cnhis-design-vue 3.4.0-beta.63 → 3.4.0-beta.66

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/src/FabricChart.vue2.js

@@ -5,6 +5,7 @@ import PopupMenu from './components/PopupMenu.js';
 import './hooks/useDraw.js';
 import 'date-fns';
 import 'lodash-es';
+import './utils/eventBus.js';
 import './hooks/useEvent.js';
 import './hooks/useShadow.js';
 import './hooks/useCommon.js';

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

@@ -71,7 +71,7 @@ var PopupMenu = /* @__PURE__ */ defineComponent({
         event.stopPropagation();
         return;
       }
-      if (item.isTitle)
+      if (item.isTitle || hasChildren(item))
         return;
       emit("update:show", false);
       emit("clickMenu", {

package/es/components/fabric-chart/src/hooks/electrocardiogram/hooks/useDetailEvent.js

@@ -6,6 +6,7 @@ import '../../useEvent.js';
 import '../../useShadow.js';
 import '../../useCommon.js';
 import 'vue';
+import '../../../utils/eventBus.js';
 import 'date-fns';
 import '../../../constants/index.js';
 import '@vueuse/shared';

package/es/components/fabric-chart/src/hooks/electrocardiogram/useElectrocardiogram.js

@@ -9,6 +9,7 @@ import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';
 import 'vue';
+import '../../utils/eventBus.js';
 import 'date-fns';
 import { ECG } from '../../constants/index.js';
 import '@vueuse/shared';

package/es/components/fabric-chart/src/hooks/electrocardiogram/useElectrocardiogramChart.js

@@ -3,6 +3,7 @@ import { defaultBorderStyle, defaultLineStyle, defaultTextStyle } from '../useDr
 import '../../../../../shared/utils/fabricjs/index.js';
 import 'date-fns';
 import { cloneDeep, last, isNumber } from 'lodash-es';
+import '../../utils/eventBus.js';
 import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';

package/es/components/fabric-chart/src/hooks/electrocardiogram/useMeasureInstrument.js

@@ -6,6 +6,7 @@ import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';
 import { isNumber } from 'lodash-es';
+import '../../utils/eventBus.js';
 import 'date-fns';
 import '../../constants/index.js';
 import '@vueuse/shared';

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

@@ -17,6 +17,7 @@ import './useTop.js';
 import './useOther.js';
 import '../../../../../shared/utils/index.js';
 import { useIntervalFn } from '@vueuse/core';
+import { singlePointAddEventBus } from '../../utils/eventBus.js';
 
 function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPopupTipRender) {
   const {
@@ -248,6 +249,21 @@ function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPo
     currentSelection && canvas.value.remove(currentSelection);
     currentSelection = null;
   }
+  function createChildrenMenuList(itemList2) {
+    return itemList2.map((item) => ({
+      key: item.key,
+      label: item.title,
+      mode: "add",
+      origin: {
+        title: item.title,
+        unit: item.unit,
+        type: item.bigType,
+        dataIndex: item.dataIndex,
+        key: item.key,
+        linkKey: item.linkKey
+      }
+    }));
+  }
   function handleRightClick(event2) {
     pointTipProps.show = false;
     const {
@@ -261,6 +277,7 @@ function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPo
           menuList = []
         } = extraMenuConfig;
         pointMenuProps.list = filter(OTHER_MENU, (o) => o.key === "add").concat(menuList);
+        pointMenuProps.list[0].children = createChildrenMenuList(itemList);
       } else {
         if (event2.target.__type !== "main")
           return;
@@ -279,6 +296,11 @@ function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPo
             }
           };
         });
+        const newChildren = itemList.filter((item) => {
+          const key = item.linkKey || item.key;
+          return !getEqualXTypes(getGridPoints(), point.left, "key", xCellWidth).includes(key);
+        });
+        pointMenuProps.list[0].children = createChildrenMenuList(newChildren);
       }
     }
     function setPointMenuProps(point, target, list) {
@@ -295,29 +317,42 @@ function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPo
     target,
     pointer
   }) {
-    var _a;
+    var _a, _b, _c;
     const {
       key,
-      origin
+      origin,
+      mode
     } = item;
     const params = {
       ...origin
     };
-    if (!origin) {
-      Object.assign(params, {
-        data: {
-          time: getXValue(pointer.x)
-        },
-        type: null
-      });
-    }
-    if (["add", "remove"].includes(key)) {
+    if (key === "remove" || mode === "add") {
       if (key === "remove") {
         updateData(params, "remove");
+      } else {
+        const pointKey = origin.linkKey || origin.key;
+        params.data = {
+          time: getXValue(pointer.x),
+          value: getYValue(origin.type, pointer.y),
+          ...origin.linkKey && {
+            key: origin.key
+          }
+        };
+        updateData({
+          ...params,
+          key: pointKey
+        }, "add");
+        const firstLeft = pointKey ? (_b = (_a = gridPointsMap.get(pointKey)) == null ? void 0 : _a[0]) == null ? void 0 : _b.left : void 0;
+        const minLeft = firstLeft != null ? firstLeft : pointer.x;
+        const limitRight = minLeft - xCellWidth;
+        singlePointAddEventBus.emit({
+          ...origin,
+          limitRight
+        });
       }
       emits(key, params);
     } else {
-      (_a = extraMenuConfig.click) == null ? void 0 : _a.call(extraMenuConfig, key, params);
+      (_c = extraMenuConfig.click) == null ? void 0 : _c.call(extraMenuConfig, key, params);
     }
   }
   function drawCordonLine(item, scaleValue) {
@@ -802,7 +837,7 @@ function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPo
     });
   }
   function redrawPoints(ItemObj) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     batchAddPoints.size && ((_a = canvas.value) == null ? void 0 : _a.remove(...doRemovePoints([...batchAddPoints])));
     batchAddPoints.clear();
     batchAddDatas = [];
