feat(module:table): fix selector error (NG-ZORRO#1742)

close NG-ZORRO#1736
wenqi73 · Aug 27, 2018 · f7f7a39 · f7f7a39
1 parent afd56dd
commit f7f7a39
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/components/table/nz-td.component.ts b/components/table/nz-td.component.ts
@@ -12,7 +12,7 @@ import { toBoolean } from '../core/util/convert';
 
 @Component({
   // tslint:disable-next-line:component-selector
-  selector   : 'td',
+  selector   : 'td:not(.nz-disable-td)',
   templateUrl: './nz-td.component.html'
 })
 export class NzTdComponent {

diff --git a/components/table/nz-td.spec.ts b/components/table/nz-td.spec.ts
@@ -123,6 +123,13 @@ describe('nz-td', () => {
       expect(td.nativeElement.classList).toContain('ant-table-td-right-sticky');
       expect(td.nativeElement.style.right).toBe('20px');
     });
+    it('should be throw error when use specific class name', () => {
+      expect(() => {
+        TestBed.configureTestingModule({
+          declarations: [ NzTestDisableTdComponent ]
+        }).createComponent(NzTestDisableTdComponent);
+      }).toThrow();
+    });
   });
 });
 
@@ -155,3 +162,11 @@ export class NzTestTdComponent {
   left;
   right;
 }
+
+@Component({
+  selector: 'nz-disable-td',
+  template: `
+    <td class="nz-disable-td" [nzShowCheckbox]="true"></td>
+  `
+})
+export class NzTestDisableTdComponent {}
diff --git a/components/table/nz-th.component.ts b/components/table/nz-th.component.ts
@@ -26,7 +26,7 @@ export interface NzThItemInterface {
 
 @Component({
   // tslint:disable-next-line:component-selector
-  selector           : 'th',
+  selector           : 'th:not(.nz-disable-th)',
   preserveWhitespaces: false,
   templateUrl        : './nz-th.component.html'
 })

diff --git a/components/table/nz-th.spec.ts b/components/table/nz-th.spec.ts
@@ -248,6 +248,13 @@ describe('nz-th', () => {
       fixture.detectChanges();
       expect(th.nativeElement.classList).toContain('ant-table-expand-icon-th');
     });
+    it('should be throw error when use specific class name', () => {
+      expect(() => {
+        TestBed.configureTestingModule({
+          declarations: [ NzTestDisableThComponent ]
+        }).createComponent(NzTestDisableThComponent);
+      }).toThrow();
+    });
   });
 });
 
@@ -306,3 +313,11 @@ export class NzThTestNzTableComponent {
   filterMultiple = true;
   expand = false;
 }
+
+@Component({
+  selector: 'nz-disable-th',
+  template: `
+    <th class="nz-disable-th" [nzShowCheckbox]="true"></th>
+  `
+})
+export class NzTestDisableThComponent {}