cnhis-design-vue 3.1.21-beta.9 → 3.1.22-beta.0

package/es/components/big-table/index.d.ts

@@ -603,11 +603,12 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         rowIndex: any;
     };
     deleteRow: (row: any, col: any, index: number) => void;
-    onFormChange: ({ value, row, column, index }: {
+    onFormChange: ({ value, row, column, index, type }: {
         value: string | number | null;
         row: any;
         column: any;
         index: number;
+        type?: string | undefined;
     }) => void;
     getDefaultValue: (params: any, item: any) => any;
     isAboutNestTable: import("vue").ComputedRef<any>;
@@ -702,7 +703,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     handleFilterChangeAll: (val: any, field: any) => void;
     handleFilterChange: (value: any, name: any, field: any) => void;
     handleFilterSearchChange: (value: any, columnName: any, field: any) => void;
-    handleFilterClearAll: (field: any) => void;
+    handleFilterClearAll: (columnName: any) => false | undefined;
     handleCancelFilter: () => void;
     mergeQuickSearchConfig: (filterFields: any, props: any) => void;
     handleFilter: (field: any) => void;
@@ -721,10 +722,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     handleCheckAll: () => void;
     handleCancelAllCheck: () => void;
     getRowClassName: (params: any) => any;
-    footerMethod: ({ columns, data }: {
-        columns: any;
-        data: any;
-    }) => any[];
+    footerMethod: (payload: any) => any;
     loadChildrenMethod: ({ row }: {
         row: any;
     }) => Promise<any>;

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

@@ -601,11 +601,12 @@ declare const _default: import("vue").DefineComponent<{
         rowIndex: any;
     };
     deleteRow: (row: any, col: any, index: number) => void;
-    onFormChange: ({ value, row, column, index }: {
+    onFormChange: ({ value, row, column, index, type }: {
         value: string | number | null;
         row: any;
         column: any;
         index: number;
+        type?: string | undefined;
     }) => void;
     getDefaultValue: (params: any, item: any) => any;
     isAboutNestTable: import("vue").ComputedRef<any>;
@@ -700,7 +701,7 @@ declare const _default: import("vue").DefineComponent<{
     handleFilterChangeAll: (val: any, field: any) => void;
     handleFilterChange: (value: any, name: any, field: any) => void;
     handleFilterSearchChange: (value: any, columnName: any, field: any) => void;
-    handleFilterClearAll: (field: any) => void;
+    handleFilterClearAll: (columnName: any) => false | undefined;
     handleCancelFilter: () => void;
     mergeQuickSearchConfig: (filterFields: any, props: any) => void;
     handleFilter: (field: any) => void;
@@ -719,10 +720,7 @@ declare const _default: import("vue").DefineComponent<{
     handleCheckAll: () => void;
     handleCancelAllCheck: () => void;
     getRowClassName: (params: any) => any;
-    footerMethod: ({ columns, data }: {
-        columns: any;
-        data: any;
-    }) => any[];
+    footerMethod: (payload: any) => any;
     loadChildrenMethod: ({ row }: {
         row: any;
     }) => Promise<any>;

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

@@ -494,7 +494,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           col.slots.header = toolTipTitle(item);
         }
-        if (!isScanMultiTable2) {
+        if (!isScanMultiTable2 && !isFunction(attr.footerMethod) && !isFunction(attr["footer-method"])) {
           col.slots.footer = "tooltip_footer";
         }
         if (props.showNestTable && state.isTree == 0 && ((_g = props.curNestColumnConfig) == null ? void 0 : _g.isTree) == 0) {
@@ -833,7 +833,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }, [createVNode("span", null, [createTextVNode("\u5DF2\u9009\u62E9"), field.CONVERT.length, createTextVNode("\u9879")]), createVNode(NButton, {
             "class": "checkbox-btn checkbox-btn-clear",
             "text": true,
-            "onClick": () => handleFilterClearAll(field)
+            "onClick": () => handleFilterClearAll(item.columnName)
           }, {
             default: () => [createTextVNode("\u6E05\u7A7A")]
           })]) : null, createVNode("div", null, [createVNode(NButton, {
@@ -913,7 +913,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field.searchFilterCONVERT = value;
       _beforeSearchConvert = XEUtils.clone(value, true);
     };
-    const handleFilterClearAll = (field) => {
+    const handleFilterClearAll = (columnName) => {
+      const field = state.filterFields[columnName];
+      if (!field)
+        return false;
       field.indeterminate = false;
       field.checkAll = false;
       state.filterFields[field.columnName].CONVERT = [];
@@ -1040,10 +1043,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       };
       return state.selectType === "checkbox" ? selectStyle() : null;
     };
-    const footerMethod = ({
-      columns,
-      data
-    }) => {
+    const footerMethod = (payload) => {
+      const {
+        columns,
+        data
+      } = payload;
+      if (isFunction(attr.footerMethod))
+        return attr.spanMethod(footerMethod);
+      if (isFunction(attr["footer-method"]))
+        return attr["footer-method"](payload);
       if (!props.groupCountFields || !props.groupCountFields.length) {
         return [columns.map((column, index) => {
           if (index === 0) {
@@ -2282,7 +2290,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       formatData,
       xGrid,
       loadColumn,
-      loadData
+      loadData,
+      handleFilterClearAll
     });
     return (_ctx, _cache) => {
       var _a;

package/es/components/big-table/src/components/edit-form/edit-input.js

@@ -36,20 +36,21 @@ var EditInput = defineComponent({
       formRef
     } = useCommon(props, attrs);
     const __value = ref(attrs.value);
+    const commData = {
+      row: props.row,
+      column: props.col,
+      index: props.index
+    };
     const onUpdateValue = (value) => {
       emit("formChange", {
         value,
-        row: props.row,
-        column: props.col,
-        index: props.index
+        ...commData
       });
     };
     function onBlur() {
       emit("formChange", {
         value: __value.value,
-        row: props.row,
-        column: props.col,
-        index: props.index
+        ...commData
       });
     }
     const config = {
@@ -68,7 +69,14 @@ var EditInput = defineComponent({
     }), null) : createVNode(NInputNumber, mergeProps({
       "ref": formRef
     }, attrs, config, {
-      "onUpdateValue": onUpdateValue
+      "value": __value.value,
+      "onUpdate:value": ($event) => __value.value = $event,
+      "onUpdateValue": onUpdateValue,
+      "onBlur": () => emit("formChange", {
+        value: __value.value,
+        ...commData,
+        type: "blur"
+      })
     }), null);
   }
 });

package/es/components/big-table/src/hooks/useEdit.d.ts

@@ -326,11 +326,12 @@ export declare const useEdit: (props: any, state: any, emit: any, xGrid: any) =>
     initEditTable: () => Promise<void>;
     deleteRow: (row: any, col: any, index: number) => void;
     onClickSelectTable: (row: any) => Promise<void>;
-    onFormChange: ({ value, row, column, index }: {
+    onFormChange: ({ value, row, column, index, type }: {
         value: number | string | null;
         row: any;
         column: any;
         index: number;
+        type?: string | undefined;
     }) => void;
     getDefaultValue: (params: any, item: any) => any;
 };

package/es/components/big-table/src/hooks/useEdit2.js

@@ -60,7 +60,8 @@ const useEdit = (props, state, emit, xGrid) => {
     value,
     row,
     column,
-    index
+    index,
+    type
   }) => {
     var _a, _b;
     let oldValue = row[column.columnName];
@@ -84,7 +85,7 @@ const useEdit = (props, state, emit, xGrid) => {
     if (((column == null ? void 0 : column.formType) === "date" || (column == null ? void 0 : column.formType) === "time") && !value) {
       row[column.columnName] = void 0;
     }
-    emit("formChange", { value, row, column, index, oldValue });
+    emit("formChange", { value, row, column, index, oldValue, ...type ? { type } : {} });
   };
   const getDefaultValue = (params, item) => {
     var _a;

package/es/components/big-table/src/hooks/useSeparateRow2.js

@@ -114,7 +114,7 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
       }, {});
     }
     function getColumnInfoMaxLength(parsedRowData) {
-      return Math.max(...parsedRowData.map((r) => r.data.length));
+      return Math.max(...parsedRowData.map((r) => r.data.length), 1);
     }
     async function getColumnRenderWidth(column) {
       const prev = getRenderWidth();
@@ -132,11 +132,12 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
     }
   }
   function contentSeparate(value, columnName, width) {
-    if (isArray(value))
+    if (isArray(value)) {
       return value.map((row) => {
         var _a, _b, _c;
         return (_c = (_b = (_a = getFieldItem(columnName)) == null ? void 0 : _a.separateFormatter) == null ? void 0 : _b.call(_a, cloneDeep(row))) != null ? _c : row;
       });
+    }
     if (!isString(value) || !isNumber(width))
       return [value];
     width -= 24;

package/es/components/big-table/style/index.css

@@ -1 +1 @@
-.big-table-filter-wrap{background-color:#fff;border-radius:4px;-webkit-box-shadow:0 2px 8px rgba(0,0,0,.15);box-shadow:0 2px 8px rgba(0,0,0,.2);display:flex;flex-direction:column;flex-wrap:wrap;margin-top:-6px;min-width:280px;overflow:hidden;position:fixed;transform:translateX(-2%);transition:width 2s;z-index:99998}.big-table-filter-wrap .sort-list{margin-top:6px}.big-table-filter-wrap .sort-item{align-items:center;display:flex;height:32px;padding:0 13px}.big-table-filter-wrap .sort-item.active,.big-table-filter-wrap .sort-item:hover{background:#f2f2f2}.big-table-filter-wrap .sort-icon{background-size:contain;display:inline-block;height:16px;width:16px}.big-table-filter-wrap .sort-text{color:rgba(0,0,0,.8);font-size:14px;line-height:32px;margin-left:11px}.big-table-filter-wrap .sort-icon-desc{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABT0lEQVRYR+3WvSuGYRTH8c9TykpJSimLMvgHpLyUCQsmg/wBMss/ILvdJgspNnkbZFYGk7JQSAaLwUuX7uFxu3E/nvvqSd3XeHW6zvec65zfORUNPpUG+1cClBnIysABhiMV5y4mqt/OAliPCHCImd8AIgWf/WzMIhzFK/Z/iigWQAtuE4A2PH0HEQugG5eJ005clwBlBmrJwDwGcorBNjYybOsqwit05QQ4R1/RAB3oqQHgoWiAnL5/NKvrC/4tQBNacYesDAR5fkxHV6QU72EQczhNSfE4VpOOmY01jsOyMYYXLGElcbSIZT4W4C1MxQIIUy9sU1ltGXyeYQSfuua7L2jOWYnPKbt2HKE3dR/0Iqx593lq4AT9OQE2MZ2yDTpyXKUlF0lthP3gy8nKwBqGcgLsYCHDNuwAAe4Nk7ipZRbk9F2MWZFt+CeiEuAdAU5CIQxYYdUAAAAASUVORK5CYII=")}.big-table-filter-wrap .filter-header{cursor:auto;padding:0 13px}.big-table-filter-wrap .filter-header-icon{border-right-color:#333;border-top-color:#333}.big-table-filter-wrap .filter-header-text{margin-left:11px}.big-table-filter-wrap .check-search-wrap{background:#f7f7f7;display:flex;justify-content:center;padding:8px 0;width:100%}.big-table-filter-wrap .check-seach-input{line-height:32px}.big-table-filter-wrap .checkbox-box{padding-right:3px;width:100%}.big-table-filter-wrap .checkbox-wrap{background:#fff;display:flex;flex-direction:column;overflow-y:auto;padding-left:13px;padding-right:3px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar{height:4px;width:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-thumb{background-color:#d5d5d5;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-track{background-color:#fff;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-corner{background-color:#000;border-radius:4px;width:4px}.big-table-filter-wrap .checkbox-wrap--search{padding-right:10px}.big-table-filter-wrap .checkbox-btn-wrap{display:flex;padding:9px 10px 9px 14px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn{padding:0;width:56px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn+.checkbox-btn{margin-left:8px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn{border:0;border-radius:0;margin:0 13px;position:relative;width:auto}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn:hover:after{background-color:#5585f5;bottom:5px;content:"";display:block;height:1px;position:absolute;width:100%}.big-table-filter-wrap .arrows-icon{bottom:-1px;cursor:nw-resize;font-size:15px;height:20px;position:absolute;right:-1px;width:25px}.big-table__separate{padding:4px}.big-table__separatePlaceholder{display:inline-block;max-width:0;visibility:hidden;width:0;word-break:keep-all}.custom-big-table{position:relative}.custom-big-table .n-input{width:fit-content}.custom-big-table .img-wrap{align-items:center;display:flex;height:100%;line-height:1;padding:2px 0}.custom-big-table .img-wrap img{cursor:pointer;max-height:100%;object-fit:contain}.custom-big-table .img-wrap.img-circle img{border-radius:50%;object-fit:contain;width:28px}.custom-big-table .bigTable-qr-span{display:inline-block;height:100%;position:relative}.custom-big-table .bigTable-qr-span .bigTable-qr-img{max-height:96%}.custom-big-table .bigTable-qr-span>span{align-items:center;background:rgba(0,0,0,.7);color:#fff;cursor:pointer;display:none;height:100%;justify-content:center;left:0;position:absolute;top:0;width:100%}.custom-big-table .bigTable-qr-span:hover>span{display:inline-flex}.custom-big-table .base-form{align-items:center;display:flex;overflow:hidden!important;width:100%}.custom-big-table .base-form-content{width:100%}.custom-big-table textarea{height:32px;margin-bottom:0;resize:none}.custom-big-table .formItem-select-multiple{align-items:center;display:flex;line-height:40px;width:100%}.custom-big-table.mt{height:calc(100% - 78px)!important;margin-top:26px}.custom-big-table.expand-padding .vxe-table .vxe-body--expanded-cell{padding-left:66px!important;padding-right:66px!important}.custom-big-table th.vxe-header--column{cursor:pointer}.custom-big-table .row-btn{margin-right:10px}.custom-big-table .vxe-table{transform:translateZ(0)}.custom-big-table .vxe-table .vxe-table--empty-content,.custom-big-table .vxe-table .vxe-table--empty-content>div{height:100%;width:100%}.custom-big-table .vxe-table .vxe-table--empty-content>div .no-data-tip{display:inline-flex}.custom-big-table .vxe-table .col--checkbox .vxe-cell,.custom-big-table .vxe-table .col--seq .vxe-cell{padding:0}.custom-big-table .vxe-table .col--checkbox .vxe-cell .vxe-checkbox--label,.custom-big-table .vxe-table .col--seq .vxe-cell .vxe-checkbox--label{padding-left:0}.custom-big-table .vxe-table .vxe-cell .vxe-tree-cell{height:100%}.custom-big-table .vxe-table .scan-multi-delete{color:#f06f64}.custom-big-table .vxe-table .vxe-table--header{background-color:#f2f2f2}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title{display:inline-flex;height:100%;line-height:unset;width:100%}.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title,.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title{display:inline-block}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar{background-color:#f2f2f2;height:10px;width:10px}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb:hover,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb:hover{background-color:#b2b2b2}.custom-big-table .vxe-table .vxe-footer--row .vxe-footer--column>.vxe-cell .vxe-cell--item{height:30px;line-height:30px}.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label{display:none}.custom-big-table .filter-box{align-items:center;display:flex;width:100%}.custom-big-table .filter-box .text-over-tooltip-components{max-width:calc(100% - 40px)}.custom-big-table .filter-box .vxe-filter--btn{border-right-color:#c0c4cc;border-top-color:#c0c4cc}.custom-big-table .filter-box .vxe-filter--btn.active{border-right-color:#35393c;border-top-color:#35393c}.custom-big-table .filter-box .vxe-filter--btn.checked{border-right-color:#5585f5;border-top-color:#5585f5}.custom-big-table .disabled-checked-tips{background:#fff;border:2px solid #ff1818;border-radius:50%;bottom:0;box-sizing:border-box;height:16px;margin-top:-8px;overflow:hidden;position:absolute;right:0;top:50%;width:16px}.custom-big-table .disabled-checked-tips:after{background-color:#ff1818;content:"";height:2px;left:0;position:absolute;top:0;transform:rotate(45deg);transform-origin:0 2px;width:16px}.custom-big-table .form-select-table .n-base-select-menu__empty{display:none}.custom-big-table .percent-wrap{align-items:center;display:flex;flex-direction:column;justify-content:center;text-align:center}.custom-big-table .percent-wrap .percent-value{line-height:1;margin-bottom:-4px;margin-top:4px}.custom-big-table .refresh{align-items:center;background-color:#fff;border-bottom-left-radius:14px;border-top-left-radius:14px;box-shadow:0 2px 4px 0 hsla(0,0%,42%,.13);color:#5585f5;cursor:pointer;display:flex;font-size:12px;height:27px;padding-left:14px;padding-right:14px;position:absolute;right:0;top:6px;z-index:1}.custom-big-table .refresh-row{margin-bottom:0;margin-left:3px}.custom-big-table .check-wrap{background:#ffffe9;display:flex;justify-content:center;line-height:26px;margin-top:-26px;position:absolute;width:100%}.custom-big-table .check-wrap .check-wrap-btn,.custom-big-table .check-wrap .check-wrap-title{color:#000;cursor:pointer;font-size:12px;margin-bottom:0}.custom-big-table .check-wrap .check-wrap-btn{color:#5585f5}.custom-big-table .domPropsInnerHTML-span{height:100%}.custom-big-table .domPropsInnerHTML-span img{display:inline-block;height:var(--tableImageHeight);width:var(--tableImageWidth)}.custom-big-table .domPropsInnerHTML-span .icon-dot-custom{background:var(--table-icon-color);box-shadow:0 2px 4px 0 var(--table-icon-shadow)}.custom-big-table .domPropsInnerHTML-span .icon-dot-custom,.custom-big-table .domPropsInnerHTML-span .icon-dot-red{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-red{background:red;box-shadow:0 2px 4px 0 rgba(255,0,0,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-blue{background:blue;box-shadow:0 2px 4px 0 rgba(0,0,255,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-blue,.custom-big-table .domPropsInnerHTML-span .icon-dot-green{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-green{background:green;box-shadow:0 2px 4px 0 rgba(0,128,0,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-gray{background:gray;box-shadow:0 2px 4px 0 hsla(0,0%,50%,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-gray,.custom-big-table .domPropsInnerHTML-span .icon-dot-yellow{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-yellow{background:#ff0;box-shadow:0 2px 4px 0 rgba(255,255,0,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-resolved{background:#36be8c;box-shadow:0 2px 4px 0 rgba(54,190,140,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-huifu,.custom-big-table .domPropsInnerHTML-span .icon-dot-resolved{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-huifu{background:#42d0f6;box-shadow:0 2px 4px 0 rgba(66,208,246,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-close{background:#718391;box-shadow:0 2px 4px 0 rgba(113,131,145,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-audit,.custom-big-table .domPropsInnerHTML-span .icon-dot-close{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-audit{background:#f4ba32;box-shadow:0 2px 4px 0 rgba(244,186,50,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-design{background:#927ce1;box-shadow:0 2px 4px 0 rgba(146,124,225,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-design,.custom-big-table .domPropsInnerHTML-span .icon-dot-develop{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop{background:#4eb0ef;box-shadow:0 2px 4px 0 rgba(78,176,239,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop-complete{background:#6381f9;-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;box-shadow:0 2px 4px 0 rgba(99,129,249,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle{box-shadow:4px 0 4px 0 rgba(0,0,0,.12)}.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle{box-shadow:-4px 0 4px 0 rgba(0,0,0,.12)}.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.no-data-tip{align-items:center;color:#333;display:flex;flex-direction:column;font-size:22px;height:100%;justify-content:center;width:100%}.no-data-tip>img{max-width:70%;width:260px}.no-data-tip>p{color:rgba(0,0,0,.8);font-size:16px;margin-bottom:0;margin-top:12px}.no-data-tip>span{color:rgba(0,0,0,.4);font-size:14px;margin-top:6px}.text-over-tooltip-components{display:inline-block;max-width:98%}.text-over-tooltip-components .ellipsis{color:#35393c;font-size:14px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-over-tooltip-components .ellipsis i{font-style:normal;white-space:nowrap;word-break:keep-all}.text-over-tooltip-components .fs20{color:green;font-size:20px;font-weight:600;line-height:22px}.text-over-tooltip-components .fs12{color:orange;font-size:12px;font-weight:400;line-height:14px}.svg-icon{fill:currentColor;height:1em;overflow:hidden;vertical-align:-.15em;width:1em}.vxe-header--column [annotation-hover-show=true]{visibility:hidden}.vxe-header--column:hover [annotation-hover-show=true]{visibility:visible}.big-table__annotationWrapper{align-items:center;display:inline-flex;width:20px}
+.big-table-filter-wrap{background-color:#fff;border-radius:4px;-webkit-box-shadow:0 2px 8px rgba(0,0,0,.15);box-shadow:0 2px 8px rgba(0,0,0,.2);display:flex;flex-direction:column;flex-wrap:wrap;margin-top:-6px;min-width:280px;overflow:hidden;position:fixed;transform:translateX(-2%);transition:width 2s;z-index:99998}.big-table-filter-wrap .sort-list{margin-top:6px}.big-table-filter-wrap .sort-item{align-items:center;display:flex;height:32px;padding:0 13px}.big-table-filter-wrap .sort-item.active,.big-table-filter-wrap .sort-item:hover{background:#f2f2f2}.big-table-filter-wrap .sort-icon{background-size:contain;display:inline-block;height:16px;width:16px}.big-table-filter-wrap .sort-text{color:rgba(0,0,0,.8);font-size:14px;line-height:32px;margin-left:11px}.big-table-filter-wrap .sort-icon-desc{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABT0lEQVRYR+3WvSuGYRTH8c9TykpJSimLMvgHpLyUCQsmg/wBMss/ILvdJgspNnkbZFYGk7JQSAaLwUuX7uFxu3E/nvvqSd3XeHW6zvec65zfORUNPpUG+1cClBnIysABhiMV5y4mqt/OAliPCHCImd8AIgWf/WzMIhzFK/Z/iigWQAtuE4A2PH0HEQugG5eJ005clwBlBmrJwDwGcorBNjYybOsqwit05QQ4R1/RAB3oqQHgoWiAnL5/NKvrC/4tQBNacYesDAR5fkxHV6QU72EQczhNSfE4VpOOmY01jsOyMYYXLGElcbSIZT4W4C1MxQIIUy9sU1ltGXyeYQSfuua7L2jOWYnPKbt2HKE3dR/0Iqx593lq4AT9OQE2MZ2yDTpyXKUlF0lthP3gy8nKwBqGcgLsYCHDNuwAAe4Nk7ipZRbk9F2MWZFt+CeiEuAdAU5CIQxYYdUAAAAASUVORK5CYII=")}.big-table-filter-wrap .filter-header{cursor:auto;padding:0 13px}.big-table-filter-wrap .filter-header-icon{border-right-color:#333;border-top-color:#333}.big-table-filter-wrap .filter-header-text{margin-left:11px}.big-table-filter-wrap .check-search-wrap{background:#f7f7f7;display:flex;justify-content:center;padding:8px 0;width:100%}.big-table-filter-wrap .check-seach-input{line-height:32px}.big-table-filter-wrap .checkbox-box{padding-right:3px;width:100%}.big-table-filter-wrap .checkbox-wrap{background:#fff;display:flex;flex-direction:column;overflow-y:auto;padding-left:13px;padding-right:3px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar{height:4px;width:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-thumb{background-color:#d5d5d5;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-track{background-color:#fff;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-corner{background-color:#000;border-radius:4px;width:4px}.big-table-filter-wrap .checkbox-wrap--search{padding-right:10px}.big-table-filter-wrap .checkbox-btn-wrap{display:flex;padding:9px 10px 9px 14px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn{padding:0;width:56px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn+.checkbox-btn{margin-left:8px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn{border:0;border-radius:0;margin:0 13px;position:relative;width:auto}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn:hover:after{background-color:#5585f5;bottom:5px;content:"";display:block;height:1px;position:absolute;width:100%}.big-table-filter-wrap .arrows-icon{bottom:-1px;cursor:nw-resize;font-size:15px;height:20px;position:absolute;right:-1px;width:25px}.big-table__separate{padding:4px}.big-table__separatePlaceholder{display:inline-block;max-width:0;visibility:hidden;width:0;word-break:keep-all}.custom-big-table{position:relative}.custom-big-table .n-input{width:fit-content}.custom-big-table .img-wrap{align-items:center;display:flex;height:100%;line-height:1;padding:2px 0}.custom-big-table .img-wrap img{cursor:pointer;max-height:100%;object-fit:contain}.custom-big-table .img-wrap.img-circle img{border-radius:50%;object-fit:contain;width:28px}.custom-big-table .bigTable-qr-span{display:inline-block;height:100%;position:relative}.custom-big-table .bigTable-qr-span .bigTable-qr-img{max-height:96%}.custom-big-table .bigTable-qr-span>span{align-items:center;background:rgba(0,0,0,.7);color:#fff;cursor:pointer;display:none;height:100%;justify-content:center;left:0;position:absolute;top:0;width:100%}.custom-big-table .bigTable-qr-span:hover>span{display:inline-flex}.custom-big-table .base-form{align-items:center;display:flex;overflow:hidden!important;width:100%}.custom-big-table .base-form-content{width:100%}.custom-big-table textarea{height:32px;margin-bottom:0;resize:none}.custom-big-table .formItem-select-multiple{align-items:center;display:flex;line-height:40px;width:100%}.custom-big-table.mt{height:calc(100% - 78px)!important;margin-top:26px}.custom-big-table.expand-padding .vxe-table .vxe-body--expanded-cell{padding-left:66px!important;padding-right:66px!important}.custom-big-table th.vxe-header--column{cursor:pointer}.custom-big-table .row-btn{margin-right:10px}.custom-big-table .vxe-table{transform:translateZ(0)}.custom-big-table .vxe-table .vxe-table--empty-content,.custom-big-table .vxe-table .vxe-table--empty-content>div{height:100%;width:100%}.custom-big-table .vxe-table .vxe-table--empty-content>div .no-data-tip{display:inline-flex}.custom-big-table .vxe-table .col--checkbox .vxe-cell,.custom-big-table .vxe-table .col--seq .vxe-cell{padding:0}.custom-big-table .vxe-table .col--checkbox .vxe-cell .vxe-checkbox--label,.custom-big-table .vxe-table .col--seq .vxe-cell .vxe-checkbox--label{padding-left:0}.custom-big-table .vxe-table .vxe-cell .vxe-tree-cell{height:100%}.custom-big-table .vxe-table .scan-multi-delete{color:#f06f64}.custom-big-table .vxe-table .vxe-table--header{background-color:#f2f2f2}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title{display:inline-flex;height:100%;line-height:unset;width:100%}.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title,.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title{display:inline-block}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar{background-color:transparent;height:10px;width:10px}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb{background-clip:padding-box;background-color:#f2f2f2;border:3px dashed transparent;border-radius:0}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb:hover,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb:hover{background:#b2b2b2}.custom-big-table .vxe-table .vxe-footer--row .vxe-footer--column>.vxe-cell .vxe-cell--item{height:30px;line-height:30px}.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label{display:none}.custom-big-table .filter-box{align-items:center;display:flex;width:100%}.custom-big-table .filter-box .text-over-tooltip-components{max-width:calc(100% - 40px)}.custom-big-table .filter-box .vxe-filter--btn{border-right-color:#c0c4cc;border-top-color:#c0c4cc}.custom-big-table .filter-box .vxe-filter--btn.active{border-right-color:#35393c;border-top-color:#35393c}.custom-big-table .filter-box .vxe-filter--btn.checked{border-right-color:#5585f5;border-top-color:#5585f5}.custom-big-table .disabled-checked-tips{background:#fff;border:2px solid #ff1818;border-radius:50%;bottom:0;box-sizing:border-box;height:16px;margin-top:-8px;overflow:hidden;position:absolute;right:0;top:50%;width:16px}.custom-big-table .disabled-checked-tips:after{background-color:#ff1818;content:"";height:2px;left:0;position:absolute;top:0;transform:rotate(45deg);transform-origin:0 2px;width:16px}.custom-big-table .form-select-table .n-base-select-menu__empty{display:none}.custom-big-table .percent-wrap{align-items:center;display:flex;flex-direction:column;justify-content:center;text-align:center}.custom-big-table .percent-wrap .percent-value{line-height:1;margin-bottom:-4px;margin-top:4px}.custom-big-table .refresh{align-items:center;background-color:#fff;border-bottom-left-radius:14px;border-top-left-radius:14px;box-shadow:0 2px 4px 0 hsla(0,0%,42%,.13);color:#5585f5;cursor:pointer;display:flex;font-size:12px;height:27px;padding-left:14px;padding-right:14px;position:absolute;right:0;top:6px;z-index:1}.custom-big-table .refresh-row{margin-bottom:0;margin-left:3px}.custom-big-table .check-wrap{background:#ffffe9;display:flex;justify-content:center;line-height:26px;margin-top:-26px;position:absolute;width:100%}.custom-big-table .check-wrap .check-wrap-btn,.custom-big-table .check-wrap .check-wrap-title{color:#000;cursor:pointer;font-size:12px;margin-bottom:0}.custom-big-table .check-wrap .check-wrap-btn{color:#5585f5}.custom-big-table .domPropsInnerHTML-span{height:100%}.custom-big-table .domPropsInnerHTML-span img{display:inline-block;height:var(--tableImageHeight);width:var(--tableImageWidth)}.custom-big-table .domPropsInnerHTML-span .icon-dot-custom{background:var(--table-icon-color);box-shadow:0 2px 4px 0 var(--table-icon-shadow)}.custom-big-table .domPropsInnerHTML-span .icon-dot-custom,.custom-big-table .domPropsInnerHTML-span .icon-dot-red{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-red{background:red;box-shadow:0 2px 4px 0 rgba(255,0,0,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-blue{background:blue;box-shadow:0 2px 4px 0 rgba(0,0,255,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-blue,.custom-big-table .domPropsInnerHTML-span .icon-dot-green{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-green{background:green;box-shadow:0 2px 4px 0 rgba(0,128,0,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-gray{background:gray;box-shadow:0 2px 4px 0 hsla(0,0%,50%,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-gray,.custom-big-table .domPropsInnerHTML-span .icon-dot-yellow{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-yellow{background:#ff0;box-shadow:0 2px 4px 0 rgba(255,255,0,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-resolved{background:#36be8c;box-shadow:0 2px 4px 0 rgba(54,190,140,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-huifu,.custom-big-table .domPropsInnerHTML-span .icon-dot-resolved{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-huifu{background:#42d0f6;box-shadow:0 2px 4px 0 rgba(66,208,246,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-close{background:#718391;box-shadow:0 2px 4px 0 rgba(113,131,145,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-audit,.custom-big-table .domPropsInnerHTML-span .icon-dot-close{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-audit{background:#f4ba32;box-shadow:0 2px 4px 0 rgba(244,186,50,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-design{background:#927ce1;box-shadow:0 2px 4px 0 rgba(146,124,225,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-design,.custom-big-table .domPropsInnerHTML-span .icon-dot-develop{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop{background:#4eb0ef;box-shadow:0 2px 4px 0 rgba(78,176,239,.5)}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop-complete{background:#6381f9;-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;box-shadow:0 2px 4px 0 rgba(99,129,249,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle{box-shadow:4px 0 4px 0 rgba(0,0,0,.12)}.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle{box-shadow:-4px 0 4px 0 rgba(0,0,0,.12)}.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.no-data-tip{align-items:center;color:#333;display:flex;flex-direction:column;font-size:22px;height:100%;justify-content:center;width:100%}.no-data-tip>img{max-width:70%;width:260px}.no-data-tip>p{color:rgba(0,0,0,.8);font-size:16px;margin-bottom:0;margin-top:12px}.no-data-tip>span{color:rgba(0,0,0,.4);font-size:14px;margin-top:6px}.text-over-tooltip-components{display:inline-block;max-width:98%}.text-over-tooltip-components .ellipsis{color:#35393c;font-size:14px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-over-tooltip-components .ellipsis i{font-style:normal;white-space:nowrap;word-break:keep-all}.text-over-tooltip-components .fs20{color:green;font-size:20px;font-weight:600;line-height:22px}.text-over-tooltip-components .fs12{color:orange;font-size:12px;font-weight:400;line-height:14px}.svg-icon{fill:currentColor;height:1em;overflow:hidden;vertical-align:-.15em;width:1em}.vxe-header--column [annotation-hover-show=true]{visibility:hidden}.vxe-header--column:hover [annotation-hover-show=true]{visibility:visible}.big-table__annotationWrapper{align-items:center;display:inline-flex;width:20px}

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

@@ -60,7 +60,7 @@ var PopupMenu = defineComponent({
         "align": "center"
       }, {
         default: () => [createVNode("span", null, [item.label]), createVNode(NInputNumber, {
-          "style": "width: 120px",
+          "style": "width: 110px",
           "size": "small",
           "value": item.value,
           "onUpdate:value": ($event) => item.value = $event,
@@ -68,6 +68,7 @@ var PopupMenu = defineComponent({
           "placeholder": "\u8BF7\u8F93\u5165\u6570\u503C",
           "max": props.target.origin.data.value,
           "min": min,
+          "showButton": false,
           "onFocus": () => emit("update:show", true)
         }, null)]
       });

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

@@ -12,3 +12,43 @@ export declare const PAIN_MENU: {
     value: undefined;
     type: string;
 }[];
+export declare const OVERLAP: {
+    yemai: {
+        stroke: string;
+        strokeX: string;
+        strokeWidth: number;
+        strokeWidthX: number;
+        radius: number;
+        angle: number;
+    };
+    koumai: {
+        stroke: string;
+        strokeWidth: number;
+        radius: number;
+        radiusCircle: number;
+        fillCircle: string;
+    };
+    gangmai: {
+        radius: number;
+        radiusCircle: number;
+        stroke: string;
+        fillCircle: string;
+    };
+    xinmai: {
+        radius: number;
+        radiusCircle: number;
+        stroke: string;
+        fillCircle: string;
+    };
+    humai: {
+        radius: number;
+        fill: string;
+    };
+    ermai: {
+        stroke: string;
+        strokeWidth: number;
+        radius: number;
+        radiusCircle: number;
+        fillCircle: string;
+    };
+};

package/es/components/fabric-chart/src/hooks/constant.js

@@ -1 +1 @@
-export { PAIN_MENU, TEMPERATURE_MENU } from './constant2.js';
+export { OVERLAP, PAIN_MENU, TEMPERATURE_MENU } from './constant2.js';

package/es/components/fabric-chart/src/hooks/constant2.js

@@ -32,5 +32,47 @@ const PAIN_MENU = [
     type: "physicsReduce"
   }
 ];
+const BLUE = "#2563F4";
+const RED = "#FF1818";
+const OVERLAP = {
+  yemai: {
+    stroke: RED,
+    strokeX: BLUE,
+    strokeWidth: 1,
+    strokeWidthX: 1,
+    radius: 6,
+    angle: 45
+  },
+  koumai: {
+    stroke: RED,
+    strokeWidth: 1,
+    radius: 6,
+    radiusCircle: 3,
+    fillCircle: BLUE
+  },
+  gangmai: {
+    radius: 6,
+    radiusCircle: 3,
+    stroke: BLUE,
+    fillCircle: RED
+  },
+  xinmai: {
+    radius: 6,
+    radiusCircle: 3,
+    stroke: RED,
+    fillCircle: RED
+  },
+  humai: {
+    radius: 6,
+    fill: "green"
+  },
+  ermai: {
+    stroke: RED,
+    strokeWidth: 1,
+    radius: 6,
+    radiusCircle: 3,
+    fillCircle: BLUE
+  }
+};
 
-export { PAIN_MENU, TEMPERATURE_MENU };
+export { OVERLAP, PAIN_MENU, TEMPERATURE_MENU };

package/es/components/fabric-chart/src/hooks/useCenter2.js

@@ -3,7 +3,7 @@ import { fabric } from '../utils/index.js';
 import { drawLine, defaultStyle, drawPoint, drawText, drawArrow } from './useDraw2.js';
 import useGrid from './useGrid2.js';
 import { useShadow } from './useShadow2.js';
-import { TEMPERATURE_MENU, PAIN_MENU } from './constant2.js';
+import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from './constant2.js';
 
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
@@ -154,17 +154,20 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
             itemList.forEach((v) => {
               if (!getEqualXTypes(x).includes(v.bigType)) {
-                pointMenuProps.list.push({
-                  renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
-                  origin: {
-                    title: v.title,
-                    unit: v.unit,
-                    type: v.bigType,
-                    dataIndex: v.dataIndex,
-                    key: v.key
-                  },
-                  pointer: event2.pointer
-                });
+                const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
+                if (y >= newY.originY && y <= newY.endY) {
+                  pointMenuProps.list.push({
+                    renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
+                    origin: {
+                      title: v.title,
+                      unit: v.unit,
+                      type: v.bigType,
+                      dataIndex: v.dataIndex,
+                      key: v.key
+                    },
+                    pointer: event2.pointer
+                  });
+                }
               }
             });
             if (pointMenuProps.list.length === 1) {
@@ -193,7 +196,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       return;
     if (!pulseObj.dataList.some((item) => item.title.includes("\u8109\u640F")))
       return;
-    const overlap = left.overlap || {};
+    const overlap = Object.assign({}, OVERLAP, left.overlap || {});
     const points = [];
     maiboPoints.size && [...maiboPoints].forEach((item) => {
       [...otherPoints].forEach((obj) => {
@@ -232,6 +235,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   function drawPolyLine(item, dataIndex, scaleValue) {
     const {
       type,
+      riseStyle = {},
       noRiseStyle = {},
       verifiedStyle = {},
       reduceStyle = {},
@@ -256,9 +260,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
       const nextPoint = getPointer(nextV, scaleValue);
-      let reduceLine, reducePoint, noRiseText, arrowGroup, verifiedText;
+      let reduceLine, reducePoint, noRiseText, arrowGroup, riseText, verifiedText;
       if ((points == null ? void 0 : points.length) && (type === "temperature" || type === "pain")) {
-        if (v.noRise) {
+        if (v.noRise && noRiseStyle.show) {
           if (typeof v.noRise === "string") {
             noRiseText = drawText([points[0], points[1] + 5], {
               value: v.noRise.split("").join("\n"),
@@ -272,6 +276,14 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             otherList.push(arrowGroup);
           }
         }
+        if (v.rise && riseStyle.show) {
+          riseText = drawText([points[0], points[1] - 5], {
+            value: v.rise.split("").join("\n"),
+            originY: "bottom",
+            ...riseStyle
+          });
+          otherList.push(riseText);
+        }
         if (v.verified) {
           verifiedText = drawText([points[0], points[1] - 5], {
             value: "v",
@@ -348,8 +360,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const pointAttrNew = {
         origin: {
           data: v,
-          title: item.title,
-          key: item.key || "",
+          title: _item.title,
+          key: _item.key || "",
           unit: scaleValue.unit,
           type,
           dataIndex,
@@ -385,7 +397,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
-        if (item.title.includes("\u8109\u640F")) {
+        if (_item.title.includes("\u8109\u640F")) {
           maiboPoints.add(point);
         } else {
           otherPoints.add(point);

package/es/components/fabric-chart/src/hooks/useDraw2.js

@@ -129,13 +129,11 @@ function drawPoint(type = "circle", style) {
         ...newStyle
       });
     case "image":
-      if (style == null ? void 0 : style.url) ; else {
-        return new fabric.Image(style.element, {
-          ...newStyle,
-          scale: 1
-        });
-      }
-    case "yemai":
+      return new fabric.Image(style.element, {
+        ...newStyle,
+        scale: 1
+      });
+    case "yemai": {
       const createAdd = () => {
         const width = ((style.radius || 5) + (style.strokeWidth || 1)) * 2;
         const subLineStyle = {
@@ -152,7 +150,8 @@ function drawPoint(type = "circle", style) {
         scale: 1,
         ...newStyle
       });
-    case "koumai":
+    }
+    case "koumai": {
       const left = (style.radius || 5) + (style.strokeWidth || 1);
       const circle = new fabric.Circle({
         objectCaching: false,
@@ -167,6 +166,7 @@ function drawPoint(type = "circle", style) {
         scale: 1,
         ...newStyle
       });
+    }
     default:
       style && Reflect.deleteProperty(style, "stroke");
       return new fabric.Text(String(type), {

package/es/components/fabric-chart/src/hooks/useLeft2.js

@@ -235,8 +235,21 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   function isLimit(point) {
     return point.left >= originX && point.left <= endX && point.top >= originY && point.top <= endY;
   }
+  function moveLimit(point) {
+    if (point.left >= originX && point.left <= endX) {
+      point.setCoords();
+      const newY = point.origin.type === "pain" ? painOriginY : vitalSignsOriginY;
+      if (point.top < newY.originY) {
+        point.set("top", newY.originY);
+      }
+      if (point.top > newY.endY) {
+        point.set("top", newY.endY);
+      }
+    }
+  }
   function setPointEvent(point) {
     point.on("moving", () => {
+      moveLimit(point);
       if (isLimit(point)) {
         setPopup(point);
       } else {

package/es/components/field-set/index.d.ts

@@ -62,7 +62,10 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             fixedWay: "NONE" | "LEFT" | "RIGHT";
             columnWidth: number;
             editable: boolean;
+            editableDisable: boolean;
             required: boolean;
+            requiredDisable: boolean;
+            hide: boolean;
         }[];
         widthShow: string;
         widthLarge: string;
@@ -79,7 +82,10 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         fixedWay: "NONE" | "LEFT" | "RIGHT";
         columnWidth: number;
         editable: boolean;
+        editableDisable: boolean;
         required: boolean;
+        requiredDisable: boolean;
+        hide: boolean;
     }) => {
         background: string | undefined;
     };
@@ -103,8 +109,28 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         fixedWay: "NONE" | "LEFT" | "RIGHT";
         columnWidth: number;
         editable: boolean;
+        editableDisable: boolean;
         required: boolean;
+        requiredDisable: boolean;
+        hide: boolean;
     }) => void;
+    isDisable: (item: {
+        [key: string]: any;
+        id: string;
+        name: string;
+        show: boolean;
+        sort: boolean;
+        title: string;
+        alias: string;
+        fixedShow: boolean;
+        fixedWay: "NONE" | "LEFT" | "RIGHT";
+        columnWidth: number;
+        editable: boolean;
+        editableDisable: boolean;
+        required: boolean;
+        requiredDisable: boolean;
+        hide: boolean;
+    }, key: string) => any;
     setWidth: () => void;
     NButton: any;
     NCheckbox: any;