cnhis-design-vue 3.4.0-beta.7 → 3.4.0-beta.71

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

@@ -1,7 +1,8 @@
 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 '../../utils/eventBus.js';
 import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';
@@ -25,12 +26,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;
     }
@@ -96,7 +97,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;
         }
@@ -124,9 +125,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));
@@ -223,10 +224,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/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;
 };

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

@@ -1,4 +1,4 @@
-import { reactive, computed, watch, toRefs } from 'vue';
+import { reactive, watch, toRefs } from 'vue';
 import { defaultBorderStyle } from '../useDraw.js';
 import '../../../../../shared/utils/fabricjs/index.js';
 import { useCumputedPoint } from '../useCumputedPoint.js';
@@ -8,10 +8,10 @@ import '../useCommon.js';
 import { setOtherType, isOneLine, getFloorNumber } from '../../utils/index.js';
 import { flatten } from 'lodash-es';
 import { format, addDays } from 'date-fns';
+import '../../constants/index.js';
 import 'naive-ui';
 import '../surgicalAnesthesia/useTop.js';
 import '@vueuse/core';
-import '../../constants/index.js';
 import '../surgicalAnesthesia/useOther.js';
 import '../../../../../shared/utils/index.js';
 import { useTop } from './useTop.js';
@@ -28,284 +28,206 @@ function useTemperatureChart(canvas, props, emits, canvasRef, pointTipProps, poi
     redrawPoints: null,
     clickMenu: null
   });
