cnhis-design-vue 2.1.144 → 2.1.146

package/package.json

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

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

@@ -148,6 +148,12 @@ export default create({
     getProps() {
       return this.$props;
     }
+  },
+  methods: {
+    // 向外抛出vue2组件直接调用内部的方法
+    handleClickBtn() {
+      this.$refs.printComponentRef.handleClickBtn();
+    }
   }
 });
 </script>

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

@@ -31,7 +31,6 @@ import FabricGrid from './FabricGrid';
 import FabricTextGroup from './fabric-chart/FabricTextGroup';
 import FabricScaleValue from './fabric-chart/FabricScaleValue';
 import FabricLines from './fabric-chart/FabricLines';
-import { isObject } from './utils';
 
 export default create({
   name: 'fabric-chart',
@@ -50,6 +49,12 @@ export default create({
     FabricLines
   },
   computed: {
+    fabric() {
+      return this.$refs.canvasEle?.fabric;
+    },
+    canvas() {
+      return this.$refs.canvasEle?.canvas;
+    },
     polylines() {
       const list = [];
       if (this.templateData?.right?.rightYScalevalue?.dataList?.length) {
@@ -84,6 +89,10 @@ export default create({
     this.canvasWidth = `${this.templateData.canvasWidth}px` || '1000px';
   },
   methods: {
+    computedX() {
+      if (!this.$refs.polylines?.computedX) return;
+      return this.$refs.polylines?.computedX(...arguments);
+    },
     setTimeRange(enabled) {
       this.$refs.polylines.timeRangeData.enabled = enabled;
     },

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

@@ -83,7 +83,6 @@ export default {
         console.warn(error);
       }
     }
-    // if (!this.templateData.left || !this.templateData.right) {
     if (!this.templateData.left) {
       try {
         throw new Error('缺少左侧数据对象, 无法生成垂直方向刻度');

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

@@ -58,6 +58,14 @@ export default {
       this.createLine();
       this.eventStyle.evented && this.createEvent();
     },
+    isTopTreeAndGridLimit(x, y) {
+      const { endX, endYTop, originYTop } = this.propItems;
+      return x >= 0 && x <= endX && y >= originYTop && y <= endYTop;
+    },
+    isGridLimit({ x, y }) {
+      const { originX, endX, endYTop, originYTop } = this.propItems;
+      return x >= originX && x <= endX && y >= originYTop && y <= endYTop;
+    },
     createEvent() {
       this.canvas.on('mouse:up', event => {
         if (event.button === 3) {
@@ -104,25 +112,37 @@ export default {
           this.rightClickNode = Object.freeze(rightClickNode.slice());
           this.isRightVisible = true;
         } else {
-          this.doContextmenuEvent(this.activeEvent.pointer);
+          this.doContextmenuEvent(id, this.activeEvent.pointer);
         }
       });
     },
-    doContextmenuEvent(pointer) {
+    doContextmenuEvent(id, pointer) {
       const { x, y } = pointer;
       const { treeList } = this.$propItems();
       const _treeList = vexutils.clone(treeList, true);
-      let data;
+      const param = { type: 'tree', treeData: [] };
+      const isBlankGrid = !id && this.isGridLimit(pointer);
+      if (isBlankGrid) {
+        param.type = 'grid';
+        param.time = this.getXValue(x);
+        param.lineData = [];
+      }
       ergodicTree(_treeList);
-      data && this.$emit('rightClick', data);
-      data = null;
+      this.$emit('rightClick', param);
       function ergodicTree(tree) {
         for (let i = 0, len = tree.length; i < len; i++) {
-          const { left, top, width, height, children = [], origin } = tree[i];
-          if (x >= left && x <= left + width && y >= top && y <= y + height) {
-            data = origin;
-          } else if (children.length) {
-            ergodicTree(children);
+          const { left, top, width, height, children = [], origin, lineList = [] } = tree[i];
+          if (y >= top && y <= top + height) {
+            if (x >= left && x <= left + width) {
+              param.treeData = origin;
+              break;
+            } else if (children.length) {
+              ergodicTree(children);
+            } else if (isBlankGrid) {
+              param.treeData = origin;
+              param.lineData = lineList;
+              break;
+            }
           }
         }
       }

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

@@ -14,7 +14,8 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 import Bus from '../utils/bus';
-import { nearlyEqual } from '../utils';
+import { nearlyEqual, getUuid, toReversed } from '../utils';
+import vexutils from '@/utils/vexutils';
 
 /**
  * @description: 递归遍历节点，设置颜色属性
@@ -1062,7 +1063,7 @@ export default {
         if (isRight) {
           this._concatIndex = polylineObj?.pointerList.findIndex(l => l + n > left && l > originLeft);
         } else {
-          const idx = polylineObj?.pointerList.toReversed().findIndex(l => l - n < left && l < originLeft);
+          const idx = polylineObj?.pointerList?.length ? toReversed(polylineObj?.pointerList).findIndex(l => l - n < left && l < originLeft) : -1;
           this._concatIndex = !~idx ? -1 : polylineObj?.pointerList.length - 1 - idx;
         }
         if (!~this._concatIndex) {
@@ -1100,7 +1101,7 @@ export default {
       // 如果往回拖动则删除经过的已存在的节点
       if (startLength > 0) {
         if (isRight) {
-          this.removeLeftClonePoint(originLeft);
+          this.removeLeftClonePoint(originLeft - this.spaceWidth);
           this.addPointList = this.addPointList.filter(v => v.left >= originLeft);
           if (this.addPointList.length > 0 && currentLeft <= this.addPointList[this.addPointList.length - 1].left) {
             this.removePolyline('increasePointBatch', left);
@@ -1117,7 +1118,7 @@ export default {
             }
           }
         } else {
-          this.removePolyline('increasePointBatch', originLeft);
+          this.removePolyline('increasePointBatch', originLeft + this.spaceWidth);
           this.addPointList = this.addPointList.filter(v => v.left <= originLeft);
           if (this.addPointList.length > 0 && currentLeft >= this.addPointList[this.addPointList.length - 1].left) {
             this.removeLeftClonePoint(left);
@@ -1292,15 +1293,35 @@ export default {
               this.rightClickNode.push(item);
             }
           });
+          this.addExtraMenu();
           this.isRightVisible = true;
         }
       });
     },
+    addExtraMenu() {
+      const { menuList } = this.propItems.table?.extraMenuConfig || {};
+      if (Array.isArray(menuList) && menuList.length > 0) {
+        menuList.forEach(item => {
+          this.rightClickNode.push({
+            name: item.label,
+            type: item.key || getUuid(),
+            extra: true,
+            origin: item
+          });
+        });
+      }
+    },
     // 关闭右键菜单，打开添加节点弹窗表单
-    handleRightClick({ type, name }) {
+    handleRightClick({ type, name, extra, origin }) {
       this.isRightVisible = false;
       const { left, top } = this._active;
-      let data = this._currentPoint?.id ? this.getDataByPoint(this._currentPoint) : this.getValue({ left, top });
+      const data = this._currentPoint?.id ? this.getDataByPoint(this._currentPoint) : this.getValue({ left, top });
+      if (extra) {
+        const { click } = this.propItems.table?.extraMenuConfig || {};
+        if (!vexutils.isFunction(click)) return;
+        click(data, origin);
+        return;
+      }
       if (type == 'add') {
         if (name.includes('左')) {
           data.range = {

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

@@ -72,10 +72,6 @@ export default {
     isGridLimit(x, y) {
       const { originX, originY, endX, endY } = this.propItems;
       return x >= originX && x <= endX && y >= originY && y <= endY;
-    },
-    isTopTreeAndGridLimit(x, y) {
-      const { endX, endYTop, originYTop } = this.propItems;
-      return x >= 0 && x <= endX && y >= originYTop && y <= endYTop;
     }
   }
 };

package/packages/fabric-chart/src/utils/index.js

@@ -1,3 +1,5 @@
+import vexutils from '@/utils/vexutils';
+
 export const isNumber = num => {
   return typeof num === 'number' && Number.isFinite(num);
 };
@@ -87,3 +89,16 @@ export function sortByTime(list = []) {
 
   return list;
 }
+
+export function getUuid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    const r = (Math.random() * 16) | 0,
+      v = c == 'x' ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+}
+
+export function toReversed(arr) {
+  const copyArr = vexutils.clone(arr, true);
+  return copyArr.reverse();
+}

package/packages/multi-chat/chat/client/clientChat.vue

@@ -59,6 +59,9 @@ export default {
     isCustomServe: {
       type: Boolean,
       default: false
+    },
+    decrypt: {
+      type: Function
     }
   },
   computed: {
@@ -201,12 +204,21 @@ export default {
         }
       }).then(({ data }) => {
         if (data.result === 'SUCCESS') {
-          const { sdkAppId, host, vendor, wsUrl, turnUrl, turnUsername, turnCredential } = data.obj;
+          let useObj = data?.obj || {}
+          const {isEncrypt, obj} = useObj;
+          if(isEncrypt && obj && this.decrypt && typeof this.decrypt === 'function') {
+            try {
+              useObj = JSON.parse(this.decrypt(obj)) || {};
+            } catch(err) {
+              console.log(err)
+            }
+          }
+          const { sdkAppId, host, vendor, wsUrl, turnUrl, turnUsername, turnCredential } = useObj;
           this.setSdkInfo({ sdkAppId, host, vendor, wsUrl, turnUrl, turnUsername, turnCredential });
           // 江苏省
           if (vendor == 3) {
             this.initUniRTC({
-              ...data.obj,
+              ...useObj,
               params: {
                 assemblyId: this.assemblyId
               }

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

@@ -421,6 +421,9 @@ export default {
     rightPanelHide: {
       type: Boolean,
       default: false
+    },
+    decrypt: {
+      type: Function
     }
   },
   async created() {
@@ -1343,12 +1346,21 @@ export default {
         })
         .then(({ data }) => {
           if (data.result === 'SUCCESS') {
-            const { sdkAppId, host, vendor, wsUrl, turnUrl, turnUsername, turnCredential } = data.obj;
+            let useObj = data?.obj || {}
+            const {isEncrypt, obj} = useObj;
+            if(isEncrypt && obj && this.decrypt && typeof this.decrypt === 'function') {
+              try {
+                useObj = JSON.parse(this.decrypt(obj)) || {};
+              } catch(err) {
+                console.log(err)
+              }
+            }
+            const { sdkAppId, host, vendor, wsUrl, turnUrl, turnUsername, turnCredential } = useObj;
             this.setSdkInfo({ sdkAppId, host, vendor, wsUrl, turnUrl, turnUsername, turnCredential });
             // 江苏省
             if (vendor == 3) {
               this.initUniRTC({
-                ...data.obj,
+                ...useObj,
                 vueSelf: this,
                 params: {
                   assemblyId: this.assemblyId

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

@@ -61,6 +61,9 @@ export default {
     isOtherEntry: {
       type: Boolean,
       default: false
+    },
+    decrypt: {
+      type: Function
     }
   },
   data() {
@@ -187,7 +190,16 @@ export default {
         })
         .then(({ data }) => {
           if (data.result === "SUCCESS") {
-            const { vendor } = data.obj;
+            let useObj = data?.obj || {}
+            const {isEncrypt, obj} = useObj;
+            if(isEncrypt && obj && this.decrypt && typeof this.decrypt === 'function') {
+              try {
+                useObj = JSON.parse(this.decrypt(obj)) || {};
+              } catch(err) {
+                console.log(err)
+              }
+            }
+            const { vendor } = useObj;
             this.skdVender = vendor;
           }
         });