cnhis-design-vue 2.1.145 → 2.1.147

package/package.json

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

package/packages/button/src/ButtonPrint/index.vue

@@ -148,6 +148,12 @@ export default create({
     getProps() {
       return this.$props;
     }
+  },
+  methods: {
+    // 向外抛出vue2组件直接调用内部的方法
+    handleClickBtn() {
+      this.$refs.printComponentRef.handleClickBtn();
+    }
   }
 });
 </script>

package/packages/button/src/ButtonPrint/new.vue

@@ -68,7 +68,8 @@
     <a-button-group v-else>
       <a-button style="display: flex;align-items: center;" :loading="this.spinning" @click.stop="printAllButtonClick">
         <a-icon type="printer" v-if="!this.spinning"/>
-        {{ isShowPrintAllBtn ? '打印全部' : defaultFormatTitle ? defaultFormatTitle : btnText }}
+        <!-- 如果允许打印全部则展示打印全部，否则展示传入的动态按钮名称 -->
+        {{ isShowPrintAllBtn ? '打印全部' : btnText }}
       </a-button>
       <a-button
         v-if="innerPrintItems.length == 0"
@@ -347,17 +348,17 @@ export default create({
       return this.options.every(option => option.selected);
     },
     // 设置默认format的标题
-    defaultFormatTitle() {
-      const curFormat = this.innerPrintItems.find(option => option.key == this.defaultPrintFormatId);
-      if (curFormat) {
-        return `打印${curFormat.label}`;
-      }
-      // 如果innerPrintItems长度只有一项，则默认选中它
-      if (this.innerPrintItems.length == 1) {
-        return `打印${this.innerPrintItems[0].label}`;
-      }
-      return ''
-    },
+    // defaultFormatTitle() {
+    //   const curFormat = this.innerPrintItems.find(option => option.key == this.defaultPrintFormatId);
+    //   if (curFormat) {
+    //     return `打印${curFormat.label}`;
+    //   }
+    //   // 如果innerPrintItems长度只有一项，则默认选中它
+    //   if (this.innerPrintItems.length == 1) {
+    //     return `打印${this.innerPrintItems[0].label}`;
+    //   }
+    //   return ''
+    // },
   },
   data() {
     return {

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

@@ -58,6 +58,14 @@ export default {
       this.createLine();
       this.eventStyle.evented && this.createEvent();
     },
+    isTopTreeAndGridLimit(x, y) {
+      const { endX, endYTop, originYTop } = this.propItems;
+      return x >= 0 && x <= endX && y >= originYTop && y <= endYTop;
+    },
+    isGridLimit({ x, y }) {
+      const { originX, endX, endYTop, originYTop } = this.propItems;
+      return x >= originX && x <= endX && y >= originYTop && y <= endYTop;
+    },
     createEvent() {
       this.canvas.on('mouse:up', event => {
         if (event.button === 3) {
@@ -104,25 +112,37 @@ export default {
           this.rightClickNode = Object.freeze(rightClickNode.slice());
           this.isRightVisible = true;
         } else {
-          this.doContextmenuEvent(this.activeEvent.pointer);
+          this.doContextmenuEvent(id, this.activeEvent.pointer);
         }
       });
     },
-    doContextmenuEvent(pointer) {
+    doContextmenuEvent(id, pointer) {
       const { x, y } = pointer;
       const { treeList } = this.$propItems();
       const _treeList = vexutils.clone(treeList, true);
-      let data;
+      const param = { type: 'tree', treeData: [] };
+      const isBlankGrid = !id && this.isGridLimit(pointer);
+      if (isBlankGrid) {
+        param.type = 'grid';
+        param.time = this.getXValue(x);
+        param.lineData = [];
+      }
       ergodicTree(_treeList);
-      data && this.$emit('rightClick', data);
-      data = null;
+      this.$emit('rightClick', param);
       function ergodicTree(tree) {
         for (let i = 0, len = tree.length; i < len; i++) {
-          const { left, top, width, height, children = [], origin } = tree[i];
-          if (x >= left && x <= left + width && y >= top && y <= y + height) {
-            data = origin;
-          } else if (children.length) {
-            ergodicTree(children);
+          const { left, top, width, height, children = [], origin, lineList = [] } = tree[i];
+          if (y >= top && y <= top + height) {
+            if (x >= left && x <= left + width) {
+              param.treeData = origin;
+              break;
+            } else if (children.length) {
+              ergodicTree(children);
+            } else if (isBlankGrid) {
+              param.treeData = origin;
+              param.lineData = lineList;
+              break;
+            }
           }
         }
       }

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

@@ -14,7 +14,7 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 import Bus from '../utils/bus';
-import { nearlyEqual, getUuid } from '../utils';
+import { nearlyEqual, getUuid, toReversed } from '../utils';
 import vexutils from '@/utils/vexutils';
 
 /**
@@ -1063,7 +1063,7 @@ export default {
         if (isRight) {
           this._concatIndex = polylineObj?.pointerList.findIndex(l => l + n > left && l > originLeft);
         } else {
-          const idx = polylineObj?.pointerList.toReversed().findIndex(l => l - n < left && l < originLeft);
+          const idx = polylineObj?.pointerList?.length ? toReversed(polylineObj?.pointerList).findIndex(l => l - n < left && l < originLeft) : -1;
           this._concatIndex = !~idx ? -1 : polylineObj?.pointerList.length - 1 - idx;
         }
         if (!~this._concatIndex) {

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

@@ -72,10 +72,6 @@ export default {
     isGridLimit(x, y) {
       const { originX, originY, endX, endY } = this.propItems;
       return x >= originX && x <= endX && y >= originY && y <= endY;
-    },
-    isTopTreeAndGridLimit(x, y) {
-      const { endX, endYTop, originYTop } = this.propItems;
-      return x >= 0 && x <= endX && y >= originYTop && y <= endYTop;
     }
   }
 };

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

@@ -1,3 +1,5 @@
+import vexutils from '@/utils/vexutils';
+
 export const isNumber = num => {
   return typeof num === 'number' && Number.isFinite(num);
 };
@@ -95,3 +97,8 @@ export function getUuid() {
     return v.toString(16);
   });
 }
+
+export function toReversed(arr) {
+  const copyArr = vexutils.clone(arr, true);
+  return copyArr.reverse();
+}