cnhis-design-vue 3.4.0-beta.62 → 3.4.0-beta.65

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

@@ -1,35 +1,25 @@
-import { i18n } from '../../../../../_virtual/_virtual_i18n-methods.js';
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle, drawPoint, drawText, drawArrow } from '../useDraw.js';
 import { useGrid } from '../useGrid.js';
 import { format } from 'date-fns';
-import { getType, getTime, isOneLine, isOverlapPoint, getFloorNumber, isValidValue, setOtherType, isEffectiveNode, deleteProperty, getIndex } from '../../utils/index.js';
+import { getType, getTime, isOneLine, isOverlapPoint, getFloorNumber, isValidValue, setOtherType, isEffectiveNode, getIndex } from '../../utils/index.js';
 import { cloneDeep, omit, flatten, last } from 'lodash-es';
 import '../useEvent.js';
 import { useShadow } from '../useShadow.js';
 import { useCommon } from '../useCommon.js';
 import 'vue';
+import { TEMPERATURE_MENU, PAIN_MENU, TITLE_MENU_MAP, OVERLAP } from '../../constants/index.js';
 import 'naive-ui';
 import '../surgicalAnesthesia/useTop.js';
 import '@vueuse/core';
-import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from '../../constants/index.js';
 import '../surgicalAnesthesia/useOther.js';
 import '../../../../../shared/utils/index.js';
 import { promiseTimeout } from '@vueuse/shared';
 
 function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps) {
-  useGrid(canvas, {
-    ...propItems,
-    isTemperature: true
-  });
-  const {
-    getEqualXTypes,
-    handleAddPrevent,
-    getPointEventProps
-  } = useCommon(canvas, emits, propItems);
-  const {
-    createShadowLines
-  } = useShadow();
+  useGrid(canvas, { ...propItems, isTemperature: true });
+  const { getEqualXTypes, handleAddPrevent, getPointEventProps } = useCommon(canvas, emits, propItems);
+  const { createShadowLines } = useShadow();
   const {
     left,
     xScaleList,
@@ -75,21 +65,20 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
   }
   function drawBorder() {
     const borderList = [];
-    borderList.push(new fabric.Rect({
-      left: iconsWidth,
-      top: 0,
-      width: canvasWidth - iconsWidth - borderStyle.strokeWidth,
-      height: canvasHeight - borderStyle.strokeWidth,
-      fill: "transparent",
-      ...borderStyle
-    }));
+    borderList.push(
+      new fabric.Rect({
+        left: iconsWidth,
+        top: 0,
+        width: canvasWidth - iconsWidth - borderStyle.strokeWidth,
+        height: canvasHeight - borderStyle.strokeWidth,
+        fill: "transparent",
+        ...borderStyle
+      })
+    );
     if (painBorderColor) {
       const painTop = painOriginY.originY - painSurplusCell[0] * yCellHeight;
       const painEndTop = painTop + painHeight + (painSurplusCell[0] + painSurplusCell[1]) * yCellHeight - 1;
-      const style = {
-        ...borderStyle,
-        stroke: painBorderColor
-      };
+      const style = { ...borderStyle, stroke: painBorderColor };
       const topLine = drawLine([iconsWidth, painTop, endX, painTop], style);
       const bottomLine = drawLine([iconsWidth, painEndTop, endX, painEndTop], style);
       borderList.push(topLine, bottomLine);
@@ -104,7 +93,9 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         Array.from(gridPoints).forEach((point) => {
           var _a, _b;
           if (((_a = point == null ? void 0 : point.origin) == null ? void 0 : _a.type) === "pulse") {
-            if (pointerItem.find((pointer) => Math.abs(point.left - pointer[0]) <= 1 && Math.abs(point.top - pointer[1]) <= 1)) {
+            if (pointerItem.find(
+              (pointer) => Math.abs(point.left - pointer[0]) <= 1 && Math.abs(point.top - pointer[1]) <= 1
+            )) {
               if (((_b = point == null ? void 0 : point.origin) == null ? void 0 : _b.key) === SHADOWKEYS[0]) {
                 heartRatePoints.push(point);
               } else {
@@ -171,36 +162,20 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     shadowLinesCache.clear();
     if (shadowPointCache.size > 1) {
       if (target) {
-        const {
-          type,
-          key
-        } = target.origin || {};
+        const { type, key } = target.origin || {};
         if (type === "pulse") {
           const list = shadowPointCache.get(key);
           const index = list == null ? void 0 : list.findIndex((point) => point.left === target.left);
-          list.splice(index, 1, {
-            ...list[index],
-            left: target.left,
-            top: target.top
-          });
+          list.splice(index, 1, { ...list[index], left: target.left, top: target.top });
         }
       }
-      const {
-        data,
-        otherLineData
-      } = getShadowData();
+      const { data, otherLineData } = getShadowData();
       if (data.length > 0) {
         removePulsePointLine(data);
       }
-      const {
-        mode,
-        style = {}
-      } = pulseObj.shadow || {};
+      const { mode, style = {} } = pulseObj.shadow || {};
       data.forEach((item) => {
-        const points = item.map((v) => ({
-          x: v[0],
-          y: v[1]
-        }));
+        const points = item.map((v) => ({ x: v[0], y: v[1] }));
         const polygon = mode === "color" ? new fabric.Polygon(points, {
           ...defaultStyle,
           ...style,
@@ -222,10 +197,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
               finalData.push(...otherFilters);
             }
             finalData.forEach((_item) => {
-              const l = drawLine([...flatten(_item)], {
-                ...style,
-                originX: "center"
-              });
+              const l = drawLine([...flatten(_item)], { ...style, originX: "center" });
               shadowLines.push(l);
               shadowLinesCache.add(l);
             });
@@ -243,7 +215,9 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       acc[key] = !acc[key] ? [cur] : acc[key].concat([cur]);
       return acc;
     }, {});
-    const finalResult = Object.values(result).filter((item) => item.length === 2 && Math.trunc(item[0][1]) !== Math.trunc(item[1][1]));
+    const finalResult = Object.values(result).filter(
+      (item) => item.length === 2 && Math.trunc(item[0][1]) !== Math.trunc(item[1][1])
+    );
     return finalResult;
   }
   function getXY(point) {
@@ -261,11 +235,10 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       pulsePoints.push(item[1]);
       if (item[0] === SHADOWKEYS[0]) {
         item[1].forEach((_item) => {
-          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v.left === _item.left || v.time === _item.time);
-          someIndex > -1 && sames.push({
-            time: _item.time,
-            left: _item.left
-          });
+          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex(
+            (v) => v.left === _item.left || v.time === _item.time
+          );
+          someIndex > -1 && sames.push({ time: _item.time, left: _item.left });
         });
       }
     }
@@ -282,10 +255,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       _arr1 = [];
       _arr2 = [];
     };
-    sames.forEach(({
-      time,
-      left: left2
-    }) => {
+    sames.forEach(({ time, left: left2 }) => {
       const index1 = points1.findIndex((point) => point.left === left2 || point.time === time);
       const index2 = points2.findIndex((point) => point.left === left2 || point.time === time);
       const currentPoint1 = points1[index1];
@@ -332,34 +302,19 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         otherLineData.push([getXY(currentPoint1), getXY(currentPoint2)]);
       }
     });
-    return {
-      data,
-      otherLineData
-    };
+    return { data, otherLineData };
   }
   function setCanvasEvent() {
     canvas.value.on("mouse:up", (event2) => {
-      const {
-        button,
-        target,
-        pointer = {}
-      } = event2;
+      const { button, target, pointer = {} } = event2;
       if (button === 3) {
         if (!propItems.event.evented)
           return;
-        const {
-          x = 0,
-          y = 0
-        } = pointer;
+        const { x = 0, y = 0 } = pointer;
         if (x >= originX && x <= endX && y >= originY && y <= endY) {
-          pointMenuProps.point = {
-            x,
-            y
-          };
+          pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
-          const {
-            type
-          } = (target == null ? void 0 : target.origin) || {};
+          const { type } = (target == null ? void 0 : target.origin) || {};
           if (target && ["temperature", "pain"].includes(type)) {
             if (type === "temperature") {
               pointMenuProps.list = [...TEMPERATURE_MENU];
@@ -370,7 +325,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             pointMenuProps.target = target;
           } else {
             pointMenuProps.target = null;
-            pointMenuProps.list = [i18n("10010.1.219", "\u65B0\u589E\u8282\u70B9")];
+            pointMenuProps.list = [TITLE_MENU_MAP.add];
             itemList.forEach((v) => {
               if (!getEqualXTypes([...gridPoints], x, "_type").includes(v.bigType)) {
                 const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
@@ -385,7 +340,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
                       key: v.key,
                       isOneLine: v.isOneLine
                     },
-                    pointer
+                    key: v.key
                   });
                 }
               }
@@ -401,10 +356,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       if (button === 1) {
         if (target)
           return;
-        const {
-          x = 0,
-          y = 0
-        } = pointer;
+        const { x = 0, y = 0 } = pointer;
         if (x >= originX && x <= endX && y > 0 && y < canvasHeight) {
           emits("click:grid", {
             x,
@@ -441,10 +393,12 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
               type = key;
             }
             const styleKey = overlapKey || key;
-            points.push(drawPoint(type, {
-              ...overlap[styleKey],
-              ...pointer
-            }));
+            points.push(
+              drawPoint(type, {
+                ...overlap[styleKey],
+                ...pointer
+              })
+            );
           }
         }
       });
@@ -474,10 +428,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       dataList = [],
       list: scaleList = []
     } = scaleValue;
-    const {
-      type: nonePainPointType,
-      textStyle: nonePainPointTextStyle
-    } = nonePainPointStyle;
+    const { type: nonePainPointType, textStyle: nonePainPointTextStyle } = nonePainPointStyle;
     const pointList = [];
     const lineList = [];
     const otherList = [];
@@ -488,19 +439,11 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     const _isOneLine = isOneLine(scaleValue);
     (_a = item.list) == null ? void 0 : _a.forEach((v, index) => {
       const _item = !_isOneLine ? item : dataList.find((_v) => _v.key === v.key);
-      const points = getPointer(isRespirator(v) ? {
-        ...v,
-        value: respiratorStyle.fixedValue
-      } : v, scaleValue);
+      const points = getPointer(isRespirator(v) ? { ...v, value: respiratorStyle.fixedValue } : v, scaleValue);
       const nextV = item.list[index + 1];
-      const nextPoint = nextV ? getPointer(isRespirator(nextV) ? {
-        ...nextV,
-        value: respiratorStyle.fixedValue
-      } : nextV, scaleValue) : void 0;
+      const nextPoint = nextV ? getPointer(isRespirator(nextV) ? { ...nextV, value: respiratorStyle.fixedValue } : nextV, scaleValue) : void 0;
       const nextItem = nextV ? !_isOneLine ? item : dataList.find((_v) => _v.key === nextV.key) : {};
-      const {
-        key = ""
-      } = _item;
+      const { key = "" } = _item;
       const mai = "mai";
       if (!(key === mai && nextItem.key !== mai || key !== mai && nextItem.key === mai) && points && nextPoint && getFloorNumber(points[0], 1) === getFloorNumber(nextPoint[0], 1)) {
         const pointOriginX = points[0] - xCellWidth / 2;
@@ -537,12 +480,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             }
             nextDoublePointsX2 = null;
           }
-          return {
-            time: (_d = (_c = point.origin) == null ? void 0 : _c.data) == null ? void 0 : _d.time,
-            left: point.left,
-            top: point.top,
-            breakpoint: !point.rightLine
-          };
+          return { time: (_d = (_c = point.origin) == null ? void 0 : _c.data) == null ? void 0 : _d.time, left: point.left, top: point.top, breakpoint: !point.rightLine };
         });
       };
       if (_isOneLine) {
@@ -555,9 +493,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           shadowPointCache.set(key, getData(pulsePoints[key]));
         });
       } else {
-        const {
-          key
-        } = item;
+        const { key } = item;
         shadowPointCache.set(key, getData(pointList));
       }
     }
@@ -566,9 +502,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     function drawValue(points, v, _item) {
       if (!(points == null ? void 0 : points.length) || !config.showValue)
         return;
-      const {
-        lineAttr = {}
-      } = _item;
+      const { lineAttr = {} } = _item;
       const y = points[1] <= vitalSignsOriginY.originY + yCellHeight ? points[1] + yCellHeight : points[1] - yCellHeight;
       const value = drawText([points[0], y], {
         value: isRespirator(v) ? respiratorStyle.fixedValue : v.value,
@@ -592,13 +526,8 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         return;
       if (!v.value && type === "breathe")
         return;
-      const {
-        lineAttr = {},
-        key
-      } = _item;
-      const {
-        value
-      } = otherObj;
+      const { lineAttr = {}, key } = _item;
+      const { value } = otherObj;
       const x = computedX(v.time);
       let reduceLine, reducePoint, noRise, riseText, verifiedText, respirator;
       if (v.noRise && noRiseStyle.show) {
@@ -613,9 +542,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             gridPoints.add(noRise);
         } else if (v.value) {
           const top = y + yCellHeight * 2;
-          noRise = drawArrow([x, y, top], {
-            ...noRiseStyle.style
-          });
+          noRise = drawArrow([x, y, top], { ...noRiseStyle.style });
         }
         noRise && otherList.push(noRise);
         if (noRise && isFixed(noRiseStyle, v)) {
@@ -708,10 +635,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       const maxValue = Math.max(...scaleList);
       const minValue = Math.min(...scaleList);
       let upArrow, limitValue, belowMinValue;
-      const {
-        upArrowShow = false,
-        limitValueShow = false
-      } = _item;
+      const { upArrowShow = false, limitValueShow = false } = _item;
       if (upArrowShow && +v.value > 180) {
         let top = points[1] - yCellHeight * 2.5;
         let yArr = [points[1] - yCellHeight / 2, top];
@@ -749,9 +673,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           });
         } else {
           const top = y + yCellHeight * 2;
-          belowMinValue = drawArrow([points[0], y, top], {
-            ...belowMinValueStyle.style
-          });
+          belowMinValue = drawArrow([points[0], y, top], { ...belowMinValueStyle.style });
         }
         otherList.push(belowMinValue);
       }
@@ -773,14 +695,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     function drawPointLine(points, nextPoint, v, index, _item, otherObj) {
       let point;
       let line;
-      const {
-        pointAttr = {},
-        lineAttr = {},
-        title = "",
-        key,
-        type: pointType = "circle",
-        overlapKey
-      } = _item;
+      const { pointAttr = {}, lineAttr = {}, title = "", key, type: pointType = "circle", overlapKey } = _item;
       const pointHalfHeight = pointAttr.height ? pointAttr.height / 2 : 5;
       const nextV = item.list[index + 1];
       let newPoints = cloneDeep(points);
@@ -822,9 +737,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         line = drawLine([...newPoints, ...newNextPoint], {
           ...lineAttr
         });
-        const {
-          obj: reduceObj
-        } = (otherObj == null ? void 0 : otherObj.reducePoint) || {};
+        const { obj: reduceObj } = (otherObj == null ? void 0 : otherObj.reducePoint) || {};
         if (points && nextPoint && (reduceObj == null ? void 0 : reduceObj.top) < points[1] && (config == null ? void 0 : config.hypothermyViewCustom)) {
           const reduceRightLine = drawLine([reduceObj.left, reduceObj.top, ...nextPoint], {
             ...lineAttr
@@ -843,10 +756,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       const previousLine = lineList[index - 1];
       const pointAttrNew = {
         origin: {
-          data: isRespirator(v) ? {
-            ...v,
-            value: respiratorStyle.fixedValue
-          } : v,
+          data: isRespirator(v) ? { ...v, value: respiratorStyle.fixedValue } : v,
           title,
           key: key || "",
           overlapKey,
@@ -863,11 +773,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         ...v.pacemakerShow && type == "pulse" ? pacemaker.style : isRespirator(v) ? respiratorStyle.style : pointAttr,
         ...getPointEventProps(),
         lockMovementX: true,
-        ...isNonePain ? {
-          selectable: false,
-          evented: false,
-          ...nonePainPointType === "number" ? nonePainPointTextStyle : {}
-        } : {}
+        ...isNonePain ? { selectable: false, evented: false, ...nonePainPointType === "number" ? nonePainPointTextStyle : {} } : {}
       };
       if (points) {
         if (!previousLine) {
@@ -918,9 +824,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     point.on("mouseup", (event2) => {
       pointTipProps.show = false;
       if (event2.button === 1) {
-        const {
-          type
-        } = point.origin;
+        const { type } = point.origin;
         const value = getYValue(type, point.top);
         const params = {
           ...point.origin,
@@ -936,12 +840,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     });
   }
   function setPopup(point, status = "moving") {
-    const {
-      title,
-      unit,
-      type,
-      data
-    } = point.origin;
+    const { title, unit, type, data } = point.origin;
     pointTipProps.point = {
       x: point.left,
       y: point.top
@@ -950,10 +849,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     pointTipProps.list = [getListValue(), timeText];
     pointTipProps.show = true;
     function getListValue() {
-      const {
-        drugReduce,
-        physicsReduce
-      } = data || {};
+      const { drugReduce, physicsReduce } = data || {};
       const value = status === "hover" ? data.value : getYValue(type, point.top);
       if (isValidValue(drugReduce)) {
         timeText += (data == null ? void 0 : data.changeTime) ? "\u2014>" + (data == null ? void 0 : data.changeTime.slice(-5)) : "";
@@ -978,37 +874,18 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
   }
   function updateLine(point) {
     var _a, _b;
-    (_a = point.leftLine) == null ? void 0 : _a.setCoords().set({
-      x2: point.left,
-      y2: point.top
-    });
-    (_b = point.rightLine) == null ? void 0 : _b.setCoords().set({
-      x1: point.left,
-      y1: point.top
-    });
+    (_a = point.leftLine) == null ? void 0 : _a.setCoords().set({ x2: point.left, y2: point.top });
+    (_b = point.rightLine) == null ? void 0 : _b.setCoords().set({ x1: point.left, y1: point.top });
     Object.values(point.otherObj).forEach((o) => {
-      const {
-        obj,
-        type = "",
-        top = 0,
-        isFixed: isFixed2,
-        moveHide = false,
-        left: left2 = 0
-      } = o || {};
+      const { obj, type = "", top = 0, isFixed: isFixed2, moveHide = false, left: left2 = 0 } = o || {};
       if (type === "reduce")
         return;
       if (obj) {
         if (type === "line") {
-          obj.setCoords().set({
-            x1: point.left,
-            y1: point.top
-          });
+          obj.setCoords().set({ x1: point.left, y1: point.top });
         } else {
           if (!isFixed2) {
-            obj.setCoords().set({
-              left: point.left + left2,
-              top: point.top + top
-            });
+            obj.setCoords().set({ left: point.left + left2, top: point.top + top });
           }
           if (moveHide) {
             canvas.value.remove(obj);
@@ -1051,33 +928,25 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     }
     return true;
   }
-  function clickMenu({
-    item,
-    target
-  }) {
+  function clickMenu({ item, target, pointer }) {
     if (!target) {
       const params = {
         data: {
-          time: getXValue(item.pointer.x),
-          value: getYValue(item.origin.type, item.pointer.y),
-          ...!item.origin.isOneLine ? {} : {
-            key: item.origin.key
-          }
+          time: getXValue(pointer.x),
+          value: getYValue(item.origin.type, pointer.y),
+          ...item.origin.isOneLine && { key: item.origin.key }
         },
         ...item.origin
       };
       emits("add", params);
       updateData(params);
     } else {
-      const {
+      const { data, type, isOneLine: isOneLine2, dataIndex, index } = target.origin;
+      const _data = omit(
         data,
-        type,
-        isOneLine: isOneLine2,
-        dataIndex,
-        index
-      } = target.origin;
-      const _data = deleteProperty(data, [...TEMPERATURE_MENU, ...PAIN_MENU]);
-      _data[`${item.type}`] = item.value;
+        [...TEMPERATURE_MENU, ...PAIN_MENU].map((v) => v.key)
+      );
+      _data[`${item.key}`] = item.value;
       _data.changeTime = format(new Date(), "yyyy-MM-dd HH:mm");
       if (isOneLine2) {
         _data["key"] = target.origin.key;
@@ -1091,13 +960,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     }
   }
   function updateData(params, mode = "add") {
-    const {
-      type,
-      dataIndex,
-      index,
-      data,
-      key
-    } = params;
+    const { type, dataIndex, index, data, key } = params;
     const obj = yScaleValue.find((v) => v.type === type);
     if (mode === "add") {
       const dataList = !isOneLine(obj) ? obj.dataList[dataIndex] : obj.dataList.find((v) => v.enable);

package/es/components/fabric-chart/src/hooks/temperature/useTemperatureChart.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';

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;
@@ -198,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/index.d.ts

@@ -1,7 +1,6 @@
 import { IPoint, ITreeItem } from '../interface';
 import { AnyObject } from '../../../../shared/types';
 export declare function isEffectiveNode(node: IPoint): string | number | boolean;
-export declare function deleteProperty(data: AnyObject, list: AnyObject[]): {};
 /**
  * @description: 判断yScaleValue数组内的项类型是否可以连成一条折线，比如温度线
  * @param {string} type

package/es/components/fabric-chart/src/utils/index.js

@@ -3,15 +3,6 @@ import { isNull, isNumber } from 'lodash-es';
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
-function deleteProperty(data, list) {
-  const _data = {};
-  for (const key in data) {
-    if (!list.map((v) => v.type).includes(key)) {
-      _data[key] = data[key];
-    }
-  }
-  return _data;
-}
 function isOneLine(scaleItem) {
   return ["temperature", "pulse"].includes(scaleItem.type) && scaleItem.dataList.length && !!scaleItem.dataList.find((i) => i.enable);
 }
@@ -81,4 +72,4 @@ function nearlyEqual(v1, v2) {
   return Math.abs(v1 - v2) <= 1e-4;
 }
 
-export { deleteProperty, getChildrenSize, getFloorNumber, getIndex, getPointRange, getRoundNumber, getScaleNumberList, getTime, getType, isEffectiveNode, isOneLine, isOverlapPoint, isValidValue, nearlyEqual, setOtherType };
+export { getChildrenSize, getFloorNumber, getIndex, getPointRange, getRoundNumber, getScaleNumberList, getTime, getType, isEffectiveNode, isOneLine, isOverlapPoint, isValidValue, nearlyEqual, setOtherType };

package/es/components/fabric-chart/style/index.css

@@ -1 +1 @@
-.c-fabric-chart{position:relative;user-select:none}.c-fabric-chart-popup{font-size:12px;margin:0;position:absolute;z-index:1001}.c-fabric-chart-popup li{list-style:none}.c-fabric-chart-popup__tip{color:#000}.c-fabric-chart-popup__tip .default-box{background:rgba(0,0,0,.7);border-radius:4px;display:flex;flex-flow:column nowrap;margin:0;padding:8px 12px}.c-fabric-chart-popup__tip .default-box>li{color:#fff}.c-fabric-chart-popup__menu{background:#fff;border:1px solid #e2e6ed;border-radius:2px;box-shadow:0 2px 12px 0 rgba(56,56,56,.2);display:flex;flex-flow:column nowrap;padding:8px 5px!important}.c-fabric-chart-popup__menu>li{background:#fff;cursor:pointer;padding:5px}.c-fabric-chart-popup__menu>li:hover{background:#f0f7ff}.c-fabric-chart-popup__menu>li.no-click{cursor:default}.c-fabric-chart-popup__menu>li.no-click:hover{background:#fff}
+.c-fabric-chart{position:relative;user-select:none}.c-fabric-chart-popup{font-size:12px;margin:0;position:absolute;z-index:1001}.c-fabric-chart-popup li{list-style:none}.c-fabric-chart-popup li ul{padding-left:5px}.c-fabric-chart-popup__tip{color:#000}.c-fabric-chart-popup__tip .default-box{background:rgba(0,0,0,.7);border-radius:4px;display:flex;flex-flow:column nowrap;margin:0;padding:8px 12px}.c-fabric-chart-popup__tip .default-box>li{color:#fff}.c-fabric-chart-popup__menu{background:#fff;border:1px solid #e2e6ed;border-radius:2px;box-shadow:0 2px 12px 0 rgba(56,56,56,.2);display:flex;flex-flow:column nowrap;padding:8px 5px!important}.c-fabric-chart-popup__menu>li{background:#fff;cursor:pointer;padding:5px;position:relative}.c-fabric-chart-popup__menu>li .menu-item__content{align-items:center;display:flex;justify-content:space-between}.c-fabric-chart-popup__menu>li .submenu-arrow{color:#999;margin-left:8px}.c-fabric-chart-popup__menu>li:hover{background:#f0f7ff}.c-fabric-chart-popup__menu>li.no-click{cursor:default}.c-fabric-chart-popup__menu>li.no-click:hover{background:#fff}.c-fabric-chart-popup__menu>li:hover>.c-fabric-chart-popup__submenu{display:block}.c-fabric-chart-popup__submenu{background:#fff;border:1px solid #e2e6ed;border-radius:2px;box-shadow:0 2px 12px 0 rgba(56,56,56,.2);display:none;left:100%;padding:8px 5px;position:absolute;top:0;white-space:nowrap;width:max-content}.c-fabric-chart-popup__submenu>li{background:#fff;cursor:pointer;padding:5px}.c-fabric-chart-popup__submenu>li .menu-item__content{align-items:center;display:flex;justify-content:flex-start}.c-fabric-chart-popup__submenu>li .submenu-arrow{color:#999;margin-left:8px}.c-fabric-chart-popup__submenu>li:hover{background:#f0f7ff}.c-fabric-chart-popup__submenu>li.no-click{cursor:default}.c-fabric-chart-popup__submenu>li.no-click:hover{background:#fff}.c-fabric-chart-popup>li:hover>.c-fabric-chart-popup__submenu{display:block}

package/es/components/form-render/src/components/renderer/combination/jsonCombination.js

@@ -166,6 +166,7 @@ const script = /* @__PURE__ */ defineComponent({
       })]), range(currentGroupNum.value).map((_, idx) => createVNode("section", {
         "class": "form-render__combinationContentJson"
       }, [createVNode(FormRenderComponent, {
+        "lifeCycle": globProps == null ? void 0 : globProps.lifeCycle,
         "ref": (_ref) => setFormRenderRef(idx, _ref),
         "fieldList": props.properties,
         "components": globProps == null ? void 0 : globProps.components,