cnhis-design-vue 3.4.0-beta.3 → 3.4.0-beta.30

package/es/components/fabric-chart/src/hooks/temperature/useLeft.js

@@ -18,11 +18,7 @@ import '../../../../../shared/utils/index.js';
 
 function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, computedY, getXValue, getYValue, isAddPoint, updateData, gridPoints) {
   var _a, _b;
-  const {
-    getEqualXTypes,
-    handleAddPrevent,
-    isGridLimit
-  } = useCommon(canvas, emits, propItems);
+  const { getEqualXTypes, handleAddPrevent, isGridLimit } = useCommon(canvas, emits, propItems);
   const {
     originY,
     endY,
@@ -61,27 +57,28 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
     } = item;
     const titleList = [];
     const painTop = painOriginY.originY - painSurplusCell[0] * yCellHeight;
-    const title = drawTextGroup({
-      width: originX - iconsWidth,
-      height: painHeight + (painSurplusCell[0] + painSurplusCell[1]) * yCellHeight,
-      ...borderStyle
-    }, {
-      value: `${titleText}`,
-      ...defaultTextStyle,
-      ...style || {}
-    }, {
-      left: iconsWidth,
-      top: painTop
-    });
+    const title = drawTextGroup(
+      {
+        width: originX - iconsWidth,
+        height: painHeight + (painSurplusCell[0] + painSurplusCell[1]) * yCellHeight,
+        ...borderStyle
+      },
+      {
+        value: `${titleText}`,
+        ...defaultTextStyle,
+        ...style || {}
+      },
+      {
+        left: iconsWidth,
+        top: painTop
+      }
+    );
     titleList.push(title);
     const topLine = !painBorderColor ? drawLine([iconsWidth, painTop, originX, painTop], borderStyle) : null;
     topLine && titleList.push(topLine);
     const list = [];
     if (showScale || showNumber) {
-      const {
-        lineXMain,
-        textLeft
-      } = getScaleInfo(position, iconsWidth, originX - iconsWidth);
+      const { lineXMain, textLeft } = getScaleInfo(position, iconsWidth, originX - iconsWidth);
       const listLen = listItem.length;
       listItem.forEach((v, i) => {
         let top = painOriginY.endY - i * yCellHeight * spaceGridNumber;
@@ -109,9 +106,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
     var _a2;
     if (!(yScaleValueList2 == null ? void 0 : yScaleValueList2.length))
       return;
-    const {
-      layout
-    } = yScaleValueList2[0];
+    const { layout } = yScaleValueList2[0];
     let start = iconsWidth;
     let end = originX;
     if (layout === "right") {
@@ -160,11 +155,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
         sinkNumber = 0
       } = item;
       if (showScale || showNumber) {
-        const {
-          lineXMain,
-          lineXSub,
-          textLeft
-        } = getScaleInfo(position, rectLeft, rectWidth);
+        const { lineXMain, lineXSub, textLeft } = getScaleInfo(position, rectLeft, rectWidth);
         const spaceValue = (listItem[1] - listItem[0]) / 2;
         const currentList = showdetailedScale && !detailedList.length ? listItem.reduce((res, n, i) => {
           const lastItem = res[res.length - 1];
@@ -194,7 +185,18 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
             }
             list.push(scaleNumber);
           }
-          list.push(...drawScaleLine(item, i, lineXMain, lineXSub, top, yCellHeight, vitalSignsOriginY.originY, currentList.findIndex((n) => n == endRangeValue) + 1));
+          list.push(
+            ...drawScaleLine(
+              item,
+              i,
+              lineXMain,
+              lineXSub,
+              top,
+              yCellHeight,
+              vitalSignsOriginY.originY,
+              currentList.findIndex((n) => n == endRangeValue) + 1
+            )
+          );
         });
       }
       let title = item.title || "";
@@ -214,24 +216,21 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
           obj.setCoords().set({
             top: yCellHeight > 12 ? vitalSignsTop + 1 : vitalSignsTop
           });
-          const border = drawLine([rectLeft, vitalSignsTop + yCellHeight, rectLeft + rectWidth, vitalSignsTop + yCellHeight], {
-            objectCaching: false,
-            ...borderStyle
-          });
+          const border = drawLine(
+            [rectLeft, vitalSignsTop + yCellHeight, rectLeft + rectWidth, vitalSignsTop + yCellHeight],
+            {
+              objectCaching: false,
+              ...borderStyle
+            }
+          );
           list.push(border);
         }
         list.push(obj);
       }
