cnhis-design-vue 2.1.57 → 2.1.59

package/packages/fabric-chart/src/components/TimeScaleValue.vue

@@ -1,115 +1,114 @@
-<template>
-  <div v-show="isShow" class="c-time-scalevalue" :style="{ '--left': popupStyle.left, '--top': popupStyle.top, '--height': popupStyle.height, '--width': popupStyle.width }">
-    <span
-      class="c-time-scalevalue-list"
-      v-show="index % 2 == 0"
-      v-for="(item, index) in times"
-      :key="item.left"
-      :style="{ left: `${item.left - item.width / 2}px`, '--font-size': popupStyle.fontSize }"
-    >
-      {{ item.time }}
-    </span>
-  </div>
-</template>
-
-<script>
-// import Vue from 'vue';
-// import DomPortal from 'vue-dom-portal';
-import vexutils from '@/utils/vexutils';
-import fabricCommon from '../mixins/fabricCommon';
-
-export default {
-  mixins: [fabricCommon],
-  props: {
-    times: {
-      type: Array,
-      required: true
-    }
-    // to: {
-    //   type: String,
-    //   default: 'body'
-    // }
-  },
-  // beforeCreate() {
-  //   Vue.use(DomPortal);
-  // },
-  data() {
-    return {
-      cFabricChart: null,
-      scrollEvent: null,
-      top: 0,
-      popupStyle: {
-        width: '1000px',
-        height: '80px',
-        left: 0,
-        top: 0,
-        fontSize: '12px'
-      },
-      isShow: false
-    };
-  },
-  mounted() {
-    this._timer = setInterval(() => {
-      if (document.readyState === 'complete') {
-        this.initDoc();
-        clearInterval(this._timer);
-      }
-    }, 500);
-  },
-  methods: {
-    initDoc() {
-      // this.to = this.templateData.top?.xScalevalue?.to || 'body';
-      const { xScalevalue } = this.$attrs.templateData.top || {};
-      const { canvasWidth, spaceHeight, xCellWidth } = this.propItems;
-      this.cFabricChart = document.querySelector('.c-fabric-chart');
-      // this.bodyHeight = document.body.getBoundingClientRect().height;
-      this.top = this.cFabricChart?.getBoundingClientRect()?.top || 0;
-      this.popupStyle = {
-        left: `${this.cFabricChart?.getBoundingClientRect()?.left || 0}px`,
-        top: `${xScalevalue?.popupTop || 0}px`,
-        width: `${canvasWidth}px`,
-        height: `${spaceHeight}px`,
-        fontSize: `${xScalevalue.style?.fontSize || 12}px`
-      };
-      // const spaceGridNumber = xScalevalue.spaceGridNumber || 3;
-      // this.marginLeft = `${xCellWidth * spaceGridNumber}px`;
-      // 节流的间隔时间不宜太大，因为实际top值不准，会造成判断条件不准确
-      this.scrollEvent = vexutils.throttle(this.scroll, 100);
-      window.addEventListener('scroll', this.scrollEvent, true);
-    },
-    scroll() {
-      if (this.cFabricChart) {
-        const { originY, spaceHeight } = this.propItems;
-        const top = this.cFabricChart.getBoundingClientRect().top;
-        const newOriginY = originY - spaceHeight;
-        const { xScalevalue } = this.$attrs.templateData.top || {};
-        const popupTop = xScalevalue?.popupTop || 0;
-        this.isShow = top + newOriginY < popupTop ? true : false;
-      }
-    }
-  },
-  beforeDestroy() {
-    this._timer && clearInterval(this._timer);
-    window.removeEventListener('scroll', this.scroll, true);
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.c-time-scalevalue {
-  position: fixed;
-  z-index: 999;
-  left: var(--left);
-  top: var(--top);
-  width: var(--width);
-  height: var(--height);
-  background: rgba(0, 0, 0, 0.6);
-  color: #fff;
-  &-list {
-    position: absolute;
-    line-height: var(--height);
-    transform-origin: center;
-    font-size: var(--font-size);
-  }
-}
-</style>
+<template>
+  <div v-show="isShow" class="c-time-scalevalue" :style="{ '--left': popupStyle.left, '--top': popupStyle.top, '--height': popupStyle.height, '--width': popupStyle.width }">
+    <span
+      class="c-time-scalevalue-list"
+      v-show="index % 2 == 0"
+      v-for="(item, index) in times"
+      :key="item.left"
+      :style="{ left: `${item.left - item.width / 2}px`, '--font-size': popupStyle.fontSize }"
+    >
+      {{ item.time }}
+    </span>
+  </div>
+</template>
+
+<script>
+// import Vue from 'vue';
+// import DomPortal from 'vue-dom-portal';
+import vexutils from '@/utils/vexutils';
+import fabricCommon from '../mixins/fabricCommon';
+
+export default {
+  mixins: [fabricCommon],
+  props: {
+    times: {
+      type: Array,
+      required: true
+    }
+    // to: {
+    //   type: String,
+    //   default: 'body'
+    // }
+  },
+  // beforeCreate() {
+  //   Vue.use(DomPortal);
+  // },
+  data() {
+    return {
+      cFabricChart: null,
+      scrollEvent: null,
+      top: 0,
+      popupStyle: {
+        width: '1000px',
+        height: '80px',
+        left: 0,
+        top: 0,
+        fontSize: '12px'
+      },
+      isShow: false
+    };
+  },
+  mounted() {
+    this._timer = setInterval(() => {
+      if (document.readyState === 'complete') {
+        this.initDoc();
+        clearInterval(this._timer);
+      }
+    }, 500);
+  },
+  methods: {
+    initDoc() {
+      // this.to = this.templateData.top?.xScalevalue?.to || 'body';
+      const { xScalevalue } = this.$attrs.templateData.top || {};
+      const { canvasWidth, spaceHeight, xCellWidth } = this.propItems;
+      this.cFabricChart = document.querySelector('.c-fabric-chart');
+      // this.bodyHeight = document.body.getBoundingClientRect().height;
+      this.top = this.cFabricChart?.getBoundingClientRect()?.top || 0;
+      this.popupStyle = {
+        left: `${this.cFabricChart?.getBoundingClientRect()?.left || 0}px`,
+        top: `${xScalevalue?.popupTop || 0}px`,
+        width: `${canvasWidth}px`,
+        height: `${spaceHeight}px`,
+        fontSize: `${xScalevalue.style?.fontSize || 12}px`
+      };
+      // const spaceGridNumber = xScalevalue.spaceGridNumber || 3;
+      // this.marginLeft = `${xCellWidth * spaceGridNumber}px`;
+      // 节流的间隔时间不宜太大，因为实际top值不准，会造成判断条件不准确
+      this.scrollEvent = vexutils.throttle(this.scroll, 100);
+      window.addEventListener('scroll', this.scrollEvent, true);
+    },
+    scroll() {
+      if (this.cFabricChart) {
+        const { originYTime } = this.propItems;
+        const top = this.cFabricChart.getBoundingClientRect().top;
+        const { xScalevalue } = this.$attrs.templateData.top || {};
+        const popupTop = xScalevalue?.popupTop || 0;
+        this.isShow = top + originYTime < popupTop ? true : false;
+      }
+    }
+  },
+  beforeDestroy() {
+    this._timer && clearInterval(this._timer);
+    window.removeEventListener('scroll', this.scroll, true);
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.c-time-scalevalue {
+  position: fixed;
+  z-index: 999;
+  left: var(--left);
+  top: var(--top);
+  width: var(--width);
+  height: var(--height);
+  background: rgba(0, 0, 0, 0.6);
+  color: #fff;
+  &-list {
+    position: absolute;
+    line-height: var(--height);
+    transform-origin: center;
+    font-size: var(--font-size);
+  }
+}
+</style>

package/packages/fabric-chart/src/const/defaultVaule.js

@@ -1,59 +1,60 @@
-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: 20, // 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/FabricCanvas.vue

@@ -60,8 +60,10 @@ export default {
           yCellHeight: this.yCellHeight,
           table: { ...this.templateData.table },
           spaceHeight: this.spaceHeight,
+          originYTime: this.originYTime,
           gridYnumberTop: this.gridYnumberTop,
           yCellHeightTop: this.yCellHeightTop,
+          originYTop: this.originYTop,
           endYTop: this.endYTop,
           treeList: this.treeList,
           xScaleList: this.xScaleList,
@@ -91,6 +93,11 @@ export default {
         console.warn(error);
       }
     }
+
+    this.throttleEvent = vexutils.throttle((event, componentInstance) => {
+      const { eventStyle = null, handleMoving = null } = componentInstance;
+      eventStyle.evented && handleMoving?.(event);
+    }, 50);
   },
   computed: {
     canvasWidth() {
@@ -127,10 +134,8 @@ export default {
       return originX + residue;
     },
     originY() {
-      // 顶部列表高度 网格不需要的高度放到顶部，因为底部不一定存在列表
-      const topHeight = this.endYTop;
-      const residue = (this.endY - topHeight) % this.gridYNumber;
-      return topHeight + residue + (this.templateData.top?.spaceHeight || defaultVaule.topSpaceHeight);
+      // 主网格起始高度值
+      return this.spaceHeight + (this.endYTop - this.originYTop);
     },
     endX() {
       // 网格区域水平方向最大坐标值, 也是整个画布右侧列表坐标起始值，网格右下角x轴坐标值
@@ -153,16 +158,22 @@ export default {
     },
     spaceHeight() {
       // 头部表格底部空白位置的高，用于显示x轴时间点
-      const topHeight = this.endYTop;
-      const residue = (this.endY - topHeight) % this.gridYNumber;
-      return residue + (this.templateData.top?.spaceHeight || defaultVaule.topSpaceHeight);
+      return this.templateData.top?.spaceHeight || defaultVaule.topSpaceHeight;
+    },
+    originYTime() {
+      return this.originYTop > 0 ? 0 : this.endYTop;
     },
     yCellHeightTop() {
       // 头部表格垂直方向网格高度
       return this.templateData.top?.treeTableminCellHeight || 20;
     },
     endYTop() {
-      return this.gridYnumberTop * this.yCellHeightTop;
+      const endYTop = this.gridYnumberTop * this.yCellHeightTop;
+      return this.originYTop + endYTop;
+    },
+    originYTop() {
+      const { layout = 'center' } = this.templateData.top?.xScalevalue || {};
+      return layout === 'center' ? 0 : this.spaceHeight;
     },
     // 转换为时间戳的x轴时间列表
     xScaleList() {
@@ -206,6 +217,13 @@ export default {
     },
     operable() {
       return this.templateData.table?.operable || { set: false, connect: false, lockMovementX: false };
+    },
+    fabricLinesInstances() {
+      return this.$slots.default.find(VNode => /lines/.test(VNode.tag))?.componentInstance;
+    },
+    fabricPolylinesInstances() {
+      // return this.$slots.default.filter(VNode => /(polylines)|(lines)/.test(VNode.tag));
+      return this.$slots.default.find(VNode => /polylines/.test(VNode.tag))?.componentInstance;
     }
   },
   mounted() {
@@ -224,6 +242,22 @@ export default {
         this.getGridYnumberTop(this.templateData.top.list);
         this.treeList = this.setTreeStyle(vexutils.clone(this.templateData.top.list, true));
       }
+
+      this.canvas.on('mouse:move', event => {
+        const { target, pointer } = event;
+        const { x, y } = pointer;
+        const { originX, endX, originY, endY, originYTop, endYTop } = this;
+        if (x > originX && x < endX && y > originYTop && y < endYTop && !target) {
+          this.throttleEvent?.(event, this.fabricLinesInstances);
+          this.fabricPolylinesInstances.isDropVisible = false;
+        } else if (x > originX && x < endX && y > originY && y < endY && !target) {
+          this.throttleEvent?.(event, this.fabricPolylinesInstances);
+          this.fabricLinesInstances.isDropVisible = false;
+        } else if (x <= originX || x >= endX || y <= originYTop || y >= endY) {
+          this.fabricPolylinesInstances.isDropVisible = false;
+          this.fabricLinesInstances.isDropVisible = false;
+        }
+      });
     },
     getGridYnumberTop(list) {
       // 头部表格垂直方向网格总数
@@ -258,7 +292,7 @@ export default {
         Object.assign(obj, {
           title: node.title || '',
           left: levelCol * treeTableminCellWidth,
-          top: this.levelRow * treeTableminCellHeight,
+          top: this.levelRow * treeTableminCellHeight + this.originYTop,
           origin: node.origin
         });
         this.levelRow++;