fix(module: tree): fix warning bug (#3692)

NG-ZORRO · Jul 1, 2019 · 637c334 · 637c334
1 parent 893e9e5
commit 637c334
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/components/tree/demo/basic.ts b/components/tree/demo/basic.ts
@@ -63,9 +63,7 @@ export class NzDemoTreeBasicComponent implements OnInit, AfterViewInit {
     console.log(keys, this.nzTreeComponent.getSelectedNodeList());
   }
 
-  ngOnInit(): void {
-    // TODO something
-  }
+  ngOnInit(): void {}
 
   ngAfterViewInit(): void {
     // get node by key: '10011'

diff --git a/components/tree/demo/directory.ts b/components/tree/demo/directory.ts
@@ -4,22 +4,26 @@ import { NzContextMenuService, NzDropdownMenuComponent, NzFormatEmitEvent, NzTre
 @Component({
   selector: 'nz-demo-tree-directory',
   template: `
-    <nz-tree [nzData]="nodes" (nzClick)="activeNode($event)" (nzDblClick)="openFolder($event)">
-      <ng-template #nzTreeTemplate let-node>
-        <span class="custom-node" [class.active]="activedNode?.key === node.key">
-          <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
-            <i nz-icon [nzType]="node.isExpanded ? 'folder-open' : 'folder'" (click)="openFolder(node)"></i>
-            <span class="folder-name">{{ node.title }}</span>
-            <span class="folder-desc">created by {{ node?.origin?.author | lowercase }}</span>
-          </span>
-          <span *ngIf="node.isLeaf" (contextmenu)="contextMenu($event, menu)">
-            <i nz-icon nzType="file"></i>
-            <span class="file-name">{{ node.title }}</span>
-            <span class="file-desc">modified by {{ node?.origin?.author | lowercase }}</span>
-          </span>
+    <nz-tree
+      [nzData]="nodes"
+      (nzClick)="activeNode($event)"
+      (nzDblClick)="openFolder($event)"
+      [nzTreeTemplate]="nzTreeTemplate"
+    ></nz-tree>
+    <ng-template #nzTreeTemplate let-node>
+      <span class="custom-node" [class.active]="activedNode?.key === node.key">
+        <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
+          <i nz-icon [nzType]="node.isExpanded ? 'folder-open' : 'folder'" (click)="openFolder(node)"></i>
+          <span class="folder-name">{{ node.title }}</span>
+          <span class="folder-desc">created by {{ node?.origin?.author | lowercase }}</span>
         </span>
-      </ng-template>
-    </nz-tree>
+        <span *ngIf="node.isLeaf" (contextmenu)="contextMenu($event, menu)">
+          <i nz-icon nzType="file"></i>
+          <span class="file-name">{{ node.title }}</span>
+          <span class="file-desc">modified by {{ node?.origin?.author | lowercase }}</span>
+        </span>
+      </span>
+    </ng-template>
     <nz-dropdown-menu #menu="nzDropdownMenu">
       <ul nz-menu>
         <li nz-menu-item (click)="selectDropdown()">Action 1</li>

diff --git a/components/tree/nz-tree-node.component.html b/components/tree/nz-tree-node.component.html
@@ -99,7 +99,6 @@
       [nzCheckable]="nzCheckable"
       [nzAsyncData]="nzAsyncData"
       [nzExpandAll]="nzExpandAll"
-      [nzDefaultExpandAll]="nzDefaultExpandAll"
       [nzShowIcon]="nzShowIcon"
       [nzSearchValue]="nzSearchValue"
       [nzHideUnMatched]="nzHideUnMatched"

diff --git a/components/tree/nz-tree.component.html b/components/tree/nz-tree.component.html
@@ -16,7 +16,6 @@
       [nzHideUnMatched]="nzHideUnMatched"
       [nzBeforeDrop]="nzBeforeDrop"
       [nzExpandAll]="nzExpandAll"
-      [nzDefaultExpandAll]="nzDefaultExpandAll"
       [nzShowIcon]="nzShowIcon"
       [nzTreeTemplate]="nzTreeTemplate"
       [nzNoAnimation]="noAnimation?.nzNoAnimation">

diff --git a/components/tree/nz-tree.component.ts b/components/tree/nz-tree.component.ts
@@ -95,6 +95,7 @@ export class NzTreeComponent extends NzTreeBase implements OnInit, OnDestroy, Co
   @InputBoolean()
   set nzDefaultExpandAll(value: boolean) {
     warnDeprecation(`'nzDefaultExpandAll' would be removed in 9.0.0. Please use 'nzExpandAll' instead.`);
+    this.nzExpandAll = value;
     this._nzDefaultExpandAll = value;
   }
 
@@ -171,8 +172,11 @@ export class NzTreeComponent extends NzTreeBase implements OnInit, OnDestroy, Co
     this.nzTreeService.searchExpand(value);
     if (isNotNil(value)) {
       this.nzSearchValueChange.emit(this.nzTreeService.formatEvent('search', null, null));
+      /**
+       * @deprecated 9.0.0 - use `nzOnSearchNode` instead.
+       * Hide warning, need remove next version
+       */
       this.nzOnSearchNode.emit(this.nzTreeService.formatEvent('search', null, null));
-      warnDeprecation(`'nzOnSearchNode' would be deprecated in 9.0.0. Please use 'nzSearchValueChange' instead.`);
     }
   }