cnhis-design-vue 2.1.39 → 2.1.40

package/package.json

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

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

@@ -80,6 +80,7 @@ export default {
       rightClickNode: [],
       activeEvent: null, // 当前可右键活动的对象
       addPointList: [], // 快速新增的节点list
+      addPointObjList: [], // 批量新增节点对象的缓存
       isSelectArea: false, // 是否正在选区
       selectArea: null, // 选区矩形对象
       currentDelPoint: null, // 缓存当前可批量删除的项目线段上的点
@@ -573,6 +574,7 @@ export default {
           if (point && point.id.includes('_polylinePoint_')) {
             this.isDropVisible = false;
             this.setEmitFunction(point);
+            this.addPointObjList = [];
           }
         });
         point.on('mouseup', event => {
@@ -658,6 +660,23 @@ export default {
       data.top = top;
       this.addPointList.push(data);
     },
+    // 纠正线段坐标
+    setLinePatch(point) {
+      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 => obj.left === currentPoint.left);
+        if (currentPointObj?.line1?.x1 !== prevPoint.left) {
+          currentPointObj.line1.set({
+            x1: prevPoint.left,
+            y1: prevPoint.top,
+            x2: currentPoint.left,
+            y2: currentPoint.top
+          });
+        }
+      }
+    },
     /**
      * @description: 拖动批量新增节点
      * @param {*} point 拖动的最后一个节点
@@ -722,6 +741,8 @@ export default {
               }
             }
           }
+          // 纠正节点上的line1的坐标
+          this.setLinePatch(point);
         };
 
         // const i = Math.floor((left - originLeft) / spaceWidth);
@@ -740,8 +761,11 @@ export default {
               data.value = { time: x, value: y };
               data.left = left;
               data.top = top;
-              this.addPointList.push(data);
-              this.clonePoint(point, [...points1, left, top]);
+              // 避免重复添加
+              if (this.addPointObjList.every(o => o.left !== left)) {
+                this.addPointList.push(data);
+                this.clonePoint(point, [...points1, left, top]);
+              }
             }
           }
           checkPoints();
@@ -826,28 +850,29 @@ export default {
       polylineIndex = point.polylineIndex;
       polylineTypeId = point.polylineTypeId;
 
-      return new Promise((resolve, reject) => {
-        point.clone(clonedObj => {
-          clonedObj.set({
-            left: points[2],
-            top: points[3],
-            idClone: 'increasePointBatch',
-            id: '_polylinePoint_' + new Date().getTime(), // 此id必须，用于remove节点的时候
-            polylineTypeId,
-            polylineIndex: point.polylineIndex,
-            scaleX: point.scale,
-            scaleY: point.scale
-          });
-          clonedObj.hasControls = clonedObj.hasBorders = false;
-          point.prePoints = [point.left, point.top];
-          const line = this.drawLine([...points], { evented, selectable, ...lineAttr, polylineIndex, polylineTypeId, lineIndex });
-          clonedObj.line1 = line;
-          this.canvas.sendBackwards(line);
-          clonedObj.bringForward();
-          this.canvas.add(clonedObj);
-          resolve(clonedObj);
+      // return new Promise((resolve, reject) => {
+      point.clone(clonedObj => {
+        clonedObj.set({
+          left: points[2],
+          top: points[3],
+          idClone: 'increasePointBatch',
+          id: '_polylinePoint_' + new Date().getTime(), // 此id必须，用于remove节点的时候
+          polylineTypeId,
+          polylineIndex: point.polylineIndex,
+          scaleX: point.scale,
+          scaleY: point.scale
         });
+        clonedObj.hasControls = clonedObj.hasBorders = false;
+        point.prePoints = [point.left, point.top];
+        const line = this.drawLine([...points], { evented, selectable, ...lineAttr, polylineIndex, polylineTypeId, lineIndex });
+        clonedObj.line1 = line;
+        this.canvas.sendBackwards(line);
+        clonedObj.bringForward();
+        this.canvas.add(clonedObj);
+        this.addPointObjList.push(clonedObj);
+        // resolve(clonedObj);
       });
+      // });
     },
     getValue(point) {
       const x = this.getXValue(point.left);
@@ -1019,15 +1044,26 @@ export default {
       // 根据id或者idClone删除
       if (id) {
         const pointId = left ? 'idClone' : 'id';
-        const point = this.canvas.getObjects().filter(item => item[pointId] === id);
-        if (point && point.length > 0) {
-          point.forEach(v => {
-            if ((left && v.left >= left) || !left) {
-              this.canvas.remove(v);
-              v.line1 && this.canvas.remove(v.line1);
+        if (pointId === 'idClone') {
+          this.addPointObjList.forEach(obj => {
+            if (obj.left >= left) {
+              this.canvas.remove(obj);
+              obj.line1 && this.canvas.remove(obj.line1);
             }
           });
+          this.addPointObjList = this.addPointObjList.filter(obj => obj.left < left);
+        } else {
+          const point = this.canvas.getObjects().filter(item => item[pointId] === id);
+          if (point && point.length > 0) {
+            point.forEach(v => {
+              if (!left) {
+                this.canvas.remove(v);
+                v.line1 && this.canvas.remove(v.line1);
+              }
+            });
+          }
         }
+
         return;
       }
       // 删除一条线