-      const group2 = new fabric.Group(list, {
-        ...defaultStyle,
-        objectCaching: false
-      });
+      const group2 = new fabric.Group(list, { ...defaultStyle, objectCaching: false });
       groupList.push(group2);
     });
-    const group = groupList.length > 0 ? new fabric.Group([...groupList], {
-      ...defaultStyle,
-      objectCaching: false
-    }) : null;
+    const group = groupList.length > 0 ? new fabric.Group([...groupList], { ...defaultStyle, objectCaching: false }) : null;
     group && canvas.value.add(group);
     group && group.sendToBack();
   }
@@ -245,10 +244,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
       if (title.endsWith("\n")) {
         title = title.slice(0, title.length - 1);
       }
-      const {
-        text,
-        icon
-      } = drawTextAndIconGroup(title, item, {
+      const { text, icon } = drawTextAndIconGroup(title, item, {
         text: {
           left: leftX - (item.pointAttr.width || 10) - 5,
           top: topY,
@@ -307,9 +303,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
               data: {
                 time: getXValue(point.left),
                 value: getYValue(point.origin.type, point.top),
-                ...!point.origin.isOneLine ? {} : {
-                  key: point.origin.key
-                }
+                ...!point.origin.isOneLine ? {} : { key: point.origin.key }
               },
               ...point.origin
             };
@@ -322,11 +316,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
     });
   }
   function setRestore(point) {
-    point.setCoords().set({
-      originX: "right",
-      left: point.originLeft,
-      top: point.originTop
-    });
+    point.setCoords().set({ originX: "right", left: point.originLeft, top: point.originTop });
   }
   iconsWidth && drawIcons();
   const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain" && v.show);
@@ -340,10 +330,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
   }
   const pulseIdx = yScaleValueList.findIndex((v) => v.type === "pulse" && v.show && v.doubleShow);
   const pulseItem = yScaleValueList[pulseIdx];
-  pulseIdx > -1 && yScaleValueList.splice(pulseIdx, 0, {
-    ...pulseItem,
-    title: (pulseItem == null ? void 0 : pulseItem.doubleTitle) || (pulseItem == null ? void 0 : pulseItem.title)
-  });
+  pulseIdx > -1 && yScaleValueList.splice(pulseIdx, 0, { ...pulseItem, title: (pulseItem == null ? void 0 : pulseItem.doubleTitle) || (pulseItem == null ? void 0 : pulseItem.title) });
   drawScaleValue(yScaleValueList);
   return {
     drawScaleValue

package/es/components/fabric-chart/src/hooks/temperature/useOther.js

@@ -1,6 +1,6 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle } from '../useDraw.js';
-import { parse, isBefore, addDays, getDate } from 'date-fns';
+import { parse } from 'date-fns';
 import { last, cloneDeep } from 'lodash-es';
 import '../useEvent.js';
 import '../useShadow.js';
