fix(abc:st): fix style misplacement when expand is true (#860)

ng-alain · Apr 28, 2020 · 773f546 · 773f546
1 parent 020393d
commit 773f546
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/packages/abc/st/st.component.html b/packages/abc/st/st.component.html
@@ -169,10 +169,7 @@
         </td>
       </tr>
       <tr [nzExpand]="i.expand">
-        <td></td>
-        <td [attr.colspan]="_columns.length">
-          <ng-template [ngTemplateOutlet]="expand" [ngTemplateOutletContext]="{$implicit: i, index: index }"></ng-template>
-        </td>
+        <ng-template [ngTemplateOutlet]="expand" [ngTemplateOutletContext]="{$implicit: i, index: index }"></ng-template>
       </tr>
     </ng-template>
     <ng-container *ngIf="!virtualScroll">

diff --git a/packages/abc/st/st.component.ts b/packages/abc/st/st.component.ts
@@ -482,6 +482,9 @@ export class STComponent implements AfterViewInit, OnChanges, OnDestroy {
   }
 
   _expandChange(item: STData, expand: boolean): void {
+    if (this.expandRowByClick) {
+      return;
+    }
     item.expand = expand;
     this.closeOtherExpand(item);
     this.changeEmit('expand', item);

diff --git a/packages/abc/st/style/index.less b/packages/abc/st/style/index.less
@@ -62,6 +62,12 @@
     display: inline-block;
     margin-left: 4px;
   }
+  // 修复 `st` 内嵌表格额外产生边距
+  .@{ant-prefix}-table-tbody > tr {
+    .@{ant-prefix}-table-wrapper:only-child .@{ant-prefix}-table {
+      margin: 0;
+    }
+  }
 
   @media screen and (min-width: @nz-table-rep-min-width) {
     &__width {

diff --git a/packages/abc/st/test/st.spec.ts b/packages/abc/st/test/st.spec.ts
@@ -1075,6 +1075,16 @@ describe('abc: table', () => {
           el.click();
           page.expectData(1, 'expand', undefined).asyncEnd();
         }));
+        it('should be click icon when with true', fakeAsync(() => {
+          context.expandRowByClick = true;
+          page
+            .cd()
+            .expectData(1, 'expand', undefined)
+            .clickCell('.ant-table-row-expand-icon')
+            .expectData(1, 'expand', true)
+            .expectChangeType('expand')
+            .asyncEnd();
+        }));
       });
       describe('expandRowByClick', () => {
         it('should be close other expaned', fakeAsync(() => {