cnhis-design-vue 2.0.8 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.0.8",
+  "version": "2.0.11",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -22,10 +22,11 @@
         <span> 已勾选数据共{{ allSelectedLength }}条 </span>
         <span v-show="visibleCheckAllWrapMore"> （当前页{{ currentPageSelectedLength }}条） </span>
       </p>
-      <template v-if="visibleCheckAllWrapMore && !asyncCount">
+      <template v-if="visibleCheckAllWrapMore">
         ，
         <p v-if="!visibleCancelCheckAllBtn" class="check-wrap-btn" @click="handleCheckAll">
-          <span v-if="pageVO.total > MAX_CHECK_SIZE">
+            <!-- asyncCount 性能模式也可以“勾选全部” -->
+           <span v-if="pageVO.total > MAX_CHECK_SIZE">
             <!-- {{ `最大勾选“${tableName}” ${MAX_CHECK_SIZE}条数据` }} -->
             {{ `勾选全部页 ${MAX_CHECK_SIZE}条数据` }}
           </span>
@@ -434,7 +435,7 @@ export default create({
         this.handleTableImageSize(val, 'LIST_FIELD_SMALL', v + 'px');
       }
     },
-   
+
     // $route(val) {
     //   this.resetTableInlineEditStatus();
     // },

package/packages/fabric-chart/src/fabric-chart/FabricPolylines.vue

@@ -220,6 +220,7 @@ export default {
       }
 
       const eventStyle = { selectable: false, evented: false };
+      const types = ['arrow', '+', 'shjs', 'shks', 'cg', 'jxtq'];
       leftTitleList.forEach(async (v, i) => {
         const baseTop = canvasHeight - lableMargin[1];
         const top = baseTop - i * lableLineHeight;
@@ -235,8 +236,7 @@ export default {
           ...defaultVaule.style,
           id: pointId
         });
-        const isOriginXCenter = v.type === 'arrow' || v.type === '+' || v.type === 'shjs' || v.type === 'shks' || v.type === 'cg';
-
+        const isOriginXCenter = types.includes(v.type);
         const iconLeft = isOriginXCenter ? text.width + text.left + 10 : text.width + text.left + 5;
         const option = {
           left: iconLeft,

package/packages/fabric-chart/src/mixins/draw.js

@@ -165,6 +165,22 @@ export default {
         ...data,
       })
     },
+    // 机械通气
+    createJXTQ(data) {
+      const width = data.width || 25;
+      const height = data.height || 10;
+      return new this.fabric.Polyline([
+        { x: 0, y: height },
+        { x: width / 5, y: 0 },
+        { x: width / 5 * 2, y: height },
+        { x: width / 5 * 3, y: 0 },
+        { x: width / 5 * 4, y: height },
+        { x: width / 5 * 5, y: 0 }
+      ], {
+        scale: 1,
+        ...data,
+      })
+    },
     ceateLineArrow(data) {
       const line = new this.fabric.Line([data.left, data.top, data.left + data.width, data.top], {
         stroke: data.stroke,
@@ -273,6 +289,8 @@ export default {
             scale: 1,
             ...data,
           })
+        case 'jxtq':
+          return this.createJXTQ(data);
         default:
           // 文字(默认:比如 type === x)
           data.stroke && delete data.stroke;

package/packages/multi-chat/chat/index.vue

@@ -789,6 +789,8 @@ export default {
             this.loading = false;
             this.status = status;
             clearInterval(this.heartTimer);
+            // 不是“客服人员”,不用心跳连接
+            if(!isService) return;
             this.heartTimer = setInterval(() => {
               fetch.post(
                 '/chat/service/sessionHeart',

package/packages/scale-view/scaleView.vue

@@ -1770,6 +1770,7 @@ export default create({
       if (!Object.keys(tempObj).length) return {};
       for (let key in tempObj) {
         let itemTemp = this.formArray.find(item => this.formKey(item) == key);
+        let curValue = tempObj[key];
         if (key && itemTemp) {
           let keyTemp;
           if (itemTemp && itemTemp.databaseTitle) keyTemp = itemTemp.databaseTitle;
@@ -1778,40 +1779,39 @@ export default create({
             itemTemp &&
             itemTemp.setting &&
             itemTemp.setting.startToStop != 1 &&
-            tempObj[key] &&
+            curValue &&
             itemTemp.type == "DATETIME"
           ) {
-            if (itemTemp.setting && itemTemp.setting.dateType == "time" && tempObj[key])
-              tempObj[key] = moment().format("YYYY-MM-DD ") + tempObj[key];
-            if (itemTemp.setting && itemTemp.setting.dateType == "date" && tempObj[key])
-              tempObj[key] =
-                moment(tempObj[key]).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
+            if (itemTemp.setting && itemTemp.setting.dateType == "time" && curValue)
+              curValue = moment().format("YYYY-MM-DD ") + curValue;
+            if (itemTemp.setting && itemTemp.setting.dateType == "date" && curValue)
+              curValue =
+                moment(curValue).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
           }
-          if (key.includes("~-~")) {
-            let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
-            res[newKey] = tempObj[key];
-          } else {
-            res[keyTemp || key] = !tempObj[key] ? null : tempObj[key];
-          }
-
 
           // 处理choice选项 将key替换为value
           let isChoice = ["RADIO_BLOCK", "CHECKBOX_BLOCK"].includes(itemTemp.type);
           if (isChoice) {
             let { options } = itemTemp;
-            let useKey = this.formKey(itemTemp);
-            let obj = this.choiceComObj[useKey];
-            let value = tempObj[key];
-            if (itemTemp.type === "RADIO_BLOCK" && value) {
-              res[useKey] = this.handleChoiceItem(value, options, obj);
+            let obj = this.choiceComObj[key];
+            if (itemTemp.type === "RADIO_BLOCK" && curValue) {
+              curValue = this.handleChoiceItem(curValue, options, obj);
             }
-            if (itemTemp.type === "CHECKBOX_BLOCK" && value?.length) {
-              let resArr = this.handleCheckboxParams(value, options, obj);
-              res[useKey] = resArr;
+            if (itemTemp.type === "CHECKBOX_BLOCK" && curValue?.length) {
+              let resArr = this.handleCheckboxParams(curValue, options, obj);
+              curValue = resArr;
             }
           }
+
+          if (key.includes("~-~")) {
+            let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
+            res[newKey] = curValue;
+          } else {
+            res[keyTemp || key] = !curValue ? null : curValue;
+          }
+          
         } else {
-          res[key] = tempObj[key];
+          res[key] = curValue;
         }
       }
       console.log("res", res);

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 展示异常。
@@ -313,15 +313,17 @@ 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 checked = showKeys.includes(key);
         // 父级全选，子级不展示
         /** String(parentId) 类型不相等 */
-        if (isLeaf && parentId && this.checkedKeys.main.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;
       });
@@ -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;
@@ -1049,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) {
@@ -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,43 @@ 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];
+        // 搜索时选中上级也要把它所有下级给选中 如果是选中一个下级但是也把其上级选中了要把上级选中给去掉
+        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 = {};
+        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);
+        });
+        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;
+      this.isAllCheck(totalCheckedKeys);
+      this.isSearchAllCheck(totalCheckedKeys);
       this.$emit('pubCheckedTreeItem', [...this.checkedTreeItem, ...this.defaultShowList]);
       this.$emit('check', [...this.checkedTreeItem, ...this.defaultShowList]);
     },

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);
+      }
+    }
+  }
+}