@@ -812,12 +847,13 @@ function useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPo
         scaleValue
       } = ItemObj;
       const item = scaleValue.dataList[dataIndex];
-      (_b = canvas.value) == null ? void 0 : _b.remove(...doRemovePoints(gridPointsMap.get(item.key)));
+      const points = (_b = gridPointsMap.get(item.key)) != null ? _b : [];
+      (_c = canvas.value) == null ? void 0 : _c.remove(...doRemovePoints(points));
       gridPointsMap.delete(item.key);
       drawPolyLine(item, dataIndex, scaleValue);
     } else {
       yScaleValue = cloneDeep(scaleValues);
-      gridPointsMap.size && ((_c = canvas.value) == null ? void 0 : _c.remove(...doRemovePoints(getGridPoints())));
+      gridPointsMap.size && ((_d = canvas.value) == null ? void 0 : _d.remove(...doRemovePoints(getGridPoints())));
       gridPointsMap.clear();
       init();
     }

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

@@ -1,3 +1,4 @@
+import { onBeforeUnmount } from 'vue';
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawTextGroup, defaultRectStyle, drawTextAndIconGroup, drawText, defaultTextStyle, defaultStyle } from '../useDraw.js';
 import { useBirthProcessCumputedPoint } from '../useCumputedPoint.js';
@@ -5,7 +6,6 @@ import '../useEvent.js';
 import '../useShadow.js';
 import { drawScaleNumber } from '../useScaleColumn.js';
 import { useCommon } from '../useCommon.js';
-import 'vue';
 import { isEffectiveNode, getScaleNumberList } from '../../utils/index.js';
 import { cloneDeep, omit, last } from 'lodash-es';
 import 'date-fns';
@@ -16,6 +16,7 @@ import './useTop.js';
 import '@vueuse/core';
 import './useOther.js';
 import '../../../../../shared/utils/index.js';
+import { singlePointAddEventBus } from '../../utils/eventBus.js';
 
 function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, updateData, getGridPoints) {
   const { getYValue, getXValue, computedX } = useBirthProcessCumputedPoint(propItems);
@@ -36,6 +37,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
     canvasHeight,
     xCellWidth
   } = propItems;
+  const icons = /* @__PURE__ */ new Set();
   function drawTitle() {
     if (!left)
       return;
@@ -130,8 +132,15 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
         }
       });
       icon.linkPoints = linkPoints;
+      icons.add(icon);
     });
   }
+  function listener(params) {
+    const { limitRight, key } = params;
+    const icon = Array.from(icons).find((_icon) => _icon.origin.key === key);
+    icon && setLimitRight(icon, limitRight);
+  }
+  singlePointAddEventBus.on(listener);
   function setPointEvent(point) {
     point.on("moving", () => {
       point.set("originX", "center");
@@ -153,17 +162,17 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
             handleAddPrevent("repeat");
           } else {
             const params = {
-              data: {
-                time: getXValue(point.left),
-                value: getYValue(point.origin.type, point.top),
-                ...point.origin.linkKey ? { key: point.origin.key } : {}
-              },
+              data: [
+                {
+                  time: getXValue(point.left),
+                  value: getYValue(point.origin.type, point.top),
+                  ...point.origin.linkKey && { key: point.origin.key }
+                }
+              ],
               ...point.origin
             };
             const limitRight = point.left - xCellWidth;
-            point.linkPoints.forEach((_point) => {
-              _point.origin.limitRight = limitRight;
-            });
+            setLimitRight(point, limitRight);
             emits("add", omit(params, ["limitRight"]));
             updateData({ ...params, key });
           }
@@ -172,6 +181,11 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
       setRestore(point);
     });
   }
