cnhis-design-vue 2.1.122 → 2.1.125

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

@@ -14,6 +14,7 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 import Bus from '../utils/bus';
+import { nearlyEqual } from '../utils';
 
 /**
  * @description: 递归遍历节点，设置颜色属性
@@ -609,7 +610,7 @@ export default {
      * @param {polylineIndex} 当前折线 index
      */
     drawPolyline(polyline, polylineIndex, polylineType, polylineTypeId) {
-      const { originY, endY } = this.propItems;
+      const { originY, endY, xCellWidth, table } = this.propItems;
       const { list = [], critical = {}, diffValue = {} } = polyline;
 
       const pointList = [];
@@ -648,7 +649,10 @@ export default {
         let line;
         let point;
         let previousLine;
-        line = points && nextPoint && !linePoints.data?.breakpoint ? this.drawLine([...points, ...nextPoint], { polylineIndex, polylineTypeId, lineIndex: index, ...lineAttr }) : null;
+        line =
+          !points || !nextPoint || linePoints.data?.breakpoint || (table.breakpoint && nextPoint[0] - points[0] > xCellWidth)
+            ? null
+            : this.drawLine([...points, ...nextPoint], { polylineIndex, polylineTypeId, lineIndex: index, ...lineAttr });
         previousLine = lineList[index - 1];
         const pointOthers = { polylineTypeId, polylineIndex, pointIndex: index, ...pointAttr, lineAttr };
         if (points) {
@@ -876,8 +880,8 @@ export default {
       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) {
+        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,
@@ -897,7 +901,7 @@ export default {
           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(p => nearlyEqual(p.left, curLeft));
             // const hasPoint = this.addPointList.some(v => v.left == curLeft);
             if (!hasPoint) {
               let index;
@@ -940,7 +944,7 @@ export default {
       const currentLeft = left;
 
       const startLength = this.addPointList.length;
-      const n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
+      const n = Math.min(this.spaceWidth / 2, 6); // 拖动范围，在需要增加节点的刻度左右吸入的范围值
       const residue = (left - originLeft) % this.spaceWidth;
 
       const condition = residue > 0 && (residue > this.spaceWidth - n || residue < n);
@@ -961,7 +965,7 @@ export default {
           // 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 (this.addPointList.every(v => v.left !== left)) {
+          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) {
@@ -973,7 +977,7 @@ export default {
               data.left = left;
               data.top = top;
               // 避免重复添加
-              if (this.addPointObjList.every(o => o.left !== left)) {
+              if (this.addPointObjList.every(o => !nearlyEqual(o.left, left))) {
                 this.addPointList.push(data);
                 this.clonePoint(point, [...points1, left, top]);
               }

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

@@ -322,29 +322,33 @@ export default {
             };
             const left = this.computedX(v.time);
             title.dataList.push(left);
-            const icon = await this.createPoint(_icon.type, {
-              originX: 'center',
-              left,
-              ...item.style,
-              ...(item.style ? { stroke: item.style.fill } : {}),
-              ...(_icon.style || {}),
-              ...commonOptions
-            });
+            const icon =
+              !Reflect.has(_icon, 'show') || _icon.show
+                ? await this.createPoint(_icon.type, {
+                    originX: 'center',
+                    left,
+                    ...item.style,
+                    ...(item.style ? { stroke: item.style.fill } : {}),
+                    ...(_icon.style || {}),
+                    ...commonOptions
+                  })
+                : null;
+            const iconHalfWidth = icon ? icon.width / 2 : 0;
             const text = new this.fabric.Text(String(v.value), {
               ...defaultVaule.style,
               ...defaultVaule.textStyle,
               ...item.style,
-              left: left + icon.width / 2,
+              left: left + iconHalfWidth,
               name: v.value,
               ...commonOptions
             });
-            const groupObj = new this.fabric.Group([icon, text], {
+            const groupObj = new this.fabric.Group(icon ? [icon, text] : [text], {
               id: `${index}_${i}_other_${Date.now()}`,
               lockMovementY: true,
               ...commonOptions,
               ...this.eventStyle,
               realLeft: left,
-              iconHalfWidth: icon.width / 2
+              iconHalfWidth
             });
             if (prevPoint) {
               prevPoint.nextPoint = groupObj;

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

@@ -9,7 +9,7 @@ export function getTangent(angle) {
   return +Math.tan((angle * Math.PI) / 180);
 }
 
-function nearlyEqual(v1, v2) {
+export function nearlyEqual(v1, v2) {
   return Math.abs(v1 - v2) <= 0.0001;
 }
 

package/packages/grid/src/grid.js

@@ -6,10 +6,9 @@
 import Vue from 'vue';
 import 'xe-utils';
 import VXETable from 'vxe-table';
-import VXETablePluginAntd from 'vxe-table-plugin-antd'
+import VXETablePluginAntd from 'vxe-table-plugin-antd';
 import Grid from 'vxe-table/lib/grid';
-// import 'vxe-table/lib/style.css';
-import 'vxe-table-plugin-antd/dist/style.css'
+import 'vxe-table-plugin-antd/dist/style.css';
 
 VXETable.use(VXETablePluginAntd);
 import create from '@/core/create';