@@ -15,15 +15,7 @@ import '../surgicalAnesthesia/useOther.js';
 import '../../../../../shared/utils/index.js';
 
 function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints, getXValue) {
-  const {
-    left: leftObj,
-    other,
-    vitalSignsOriginY,
-    xCellWidth,
-    yCellHeight,
-    endX,
-    originX
-  } = propItems;
+  const { left: leftObj, other, vitalSignsOriginY, xCellWidth, yCellHeight, endX, originX } = propItems;
   const getYCellHeight = () => {
     const fontSize = Math.min(...((other == null ? void 0 : other.list) || []).map((item) => {
       var _a, _b;
@@ -33,12 +25,12 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   };
   const _yCellHeight = getYCellHeight();
   let textDiff = 0;
-  function handleCrossDayLayout(currentTime, itemLeft, lastLeft, eventList) {
-    const newLeft = itemLeft + xCellWidth;
+  function handleCrossDayLayout(currentTime, lastLeft, eventList) {
+    const newLeft = lastLeft + xCellWidth;
     const nextTime = getXValue(newLeft);
-    if (isCrossDay(currentTime, nextTime)) {
+    if (!(other == null ? void 0 : other.allowCrossDay) && isCrossDay(currentTime, nextTime)) {
       adjustEventsForCrossDay(eventList);
-      return itemLeft;
+      return lastLeft;
     } else {
       return lastLeft + xCellWidth;
     }
@@ -104,7 +96,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
       item.vertical.forEach((v, i) => {
         var _a2, _b2, _c, _d, _e;
         const baseTop = (v.baseTop || 0) * yCellHeight;
-        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
+        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.trueLeft) || 0;
         if (i === 0 && item.left <= lastLeft) {
           leftX = lastLeft + xCellWidth;
         }
@@ -132,9 +124,9 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
         var _a2, _b2;
         const topY2 = vitalSignsOriginY.originY + (v.baseTop || 0) * yCellHeight;
         fixedTopY = fixedTop;
-        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
+        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.trueLeft) || 0;
         if (item.left <= lastLeft + 0.1) {
-          leftX = handleCrossDayLayout(v.time, item.left, lastLeft, list);
+          leftX = handleCrossDayLayout(v.time, lastLeft, list);
         }
         if (String(v.value).length) {
           list.push(drawEventText(v, leftX, topY2));
@@ -192,9 +184,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
       originX: "center",
       ...defaultStyle
     });
-    const {
-      eventHighlight = false
-    } = other || {};
+    const { eventHighlight = false } = other || {};
     const options = {
       originX: "center",
       left: x,
@@ -215,9 +205,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
     return group;
   }
   function setEvent(point) {
-    const {
-      highlightColor = "#ffff00"
-    } = other || {};
+    const { highlightColor = "#ffff00" } = other || {};
     point.on("mouseover", () => {
       point.highlightObject.set("fill", highlightColor);
       canvas.value.requestRenderAll();
@@ -235,10 +223,9 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
 function isCrossDay(dateStr1, dateStr2) {
   const date1 = parse(dateStr1, "yyyy-MM-dd HH:mm", new Date());
   const date2 = parse(dateStr2, "yyyy-MM-dd HH:mm", new Date());
-  const earlierDate = isBefore(date1, date2) ? date1 : date2;
-  const laterDate = isBefore(date1, date2) ? date2 : date1;
-  const earlierDatePlusOneDay = addDays(earlierDate, 1);
-  return getDate(earlierDatePlusOneDay) === getDate(laterDate);
+  const date1String = `${date1.getFullYear()}-${date1.getMonth()}-${date1.getDate()}`;
+  const date2String = `${date2.getFullYear()}-${date2.getMonth()}-${date2.getDate()}`;
+  return date1String !== date2String;
 }
 
 export { useOther };

package/es/components/fabric-chart/src/hooks/temperature/useRight.js

@@ -1,20 +1,13 @@
 function useRight(canvas, propItems, drawScaleValue) {
   var _a, _b;
-  const {
-    left,
-    right,
-    getRightInfo
-  } = propItems;
+  const { left, right, getRightInfo } = propItems;
   const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right" && v.show);
   if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right" && ((_b = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _b.show)) {
     yScaleValueList.push(getRightInfo);
   }
   const pulseIdx = yScaleValueList.findIndex((v) => v.type === "pulse" && v.show && v.doubleShow);
   const pulseItem = yScaleValueList[pulseIdx];
-  pulseIdx > -1 && yScaleValueList.splice(pulseIdx, 0, {
-    ...pulseItem,
-    title: (pulseItem == null ? void 0 : pulseItem.doubleTitle) || (pulseItem == null ? void 0 : pulseItem.title)
-  });
+  pulseIdx > -1 && yScaleValueList.splice(pulseIdx, 0, { ...pulseItem, title: (pulseItem == null ? void 0 : pulseItem.doubleTitle) || (pulseItem == null ? void 0 : pulseItem.title) });
   drawScaleValue(yScaleValueList);
 }
 

package/es/components/fabric-chart/src/hooks/temperature/useTemperatureChart.d.ts

@@ -3,14 +3,14 @@ import { fabric } from '../../../../../shared/utils/fabricjs';
 import { IPointTipProps, IPointMenuProps } from '../../../../../components/fabric-chart/src/interface';
 import { AnyObject } from '../../../../../shared/types';
 export declare function useTemperatureChart(canvas: Ref<fabric.Canvas>, props: AnyObject, emits: Function, canvasRef: Ref<HTMLCanvasElement | null>, pointTipProps: IPointTipProps, pointMenuProps: IPointMenuProps): {
-    select?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    redrawPoints?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    clickMenu?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    updatePolyline?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    useMeasureRuler?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    useCaliper?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    useCaliperRuler?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    useRectRuler?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
-    redrawLinePoints?: Ref<import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    select?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    redrawPoints?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    clickMenu?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    updatePolyline?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    useMeasureRuler?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    useCaliper?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    useCaliperRuler?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    useRectRuler?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
+    redrawLinePoints?: Ref<import("../../../../../shared/types").AnyFn | null | undefined, import("../../../../../shared/types").AnyFn | null | undefined> | undefined;
     propItems: any;
 };