fix(module:tree-select): can't work default values in OnPush mode (#2364

) close #2318 close #2085
NG-ZORRO · Oct 26, 2018 · 04cf7aa · 04cf7aa
1 parent bea1d05
commit 04cf7aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/components/tree-select/nz-tree-select.component.html b/components/tree-select/nz-tree-select.component.html
@@ -29,6 +29,8 @@
       [nzSelectedKeys]="!nzCheckable ? value : []"
       (nzExpandChange)="nzExpandChange.emit($event)"
       (nzClick)="nzTreeClick.emit($event)"
+      (nzCheckedKeysChange)="updateSelectedNodes()"
+      (nzSelectedKeysChange)="updateSelectedNodes()"
       (nzCheckBoxChange)="nzTreeCheckBoxChange.emit($event)">
     </nz-tree>
   </div>

diff --git a/components/tree-select/nz-tree-select.component.ts b/components/tree-select/nz-tree-select.component.ts
@@ -119,9 +119,7 @@ export class NzTreeSelectComponent implements ControlValueAccessor, OnInit, Afte
   @Input()
   set nzNodes(value: NzTreeNode[]) {
     this.nodes = value;
-    if (this.treeRef) {
-      setTimeout(() => this.updateSelectedNodes(), 0);
-    }
+    setTimeout(() => this.updateSelectedNodes(), 0);
   }
 
   get nzNodes(): NzTreeNode[] {
@@ -346,7 +344,9 @@ export class NzTreeSelectComponent implements ControlValueAccessor, OnInit, Afte
   }
 
   updateSelectedNodes(): void {
-    this.selectedNodes = [ ...(this.nzCheckable ? this.treeRef.getCheckedNodeList() : this.treeRef.getSelectedNodeList()) ];
+    if (this.treeRef) {
+      this.selectedNodes = [ ...(this.nzCheckable ? this.treeRef.getCheckedNodeList() : this.treeRef.getSelectedNodeList()) ];
+    }
   }
 
   updatePosition(): void {
@@ -407,14 +407,15 @@ export class NzTreeSelectComponent implements ControlValueAccessor, OnInit, Afte
       } else {
         this.value = [ (value as string) ];
       }
-      setTimeout(() => this.updateSelectedNodes(), 100);
+      this.updateSelectedNodes();
     } else {
       this.value = [];
       this.selectedNodes.forEach(node => {
         this.removeSelected(node, false);
       });
       this.selectedNodes = [];
     }
+    this.cdr.markForCheck();
   }
 
   registerOnChange(fn: (_: string[] | string) => void): void {