Commit 287b37d8 authored by ibuler's avatar ibuler

[Update] 优化树搜索展示

parent ddc798b2
...@@ -4,6 +4,7 @@ import {AppService, LogService} from '../../app.service'; ...@@ -4,6 +4,7 @@ import {AppService, LogService} from '../../app.service';
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material'; import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
import {FormControl, Validators} from '@angular/forms'; import {FormControl, Validators} from '@angular/forms';
import {BehaviorSubject} from 'rxjs/BehaviorSubject'; import {BehaviorSubject} from 'rxjs/BehaviorSubject';
import {forEach} from '@angular-devkit/schematics';
declare var $: any; declare var $: any;
...@@ -32,6 +33,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges { ...@@ -32,6 +33,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
}, },
}; };
hiddenNodes: any; hiddenNodes: any;
expandNodes: any;
onCzTreeOnClick(event, treeId, treeNode, clickFlag) { onCzTreeOnClick(event, treeId, treeNode, clickFlag) {
if (treeNode.isParent) { if (treeNode.isParent) {
...@@ -221,10 +223,18 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges { ...@@ -221,10 +223,18 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
const _keywords = this.query; const _keywords = this.query;
const nodes = zTreeObj.transformToArray(zTreeObj.getNodes()); const nodes = zTreeObj.transformToArray(zTreeObj.getNodes());
if (!_keywords) { if (!_keywords) {
zTreeObj.showNodes(nodes); if (this.hiddenNodes) {
zTreeObj.expandAll(false); zTreeObj.showNodes(this.hiddenNodes);
const root = zTreeObj.getNodes()[0]; this.hiddenNodes = null;
zTreeObj.expandNode(root); }
if (this.expandNodes) {
this.expandNodes.forEach((node) => {
if (node.id !== nodes[0].id) {
zTreeObj.expandNode(node, false);
}
});
this.expandNodes = null;
}
return null; return null;
} }
let shouldShow = []; let shouldShow = [];
...@@ -235,9 +245,16 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges { ...@@ -235,9 +245,16 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
shouldShow = [...shouldShow, ...parents, ...children, node]; shouldShow = [...shouldShow, ...parents, ...children, node];
} }
}); });
this.hiddenNodes = nodes;
this.expandNodes = shouldShow;
zTreeObj.hideNodes(nodes); zTreeObj.hideNodes(nodes);
zTreeObj.showNodes(shouldShow); zTreeObj.showNodes(shouldShow);
zTreeObj.expandAll(true); shouldShow.forEach((node) => {
if (node.isParent) {
zTreeObj.expandNode(node, true);
}
});
// zTreeObj.expandAll(true);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment