cnhis-design-vue 2.0.7 → 2.0.10

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

@@ -313,13 +313,15 @@ export default create({
         return this.checkedKeys.other.includes(item.key);
       });
       let mainItems = this.dataList.main.filter(item => {
+        // let f = this.currentKey === 'main';
+        // if(!f) return f;
         let { isLeaf, key } = item;
         let parentId = this.getParentId(item);
-        let showKeys = [...this.checkedKeys.main, ...otherItems];
+        let showKeys = [...this.checkedKeys.temp, ...otherItems];
         let checked = showKeys.includes(key);
         // 父级全选，子级不展示
         /** String(parentId) 类型不相等 */
-        if (isLeaf && parentId && this.checkedKeys.main.some(v => v == parentId)) {
+        if (isLeaf && parentId && this.checkedKeys.temp.some(v => v == parentId)) {
           checked = false;
         }
         item.itemType = 'person';
@@ -373,6 +375,10 @@ export default create({
         return this.onLoadData;
       }
       return null;
+    },
+
+    currentKey(){
+      return  { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType]
     }
   },
   watch: {
@@ -595,6 +601,10 @@ export default create({
             }
           }
         });
+        if(this.currentKey === 'main'){
+          this.checkedKeys.temp = this.checkedKeys.main;
+          this.treeData.temp = this.treeData.main;
+        }
         this.spinning = false;
       } catch (error) {
         this.spinning = false;
@@ -1086,7 +1096,6 @@ export default create({
       let checkedKeys = this.checkedKeys.dept;
       let parentId = this.getParentId(tag);
       for (let i = 0; i < checkedKeys.length; i++) {
-        console.log(tag, checkedKeys[i], parentId, 'forfor');
         if (tag.key == checkedKeys[i] && tag.key == parentId) {
           this.removeCheckedkeysIncludeChildrenDept(tag.key);
           return false;
@@ -1254,7 +1263,7 @@ export default create({
       if (!this.title) {
         // 如果为空恢复默认数据
         const key = ['main', 'dept', 'role'][this.typeActiveIndex];
-        this.treeData.temp = this.treeData[key];
+        this.$set(this.treeData, 'temp', this.treeData[key]);
         return;
       }
       let copyData = JSON.parse(JSON.stringify(this.treeData.temp));
@@ -1271,7 +1280,7 @@ export default create({
           item.children = item.children.filter(child => child.visible);
         }
       });
-      this.treeData.temp = copyData;
+      this.$set(this.treeData, 'temp', copyData);
       this.expandedKeys = expandedKeys;
     },
     getStaticSearchParentKey(treeData, expandedKeys, orgId) {
@@ -1313,7 +1322,6 @@ export default create({
       // 断掉了父子关系 要不然当存在一二级科室的时候 搜索二级科室 再选中会把一级也选中 ； 后续与产品沟通 不需要断 只取最后一级科室
       const propStr = ['main', 'dept', 'role'][this.typeActiveIndex];
       let totalCheckedKeys = [];
-      const childKeys = [];
       // const keyData = this.dataList[propStr].find(item => item.key === node.eventKey);
       // let keyData = {};
       // vexutils.searchTree(this.treeData[propStr], item => {
@@ -1331,10 +1339,29 @@ export default create({
       //   // totalCheckedKeys = checkedKeys;
       //   totalCheckedKeys = this.isSingleCheck ? [] : checkedKeys.filter(key => !childKeys.includes(key));
       // }
-      this.checkedKeys.temp = checkedKeys;
-      this.checkedKeys[propStr] = checkedKeys;
-      this.isAllCheck(checkedKeys);
-      this.isSearchAllCheck(checkedKeys);
+      // 如果是选中就把之前选中和现在选中的合并做为temp值（兼容搜索的情况），
+      if (checked) {
+        const preChecked = this.checkedKeys[propStr];
+        totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys))];
+      } else {
+        // 如果是取消从之前的选择中把当前点击的及其子级去除选中作为temp值（兼容搜索的情况）
+        let keyData = {};
+        const needCancelKeys = [node.eventKey];
+        const preChecked = this.checkedKeys[propStr];
+        vexutils.searchTree(this.treeData[propStr], item => {
+          if (item.key === node.eventKey) {
+            keyData = item;
+          }
+        });
+        vexutils.searchTree(keyData.children, item => {
+          needCancelKeys.push(item.key);
+        });
+        totalCheckedKeys = [...new Set(preChecked.filter(key => !needCancelKeys.includes(key)))];
+      }
+      this.checkedKeys.temp = totalCheckedKeys;
+      this.checkedKeys[propStr] = totalCheckedKeys;
+      this.isAllCheck(totalCheckedKeys);
+      this.isSearchAllCheck(totalCheckedKeys);
       this.$emit('pubCheckedTreeItem', [...this.checkedTreeItem, ...this.defaultShowList]);
       this.$emit('check', [...this.checkedTreeItem, ...this.defaultShowList]);
     },