cnhis-design-vue 3.1.22-beta.1 → 3.1.22-beta.10

package/es/components/big-table/index2.js

@@ -1,6 +1,5 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable2.js';
 import { safeComponentRegister } from '../../shared/utils/index2.js';
-import { loadVxeTable } from '../../shared/utils/loadVxe2.js';
 import { expandXEUtils } from '../../shared/utils/utilExpand.js';
 import '../index2.js';
 import script from './src/BigTable.js';
@@ -12,7 +11,6 @@ const BigTable = script;
 BigTable.install = function(app) {
   safeComponentRegister(app, BigTable, COMPONENT_NAMESPACE + "BigTable");
   safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
-  loadVxeTable(app);
   return expandXEUtils();
 };
 

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

@@ -14,8 +14,7 @@ import { useAnnotation } from './hooks/useAnnotation.js';
 import { useSeparateRow, useSeparateMap } from './hooks/useSeparateRow2.js';
 import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline } from '@vicons/ionicons5';
 import NoData from './components/NoData.js';
-import script from '../../../shared/components/TextOverTooltip/TextOverTooltip.js';
-import script$1 from '../../../shared/components/SvgIcon/SvgIcon.js';
+import script from '../../../shared/components/SvgIcon/SvgIcon.js';
 import { useMessage, NIcon, NTooltip, NCheckbox, NCheckboxGroup, NGrid, NGi, NSpace, NButton, NPopconfirm, NProgress, NDropdown, NSwitch, NPopover, NTabs, NTabPane } from 'naive-ui';
 import Grid from '../../grid/index2.js';
 import XEUtils from 'xe-utils';
@@ -291,11 +290,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           selectTableDisable: false
         };
       });
-      await table.loadData(await separate(formatList, data));
+      if (props.columnConfig.isEdit) {
+        await table.loadData(data);
+      } else {
+        await table.loadData(await separate(formatList, data));
+      }
       table.setCurrentRow({});
       setCurrentPageRowChecked();
       setGroupTreeExpand();
-      resetTableInlineEditStatus();
     };
     separateHandle.clear();
     separateHandle.add(() => loadData(props.data));
@@ -545,7 +547,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         },
         editTrigger: state.editConfig.trigger
       };
