cnhis-design-vue 3.1.14-beta.3 → 3.1.14-beta.6

package/README.md

@@ -1,23 +1,23 @@
-# Vue 3 + Typescript + Vite
-
-This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
-
-## Recommended IDE Setup
-
-- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
-
-## Type Support For `.vue` Imports in TS
-
-Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's `.vue` type support plugin by running `Volar: Switch TS Plugin on/off` from VSCode command palette.
-
-## 使用
-```JavaScript
-import { createApp } from "vue";
-import App from "./App.vue";
-import cui from "cnhis-design-vue";
-import "cnhis-design-vue/es/index.css";
-
-const app = createApp(App);
-app.use(cui);
-app.mount("#app");
+# Vue 3 + Typescript + Vite
+
+This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+## Recommended IDE Setup
+
+- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
+
+## Type Support For `.vue` Imports in TS
+
+Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's `.vue` type support plugin by running `Volar: Switch TS Plugin on/off` from VSCode command palette.
+
+## 使用
+```JavaScript
+import { createApp } from "vue";
+import App from "./App.vue";
+import cui from "cnhis-design-vue";
+import "cnhis-design-vue/es/index.css";
+
+const app = createApp(App);
+app.use(cui);
+app.mount("#app");
 ```

package/es/packages/annotation-edit/index.d.ts

@@ -0,0 +1,17 @@
+import { SFCWithInstall } from '../../../es/src/types';
+declare const Annotation: SFCWithInstall<import("vue").DefineComponent<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & {
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}, {
+    modelValue: string;
+}>>;
+export default Annotation;

package/es/packages/annotation-edit/index.js

@@ -0,0 +1,10 @@
+import { COMPONENT_NAMESPACE } from '../../src/global/variable';
+import { safeComponentRegister } from '../../src/utils';
+import script from './src/AnnotationEdit.js';
+
+const Annotation = script;
+Annotation.install = function(app) {
+  safeComponentRegister(app, Annotation, COMPONENT_NAMESPACE + "Annotation");
+};
+
+export { Annotation as default };

package/es/packages/annotation-edit/src/AnnotationEdit.d.ts

@@ -0,0 +1,16 @@
+declare const _default: import("vue").DefineComponent<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & {
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}, {
+    modelValue: string;
+}>;
+export default _default;

package/es/packages/annotation-edit/src/AnnotationEdit.js

@@ -0,0 +1,119 @@
+import { defineComponent, computed, ref, createVNode, unref } from 'vue';
+import { FileTrayFull, FileTray } from '@vicons/ionicons5';
+import { NPopover, NIcon, NInput } from 'naive-ui';
+
+var script = defineComponent({
+  props: {
+    modelValue: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props, {
+    emit
+  }) {
+    const modelValue = computed({
+      get() {
+        return props.modelValue;
+      },
+      set(value) {
+        emit("update:modelValue", value);
+      }
+    });
+    const __showPopper = ref(false);
+    const showPopper = computed({
+      get() {
+        return __showPopper.value;
+      },
+      async set(value) {
+        __showPopper.value = value;
+        if (!value && isEdit.value) {
+          await new Promise((resolve) => setTimeout(resolve, 200));
+          isEdit.value = false;
+        }
+      }
+    });
+    const isEdit = ref(false);
+    let clickTimer;
+    function iconClick() {
+      clearTimeout(clickTimer);
+      if (showPopper.value && isEdit.value) {
+        showPopper.value = false;
+        return;
+      }
+      clickTimer = setTimeout(() => {
+        if (!unref(modelValue)) {
+          isEdit.value = showPopper.value = true;
+        }
+      }, 200);
+    }
+    function iconDbClick() {
+      clearTimeout(clickTimer);
+      if (!unref(modelValue))
+        return;
+      showPopper.value = true;
+      isEdit.value = true;
+    }
+    function iconMouseenter() {
+      if (!unref(modelValue))
+        return;
+      showPopper.value = true;
+    }
+    function iconMouseleave() {
+      if (!unref(modelValue) || isEdit.value)
+        return;
+      showPopper.value = false;
+    }
+    function renderAnnotation() {
+      return createVNode("section", {
+        "class": ["annotation-edit", {
+          "is-active": !!unref(modelValue)
+        }],
+        "style": {
+          "--icon-right": "-5"
+        },
+        "annotation-hover-show": !unref(modelValue) && !isEdit.value
+      }, [createVNode(NPopover, {
+        "style": {
+          maxWidth: "200px",
+          wordBreak: "break-all"
+        },
+        "show": showPopper.value,
+        "onUpdate:show": ($event) => showPopper.value = $event,
+        "trigger": "manual",
+        "duration": 100
+      }, {
+        default: renderDefault,
+        trigger: renderTrigger
+      })]);
+      function renderText() {
+        return createVNode("span", null, [unref(modelValue)]);
+      }
+      function renderTextarea() {
+        return createVNode(NInput, {
+          "type": "textarea",
+          "value": modelValue.value,
+          "onUpdate:value": ($event) => modelValue.value = $event
+        }, null);
+      }
+      function renderDefault() {
+        return createVNode("div", null, [isEdit.value ? renderTextarea() : renderText()]);
+      }
+      function renderTrigger() {
+        return createVNode("div", {
+          "class": "annotation-edit__icon",
+          "onMouseleave": iconMouseleave,
+          "onMouseenter": iconMouseenter,
+          "onDblclick": iconDbClick,
+          "onClick": iconClick
+        }, [createVNode(NIcon, {
+          "component": unref(modelValue) ? FileTrayFull : FileTray
+        }, null)]);
+      }
+    }
+    return renderAnnotation;
+  }
+});
+
+export { script as default };

package/es/packages/annotation-edit/style/index.css

@@ -0,0 +1,15 @@
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1093,9 +1093,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostFocusSuccess: string;
                 textColorGhostDisabledSuccess: string;
                 borderSuccess: string;
-                borderHoverSuccess: string; /**
-                 * 删除选中scan数据
-                 */
+                borderHoverSuccess: string;
                 borderPressedSuccess: string;
                 borderFocusSuccess: string;
                 borderDisabledSuccess: string;
@@ -1210,10 +1208,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorPressed: string;
                 textColorFocus: string;
                 textColorDisabled: string;
-                textColorText: string; /**
-                 * 避免每次点击都查询
-                 * 初始化查一次 行编辑 表单search用
-                 */
+                textColorText: string;
                 textColorTextHover: string;
                 textColorTextPressed: string;
                 textColorTextFocus: string;
@@ -1310,7 +1305,7 @@ declare const _default: import("vue").DefineComponent<{
                 colorWarning: string;
                 colorHoverWarning: string;
                 colorPressedWarning: string;
-                colorFocusWarning: string;
+                colorFocusWarning: string; /** string */
                 colorDisabledWarning: string;
                 textColorWarning: string;
                 textColorHoverWarning: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1338,8 +1338,7 @@ var script = /* @__PURE__ */ defineComponent({
         emit("checkboxChange", {
           checked: checked2,
           row,
-          index: $rowIndex,
-          records: [row]
+          index: $rowIndex
         });
         return;
       }
@@ -1412,8 +1411,7 @@ var script = /* @__PURE__ */ defineComponent({
         emit("checkboxChange", {
           checked: setChecked,
           row,
-          index: $rowIndex,
-          records: checkedRow
+          index: $rowIndex
         });
         setChecked && emit("handlerClickRow", row, $rowIndex);
         return;
@@ -1430,8 +1428,7 @@ var script = /* @__PURE__ */ defineComponent({
       emit("checkboxChange", {
         checked: setChecked,
         row,
-        index: $rowIndex,
-        records: checkedRow
+        index: $rowIndex
       });
       setChecked && emit("handlerClickRow", row, $rowIndex);
     };
@@ -1451,7 +1448,6 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const treeTableSelectionChange = (records) => {
       if (state.isTree == 0) {
-        emit("selectionChange", records);
         return false;
       }
       pubCheckChange(records);
@@ -1472,8 +1468,7 @@ var script = /* @__PURE__ */ defineComponent({
       emit("checkboxChange", {
         checked,
         row,
-        index: $rowIndex,
-        records
+        index: $rowIndex
       });
       if (treeTableSelectionChange(records))
         return;
@@ -2281,7 +2276,8 @@ var script = /* @__PURE__ */ defineComponent({
         "show-header-overflow": "",
         "show-footer-overflow": "title",
         "keep-source": "",
-        "auto-resize": ""
+        "auto-resize": "",
+        height: props.height ? "auto" : void 0
       }, _ctx.$attrs, {
         "seq-config": unref(handleSeqConfig),
         "tree-config": unref(treeConfig),
@@ -2306,7 +2302,8 @@ var script = /* @__PURE__ */ defineComponent({
           visibleMethod: unref(visibleMethod),
           trigger: "cell",
           reserve: true,
-          highlight: true
+          highlight: true,
+          ..._ctx.$attrs.checkboxConfig || {}
         },
         "radio-config": {
           checkField: "checked",
@@ -2395,7 +2392,7 @@ var script = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/packages/big-table/src/utils.js

@@ -140,7 +140,7 @@ const reScrollFilterWrap = () => {
   });
 };
 const showFilter = (field, columnName, event, props, state) => {
-  var _a;
+  var _a, _b, _c;
   if (props.isInlineOperating)
     return false;
   const target = event.target;
@@ -161,7 +161,7 @@ const showFilter = (field, columnName, event, props, state) => {
   field.top = btnRectTop + FILTER_BOX_TOP_OFFSET + (props.filterTopOffset || 0) + "px";
   field.visible = !field.visible;
   const len = (_a = state.filterFields[columnName]) == null ? void 0 : _a.CONVERT.length;
-  field.checkAll = len === field.setting.showSetting.length;
+  field.checkAll = len === ((_c = (_b = state.filterFields[columnName]) == null ? void 0 : _b.filterItems) == null ? void 0 : _c.length);
   field.indeterminate = !!len && len !== field.setting.showSetting.length;
   field.searchFilterText = "";
 };

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -1,7 +1,8 @@
 import { defineComponent, reactive, computed, onMounted, onUnmounted, watch, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, renderSlot, withModifiers, createCommentVNode, createTextVNode, toDisplayString, mergeProps } from 'vue';
+import { isObject } from '@vue/shared';
 import { useMessage, NDropdown, NButton, NIcon } from 'naive-ui';
 import { ChevronDown } from '@vicons/ionicons5';
-import Print from './utils/print.js';
+import { Print } from './utils/print.js';
 import './components/IdentityVerification.js';
 import moment from 'moment';
 import script$1 from './components/IdentityVerification.vue_vue_type_script_setup_true_lang.js';
@@ -123,6 +124,9 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const callLocalServicesErrorCb = (res) => {
       emit("error", res);
+      if (isObject(res) && res.type === "notInstalledApp") {
+        $message.error(res.message);
+      }
     };
     const prevFnError = () => {
       let error = {

package/es/packages/button-print/src/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './print';

package/es/packages/button-print/src/utils/index.js

@@ -0,0 +1 @@
+export { Print } from './print.js';

package/es/packages/button-print/src/utils/print.d.ts

@@ -1,5 +1,5 @@
 import { AnyObject, Func } from '../../../../../es/src/types';
-export default class Print {
+export declare class Print {
     private readonly webview;
     private currentMessageHandler?;
     constructor();

package/es/packages/button-print/src/utils/print.js

@@ -322,4 +322,4 @@ class Print {
   }
 }
 
-export { Print as default };
+export { Print };

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

@@ -14,7 +14,8 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         data: import("./src/interface").IData;
         addRenderItem?: Function | undefined;
     };
-    emits: (event: "change" | "add", ...args: any[]) => void;
+    emits: (event: "select" | "change" | "add", ...args: any[]) => void;
+    select: import("vue").Ref<any>;
     canvasRef: any;
     canvas: import("vue").Ref<any>;
     dateHeight: import("vue").ComputedRef<number>;
@@ -48,6 +49,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         originY: number;
         endY: number;
     }>;
+    topList: import("vue").ComputedRef<import("./src/interface").IDate[]>;
     propItems: any;
     cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./src/interface").IPointType, scaleValueList: number[], value: string | number) => number;
@@ -180,7 +182,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         show: boolean;
         list: unknown[];
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "add")[], "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "change" | "add")[], "select" | "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
         type: null;
         required: true;
@@ -191,6 +193,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
+    onSelect?: ((...args: any[]) => any) | undefined;
     onAdd?: ((...args: any[]) => any) | undefined;
 }, {}>>;
 export default FabricChart;

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

@@ -1,4 +1,4 @@
-import { IData } from './interface';
+import { IData, IDate } from './interface';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: null;
@@ -14,7 +14,8 @@ declare const _default: import("vue").DefineComponent<{
         data: IData;
         addRenderItem?: Function | undefined;
     };
-    emits: (event: "change" | "add", ...args: any[]) => void;
+    emits: (event: "select" | "change" | "add", ...args: any[]) => void;
+    select: import("vue").Ref<any>;
     canvasRef: any;
     canvas: import("vue").Ref<any>;
     dateHeight: import("vue").ComputedRef<number>;
@@ -48,6 +49,7 @@ declare const _default: import("vue").DefineComponent<{
         originY: number;
         endY: number;
     }>;
+    topList: import("vue").ComputedRef<IDate[]>;
     propItems: any;
     cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./interface").IPointType, scaleValueList: number[], value: string | number) => number;
@@ -180,7 +182,7 @@ declare const _default: import("vue").DefineComponent<{
         show: boolean;
         list: unknown[];
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "add")[], "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "change" | "add")[], "select" | "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
         type: null;
         required: true;
@@ -191,6 +193,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
+    onSelect?: ((...args: any[]) => any) | undefined;
     onAdd?: ((...args: any[]) => any) | undefined;
 }, {}>;
 export default _default;

package/es/packages/fabric-chart/src/FabricChart.vue_vue_type_script_setup_true_lang.js

@@ -9,7 +9,7 @@ import { useLeft } from './hooks/useLeft.js';
 import { useRight } from './hooks/useRight.js';
 import { useBottom } from './hooks/useBottom.js';
 import { useOther } from './hooks/useOther.js';
-import { useEvent } from './hooks/useEvent.js';
+import { useEvent, useCanvasEvent } from './hooks/useEvent.js';
 import script$1 from './components/PopupTip.vue_vue_type_script_setup_true_lang.js';
 import { useCumputedPoint } from './hooks/useCumputedPoint.js';
 
@@ -19,10 +19,11 @@ var script = /* @__PURE__ */ defineComponent({
     data: { type: null, required: true },
     addRenderItem: { type: Function, required: false }
   },
-  emits: ["change", "add"],
-  setup(__props, { emit: emits }) {
+  emits: ["change", "add", "select"],
+  setup(__props, { expose, emit: emits }) {
     const props = __props;
     const defaultHeight = 15;
+    let select = ref();
     const canvasRef = ref(null);
     let canvas = ref();
     const dateHeight = computed(() => {
@@ -200,14 +201,29 @@ var script = /* @__PURE__ */ defineComponent({
       }
       return obj;
     });
+    const topList = computed(() => {
+      const { top } = props.data;
+      let topList2 = [];
+      for (let i in top) {
+        if (top[i].show) {
+          topList2.push({
+            ...top[i],
+            key: i
+          });
+        }
+      }
+      return topList2.sort((a, b) => a.seq - b.seq);
+    });
     const propItems = reactive({
       canvasWidth: props.data.width,
       canvasHeight: props.data.height,
       borderStyle: props.data.borderStyle || defaultBorderStyle,
+      selectionStyle: props.data.selectionStyle || {},
       dateHeight: dateHeight.value,
       hospitalDaysHeight: hospitalDaysHeight.value,
       operationDaysHeight: operationDaysHeight.value,
       xScalevalueHeight: xScalevalueHeight.value,
+      topList: topList.value,
       breathingHeight: breathingHeight.value,
       grid: props.data.grid,
       top: props.data.top,
@@ -253,11 +269,16 @@ var script = /* @__PURE__ */ defineComponent({
         fireRightClick: true
       });
       useEvent(canvasRef.value);
+      const { select: selectFunc } = useCanvasEvent(canvas, propItems, emits);
+      select.value = selectFunc;
     });
     onBeforeUnmount(() => {
       canvas.value.clear();
       canvas.value = null;
     });
+    expose({
+      select
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
         createElementVNode("canvas", {

package/es/packages/fabric-chart/src/hooks/index.d.ts

@@ -1,4 +1,4 @@
-export { defaultBorderStyle } from './useDraw';
+export * from './useDraw';
 export * from './useCumputedPoint';
 export * from './useTop';
 export * from './useLeft';

package/es/packages/fabric-chart/src/hooks/index.js

@@ -1,4 +1,4 @@
-export { defaultBorderStyle } from './useDraw.js';
+export { defaultBorderStyle, defaultLineStyle, defaultRectStyle, defaultStyle, defaultTextStyle, drawLine, drawPoint, drawTextGroup } from './useDraw.js';
 export { useCumputedPoint } from './useCumputedPoint.js';
 export { useTop } from './useTop.js';
 export { useLeft } from './useLeft.js';
@@ -6,4 +6,4 @@ export { useRight } from './useRight.js';
 export { useCenter } from './useCenter.js';
 export { useBottom } from './useBottom.js';
 export { useOther } from './useOther.js';
-export { useEvent } from './useEvent.js';
+export { useCanvasEvent, useEvent } from './useEvent.js';

package/es/packages/fabric-chart/src/hooks/useCenter.js

@@ -88,19 +88,26 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       const [data1, data2] = copyDataList;
       const getPoint = (item) => {
-        return item.x && item.y ? {
-          x: item.x,
-          y: item.y
-        } : {
-          x: cumputedX(item.time),
-          y: cumputedY(pulseObj.type, pulseObj.list, item.value)
-        };
+        if (item.x && item.y) {
+          return {
+            x: item.x,
+            y: item.y
+          };
+        }
+        if (isEffectiveNode(item) && isLimit(item.time)) {
+          let y = cumputedY(pulseObj.type, pulseObj.list, item.value);
+          y = y < vitalSignsOriginY.originY ? vitalSignsOriginY.originY : y > vitalSignsOriginY.endY ? vitalSignsOriginY.endY : y;
+          return {
+            x: cumputedX(item.time),
+            y
+          };
+        }
       };
       data1.list.forEach((item, index) => {
         const point1 = getPoint(item);
         const item2 = data2.list[index];
         const point2 = item2 ? getPoint(item2) : null;
-        if (point2 && point1.x === point2.x && point1.y !== point2.y) {
+        if (point1 && point2 && point1.x === point2.x && point1.y !== point2.y) {
           points1.push(point1);
           points2.push(point2);
           const itemPrev = data1.list[index - 1];
@@ -108,12 +115,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           const itemNext2 = data2.list[index + 1];
           if (itemPrev && points1.length === 1) {
             const point = getPoint(itemPrev);
-            points1.unshift(point);
+            point && points1.unshift(point);
           }
           if (itemNext && itemNext2) {
             const pointNext = getPoint(itemNext);
             const pointNext2 = getPoint(itemNext2);
-            if (pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
+            if (pointNext && pointNext2 && pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
               points1.push(pointNext);
             }
           } else {
@@ -349,13 +356,11 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           coolPoint && otherList.push(coolPoint);
         }
       }
-      let line;
       let point;
-      let previousLine;
-      line = points && nextPoint && !v.breakpoint ? drawLine([...points, ...nextPoint], {
+      const line = points && nextPoint && !v.breakpoint ? drawLine([...points, ...nextPoint], {
         ...lineAttr
       }) : null;
-      previousLine = lineList[index - 1];
+      const previousLine = lineList[index - 1];
       const pointAttrNew = {
         origin: {
           data: v,

package/es/packages/fabric-chart/src/hooks/useEvent.d.ts

@@ -1 +1,7 @@
+import { Ref } from 'vue';
+import { fabric } from '../utils';
+import { IPropItems } from '../interface';
 export declare function useEvent(element: HTMLCanvasElement | any): void;
+export declare function useCanvasEvent(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any): {
+    select: (key: string) => void;
+};

package/es/packages/fabric-chart/src/hooks/useEvent.js

@@ -1,4 +1,5 @@
 import { useEventListener } from '@vueuse/core';
+import { fabric } from '../utils/index.js';
 
 function useEvent(element) {
   useEventListener(element.nextSibling, "contextmenu", (e) => {
@@ -6,5 +7,69 @@ function useEvent(element) {
     return false;
   });
 }
+function useCanvasEvent(canvas, propItems, emits) {
+  const { originY, originX, endX, endY, iconsWidth, selectionStyle, topList } = propItems;
+  function drawRect(options, key) {
+    const { left, top, width, height } = options;
+    const rect = new fabric.Rect({
+      key,
+      left: left != null ? left : 0,
+      top: top != null ? top : 0,
+      width,
+      height,
+      stroke: "transparent",
+      strokeWidth: 1,
+      fill: "transparent",
+      lockMovementX: true,
+      lockMovementY: true,
+      transparentCorners: false,
+      ...selectionStyle
+    });
+    canvas.value.add(rect);
+    rect.on("mousedown", () => {
+      emits("select", key);
+    });
+    return rect;
+  }
+  function initSelection() {
+    if (typeof (selectionStyle == null ? void 0 : selectionStyle.evented) === "boolean" && !(selectionStyle == null ? void 0 : selectionStyle.evented))
+      return;
+    const selections2 = [];
+    selections2.push(drawRect({
+      left: iconsWidth,
+      top: originY,
+      width: originX - iconsWidth,
+      height: endY
+    }, "left"));
+    let topY = 0;
+    topList.forEach((item, index) => {
+      if (index > 0) {
+        topY += propItems[`${topList[index - 1].key}Height`];
+      }
+      selections2.push(drawRect({
+        left: iconsWidth,
+        top: topY,
+        width: endX - iconsWidth,
+        height: propItems[`${item.key}Height`]
+      }, item.key));
+    });
+    selections2.push(drawRect({
+      left: originX,
+      top: originY,
+      width: endX - originX,
+      height: endY - originY
+    }, "grid"));
+    canvas.value.renderAll();
+    return selections2;
+  }
+  const selections = initSelection();
+  function select(key) {
+    canvas.value.discardActiveObject();
+    const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
+    obj && obj.bringToFront();
+    obj && canvas.value.setActiveObject(obj);
+  }
+  return { select };
+}
 
-export { useEvent };
+export { useCanvasEvent, useEvent };

package/es/packages/fabric-chart/src/hooks/useTop.js

@@ -14,21 +14,12 @@ function useTop(canvas, propItems) {
     hospitalDaysHeight,
     operationDaysHeight,
     xScalevalueHeight,
-    iconsWidth
+    iconsWidth,
+    topList
   } = propItems;
   function drawTop() {
     let list = [];
     let topY = 0;
-    let topList = [];
-    for (let i in top) {
-      if (top[i].show) {
-        topList.push({
-          ...top[i],
-          key: i
-        });
-      }
-    }
-    topList.sort((a, b) => a.seq - b.seq);
     topList.forEach((item, index) => {
       if (index > 0) {
         topY += propItems[`${topList[index - 1].key}Height`];

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

@@ -23,10 +23,12 @@ export interface IPropItems {
     canvasWidth: number;
     canvasHeight: number;
     borderStyle: fabric.ILineOptions;
+    selectionStyle: any;
     dateHeight: number;
     hospitalDaysHeight: number;
     operationDaysHeight: number;
     xScalevalueHeight: number;
+    topList: IDate[];
     breathingHeight: number;
     grid: IGrid;
     top: ITop;
@@ -96,6 +98,7 @@ export interface IData {
     width: number;
     height: number;
     borderStyle?: fabric.ILineOptions;
+    selectionStyle?: any;
     grid: IGrid;
     other?: IOther;
     top: ITop;

package/es/packages/form-render/index.d.ts

@@ -409,7 +409,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
     scrollTo: (id: string) => Promise<void>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     bindInfo: (info: import("../../../es/src/types").AnyObject) => import("../../../es/src/types").AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -409,7 +409,7 @@ declare const _default: import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
     scrollTo: (id: string) => Promise<void>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     bindInfo: (info: AnyObject) => AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/components/renderer/formItem.js

@@ -1,9 +1,9 @@
-import { defineComponent, inject, computed, ref, createVNode } from 'vue';
+import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
 import { connect, mapProps } from '@formily/vue';
-import { FileTrayFull, FileTray } from '@vicons/ionicons5';
 import { isBoolean } from 'lodash-es';
-import { NFormItem, NPopover, NIcon, NInput } from 'naive-ui';
+import { NFormItem } from 'naive-ui';
+import AnnotationEdit from '../../../../../packages/annotation-edit';
 import { InjectionAnnotation } from '../../../../../packages/form-render/src/constants';
 
 const script = defineComponent({
@@ -27,96 +27,12 @@ const script = defineComponent({
         };
       }
     });
-    function renderTextarea() {
-      return createVNode(NInput, {
-        "type": "textarea",
-        "value": annotationContent.value,
-        "onUpdate:value": ($event) => annotationContent.value = $event
-      }, null);
-    }
-    const __showPopper = ref(false);
-    const showPopper = computed({
-      get() {
-        return __showPopper.value;
-      },
-      async set(value) {
-        __showPopper.value = value;
-        if (!value && isEdit.value) {
-          await new Promise((resolve) => setTimeout(resolve, 200));
-          isEdit.value = false;
-        }
-      }
-    });
-    const isEdit = ref(false);
-    let clickTimer;
-    function iconClick() {
-      clearTimeout(clickTimer);
-      if (showPopper.value && isEdit.value) {
-        showPopper.value = false;
-        return;
-      }
-      clickTimer = setTimeout(() => {
-        if (!annotationContent.value) {
-          isEdit.value = showPopper.value = true;
-        }
-      }, 200);
-    }
-    function iconDbClick() {
-      clearTimeout(clickTimer);
-      if (!annotationContent.value)
-        return;
-      showPopper.value = true;
-      isEdit.value = true;
-    }
-    function iconMouseenter() {
-      if (!annotationContent.value)
-        return;
-      showPopper.value = true;
-    }
-    function iconMouseleave() {
-      if (!annotationContent.value || isEdit.value)
-        return;
-      showPopper.value = false;
-    }
     function renderAnnotation() {
-      return createVNode("section", {
-        "class": ["form-render__formItemLabel--annotation", {
-          "is-active": !!annotationContent.value
-        }],
-        "style": {
-          "--icon-right": "-5"
-        },
-        "form-item-hover-show": !annotationContent.value && !isEdit.value
-      }, [createVNode(NPopover, {
-        "style": {
-          maxWidth: "200px",
-          wordBreak: "break-all"
-        },
-        "show": showPopper.value,
-        "onUpdate:show": ($event) => showPopper.value = $event,
-        "trigger": "manual",
-        "duration": 100
-      }, {
-        default: renderDefault,
-        trigger: renderTrigger
-      })]);
-      function renderText() {
-        return createVNode("span", null, [annotationContent.value]);
-      }
-      function renderDefault() {
-        return createVNode("div", null, [isEdit.value ? renderTextarea() : renderText()]);
-      }
-      function renderTrigger() {
-        return createVNode("div", {
-          "class": "form-render__formItemLabel--icon",
-          "onMouseleave": iconMouseleave,
-          "onMouseenter": iconMouseenter,
-          "onDblclick": iconDbClick,
-          "onClick": iconClick
-        }, [createVNode(NIcon, {
-          "component": annotationContent.value ? FileTrayFull : FileTray
-        }, null)]);
-      }
+      return createVNode(AnnotationEdit, {
+        "class": "form-render__formItemLabel--annotation",
+        "modelValue": annotationContent.value,
+        "onUpdate:modelValue": ($event) => annotationContent.value = $event
+      }, null);
     }
     const showAnnotation = computed(() => {
       return annotation.value && (!isBoolean(props.annotation) || props.annotation);

package/es/packages/form-render/src/hooks/useAnchor.d.ts

@@ -3,7 +3,7 @@ import { ISchema } from '@formily/json-schema/esm/types';
 import { FormItemDepsCollector } from '../../../../../es/packages/form-render';
 export declare function useAnchor(props: Readonly<AnyObject>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     formHeight: import("vue").ComputedRef<any>;
     anchorIdList: import("vue").Ref<{
         name: string;

package/es/packages/form-render/src/hooks/useAnchor.js

@@ -3,7 +3,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isNumber } from 'lodash-es';
 import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../../../../packages/form-render/src/constants';
-import { traverseSchema, createLinebarId } from '../../../../packages/form-render/src/utils';
+import { createLinebarId, traverseSchema } from '../../../../packages/form-render/src/utils';
 
 function useAnchor(props, collector) {
   const __currentAnchor = ref("");
@@ -44,13 +44,13 @@ function useAnchor(props, collector) {
       scrollLock = false;
     }
   }
-  const onScroll = useDebounceFn(async function() {
+  const onScroll = useDebounceFn(function() {
     var _a;
     if (scrollLock || !scrollbarRef.value)
       return;
     const { scrollTop, clientHeight } = scrollbarRef.value;
     const result = anchorIdList.value.find((anchor) => {
-      const node = scrollbarRef.value.querySelector(`#${anchor.name}`);
+      const node = scrollbarRef.value.querySelector(`#${createLinebarId(anchor.name)}`);
       if (!node)
         return;
       return node.offsetTop >= scrollTop || node.offsetTop < scrollTop && node.clientHeight + node.offsetTop > scrollTop + clientHeight;

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -1,7 +1,7 @@
 import { isObject } from '@vueuse/core';
 import { isArray, pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { createLinebarId, arrayed, transformDateFormat } from '../utils/index.js';
+import { fieldKeyEscape, createLinebarId, arrayed, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -174,13 +174,15 @@ function useFieldListAdaptor(collector, uuid) {
     return creator(item);
   };
   const createWidgetCombinationSchema = (item) => {
+    if (!item.suffixConfig)
+      return createWidgetSchema(item);
     const suffixList = arrayed(item.suffixConfig);
     const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
       return { ...suffix, is_show: item.is_show, alias: " " };
     }));
     return {
       type: "void",
-      name: fieldList.map((f) => f.val_key).join("-"),
+      name: fieldKeyEscape(fieldList),
       title: item.alias || item.name,
       "x-component": "INPUT_GROUP",
       "x-component-props": { span: item.elem_width },
@@ -212,7 +214,7 @@ function useFieldListAdaptor(collector, uuid) {
     }
     function createFieldName(fieldItem) {
       if (isArray(fieldItem.suffixConfig)) {
-        return [fieldItem.val_key, fieldItem.suffixConfig.map((f) => f.val_key)].join("-");
+        return fieldKeyEscape([fieldItem, ...fieldItem.suffixConfig]);
       }
       return fieldItem.val_key;
     }

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -69,6 +69,7 @@ export declare type FieldItem = {
         nameKey: string;
         valueKey: string;
     }>;
+    suffixConfig: FieldItem[] | FieldItem;
     fieldType: 'string' | 'object' | 'array' | 'number' | 'void' | 'boolean' | 'datetime';
     content: string | FormRenderer | Record<string, FormRenderer>;
     properties: FieldItem[];

package/es/packages/form-render/src/utils/index.d.ts

@@ -27,3 +27,4 @@ export declare function queryInput(decoratorElement?: HTMLElement | null): {
 };
 export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
 export declare function createLinebarId(id: string): string;
+export declare function fieldKeyEscape(fieldList: FieldItem[]): string;

package/es/packages/form-render/src/utils/index.js

@@ -139,5 +139,8 @@ function getParentLinebar(key, fieldList) {
 function createLinebarId(id) {
   return `id-${id}`;
 }
+function fieldKeyEscape(fieldList) {
+  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
+}
 
-export { arrayed, assignUpdateValue, createLinebarId, createSlot, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };

package/es/packages/form-render/style/index.css

@@ -1,3 +1,18 @@
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
@@ -21,24 +36,11 @@
 .form-render__formItemLabel--text.has-annotation {
   margin-right: 15px;
 }
-.form-render__formItemLabel--icon {
-  display: inline-flex;
-  align-items: center;
-}
 .form-render__formItemLabel--annotation {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.form-render__formItemLabel--annotation.is-active {
-  color: rgba(255, 152, 40);
 }
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
@@ -132,9 +134,9 @@
 .form-render .n-form-item-label {
   display: inline-flex;
 }
-.form-render .n-form-item-label [form-item-hover-show='true'] {
+.form-render .n-form-item-label [annotation-hover-show='true'] {
   visibility: hidden;
 }
-.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
   visibility: visible;
 }

package/es/packages/index.css

@@ -2646,6 +2646,21 @@ body > .vxe-table--tooltip-wrapper {
   font-size: 14px;
   text-decoration: none !important;
 }
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
@@ -2669,24 +2684,11 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__formItemLabel--text.has-annotation {
   margin-right: 15px;
 }
-.form-render__formItemLabel--icon {
-  display: inline-flex;
-  align-items: center;
-}
 .form-render__formItemLabel--annotation {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.form-render__formItemLabel--annotation.is-active {
-  color: rgba(255, 152, 40);
 }
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
@@ -2780,10 +2782,10 @@ body > .vxe-table--tooltip-wrapper {
 .form-render .n-form-item-label {
   display: inline-flex;
 }
-.form-render .n-form-item-label [form-item-hover-show='true'] {
+.form-render .n-form-item-label [annotation-hover-show='true'] {
   visibility: hidden;
 }
-.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
   visibility: visible;
 }
 .c-fabric-chart-popup-tip,

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.14-beta.3",
+  "version": "3.1.14-beta.6",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",