cnhis-design-vue 2.1.144 → 2.1.145

package/package.json

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

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/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 } from '../utils';
+import vexutils from '@/utils/vexutils';
 
 /**
  * @description: 递归遍历节点，设置颜色属性
@@ -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/utils/index.js

@@ -87,3 +87,11 @@ 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);
+  });
+}

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