-  const painSurplusCell = computed(() => {
-    const { painSurplusCell: painSurplusCell2 = [0, 0] } = props.data.grid || {};
-    if (!~painIndex.value)
-      return [0, 0];
-    return painSurplusCell2;
-  });
-  const surplusCell = computed(() => {
-    var _a, _b;
-    const surplusCell2 = ((_b = (_a = props.data.grid) == null ? void 0 : _a.surplusCell) == null ? void 0 : _b.slice()) || [0, 0, 0, 0];
-    if (painIndex.value === 0) {
-      surplusCell2[0] = surplusCell2[0] + painSurplusCell.value[1];
-    } else if (painIndex.value > 0) {
-      surplusCell2[2] = surplusCell2[2] + painSurplusCell.value[0];
-    }
-    return surplusCell2;
-  });
-  const mainSurplusCell = computed(() => {
-    if (painIndex.value === 0) {
-      return [painSurplusCell.value[0], surplusCell.value[1], surplusCell.value[2], surplusCell.value[3]];
-    } else if (painIndex.value > 0) {
-      return [surplusCell.value[0], surplusCell.value[1], painSurplusCell.value[1], surplusCell.value[3]];
-    }
-    return surplusCell.value;
-  });
-  const dateHeight = computed(() => {
-    const { top } = props.data;
-    return top.date.show && (top.date.height || defaultHeight) || 0;
-  });
-  const hospitalDaysHeight = computed(() => {
-    var _a;
-    const { top } = props.data;
-    return ((_a = top.hospitalDays) == null ? void 0 : _a.show) && (top.hospitalDays.height || defaultHeight) || 0;
-  });
-  const operationDaysHeight = computed(() => {
-    var _a;
-    const { top } = props.data;
-    return ((_a = top.operationDays) == null ? void 0 : _a.show) && (top.operationDays.height || defaultHeight) || 0;
-  });
-  const xScalevalueHeight = computed(() => {
-    var _a, _b, _c;
-    const { top } = props.data;
-    const height = ((_a = top.xScalevalue) == null ? void 0 : _a.show) && (top.xScalevalue.height || defaultHeight) || 0;
-    const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? (_c = top.dayHeight) != null ? _c : 0 : 0;
-    return height + dayHeight;
-  });
-  const childbirthDaysHeight = computed(() => {
-    var _a;
-    const { top } = props.data;
-    return ((_a = top.childbirthDays) == null ? void 0 : _a.show) && (top.childbirthDays.height || defaultHeight) || 0;
-  });
-  const breathingHeight = computed(() => {
-    var _a;
-    const { bottom } = props.data;
-    return ((_a = bottom == null ? void 0 : bottom.breathing) == null ? void 0 : _a.show) && (bottom.breathing.height || defaultHeight * 2) || 0;
-  });
-  const gridXNumber = computed(() => {
-    const { grid } = props.data;
-    return grid.mainXCell * grid.subXCell + surplusCell.value[1] + surplusCell.value[3];
-  });
-  const gridYNumber = computed(() => {
-    const { mainYCell, subYCell, painSubYCell = 5 } = props.data.grid;
-    const painSurplusCellNumber = painIndex.value > 0 ? painSurplusCell.value[1] : painSurplusCell.value[0];
-    return (mainYCell - 1) * subYCell + painSubYCell + surplusCell.value[0] + surplusCell.value[2] + painSurplusCellNumber;
-  });
-  const endX = computed(() => {
-    var _a;
-    const { width, right = null, top } = props.data;
-    if (!right)
-      return width;
-    const endWidth = (_a = right.width) != null ? _a : 0;
-    return width - endWidth;
-  });
-  const endXLimit = computed(() => {
-    return endX.value - surplusCell.value[1] * xCellWidth.value;
-  });
-  const originX = computed(() => {
-    const { top, left } = props.data;
-    const originX2 = top.titleWidth + iconsWidth.value;
-    return originX2;
-  });
-  const endY = computed(() => {
-    const { bottom = null, height } = props.data;
-    if (!bottom)
-      return height;
-    const endHeight = bottom.height || 30;
-    return height - endHeight;
-  });
-  const originY = computed(() => {
-    var _a;
-    const { top } = props.data;
-    const dayHeight = top.xScalevalue.show && ((_a = top.dayHeight) != null ? _a : 0) || 0;
-    const xScaleHeight = top.xScalevalue.show && (top.xScalevalue.height || defaultHeight) || 0;
-    const topHeight = dateHeight.value + dayHeight + xScaleHeight + hospitalDaysHeight.value + operationDaysHeight.value + childbirthDaysHeight.value;
-    return topHeight;
-  });
-  const xCellWidth = computed(() => {
-    return (endX.value - originX.value) / gridXNumber.value;
-  });
-  const yCellHeight = computed(() => {
-    return (endY.value - originY.value) / gridYNumber.value;
-  });
-  const iconsWidth = computed(() => {
-    var _a, _b;
-    const { left } = props.data;
-    return ((_a = left.icons) == null ? void 0 : _a.show) && (((_b = left.icons) == null ? void 0 : _b.width) || 100) || 0;
-  });
-  const xScaleList = computed(() => {
-    var _a, _b;
-    const { top, grid } = props.data;
-    const dateList = ((_b = (_a = top.date.list) == null ? void 0 : _a.slice) == null ? void 0 : _b.call(_a, 0, grid.mainXCell)) || [];
-    const times = top.xScalevalue.times;
-    let left = originX.value - xCellWidth.value;
-    const startDate = top.date.startDate || format(new Date(), "yyyy-MM-dd");
-    const newDateList = dateList.reduce(
-      (arr, item, index) => index === 0 ? arr.concat(startDate) : arr.concat(format(addDays(new Date(startDate.replace(/-/g, "/")), index), "yyyy-MM-dd")),
-      []
-    );
-    const timeList = newDateList.map((item) => {
-      return times.map((v) => {
-        left += xCellWidth.value;
-        const start = Date.parse(`${item} ${v.start}`);
-        const end = Date.parse(`${item} ${v.end}`);
-        return {
-          start,
-          end,
-          left,
-          center: left + xCellWidth.value / 2,
-          scaleCell: (end - start) / xCellWidth.value
-        };
-      });
-    });
-    return flatten(timeList);
-  });
-  const event = computed(() => {
-    var _a;
-    return ((_a = props.data.grid) == null ? void 0 : _a.event) || { selectable: true, evented: true, hovered: true };
-  });
-  const itemList = computed(() => {
-    const { left } = props.data;
-    return flatten(
-      left.yScaleValue.filter((v) => v.show).map((item) => {
-        return item.dataList.filter((v) => v.show).map((v, dataIndex) => {
+  function buildDerived() {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    const { grid, top, left, right, bottom } = props.data;
+    const iconsWidth = ((_a = left.icons) == null ? void 0 : _a.show) && (((_b = left.icons) == null ? void 0 : _b.width) || 100) || 0;
+    const dateHeight = top.date.show && (top.date.height || defaultHeight) || 0;
+    const hospitalDaysHeight = ((_c = top.hospitalDays) == null ? void 0 : _c.show) && (top.hospitalDays.height || defaultHeight) || 0;
+    const operationDaysHeight = ((_d = top.operationDays) == null ? void 0 : _d.show) && (top.operationDays.height || defaultHeight) || 0;
+    const xScaleHeight = ((_e = top.xScalevalue) == null ? void 0 : _e.show) && (top.xScalevalue.height || defaultHeight) || 0;
+    const dayHeight = ((_f = top.xScalevalue) == null ? void 0 : _f.show) ? (_g = top.dayHeight) != null ? _g : 0 : 0;
+    const xScalevalueHeight = xScaleHeight + dayHeight;
+    const childbirthDaysHeight = ((_h = top.childbirthDays) == null ? void 0 : _h.show) && (top.childbirthDays.height || defaultHeight) || 0;
+    const breathingHeight = ((_i = bottom == null ? void 0 : bottom.breathing) == null ? void 0 : _i.show) && (bottom.breathing.height || defaultHeight * 2) || 0;
+    const painIndex = (() => {
+      const index = left.yScaleValue.findIndex((v) => v.type === "pain");
+      return index > -1 && left.yScaleValue[index].show ? index : -1;
+    })();
+    const painSurplusCell = (() => {
+      const { painSurplusCell: painSurplusCell2 = [0, 0] } = grid || {};
+      if (!~painIndex)
+        return [0, 0];
+      return painSurplusCell2;
+    })();
+    const surplusCell = (() => {
+      var _a2;
+      const sc = ((_a2 = grid == null ? void 0 : grid.surplusCell) == null ? void 0 : _a2.slice()) || [0, 0, 0, 0];
+      if (painIndex === 0) {
+        sc[0] = sc[0] + painSurplusCell[1];
+      } else if (painIndex > 0) {
+        sc[2] = sc[2] + painSurplusCell[0];
+      }
+      return sc;
+    })();
+    const mainSurplusCell = (() => {
+      if (painIndex === 0) {
+        return [painSurplusCell[0], surplusCell[1], surplusCell[2], surplusCell[3]];
+      } else if (painIndex > 0) {
+        return [surplusCell[0], surplusCell[1], painSurplusCell[1], surplusCell[3]];
+      }
+      return surplusCell;
+    })();
+    const originX = top.titleWidth + iconsWidth;
+    const endX = !right ? props.data.width : props.data.width - ((_j = right.width) != null ? _j : 0);
+    const endXLimit = endX - surplusCell[1] * ((endX - originX) / (grid.mainXCell * grid.subXCell + surplusCell[1] + surplusCell[3]));
+    const endY = !bottom ? props.data.height : props.data.height - (bottom.height || 30);
+    const originY = dateHeight + dayHeight + xScaleHeight + hospitalDaysHeight + operationDaysHeight + childbirthDaysHeight;
+    const gridXNumber = grid.mainXCell * grid.subXCell + surplusCell[1] + surplusCell[3];
+    const { mainYCell, subYCell, painSubYCell = 5 } = grid;
+    const painSurplusCellNumber = painIndex > 0 ? painSurplusCell[1] : painSurplusCell[0];
+    const gridYNumber = (mainYCell - 1) * subYCell + painSubYCell + surplusCell[0] + surplusCell[2] + painSurplusCellNumber;
+    const xCellWidth = (endX - originX) / gridXNumber;
+    const yCellHeight = (endY - originY) / gridYNumber;
+    const xScaleList = (() => {
+      var _a2, _b2;
+      const dateList = ((_b2 = (_a2 = top.date.list) == null ? void 0 : _a2.slice) == null ? void 0 : _b2.call(_a2, 0, grid.mainXCell)) || [];
+      const times = top.xScalevalue.times;
+      let leftPos = originX - xCellWidth;
+      const startDate = top.date.startDate || format(new Date(), "yyyy-MM-dd");
+      const newDateList = dateList.reduce(
+        (arr, _item, index) => index === 0 ? arr.concat(startDate) : arr.concat(format(addDays(new Date(startDate.replace(/-/g, "/")), index), "yyyy-MM-dd")),
+        []
+      );
+      const timeList = newDateList.map((item) => {
+        return times.map((v) => {
+          leftPos += xCellWidth;
+          const start = Date.parse(`${item} ${v.start}`);
+          const end = Date.parse(`${item} ${v.end}`);
           return {
-            ...v,
-            bigType: setOtherType(v.key, item.type),
-            unit: item.unit,
-            dataIndex,
-            isOneLine: isOneLine(item)
+            start,
+            end,
+            left: leftPos,
+            center: leftPos + xCellWidth / 2,
+            scaleCell: (end - start) / xCellWidth
           };
         });
-      })
+      });
+      return flatten(timeList);
+    })();
+    const event = ((_k = props.data.grid) == null ? void 0 : _k.event) || { selectable: true, evented: true, hovered: true };
+    const itemList = flatten(
+      left.yScaleValue.filter((v) => v.show).map(
+        (item) => item.dataList.filter((v) => v.show).map((v, dataIndex) => ({
+          ...v,
+          bigType: setOtherType(v.key, item.type),
+          unit: item.unit,
+          dataIndex,
+          isOneLine: isOneLine(item)
+        }))
+      )
     );
-  });
-  const painScalePositionSurplusHeight = computed(() => {
-    const { left } = props.data;
     const painItem = left.yScaleValue.find((v) => v.type === "pain");
-    if (!painItem)
-      return 0;
-    const { numberVerticalPosition = "bottom", spaceGridNumber = 1 } = painItem;
-    return numberVerticalPosition === "center" ? yCellHeight.value * spaceGridNumber / 2 : 0;
-  });
-  const painIndex = computed(() => {
-    const { left } = props.data;
-    const index = left.yScaleValue.findIndex((v) => v.type === "pain");
-    return index > -1 && left.yScaleValue[index].show ? index : -1;
-  });
-  const painHeight = computed(() => {
-    const { painSubYCell = 5 } = props.data.grid;
-    return painIndex.value === -1 ? 0 : yCellHeight.value * painSubYCell;
-  });
-  const painBorderColor = computed(() => {
-    const { left } = props.data;
-    return (left.yScaleValue.find((v) => v.type === "pain") || {}).borderColor;
-  });
-  const painOriginY = computed(() => {
-    const { left } = props.data;
-    const obj = {
-      originY: originY.value + painSurplusCell.value[0] * yCellHeight.value,
-      endY: endY.value - painSurplusCell.value[1] * yCellHeight.value - painScalePositionSurplusHeight.value
-    };
-    if (painIndex.value === 0 && left.yScaleValue.length > 1) {
-      obj.endY = obj.originY + painHeight.value - painScalePositionSurplusHeight.value;
-    } else if (painIndex.value === left.yScaleValue.length - 1) {
-      obj.originY = obj.endY - painHeight.value + painScalePositionSurplusHeight.value;
-    }
-    return obj;
-  });
-  const vitalSignsOriginY = computed(() => {
-    const { left } = props.data;
-    const obj = {
-      originY: originY.value + surplusCell.value[0] * yCellHeight.value,
-      endY: endY.value - surplusCell.value[2] * yCellHeight.value
-    };
-    if (painIndex.value === 0 && left.yScaleValue.length > 1) {
-      obj.originY = painOriginY.value.endY + painScalePositionSurplusHeight.value + surplusCell.value[0] * yCellHeight.value;
-    } else if (painIndex.value === left.yScaleValue.length - 1) {
-      obj.endY = painOriginY.value.originY - surplusCell.value[2] * yCellHeight.value;
-    }
-    return obj;
-  });
-  const topList = computed(() => {
-    var _a, _b;
-    const { top, grid } = props.data;
-    const topList2 = [];
-    for (const i in top) {
-      if (top[i].show) {
-        topList2.push({
-          ...top[i],
-          list: ((_b = (_a = top[i].list) == null ? void 0 : _a.slice) == null ? void 0 : _b.call(_a, 0, grid.mainXCell)) || [],
-          key: i
+    const painScalePositionSurplusHeight = (() => {
+      if (!painItem)
+        return 0;
+      const { numberVerticalPosition = "bottom", spaceGridNumber = 1 } = painItem;
+      return numberVerticalPosition === "center" ? yCellHeight * spaceGridNumber / 2 : 0;
+    })();
+    const painHeight = painIndex === -1 ? 0 : yCellHeight * ((_l = grid.painSubYCell) != null ? _l : 5);
+    const painBorderColor = (painItem || {}).borderColor;
+    const painOriginY = (() => {
+      const obj = {
+        originY: originY + painSurplusCell[0] * yCellHeight,
+        endY: endY - painSurplusCell[1] * yCellHeight - painScalePositionSurplusHeight
+      };
+      if (painIndex === 0 && left.yScaleValue.length > 1) {
+        obj.endY = obj.originY + painHeight - painScalePositionSurplusHeight;
+      } else if (painIndex === left.yScaleValue.length - 1) {
+        obj.originY = obj.endY - painHeight + painScalePositionSurplusHeight;
+      }
+      return obj;
+    })();
+    const vitalSignsOriginY = (() => {
+      const obj = {
+        originY: originY + surplusCell[0] * yCellHeight,
+        endY: endY - surplusCell[2] * yCellHeight
+      };
+      if (painIndex === 0 && left.yScaleValue.length > 1) {
+        obj.originY = painOriginY.endY + painScalePositionSurplusHeight + surplusCell[0] * yCellHeight;
+      } else if (painIndex === left.yScaleValue.length - 1) {
+        obj.endY = painOriginY.originY - surplusCell[2] * yCellHeight;
+      }
+      return obj;
+    })();
+    const topList = (() => {
+      var _a2, _b2;
+      const list = [];
+      for (const i in top) {
+        if (top[i].show) {
+          list.push({
+            ...top[i],
+            list: ((_b2 = (_a2 = top[i].list) == null ? void 0 : _a2.slice) == null ? void 0 : _b2.call(_a2, 0, grid.mainXCell)) || [],
+            key: i
+          });
+        }
+      }
+      return list.sort((a, b) => a.seq - b.seq);
+    })();
+    const getRightInfo = (() => {
+      var _a2;
+      const temperatureObj = left.yScaleValue.find((v) => v.type === "temperature");
+      const yScaleValue = (right == null ? void 0 : right.yScaleValue) ? { ...right.yScaleValue } : {};
+      if ((_a2 = temperatureObj == null ? void 0 : temperatureObj.list) == null ? void 0 : _a2.length) {
+        const detailedList = (yScaleValue == null ? void 0 : yScaleValue.showdetailedScale) ? temperatureObj.list.reduce((res) => {
+          const lastItem = res[res.length - 1];
+          return lastItem ? res.concat([lastItem + 1, lastItem + 2]) : res.concat([92]);
+        }, []) : [];
+        const list = temperatureObj.list.map((v) => getFloorNumber(1.8 * v + 32));
+        Object.assign(yScaleValue, {
+          list,
+          detailedList,
+          spaceGridNumber: temperatureObj.spaceGridNumber
         });
       }
-    }
-    return topList2.sort((a, b) => a.seq - b.seq);
-  });
-  const getRightInfo = computed(() => {
-    var _a;
-    const { left, right } = props.data;
-    const temperatureObj = left.yScaleValue.find((v) => v.type === "temperature");
-    const yScaleValue = (right == null ? void 0 : right.yScaleValue) || {};
-    if ((_a = temperatureObj == null ? void 0 : temperatureObj.list) == null ? void 0 : _a.length) {
-      const detailedList = (yScaleValue == null ? void 0 : yScaleValue.showdetailedScale) ? temperatureObj.list.reduce((res) => {
-        const lastItem = res[res.length - 1];
-        return lastItem ? res.concat([lastItem + 1, lastItem + 2]) : res.concat([92]);
-      }, []) : [];
-      const list = temperatureObj.list.map((v) => getFloorNumber(1.8 * v + 32));
-      Object.assign(yScaleValue, {
-        list,
-        detailedList,
-        spaceGridNumber: temperatureObj.spaceGridNumber
-      });
-    }
-    return yScaleValue;
-  });
-  const propItems = reactive({
-    canvasWidth: props.data.width,
-    canvasHeight: props.data.height,
-    borderStyle: { ...defaultBorderStyle, ...props.data.borderStyle || {} },
-    selectionStyle: props.data.selectionStyle || {},
-    dateHeight: dateHeight.value,
-    hospitalDaysHeight: hospitalDaysHeight.value,
-    operationDaysHeight: operationDaysHeight.value,
-    xScalevalueHeight: xScalevalueHeight.value,
-    childbirthDaysHeight: childbirthDaysHeight.value,
-    topList: topList.value,
-    breathingHeight: breathingHeight.value,
-    hospitalizationDate: props.data.hospitalizationDate,
-    grid: props.data.grid,
-    top: props.data.top,
-    left: props.data.left,
-    right: props.data.right,
-    bottom: props.data.bottom,
-    other: props.data.other,
-    painIndex: painIndex.value,
-    painHeight: painHeight.value,
-    painOriginY: painOriginY.value,
-    vitalSignsOriginY: vitalSignsOriginY.value,
-    gridXNumber: gridXNumber.value,
-    gridYNumber: gridYNumber.value,
-    iconsWidth: iconsWidth.value,
-    originX: originX.value,
-    originY: originY.value,
-    endX: endX.value,
-    endXLimit: endXLimit.value,
-    endY: endY.value,
-    xCellWidth: xCellWidth.value,
-    yCellHeight: yCellHeight.value,
-    xScaleList: xScaleList.value,
-    event: event.value,
-    itemList: itemList.value,
-    getRightInfo: getRightInfo.value,
-    config: props.data.config || {},
-    surplusCell: surplusCell.value,
-    painSurplusCell: painSurplusCell.value,
-    mainSurplusCell: mainSurplusCell.value,
-    painScalePositionSurplusHeight: painScalePositionSurplusHeight.value,
-    painBorderColor: painBorderColor.value
-  });
+      return yScaleValue;
+    })();
+    return {
+      canvasWidth: props.data.width,
+      canvasHeight: props.data.height,
+      borderStyle: { ...defaultBorderStyle, ...props.data.borderStyle },
+      selectionStyle: props.data.selectionStyle || {},
+      dateHeight,
+      hospitalDaysHeight,
+      operationDaysHeight,
+      xScalevalueHeight,
+      childbirthDaysHeight,
+      topList,
+      breathingHeight,
+      hospitalizationDate: props.data.hospitalizationDate,
+      grid: props.data.grid,
+      top: props.data.top,
+      left: props.data.left,
+      right: props.data.right,
+      bottom: props.data.bottom,
+      other: props.data.other,
+      painIndex,
+      painHeight,
+      painOriginY,
+      vitalSignsOriginY,
+      gridXNumber,
+      gridYNumber,
+      iconsWidth,
+      originX,
+      originY,
+      endX,
+      endXLimit,
+      endY,
+      xCellWidth,
+      yCellHeight,
+      xScaleList,
+      event,
+      itemList,
+      getRightInfo,
+      config: props.data.config || {},
+      surplusCell,
+      painSurplusCell,
+      mainSurplusCell,
+      painScalePositionSurplusHeight,
+      painBorderColor
+    };
+  }
+  const propItems = reactive(buildDerived());
   const { computedX, computedY, getXValue, getYValue } = useCumputedPoint(propItems);
   watch(
     () => canvas.value,

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

@@ -2,6 +2,7 @@ import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle, drawTextGroup, defaultTextStyle } from '../useDraw.js';
 import 'date-fns';
 import { flatten } from 'lodash-es';
+import '../../utils/eventBus.js';
 import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';

package/es/components/fabric-chart/src/interface.d.ts

@@ -1,4 +1,4 @@
-import { type Ref } from 'vue';
+import { type Ref, VNode } from 'vue';
 import { fabric } from '../../../shared/utils/fabricjs';
 import { AnyObject, AnyFn } from '../../../shared/types';
 export type IType = 'temperature' | 'birthProcess' | 'surgicalAnesthesia' | 'electrocardiogram' | 'newBirthProcess' | undefined;
@@ -95,6 +95,7 @@ interface IOther {
     highlightColor?: string;
     eventHighlight?: boolean;
     splitLineNumber?: number;
+    allowCrossDay?: boolean;
     list: Array<IPoint>;
 }
 export interface IDate {
@@ -197,4 +198,17 @@ export type IexposeMethods = Partial<{
     useRectRuler: AnyFn | null;
     redrawLinePoints: AnyFn | null;
 }>;
+export type PopupMenuItem = {
+    label: string;
+    key: string;
+    value?: any;
+    _type?: 'tree' | 'other';
+    mode?: 'add' | 'remove';
+    origin?: AnyObject;
+    isTitle?: boolean;
+    hasInput?: boolean;
+    renderItem?: () => VNode;
+    children?: PopupMenuItem[];
+    [key: string]: any;
+};
 export {};

package/es/components/fabric-chart/src/utils/eventBus.d.ts

@@ -0,0 +1,2 @@
+import { AnyObject } from '../../../../shared/types';
+export declare const singlePointAddEventBus: import("@vueuse/core").UseEventBusReturn<AnyObject, any>;