cnhis-design-vue 2.1.16 → 2.1.19

package/packages/button/src/ButtonPrint/js/print.es.min.js

@@ -2136,7 +2136,7 @@ var na = ''.concat('http://127.0.0.1:11111', '/services/print'),
             var r = e.resolve,
               n = e.reject;
             try {
-              console.log(t), r(JSON.parse(t.data));
+              console.log(t), r(JSON.parse(t.data.res));
             } catch (t) {
               n(t);
             }

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

@@ -1,43 +1,22 @@
 <template>
-  <div class="c-fabric-chart" :style="{'width': canvasWidth}">
-    <component
-      ref="canvasEle"
-      :is="`FabricCanvas${templateData.type || ''}`"
-      :id="id"
-      :templateData="templateData"
-      v-if="rendercanvas"
-    >
+  <div class="c-fabric-chart" :style="{ width: canvasWidth }">
+    <component ref="canvasEle" :is="`FabricCanvas${templateData.type || ''}`" :id="id" :templateData="templateData" v-if="rendercanvas">
       <template v-if="templateData.type">
         <fabric-grid></fabric-grid>
         <fabric-top2 :templateData="templateData"></fabric-top2>
         <fabric-left2 :templateData="templateData"></fabric-left2>
         <fabric-right2 :templateData="templateData"></fabric-right2>
         <fabric-bottom2 :templateData="templateData"></fabric-bottom2>
-        <fabric-center2
-          :other="templateData.other"
-          :polyline="templateData.left.leftYScalevalue"
-          v-on="$listeners"
-          @pointOperation="pointOperation"
-         ></fabric-center2>
+        <fabric-center2 :other="templateData.other" :polyline="templateData.left.leftYScalevalue" v-on="$listeners" @pointOperation="pointOperation"></fabric-center2>
       </template>
 
       <template v-else>
-        <fabric-text-group
-          v-if="hasXScalevalue"
-          :templateData="templateData"
-          v-on="$listeners"
-        ></fabric-text-group>
+        <fabric-text-group v-if="hasXScalevalue" :templateData="templateData" v-on="$listeners"></fabric-text-group>
         <fabric-grid></fabric-grid>
         <fabric-scale-value v-if="hasTable" :templateData="templateData"></fabric-scale-value>
         <fabric-lines v-if="hasTopTable" ref="lines" :linesObj="templateData.top" v-on="$listeners"></fabric-lines>
-        <fabric-polylines ref="polylines"
-          v-if="hasTable"
-          :polyline="polylines"
-          :other="templateData.left.other || {}"
-          @pointOperation="pointOperation"
-          v-on="$listeners"></fabric-polylines>
+        <fabric-polylines ref="polylines" v-if="hasTable" :polyline="polylines" :other="templateData.left.other || {}" @pointOperation="pointOperation" v-on="$listeners"></fabric-polylines>
       </template>
-      
     </component>
   </div>
 </template>
@@ -74,7 +53,7 @@ export default create({
     templateData: {
       type: Object,
       required: true
-    },
+    }
   },
   components: {
     FabricCanvas,
@@ -109,17 +88,17 @@ export default create({
     hasTable() {
       const hasLeft = this.templateData.left?.leftYScalevalue?.list?.length > 0;
       const hasRight = this.templateData.right?.rightYScalevalue?.list?.length > 0;
-      return this.hasXScalevalue && hasLeft && hasRight;
+      return this.hasXScalevalue && (hasLeft || hasRight);
     },
     hasXScalevalue() {
       return this.templateData.top?.xScalevalue?.list?.length > 0;
-    },
+    }
   },
   data() {
     return {
       rendercanvas: true,
       canvasWidth: 0
-    }
+    };
   },
   mounted() {
     this.canvasWidth = `${this.templateData.canvasWidth}px` || '1000px';
@@ -159,21 +138,21 @@ export default create({
       // 在组件移除后，重新渲染组件
       // this.$nextTick可实现在DOM 状态更新后，执行传入的方法。
       this.$nextTick(() => {
-          this.rendercanvas = true;
-      })
+        this.rendercanvas = true;
+      });
       // this.$refs.canvasEle.renderCanvas();
     },
     removeSelectArea() {
       this.$nextTick(() => {
         this.$refs.polylines.removeSelectArea();
-      })
+      });
     }
   }
 });
 </script>
 
 <style lang="less" scoped>
-  .c-fabric-chart {
-    position: relative;
-  }
+.c-fabric-chart {
+  position: relative;
+}
 </style>

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

@@ -1,117 +1,113 @@
-<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.$nextTick(() => {
-      setTimeout(() => {
-        this.init();
-      }, 0);
-    });
-  },
-  methods: {
-    init() {
-      // 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;
-      this.popupStyle = {
-        left: `${this.cFabricChart.getBoundingClientRect().left}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;
-        if (top + newOriginY < popupTop) {
-          this.isShow = true;
-        } else {
-          this.isShow = false;
-        }
-      }
-    }
-  },
-  beforeDestroy() {
-    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.$nextTick(() => {
+      setTimeout(() => {
+        this.init();
+      }, 0);
+    });
+  },
+  methods: {
+    init() {
+      // 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;
+      this.popupStyle = {
+        left: `${this.cFabricChart.getBoundingClientRect().left}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() {
+    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,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/FabricCanvas.vue

@@ -82,9 +82,10 @@ export default {
         console.warn(error);
       }
     }
-    if (!this.templateData.left || !this.templateData.right) {
+    // if (!this.templateData.left || !this.templateData.right) {
+    if (!this.templateData.left) {
       try {
-        throw new Error('缺少左/右侧数据对象, 无法生成垂直方向刻度');
+        throw new Error('缺少左侧数据对象, 无法生成垂直方向刻度');
       } catch (error) {
         console.warn(error);
       }
@@ -133,7 +134,7 @@ export default {
     endX() {
       // 网格区域水平方向最大坐标值, 也是整个画布右侧列表坐标起始值，网格右下角x轴坐标值
       if (!this.templateData.right && !this.topTotal) return this.templateData.canvasWidth;
-      return this.templateData.canvasWidth - (this.templateData.right?.width || 20) - this.topTotal.width;
+      return this.templateData.canvasWidth - (this.templateData.right?.width ?? 20) - this.topTotal.width;
     },
     endY() {
       // 画布高度 - 底部列表高度 ，网格右下角y轴坐标值