cnhis-design-vue 2.1.21 → 2.1.24

package/package.json

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

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

@@ -593,6 +593,11 @@ export default create({
     setCurrentRow(row) {
       this.$refs.xGrid.setCurrentRow(row);
     },
+    setDefCheckboxRow(row) {
+      const vxeTable = this.$refs.xGrid;
+      let { tableData } = vxeTable.getTableData();
+      this.$refs.xGrid?.setCheckboxRow([tableData?.[0] || row], true);
+    },
     // 加载表格头部
     loadColumn(config) {
       this.isLoadColumn = false;
@@ -1288,7 +1293,7 @@ export default create({
       this.fieldKeyMap = {};
       const currentColumns = fieldList.map((item, index) => {
         this.fieldKeyMap[item.columnName] = item;
-        let filterField = item?.fieldSetting?.mapping?.type === 'manual' && item.isMerge != 1;
+        let filterField = item?.fieldSetting?.mapping?.type === 'manual' && item.isMerge != 1 && item.notParticipatingSearch != 1;
         // 是否排序 1 不可排序
         let notParticipatingSort = item?.fieldSetting?.notParticipatingSort || '';
         // 有子列表fixed会遮盖 所以主表不设置fixed

package/packages/button/src/ButtonPrint/index.vue

@@ -136,7 +136,12 @@ export default create({
       default: () => ({})
     },
     // 1 为his老版，2 为新版 3为his更老版本
-    versionType: { type: [Number, String], default: '2' }
+    versionType: { type: [Number, String], default: '2' },
+    // 用于获取用户信息的token
+    token: {
+      type: String,
+      default: ''
+    }
   },
   computed: {
     currentFormatItem() {
@@ -166,14 +171,17 @@ export default create({
     };
   },
   beforeCreate() {
-    Vue.use(Button).use(Dropdown).use(Menu).use(Icon);
+    Vue.use(Button)
+      .use(Dropdown)
+      .use(Menu)
+      .use(Icon);
   },
   mounted() {
     this.isInited = false;
   },
   beforeDestroy() {
     // 创建Print实例的时候会在webview中注册一个事件, 需要调用printInstance.destroy()手动清除
-    printInstance?.destroy?.()
+    printInstance?.destroy?.();
   },
   watch: {
     // 监听变化, 重新格式化printParams
@@ -409,7 +417,10 @@ export default create({
     /*  */
     getPrintParams(index = 0) {
       const params = this.printParams[index];
-      return JSON.stringify(params);
+      return JSON.stringify({
+        ...(params || {}),
+        ...(this.token ? { token: this.token } : {})
+      });
     },
     getTemplateIdByFormatId(id) {
       let find = this.formatList.find(item => item.id === id);
@@ -460,7 +471,7 @@ export default create({
         })
         .then(() => {
           if (this.versionType == 1 || this.versionType == 3) {
-            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
+            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
             if (this.strategy === 'MULTI') {
               for (let i = 0; i < this.params.length; i++) {
                 const params = this.getHisParams(i);
@@ -529,7 +540,7 @@ export default create({
       const { templateParams, hisParams, params } = this;
       const { reportid = '280' } = hisParams;
       const { id, name } = templateParams;
-      const obj = {}
+      const obj = {};
       Object.keys(params[0]).forEach(v => {
         obj[v] = [];
         params.forEach(k => {
@@ -555,7 +566,7 @@ export default create({
         .then(() => {
           if (this.versionType == 1 || this.versionType == 3) {
             const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
-            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
+            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
             printInstance[printFn](8, params)
               .then(res => {
                 console.log(res, 88888888);
@@ -565,7 +576,7 @@ export default create({
               });
           } else {
             const IS_MULTI = this.strategy === 'MULTI';
-            if(IS_MULTI){
+            if (IS_MULTI) {
               // 循环多条
               for (let i = 0; i < this.printParams.length; i++) {
                 const queryParams = {
@@ -574,26 +585,26 @@ export default create({
                   params: this.getPrintParams(i)
                 };
                 printInstance.preview(
-              queryParams,
-              res => {
-                this.callLocalServicesSuccessCb(res, 'preview');
-              },
-              this.callLocalServicesErrorCb
-            );
+                  queryParams,
+                  res => {
+                    this.callLocalServicesSuccessCb(res, 'preview');
+                  },
+                  this.callLocalServicesErrorCb
+                );
               }
             } else {
-           const queryParams = {
-              formatId: this.currentFormatId,
-              templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-              params: this.getOnceParams()
-            };
-            printInstance.preview(
-              queryParams,
-              res => {
-                this.callLocalServicesSuccessCb(res, 'preview');
-              },
-              this.callLocalServicesErrorCb
-            );
+              const queryParams = {
+                formatId: this.currentFormatId,
+                templateId: this.getTemplateIdByFormatId(this.currentFormatId),
+                params: this.getOnceParams()
+              };
+              printInstance.preview(
+                queryParams,
+                res => {
+                  this.callLocalServicesSuccessCb(res, 'preview');
+                },
+                this.callLocalServicesErrorCb
+              );
             }
           }
         })
@@ -612,7 +623,7 @@ export default create({
         .then(() => {
           if (this.versionType == 1 || this.versionType == 3) {
             const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
-            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
+            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
             printInstance[printFn](9, params)
               .then(res => {
                 console.log(res, 999999);
@@ -669,12 +680,12 @@ export default create({
     /**
      * 获取 axios 自定义配置
      */
-    getCustomCofing(customCofing){
-      let cCofing = {}
+    getCustomCofing(customCofing) {
+      let cCofing = {};
       let type = typeof customCofing;
-      if(type === 'function'){
+      if (type === 'function') {
         cCofing = customCofing();
-      } else if(type === 'object'){
+      } else if (type === 'object') {
         cCofing = customCofing;
       }
       return cCofing;

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

@@ -14,6 +14,32 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 
+/**
+ * @description: 递归遍历节点，设置颜色属性
+ * @param {fabric.Object[]} pointArr
+ * @param {string}} color
+ * @return {*}
+ */
+
+function resetPointColor(pointArr, color) {
+  pointArr.forEach(point => {
+    const { fill, stroke } = point;
+    if (fill && !fill.includes('#fff') && fill !== 'transparent') {
+      point.set({ fill: color });
+    }
+    if (stroke && !stroke.includes('#fff') && stroke !== 'transparent') {
+      point.set({ stroke: color });
+    }
+    if (point._objects?.length) {
+      resetPointColor(point._objects, color);
+    }
+  });
+}
+const setPointLineColor = (point, color, conditionHasLine2) => {
+  point.line1?.set({ stroke: color });
+  conditionHasLine2 && point.line2?.set({ stroke: color });
+};
+
 const isEffectiveNode = node => {
   return node?.time && (node?.value || node?.value === 0);
 };
@@ -470,13 +496,7 @@ export default {
             polylineTypeId,
             polylineIndex,
             pointerList,
-            pointStyle: {
-              fill: res[0].fill,
-              stroke: res[0].stroke
-            },
-            lineStyle: {
-              stroke: lineAttr.stroke
-            },
+            color: lineAttr.stroke,
             pointList: res
           });
         }
@@ -583,13 +603,18 @@ export default {
         const position = this.polyline[point.polylineTypeId].position;
         // 如果是重合/连线节点
         if (point.get('scaleX') !== point.scale) {
-          this.addPointList.splice(-1, 1, {
+          const addOjb = {
             ...lastPoint,
             value: {
               time: this.getXValue(this._concatPoint?.left),
               value: this.getYValue(position, this._concatPoint?.top)
             }
-          });
+          };
+          if (lastPoint.value.time == addOjb.value.time) {
+            this.addPointList.splice(-1, 1, addOjb);
+          } else {
+            this.addPointList.push(addOjb);
+          }
           this.addPointList.forEach(v => Object.assign(v, { isConcat: true, concatIndex: this._concatIndex }));
         } else if (point.line2 || (point.nextPoint && lastPoint.left >= point.nextPoint.left)) {
           // 1、存在右连线 2、无右侧连线，并且存在下一个节点的情况
@@ -679,13 +704,7 @@ export default {
         // 复制点和线
         if (conditionNoLine2 || conditionHasLine2) {
           // point.line1 && this.removePolyline(point.line1.id);
-          point.line1?.set({
-            stroke: 'transparent'
-          });
-          conditionHasLine2 &&
-            point.line2?.set({
-              stroke: 'transparent'
-            });
+          setPointLineColor(point, 'transparent', conditionHasLine2);
           // if (i === 1) {
           this.addPointList.length == 0 && (await this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]));
           // }
@@ -725,10 +744,10 @@ export default {
       }
 
       // 检查是否显示重合连线放大节点的标识
-      // if (conditionHasLine2) {
+      const { polylineTypeId, polylineIndex } = point;
+      const polylineObj = this.polylinePointList.find(v => v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex);
+      polylineObj?.pointList.forEach(v => v.bringToFront());
       if (point.nextPoint) {
-        const { polylineTypeId, polylineIndex } = point;
-        const polylineObj = this.polylinePointList.find(v => v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex);
         this._concatIndex = polylineObj?.pointerList.findIndex(v => v + n > left && v > originLeft);
         if (!~this._concatIndex) {
           point.set({
@@ -739,41 +758,33 @@ export default {
           concatPoint(polylineObj?.pointList[this._concatIndex]);
         }
         this._concatPoint = polylineObj?.pointList?.[this._concatIndex] || null;
+
+        // 被覆盖节点置灰配置
         polylineObj?.pointerList.forEach((v, i) => {
           const obj = polylineObj?.pointList[i];
           if (v > originLeft && v < left) {
-            const { fill, stroke } = polylineObj.pointStyle;
-            const setColor = color => {
-              return color && (color !== '#fff' || color !== 'transparent') ? '#999' : color;
-            };
             // 此处需要递归遍历group节点的所有子节点，然后更改其颜色
-            // 待完善
-            obj.set({ fill: setColor(fill), stroke: setColor(stroke) });
-            // obj.line2?.set({ fill: setColor(fill), stroke: setColor(stroke) });
+            resetPointColor([obj], '#999');
+            obj.line2?.set({ stroke: '#999' });
           } else {
-            obj.set(polylineObj.pointStyle);
-            // obj.line2?.set(polylineObj.lineStyle);
+            resetPointColor([obj], polylineObj.color);
+            obj.line2?.set({ stroke: polylineObj.color });
           }
         });
+        if ((point.line1 || point.line2) && left < originLeft + spaceWidth) {
+          setPointLineColor(point, polylineObj.color, true);
+        } else {
+          setPointLineColor(point, 'transparent', true);
+        }
       }
 
-      // } else {
-      //   point.nextPoint && concatPoint(point.nextPoint);
-      // }
-
       // 如果往回拖动则删除经过的已存在的节点
       if (startLength > 0 && currentLeft <= this.addPointList[startLength - 1].left) {
         this.removePolyline('increasePointBatch', left);
         this.addPointList = this.addPointList.filter(v => v.left < left);
         const endLength = this.addPointList.length;
         if (endLength === 0) {
-          point.line1?.set({
-            stroke: point.stroke
-          });
-          conditionHasLine2 &&
-            point.line2?.set({
-              stroke: point.stroke
-            });
+          setPointLineColor(point, polylineObj?.color, conditionHasLine2);
           this.removePolyline('increasePointBatch', originLeft);
         }
         if (endLength > 0) {

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

@@ -44,7 +44,7 @@
             checkable
             :expandedKeys="expandedKeys"
             :autoExpandParent="autoExpandParent"
-            :checkStrictly="false"
+            :checkStrictly="checkStrictly"
             :selectable="false"
             :treeData="treeData.temp"
             :load-data="getLoadChildData"
@@ -209,6 +209,14 @@ export default create({
       type: Boolean,
       default: false
     },
+    checkStrictly: {
+      type: Boolean,
+      default: false
+    },
+    needFilterParentDept: {
+      type: Boolean,
+      default: true
+    },
     queryMainTreeData: Function, // 主树请求
     queryLoadChildData: Function, // 懒加载请求
     queryTreeSearch: Function // 检索请求
@@ -331,9 +339,14 @@ export default create({
         let { key } = item;
         let showKeys = [...this.checkedKeys.dept, ...otherItems];
         let checked = showKeys.includes(key);
-        // 只展示最后一级的科室
         item.itemType = 'dept';
-        return checked && item.type == 1 && (!item.children || (item.children && !item.children.length));
+        // 只展示最后一级的科室
+        if (this.needFilterParentDept) {
+          return checked && item.type == 1 && (!item.children || (item.children && !item.children.length));
+        } else {
+          // 不过滤
+          return checked && item.type == 1;
+        }
       });
       let roleItems = this.dataList.role.filter(item => {
         let showKeys = [...this.checkedKeys.role, ...otherItems];
@@ -430,6 +443,7 @@ export default create({
           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];
+          console.log(deptIds, key, '666 init');
           this.checkedKeys.main = userIds;
           this.checkedKeys.dept = deptIds;
           this.checkedKeys.role = roleIds;
@@ -451,7 +465,8 @@ export default create({
     },
     getDeptData(data) {
       // 把data里面的人员过滤掉
-      const copyData = JSON.parse(JSON.stringify(data));
+      let copyData = JSON.parse(JSON.stringify(data));
+      copyData = copyData.filter(item => item.type === 1);
       vexutils.searchTree(copyData, item => {
         if (item.type === 1 && item.children && item.children.length) {
           item.children = item.children.filter(child => child.type === 1);
@@ -1319,6 +1334,9 @@ export default create({
       this.isAllCheck(checkedKeys);
     },
     onTreeCheck(checkedKeys, { checked, node }) {
+      if (this.checkStrictly) {
+        checkedKeys = checkedKeys.checked;
+      }
       // 断掉了父子关系 要不然当存在一二级科室的时候 搜索二级科室 再选中会把一级也选中 ； 后续与产品沟通 不需要断 只取最后一级科室
       const propStr = ['main', 'dept', 'role'][this.typeActiveIndex];
       let totalCheckedKeys = [];
@@ -1353,8 +1371,9 @@ export default create({
         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));
+        // const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey).filter(Boolean);
+        // totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys, childKeys))].filter(id => !allParentIds.includes(id));
+        totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys, childKeys))];
       } else {
         // 如果是取消从之前的选择中把当前点击的及其子级去除选中作为temp值（兼容搜索的情况）
         let keyData = {};
@@ -1369,7 +1388,10 @@ export default create({
           needCancelKeys.push(item.key);
         });
         const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey).filter(Boolean);
-        totalCheckedKeys = [...new Set(preChecked.filter(key => !needCancelKeys.includes(key)))].filter(id => !allParentIds.includes(id));
+        totalCheckedKeys = [...new Set(preChecked.filter(key => !needCancelKeys.includes(key)))];
+        if (!this.checkStrictly) {
+          totalCheckedKeys = totalCheckedKeys.filter(id => !allParentIds.includes(id));
+        }
       }
       this.checkedKeys.temp = totalCheckedKeys;
       this.checkedKeys[propStr] = totalCheckedKeys;