cnhis-design-vue 2.0.10 → 2.0.13

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

@@ -126,7 +126,7 @@ import { Icon, Checkbox, Tree, Tooltip, Input, Spin } from 'ant-design-vue';
 import searchTree from './search-tree';
 import create from '@/core/create';
 import vexutils from '@/utils/vexutils';
-import { filterTree, deepTraversalFirst } from '@/utils';
+import { filterTree, deepTraversalFirst, getAllParentId } from '@/utils';
 
 /**
  * 查询没有部门的分类时，parent_id_obj 为 undefined a-tree 展示异常。
@@ -317,13 +317,13 @@ export default create({
         // if(!f) return f;
         let { isLeaf, key } = item;
         let parentId = this.getParentId(item);
-        let showKeys = [...this.checkedKeys.temp, ...otherItems];
+        let showKeys = [...this.checkedKeys.main, ...otherItems];
         let checked = showKeys.includes(key);
         // 父级全选，子级不展示
         /** String(parentId) 类型不相等 */
-        if (isLeaf && parentId && this.checkedKeys.temp.some(v => v == parentId)) {
-          checked = false;
-        }
+        // if (isLeaf && parentId && this.checkedKeys.temp.some(v => v == parentId)) {
+        //   checked = false;
+        // }
         item.itemType = 'person';
         return checked && item.type == 2;
       });
@@ -377,8 +377,8 @@ export default create({
       return null;
     },
 
-    currentKey(){
-      return  { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType]
+    currentKey() {
+      return { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
     }
   },
   watch: {
@@ -601,7 +601,7 @@ export default create({
             }
           }
         });
-        if(this.currentKey === 'main'){
+        if (this.currentKey === 'main') {
           this.checkedKeys.temp = this.checkedKeys.main;
           this.treeData.temp = this.treeData.main;
         }
@@ -1059,10 +1059,10 @@ export default create({
         .map(i => {
           return i.key;
         });
-
-      this.checkedKeys.main = this.checkedKeys.main.filter(i => {
+      const checkedKeys = this.checkedKeys.main.filter(i => {
         return !needRemoveChildKeys.includes(i);
       });
+      this.checkedKeys.main = checkedKeys;
     },
 
     removedCheckedkeysMain(tag) {
@@ -1342,7 +1342,19 @@ export default create({
       // 如果是选中就把之前选中和现在选中的合并做为temp值（兼容搜索的情况），
       if (checked) {
         const preChecked = this.checkedKeys[propStr];
-        totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys))];
+        // 搜索时选中上级也要把它所有下级给选中 如果是选中一个下级但是也把其上级选中了要把上级选中给去掉
+        const childKeys = [];
+        let keyData = {};
+        vexutils.searchTree(this.treeData[propStr], item => {
+          if (item.key === node.eventKey) {
+            keyData = item;
+          }
+        });
+        vexutils.searchTree(keyData.children, item => {
+          childKeys.push(item.key);
+        });
+        const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey).filter(Boolean);
+        totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys, childKeys))].filter(id => !allParentIds.includes(id));
       } else {
         // 如果是取消从之前的选择中把当前点击的及其子级去除选中作为temp值（兼容搜索的情况）
         let keyData = {};
@@ -1356,7 +1368,9 @@ export default create({
         vexutils.searchTree(keyData.children, item => {
           needCancelKeys.push(item.key);
         });
-        totalCheckedKeys = [...new Set(preChecked.filter(key => !needCancelKeys.includes(key)))];
+        const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey).filter(Boolean);
+        console.log('cancel: ', this.treeData[propStr], allParentIds);
+        totalCheckedKeys = [...new Set(preChecked.filter(key => !needCancelKeys.includes(key)))].filter(id => !allParentIds.includes(id));
       }
       this.checkedKeys.temp = totalCheckedKeys;
       this.checkedKeys[propStr] = totalCheckedKeys;

package/src/utils/index.js

@@ -64,3 +64,18 @@ export const deepTraversalFirst = (node, nodeList = []) => {
   }
   return nodeList;
 };
+
+// 查找节点的父元素
+export function getAllParentId(list, id, key = 'children') {
+  for (let i in list) {
+    if (list[i].id == id) {
+      return [list[i].parentId];
+    }
+    if (list[i][key]) {
+      let node = getAllParentId(list[i][key], id);
+      if (node !== undefined) {
+        return node.concat(list[i].parentId);
+      }
+    }
+  }
+}