cnhis-design-vue 0.2.42-beta → 0.2.45-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.42-beta",
+  "version": "0.2.45-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -23,6 +23,7 @@
     "build:utils": "cross-env BABEL_ENV=utils babel src/utils --config-file ./build/babel.component.js  --out-dir es/utils",
     "build:docs": "vue-cli-service build --mode docs",
     "build:es": "vue-cli-service build --mode component && npm run build:utils",
+    "postbuild:es": "node ./build/build.component.js",
     "build:umd": "vue-cli-service build --mode library --target lib --name cui --dest lib packages/index.js",
     "build:lib": "npm run build:es && npm run build:umd",
     "lint": "vue-cli-service lint"
@@ -49,6 +50,7 @@
     "vue-resize-directive": "^1.2.0",
     "vue-simple-uploader": "^0.7.6",
     "vuedraggable": "^2.24.3",
+    "vxe-table-plugin-antd": "^1.11.3",
     "vxe-table": "^3.4.1",
     "wangeditor": "^4.7.5",
     "xe-utils": "^3.4.0"
@@ -93,4 +95,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/big-table/src/BigTable.vue

@@ -1759,7 +1759,7 @@ export default create({
             />
             {field.visible ? (
               <div
-                v-dom-portal
+                v-dom-portal={this.filterDomPortal}
                 class="big-table-filter-wrap"
                 style={{
                   left: field.left,
@@ -1995,7 +1995,6 @@ export default create({
       field.left = 'initial';
       field.right = 'initial';
       field.top = 'initial';
-
       let transformWrapWidth = transformWrap.clientWidth;
       if (btnRectLeft + FILTER_BOX_WIDTH > transformWrapWidth) {
         let transformWrapRight = transformWrap?.getBoundingClientRect().right || 0;
@@ -2004,7 +2003,7 @@ export default create({
         field.left = btnRectLeft + 'px';
       }
 
-      field.top = btnRectTop + FILTER_BOX_TOP_OFFSET + 'px';
+      field.top = (btnRectTop + FILTER_BOX_TOP_OFFSET) + (this.filterTopOffset || 0)+ 'px';
 
       field.visible = !field.visible;
 

package/packages/big-table/src/utils/bigTableProps.js

@@ -80,7 +80,15 @@ const bigTableProps = {
   asyncCount: Boolean,
   showSettings: { type: Object, default: () => ({}) },
   inlineFormData: { type: Object, default: () => ({}) },
-  inlineOriginalTableRow: { type: Object, default: () => ({}) }
+  inlineOriginalTableRow: { type: Object, default: () => ({}) },
+  filterDomPortal:{ // 表头筛选挂载的地方
+    type: String,
+    default: "body"
+  },
+  filterTopOffset:{ // 表头 top 调节
+    type: Number,
+    default: 0
+  }
 };
 
 export default bigTableProps;

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

@@ -136,6 +136,9 @@ export default create({
         case 'increasePointBatch':
           this.$emit('increasePointBatch', value);
           break;
+        case 'set':
+          this.$emit('setPoint', value);
+          break;
       }
     },
     repaintPolyline(position, dadaIndex) {

package/packages/fabric-chart/src/components/DropPopup.vue

@@ -5,8 +5,6 @@
       <span v-for="item in val.list" :key="item.id">
         {{`${item.name}: ${item.value}`}}
       </span>
-      <!-- <span>{{val.y}}</span>
-      <span>{{val.x}}</span> -->
     </div>
   </div>
 </template>

package/packages/fabric-chart/src/components/MouseRightClick.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="c-mouse-right-menu-popup c-animation-in" :style="dialogStyle">
     <div class="c-mouse-right-menu">
-      <div v-for="item in nodeList" :key="item.type" class="c-mouse-menu-item" @click="handleNodeClick(item)">
+      <div v-for="(item, index) in nodeList" :key="index" class="c-mouse-menu-item" @click="handleNodeClick(item)">
         <span>{{ item.name }}</span>
       </div>
     </div>

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

@@ -68,7 +68,8 @@ export default {
           yScaleCellLeft: this.yScaleCellLeft,
           yScaleCellRight: this.yScaleCellRight,
           eventStyle: this.eventStyle,
-          topTotal: this.topTotal
+          topTotal: this.topTotal,
+          operable: this.operable
         };
       }
     };
@@ -200,6 +201,9 @@ export default {
     },
     eventStyle() {
       return this.templateData.table?.eventStyle || { selectable: true, evented: true };
+    },
+    operable() {
+      return this.templateData.table?.operable || { set: false, connect: false };
     }
   },
   mounted() {

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

@@ -14,10 +14,18 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 
+const isEffectiveNode = node => {
+  return node?.time && (node?.value || node?.value === 0);
+};
 const rightClickNode = [
   { name: '新增节点', type: 'add' },
+  { name: '检测项设置', type: 'set' },
   { name: '删除节点', type: 'delete' }
 ];
+const rightClickNodeConnect = [
+  { name: '新增节点连接右侧节点', type: 'add',  },
+  { name: '新增节点连接左侧节点', type: 'add' }
+];
 export default {
   name: 'fabric-polylines',
   mixins: [FabricCommon, draw, eventCommon],
@@ -43,13 +51,6 @@ export default {
       dropPos: { clientX: 0, clientY: 0 },
       isRightVisible: false,
       rightPos: { clientX: 0, clientY: 0 },
-
-      willUpdatePolylineIndex: 0,
-      // willUpdatePointIndex: 0,
-      // willUpdateLine: null,
-      polylineList: [],
-
-      // polineGroup: null,
       rightClickNode: [],
       activeEvent: null, // 当前可右键活动的对象
       addPointList: [], // 快速新增的节点list
@@ -64,24 +65,12 @@ export default {
   },
 
   watch: {
-    // polyline() {
-    //   this.repaintPolyline();
-    // },
-    // polylineList(value) {
-    //   if (value) {
-    //     // console.log(this.canvas.toObject());
-    //     this.polylineList.forEach((polylineType, polylineTypeId) => {
-    //       this.createPolyline(polylineType, polylineTypeId);
-    //     });
-    //   }
-    // }
   },
 
   mounted() {
     this.$nextTick(() => {
-      this.polylineList = [...this.polyline];
       this.drawPolylineTitle();
-      this.polylineList.forEach((polylineType, polylineTypeId) => {
+      this.polyline.forEach((polylineType, polylineTypeId) => {
         this.createPolyline(polylineType, polylineTypeId);
       });
 
@@ -160,7 +149,7 @@ export default {
     // 绘制左侧折线标题
     drawPolylineTitle() {
       const { canvasHeight, treeTableminCellWidth, originX, xScaleList, xScaleCellList, endX } = this.propItems;
-      const leftYScalevalue = this.polylineList.find(v => v.position === 'left');
+      const leftYScalevalue = this.polyline.find(v => v.position === 'left');
       const lableMargin = leftYScalevalue.lableMargin || [5, 30];
       const lableLineHeight = leftYScalevalue.lableLineHeight || 20;
       const style = leftYScalevalue.style || { fontSize: 12, fill: '#000' };
@@ -169,19 +158,19 @@ export default {
 
       const minTime = Math.min(...xScaleList);
       const maxTime = Math.max(...xScaleList);
-      this.polylineList.forEach((item, index) => {
+      this.polyline.forEach((item, index) => {
         item.dataList.forEach((v, i) => {
-          // 配置是否可拖动标题图标批量增加-
+           // 配置是否可拖动标题图标批量增加-
           const isAdd = v.list.length
             ? !v.list.some(k => {
-                return k.time && new Date(k.time).getTime() >= minTime && new Date(k.time).getTime() < xScaleCellList[1].time;
+                return isEffectiveNode(k) && new Date(k.time).getTime() >= minTime && new Date(k.time).getTime() < xScaleCellList[1].time;
               })
             : true;
           let rightLimit = endX;
-          const point = v.list.find(k => k.time && new Date(k.time).getTime() >= xScaleCellList[1].time && new Date(k.time).getTime() <= maxTime);
+          const point = v.list.find(k => isEffectiveNode(k) && new Date(k.time).getTime() >= xScaleCellList[1].time && new Date(k.time).getTime() <= maxTime);
           const limitObj =
             point &&
-            JSON.parse(JSON.stringify(this.propItems.xScaleCellList))
+            JSON.parse(JSON.stringify(xScaleCellList))
               .reverse()
               .find(k => new Date(point.time).getTime() > k.time);
           limitObj && (rightLimit = limitObj.x);
@@ -275,9 +264,19 @@ export default {
         let originTop = top;
         let cloneIconId;
         icon.on('moving', () => {
+          
+          // 优化左侧图标太小不容易选中的问题
+          if (!icon.url && icon.scaleX == 1.8 && icon.scaleY == 1.8) {
+            icon.set({
+              'scaleX': 1,
+              'scaleY': 1
+            });
+            this.canvas.renderAll();
+          }
+
           if (!cloneIconId) {
+            cloneIconId = '_polylinePoint_temp_' + new Date().getTime();
             icon.clone(clonedObj => {
-              cloneIconId = '_polylinePoint_temp_' + new Date().getTime();
               clonedObj.set({
                 id: cloneIconId // 此id必须，用于remove节点的时候
               });
@@ -321,6 +320,17 @@ export default {
           this.drawPolylineTitle();
         });
 
+        // 优化左侧图标太小不容易选中的问题
+        if (icon.evented && !icon.url) {
+          const maxVal = Math.max(icon.width * icon.scale, icon.height * icon.scale);
+          if (maxVal < 7) {
+            icon.set({
+              scaleX: 1.8,
+              scaleY: 1.8
+            });
+          }
+        }
+
         this.canvas.add(text, icon);
         this.canvas.requestRenderAll();
       });
@@ -367,7 +377,7 @@ export default {
       const lines = [];
       
       const drawLine = ({ value, lineStyle }) => {
-        const top = this.cumputedY(polylineType, +value, polylineTypeId);
+        const top = this.cumputedY(polylineType, +value);
         return this.drawLine([originX, top, endX, top], { polylineIndex, lineIndex: 0, polylineTypeId, ...(lineStyle || defaultVaule.criticalStyle) });
       };
       const drawText = ({ name, nameStyle }, top) => {
@@ -417,9 +427,9 @@ export default {
         // 当前点
         let points = null;
         let isInit = false;
-        if (linePoints.time && (linePoints.value || linePoints.value == 0)) {
+        if (isEffectiveNode(linePoints)) {
           const x = this.cumputedX(linePoints.time);
-          const y = this.cumputedY(polylineType, linePoints.value, polylineTypeId);
+          const y = this.cumputedY(polylineType, linePoints.value);
           isInit = y < originY || y > endY;
           if (this.isLimit(linePoints.time)) points = [x, y < originY ? originY : y > endY ? endY : y];
         }
@@ -427,9 +437,9 @@ export default {
         // 下一个点
         const nextPoints = list[index + 1];
         let nextPoint = null;
-        if (nextPoints?.time && (nextPoints.value || nextPoints.value == 0)) {
+        if (isEffectiveNode(nextPoints)) {
           const nextX = this.cumputedX(nextPoints.time);
-          const nextY = this.cumputedY(polylineType, nextPoints.value, polylineTypeId);
+          const nextY = this.cumputedY(polylineType, nextPoints.value);
           if (this.isLimit(nextPoints.time)) nextPoint = [nextX, nextY < originY ? originY : nextY > endY ? endY : nextY];
         }
         let line;
@@ -440,6 +450,7 @@ export default {
         previousLine = lineList[index - 1];
         const pointOthers = { polylineTypeId, polylineIndex, pointIndex: index, ...pointAttr, lineAttr };
         if (points) {
+          pointOthers.time = linePoints.time;
           point = previousLine ? this.drawPoint(...points, previousLine, line, polyline.type, pointOthers, isInit) : this.drawPoint(...points, null, line, polyline.type, pointOthers, isInit);
         }
         lineList.push(line);
@@ -463,9 +474,11 @@ export default {
       this.createCritical(polyline, polylineIndex, polylineType, polylineTypeId);
     },
     // 计算y轴坐标
-    cumputedY(polylineType, linePointY, polylineTypeId) {
-      const yScaleCell = polylineTypeId == 1 ? this.propItems.yScaleCellLeft : this.propItems.yScaleCellRight; // polylineTypeId值为1表示是右边单位的折线数据，即℃
-      const yCellUnit = linePointY - Math.min(...polylineType.list);
+    cumputedY(polylineType, linePointY) {
+      const { position = 'left', list = [] } = polylineType;
+      const key = position === 'left' ? 'Left' : 'Right';
+      const yScaleCell = this.propItems[`yScaleCell${key}`];
+      const yCellUnit = linePointY - Math.min(...list);
       return this.propItems.endY - yScaleCell * yCellUnit;
     },
     /**
@@ -510,7 +523,7 @@ export default {
           this.canvas.renderAll();
           this.showDrapPopup(point);
         });
-        // 折线点停止拖拽后 更新polylineList中对应的坐标
+        // 折线点停止拖拽后 更新polyline中对应的坐标
         point.on('moved', () => {
           if (point && point.id.includes('_polylinePoint_')) {
             this.isDropVisible = false;
@@ -541,11 +554,18 @@ export default {
             ...last,
             value: {
               time: this.getXValue(point.nextPoint.left),
-              value: this.getYValue(point.polylineTypeId == 0 ? 'right' : 'left', point.nextPoint.top)
+              value: this.getYValue(this.polyline[point.polylineTypeId].position, point.nextPoint.top)
             }
           };
-          last.left === point.left && this.addPointList.splice(-1, 1, value);
-          last.left !== point.left && this.addPointList.push(value);
+          if (last.left === point.left) {
+            this.addPointList.splice(-1, 1, value);
+          } else {
+            this.addPointList.push(value);
+            const [lastPoint, prePoint, ...list] = JSON.parse(JSON.stringify(this.addPointList)).reverse();
+            if (prePoint.value.time == lastPoint.value.time) {
+              this.addPointList.splice(-2, 1);
+            }
+          }
         }
         !point.id.includes('isTitle') && this.removePolyline(point.id);
         this.$emit('pointOperation', 'increasePointBatch', this.addPointList);
@@ -567,7 +587,7 @@ export default {
      * @param {*} originTop 拖动的源节点的top值
      * @return {*}
      */
-    addPoint(point, originLeft, originTop) {
+    async addPoint(point, originLeft, originTop) {
       const { xCellWidth, table, originX } = this.propItems;
       // const addPointSpaceGridNumbers = table.addPointSpaceGridNumbers || [];
       let addPointSpaceGridNumber = table.addPointSpaceGridNumber || 1;
@@ -576,7 +596,7 @@ export default {
       const currentLeft = left;
 
       const startLength = this.addPointList.length;
-      const n = 5; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
+      const n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
       const spaceWidth = xCellWidth * addPointSpaceGridNumber;
       const residue = (left - originLeft) % spaceWidth;
 
@@ -588,21 +608,46 @@ export default {
         point.set({
           left
         });
-        const i = Math.floor((left - originLeft) / spaceWidth);
-        // if (i === 0 ) {
-        //   if (!~this.addPointList.findIndex(v => v.left === originLeft) && point.id.includes('isTitle')) {
-        //     this.setAddPointList(point);
-        //   }
-        // }
+
+        const checkPoints = () => {
+          const PointLens = Math.floor((left - originLeft) / spaceWidth);
+          if (PointLens > 1 && this.addPointList?.length < PointLens) {
+            for (let k = 0; k < PointLens; k++) {
+              if (k > 0) {
+                const curLeft = originLeft + spaceWidth * k;
+                // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
+                const isNoLack = this.addPointList.some(v => v.left === curLeft);
+                if (!isNoLack) {
+                  let index;
+                  const pointObj = this.addPointList.find((v, i) => {
+                    if (v.left > curLeft) {
+                      index = i;
+                    }
+                    return v.left > curLeft;
+                  });
+                  if (pointObj) {
+                    let cloneObj = JSON.parse(JSON.stringify(pointObj));
+                    cloneObj.value.time = this.getXValue(curLeft);
+                    cloneObj.left = curLeft;
+                    this.addPointList.splice(index, 0 , cloneObj);
+                  }
+                }
+              }
+            }
+          }
+        };
+
+        // const i = Math.floor((left - originLeft) / spaceWidth);
         // 复制点和线
         if (left > originLeft) {
           point.line1 && this.removePolyline(point.line1.id);
-          if (i === 1) {
-            this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]);
-          }
-          if (!~this.addPointList.findIndex(v => v.left === left)) {
-            const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
-            points1 && this.clonePoint(point, [...points1, left, top]);
+          // if (i === 1) {
+            this.addPointList.length == 0 && await 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)) {
+            // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
+            const points1 = this.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
+            points1 && await this.clonePoint(point, [...points1, left, top]);
             // this.setAddPointList(point);
             // 调用上面方法就会导致线段绘制失败，目前还不知道为啥子
             const { data, x, y } = this.getValue(point);
@@ -611,15 +656,17 @@ export default {
             data.top = top;
             this.addPointList.push(data);
           }
+          checkPoints();
         }
       }
+
       // 断点相连
       if (point.nextPoint && left >= point.nextPoint.left - n && top <= point.nextPoint.top + n && top >= point.nextPoint.top - n) {
         point.set({
           left: point.nextPoint.get('left'),
           top: point.nextPoint.get('top'),
-          scaleX: point.scale === 1 ? 1.5 : 0.1,
-          scaleY: point.scale === 1 ? 1.5 : 0.1
+          scaleX: point.scale === 1 ? 2.5 : 0.1,
+          scaleY: point.scale === 1 ? 2.5 : 0.1
         });
       } else if (point.nextPoint) {
         point.set({
@@ -648,25 +695,29 @@ export default {
       polylineIndex = point.polylineIndex;
       polylineTypeId = point.polylineTypeId;
 
-      point.clone(clonedObj => {
-        clonedObj.set({
-          left: points[2],
-          top: points[3],
-          idClone: 'increasePointBatch',
-          id: '_polylinePoint_' + new Date().getTime(), // 此id必须，用于remove节点的时候
-          polylineTypeId,
-          polylineIndex: point.polylineIndex
-        });
-        clonedObj.hasControls = clonedObj.hasBorders = false;
-        point.set({
-          prePoints: [point.left, point.top]
+      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
+          });
+          clonedObj.hasControls = clonedObj.hasBorders = false;
+          point.set({
+            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.canvas.renderAll();
+          resolve(clonedObj);
         });
-        const line = this.drawLine([...points], { evented, selectable, ...lineAttr, polylineIndex, polylineTypeId, lineIndex });
-        clonedObj.line1 = line;
-        this.canvas.sendBackwards(line);
-        clonedObj.bringForward();
-        this.canvas.add(clonedObj);
-      });
+      })
     },
     getValue(point) {
       const x = this.getXValue(point.left);
@@ -713,11 +764,22 @@ export default {
         top: point.top
       };
       let { x, y, data } = this.getValue(point);
+      const getY = y => {
+        if (data?.position == 'right') {
+          if (y.toString().includes('.')) {
+            const [m, n] = y.toString().split('.');
+            return parseFloat(`${m}.${n.slice(0, 1)}`) * 10 / 10;
+          }
+          return y;
+        } else {
+          return Math.round(y);
+        }
+      };
       this.dropVal = {
         title: data.title,
         list: [
           { id: '11', name: '时间', value: x },
-          { id: '22', name: '值', value: Math.round(y) }
+          { id: '22', name: '值', value: getY(y) }
         ]
       };
     },
@@ -743,29 +805,56 @@ export default {
       const id = target ? target.id : '';
       this.$nextTick(() => {
         if (id && id.includes('_polylinePoint_')) {
-          this._currentPointId = id;
-          this.rightClickNode = Object.freeze(rightClickNode.slice());
+          this._currentPoint = target;
+          let nodeConnect = [];
+          if (this.propItems.operable.connect) {
+            if (!target.line2 && target.nextPoint) {
+              nodeConnect = rightClickNodeConnect.slice(0, 1);
+            }
+            if (!target.line1 && target.prevPoint) {
+              nodeConnect = rightClickNodeConnect.slice(1);
+            }
+            if (!target.line1 && !target.line2 && target.prevPoint && target.nextPoint) {
+              nodeConnect = rightClickNodeConnect.slice();
+            }
+          }
+          this.rightClickNode = Object.freeze(rightClickNode.slice(0, 1).concat(nodeConnect).concat(rightClickNode.slice(-1)));
           this.isRightVisible = true;
         } else if (!id) {
-          this._currentPointId = '';
-          this.rightClickNode = Object.freeze(rightClickNode.slice(0, 1));
+          const { operable } = this.propItems;
+          this._currentPoint = null;
+          this.rightClickNode = Object.freeze(operable.set ? rightClickNode.slice(0, 2) : rightClickNode.slice(0, 1));
           this.isRightVisible = true;
         }
       });
     },
     // 关闭右键菜单，打开添加节点弹窗表单
-    handleRightClick({ type }) {
+    handleRightClick({ type, name }) {
       this.isRightVisible = false;
-      const id = this._currentPointId;
-      this._currentPointId = '';
+      const id = this._currentPoint?.id;
       const { left, top } = this._active;
       let data = id ? this.getDataById(id) : this.getValue({ left, top });
+      if (type == 'add') {
+        if (name.includes('左')) {
+          data.range = {
+            time: [this._currentPoint.prevPoint.time, this._currentPoint.time],
+            direction: 'left'
+          };
+        }
+        if (name.includes('右')) {
+          data.range = {
+            time: [this._currentPoint.time, this._currentPoint.nextPoint.time],
+            direction: 'right'
+          };
+        }
+      }
       this.$emit('pointOperation', type, data);
+      this._currentPoint = null;
     },
     getDataById(id) {
       const arr = id.replace(/_?[a-zA-Z]+.+$/, '').split('_');
       const [typeIndex, lineIndex, pointIndex] = arr;
-      const data = this.polylineList[typeIndex];
+      const data = this.polyline[typeIndex];
       const value = data?.dataList?.[lineIndex]?.list?.[pointIndex]?.data || '';
       return {
         title: data?.dataList?.[lineIndex].title || '',
@@ -775,7 +864,7 @@ export default {
         data: value
       };
     },
-    removePolyline(id, left, polylineTypeId, polylineIndex) {
+    removePolyline(id, left, position, polylineIndex) {
       // 根据id或者idClone删除
       if (id) {
         const pointId = left ? 'idClone' : 'id';
@@ -794,14 +883,15 @@ export default {
         return;
       }
       // 删除一条线
-      if ((polylineTypeId === 0 || polylineTypeId) && (polylineIndex === 0 || polylineIndex)) {
+      if (position && (polylineIndex === 0 || polylineIndex)) {
+        const polylineTypeId = this.polyline.findIndex(v => v.position === position);
         this.canvas.forEachObject(obj => {
           const isPolyLine = obj.polylineTypeId === polylineTypeId && obj.polylineIndex === polylineIndex;
           if (obj.id && /_polyline(Point|Line)_/.test(obj.id) && !obj.id.includes('isTitle') && isPolyLine) {
-            this.canvas.remove(obj);
             obj.text && this.canvas.remove(obj.text);
             obj.line1 && this.canvas.remove(obj.line1);
             obj.line2 && this.canvas.remove(obj.line2);
+            this.canvas.remove(obj);
           }
         });
         return;
@@ -809,6 +899,7 @@ export default {
       // 删除折线图上的所有点和线
       this.canvas.forEachObject(obj => {
         if (obj.id && /_polyline(Point|Line)_/.test(obj.id) && !obj.id.includes('isTitle')) {
+          obj.text && this.canvas.remove(obj.text);
           this.canvas.remove(obj);
         }
       });
@@ -821,20 +912,18 @@ export default {
     },
     repaintPolyline(position, dadaIndex) {
       if (arguments.length < 2) {
-        if (this.polylineList.length) {
+        if (this.polyline.length) {
           this.removePolyline();
         }
-        this.polylineList = [...this.polyline];
-        this.polylineList.forEach((polylineType, polylineTypeId) => {
+        this.polyline.forEach((polylineType, polylineTypeId) => {
           this.createPolyline(polylineType, polylineTypeId);
         });
         this.removeTitle();
         this.drawPolylineTitle();
       } else {
-        this.polylineList = [...this.polyline];
-        const polylineTypeId = position == 'left' ? 1 : 0;
-        this.removePolyline(null, null, polylineTypeId, parseInt(dadaIndex));
-        this.drawPolyline(this.polylineList[polylineTypeId].dataList[parseInt(dadaIndex)], parseInt(dadaIndex), this.polylineList[polylineTypeId], polylineTypeId);
+        const polylineTypeId = this.polyline.findIndex(v => v.position === position);
+        this.removePolyline(null, null, position, parseInt(dadaIndex));
+        this.drawPolyline(this.polyline[polylineTypeId].dataList[parseInt(dadaIndex)], parseInt(dadaIndex), this.polyline[polylineTypeId], polylineTypeId);
       }
     }
   }

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

@@ -253,8 +253,8 @@ export default {
       const { originX, originY } = this.propItems;
       let top = originY + 10;
       list.forEach((item, index) => {
-        const marginLeft = this.templateData.left.leftYScalevalue.spaceGridNumber || defaultVaule.spaceGridNumber;
-        const left = originX - marginLeft * 4; // 默认减去4倍的左边距，防止最左边的数据与名称显示重合了
+        const marginLeft = item.titleStyle?.marginLeft || 8;
+        const left = originX - marginLeft; // 防止最左边的数据与名称显示重合了
 
         if (list[index - 1]) {
           top += item.lineHeight || 15;
@@ -264,6 +264,7 @@ export default {
           ...defaultVaule.style,
           ...defaultVaule.textStyle,
           ...item.style,
+          ...(item.titleStyle || {}),
           originX: 'right',
           originY: 'center',
           left,

package/packages/form-table/src/FormTable.vue

@@ -512,7 +512,7 @@ export default create({
       $event.preventDefault();
       $event.stopPropagation();
       // 触发checkbox 不执行下面逻辑
-      if (className.includes("vxe-checkbox--icon")) return;
+      if (className?.includes("vxe-checkbox--icon")) return;
 
       let table = this.$refs[this.formTableGridRef];
       let isChecked = table.isCheckedByCheckboxRow(row);