-      if (formType === "date" || formType === "time") {
+      if (["date", "time"].includes(formType)) {
         propsData.formattedValue = row[col.columnName];
       } else if (formatMap) {
         propsData.value = row[formatMap.value];
@@ -968,33 +970,23 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const toolTipTitle = (item, type) => {
       var _a;
       let name = item.formTitle || item.alias || item.title;
-      let tooltipTitle = item.alias;
-      let isAlias = false;
+      item.alias;
       if (((_a = props.tableOptions) == null ? void 0 : _a.dataSourceType) == "guage") {
-        tooltipTitle = item.alias || item.title;
-      }
-      if (name && tooltipTitle && name !== tooltipTitle) {
-        isAlias = !!tooltipTitle;
+        item.alias || item.title;
       }
       if (isFunction(item.headerSlotFn))
         return () => item.headerSlotFn(item);
       if (type === "format")
-        return [createVNode(script, {
-          "tooltipTitle": tooltipTitle,
-          "content": name,
-          "isAlias": isAlias
-        }, null), renderAnnotation(item)];
+        return [createVNode("span", {
+          "class": "header-title-span"
+        }, [name]), renderAnnotation(item)];
       return () => {
-        return [createVNode(script, {
-          "tooltipTitle": tooltipTitle,
-          "content": name,
-          "isAlias": isAlias
-        }, {
-          default: () => [item.treeNode && state.isTree == 1 ? createVNode(NIcon, {
-            "component": state.isExpand && state.total < 1001 ? CaretDown : CaretForward,
-            "onClick": (e) => triggerExpand(e, state.isExpand)
-          }, null) : ""]
-        }), renderAnnotation(item)];
+        return [item.treeNode && state.isTree == 1 ? createVNode(NIcon, {
+          "component": state.isExpand && state.total < 1001 ? CaretDown : CaretForward,
+          "onClick": (e) => triggerExpand(e, state.isExpand)
+        }, null) : "", createVNode("span", {
+          "class": "header-title-span"
+        }, [name]), renderAnnotation(item)];
       };
     };
     const triggerExpand = (e, isExpand) => {
@@ -1631,7 +1623,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "onPositiveClick": () => confirmScanMulti(params)
       }, {
         trigger() {
-          return createVNode(script$1, {
+          return createVNode(script, {
             "class": "scan-multi-delete",
             "iconClass": "shanchu"
           }, null);
@@ -1848,7 +1840,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, [createVNode("img", {
         "class": "bigTable-qr-img",
         "src": src
-      }, null), createVNode("span", null, [createVNode(script$1, {
+      }, null), createVNode("span", null, [createVNode(script, {
         "iconClass": "fangda"
       }, null)])])];
     };
@@ -1932,7 +1924,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }, null);
         } else {
           icon = createVNode(NTooltip, null, {
-            trigger: () => createVNode(script$1, {
+            trigger: () => createVNode(script, {
               "iconClass": btn.icon,
               "style": {
                 marginRight: mr
@@ -1942,7 +1934,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           });
         }
       } else if (btn.iconSetting) {
-        icon = createVNode(script$1, {
+        icon = createVNode(script, {
           "iconClass": JSON.parse(btn.iconSetting).icon,
           "style": {
             marginRight: mr

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

@@ -1,7 +1,7 @@
-import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, computed, watch, createVNode, mergeProps } from 'vue';
 import { generateTimeFormat } from '../../../../../shared/utils/index2.js';
-import { isFunction } from 'lodash-es';
-import { NDatePicker } from 'naive-ui';
+import { isFunction, isNaN } from 'lodash-es';
+import { NDatePicker, NPopover, NInput } from 'naive-ui';
 import { useCommon } from './useCommon2.js';
 
 var EditDate = defineComponent({
@@ -33,7 +33,9 @@ var EditDate = defineComponent({
       formRef,
       isShow
     } = useCommon(props, attrs);
+    const __value = ref(attrs.formattedValue);
     const onConfirm = (value) => {
+      __value.value = value;
       emit("formChange", {
         value,
         row: props.row,
@@ -107,6 +109,45 @@ var EditDate = defineComponent({
         return customDateDisabled(ts, props.row);
       };
     }
+    function getFormatDate(str) {
+      if (!str)
+        return "";
+      const d = new Date(str);
+      const month = `00${d.getMonth() + 1}`.slice(-2);
+      const day = `00${d.getDate()}`.slice(-2);
+      const valueFormat = formatConfig.value.valueFormat;
+      const format = valueFormat.includes("/") ? "/" : valueFormat.includes(".") ? "." : "-";
+      let date = `${d.getFullYear()}${format}${month}${format}${day}`;
+      const dTime = d.getTime();
+      const connectFieldTime = new Date(props.row[connectField]).getTime();
+      if (props.row[connectField] && (isStartDate && dTime > connectFieldTime || isEndDate && dTime < connectFieldTime)) {
+        date = "";
+      }
+      return date;
+    }
+    function onBlur() {
+      let date = __value.value;
+      if (isNaN(new Date(date).getTime())) {
+        if (/^\d{8}$/.test(date)) {
+          const dateNew = `${date.slice(0, 4)} ${date.slice(4, 6)} ${date.slice(6)}`;
+          date = "";
+          if (!isNaN(new Date(dateNew).getTime())) {
+            date = getFormatDate(dateNew);
+          }
+        } else {
+          date = "";
+        }
+      } else {
+        date = getFormatDate(date);
+      }
+      __value.value = date || void 0;
+      emit("formChange", {
+        value: __value.value,
+        row: props.row,
+        column: props.col,
+        index: props.index
+      });
+    }
     const formatConfig = computed(() => {
       var _a;
       const valueFormat = ((_a = props.col.componentProps) == null ? void 0 : _a.valueFormat) || props.col.valueFormat || "yyyy-MM-dd HH:mm:ss";
@@ -130,13 +171,43 @@ var EditDate = defineComponent({
     if (config.type.includes("time")) {
       config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
-    return () => createVNode(NDatePicker, mergeProps({
-      "ref": formRef,
-      "show": isShow.value,
-      "onUpdate:show": ($event) => isShow.value = $event
-    }, attrs, config, {
-      "onUpdateFormattedValue": onConfirm
-    }), null);
+    watch(() => attrs.formattedValue, (value) => {
+      __value.value = value;
+    });
+    return () => {
+      var _a;
+      return ((_a = props.col.componentProps) == null ? void 0 : _a.isPopover) ? createVNode(NPopover, mergeProps({
+        "show": isShow.value,
+        "trigger": "click",
+        "showArrow": false,
+        "placement": "bottom-start",
+        "style": "padding: 0"
+      }, props.col.componentProps || {}, {
+        "onClickoutside": () => isShow.value = false
+      }), {
+        trigger: () => createVNode(NInput, {
+          "ref": formRef,
+          "clearable": true,
+          "value": __value.value,
+          "onUpdate:value": ($event) => __value.value = $event,
+          "onBlur": onBlur,
+          "onClick": () => isShow.value = true
+        }, null),
+        default: () => createVNode(NDatePicker, mergeProps({
+          "panel": true,
+          "show": isShow.value,
+          "onUpdate:show": ($event) => isShow.value = $event
+        }, attrs, config, {
+          "onUpdateFormattedValue": onConfirm
+        }), null)
+      }) : createVNode(NDatePicker, mergeProps({
+        "ref": formRef,
+        "show": isShow.value,
+        "onUpdate:show": ($event) => isShow.value = $event
+      }, attrs, config, {
+        "onUpdateFormattedValue": onConfirm
+      }), null);
+    };
   }
 });
 

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

@@ -54,6 +54,7 @@ var EditInput = defineComponent({
       });
     }
     const config = {
+      clearable: true,
       placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
       ...props.col.componentProps || {}
     };

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

@@ -65,7 +65,7 @@ const useEdit = (props, state, emit, xGrid) => {
   }) => {
     var _a, _b;
     let oldValue = row[column.columnName];
-    if (((column == null ? void 0 : column.formType) === "input" || (column == null ? void 0 : column.formType) === "number") && ((_a = props.columnConfig) == null ? void 0 : _a.formValidate)) {
+    if (["input", "number"].includes(column == null ? void 0 : column.formType) && ((_a = props.columnConfig) == null ? void 0 : _a.formValidate)) {
       row[column.columnName] = (_b = props.columnConfig) == null ? void 0 : _b.formValidate({
         row,
         column,
@@ -82,7 +82,7 @@ const useEdit = (props, state, emit, xGrid) => {
     } else {
       row[column.columnName] = value;
     }
-    if (((column == null ? void 0 : column.formType) === "date" || (column == null ? void 0 : column.formType) === "time") && !value) {
+    if (["date", "time"].includes(column == null ? void 0 : column.formType) && !value) {
       row[column.columnName] = void 0;
     }
     emit("formChange", { value, row, column, index, oldValue, ...type ? { type } : {} });

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: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}
+.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{color:#35393c;height:100%;line-height:unset}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title .header-title-span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.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)}.custom-big-table .v-binder-follower-container{z-index:4!important}.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__annotationWrapper .is-active{position:relative;top:3px}

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

@@ -82,6 +82,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => import("./src/interface").IPointType[];
+    isAddPoint: (x: number) => boolean;
     drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {

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

@@ -240,6 +240,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       xScalevalueHeight: xScalevalueHeight.value,
       topList: topList.value,
       breathingHeight: breathingHeight.value,
+      hospitalizationDate: props.data.hospitalizationDate,
       grid: props.data.grid,
       top: props.data.top,
       left: props.data.left,
@@ -280,8 +281,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);
-    const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);
-    const { drawScaleValue } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes);
+    const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes, isAddPoint } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);
+    const { drawScaleValue } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes, isAddPoint);
     useRight(canvas, propItems, drawScaleValue);
     useBottom(canvas, propItems);
     useOther(canvas, propItems, cumputedX);

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

@@ -83,6 +83,7 @@ declare const _default: import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => IPointType[];
+    isAddPoint: (x: number) => boolean;
     drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {

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

@@ -26,4 +26,5 @@ export declare function useCenter(canvas: Ref<fabric.Canvas>, propItems: IPropIt
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => IPointType[];
+    isAddPoint: (x: number) => boolean;
 };

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

@@ -33,7 +33,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     itemList,
     event,
     vitalSignsOriginY,
-    painOriginY
+    painOriginY,
+    hospitalizationDate
   } = propItems;
   const pointTipProps = reactive({
     show: false,
@@ -170,7 +171,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                 }
               }
             });
-            if (pointMenuProps.list.length === 1) {
+            if (!isAddPoint(x) || pointMenuProps.list.length === 1) {
               pointMenuProps.show = false;
               console.log("\u5F53\u524D\u65F6\u95F4\u6BB5\u5185\u65E0\u53EF\u65B0\u589E\u8282\u70B9");
             }
@@ -530,6 +531,16 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       return [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
     }
   }
+  function isAddPoint(x) {
+    const d = new Date();
+    const month = `00${d.getMonth() + 1}`.slice(-2);
+    const day = `00${d.getDate()}`.slice(-2);
+    const todayTime = new Date(`${d.getFullYear()}-${month}-${day} 23:59:59`).getTime();
+    const pointTime = new Date(`${getXValue(x)}:00`).getTime();
+    if (hospitalizationDate && pointTime < new Date(hospitalizationDate).getTime() || pointTime > todayTime)
+      return false;
+    return true;
+  }
   function clickMenu({ item, target }) {
     if (!target) {
       emits("add", {
@@ -560,7 +571,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     pointMenuProps,
     clickMenu,
     setPopup,
-    getEqualXTypes
+    getEqualXTypes,
+    isAddPoint
   };
 }
 

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

@@ -1,6 +1,6 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
 import { IPropItems } from '../interface';
-export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function): {
+export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function, isAddPoint: Function): {
     drawScaleValue: (yScaleValueList: any[]) => void;
 };

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

@@ -2,7 +2,7 @@ import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultTextStyle, defaultStyle, defaultRectStyle, drawPoint, drawTextGroup } from './useDraw2.js';
 
-function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes) {
+function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes, isAddPoint) {
   const {
     originY,
     endY,
@@ -19,7 +19,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     right,
     canvasWidth,
     canvasHeight,
-    getRightInfo
+    getRightInfo,
+    hospitalizationDate
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -233,7 +234,7 @@ 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;
+    return point.left >= originX && point.left < endX && point.top >= originY && point.top <= endY;
   }
   function moveLimit(point) {
     if (point.left >= originX && point.left <= endX) {
@@ -249,6 +250,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   }
   function setPointEvent(point) {
     point.on("moving", () => {
+      point.set("originX", "center");
       moveLimit(point);
       if (isLimit(point)) {
         setPopup(point);
@@ -260,7 +262,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       pointTipProps.show = false;
       if (event.e.button === 0) {
         if (isLimit(point)) {
-          if (!getEqualXTypes(point.left).includes(point.origin.type)) {
+          if (!getEqualXTypes(point.left).includes(point.origin.type) && isAddPoint(point.left)) {
             emits("add", {
               data: {
                 time: getXValue(point.left),
@@ -279,7 +281,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       }
       function setRestore() {
         point.setCoords();
-        point.set({ left: point.originLeft, top: point.originTop });
+        point.set({ originX: "right", left: point.originLeft, top: point.originTop });
       }
     });
   }

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

@@ -34,6 +34,7 @@ export interface IPropItems {
     xScalevalueHeight: number;
     topList: IDate[];
     breathingHeight: number;
+    hospitalizationDate?: string;
     grid: IGrid;
     top: ITop;
     left: ILeft;
@@ -106,6 +107,7 @@ export interface IData {
     height: number;
     borderStyle?: fabric.ILineOptions;
     selectionStyle?: any;
+    hospitalizationDate: string;
     grid: IGrid;
     other?: IOther;
     top: ITop;

package/es/components/form-render/src/components/renderer/cascader.js

@@ -38,7 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NCascader } from 'naive-ui';
-import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCascader",
@@ -146,7 +146,7 @@ const script = defineComponent({
       function notNeedToFetchData(props2, option2) {
         return !configFor(props2) || !option2 && remoteOptions.value || deepFor(option2) >= deepFor(props2) - 1;
       }
-      function createRequestParams(deep, config, key, option2) {
+      function createRequestParams(deep, config, key2, option2) {
         const params = {
           lvlnr: deep + 1 + ""
         };
@@ -158,7 +158,7 @@ const script = defineComponent({
         return {
           params,
           ...config,
-          key
+          key: key2
         };
       }
       function getOptionChain(option2) {
@@ -189,7 +189,8 @@ const script = defineComponent({
     }
     const {
       injectValueValidate,
-      injectValueWatchFromEmpty
+      injectValueWatchFromEmpty,
+      injectValueBindKey
     } = useCommonInjection();
     injectValueWatchFromEmpty(() => props.value, fetchData);
     injectValueValidate(() => props.value);
@@ -207,7 +208,7 @@ const script = defineComponent({
     const parsedOptions = computed(() => {
       return remoteOptions.value || props.options || [];
     });
-    function focusDecorator(onFocus) {
+    function visitedDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
           field.value.visited = true;
@@ -216,8 +217,10 @@ const script = defineComponent({
       };
     }
     const remote = computed(() => !props.filterable);
+    const key = injectValueBindKey(valueRef);
     return () => {
       return createVNode(NCascader, {
+        "key": key.value,
         "remote": remote.value,
         "filterable": props.filterable,
         "checkStrategy": "child",
@@ -229,13 +232,13 @@ const script = defineComponent({
         "valueField": valueKey.value,
         "options": parsedOptions.value,
         "onLoad": fetchData,
-        "onFocus": focusDecorator(props.onFocus)
+        "onFocus": visitedDecorator(props.onFocus)
       }, slots);
     };
   }
 });
 const SEARCH_CASCADE = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue, assignValueBindKey));
+}, assignUpdateValue));
 
 export { SEARCH_CASCADE };

package/es/components/form-render/src/components/renderer/combination.d.ts

@@ -11,6 +11,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     maxGroupNum: {
         type: NumberConstructor;
     };
+    disabled: {
+        type: BooleanConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -29,6 +32,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     maxGroupNum: {
         type: NumberConstructor;
     };
+    disabled: {
+        type: BooleanConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -39,6 +45,7 @@ export declare const COMBINATION: import("vue").DefineComponent<{
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
+    disabled: boolean;
     title: string;
     getProperties: () => FieldItem[];
 }>;

package/es/components/form-render/src/components/renderer/combination.js

@@ -22,6 +22,9 @@ const script = defineComponent({
     maxGroupNum: {
       type: Number
     },
+    disabled: {
+      type: Boolean
+    },
     getProperties: {
       type: Function,
       default: () => []
@@ -70,7 +73,7 @@ const script = defineComponent({
         "onClick": addGroup,
         "type": "info",
         "text": true,
-        "disabled": currentGroupNum.value >= maxGroupNum.value
+        "disabled": currentGroupNum.value >= maxGroupNum.value || props.disabled
       }, {
         icon: () => createVNode(NIcon, {
           "component": AddCircleOutline