cnhis-design-vue 2.1.123 → 2.1.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.123",
+  "version": "2.1.125",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -114,4 +114,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

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

@@ -2143,13 +2143,11 @@ export default create({
       let forbiddenBatchSelect = !this.checkMethod(data);
       // 如果该行禁止批量多选，则选择/取消单行 并触发单击事件
       if (this.selectType == 'checkbox' && forbiddenBatchSelect) {
-        /* 存在问题注释的代码
-         选中“禁用”行，会把之前的选中数据清空
-         table?.setAllCheckboxRow(false);
-        */
-        const value = this.getRowClassName({ row }) == 'single--checked' ? [] : [row];
+        // 选中“禁用”行，需要清空其它选择数据, 并且再次点击不要取消选中
+        table?.setAllCheckboxRow(false);
+        const value = [row];
         this.$set(this, 'checkedRows', value);
-        this.pubCheckChange(value);
+        this.pubCheckChange(value, { forbiddenBatchSelect });
         this.$emit('handlerClickRow', row, rowIndex, { source, column, trigger });
         return;
       }
@@ -2493,13 +2491,13 @@ export default create({
 
       this.setCurrentCheckedLength();
     },
-    pubCheckChange(rows = []) {
+    pubCheckChange(rows = [], config = {}) {
       this.treeTableLength = rows.filter(item => {
         let isGroupRow = vexutils.has(item, GROUP_TITLE_KEY);
         return !isGroupRow;
       }).length;
       this.visibleTreeCheck = rows.length > 1;
-      this.$emit('selectionChange', rows);
+      this.$emit('selectionChange', rows, config);
     },
     setCurrentPageRowChecked() {
       let table = this.$refs.xGrid;

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

@@ -265,7 +265,10 @@ export default {
           const [preItem0] = lineList[j + 1];
           if (preItem0) {
             const preStartMinute = new Date(preItem0).getTime();
-            if (preStartMinute > minMinute && preStartMinute <= maxMinute) rightLimit.x2 = this.computedX(preItem0);
+            if (preStartMinute > minMinute && preStartMinute <= maxMinute) {
+              rightLimit.x2 = this.computedX(preItem0);
+              if (!x2) leftLimit.x2 = rightLimit.x2;
+            }
           }
         }
 

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

@@ -610,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 = [];
@@ -649,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) {

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/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';