cnhis-design-vue 2.0.4 → 2.0.5

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

@@ -44,7 +44,7 @@
             checkable
             :expandedKeys="expandedKeys"
             :autoExpandParent="autoExpandParent"
-            :checkStrictly="true"
+            :checkStrictly="false"
             :selectable="false"
             :treeData="treeData.temp"
             :load-data="getLoadChildData"
@@ -326,17 +326,12 @@ export default create({
         return checked && item.type == 2;
       });
       let deptItems = this.dataList.dept.filter(item => {
-        let { isLeaf, key } = item;
-        let parentId = this.getParentId(item);
+        let { key } = item;
         let showKeys = [...this.checkedKeys.dept, ...otherItems];
         let checked = showKeys.includes(key);
-        // 父级全选，子级不展示
-        /** String(parentId) 类型不相等 */
-        if (isLeaf && parentId && this.checkedKeys.dept.some(v => v == parentId)) {
-          checked = false;
-        }
+        // 只展示最后一级的科室
         item.itemType = 'dept';
-        return checked && item.type == 1;
+        return checked && item.type == 1 && (!item.children || (item.children && !item.children.length));
       });
       let roleItems = this.dataList.role.filter(item => {
         let showKeys = [...this.checkedKeys.role, ...otherItems];
@@ -347,12 +342,12 @@ export default create({
       if (this.selectType === 'multiple') {
         deptItems.forEach(item => {
           if (item.title) {
-            item.title = item.title.includes('科室') ? item.title : `${item.title}（科室）`;
+            item.title = item.title.includes('（科室）') ? item.title : `${item.title}（科室）`;
           }
         });
         roleItems.map(item => {
           if (item.title) {
-            item.title = item.title.includes('角色') ? item.title : `${item.title}（角色）`;
+            item.title = item.title.includes('（角色）') ? item.title : `${item.title}（角色）`;
           }
           return item;
         });
@@ -381,13 +376,13 @@ export default create({
     }
   },
   watch: {
-    defaultList: {
-      immediate: true,
-      handler(val) {
-        if (!val) return;
-        this.initDefault();
-      }
-    },
+    // defaultList: {
+    //   immediate: true,
+    //   handler(val) {
+    //     if (!val) return;
+    //     this.initDefault();
+    //   }
+    // },
     selectType: {
       immediate: true,
       handler(val) {
@@ -400,9 +395,7 @@ export default create({
       immediate: true,
       handler() {
         this.staticDataInit();
-        if (['dept'].includes(this.selectType)) {
-          this.staticDeptAndRoleDataInit();
-        }
+        this.staticDeptAndRoleDataInit();
         const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
         this.treeData.temp = this.treeData[key];
       }
@@ -410,20 +403,16 @@ export default create({
     roleData: {
       immediate: true,
       handler() {
-        if (['multiple', 'role'].includes(this.selectType)) {
-          this.staticDeptAndRoleDataInit();
-          const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
-          this.treeData.temp = this.treeData[key];
-        }
+        this.staticDeptAndRoleDataInit();
+        const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
+        this.treeData.temp = this.treeData[key];
       }
-    },
-    checkedTreeItem(val) {
-      this.$emit('check', [...val, ...this.defaultShowList]);
     }
   },
   created() {},
   mounted() {
     this.getUsers();
+    this.initDefault();
   },
   methods: {
     initDefault() {
@@ -431,7 +420,14 @@ export default create({
         this.getDefaultList();
       } else {
         this.$nextTick(() => {
-          this.checkedKeys.main = [...this.defaultList];
+          const userIds = this.defaultList.filter(item => item.itemType === 'person').map(item => item.id);
+          const deptIds = this.defaultList.filter(item => item.itemType === 'dept').map(item => item.id);
+          const roleIds = this.defaultList.filter(item => item.itemType === 'role').map(item => item.id);
+          const key = ['main', 'dept', 'role'][this.typeActiveIndex];
+          this.checkedKeys.main = userIds;
+          this.checkedKeys.dept = deptIds;
+          this.checkedKeys.role = roleIds;
+          this.checkedKeys.temp = this.checkedKeys[key];
         });
       }
     },
@@ -844,13 +840,13 @@ export default create({
         this.searchChecked = checked;
       }
       this.checkAll(checked ? 1 : 2);
+      this.handleOk();
     },
     // type 1 全选 2 反选(清空)
     checkAll(type) {
       if (this.checkAllSearchTree(type)) return false;
       const key = ['main', 'dept', 'role'][this.typeActiveIndex];
       if (type == 1) {
-        console.log(key, this[`dataList${key.slice(0, 1).toUpperCase()}${key.slice(1)}Keys`], 'dqee2');
         this.expandedKeys = [];
         this.checkedKeys[key] = this[`dataList${key.slice(0, 1).toUpperCase()}${key.slice(1)}Keys`]; // dataListMainKeys dataListDeptKeys dataListRoleKeys;
         this.checkedKeys.temp = this.checkedKeys[key];
@@ -1036,8 +1032,12 @@ export default create({
       this.removedCheckedkeysDept(removedTag);
       this.removedCheckedkeysRole(removedTag);
       this.removedCheckedkeysOther(removedTag);
-
+      const propStr = ['person', 'dept', 'role'][this.typeActiveIndex];
+      const checkedKeys = this.checkedTreeItem.filter(item => item.itemType === propStr).map(item => item.key);
+      this.checkedKeys.temp = checkedKeys;
+      this.handleEmitValue();
       this.refreshSearchTree();
+      this.isAllCheck(checkedKeys);
     },
 
     removeCheckedkeysIncludeChildren(parentKey) {
@@ -1068,12 +1068,27 @@ export default create({
         }
       }
     },
+    removeCheckedkeysIncludeChildrenDept(parentKey) {
+      let needRemoveChildKeys = this.dataList.dept
+        .filter(i => {
+          let parentId = this.getParentId(i);
+          return parentId == parentKey || i.key == parentKey;
+        })
+        .map(i => {
+          return i.key;
+        });
+      const checkedKeys = this.checkedKeys.dept.filter(i => {
+        return !needRemoveChildKeys.includes(i);
+      });
+      this.checkedKeys.dept = checkedKeys;
+    },
     removedCheckedkeysDept(tag) {
       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.removeCheckedkeysIncludeChildren(tag.key);
+          this.removeCheckedkeysIncludeChildrenDept(tag.key);
           return false;
         } else if (tag.key == checkedKeys[i]) {
           checkedKeys.splice(i, 1);
@@ -1171,6 +1186,7 @@ export default create({
       // let subList = [...submitData, ...this.defaultShowList];
 
       this.$emit('pubCheckedTreeItem', [...this.checkedTreeItem, ...this.defaultShowList]);
+      this.$emit('check', [...this.checkedTreeItem, ...this.defaultShowList]);
       this.$emit('handleOk', this.checkedLeafKeys);
       this.$emit('change', this.checkedLeafKeys, [...submitData, ...this.defaultShowList]);
       this.$emit('submitData', [...submitData, ...this.defaultShowList]);
@@ -1293,33 +1309,34 @@ export default create({
       // 处理全选框
       this.isAllCheck(checkedKeys);
     },
-    onTreeCheck({ checked: checkedKeys }, { checked, node }) {
-      // 断掉了父子关系 要不然当存在一二级科室的时候 搜索二级科室 再选中会把一级也选中
+    onTreeCheck(checkedKeys, { checked, node }) {
+      // 断掉了父子关系 要不然当存在一二级科室的时候 搜索二级科室 再选中会把一级也选中 ； 后续与产品沟通 不需要断 只取最后一级科室
       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 => {
-        if (item.key === node.eventKey) {
-          keyData = item;
-        }
-      });
-      vexutils.searchTree(keyData.children, item => {
-        childKeys.push(item.key);
-      });
-      if (checked) {
-        const singleCheckedKeys = this.getSingleCheckedKeys(propStr, this.treeData[propStr], keyData);
-        totalCheckedKeys = this.isSingleCheck ? singleCheckedKeys : [...new Set(checkedKeys.concat(childKeys))];
-      } else {
-        // totalCheckedKeys = checkedKeys;
-        totalCheckedKeys = this.isSingleCheck ? [] : checkedKeys.filter(key => !childKeys.includes(key));
-      }
-      this.checkedKeys.temp = totalCheckedKeys;
-      this.checkedKeys[propStr] = totalCheckedKeys;
-      this.isAllCheck(totalCheckedKeys);
-      this.isSearchAllCheck(totalCheckedKeys);
-      this.handleEmitValue();
+      // let keyData = {};
+      // vexutils.searchTree(this.treeData[propStr], item => {
+      //   if (item.key === node.eventKey) {
+      //     keyData = item;
+      //   }
+      // });
+      // vexutils.searchTree(keyData.children, item => {
+      //   childKeys.push(item.key);
+      // });
+      // if (checked) {
+      //   const singleCheckedKeys = this.getSingleCheckedKeys(propStr, this.treeData[propStr], keyData);
+      //   totalCheckedKeys = this.isSingleCheck ? singleCheckedKeys : [...new Set(checkedKeys.concat(childKeys))];
+      // } else {
+      //   // 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);
+      this.$emit('pubCheckedTreeItem', [...this.checkedTreeItem, ...this.defaultShowList]);
+      this.$emit('check', [...this.checkedTreeItem, ...this.defaultShowList]);
     },
     getSingleCheckedKeys(propStr, treeData, keyData) {
       const firstTreeData = deepTraversalFirst(keyData) || [];