fix:deliver template by treeRef

NG-ZORRO · Sep 8, 2018 · 1b0a3c0 · 1b0a3c0
1 parent feeb5d2
commit 1b0a3c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/components/tree-select/nz-tree-select.component.html b/components/tree-select/nz-tree-select.component.html
@@ -27,7 +27,6 @@
       [nzDefaultExpandedKeys]="nzDefaultExpandedKeys"
       [nzDefaultCheckedKeys]="nzCheckable ? value : []"
       [nzDefaultSelectedKeys]="!nzCheckable ? value : []"
-      [nzTreeSelectTemplate]="nzTreeSelectTemplate"
       (nzExpandChange)="nzExpandChange.emit($event)"
       (nzClick)="nzTreeClick.emit($event)"
       (nzCheckBoxChange)="nzTreeCheckBoxChange.emit($event)"

diff --git a/components/tree-select/nz-tree-select.component.ts b/components/tree-select/nz-tree-select.component.ts
@@ -440,6 +440,9 @@ export class NzTreeSelectComponent implements ControlValueAccessor, OnInit, Afte
 
   ngAfterViewInit(): void {
     this.attachOverlay();
+    if (this.nzTreeSelectTemplate) {
+      setTimeout(() => this.treeRef.nzTreeTemplate = this.nzTreeSelectTemplate, 0);
+    }
   }
 
   setDisabledState(isDisabled: boolean): void {

diff --git a/components/tree/nz-tree.component.ts b/components/tree/nz-tree.component.ts
@@ -40,7 +40,6 @@ export class NzTreeComponent implements OnInit {
   @Input() nzDefaultExpandAll: boolean = false;
   @Input() nzDefaultExpandedKeys: string[] = [];
   @Input() nzDefaultSelectedKeys: string[] = [];
-  @Input() nzTreeSelectTemplate: TemplateRef<{}>;
   @Input() nzBeforeDrop: (confirm: NzFormatBeforeDropEvent) => Observable<boolean>;
   @Input()
   set nzDefaultCheckedKeys(value: string[]) {
@@ -133,8 +132,5 @@ export class NzTreeComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    if (this.nzTreeSelectTemplate) {
-      this.nzTreeTemplate = this.nzTreeSelectTemplate;
-    }
   }
 }