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

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

@@ -15,7 +15,7 @@ import './useTop.js';
 import '@vueuse/core';
 import '../../../../../shared/utils/index.js';
 
-const NEW_OTHER_MENU = filter(OTHER_MENU, (o) => o.type !== "add");
+const NEW_OTHER_MENU = filter(OTHER_MENU, (o) => o.key !== "add");
 function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveLimit, getContainPoints, showDialog, removeCurrentSelection) {
   const { computedX, getXValue } = useBirthProcessCumputedPoint(propItems);
   const { getEqualXTypes, handleAddPrevent, isGridLimit, getPointEventProps } = useCommon(canvas, emits, propItems);
@@ -216,14 +216,14 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
     });
     canvas.value.add(...gridPointsMap.get(key));
   }
-  function clickMenu({ item, target }) {
+  function clickMenu({ item, target, pointer }) {
     if (!target)
       return;
-    const { type, _type } = item;
+    const { key, _type } = item;
     const params = { ...target.origin, type: _type };
-    emits(type, params);
-    if (type === "remove") {
-      updateData(params, type);
+    emits(key, params);
+    if (key === "remove") {
+      updateData(params, key);
     }
   }
   function updateData(params, mode = "add") {
@@ -447,7 +447,6 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
         pointMenuProps.list = NEW_OTHER_MENU.map((item) => {
           return {
             ...item,
-            renderItem: () => item.label,
             _type: "other"
           };
         });

package/es/components/fabric-chart/src/hooks/surgicalAnesthesia/useTop.d.ts

@@ -1,11 +1,12 @@
 import { type Ref } from 'vue';
 import { fabric } from '../../../../../shared/utils/fabricjs';
 import { AnyObject } from '../../../../../shared/types';
-import { IPointTipProps, IPointMenuProps } from '../../../../../components/fabric-chart/src/interface';
+import { IPointTipProps, IPointMenuProps, ICoordinateValue, PopupMenuItem } from '../../../../../components/fabric-chart/src/interface';
 export declare function useTop(canvas: Ref<fabric.Canvas>, propItems: AnyObject, emits: Function, pointTipProps: IPointTipProps, pointMenuProps: IPointMenuProps): {
     redrawLinePoints: () => void;
-    clickMenu: ({ item, target }: {
-        item: AnyObject;
+    clickMenu: ({ item, target, pointer }: {
+        item: PopupMenuItem;
         target: any;
+        pointer: ICoordinateValue;
     }) => void;
 };

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

@@ -18,7 +18,7 @@ import '@vueuse/core';
 import './useOther.js';
 import '../../../../../shared/utils/index.js';
 
-const NEW_OTHER_MENU = filter(OTHER_MENU, (o) => o.type !== "add");
+const NEW_OTHER_MENU = filter(OTHER_MENU, (o) => o.key !== "add");
 function findTreeItem(tree, type, [x, y]) {
   var _a, _b;
   let item = null;
@@ -776,8 +776,6 @@ function useTop(canvas, propItems, emits, pointTipProps, pointMenuProps) {
           pointMenuProps.list = NEW_OTHER_MENU.concat(treeMenuList).map((item) => {
             return {
               ...item,
-              renderItem: () => item.label,
-              type: item.key || item.type,
               _type: "tree"
             };
           });
@@ -793,21 +791,22 @@ function useTop(canvas, propItems, emits, pointTipProps, pointMenuProps) {
   }
   function clickMenu({
     item,
-    target
+    target,
+    pointer
   }) {
     var _a;
     if (!target)
       return;
     const {
-      type,
+      key,
       _type
     } = item;
     const params = {
       ...target.origin,
       type: _type
     };
-    if (NEW_OTHER_MENU.map((item2) => item2.type).includes(type)) {
-      if (type === "remove") {
+    if (NEW_OTHER_MENU.map((item2) => item2.key).includes(key)) {
+      if (key === "remove") {
         const removeItemList = [...gridPoints].filter((p) => {
           var _a2;
           return ((_a2 = p.origin) == null ? void 0 : _a2.uuid) === params.uuid;
@@ -819,9 +818,9 @@ function useTop(canvas, propItems, emits, pointTipProps, pointMenuProps) {
           });
         }
       }
-      emits(type, omit(params, ["uuid"]));
+      emits(key, omit(params, ["uuid"]));
     } else {
-      (_a = extraMenuConfig.click) == null ? void 0 : _a.call(extraMenuConfig, type, omit(params, ["uuid"]));
+      (_a = extraMenuConfig.click) == null ? void 0 : _a.call(extraMenuConfig, key, omit(params, ["uuid"]));
     }
   }
   useGrid(canvas, {

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

@@ -1,11 +1,12 @@
 import { type Ref } from 'vue';
 import { fabric } from '../../../../../shared/utils/fabricjs';
-import { IObject, IPropItems, IPointTipProps, IPointMenuProps } from '../../../../../components/fabric-chart/src/interface';
+import { IObject, IPropItems, IPointTipProps, IPointMenuProps, PopupMenuItem, ICoordinateValue } from '../../../../../components/fabric-chart/src/interface';
 import { AnyObject } from '../../../../../shared/types';
 export declare function useCenter(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: Function, computedX: Function, computedY: Function, getXValue: Function, getYValue: Function, addRenderItem: Function | undefined, pointTipProps: IPointTipProps, pointMenuProps: IPointMenuProps): {
-    clickMenu: ({ item, target }: {
-        item: any;
+    clickMenu: ({ item, target, pointer }: {
+        item: PopupMenuItem;
         target: any;
+        pointer: ICoordinateValue;
     }) => void;
     setPopup: (point: any, status?: string) => void;
     isAddPoint: (x: number) => boolean;