From 2e5919fd0c668946871939370f7850e0c8b38b7e Mon Sep 17 00:00:00 2001
From: qicj <qicj@amberdata.cn>
Date: Wed, 28 Jul 2021 18:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AD=96=E7=95=A5=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=E6=97=B6=EF=BC=8C=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=A9=BA=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projects/recordinfo/package.json              |  2 +-
 .../add-electronic-document.component.html    |  5 +++
 .../add-electronic-document.component.ts      | 34 +++++++++++++++++++
 .../recordinfo/src/lib/recordinfo.module.ts   |  2 ++
 src/styles.scss                               |  1 +
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/projects/recordinfo/package.json b/projects/recordinfo/package.json
index 397e987..927e776 100644
--- a/projects/recordinfo/package.json
+++ b/projects/recordinfo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "recordinfo",
-  "version": "1.4.228",
+  "version": "1.4.231",
   "repository": {
     "type": "git",
     "url": "https://github.com/qichangjun/ad-record-info"
diff --git a/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.html b/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.html
index 420ac0f..3dee174 100644
--- a/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.html
+++ b/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.html
@@ -24,6 +24,11 @@
     </mat-radio-group>
   </div>
   <div class="select--node--upload--box">
+    <nz-switch 
+    *ngIf="currentPolicy!='default'"
+    nzCheckedChildren="隐藏空节点" nzUnCheckedChildren="显示空节点"
+    [(ngModel)]="hideEmptyNode" (ngModelChange)="toggleShowType($event)"></nz-switch>
+    
     <div
       [ngClass]="{hasData : ((currentPolicy=='default' && defaultFileLists.length > 0) || (currentPolicy!='default' && policyInfo.children.length>0))}"
       class="head" class="head">电子文件：</div>
diff --git a/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.ts b/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.ts
index 08aadf1..0e054e3 100644
--- a/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.ts
+++ b/projects/recordinfo/src/lib/add-electronic-document/add-electronic-document.component.ts
@@ -61,6 +61,7 @@ export class addElectronicDocumentComponent implements OnInit, OnChanges {
   relativePath: any//上传时候的relativePath
   hasNoFileBlock: boolean = false
   firstInitServerFilesFinished: boolean = false
+  hideEmptyNode : boolean = true
   currentFile : string = ''
   path:path
   @ViewChild('fileTree') fileTree : any
@@ -179,6 +180,7 @@ export class addElectronicDocumentComponent implements OnInit, OnChanges {
   // 若有，则调用formatPoolicyInfo方法,把jsonData中的文件集合初始化到policy的json中
   async getPolicyInfo() {
     let policyInfo
+    this.hideEmptyNode = true
     this.firstInitServerFilesFinished = false
     this.policyLists = await this.getPolicyInfoPomise(this.metadataSchemeId)
     let block = JSONPath.JSONPath({ path: this.fileJsonPath, json: this.jsonMetadataTemplate, resultType: 'all' })
@@ -699,6 +701,38 @@ export class addElectronicDocumentComponent implements OnInit, OnChanges {
     } 
   }
 
+  toggleShowType(e?){   
+    this.fileTree.nzNodes.forEach((node:NzTreeNode)=>{
+      this.toggleNodeDisplay(node)
+    })      
+  }
+
+  toggleNodeDisplay(node){
+    let result = this.checkHasFileNode(node)
+    if(!result){
+      node.component.elRef.nativeElement.style.display = 
+        node.component.elRef.nativeElement.style.display == 'none' ?  '' : 'none'
+    }
+    node.getChildren().forEach(child=>{
+      this.toggleNodeDisplay(child)
+    })
+  }
+
+  checkHasFileNode(node:NzTreeNode):boolean{
+    let hasFileNode : boolean = false 
+    function checkChildren(child:NzTreeNode){
+      if(child.origin.type == 'file'){
+        hasFileNode = true 
+        return  
+      }    
+      child.getChildren().forEach(s_children => {
+        checkChildren(s_children)
+      });
+    }   
+    checkChildren(node) 
+    return hasFileNode 
+  }
+
   /**
    * 根据key找到文件资料节点
    * @param key 节点的key,不传时默认查当前节点的key
diff --git a/projects/recordinfo/src/lib/recordinfo.module.ts b/projects/recordinfo/src/lib/recordinfo.module.ts
index 85d6f16..896ece0 100644
--- a/projects/recordinfo/src/lib/recordinfo.module.ts
+++ b/projects/recordinfo/src/lib/recordinfo.module.ts
@@ -37,6 +37,7 @@ import { NzIconModule } from 'ng-zorro-antd';
 import { NzProgressModule } from 'ng-zorro-antd';
 import { NzPopoverModule } from 'ng-zorro-antd';
 
+import { NzSwitchModule } from 'ng-zorro-antd';
 import { registerLocaleData } from '@angular/common';
 import zh from '@angular/common/locales/zh';
 registerLocaleData(zh);
@@ -49,6 +50,7 @@ registerLocaleData(zh);
     NzInputModule,
     FileUploadModule,
     NzTreeSelectModule,
+    NzSwitchModule,
     NzSelectModule,
     MatProgressSpinnerModule,
     MatDialogModule,
diff --git a/src/styles.scss b/src/styles.scss
index ff82ed2..e6df2a1 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -13,6 +13,7 @@ body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
 @import "~ng-zorro-antd/progress/style/index.min.css";  /* 下拉 */
 
 @import "~ng-zorro-antd/popover/style/index.min.css"; /* 折叠板 */
+@import "~ng-zorro-antd/switch/style/index.min.css"; /* 折叠板 */
 .drag-over-gap-bottom{
     border-bottom:2px solid #1890ff;
 }