+  function setLimitRight(point, limitRight) {
+    point.linkPoints.forEach((_point) => {
+      _point.origin.limitRight = limitRight;
+    });
+  }
   function setRestore(point) {
     point.setCoords().set({ originX: "left", left: point.originLeft, top: point.originTop });
   }
@@ -244,6 +258,9 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
   drawYScale();
   drawIcons();
   drawBorder();
+  onBeforeUnmount(() => {
+    singlePointAddEventBus.off(listener);
+  });
 }
 
 export { useLeft };

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

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

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

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

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/utils/eventBus.d.ts

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

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

@@ -0,0 +1,5 @@
+import { useEventBus } from '@vueuse/core';
+
+const singlePointAddEventBus = useEventBus("single-point-add");
+
+export { singlePointAddEventBus };

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

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

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

@@ -1,4 +1,5 @@
 import { isNull, isNumber } from 'lodash-es';
+export { singlePointAddEventBus } from './eventBus.js';
 
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -553,12 +553,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
-        idx: number;
-        isHighlight: boolean;
-        isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
+        isFieldSet: boolean;
         hideExpressionOption: AnyObject[];
+        idx: number;
+        isHighlight: boolean;
+        isHighlightRow: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     EditDialog: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         visible: {

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -594,12 +594,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
-        idx: number;
-        isHighlight: boolean;
-        isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
+        isFieldSet: boolean;
         hideExpressionOption: AnyObject[];
+        idx: number;
+        isHighlight: boolean;
+        isHighlightRow: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     readonly setStyle: typeof setStyle;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "save" | "reset")[], "close" | "save" | "reset", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -773,12 +773,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
-        idx: number;
-        isHighlight: boolean;
-        isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
+        isFieldSet: boolean;
         hideExpressionOption: AnyObject[];
+        idx: number;
+        isHighlight: boolean;
+        isHighlightRow: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     readonly isArray: {
         (value?: any): value is any[];
@@ -918,9 +918,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     showSeq: boolean;
     developMode: boolean;
     footerFlag: boolean;
-    fieldDescribeMode: "column" | "tooltip";
     customColumns: FieldSetColumnItem[];
     showSortPriority: boolean;
     showHeadFilter: boolean;
+    fieldDescribeMode: "column" | "tooltip";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -384,11 +384,11 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hide: boolean;
     }>;
     draggable: boolean;
-    isHighlightRow: boolean;
-    idx: number;
-    isHighlight: boolean;
-    isFieldSet: boolean;
     fieldDescribeMode: "column" | "tooltip";
+    isFieldSet: boolean;
     hideExpressionOption: AnyObject[];
+    idx: number;
+    isHighlight: boolean;
+    isHighlightRow: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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,

package/es/components/select-person/src/SelectPerson.vue2.js

@@ -383,7 +383,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           ...props.searchFilter
         };
         const customTitles = searchFilter.customTitles || [""];
-        const values = [childList, parentList];
+        const values = props.onlyCheckChildNode ? [childList] : [childList, parentList];
         searchData.value = customTitles.map((title, i) => ({
           title,
           data: values[i] || []
@@ -668,11 +668,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           })]), __props.multiple && !isSearch.value && treeData.value.length > 0 ? withDirectives((openBlock(), createBlock(unref(NCheckbox), {
             key: 0,
             checked: checkedAll.value,
-            "onUpdate:checked": [_cache[1] || (_cache[1] = ($event) => checkedAll.value = $event), checkedAllChange]
+            "onUpdate:checked": [_cache[1] || (_cache[1] = ($event) => checkedAll.value = $event), checkedAllChange],
+            disabled: __props.onlyCheckChildNode
           }, {
             default: withCtx(() => [..._cache[3] || (_cache[3] = [createTextVNode(i18n("10010.1.37", "\u5168\u9009"), -1)])]),
             _: 1
-          }, 8, ["checked"])), [[vShow, __props.forceShowSelectAll]]) : createCommentVNode("v-if", true), createCommentVNode(" \u540C\u65F6\u517C\u5BB9\u9009\u4EBA\u548C\u9009\u90E8\u95E8 "), isSearch.value && isShowGroupList.value ? (openBlock(), createBlock(SearchGroupList, {
+          }, 8, ["checked", "disabled"])), [[vShow, __props.forceShowSelectAll]]) : createCommentVNode("v-if", true), createCommentVNode(" \u540C\u65F6\u517C\u5BB9\u9009\u4EBA\u548C\u9009\u90E8\u95E8 "), isSearch.value && isShowGroupList.value ? (openBlock(), createBlock(SearchGroupList, {
             key: 1,
             class: "c-select-person__hide",
             type: showType.value,

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.63";
+var version = "3.4.0-beta.66";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.63",
+	"version": "3.4.0-beta.66",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "3191a7a49e9b0f076d59decced27fdfab9dfc85c"
+	"gitHead": "ebc0b457ddea06a2b1a8abe4234e5c077782291f"
 }