cnhis-design-vue 2.1.121 → 2.1.123

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

@@ -14,6 +14,7 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 import Bus from '../utils/bus';
+import { nearlyEqual } from '../utils';
 
 /**
  * @description: 递归遍历节点，设置颜色属性
@@ -876,8 +877,8 @@ export default {
       for (let i = 0, len = this.addPointList.length; i < len; i++) {
         const currentPoint = this.addPointList[i];
         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) {
+        const currentPointObj = this.addPointObjList.find(obj => nearlyEqual(obj.left, currentPoint.left));
+        if (!nearlyEqual(currentPointObj?.line1?.x1, prevPoint.left)) {
           currentPointObj?.line1?.set({
             x1: prevPoint.left,
             y1: prevPoint.top,
@@ -897,7 +898,7 @@ export default {
           if (k > 0) {
             const curLeft = originLeft + this.spaceWidth * k;
             // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
-            const hasPoint = this.addPointList.some(p => Math.abs(p.left - curLeft) <= 0.001);
+            const hasPoint = this.addPointList.some(p => nearlyEqual(p.left, curLeft));
             // const hasPoint = this.addPointList.some(v => v.left == curLeft);
             if (!hasPoint) {
               let index;
@@ -940,7 +941,7 @@ export default {
       const currentLeft = left;
 
       const startLength = this.addPointList.length;
-      const n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
+      const n = Math.min(this.spaceWidth / 2, 6); // 拖动范围，在需要增加节点的刻度左右吸入的范围值
       const residue = (left - originLeft) % this.spaceWidth;
 
       const condition = residue > 0 && (residue > this.spaceWidth - n || residue < n);
@@ -961,7 +962,7 @@ export default {
           // point.line1 && this.removePolyline(point.line1.id);
           setPointLineColor(point, 'transparent', conditionHasLine2);
           this.addPointList.length == 0 && this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]);
-          if (this.addPointList.every(v => v.left !== left)) {
+          if (this.addPointList.every(v => !nearlyEqual(v.left, left))) {
             // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
             const points1 = this.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
             if (points1) {
@@ -973,7 +974,7 @@ export default {
               data.left = left;
               data.top = top;
               // 避免重复添加
-              if (this.addPointObjList.every(o => o.left !== left)) {
+              if (this.addPointObjList.every(o => !nearlyEqual(o.left, left))) {
                 this.addPointList.push(data);
                 this.clonePoint(point, [...points1, left, top]);
               }

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

@@ -100,7 +100,7 @@ export default {
       this.drawBorder();
       // this.canvas.renderAll();
       if (this.templateData.bottom) {
-        this.drawExtracorporealCirculation(this.extracorporealCirculation);
+        this.drawExtracorporealCirculation();
         this.drawBottomTextDataGroup(this.templateData.bottom);
       }
     },
@@ -485,7 +485,8 @@ export default {
       });
       this.canvas.add(title);
       // textList.push(title);
-      const baseY = endY + 2; // 目前固定10像素的下边距
+      const _endY = this.extracorporealCirculationHeight ? endY + this.extracorporealCirculationHeight : endY;
+      const baseY = _endY + 2; // 目前固定10像素的下边距
       const baseYLimit = endY - 2; // 目前固定10像素的上边距
       const lineHeightText = (obj.style?.fontSize || 12) + 2;
       const lineHeightImg = (obj.iconStyle?.height || 12) + 2;

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

@@ -1,16 +1,23 @@
 import cloneDeep from 'lodash/cloneDeep';
+import vexutils, { moment } from '@/utils/vexutils';
 
 export default {
   name: 'drawExtracorporealCirculation',
   data() {
     this.extracorporealCirculation = cloneDeep(this.templateData.bottom?.extracorporealCirculation);
     this.extracorporealCirculationObjs = [];
+    this.extracorporealCirculationHeight = 0;
     return {};
   },
   components: {},
   methods: {
-    drawExtracorporealCirculation(extracorporealCirculation) {
+    updateExtracorporealCirculation() {
+      this.extracorporealCirculation = cloneDeep(this.templateData.bottom?.extracorporealCirculation);
+      this.drawExtracorporealCirculation();
+    },
+    drawExtracorporealCirculation() {
       const { endX, originX, endY, markHeight, canvasWidth } = this.propItems;
+      const extracorporealCirculation = this.extracorporealCirculation;
       if (!markHeight || !extracorporealCirculation || !extracorporealCirculation.list?.length) {
         return;
       }
@@ -32,19 +39,26 @@ export default {
 
         let prevShadowBox;
         xList.forEach((x, i) => {
+          if (isInvalid(x)) return;
+
           const nextX = xList[i + 1];
           const prevX = xList[i - 1];
           if (isValid(x) || isValid(nextX)) {
             const x1 = isValid(x) ? x : originX;
-            const x2 = isValid(nextX) ? nextX : endX;
+            const x2 = isValid(nextX) ? nextX : isInvalid(nextX) ? null : endX;
             const prevX1 = isValid(prevX) ? prevX : originX;
             const shadowBox = {};
-            if (i < xList.length - 1) {
+            if (i < xList.length - 1 && x2) {
               shadowBox.params = [x1, x2, y2, [0, 2].includes(i) ? extracorporealCirculationStyle : ascendAortaStyle];
               shadowBox.shadowObjs = this.drawShadowBox(...shadowBox.params);
             }
             if (isValid(x)) {
               const key = getKey(i);
+              const currentTime = moment()
+                .clone()
+                .format('YYYY-MM-DD HH:mm');
+              const currentTimeX = this.computedX(currentTime);
+              const limitX2 = x < currentTimeX && isValid(currentTimeX) ? currentTimeX : x;
               const optLine = this.drawOptLine([x, endY, x, y2], {
                 origin: {
                   index,
@@ -53,7 +67,8 @@ export default {
                 },
                 limitX: {
                   x1: i === 0 ? prevEndX ?? originX : prevX1,
-                  x2
+                  x2: x2 || limitX2,
+                  isCurrentTime: !x2 && index === list.length - 1
                 },
                 ...([1, 2, 3].includes(i) ? { leftShadowBox: prevShadowBox } : {}),
                 ...([0, 1, 2].includes(i) ? { rightShadowBox: shadowBox } : {})
@@ -63,7 +78,7 @@ export default {
                 prevLine = optLine;
               }
               if (i === 0 && prevLine) {
-                prevLine.limitX.x2 = shadowBox.params[0];
+                prevLine.limitX.x2 = x1;
               }
             }
             prevShadowBox = shadowBox;
@@ -71,9 +86,16 @@ export default {
         });
       });
 
+      if (this.extracorporealCirculationObjs.length) {
+        this.extracorporealCirculationHeight = height;
+      }
+
       function isValid(x) {
         return x && x > 0 && x < canvasWidth;
       }
+      function isInvalid(x) {
+        return typeof x === 'undefined' || x === '';
+      }
       function getKey(i) {
         switch (i) {
           case 0:
@@ -108,6 +130,14 @@ export default {
       if (this.eventStyle.evented) {
         optLine.on('moving', () => {
           const { left, limitX } = optLine;
+          const { canvasWidth } = this.propItems;
+          const currentTime = moment()
+            .clone()
+            .format('YYYY-MM-DD HH:mm');
+          const currentTimeX = this.computedX(currentTime);
+          if (limitX.isCurrentTime && limitX.x2 < currentTimeX && currentTimeX > 0 && currentTimeX < canvasWidth) {
+            limitX.x2 = currentTimeX;
+          }
           if (left < limitX.x1) {
             optLine.setCoords().set({ x1: limitX.x1, x2: limitX.x1 });
           }

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

@@ -9,7 +9,7 @@ export function getTangent(angle) {
   return +Math.tan((angle * Math.PI) / 180);
 }
 
-function nearlyEqual(v1, v2) {
+export function nearlyEqual(v1, v2) {
   return Math.abs(v1 - v2) <= 0.0001;
 }
 

package/packages/full-calendar/src/FullCalendar.vue

@@ -641,6 +641,10 @@ export default create({
 
         .fc-col-header-cell-cushion {
           font-weight: normal;
+          & > span {
+            padding: 10px 0;
+            display: inline-block;
+          }
         }
 
         .fc-more-popover {
@@ -719,8 +723,7 @@ export default create({
         }
 
         .month-header {
-          height: 60px;
-          line-height: 60px;
+          padding: 10px 0;
           font-size: 14px;
           font-weight: normal;
           color: #212121;

package/packages/full-calendar/src/components/ListTag.vue

@@ -9,7 +9,7 @@
         </div>
         <div class="list-tag__right">
           <div v-for="(item, index) in data.list" :key="index">
-            <tag v-bind="$attrs" v-on="$listeners" :item="item" :title="item.title" :state="data.state" :avatar="item.avatar" :isAllDay="item.isAllDay"></tag>
+            <tag v-bind="$attrs" v-on="$listeners" :item="item" :title="item.title" :state="item.state" :avatar="item.avatar" :isAllDay="item.isAllDay"></tag>
           </div>
         </div>
       </li>

package/packages/full-calendar/src/components/Tag.vue

@@ -1,9 +1,9 @@
 <template>
   <div :class="['event-tag', 'event-tag-' + viewType, { 'event-tag--active': isActive }, { 'event-tag-allday': isAllDay }]" @click.stop="clickTag" ref="tagRef">
     <div :class="['event-tag__main', statusClass[state]]">
-      <span class="event-tag__main__text-time" v-if="viewType === 'list'">{{ timeRange }}</span>
-      <span class="event-tag__main__text-title">{{ title }}</span>
-      <div :class="['right-operate', { 'right-operate-hasBtn': hasBtns }]">
+      <span :class="['event-tag__main__text-time', state == 2 ? 'text--deleted' : '']" v-if="viewType === 'list'">{{ timeRange }}</span>
+      <span :class="['event-tag__main__text-title', state == 2 ? 'text--deleted' : '']">{{ title }}</span>
+      <div :class="['right-operate', { 'right-operate-hasBtn': hasBtns }]" v-if="state != 2">
         <!-- <img :src="avatar" class="avatar-icon" alt="" /> -->
         <span class="calendar-quick-btn-wrap" v-if="hasBtns">
           <span v-for="btn in btns" :key="btn.type" @click.stop="() => clickListBtn(btn)" class="calendar-quick-btn">
@@ -261,6 +261,10 @@ export default {
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
+      &.text--deleted {
+        text-decoration: line-through;
+        color: #7f7f7f;
+      }
     }
     &__text-time {
       flex: 0 0 150px;

package/packages/full-calendar/src/components/TagDetail.vue

@@ -2,7 +2,7 @@
   <div class="tag-detail-wrpper">
     <div class="header">
       <p>日程详情</p>
-      <div class="btn-wrap">
+      <div class="btn-wrap" v-if="item.state != 2">
         <span class="btn-item" v-for="btn in btns" :key="btn.type" @click.stop="() => clickListBtn(btn)">
           <a-icon v-if="btn.type === 'close'" :type="btn.type" :style="{ fontSize: '16px' }" />
           <a-tooltip v-else :title="btn.name" overlayClassName="tippy-tooltip">