|
@@ -281,18 +281,19 @@
|
|
|
//获取treeId --classstructureid
|
|
|
onSearchTree(val){
|
|
|
let arr = [];
|
|
|
- const reg = new RegExp(val, 'g')
|
|
|
+ const reg = new RegExp(val, 'g');
|
|
|
+ let flag= false;
|
|
|
if(this.typeEdit=='Zone'){
|
|
|
this.treeData.map((item)=>{
|
|
|
if(item.name.indexOf(val)!=-1){
|
|
|
item.name=item.name.replace(reg, `<span style="color:#F96600">${val}</span>`);
|
|
|
arr.push(item)
|
|
|
}
|
|
|
-
|
|
|
});
|
|
|
|
|
|
}
|
|
|
if(this.typeEdit=='Image'){
|
|
|
+ console.log(this.treeData);
|
|
|
this.treeData.map(item=>{
|
|
|
if(item.name.indexOf(val)!=-1){
|
|
|
item.name=item.name.replace(reg, `<span style="color:#F96600">${val}</span>`);
|
|
@@ -300,11 +301,14 @@
|
|
|
}else{
|
|
|
item.children.map(item1=>{
|
|
|
if(item1.name.indexOf(val)!=-1){
|
|
|
+ flag = true;
|
|
|
item.open=true;
|
|
|
item1.name=item1.name.replace(reg, `<span style="color:#F96600">${val}</span>`);
|
|
|
- arr.push(item)
|
|
|
}
|
|
|
})
|
|
|
+ if(flag){
|
|
|
+ arr.push(item)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
})
|