cnhis-design-vue 2.1.93 → 2.1.95

package/package.json

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

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

@@ -459,7 +459,7 @@ export default create({
     },
     getTemplateIdByFormatId(id) {
       let find = this.formatList.find(item => item.id === id);
-      return find.templateId;
+      return find?.templateId || '';
     },
     getOnceParams() {
       // 聚合一条

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

@@ -1,8 +1,8 @@
 <template>
   <div class="c-fabric-chart" :style="{ width: canvasWidth }">
     <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-text-group v-if="hasXScalevalue" :templateData="templateData" v-on="$listeners"></fabric-text-group>
       <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

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

@@ -1,7 +1,8 @@
 const data = {
   style: {
     evented: false,
-    selectable: false
+    selectable: false,
+    objectCaching: false
   },
   rectStyle: {
     fill: 'transparent',

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

@@ -46,6 +46,7 @@ export default {
           type: this.templateData.type,
           endX: this.endX,
           endY: this.endY,
+          markHeight: this.markHeight,
           originX: this.originX,
           originY: this.originY,
           treeTableminCellWidth: this.treeTableminCellWidth,
@@ -105,6 +106,15 @@ export default {
       // 画布高度
       return this.templateData.canvasHeight;
     },
+    layout() {
+      return (
+        this.templateData.layout || {
+          top: 'drug',
+          center: 'xAxis',
+          bottom: 'intraoperatively'
+        }
+      );
+    },
     treeTableminCellWidth() {
       return this.templateData.top?.treeTableminCellWidth || this.templateData.left?.titleWidth || 20;
     },
@@ -132,18 +142,17 @@ export default {
     },
     originY() {
       // 主网格起始高度值
-      return this.spaceHeight + (this.endYTop - this.originYTop);
+      const currentLayout = this.getLayout('intraoperatively') || 'bottom';
+      return this.getOriginTop(currentLayout);
     },
     endX() {
-      // 网格区域水平方向最大坐标值, 也是整个画布右侧列表坐标起始值，网格右下角x轴坐标值
+      // 术中监测结束x坐标
       if (!this.templateData.right && !this.topTotal) return this.templateData.canvasWidth;
       return this.templateData.canvasWidth - (this.templateData.right?.width ?? 20) - this.topTotal.width;
     },
     endY() {
-      // 画布高度 - 底部列表高度 ，网格右下角y轴坐标值
-      const { show = true, height } = this.templateData.bottom || {};
-      if (!show || !height) return this.templateData.canvasHeight;
-      return this.canvasHeight - height;
+      // 术中监测结束y坐标
+      return this.originY + (this.canvasHeight - this.gridHeightTop - this.spaceHeight - this.markHeight);
     },
     xCellWidth() {
       // 水平方向网格宽度
@@ -153,24 +162,36 @@ export default {
       // 垂直方向网格宽度
       return (this.endY - this.originY) / this.gridYNumber;
     },
+    // 标记部分高度值
+    markHeight() {
+      const { show = true, height } = this.templateData.bottom || {};
+      if (!show || !height) return 0;
+      return height;
+    },
     spaceHeight() {
       // 头部表格底部空白位置的高，用于显示x轴时间点
       return this.templateData.top?.spaceHeight || defaultVaule.topSpaceHeight;
     },
     originYTime() {
-      return this.originYTop > 0 ? 0 : this.endYTop;
+      const currentLayout = this.getLayout('xAxis') || 'center';
+      return this.getOriginTop(currentLayout);
     },
     yCellHeightTop() {
       // 头部表格垂直方向网格高度
       return this.templateData.top?.treeTableminCellHeight || 20;
     },
-    endYTop() {
-      const endYTop = this.gridYnumberTop * this.yCellHeightTop;
-      return this.originYTop + endYTop;
+    // x轴高度值
+    gridHeightTop() {
+      return this.gridYnumberTop * this.yCellHeightTop;
     },
+    // 用药区域起始y坐标
     originYTop() {
-      const { layout = 'center' } = this.templateData.top?.xScalevalue || {};
-      return layout === 'center' ? 0 : this.spaceHeight;
+      const currentLayout = this.getLayout('drug') || 'center';
+      return this.getOriginTop(currentLayout);
+    },
+    // 用药区域结束y坐标
+    endYTop() {
+      return this.originYTop + this.gridHeightTop;
     },
     // 转换为时间戳的x轴时间列表
     xScaleList() {
@@ -249,12 +270,47 @@ export default {
         } 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) {
+        } else if (x <= originX || x >= endX || !((y > originY && y < endY) || (y > originYTop && y < endYTop))) {
           this.fabricPolylinesInstances.isDropVisible = false;
           this.fabricLinesInstances.isDropVisible = false;
         }
       });
     },
+    // 根据布局名称获取其位置
+    getLayout(moduleName) {
+      let layout = '';
+      Object.entries(this.layout).some(([key, value]) => {
+        if (value === moduleName) {
+          layout = key;
+          return true;
+        }
+        return;
+      });
+      return layout;
+    },
+    // 根据定位获取模块高度值
+    getLayoutHeight(layout) {
+      const moduleName = this.layout[layout];
+      switch (moduleName) {
+        case 'drug':
+          return this.gridHeightTop;
+        case 'xAxis':
+          return this.spaceHeight;
+        default:
+          return this.canvasHeight - this.gridHeightTop - this.spaceHeight;
+      }
+    },
+    // 根据定位获取模块起始y坐标
+    getOriginTop(layout) {
+      switch (layout) {
+        case 'top':
+          return 0;
+        case 'center':
+          return this.getLayoutHeight('top');
+        default:
+          return this.getLayoutHeight('top') + this.getLayoutHeight('center');
+      }
+    },
     getGridYnumberTop(list) {
       // 头部表格垂直方向网格总数
       for (let i = 0; i < list.length; i++) {

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

@@ -319,6 +319,7 @@ export default {
         id: '_lineGroup_' + new Date().getTime(),
         rowIndex: i,
         colIndex: j,
+        objectCaching: false,
         ...(this.linesObj.dataTextStyle || {})
       });
       this.setTextPosition(text, top, x1, x2, leftLimit, rightLimit, y2);

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

@@ -110,8 +110,6 @@ export default {
     }
   },
 
-  watch: {},
-
   mounted() {
     Bus.$on('mouseoverTarget', isMovingToOtherTarget => {
       this.isMovingToOtherTarget = isMovingToOtherTarget;
@@ -301,7 +299,7 @@ export default {
     },
     // 绘制左侧折线标题
     drawPolylineTitle() {
-      const { canvasHeight, treeTableminCellWidth, originX, xScaleList, xScaleCellList, endX } = this.propItems;
+      const { endY, markHeight, treeTableminCellWidth, originX, xScaleList, endX } = this.propItems;
       const leftYScalevalue = this.polyline.find(v => v.position === 'left');
       const lableMargin = leftYScalevalue.lableMargin || [5, 30];
       const lableLineHeight = leftYScalevalue.lableLineHeight || 20;
@@ -353,7 +351,7 @@ export default {
 
       const eventStyle = { selectable: false, evented: false };
       leftTitleList.forEach(async (v, i) => {
-        const baseTop = canvasHeight - lableMargin[1];
+        const baseTop = endY + markHeight - lableMargin[1];
         const top = baseTop - i * lableLineHeight;
         const left = lableMargin[0] + treeTableminCellWidth;
         const pointId = `${v.polylineTypeId}_${v.polylineIndex}_-1_polylinePoint_'${new Date().getTime()}_isTitle`;
@@ -387,6 +385,7 @@ export default {
           ele = await this.createImage(v.pointAttr.iconClassName, v.pointAttr);
         }
         const icon = await this.createPoint(v.type, {
+          objectCaching: false,
           ele: ele || '',
           ...option
         });
@@ -690,6 +689,7 @@ export default {
       const pointId = `${others.polylineTypeId}_${others.polylineIndex}_${others.pointIndex}_polylinePoint_${new Date().getTime()}`;
       const ele = this._iconClassName && (await this.createImage(this._iconClassName, others));
       let point = await this.createPoint(type, {
+        objectCaching: false,
         id: pointId,
         left: left,
         top: top,
@@ -821,7 +821,7 @@ export default {
         const prevPoint = this.addPointList[i - 1] || { left: point.prePoint?.left ?? originLeft, top: point.prePoint?.top ?? originTop };
         const currentPointObj = this.addPointObjList.find(obj => obj.left === currentPoint.left);
         if (currentPointObj?.line1?.x1 !== prevPoint.left) {
-          currentPointObj.line1.set({
+          currentPointObj?.line1?.set({
             x1: prevPoint.left,
             y1: prevPoint.top,
             x2: currentPoint.left,

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

@@ -27,6 +27,7 @@ export default {
   computed: {
     defaultTextStyle() {
       return {
+        objectCaching: false,
         ...defaultVaule.textStyle,
         centeredRotation: true,
         originX: 'center',
@@ -67,7 +68,8 @@ export default {
       }, '');
       const group = new this.fabric.Group([...textList], {
         evented: false,
-        selectable: false
+        selectable: false,
+        objectCaching: false
       });
       this.canvas.add(group);
       this.canvas.sendBackwards(group);
@@ -90,7 +92,8 @@ export default {
       }
       const group = new this.fabric.Group([...textList], {
         evented: false,
-        selectable: false
+        selectable: false,
+        objectCaching: false
       });
       this.canvas.add(group);
       this.canvas.sendBackwards(group);
@@ -122,8 +125,8 @@ export default {
       this.canvas.sendBackwards(group);
     },
     setOverFlowPoint(point) {
-      const { endY, canvasHeight } = this.propItems;
-      endY === canvasHeight && point.set('top', point.top - point.height / 2);
+      const { markHeight } = this.propItems;
+      !markHeight && point.set('top', point.top - point.height / 2);
     },
     createText(text, left, top, originX, style) {
       return new this.fabric.Text(String(text), {

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

@@ -165,7 +165,7 @@ export default {
       });
     },
     drawTopTotal(topTotalList) {
-      const { endX, canvasWidth, yCellHeightTop, topTotal, endYTop, spaceHeight, originYTop } = this.propItems;
+      const { endX, canvasWidth, yCellHeightTop, topTotal, endYTop, spaceHeight, originYTop, originYTime } = this.propItems;
       const textList = [];
       const totalWidth = canvasWidth - endX;
       const left = endX + totalWidth / 2;
@@ -192,7 +192,7 @@ export default {
       const title = this.drawTextGroup(
         { width: totalWidth, height: spaceHeight, strokeWidth: 1 },
         { text: String(topTotal.title), ...(topTotal.style || defaultVaule.textStyle) },
-        { left: endX, top: originYTop > 0 ? 0 : endYTop }
+        { left: endX, top: originYTime }
       );
       this.canvas.add(...textList, title);
     },
@@ -252,6 +252,7 @@ export default {
               type: 'colList',
               id: `${index}_${i}_other_${Date.now()}`,
               name: v.value,
+              objectCaching: false,
               ...this.eventStyle
             });
             text.hasControls = text.hasBorders = false;
@@ -301,7 +302,8 @@ export default {
               top,
               dataIndex: index,
               index: i,
-              type: 'list'
+              type: 'list',
+              objectCaching: false
             };
             const left = this.cumputedX(v.time);
             title.dataList.push(left);
@@ -410,12 +412,13 @@ export default {
     },
     // 底部标记
     drawBottomTextDataGroup(obj) {
-      const { endX, originX, endY, canvasHeight, topTotal } = this.propItems;
-      if (!obj.list || endY === canvasHeight) {
+      const { endX, originX, endY, topTotal, markHeight } = this.propItems;
+      if (!markHeight || !obj.list) {
         return;
       }
 
-      topTotal.width && this.canvas.add(this.drawLine([endX, endY - 1, endX, canvasHeight], { ...this.defaultRectStyle }));
+      topTotal.width && this.canvas.add(this.drawLine([endX, endY - 1, endX, endY + markHeight], { ...this.defaultRectStyle }));
+      topTotal.width && this.canvas.add(this.drawLine([originX, endY + markHeight, endX, endY + markHeight], { ...this.defaultRectStyle }));
       // const textList = [];
       const marginLeft = this.templateData.left.leftYScalevalue.spaceGridNumber || defaultVaule.spaceGridNumber;
       const left = originX - marginLeft * 4; // 默认减去4倍的左边距，防止最左边的数据与名称显示重合了
@@ -426,7 +429,7 @@ export default {
         originX: 'right',
         originY: 'center',
         left,
-        top: endY + (canvasHeight - endY) / 2,
+        top: endY + markHeight / 2,
         type: 'mark'
       });
       this.canvas.add(title);
@@ -445,7 +448,7 @@ export default {
       const setTop = (lineHeight, i, condition) => {
         if (!~condition.limitIndex) {
           condition.y += i === 0 ? lineHeight / 2 : lineHeight;
-          if (condition.y >= canvasHeight - lineHeight / 2) {
+          if (condition.y >= endY + markHeight - lineHeight / 2) {
             condition.limitIndex++;
             if (condition.limitIndex === 0) {
               condition.y = baseYLimit;
@@ -473,7 +476,8 @@ export default {
               other: v.other || {},
               time: item[0],
               name: v.name,
-              type: 'mark'
+              type: 'mark',
+              objectCaching: false
             };
 
             const eventStyle = !this.eventStyle.evented
@@ -559,7 +563,7 @@ export default {
     },
     moveLimit(point) {
       point.setCoords();
-      const { originX, endX, originY, canvasHeight } = this.propItems;
+      const { originX, endX, originY, endY, markHeight } = this.propItems;
       const bottom = this.templateData.bottom;
       // 如果是起始标记，如入手术室时间
       if (point.other?.isStart) {
@@ -597,8 +601,8 @@ export default {
           point.set('left', limitLeft);
         }
       }
-      if (point.top > canvasHeight - 14) {
-        point.set('top', canvasHeight - 14);
+      if (point.top > endY + markHeight - 14) {
+        point.set('top', endY + markHeight - 14);
       }
       if (point.top < originY) {
         point.set('top', originY);
@@ -620,12 +624,12 @@ export default {
 
     drawLeftScaleGroup(dataLeft) {
       this.drawLeftTitle(dataLeft);
-      const { canvasHeight, originX, originY, treeTableminCellWidth } = this.propItems;
+      const { endY, markHeight, originX, originY, treeTableminCellWidth } = this.propItems;
       let rect = new this.fabric.Rect({
         left: treeTableminCellWidth,
         top: originY,
         width: originX - treeTableminCellWidth,
-        height: canvasHeight - originY,
+        height: endY + markHeight - originY,
         ...defaultVaule.rectStyle,
         ...defaultVaule.style,
         originX: 'left',
@@ -636,11 +640,12 @@ export default {
     },
     drawLeftTitle(dataLeft) {
       if (dataLeft.title) {
+        const { endY, markHeight, treeTableminCellWidth, originY } = this.propItems;
         this.canvas.add(
           this.drawTextGroup(
-            { width: this.propItems.treeTableminCellWidth, height: this.propItems.canvasHeight - this.propItems.originY },
+            { width: treeTableminCellWidth, height: endY + markHeight - originY },
             { text: String(dataLeft.title.split('').join('\n')), ...defaultVaule.textStyle, ...dataLeft.titleStyle },
-            { left: 0, top: this.propItems.originY }
+            { left: 0, top: originY }
           )
         );
       }

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

@@ -25,9 +25,11 @@ export default {
         centeredRotation: true,
         originX: 'center',
         originY: 'center',
-        lineHeight: 1
+        lineHeight: 1,
+        objectCaching: false
       },
       defaultGroupStyle: {
+        objectCaching: false,
         evented: false,
         selectable: false
       }
@@ -288,6 +290,21 @@ export default {
             scale: 1,
             ...data
           });
+        case 'circleAndText':
+          obj1 = new this.fabric.Text(String(data.text), {
+            fontFamily: '微软雅黑',
+            fontSize: 12,
+            originX: 'center',
+            originY: 'center',
+            fill: data.stroke,
+            left: data.left,
+            top: data.top - 1,
+            objectCaching: false
+          });
+          obj2 = this.createCircleBorder(data);
+          return new this.fabric.Group([obj2, obj1], {
+            ...data
+          });
         case 'qgcg': {
           const { width, height } = data;
           obj1 = new this.fabric.Line([0, height / 2, width, height / 2], {

package/packages/select-person/select-person.vue

@@ -288,7 +288,8 @@ export default create({
 
       searchIndeterminate: false,
       searchChecked: false,
-      typeActiveIndex: 0
+      typeActiveIndex: 0,
+      useData: []
     };
   },
   computed: {
@@ -462,12 +463,12 @@ export default create({
     },
 
     staticDataInit() {
-      if (!Array.isArray(this.data) || this.data.length == 0) return;
-      this.treeData.main = this.data;
+      if (!Array.isArray(this.useData) || this.useData.length == 0) return;
+      this.treeData.main = this.useData;
       this.generateDataList(this.treeData.main, this.dataList.main);
     },
     staticDeptAndRoleDataInit() {
-      this.treeData.dept = this.getDeptData(this.data);
+      this.treeData.dept = this.getDeptData(this.useData);
       this.generateDataList(this.treeData.dept, this.dataList.dept);
       this.treeData.role = this.handleRoleData(this.roleData);
       this.generateDataList(this.treeData.role, this.dataList.role);
@@ -1497,8 +1498,9 @@ export default create({
       }
     },
     handleData() {
-      vexutils.searchTree(this.data, item => {
-        if (this.titleAddCode) {
+      this.useData = vexutils.clone(this.data, true)
+      vexutils.searchTree(this.useData, item => {
+        if (this.titleAddCode && item.code) {
           item.title = `${item.title}(${item.code})`;
         }
       });