cnhis-design-vue 2.1.143 → 2.1.145

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

@@ -8,16 +8,16 @@
           </a-menu-item>
         </a-sub-menu>
         <a-menu-divider />
-        <a-menu-item @click="e => handleClickPrint(e)">
+        <a-menu-item @click="e => handleClickPrint(e)" v-if="!hideButtons.includes('printText')">
           {{ printText }}
         </a-menu-item>
-        <a-menu-item @click="e => handleClickPreview(e)">
+        <a-menu-item @click="e => handleClickPreview(e)" v-if="!hideButtons.includes('previewText')">
           {{ previewText }}
         </a-menu-item>
-        <a-menu-item @click="e => handleClickPdf(e)">
+        <a-menu-item @click="e => handleClickPdf(e)" v-if="isShowDownloadPdf">
           {{ pdfLoadText }}
         </a-menu-item>
-        <a-menu-item @click="e => handleClickEdit(e)">
+        <a-menu-item @click="e => handleClickEdit(e)" v-if="isShowFormatEditText">
           {{ formatEditText }}
         </a-menu-item>
       </a-menu>
@@ -59,6 +59,8 @@ import axios from 'axios';
 import moment from 'moment';
 import vexutils from '@/utils/vexutils';
 
+const downloadPdfCode = 'RY7.2.21.1.M2.G94181E';
+const formatEditTextCode = 'RY7.2.21.1.M2.G33633A';
 export default create({
   name: 'button-print',
   components: {
@@ -165,6 +167,11 @@ export default create({
 
     getPrintParamsAfter: {
       type: Function
+    },
+    // 隐藏默认按钮配置。printText: 直接打印；previewText: 打印预览；downloadPdf：下载pdf；formatEditText：格式编辑。示例：hideButtons = ['formatEditText']
+    hideButtons: {
+      type: Array,
+      default: () => []
     }
   },
   computed: {
@@ -184,6 +191,18 @@ export default create({
         formatId: this.currentFormatId,
         templateId: this.getTemplateIdByFormatId(this.currentFormatId)
       };
+    },
+    // 展示下载pdf按钮
+    isShowDownloadPdf() {
+      const isShow = !this.hideButtons.includes('downloadPdf');
+      const settingShow = this.isShowOperation(downloadPdfCode);
+      return isShow && settingShow;
+    },
+    // 展示格式编辑按钮
+    isShowFormatEditText() {
+      const isShow = !this.hideButtons.includes('formatEditText');
+      const settingShow = this.isShowOperation(formatEditTextCode);
+      return isShow && settingShow;
     }
   },
   data() {
@@ -232,6 +251,16 @@ export default create({
     // getPopupContainer(triggerNode) {
     //   return triggerNode.parentNode;
     // },
+    isShowOperation(code) {
+      const portalStr = sessionStorage.getItem('portal');
+      if (portalStr) {
+        const portal = JSON.parse(portalStr);
+        const limitObj = portal?.user?.currentRoleResourceObj || {};
+        const limitList = Object.keys(limitObj);
+        return limitList.includes(code)
+      }
+      return true;
+    },
     handleClickOutside() {
       this.visible = false;
     },

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: 递归遍历节点，设置颜色属性
@@ -37,10 +38,17 @@ function resetPointColor(pointArr, color) {
     }
   });
 }
-const setPointLineColor = (point, color, conditionHasLine2) => {
-  const line1Color = color === 'transparent' ? color : point.prevPoint?.__attrs?.lineAttr?.stroke || color;
-  point.line1?.set({ stroke: line1Color });
-  conditionHasLine2 && point.line2?.set({ stroke: color });
+const setPointLineColor = (point, color, isRight) => {
+  const lineColor = color === 'transparent' ? color : isRight ? point.prevPoint?.__attrs?.lineAttr?.stroke || color : color;
+  if (isRight) {
+    point.line1?.set({ stroke: lineColor });
+    point.line2?.set({ stroke: color });
+  } else {
+    point.line2?.set({ stroke: lineColor });
+    point.line1?.set({ stroke: color });
+  }
+  // point.line2?.set({ stroke: color });
+  // conditionHasLine && point.line2?.set({ stroke: color });
 };
 
 const isEffectiveNode = node => {
@@ -833,6 +841,7 @@ export default {
         const lastPoint = this.addPointList[this.addPointList.length - 1];
         const position = this.polyline[point.polylineTypeId].position;
         const [firstPoint] = this.addPointList;
+        const isRight = lastPoint.left > point.originLeft;
         // 如果是重合/连线节点
         if (point.get('scaleX') !== point.scale) {
           const addOjb = {
@@ -848,17 +857,35 @@ export default {
           } 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)) {
+          if (!isRight) {
+            this.addPointList.unshift({
+              ...firstPoint,
+              value: {
+                time: this.getXValue(point.originLeft),
+                value: this.getYValue(position, point.originTop),
+                ...(point.__attrs?.key ? { key: point.__attrs.key } : {})
+              }
+            });
+          }
+
+          this.addPointList.forEach(v =>
+            Object.assign(v, { isConcat: true, concatIndex: isRight ? this._concatIndex : point.pointIndex, pointIndex: isRight ? point.pointIndex : this._concatPoint.pointIndex })
+          );
+        } else if (!isRight || (isRight && (point.line2 || (point.nextPoint && lastPoint.left >= point.nextPoint.left)))) {
           // 1、存在右连线 2、无右侧连线，并且存在下一个节点的情况
           this.addPointList = [];
           this.repaintPolyline(position, point.polylineIndex);
           return;
         }
-        !point.line2 && firstPoint.left <= point.originLeft && this.addPointList.splice(0, 1);
         !point.id.includes('isTitle') && this.removePolyline(point.id);
+        if (isRight && !point.line2 && firstPoint.left <= point.originLeft) {
+          this.addPointList.splice(0, 1);
+        }
+        if (!isRight) {
+          this.addPointList.splice(-1, 1);
+        }
         if (this.addPointList.length > 0) {
-          this.$emit('pointOperation', 'increasePointBatch', this.addPointList);
+          this.$emit('pointOperation', 'increasePointBatch', isRight ? this.addPointList : this.addPointList.reverse());
           this.addPointList = [];
         } else {
           this.repaintPolyline(position, point.polylineIndex);
@@ -875,41 +902,59 @@ export default {
       this.addPointList.push(data);
     },
     // 纠正线段坐标
-    setLinePatch(point) {
+    setLinePatch(point, isRight) {
       const { originLeft, originTop } = point;
       for (let i = 0, len = this.addPointList.length; i < len; i++) {
         const currentPoint = this.addPointList[i];
         const prevPoint = this.addPointList[i - 1] || { left: point.prePoint?.left ?? originLeft, top: point.prePoint?.top ?? originTop };
         const currentPointObj = this.addPointObjList.find(obj => nearlyEqual(obj.left, currentPoint.left));
-        if (!nearlyEqual(currentPointObj?.line1?.x1, prevPoint.left)) {
-          currentPointObj?.line1?.set({
-            x1: prevPoint.left,
-            y1: prevPoint.top,
-            x2: currentPoint.left,
-            y2: currentPoint.top
-          });
+        if (isRight) {
+          if (!nearlyEqual(currentPointObj?.line1?.x1, prevPoint.left)) {
+            currentPointObj?.line1?.set({
+              x1: prevPoint.left,
+              y1: prevPoint.top,
+              x2: currentPoint.left,
+              y2: currentPoint.top
+            });
+          }
+        } else {
+          if (!nearlyEqual(currentPointObj?.line2?.x2, prevPoint.left)) {
+            currentPointObj?.line1?.set({
+              x1: currentPoint.left,
+              y1: currentPoint.top,
+              x2: prevPoint.left,
+              y2: prevPoint.top
+            });
+          }
         }
       }
     },
     // 检查批量新增拖动过程中是否存在漏点的情况
-    checkPoints(point) {
+    checkPoints(point, isRight) {
       const { originLeft, originTop, left, polylineTypeId } = point;
-      const PointLens = Math.floor((left - originLeft) / this.spaceWidth);
+      const PointLens = Math.floor(Math.abs(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;
+            const spaceWidth = this.spaceWidth * k;
+            const curLeft = isRight ? originLeft + spaceWidth : originLeft - spaceWidth;
             // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
             const hasPoint = this.addPointList.some(p => nearlyEqual(p.left, curLeft));
-            // 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;
+                if (isRight) {
+                  if (v.left > curLeft) {
+                    index = i;
+                  }
+                  return v.left > curLeft;
+                } else {
+                  if (v.left < curLeft) {
+                    index = i;
+                  }
+                  return v.left < curLeft;
                 }
-                return v.left > curLeft;
               });
               if (pointObj) {
                 let cloneObj = JSON.parse(JSON.stringify(pointObj));
@@ -917,7 +962,7 @@ export default {
                   left: originLeft,
                   top: originTop
                 };
-                const len = ~~((pointObj.left - (curLeft - this.spaceWidth)) / this.spaceWidth);
+                const len = ~~(Math.abs(pointObj.left - curLeft) / this.spaceWidth) + 1;
                 const spaceHeight = (pointObj.top - prePoint.top) / len;
                 cloneObj.top = prePoint.top + spaceHeight;
                 cloneObj.value.time = this.getXValue(curLeft);
@@ -925,14 +970,32 @@ export default {
                 if (point.__attrs.key) cloneObj.value.key = point.__attrs.key;
                 cloneObj.left = curLeft;
                 this.addPointList.splice(index, 0, cloneObj);
-                this.clonePoint(point, [prePoint.left, prePoint.top, cloneObj.left, cloneObj.top]);
+                this.clonePoint(point, [prePoint.left, prePoint.top, cloneObj.left, cloneObj.top], isRight);
               }
             }
           }
         }
       }
       // 纠正节点上的line1的坐标
-      this.setLinePatch(point);
+      this.setLinePatch(point, isRight);
+    },
+    // 断点相连
+    concatPoint(point, target, left, top, n) {
+      const { left: targetLeft, top: targetTop } = target;
+      point.setCoords();
+      if (Math.abs(left - targetLeft) <= n && Math.abs(top - targetTop) <= n) {
+        point.set({
+          left: targetLeft,
+          top: targetTop,
+          scaleX: point.scale === 1 ? 2.5 : 0.1,
+          scaleY: point.scale === 1 ? 2.5 : 0.1
+        });
+      } else {
+        point.set({
+          scaleX: point.scale,
+          scaleY: point.scale
+        });
+      }
     },
     /**
      * @description: 拖动批量新增节点
@@ -942,31 +1005,35 @@ export default {
     addPoint(point) {
       let { left, top, originLeft, originTop } = point;
       const currentLeft = left;
-
+      const isRight = currentLeft > originLeft;
       const startLength = this.addPointList.length;
+
       const n = Math.min(this.spaceWidth / 2, 6); // 拖动范围，在需要增加节点的刻度左右吸入的范围值
-      const residue = (left - originLeft) % this.spaceWidth;
+      const residue = Math.abs(left - originLeft) % this.spaceWidth;
 
-      const condition = residue > 0 && (residue > this.spaceWidth - n || residue < n);
-      const conditionNoLine2 = !point.line2 && left > originLeft;
-      const conditionHasLine2 = point.line2 && left > originLeft + this.spaceWidth;
+      const condition = residue > this.spaceWidth - n || residue < n;
+      const condition2 = left > originLeft + this.spaceWidth;
+      const conditionHasLeftPoint = point.prevPoint && left < originLeft - this.spaceWidth;
 
-      // if (!point.line2 && left > originLeft && condition) {
-      if (condition && (conditionNoLine2 || conditionHasLine2)) {
-        if (residue > this.spaceWidth - n) left = left - residue + this.spaceWidth;
-        if (residue < n) left = left - residue;
+      if (condition && (condition2 || conditionHasLeftPoint)) {
+        if (isRight) {
+          if (residue > this.spaceWidth - n) left = left - residue + this.spaceWidth;
+          if (residue < n) left = left - residue;
+        } else {
+          if (residue > this.spaceWidth - n) left = left + residue - this.spaceWidth;
+          if (residue < n) left = left + residue;
+        }
         point.set({
           left
         });
 
-        // const i = Math.floor((left - originLeft) / this.spaceWidth);
         // 复制点和线
-        if (conditionNoLine2 || conditionHasLine2) {
-          // point.line1 && this.removePolyline(point.line1.id);
-          setPointLineColor(point, 'transparent', conditionHasLine2);
-          this.addPointList.length == 0 && this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]);
+        if (condition2 || conditionHasLeftPoint) {
+          setPointLineColor(point, 'transparent', isRight);
+          const x1 = isRight ? point.line1?.x1 || originLeft : point.line2?.x2 || originLeft;
+          const y1 = isRight ? point.line1?.y1 || originTop : point.line2?.y2 || originTop;
+          this.addPointList.length == 0 && this.clonePoint(point, [x1, y1, originLeft, originTop]);
           if (this.addPointList.every(v => !nearlyEqual(v.left, left))) {
-            // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
             const points1 = this.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
             if (points1) {
               // this.setAddPointList(point);
@@ -979,30 +1046,11 @@ export default {
               // 避免重复添加
               if (this.addPointObjList.every(o => !nearlyEqual(o.left, left))) {
                 this.addPointList.push(data);
-                this.clonePoint(point, [...points1, left, top]);
+                this.clonePoint(point, [...points1, left, top], isRight);
               }
             }
           }
-          this.checkPoints(point);
-        }
-      }
-
-      // 断点相连
-      function concatPoint(target) {
-        const { left: targetLeft, top: targetTop } = target;
-        point.setCoords();
-        if (left >= targetLeft - n && left <= targetLeft + n && top <= targetTop + n && top >= targetTop - n) {
-          point.set({
-            left: targetLeft,
-            top: targetTop,
-            scaleX: point.scale === 1 ? 2.5 : 0.1,
-            scaleY: point.scale === 1 ? 2.5 : 0.1
-          });
-        } else {
-          point.set({
-            scaleX: point.scale,
-            scaleY: point.scale
-          });
+          this.checkPoints(point, isRight);
         }
       }
 
@@ -1011,55 +1059,94 @@ export default {
       const color = point.__attrs.lineAttr.stroke;
       const polylineObj = this.polylinePointList.find(v => v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex);
       polylineObj?.pointList.forEach(v => v.bringToFront());
-      if (point.nextPoint) {
-        this._concatIndex = polylineObj?.pointerList.findIndex(v => v + n > left && v > originLeft);
+      if ((isRight && point.nextPoint) || (!isRight && point.prevPoint)) {
+        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);
+          this._concatIndex = !~idx ? -1 : polylineObj?.pointerList.length - 1 - idx;
+        }
         if (!~this._concatIndex) {
           point.set({
             scaleX: point.scale,
             scaleY: point.scale
           });
         } else {
-          concatPoint(polylineObj?.pointList[this._concatIndex]);
+          this.concatPoint(point, polylineObj?.pointList[this._concatIndex], left, top, n);
         }
         this._concatPoint = polylineObj?.pointList?.[this._concatIndex] || null;
 
         // 被覆盖节点置灰配置
-        polylineObj?.pointerList.forEach((v, i) => {
+        polylineObj?.pointerList.forEach((l, i) => {
           const obj = polylineObj?.pointList[i];
-          if (v > originLeft && v < left) {
+          if ((isRight && l > originLeft && l < left) || (!isRight && l < originLeft && l > left)) {
             // 此处需要递归遍历group节点的所有子节点，然后更改其颜色
             resetPointColor([obj], '#999');
-            obj.line2?.set({ stroke: '#999' });
+            isRight && obj.line2?.set({ stroke: '#999' });
+            !isRight && obj.line1?.set({ stroke: '#999' });
           } else {
             const color = obj.__attrs.lineAttr.stroke;
             resetPointColor([obj], color);
-            obj.line2?.set({ stroke: color });
+            isRight && obj.line2?.set({ stroke: color });
+            !isRight && obj.line1?.set({ stroke: color });
           }
         });
-        if ((point.line1 || point.line2) && left < originLeft + this.spaceWidth) {
-          setPointLineColor(point, color, true);
+        if ((point.line1 || point.line2) && Math.abs(left - originLeft) < this.spaceWidth) {
+          setPointLineColor(point, color, isRight);
         } else {
-          setPointLineColor(point, 'transparent', true);
+          setPointLineColor(point, 'transparent', isRight);
         }
       }
 
       // 如果往回拖动则删除经过的已存在的节点
-      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) {
-          setPointLineColor(point, color, conditionHasLine2);
-          this.removePolyline('increasePointBatch', originLeft);
-        }
-        if (endLength > 0) {
-          point.set({
-            prePoints: [this.addPointList[endLength - 1].left, this.addPointList[endLength - 1].top]
-          });
+      if (startLength > 0) {
+        if (isRight) {
+          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);
+            this.addPointList = this.addPointList.filter(v => v.left < left);
+            const endLength = this.addPointList.length;
+            if (endLength === 0) {
+              setPointLineColor(point, color, isRight);
+              this.removePolyline('increasePointBatch', originLeft);
+            }
+            if (endLength > 0) {
+              point.set({
+                prePoints: [this.addPointList[endLength - 1].left, this.addPointList[endLength - 1].top]
+              });
+            }
+          }
+        } else {
+          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);
+            this.addPointList = this.addPointList.filter(v => v.left > left);
+            const endLength = this.addPointList.length;
+            if (endLength === 0) {
+              setPointLineColor(point, color, isRight);
+              this.removeLeftClonePoint(originLeft);
+            }
+            if (endLength > 0) {
+              point.set({
+                prePoints: [this.addPointList[endLength - 1].left, this.addPointList[endLength - 1].top]
+              });
+            }
+          }
         }
       }
     },
-    clonePoint(point, points) {
+    removeLeftClonePoint(left) {
+      this.addPointObjList.forEach(obj => {
+        if (obj.left <= left) {
+          this.canvas.remove(obj);
+          obj.line2 && this.canvas.remove(obj.line2);
+        }
+      });
+      this.addPointObjList = this.addPointObjList.filter(obj => obj.left > left);
+    },
+    clonePoint(point, points, isRight) {
       const { lineIndex, polylineIndex, lineAttr, polylineTypeId, originLeft } = point;
       const currentLineAttr = originLeft === points[2] && point.prevPoint ? point.prevPoint.__attrs.lineAttr : lineAttr;
 
@@ -1077,7 +1164,11 @@ export default {
         clonedObj.hasControls = clonedObj.hasBorders = false;
         point.prePoints = [point.left, point.top];
         const line = this.drawLine([...points], { evented: false, selectable: false, ...currentLineAttr, polylineIndex, polylineTypeId, lineIndex });
-        clonedObj.line1 = line;
+        if (isRight) {
+          clonedObj.line1 = line;
+        } else {
+          clonedObj.line2 = line;
+        }
         this.canvas.add(clonedObj);
         this.canvas.sendBackwards(line);
         clonedObj.bringForward();
@@ -1202,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/eventCommon.js

@@ -55,7 +55,7 @@ export default {
       point.setCoords(); // 需调用setCoords()才能重新计算控制位置(改变Object状态)
       // const objBoundingBox = point.getBoundingRect(); // 此方式会导致结果不精准，应该用point的top值判断
       const { originX, endX, originY, endY } = this.propItems;
-      const leftLimit = point.prevPoint?.get('left') || originX;
+      const leftLimit = (isLimit && point.prevPoint?.get('left')) || originX;
       const rightLimit = (isLimit && point.nextPoint?.get('left')) || endX;
       if (point.top < originY) {
         point.set('top', originY);

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