cnhis-design-vue 2.1.135 → 2.1.137

package/package.json

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

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

@@ -668,6 +668,7 @@ export default create({
         }
         // 处理富文本字段，转为字符串,判断是否为富文本,中转标志_temp+id，/<[^>]+>/g.test(i[item].replace(/<span (.*?)>(.*?)<\/span>$/g, ""))处理过大文本会卡住，replace的问题，直接判断有没有p元素就行
         Object.keys(i).map(item => {
+          let isHtml = this.checkHtml(i[item])
           if (i[item] && typeof i[item] == 'string' && i[item].indexOf('<p') !== -1 && item.indexOf('_temp_' + i.id) === -1) {
             i[item + '_temp_' + i.id] = i[item] || '';
             i[item] = this.htmlToText(i[item]);
@@ -684,7 +685,7 @@ export default create({
             isLink: col ? this.isLink(col, i) : undefined,
             isCopy:col ? this.isCopy(col, i) : undefined,
             tips:col ? this.handleValueTips(i, col) : undefined,
-            isHtml:this.checkHtml(i[item])
+            isHtml
           }
 
         });
@@ -1002,6 +1003,17 @@ export default create({
         }
       }
 
+
+      // 特别处理'true'与true, 让true == 'true'
+      if(item.btnLinkSwitchDefVal === true && key === 'true'){
+        item.btnLinkSwitchDefVal = 'true';
+      }
+
+      // 特别处理'false'与false, 让false == 'false'
+      if(item.btnLinkSwitchDefVal === false && key === 'false'){
+        item.btnLinkSwitchDefVal = 'false';
+      }
+
       let isEdit = this.isBatchEditing || this.isInlineEditing || this.isInlineAdding;
 
       let f = isEdit ? (this.listFormUnionSettingMap[item.columnName] ? disabled : true) : disabled;

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

@@ -186,13 +186,19 @@ export default {
               originY: 'center'
             })
           : null;
-        if (!text) return;
-        if (text.width > totalWidth)
-          text.set({
-            originX: 'right',
-            left: canvasWidth - 1
-          });
-        textList.push(text);
+        if (text) {
+          if (text.width > totalWidth)
+            text.set({
+              originX: 'right',
+              left: canvasWidth - 1
+            });
+          textList.push(text);
+        }
+        if (topTotal.divider?.show) {
+          const dividerY = (i + 2) * yCellHeightTop;
+          const divider = this.drawLine([endX, dividerY, endX + totalWidth, dividerY], topTotal.divider.style);
+          textList.push(divider);
+        }
       });
       const title = this.drawTextGroup(
         { width: totalWidth, height: spaceHeight, strokeWidth: 1 },

package/packages/fabric-chart/src/mixins/draw.js

@@ -42,14 +42,9 @@ export default {
       if (!Array.isArray(points)) return null; // 坐标点非数组
       if (points.length < 4) return null; // 坐标点位数不足 无法完成线的绘制
       if (points.filter(point => isNumber(point)).length < 4) return null; // 坐标点内可用数值不足 无法完成线的绘制
-      const lineStyle = this.isObject(style)
-        ? {
-            ...style
-          }
-        : {};
       return new this.fabric.Line(points, {
         ...this.defaultLineStyle,
-        ...lineStyle
+        ...style
       });
     },
     // 绘制文本区
@@ -223,6 +218,14 @@ export default {
 
       let obj1, obj2;
       switch (type) {
+        case 'rect':
+          // 矩形
+          return new this.fabric.Rect({
+            width: 8,
+            height: 8,
+            strokeWidth: 1,
+            ...commonOption
+          });
         case 'triangle':
           // 三角形
           return new this.fabric.Triangle({

package/src/directive/flexibleResize.js

@@ -95,6 +95,7 @@ export class FlexibleResize {
   toolInitStyle() {
     let style = "user-select:none;cursor:col-resize;position:absolute;";
     const mode = this.options.mode;
+    const styleAdd = this.options.style;
     if (/^V/.test(mode)) {
       style += "width: 8px;cursor:col-resize;";
     } else {
@@ -115,6 +116,15 @@ export class FlexibleResize {
       return v;
     }, "");
     style += p;
+    // 增加style样式
+    if (styleAdd) {
+      const styleStr = Object.keys(styleAdd).reduce((v,k) => {
+        const value = styleAdd[k];
+        v += `${k}:${value};`;
+        return v;
+      }, '')
+      style += styleStr;
+    }
     if (this.tool) {
       this.tool.style = style;
     }
@@ -139,7 +149,8 @@ export default {
       el: el,
       mode: value.mode || "VR",
       onMove: value.onMove,
-      onEnd: value.onEnd
+      onEnd: value.onEnd,
+      style: value.style
     });
   },
   unbind(el) {