cnhis-design-vue 2.1.29 → 2.1.30

package/packages/select-person/select-person.vue

@@ -217,6 +217,10 @@ export default create({
       type: Boolean,
       default: true
     },
+    filterChildren: {
+      type: Boolean,
+      default: false
+    },
     queryMainTreeData: Function, // 主树请求
     queryLoadChildData: Function, // 懒加载请求
     queryTreeSearch: Function // 检索请求
@@ -1283,20 +1287,21 @@ export default create({
       }
       let copyData = JSON.parse(JSON.stringify(this.treeData[key]));
       // 增加visible属性 true展示 false不展示
-      filterTree({ value: this.title, data: copyData, prop: 'title' });
+      filterTree({ value: this.title, data: copyData, prop: 'title', filterChildren: this.filterChildren });
       // 过滤visible属性 为true的数据
       copyData = copyData.filter(item => item.visible);
       const expandedKeys = [];
       vexutils.searchTree(copyData, item => {
-        if (item.visible) {
-          expandedKeys.push(item.key);
+        if (item.visible && item.title.indexOf(this.title) !== -1) {
+          const allParentIds = getAllParentId(copyData, item.key).filter(Boolean);
+          expandedKeys.push(...allParentIds);
         }
         if (item.children && item.children.length) {
           item.children = item.children.filter(child => child.visible);
         }
       });
       this.$set(this.treeData, 'temp', copyData);
-      this.expandedKeys = expandedKeys;
+      this.expandedKeys = [...new Set(expandedKeys)];
     },
     getStaticSearchParentKey(treeData, expandedKeys, orgId) {
       const keyword = this.title;