cnhis-design-vue 2.1.40 → 2.1.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.40",
+  "version": "2.1.42",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -37,7 +37,7 @@
   "dependencies": {
     "core-js": "^3.6.5",
     "crypto-js": "^4.0.0",
-    "fabric": "^4.4.0",
+    "fabric": "4.5.1",
     "moment": "^2.29.1",
     "recorder-core": "^1.1.21080800",
     "socket.io-client": "^2.4.0",

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

@@ -640,7 +640,7 @@ export default create({
 
       if (!xGrid) return;
 
-      Promise.all([xGrid.loadData(list), xGrid.reloadColumn(columns)]).then(() => {
+      Promise.all([xGrid.reloadColumn(columns), xGrid.reloadData(list),]).then(() => {
         console.log('列表加载完成');
         this.setGroupTitleToFristColumnFieldData(list);
         this.setGroupTreeExpand();

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

@@ -141,6 +141,24 @@ export default create({
     token: {
       type: String,
       default: ''
+    },
+    // 打印弹窗设置，1弹0不弹，默认不弹
+    printdlgshow: {
+      type: [String, Number],
+      default: '0'
+    },
+    // 没有模板提示
+    noformatTips:{
+      type: String,
+      default: ''
+    },
+
+    getOnceParamsAfter:{
+      type: Function
+    },
+
+    getPrintParamsAfter:{
+      type: Function
     }
   },
   computed: {
@@ -151,6 +169,9 @@ export default create({
     },
     formatTitle() {
       return this.currentFormatItem?.name || '格式选择';
+    },
+    printExtraParams(){
+    return  this?.printConfig?.printExtraParams || {};
     }
   },
   data() {
@@ -257,7 +278,7 @@ export default create({
       this.currentFormatId = this.getDefaultFormatId(this.formatList, 'defaultFlag');
 
       if (!this.currentFormatId) {
-        this.$message.error('获取打印格式失败，请联系管理员！');
+        this.$message.error(this.noformatTips ||'获取打印格式失败，请联系管理员！');
         return this.requestError();
       }
       if (!this.currentFormatId) {
@@ -363,6 +384,9 @@ export default create({
       if (i.type === 'DATETIME') {
         tVal = tableVal ? moment(tableVal).format('YYYY-MM-DD HH:mm:ss') : '';
       }
+      if(i.type === 'TEXT'){
+        tVal = String(tableVal) || ''
+      }
 
       return val ? val : tVal;
     },
@@ -416,11 +440,18 @@ export default create({
     },
     /*  */
     getPrintParams(index = 0) {
-      const params = this.printParams[index];
-      return JSON.stringify({
+      const params = this?.printParams?.[index] || {};
+      const extraParams = this?.printExtraParams || {};
+      let res = {
         ...(params || {}),
-        ...(this.token ? { token: this.token } : {})
-      });
+        ...(this.token ? { token: this.token } : {}),
+        ...extraParams
+      }
+      if(typeof this.getPrintParamsAfter === 'function'){
+        let t = this.getPrintParamsAfter(res);
+        return t || res;
+      }
+      return JSON.stringify(res);
     },
     getTemplateIdByFormatId(id) {
       let find = this.formatList.find(item => item.id === id);
@@ -430,9 +461,10 @@ export default create({
       // 聚合一条
       let params = {};
       let obj = {};
+      let cur = this.printParams?.[0] || {}
       if (this.templateParams?.customizeDataset?.length) {
         // 有模板数据
-        const key = Object.keys(this.printParams[0]?.datasetData || {})?.[0] || '';
+        const key = Object.keys(cur?.datasetData || {})?.[0] || '';
         const datasetDataKeyVal = JSON.stringify(this.printParams.map(v => JSON.parse(v.datasetData[key])));
         obj = {
           datasetData: {}
@@ -440,7 +472,7 @@ export default create({
         obj.datasetData[key] = datasetDataKeyVal;
       } else {
         // 无模板数据
-        Object.keys(this.printParams[0]).forEach(v => {
+        Object.keys(cur).forEach(v => {
           obj[v] = [];
           this.printParams.forEach(k => {
             obj[v].push(k[v]);
@@ -449,6 +481,10 @@ export default create({
         });
       }
       params = Object.assign({}, JSON.parse(this.getPrintParams(0)), obj);
+      if(typeof this.getOnceParamsAfter === 'function'){
+        let res = this.getOnceParamsAfter(params,obj);
+        return res || params;
+      }
       return JSON.stringify(params);
     },
     handleClickPrint(e) {
@@ -500,7 +536,8 @@ export default create({
                 const queryParams = {
                   formatId: this.currentFormatId,
                   templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                  params: this.getPrintParams(i)
+                  params: this.getPrintParams(i),
+                  printdlgshow: this.printdlgshow
                 };
                 printInstance.printDirect(queryParams, callLocalServicesSuccessCb, this.callLocalServicesErrorCb);
               }
@@ -509,7 +546,8 @@ export default create({
               const queryParams = {
                 formatId: this.currentFormatId,
                 templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                params: this.getOnceParams()
+                params: this.getOnceParams(),
+                printdlgshow: this.printdlgshow
               };
               printInstance.printDirect(
                 queryParams,

package/packages/fabric-chart/src/const/defaultVaule.js

@@ -1,59 +1,59 @@
-const data = {
-  style: {
-    evented: false,
-    selectable: false
-  },
-  rectStyle: {
-    fill: 'transparent',
-    stroke: '#999',
-    strokeWidth: 1
-  },
-  textStyle: {
-    fontFamily: '微软雅黑',
-    fontSize: 12,
-    fill: '#000',
-    lineHeight: 1
-  },
-  borderStyle: {
-    stroke: '#999',
-    strokeWidth: 1,
-    selectable: false,
-    evented: false
-  },
-  // 折线图中的点
-  pointStyle: {
-    fill: '#ffffff', // 填充色
-    stroke: '#000000', // 描边色
-    originX: 'center',
-    originY: 'center'
-  },
-  // 折线图中的线
-  lineStyle: {
-    stroke: '#000', // 描边色
-    strokeWidth: 1, // 描边宽度
-    originX: 'center',
-    originY: 'center'
-  },
-  topSpaceHeight: 10, // templateData.top.spaceHeight
-  topSpaceGridNumber: 3, // templateData.top.xScalevalue.spaceGridNumber
-  leftSpaceGridNumber: 2, // templateData.left.leftYScalevalue.spaceGridNumber
-  rightSpaceGridNumber: 2, // templateData.right.rightYScalevalue.spaceGridNumber
-  topTotal: {
-    title: '总量',
-    width: 0,
-    style: {
-      fontFamily: '微软雅黑',
-      fontSize: 12,
-      fill: '#000',
-      lineHeight: 1
-    }
-  },
-  criticalStyle: { // 危急值样式
-    stroke: 'purple', // 颜色 默认 #999
-    strokeWidth: 1, // 线宽 默认 1
-    strokeDashArray: [0, 0] // 实线设置 默认[0, 0]
-  },
-  bottomNumberLeftSpace: 10 // 底部标记的序号与标记之间的距离
-};
-
-export default data;
+const data = {
+  style: {
+    evented: false,
+    selectable: false
+  },
+  rectStyle: {
+    fill: 'transparent',
+    stroke: '#999',
+    strokeWidth: 1
+  },
+  textStyle: {
+    fontFamily: '微软雅黑',
+    fontSize: 12,
+    fill: '#000',
+    lineHeight: 1
+  },
+  borderStyle: {
+    stroke: '#999',
+    strokeWidth: 1,
+    selectable: false,
+    evented: false
+  },
+  // 折线图中的点
+  pointStyle: {
+    fill: '#ffffff', // 填充色
+    stroke: '#000000', // 描边色
+    originX: 'center',
+    originY: 'center'
+  },
+  // 折线图中的线
+  lineStyle: {
+    stroke: '#000', // 描边色
+    strokeWidth: 1, // 描边宽度
+    originX: 'center',
+    originY: 'center'
+  },
+  topSpaceHeight: 10, // templateData.top.spaceHeight
+  topSpaceGridNumber: 3, // templateData.top.xScalevalue.spaceGridNumber
+  leftSpaceGridNumber: 2, // templateData.left.leftYScalevalue.spaceGridNumber
+  rightSpaceGridNumber: 2, // templateData.right.rightYScalevalue.spaceGridNumber
+  topTotal: {
+    title: '总量',
+    width: 0,
+    style: {
+      fontFamily: '微软雅黑',
+      fontSize: 12,
+      fill: '#000',
+      lineHeight: 1
+    }
+  },
+  criticalStyle: { // 危急值样式
+    stroke: 'purple', // 颜色 默认 #999
+    strokeWidth: 1, // 线宽 默认 1
+    strokeDashArray: [0, 0] // 实线设置 默认[0, 0]
+  },
+  bottomNumberLeftSpace: 10 // 底部标记的序号与标记之间的距离
+};
+
+export default data;

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

@@ -90,6 +90,13 @@ export default {
   computed: {
     eventStyle() {
       return this.propItems.eventStyle;
+    },
+    spaceWidth() {
+      const { xCellWidth, table } = this.propItems;
+      // const addPointSpaceGridNumbers = table.addPointSpaceGridNumbers || [];
+      let addPointSpaceGridNumber = table.addPointSpaceGridNumber || 1;
+      const spaceWidth = xCellWidth * addPointSpaceGridNumber;
+      return spaceWidth;
     }
   },
 
@@ -677,75 +684,74 @@ export default {
         }
       }
     },
+    // 检查批量新增拖动过程中是否存在漏点的情况
+    checkPoints(point) {
+      const { originLeft, originTop, left, polylineTypeId } = point;
+      const PointLens = Math.floor((left - originLeft) / this.spaceWidth);
+      if (PointLens > 1 && this.addPointList?.length <= PointLens) {
+        const position = this.polyline[polylineTypeId].position;
+        for (let k = 0; k <= PointLens; k++) {
+          if (k > 0) {
+            const curLeft = originLeft + this.spaceWidth * k;
+            // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
+            const hasPoint = this.addPointList.some(p => Math.abs(p.left - curLeft) <= 0.001);
+            // const hasPoint = this.addPointList.some(v => v.left == curLeft);
+            if (!hasPoint) {
+              let index;
+              const pointObj = this.addPointList.find((v, i) => {
+                if (v.left > curLeft) {
+                  index = i;
+                }
+                return v.left > curLeft;
+              });
+              if (pointObj) {
+                let cloneObj = JSON.parse(JSON.stringify(pointObj));
+                const prePoint = this.addPointList[index - 1] || {
+                  left: originLeft,
+                  top: originTop
+                };
+                const len = ~~((pointObj.left - (curLeft - this.spaceWidth)) / this.spaceWidth);
+                const spaceHeight = (pointObj.top - prePoint.top) / len;
+                cloneObj.top = prePoint.top + spaceHeight;
+                cloneObj.value.time = this.getXValue(curLeft);
+                cloneObj.value.value = this.getYValue(position, cloneObj.top);
+                cloneObj.left = curLeft;
+                this.addPointList.splice(index, 0, cloneObj);
+                this.clonePoint(point, [prePoint.left, prePoint.top, cloneObj.left, cloneObj.top]);
+              }
+            }
+          }
+        }
+      }
+      // 纠正节点上的line1的坐标
+      this.setLinePatch(point);
+    },
     /**
      * @description: 拖动批量新增节点
      * @param {*} point 拖动的最后一个节点
      * @return {*}
      */
     addPoint(point) {
-      const { xCellWidth, table, originX } = this.propItems;
-      // const addPointSpaceGridNumbers = table.addPointSpaceGridNumbers || [];
-      let addPointSpaceGridNumber = table.addPointSpaceGridNumber || 1;
-
       let { left, top, originLeft, originTop } = point;
       const currentLeft = left;
 
       const startLength = this.addPointList.length;
       const n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
-      const spaceWidth = xCellWidth * addPointSpaceGridNumber;
-      const residue = (left - originLeft) % spaceWidth;
+      const residue = (left - originLeft) % this.spaceWidth;
 
-      const condition = residue > 0 && (residue > spaceWidth - n || residue < n);
+      const condition = residue > 0 && (residue > this.spaceWidth - n || residue < n);
       const conditionNoLine2 = !point.line2 && left > originLeft;
-      const conditionHasLine2 = point.line2 && left > originLeft + spaceWidth;
+      const conditionHasLine2 = point.line2 && left > originLeft + this.spaceWidth;
 
       // if (!point.line2 && left > originLeft && condition) {
       if (condition && (conditionNoLine2 || conditionHasLine2)) {
-        if (residue > spaceWidth - n) left = left - residue + spaceWidth;
+        if (residue > this.spaceWidth - n) left = left - residue + this.spaceWidth;
         if (residue < n) left = left - residue;
         point.set({
           left
         });
 
-        const checkPoints = () => {
-          const PointLens = Math.floor((left - originLeft) / spaceWidth);
-          if (PointLens > 1 && this.addPointList?.length <= PointLens) {
-            for (let k = 0; k <= PointLens; k++) {
-              if (k > 0) {
-                const curLeft = originLeft + spaceWidth * k;
-                // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
-                const hasPoint = this.addPointList.some(p => Math.abs(p.left - curLeft) <= 0.001);
-                // const hasPoint = this.addPointList.some(v => v.left == curLeft);
-                if (!hasPoint) {
-                  let index;
-                  const pointObj = this.addPointList.find((v, i) => {
-                    if (v.left > curLeft) {
-                      index = i;
-                    }
-                    return v.left > curLeft;
-                  });
-                  if (pointObj) {
-                    let cloneObj = JSON.parse(JSON.stringify(pointObj));
-                    const len = ~~((pointObj.left - (curLeft - spaceWidth)) / spaceWidth);
-                    const prePoint = this.addPointList[index - 1] || pointObj;
-                    const spaceHeight = (pointObj.top - prePoint.top) / len;
-                    const position = this.polyline[point.polylineTypeId].position;
-                    cloneObj.top = prePoint.top + spaceHeight;
-                    cloneObj.value.time = this.getXValue(curLeft);
-                    cloneObj.value.value = this.getYValue(position, cloneObj.top);
-                    cloneObj.left = curLeft;
-                    this.addPointList.splice(index, 0, cloneObj);
-                    this.clonePoint(point, [prePoint.left, prePoint.top, cloneObj.left, cloneObj.top]);
-                  }
-                }
-              }
-            }
-          }
-          // 纠正节点上的line1的坐标
-          this.setLinePatch(point);
-        };
-
-        // const i = Math.floor((left - originLeft) / spaceWidth);
+        // const i = Math.floor((left - originLeft) / this.spaceWidth);
         // 复制点和线
         if (conditionNoLine2 || conditionHasLine2) {
           // point.line1 && this.removePolyline(point.line1.id);
@@ -768,7 +774,7 @@ export default {
               }
             }
           }
-          checkPoints();
+          this.checkPoints(point);
         }
       }
 
@@ -819,7 +825,7 @@ export default {
             obj.line2?.set({ stroke: polylineObj.color });
           }
         });
-        if ((point.line1 || point.line2) && left < originLeft + spaceWidth) {
+        if ((point.line1 || point.line2) && left < originLeft + this.spaceWidth) {
           setPointLineColor(point, polylineObj.color, true);
         } else {
           setPointLineColor(point, 'transparent', true);

package/packages/multi-chat/store/actions.js

@@ -380,10 +380,10 @@ export default {
       const paramsData = {
         clientType: '1',
         deviceToken: uniRTC.deviceToken,
-        // appId: uniAppId,
-        // secretKey: uniSecretKey
-        appId: 'hangchuang', // 测试（9997）账号
-        secretKey: 'hangchuang' // // 测试（9997）秘钥
+        appId: uniAppId,
+        secretKey: uniSecretKey
+        // appId: 'hangchuang', // 测试（9997）账号
+        // secretKey: 'hangchuang' // // 测试（9997）秘钥
       };
       try {
         const { data } = await fetch.get('/chat/access/getMediaAuthSign', { params: paramsData });
@@ -396,8 +396,8 @@ export default {
         return;
       }
     };
-    // uniRTC = new UniRTCObject(uniAppId, getLoginToken);
-    uniRTC = new UniRTCObject('hangchuang', getLoginToken, vueSelf);
+    uniRTC = new UniRTCObject(uniAppId, getLoginToken, vueSelf);
+    // uniRTC = new UniRTCObject('hangchuang', getLoginToken, vueSelf); // 测试环境
     console.log('uniRTC', uniRTC);
     uniRTC.onCallComing = incoming => {
       commit("setIncoming", incoming);