cnhis-design-vue 2.1.34 → 2.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.34",
+  "version": "2.1.36",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -76,6 +76,7 @@
     "eslint": "^6.8.0",
     "eslint-plugin-vue": "^6.2.2",
     "filemanager-webpack-plugin": "^2.0.5",
+    "git-flow": "^0.2.0",
     "highlight.js": "^10.7.2",
     "husky": "^4.3.7",
     "less": "^3.9.0",

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

@@ -2254,7 +2254,7 @@ export default create({
       // 嵌套表与主表click切换时需要清除上次的选中
       this.isAboutNestTable && this.$emit('resetNestLastClickTable', table);
 
-      let { row, $event = {}, rowIndex } = data;
+      let { row, $event = {}, rowIndex, source } = data;
       // 点击主表格展开行按钮 不需要触发选中行
       let { className } = $event.target || {};
       if (className && vexutils.isString(className) && className.includes('vxe-table--expand-btn')) return;
@@ -2278,7 +2278,7 @@ export default create({
         const value = this.getRowClassName({ row }) == 'single--checked' ? [] : [row];
         this.$set(this, 'checkedRows', value);
         this.pubCheckChange(value);
-        this.$emit('handlerClickRow', row, rowIndex);
+        this.$emit('handlerClickRow', row, rowIndex, {source});
         return;
       }
       this.visibleCheckAllWrap = false;
@@ -2324,7 +2324,7 @@ export default create({
           }
           this.updateAddCheckedRows(rowVal, true);
           // 需要选中行
-          this.$emit('handlerClickRow', rowVal);
+          this.$emit('handlerClickRow', rowVal, rowIndex, {source});
           return;
         }
         let newTheUniqueKeyArr = [];
@@ -2343,7 +2343,7 @@ export default create({
       if (rowLen > 1) {
         this.selectType != 'radio' && table.setCheckboxRow([row], true);
         this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange(newRow);
-        this.selectType != 'radio' && this.$emit('handlerClickRow', row, rowIndex);
+        this.selectType != 'radio' && this.$emit('handlerClickRow', row, rowIndex, {source});
       } else {
         setChecked = !setChecked;
         if (!setChecked) {
@@ -2357,7 +2357,7 @@ export default create({
         this.selectType != 'radio' && table.setCheckboxRow([row], setChecked);
       }
       if (this.isTree != 0) {
-        setChecked && this.$emit('handlerClickRow', row, rowIndex);
+        setChecked && this.$emit('handlerClickRow', row, rowIndex, {source});
         return;
       }
 
@@ -2370,7 +2370,7 @@ export default create({
       }
       this.setCurrentCheckedLength();
       this.lastPageIndex = this.pageVO.pageIndex;
-      setChecked && this.$emit('handlerClickRow', row, rowIndex);
+      setChecked && this.$emit('handlerClickRow', row, rowIndex, {source});
     },
     /**
      * 单选行数据 树结构 扁平化处理
@@ -2646,9 +2646,11 @@ export default create({
       // e.stopPropagation();
       // 方晶晶验收2.5.12需求, 要求link字段第一次可选中checkbox, 第二次点击不取消选中
       let isCheckedByCheckboxRow = vxeTable.isCheckedByCheckboxRow(row);
-      if (isCheckedByCheckboxRow) {
-        e.stopPropagation();
+      // 不冒泡 手动触发方法
+      if (!isCheckedByCheckboxRow) {
+        this.handlerClickRow({row, rowIndex: index, source:'linkDetail'})
       }
+      e.stopPropagation();
       vxeTable.setCurrentRow(row);
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);

package/packages/big-table/src/components/AutoLayoutButton.vue

@@ -177,12 +177,12 @@ export default {
           <a-icon type="more" style="cursor: pointer;" />
           <a-menu slot="overlay">
             {this.hideList.map((b, j) => {
-              return (
+              return b ? (
                 <a-menu-item key={b.sid} class="c_dropdown-btn" on-click={e => this.clickBtn(row, b, index, e.domEvent, j)}>
                   {this.getBtnIcon(b)}
                    {b.showStyle === 'only_icon' ? '' : this.handleName(b)}
                 </a-menu-item>
-              );
+              ): null;
             })}
           </a-menu>
         </a-dropdown>
@@ -238,7 +238,7 @@ export default {
         // 展示的按钮宽度和加上“更多按钮”的宽度大于容器的宽度，showList 最后一个按钮移动到 hideList
         if(this.hideList.length > 0 && (showBtnListWidth + 15 > wrapWidth)){
             let t = this.showList.pop();
-            this.hideList.unshift(t);
+            t && this.hideList.unshift(t);
         }
     },
 

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

@@ -1,23 +1,12 @@
 <template>
   <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>
-      </template>
-
-      <template v-else>
-        <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>
-      </template>
-    </component>
+    <fabric-canvas ref="canvasEle" v-bind="$attrs" :templateData="templateData" v-if="rendercanvas">
+      <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-canvas>
   </div>
 </template>
 
@@ -29,27 +18,16 @@
  */
 import create from '@/core/create';
 import FabricCanvas from './fabric-chart/FabricCanvas';
-import FabricCanvas2 from './fabric-chart2/FabricCanvas';
 import FabricPolylines from './fabric-chart/FabricPolylines';
 import FabricGrid from './FabricGrid';
 import FabricTextGroup from './fabric-chart/FabricTextGroup';
 import FabricScaleValue from './fabric-chart/FabricScaleValue';
 import FabricLines from './fabric-chart/FabricLines';
-import FabricTop2 from './fabric-chart2/FabricTop';
-import FabricLeft2 from './fabric-chart2/FabricLeft';
-import FabricRight2 from './fabric-chart2/FabricRight';
-import FabricBottom2 from './fabric-chart2/FabricBottom';
-import FabricCenter2 from './fabric-chart2/FabricCenter';
 import { isObject } from './mixins/type';
 
 export default create({
   name: 'fabric-chart',
   props: {
-    id: {
-      type: String,
-      required: false,
-      default: 'c-fabric-canvas'
-    },
     templateData: {
       type: Object,
       required: true
@@ -57,17 +35,11 @@ export default create({
   },
   components: {
     FabricCanvas,
-    FabricCanvas2,
     FabricGrid,
     FabricTextGroup,
     FabricPolylines,
     FabricScaleValue,
-    FabricLines,
-    FabricTop2,
-    FabricLeft2,
-    FabricRight2,
-    FabricBottom2,
-    FabricCenter2
+    FabricLines
   },
   computed: {
     polylines() {

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

@@ -5,16 +5,10 @@ export default {
   name: 'fabric-grid',
   mixins: [fabricCommon, draw],
   data() {
-    return {
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initGrid();
-    });
+    return {};
   },
   methods: {
-    initGrid() {
+    init() {
       // 主表格
       this.createGrid(this.propItems.originY, this.propItems.endY, this.propItems.gridYNumber, this.propItems.yCellHeight);
 
@@ -22,7 +16,6 @@ export default {
       if (!this.propItems.type) {
         this.createGrid(0, this.propItems.endYTop, this.propItems.gridYnumberTop, this.propItems.yCellHeightTop);
       }
-      
     },
     createGrid(originY, endY, gridYNumber, yCellHeight) {
       const yList = [];
@@ -63,7 +56,7 @@ export default {
       });
       this.canvas.add(group);
       this.canvas.sendToBack(group);
-      this.canvas.renderAll();
+      // this.canvas.renderAll();
     }
   },
   render(h) {

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

@@ -49,22 +49,23 @@ export default {
     };
   },
   mounted() {
-    this.$nextTick(() => {
-      setTimeout(() => {
-        this.init();
-      }, 0);
-    });
+    this._timer = setInterval(() => {
+      if (document.readyState === 'complete') {
+        this.initDoc();
+        clearInterval(this._timer);
+      }
+    }, 500);
   },
   methods: {
-    init() {
+    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;
+      this.top = this.cFabricChart?.getBoundingClientRect()?.top || 0;
       this.popupStyle = {
-        left: `${this.cFabricChart.getBoundingClientRect().left}px`,
+        left: `${this.cFabricChart?.getBoundingClientRect()?.left || 0}px`,
         top: `${xScalevalue?.popupTop || 0}px`,
         width: `${canvasWidth}px`,
         height: `${spaceHeight}px`,
@@ -88,6 +89,7 @@ export default {
     }
   },
   beforeDestroy() {
+    this._timer && clearInterval(this._timer);
     window.removeEventListener('scroll', this.scroll, true);
   }
 };

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

@@ -14,7 +14,7 @@ export default {
   props: {
     id: {
       type: String,
-      required: true
+      default: 'c-fabric-canvas'
     },
     templateData: {
       type: Object,
@@ -204,7 +204,7 @@ export default {
       return this.templateData.table?.eventStyle || { selectable: true, evented: true };
     },
     operable() {
-      return this.templateData.table?.operable || { set: false, connect: false };
+      return this.templateData.table?.operable || { set: false, connect: false, lockMovementX: false };
     }
   },
   mounted() {
@@ -212,7 +212,7 @@ export default {
   },
   methods: {
     init() {
-      this.canvas = new this.fabric.Canvas('c-fabric-canvas', {
+      this.canvas = new this.fabric.Canvas(this.id, {
         width: this.templateData.canvasWidth,
         height: this.templateData.canvasHeight,
         //   margin: [this.templateData.margin.top, this.templateData.margin.right, this.templateData.margin.bottom, this.templateData.margin.left],

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

@@ -47,27 +47,7 @@ export default {
       return this.linesObj?.eventStyle || { selectable: true, evented: true };
     }
   },
-
-  watch: {
-    // linesObj: {
-    //   handler(value) {
-    //     if (value) {
-    //       if (this.lines.length) {
-    //         this.removeLines();
-    //       }
-    //       this.getLineList(this.linesObj.list);
-    //       this.createLine();
-    //     }
-    //   },
-    //   deep: true
-    // },
-  },
-
-  mounted() {
-    this.$nextTick(() => {
-      this.init();
-    });
-  },
+  mounted() {},
 
   methods: {
     init() {
@@ -282,7 +262,7 @@ export default {
         this.lineEvent({ line: rightLine, line2: centerLine, text, textObj, limitX: rightLimt, startTime: item[0], endTime: item[1], preText: null, textLimitRight: rightLimt.x2 });
       });
       this.canvas.add(...lineItemList, ...textList);
-      this.canvas.requestRenderAll();
+      // this.canvas.requestRenderAll();
     },
     drawLineText(textArr, top, i, j, centerLine, x1, x2) {
       // const value = textArr.map(v => {
@@ -394,7 +374,7 @@ export default {
           this.lineMoveLimit(line);
           this.lineMoveUpdateLine(line);
           this.textUpdatePositionX(line);
-          this.canvas.renderAll();
+          // this.canvas.renderAll();
           this.showDrapPopup(line);
         });
         line.on('moved', () => {