cnhis-design-vue 2.1.42 → 2.1.44

package/package.json

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

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

@@ -1314,6 +1314,7 @@ export default create({
           sortable = false;
         }
 
+        let showOverflow = this.handleShowOverflow(item);
         const col = Object.assign(item, {
           // 全部行编辑 隐藏“操作”
           visible: item.columnName == 'operatorColumn' ? (this.isEditAllRow ? false : showButtonTop == 0) : item.isShow == 1,
@@ -1328,7 +1329,7 @@ export default create({
 
           headerClassName: 'mycolumn', // 文本溢出处理('tooltip' vxe-table当前版本存在bug)
           // showHeaderOverflow: "title",
-          showOverflow: item.columnName == 'operatorColumn' ? false : 'title',
+          showOverflow: showOverflow,
           treeNode: treeNode,
           type: type,
           slots: {
@@ -1377,6 +1378,25 @@ export default create({
       this.columnLen = currentColumns.filter(item => item.visible).length;
       return columns;
     },
+    // 2022/12/1 沈培均/方晶晶要求新增 如果有自定义提示就不显示表格自带的提示
+    handleShowOverflow(item) {
+      if (item.columnName == "operatorColumn") return false;
+      let {showSetting} = item.settingObj || {}
+      if (!showSetting || !showSetting.length) return 'title';
+      let hasTips = 'title';
+      let i = 0, len = showSetting.length, v;
+      for(; i < len; i++) {
+        v = showSetting[i];
+        if (v?.filter?.length) {
+          let tips = v.filter.some(l => l.tips);
+          if (tips) {
+            hasTips = false;
+            break;
+          }
+        }
+      }
+      return hasTips;
+    },
     // 分组表头处理
     handleGroupColums(columns) {
       let { rowGroupSetting } = this;

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

@@ -253,7 +253,6 @@ export default {
       }
 
       const eventStyle = { selectable: false, evented: false };
-      const types = ['arrow', '+', 'shjs', 'shks', 'cg', 'jxtq', 'qgcg', 'zrhz'];
       leftTitleList.forEach(async (v, i) => {
         const baseTop = canvasHeight - lableMargin[1];
         const top = baseTop - i * lableLineHeight;
@@ -269,14 +268,13 @@ export default {
           ...defaultVaule.style,
           id: pointId
         });
-        const isOriginXCenter = types.includes(v.type);
-        const iconLeft = isOriginXCenter ? text.width + text.left + 10 : text.width + text.left + 5;
+        const iconLeft = text.width + text.left + 10;
         const option = {
           left: iconLeft,
           top,
           ...v.pointAttr,
           originY: 'center',
-          originX: isOriginXCenter ? 'center' : 'left',
+          originX: 'center',
           lineAttr: v.lineAttr || '',
           pointAttr: v.pointAttr,
           id: pointId,