fix(module:table): fix nzWidth with ngIf (#349)

close #302
NG-ZORRO · Sep 22, 2017 · d5d379b · d5d379b
1 parent aec9f83
commit d5d379b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/components/table/nz-table.component.ts b/src/components/table/nz-table.component.ts
@@ -8,9 +8,10 @@ import {
   Output,
   ContentChild,
   ChangeDetectorRef,
-  TemplateRef, OnInit
+  TemplateRef, OnInit, ContentChildren, QueryList
 } from '@angular/core';
 import { measureScrollbar } from '../util/mesureScrollBar';
+import { NzThDirective } from './nz-th.directive';
 
 @Component({
   selector     : 'nz-table',
@@ -112,6 +113,11 @@ export class NzTableComponent implements AfterViewInit, OnInit {
   @Input() nzShowTitle = false;
   @ContentChild('nzFixedHeader') fixedHeader: TemplateRef<any>;
 
+  @ContentChildren(NzThDirective, { descendants: true })
+  set setThs(value: QueryList<NzThDirective>) {
+    this.ths = value.toArray();
+  }
+
   @Input()
   set nzScroll(value) {
     this._scroll = value;

diff --git a/src/components/table/nz-th.directive.ts b/src/components/table/nz-th.directive.ts
@@ -2,31 +2,19 @@ import {
   Directive,
   Input,
   HostBinding,
-  ElementRef, OnInit, OnDestroy
+  ElementRef
 } from '@angular/core';
-import { NzTableComponent } from './nz-table.component';
 
 @Directive({
   selector: '[nz-th]'
 })
-export class NzThDirective implements OnInit, OnDestroy {
+export class NzThDirective {
   _el: HTMLElement;
   @Input() nzWidth;
   @Input() @HostBinding(`class.ant-table-selection-column`) nzCheckbox;
   @Input() @HostBinding(`class.ant-table-expand-icon-th`) nzExpand;
 
-  constructor(private _elementRef: ElementRef, private nzTableComponent: NzTableComponent) {
+  constructor(private _elementRef: ElementRef) {
     this._el = this._elementRef.nativeElement;
   }
-
-  ngOnInit() {
-    this.nzTableComponent.ths.push(this);
-  }
-
-  ngOnDestroy() {
-    const index = this.nzTableComponent.ths.indexOf(this);
-    if (index > -1) {
-      this.nzTableComponent.ths.splice(index, 1);
-    }
-  }
 }