cnhis-design-vue 2.1.61 → 2.1.62

package/package.json

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

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

@@ -2290,6 +2290,8 @@ export default create({
       if (this.isScanMultiTable || this.isInlineOperating) return false;
       if (vexutils.has(row, GROUP_TITLE_KEY)) return false;
       this.$emit('setNestTableClick', this.isNestTable);
+      let table = this.$refs.xGrid;
+      this.setTableCurrentRow(table, row, true)
       this.$emit('rowdblclick', row, column, true, true);
     },
     // 行单击
@@ -2585,8 +2587,8 @@ export default create({
       this.pubCheckChange(records);
       return true;
     },
-    setTableCurrentRow(table, row) {
-      if(!this.aboutPositionBtm) return
+    setTableCurrentRow(table, row, isSet) {
+      if(!this.aboutPositionBtm && !isSet) return
       setTimeout(() => {
         table.setCurrentRow(row);
       }, 30)

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

@@ -35,7 +35,6 @@ export default {
   },
   data() {
     return {
-      isRightVisible: false,
       rightPos: { clientX: 0, clientY: 0 },
       rightClickNode: [],
       activeEvent: null, // 当前可右键活动的对象
@@ -178,12 +177,11 @@ export default {
         let x2 = this.cumputedX(item[1]);
         // 数字文字
         const textObj = item[3] || {};
-        const textContent = textObj.content || '';
-
+        const { content: textContent, continue: isContinue } = textObj;
         // 左边手柄竖线
         let leftLine;
         if (x1 && x1 >= originX && x1 <= endX) {
-          leftLine = await this.drawGroup(x1, x2, y1 + spaceHeight, y2 - spaceHeight, i, j, { position: 'left', customIcon: !endMinute ? true : false });
+          leftLine = await this.drawGroup(x1, x2, y1 + spaceHeight, y2 - spaceHeight, i, j, { position: 'left', customIcon: !endMinute && !isContinue ? true : false, isContinue });
           lineItemList.push(leftLine);
         } else if (x1 < originX) {
           x1 = originX;
@@ -348,7 +346,7 @@ export default {
       const id = '_lineGroup_' + Date.now();
       let point;
       let left;
-      const { position, customIcon } = others;
+      const { position, customIcon, isContinue } = others;
       if (position === 'left') {
         point = [x1, y1, x1, y2];
         left = x1 - this.propItems.xCellWidth / 2;
@@ -357,6 +355,7 @@ export default {
         left = x2 - this.propItems.xCellWidth / 2;
       }
       let line;
+      let arrow;
       const common = {
         selectable: false,
         evented: false
@@ -385,6 +384,19 @@ export default {
           ...dataLineStyle,
           ...common
         });
+        arrow = isContinue
+          ? await this.ceateLineArrow({
+              left: x1,
+              top: y1 + (y2 - y1) / 2,
+              originY: 'center',
+              width: 14,
+              height: 5,
+              arrowwidth: 6,
+              arrowheight: 5,
+              ...dataLineStyle,
+              ...common
+            })
+          : null;
       }
       const rect = new this.fabric.Rect({
         width: this.propItems.xCellWidth,
@@ -396,7 +408,7 @@ export default {
         evented: false
       });
 
-      return new this.fabric.Group([line, rect], {
+      return new this.fabric.Group([line, rect, ...(arrow ? [arrow] : [])], {
         selectable: true,
         evented: true,
         originX: 'center',
@@ -554,7 +566,7 @@ export default {
           v = left + (centerLine.width / 2) * (line.line2 ? -1 : 1);
           originX = 'center';
         } else {
-          v = this.textMarginLeft + (centerLine ? centerLine.x2 : left);
+          v = this.textMarginLeft + (centerLine ? centerLine.x2 : left + 3);
           originX = 'left';
           // 移动到最右边界时候文字超出当前线段可拖动的右边界的情况
           if (line.textLimitRight && v + limitWidth > line.textLimitRight) {

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

@@ -13,6 +13,7 @@ import eventCommon from '../mixins/eventCommon';
 import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
+import Bus from '../utils/bus';
 
 /**
  * @description: 递归遍历节点，设置颜色属性
@@ -75,7 +76,6 @@ export default {
       isDropVisible: false,
       dropVal: {},
       dropPos: { clientX: 0, clientY: 0 },
-      isRightVisible: false,
       rightPos: { clientX: 0, clientY: 0 },
       rightClickNode: [],
       activeEvent: null, // 当前可右键活动的对象
@@ -84,7 +84,8 @@ export default {
       isSelectArea: false, // 是否正在选区
       selectArea: null, // 选区矩形对象
       currentDelPoint: null, // 缓存当前可批量删除的项目线段上的点
-      polylinePointList: [] // 缓存折线项目节点
+      polylinePointList: [], // 缓存折线项目节点
+      isMovingToOtherTarget: false
     };
   },
   computed: {
@@ -102,7 +103,12 @@ export default {
 
   watch: {},
 
-  mounted() {},
+  mounted() {
+    Bus.$on('mouseoverTarget', isMovingToOtherTarget => {
+      this.isMovingToOtherTarget = isMovingToOtherTarget;
+      if (isMovingToOtherTarget) this.isDropVisible = false;
+    });
+  },
 
   methods: {
     init() {
@@ -150,6 +156,8 @@ export default {
       });
     },
     handleMoving(event) {
+      // 如果移动到其他节点如气血分析、标记位节点上时需要隐藏折线组件中的提示弹框
+      if (this.isMovingToOtherTarget) return;
       const { pointer } = event;
       const { x, y } = pointer;
       this.dropPointer = { ...pointer };

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

@@ -12,6 +12,7 @@ import defaultVaule from '../const/defaultVaule';
 import DropPopup from '../components/DropPopup';
 import MouseRightClick from '../components/MouseRightClick';
 import eventCommon from '../mixins/eventCommon';
+import Bus from '../utils/bus';
 
 const rightClickNode = [
   { name: '修改', type: 'edit' },
@@ -55,6 +56,11 @@ export default {
         }
       },
       deep: true
+    },
+    isRightVisible: {
+      handler(value) {
+        Bus.$emit('mouseoverTarget', value);
+      }
     }
   },
   data() {
@@ -63,7 +69,6 @@ export default {
       isDropVisible: false,
       dropVal: {},
       dropPos: { clientX: 0, clientY: 0 },
-      isRightVisible: false,
       rightPos: { clientX: 0, clientY: 0 },
       rightClickNode: [],
       activeEvent: null // 当前可右键活动的对象
@@ -276,33 +281,39 @@ export default {
         for (let i = 0, len = dataList.length; i < len; i++) {
           const v = dataList[i];
           if (this.isLimit(v.time)) {
+            const commonOptions = {
+              originY: 'center',
+              top,
+              dataIndex: index,
+              index: i,
+              type: 'list'
+            };
             const icon = await this.createPoint(_icon.type, {
+              originX: 'center',
               left: this.cumputedX(v.time),
-              top,
-              originY: 'center',
               ...item.style,
               ...(item.style ? { stroke: item.style.fill } : {}),
               ...(_icon.style || {}),
-              lockMovementX: true,
-              lockMovementY: true,
-              ...this.eventStyle
+              ...commonOptions
             });
             const text = new this.fabric.Text(String(v.value), {
               ...defaultVaule.style,
               ...defaultVaule.textStyle,
               ...item.style,
-              originY: 'center',
-              left: icon.left + icon.width,
-              top,
-              dataIndex: index,
-              index: i,
-              type: 'list',
+              left: icon.left + icon.width / 2,
+              name: v.value,
+              ...commonOptions
+            });
+            const groupObj = new this.fabric.Group([icon, text], {
               id: `${index}_${i}_other_${Date.now()}`,
-              name: v.value
+              lockMovementX: true,
+              lockMovementY: true,
+              ...commonOptions,
+              ...this.eventStyle
             });
-            icon.hasControls = icon.hasBorders = false;
-            this.setPopup(icon);
-            textList.push(icon, text);
+            groupObj.hasControls = groupObj.hasBorders = false;
+            this.setPopup(groupObj);
+            textList.push(groupObj);
           }
         }
       }
@@ -310,9 +321,11 @@ export default {
     },
     setPopup(point) {
       point.on('mouseover', () => {
+        Bus.$emit('mouseoverTarget', true);
         this.showDrapPopup(point, true);
       });
       point.on('mouseout', () => {
+        !this.isRightVisible && Bus.$emit('mouseoverTarget', false);
         this.isDropVisible = false;
       });
     },
@@ -527,7 +540,6 @@ export default {
       }
     },
     showDrapPopup(point) {
-      // 第二个参数表示需要展示提供的viewTime时间
       this.isDropVisible = true;
       this.dropPos = {
         left: point.left,

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

@@ -201,7 +201,7 @@ export default {
         stroke: data.stroke,
         originX: 'center',
         originY: 'center',
-        left: data.left + data.width - data.arrowwidth,
+        left: data.left + data.width - data.arrowwidth + 1,
         top: data.top,
         angle: 270
       });

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

@@ -6,13 +6,14 @@ export default {
         x: 0,
         y: 0
       },
-      dropTimer: null
+      dropTimer: null,
+      isRightVisible: false
     };
   },
   watch: {
     dropPointer: {
       handler(value) {
-        if (value) {
+        if (value && !this.isMovingToOtherTarget && !this.isRightVisible) {
           this.isDropVisible = true;
           clearTimeout(this.dropTimer);
           this.dropTimer = setTimeout(() => {
@@ -21,6 +22,11 @@ export default {
         }
       },
       deep: true
+    },
+    isRightVisible: {
+      handler(value) {
+        if (value) this.isDropVisible = false;
+      }
     }
   },
   mounted() {

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

@@ -0,0 +1,2 @@
+import Vue from 'vue';
+export default new Vue();

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -1390,7 +1390,11 @@ export default create({
               value = cval.join("|#|");
             }
           } else {
-            value = optionSetting0? item.value : item.value.join("|#|");
+            value = item.value
+            // 多选有时候数据类型是string join会报错
+            if (item.value && Array.isArray(item.value) && !optionSetting0) {
+              value = item.value.join("|#|");
+            }
           }
         } else if (vexutils.anyNotEmpty(item.CONVERT) && Array.isArray(item.CONVERT)) {
           value = item.CONVERT.map(item => {