Skip to content

Commit

Permalink
fix(module: tree): fix nodes list to render correctly (#3326)
Browse files Browse the repository at this point in the history
* fix(module: tree): fix nodes list to render correctly

close #3320

* fix(module: tree): rollback default keys

* fix(module: tree): use nzNodes only
  • Loading branch information
simplejason authored and hsuanxyz committed Apr 22, 2019
1 parent d91af03 commit 6d759a8
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions components/tree/nz-tree.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,13 @@ export class NzTreeComponent implements OnInit, OnDestroy, ControlValueAccessor,
return this._searchValue;
}

/**
* To render nodes if root is changed
*/
get nzNodes(): NzTreeNode[] {
return this.nzTreeService.rootNodes;
}

// model bind
@Output() readonly nzExpandedKeysChange: EventEmitter<string[]> = new EventEmitter<string[]>();
@Output() readonly nzSelectedKeysChange: EventEmitter<string[]> = new EventEmitter<string[]>();
Expand Down Expand Up @@ -192,7 +199,6 @@ export class NzTreeComponent implements OnInit, OnDestroy, ControlValueAccessor,
_nzMultiple: boolean = false;
nzDefaultSubject = new ReplaySubject<{ type: string; keys: string[] }>(6);
destroy$ = new Subject();
nzNodes: NzTreeNode[] = [];
prefixCls = 'ant-tree';
classMap = {};

Expand Down Expand Up @@ -266,19 +272,20 @@ export class NzTreeComponent implements OnInit, OnDestroy, ControlValueAccessor,

// tslint:disable-next-line:no-any
initNzData(value: any[]): void {
let nzNodes: NzTreeNode[] = [];
if (Array.isArray(value)) {
if (!this.nzTreeService.isArrayOfNzTreeNode(value)) {
// has not been new NzTreeNode
this.nzNodes = value.map(item => new NzTreeNode(item, null, this.nzTreeService));
nzNodes = value.map(item => new NzTreeNode(item, null, this.nzTreeService));
} else {
this.nzNodes = value.map((item: NzTreeNode) => {
nzNodes = value.map((item: NzTreeNode) => {
item.service = this.nzTreeService;
return item;
});
}
this.nzTreeService.isCheckStrictly = this.nzCheckStrictly;
this.nzTreeService.isMultiple = this.nzMultiple;
this.nzTreeService.initTree(this.nzNodes);
this.nzTreeService.initTree(nzNodes);
}
}

Expand Down

0 comments on commit 6d759a8

Please sign in to comment.