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

package/es/_virtual/_virtual_i18n-methods.js

@@ -1,5 +1,9 @@
 function i18n(code, defaultValue) {
-		return window.getLanguageByCode?.(code) || window.top?.getLanguageByCode?.(code) || defaultValue;
+	  try {
+		  return window.getLanguageByCode?.(code) || window.top?.getLanguageByCode?.(code) || defaultValue;
+    } catch (error) {
+		  return defaultValue;
+	  }
 	}
 	
 	function i18nAbbr(code, defaultValue) {

package/es/components/fabric-chart/index.d.ts

@@ -239,7 +239,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<import("
             default: boolean;
         };
         list: {
-            type: ArrayConstructor;
+            type: import("vue").PropType<import("./src/interface").PopupMenuItem[]>;
             default: () => never[];
         };
         point: {
@@ -257,7 +257,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<import("
             default: boolean;
         };
         list: {
-            type: ArrayConstructor;
+            type: import("vue").PropType<import("./src/interface").PopupMenuItem[]>;
             default: () => never[];
         };
         point: {
@@ -273,7 +273,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<import("
         "onUpdate:show"?: ((...args: any[]) => any) | undefined;
         onClickMenu?: ((...args: any[]) => any) | undefined;
     }>, {
-        list: unknown[];
+        list: import("./src/interface").PopupMenuItem[];
         show: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("remove" | "edit" | "error" | "add" | "change" | "ready" | "right-click" | "select" | "add:prevent" | "click:grid" | "event-click")[], "remove" | "edit" | "error" | "add" | "change" | "ready" | "right-click" | "select" | "add:prevent" | "click:grid" | "event-click", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/fabric-chart/src/FabricChart.vue.d.ts

@@ -233,7 +233,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             default: boolean;
         };
         list: {
-            type: ArrayConstructor;
+            type: PropType<import("./interface").PopupMenuItem[]>;
             default: () => never[];
         };
         point: {
@@ -251,7 +251,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             default: boolean;
         };
         list: {
-            type: ArrayConstructor;
+            type: PropType<import("./interface").PopupMenuItem[]>;
             default: () => never[];
         };
         point: {
@@ -267,7 +267,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         "onUpdate:show"?: ((...args: any[]) => any) | undefined;
         onClickMenu?: ((...args: any[]) => any) | undefined;
     }>, {
-        list: unknown[];
+        list: import("./interface").PopupMenuItem[];
         show: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("remove" | "edit" | "error" | "add" | "change" | "ready" | "right-click" | "select" | "add:prevent" | "click:grid" | "event-click")[], "remove" | "edit" | "error" | "add" | "change" | "ready" | "right-click" | "select" | "add:prevent" | "click:grid" | "event-click", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -1,12 +1,12 @@
 import { PropType } from 'vue';
-import { IPropItems, ICoordinateValue } from '../interface';
+import { IPropItems, ICoordinateValue, PopupMenuItem } from '../interface';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     show: {
         type: BooleanConstructor;
         default: boolean;
     };
     list: {
-        type: ArrayConstructor;
+        type: PropType<PopupMenuItem[]>;
         default: () => never[];
     };
     point: {
@@ -24,7 +24,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     list: {
-        type: ArrayConstructor;
+        type: PropType<PopupMenuItem[]>;
         default: () => never[];
     };
     point: {
@@ -40,7 +40,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
     onClickMenu?: ((...args: any[]) => any) | undefined;
 }>, {
-    list: unknown[];
+    list: PopupMenuItem[];
     show: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/components/fabric-chart/src/components/PopupMenu.js

@@ -1,6 +1,7 @@
 import { i18n } from '../../../../_virtual/_virtual_i18n-methods.js';
 import { defineComponent, ref, watch, withDirectives, createVNode, vShow } from 'vue';
-import { NSpace, NInputNumber } from 'naive-ui';
+import { NIcon, NSpace, NInputNumber } from 'naive-ui';
+import { ChevronForwardOutline } from '@vicons/ionicons5';
 import useStyle from './useStyle.js';
 import { useEventListener, onClickOutside } from '@vueuse/core';
 
@@ -40,51 +41,49 @@ var PopupMenu = /* @__PURE__ */ defineComponent({
     onClickOutside(menuRef, (event) => {
       emit("update:show", false);
     });
-    props.propItems;
     const pointStyle = useStyle(props);
-    function setNoClick(item) {
-      if (typeof item === "string" && (item.startsWith(i18n("10010.1.279", "\u65B0\u589E")) || item.startsWith(i18n("10010.1.215", "\u5220\u9664")))) {
-        return true;
-      }
-    }
     function getItemContent(item) {
-      if (typeof item === "string")
-        return item;
-      if (typeof item.value === "boolean")
-        return item.label;
       if (item.renderItem)
         return item.renderItem();
-      return createVNode(NSpace, {
-        "inline": true,
-        "align": "center"
-      }, {
-        default: () => [createVNode("span", null, [item.label]), createVNode(NInputNumber, {
-          "style": "width: 110px",
-          "size": "small",
-          "value": item.value,
-          "onUpdate:value": ($event) => item.value = $event,
-          "clearable": true,
-          "placeholder": i18n("10010.1.207", "\u8BF7\u8F93\u5165\u6570\u503C"),
-          "showButton": false,
-          "onFocus": () => emit("update:show", true)
-        }, null)]
-      });
+      if (item.hasInput)
+        return createVNode(NSpace, {
+          "inline": true,
+          "align": "center"
+        }, {
+          default: () => [createVNode("span", null, [item.label]), createVNode(NInputNumber, {
+            "style": "width: 110px",
+            "size": "small",
+            "value": item.value,
+            "onUpdate:value": ($event) => item.value = $event,
+            "clearable": true,
+            "placeholder": i18n("10010.1.207", "\u8BF7\u8F93\u5165\u6570\u503C"),
+            "showButton": false
+          }, null)]
+        });
+      return item.label;
+    }
+    function hasChildren(item) {
+      return Array.isArray(item.children) && item.children.length > 0;
     }
     function clickItem(event, item) {
-      if (setNoClick(item))
-        return void 0;
-      if ((event == null ? void 0 : event.target.className) === "") {
-        emit("update:show", false);
-        emit("clickMenu", {
-          item,
-          target: props.target
-        });
+      const target = event.target;
+      if (target && target.closest(".n-input-number")) {
+        event.stopPropagation();
+        return;
       }
+      if (item.isTitle)
+        return;
+      emit("update:show", false);
+      emit("clickMenu", {
+        item,
+        target: props.target,
+        pointer: props.point
+      });
     }
     watch(() => props.show, (value) => {
       if (value) {
         props.list.forEach((item) => {
-          if (typeof item === "object" && Reflect.has(item, "value") && typeof item.value !== "boolean") {
+          if (Reflect.has(item, "value") && typeof item.value !== "boolean") {
             item.value = void 0;
           }
         });
@@ -94,14 +93,33 @@ var PopupMenu = /* @__PURE__ */ defineComponent({
       "ref": menuRef,
       "class": "c-fabric-chart-popup c-fabric-chart-popup__menu",
       "style": pointStyle.value
-    }, [props.list.map((item) => {
+    }, [props.list.map((item, index) => {
+      var _a;
       return props.show ? createVNode("li", {
         "class": {
-          "no-click": setNoClick(item)
+          "no-click": item.isTitle,
+          "has-children": hasChildren(item)
         },
         "onClick": (event) => clickItem(event, item),
-        "key": item.type || item
-      }, [getItemContent(item)]) : null;
+        "key": item.key
+      }, [createVNode("div", {
+        "class": "menu-item__content"
+      }, [getItemContent(item), hasChildren(item) ? createVNode(NIcon, {
+        "class": "submenu-arrow",
+        "size": 14,
+        "component": ChevronForwardOutline
+      }, null) : null]), hasChildren(item) ? createVNode("ul", {
+        "class": "c-fabric-chart-popup__submenu"
+      }, [(_a = item.children) == null ? void 0 : _a.map((child) => createVNode("li", {
+        "class": {
+          "no-click": child.isTitle,
+          "has-children": hasChildren(child)
+        },
+        "onClick": (event) => clickItem(event, child),
+        "key": child.key
+      }, [createVNode("div", {
+        "class": "menu-item__content"
+      }, [getItemContent(child)])]))]) : null]) : null;
     })]), [[vShow, props.show]]);
   }
 });

package/es/components/fabric-chart/src/constants/index.d.ts

@@ -1,20 +1,35 @@
 export declare const TEMPERATURE_MENU: ({
     label: string;
     value: boolean;
-    type: string;
+    key: string;
+    hasInput?: undefined;
 } | {
     label: string;
     value: undefined;
-    type: string;
+    key: string;
+    hasInput: boolean;
 })[];
+export declare const TITLE_MENU_MAP: {
+    add: {
+        label: string;
+        key: string;
+        isTitle: boolean;
+    };
+    remove: {
+        label: string;
+        key: string;
+        isTitle: boolean;
+    };
+};
 export declare const PAIN_MENU: {
     label: string;
     value: undefined;
-    type: string;
+    key: string;
+    hasInput: boolean;
 }[];
 export declare const OTHER_MENU: readonly {
     label: string;
-    type: string;
+    key: string;
 }[];
 export declare const OVERLAP: {
     yemai: {

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

@@ -3,38 +3,54 @@ import { i18n } from '../../../../_virtual/_virtual_i18n-methods.js';
 const TEMPERATURE_MENU = [{
   label: i18n("10010.1.208", "\u5347\u6E29"),
   value: true,
-  type: "rise"
+  key: "rise"
 }, {
   label: i18n("10010.1.209", "\u836F\u7269\u964D\u6E29"),
   value: void 0,
-  type: "drugReduce"
+  key: "drugReduce",
+  hasInput: true
 }, {
   label: i18n("10010.1.210", "\u7269\u7406\u964D\u6E29"),
   value: void 0,
-  type: "physicsReduce"
+  key: "physicsReduce",
+  hasInput: true
 }, {
   label: i18n("10010.1.211", "\u4E0D\u5347"),
   value: true,
-  type: "noRise"
+  key: "noRise"
 }];
+const TITLE_MENU_MAP = {
+  add: {
+    label: i18n("10010.1.219", "\u65B0\u589E\u8282\u70B9"),
+    key: "add",
+    isTitle: true
+  },
+  remove: {
+    label: i18n("10010.1.220", "\u5220\u9664\u8282\u70B9"),
+    key: "remove",
+    isTitle: true
+  }
+};
 const PAIN_MENU = [{
   label: i18n("10010.1.212", "\u836F\u7269\u964D\u75DB"),
   value: void 0,
-  type: "drugReduce"
+  key: "drugReduce",
+  hasInput: true
 }, {
   label: i18n("10010.1.213", "\u7269\u7406\u964D\u75DB"),
   value: void 0,
-  type: "physicsReduce"
+  key: "physicsReduce",
+  hasInput: true
 }];
 const OTHER_MENU = Object.freeze([{
   label: i18n("10010.1.279", "\u65B0\u589E"),
-  type: "add"
+  key: "add"
 }, {
   label: i18n("10010.1.214", "\u4FEE\u6539"),
-  type: "edit"
+  key: "edit"
 }, {
   label: i18n("10010.1.215", "\u5220\u9664"),
-  type: "remove"
+  key: "remove"
 }]);
 const BLUE = "#2563F4";
 const RED = "#FF1818";
@@ -86,4 +102,4 @@ var ECG = /* @__PURE__ */ ((ECG2) => {
   return ECG2;
 })(ECG || {});
 
-export { ECG, OTHER_MENU, OVERLAP, PAIN_MENU, TEMPERATURE_MENU };
+export { ECG, OTHER_MENU, OVERLAP, PAIN_MENU, TEMPERATURE_MENU, TITLE_MENU_MAP };

package/es/components/fabric-chart/src/hooks/birthProcess/useBirthProcess.d.ts

@@ -1,10 +1,11 @@
 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 { ICoordinateValue, IPointTipProps, IPointMenuProps, PopupMenuItem } from '../../../../../components/fabric-chart/src/interface';
 export declare function useBirthProcess(canvas: Ref<fabric.Canvas>, propItems: AnyObject, emits: Function, pointTipProps: IPointTipProps, pointMenuProps: IPointMenuProps): {
-    clickMenu: ({ item, target }: {
-        item: any;
+    clickMenu: ({ item, pointer, target }: {
+        item: PopupMenuItem;
+        pointer: ICoordinateValue;
         target: any;
     }) => void;
     redrawPoints: () => void;