cnhis-design-vue 3.1.14 → 3.1.15-beta.2

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

@@ -2314,7 +2314,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "span-method": colspanMethod,
         "footer-span-method": footerRowspanMethod,
         "tooltip-config": {
-          enterable: false
+          enterable: false,
+          ..._ctx.$attrs.tooltipConfig || {}
         },
         "checkbox-config": {
           checkField: "checked",
@@ -2330,10 +2331,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           checkField: "checked",
           trigger: "cell",
           reserve: true,
-          highlight: true
+          highlight: true,
+          ..._ctx.$attrs.radioConfig || {}
         },
         "scroll-y": {
-          gt: 50
+          gt: 50,
+          ..._ctx.$attrs.scrollY || {}
         },
         "row-style": unref(getRowStyle),
         "edit-config": state.editConfig,
@@ -2343,7 +2346,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           loadMethod: unref(loadExpandMethod),
           toggleMethod: unref(toggleExpandMethod),
           iconOpen: "iconfont icon-a-xitongtubiaozhediejian",
-          iconClose: "iconfont icon-a-xitongtubiaotianjia"
+          iconClose: "iconfont icon-a-xitongtubiaotianjia",
+          ..._ctx.$attrs.expandConfig || {}
         },
         "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
         "edit-rules": _ctx.columnConfig.editRules || {},
@@ -2413,7 +2417,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["height", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

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

@@ -1,4 +1,5 @@
 import { defineComponent, createVNode, mergeProps } from 'vue';
+import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
 
 var EditDate = defineComponent({
@@ -94,16 +95,23 @@ var EditDate = defineComponent({
         }
       };
     };
+    function customDateDisabledDecorator(customDateDisabled) {
+      if (!isFunction(customDateDisabled))
+        return null;
+      return (ts) => {
+        return customDateDisabled(ts, props.row);
+      };
+    }
     const config = {
-      type: props.col.type || "datetime",
+      type: props.col.type || props.col.dateType || "datetime",
       clearable: props.col.clearable || true,
       disabled: props.col.disabled || false,
       valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-      isDateDisabled: props.col.isDateDisabled || isDateDisabled,
+      isDateDisabled: customDateDisabledDecorator(props.col.isDateDisabled) || isDateDisabled,
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9"
     };
     if (config.type.includes("time")) {
-      config.isTimeDisabled = props.col.isTimeDisabled || isTimeDisabled;
+      config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
     return () => createVNode(NDatePicker, mergeProps(attrs, config, {
       "onUpdateFormattedValue": onConfirm

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
+import { defineComponent, ref, watch, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
 import SlotRender from '../../../../../src/components/SlotRender';
 import { cloneDeep, isObject, isArray } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
@@ -17,13 +17,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit }) {
     const props = __props;
     const popoverRef = ref();
+    const show = ref(false);
+    watch(show, updateShow);
     const editContent = ref();
     const { getRowData } = useSeparateMap();
-    function updateShow(show) {
+    function updateShow(show2) {
       const target = getRowData(props.row);
       if (!target)
         return;
-      if (show) {
+      if (show2) {
         editContent.value = cloneDeep(target.row[props.col.field]);
         return;
       }
@@ -52,14 +54,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createBlock(unref(NPopover), {
         ref_key: "popoverRef",
         ref: popoverRef,
-        trigger: "click",
-        "show-arrow": false,
-        "onUpdate:show": updateShow
+        trigger: "manual",
+        show: show.value,
+        "onUpdate:show": _cache[3] || (_cache[3] = ($event) => show.value = $event),
+        "show-arrow": false
       }, {
         trigger: withCtx(() => [
           createVNode(Separate, {
-            onClick: _cache[0] || (_cache[0] = withModifiers(() => {
-            }, ["stop"])),
+            onClick: _cache[0] || (_cache[0] = withModifiers(($event) => show.value = !show.value, ["stop"])),
             style,
             col: __props.col,
             row: __props.row
@@ -81,7 +83,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["value"]))
         ]),
         _: 1
-      }, 512);
+      }, 8, ["show"]);
     };
   }
 });

package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -31,6 +31,7 @@ declare const _default: import("vue").DefineComponent<{
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
     popoverRef: import("vue").Ref<any>;
+    show: import("vue").Ref<boolean>;
     emit: (event: "formChange", ...args: any[]) => void;
     editContent: import("vue").Ref<any>;
     getRowData: (row: AnyObject) => {

package/es/packages/big-table/src/hooks/useColumnConfigAdaptor.js

@@ -31,42 +31,52 @@ function useColumnConfigAdaptor() {
         ...["INPUT"].map((type) => [type, "input"]),
         ...["DIGITAL"].map((type) => [type, "number"])
       ]);
-      const settingMap = new Map([
-        ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
-        [
-          "is_null",
-          (value, result, _fieldItem, _editRules) => {
-            if (value === "1")
-              return;
-            if (value === "0")
-              _editRules[_fieldItem.val_key] = [{ required: true, message: "\u5FC5\u586B" }];
+      const isNullHandler = (value, result, _fieldItem, _editRules) => {
+        if (value === "1")
+          return;
+        if (value === "0")
+          _editRules[_fieldItem.val_key] = [{ required: true, message: "\u5FC5\u586B" }];
+      };
+      const validateHandler = (value, result) => {
+        if (!isObject(value))
+          return;
+        result.componentProps = Object.assign({}, result.comonentProps, {
+          maxlength: value.max_length,
+          minlength: value.min_length,
+          max: value.max_value,
+          min: value.min_value,
+          precision: value.decimal_length
+        });
+      };
+      const dateRangeValidate = (value, result) => {
+        if (!isObject(value))
+          return;
+        result.isDateDisabled = (ts, row) => {
+          if (!isObject(row))
+            return;
+          const { startDate, endDate } = value;
+          let invalid = false;
+          if (startDate) {
+            invalid = new Date(row[startDate]).getTime() > ts;
           }
-        ],
-        [
-          "validate",
-          (value, result) => {
-            if (!isObject(value))
-              return;
-            result.componentProps = Object.assign({}, result.comonentProps, {
-              maxlength: value.max_length,
-              minlength: value.min_length,
-              max: value.max_value,
-              min: value.min_value,
-              precision: value.decimal_length
-            });
+          if (endDate) {
+            invalid = invalid || new Date(row[endDate]).getTime() < ts;
           }
-        ],
-        ...["open", "close"].map((key) => {
-          return [
-            key,
-            (value, result) => {
-              if (!isObject(value))
-                return;
-              const option = { label: value.describe, ...value };
-              result.options = isArray(result.options) ? [...result.options, option] : [option];
-            }
-          ];
-        }),
+          return invalid;
+        };
+      };
+      const switchOptionHandler = (value, result) => {
+        if (!isObject(value))
+          return;
+        const option = { label: value.describe, ...value };
+        result.options = isArray(result.options) ? [...result.options, option] : [option];
+      };
+      const settingMap = new Map([
+        ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
+        ["is_null", isNullHandler],
+        ["validate", validateHandler],
+        ["dateValidate", dateRangeValidate],
+        ...["open", "close"].map((key) => [key, switchOptionHandler]),
         ["is_edit", { property: "isEdit", valueMap: isEditValueMap }],
         ["html_type", { property: "formType", valueMap: htmlTypeValueMap }],
         ["option", { property: "options", fieldMap: /* @__PURE__ */ new Map([["text", "label"]]) }]

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

@@ -223,6 +223,7 @@ export declare const comps: {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }>>;
         popoverRef: import("vue").Ref<any>;
+        show: import("vue").Ref<boolean>;
         emit: (event: "formChange", ...args: any[]) => void;
         editContent: import("vue").Ref<any>;
         getRowData: (row: import("../../../../src/types").AnyObject) => {

package/es/packages/big-table/src/hooks/useFormat.js

@@ -133,7 +133,14 @@ const useFormat = (state) => {
                 item[key] = temp.change_text;
               } else {
                 if (temp.background != "#ffffff") {
-                  item[key] = `<span class="field-span" style="color:${temp.background}"><span class="${temp.icon}"></span>${temp.change_text || ""}</span>`;
+                  const reg = /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/;
+                  let color = temp.background;
+                  let iconHtml = `<span class="${temp.icon}"></span>`;
+                  if (reg.test(temp.icon)) {
+                    color = temp.icon;
+                    iconHtml = `<span class="icon-dot-custom" style="--table-icon-color:${temp.icon};--table-icon-shadow:${temp.icon}80"></span>`;
+                  }
+                  item[key] = `<span class="field-span" style="color:${color}">${iconHtml}${temp.change_text || ""}</span>`;
                 } else {
                   item[key] = temp.change_text;
                 }

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

@@ -396,6 +396,17 @@ body > .vxe-table--tooltip-wrapper {
   height: var(--tableImageHeight);
   width: var(--tableImageWidth);
 }
+.custom-big-table .domPropsInnerHTML-span .icon-dot-custom {
+  width: 8px;
+  height: 8px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  background: var(--table-icon-color);
+  display: inline-block;
+  margin-right: 6px;
+  box-shadow: 0px 2px 4px 0px var(--table-icon-shadow);
+}
 .custom-big-table .domPropsInnerHTML-span .icon-dot-red {
   width: 8px;
   height: 8px;

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

@@ -8,6 +8,18 @@ import { TEMPERATURE_MENU, PAIN_MENU } from './constant.js';
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
+function getPointArr(arr) {
+  let _arr = [];
+  return arr.reduce((pre, cur, index) => {
+    var _a, _b;
+    _arr.push([cur.left, cur.top]);
+    if (((_b = (_a = cur.origin) == null ? void 0 : _a.data) == null ? void 0 : _b.breakpoint) || arr.length - 1 === index) {
+      pre.push(_arr);
+      _arr = [];
+    }
+    return pre;
+  }, []);
+}
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem) {
   useGrid(canvas, propItems);
   const {
@@ -36,6 +48,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     target: null
   });
   const shadowLinesCache = /* @__PURE__ */ new Set();
+  let shadowPointCache = [];
   const maiboPoints = /* @__PURE__ */ new Set();
   const otherPoints = /* @__PURE__ */ new Set();
   const prevLines = /* @__PURE__ */ new Set();
@@ -45,7 +58,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   });
   function init() {
-    drawShaDow();
+    shadowPointCache = [];
     maiboPoints.clear();
     otherPoints.clear();
     prevLines.clear();
@@ -55,6 +68,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         drawPolyLine(item, dataIndex, scaleValue);
       });
     });
+    drawShaDow();
     drawOverlapPoint();
     setCanvasEvent();
   }
@@ -67,89 +81,34 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     canvas.value.renderAll();
   }
   function drawShaDow(target) {
-    var _a, _b;
+    var _a;
     const pulseObj = left.yScaleValue.find((item) => item.type === "pulse");
     if (!pulseObj || !((_a = pulseObj.dataList) == null ? void 0 : _a.length))
       return;
     if (shadowLinesCache.size)
       canvas.value.remove(...shadowLinesCache);
     shadowLinesCache.clear();
-    const data = [];
-    if (((_b = pulseObj.dataList) == null ? void 0 : _b.length) > 1) {
-      let points1 = [];
-      let points2 = [];
-      const copyDataList = JSON.parse(JSON.stringify(pulseObj.dataList));
+    if (shadowPointCache.length > 1) {
       if (target) {
         const { type, dataIndex, index } = target.origin || {};
         if (type === "pulse") {
-          Object.assign(copyDataList[dataIndex].list[index], {
-            x: target.left,
-            y: target.top
-          });
+          shadowPointCache[dataIndex].splice(index, 1, target);
         }
       }
-      const [data1, data2] = copyDataList;
-      const getPoint = (item) => {
-        if (item.x && item.y) {
-          return {
-            x: item.x,
-            y: item.y
-          };
-        }
-        const point = getPointer(item, pulseObj);
-        if (point == null ? void 0 : point.length) {
-          return {
-            x: point[0],
-            y: point[1]
-          };
-        }
-      };
-      data1.list.forEach((item, index) => {
-        const point1 = getPoint(item);
-        const item2 = data2.list[index];
-        const point2 = item2 ? getPoint(item2) : null;
-        if (point1 && point2 && point1.x === point2.x && point1.y !== point2.y) {
-          points1.push(point1);
-          points2.push(point2);
-          const itemPrev = data1.list[index - 1];
-          const itemNext = data1.list[index + 1];
-          const itemNext2 = data2.list[index + 1];
-          if (itemPrev && points1.length === 1) {
-            const point = getPoint(itemPrev);
-            point && points1.unshift(point);
-          }
-          if (itemNext && itemNext2) {
-            const pointNext = getPoint(itemNext);
-            const pointNext2 = getPoint(itemNext2);
-            if (pointNext && pointNext2 && pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
-              points1.push(pointNext);
-            }
-          } else {
-            data.push({ points1, points2 });
-          }
-        } else {
-          if (points1.length && points2.length) {
-            data.push({ points1, points2 });
-            points1 = [];
-            points2 = [];
-          }
-        }
-      });
-    }
-    if (data.length) {
-      const newData = data.reduce((pre, cur) => {
-        const arr1 = cur.points1.map((v) => [v.x, v.y]);
-        const arr2 = cur.points2.map((v) => [v.x, v.y]);
-        return pre.concat([[...arr1, ...arr2.reverse()]]);
-      }, []);
+      const [data1, data2] = shadowPointCache;
+      if (!data1.length || !data2.length)
+        return;
+      const points1 = getPointArr(data1);
+      const points2 = getPointArr(data2);
+      const data = points1.reduce((pre, cur, index) => pre.concat([[...cur, ...points2[index].reverse()]]), []);
       const { createShadowLines } = useShadow();
-      newData.forEach((item) => {
-        var _a2, _b2, _c, _d;
+      data.forEach((item) => {
+        var _a2, _b, _c, _d;
         if (((_a2 = pulseObj.shadow) == null ? void 0 : _a2.mode) == "color") {
           const points = item.map((v) => ({ x: v[0], y: v[1] }));
           const polygon = new fabric.Polygon(points, {
             ...defaultStyle,
-            ...((_b2 = pulseObj.shadow) == null ? void 0 : _b2.style) || {}
+            ...((_b = pulseObj.shadow) == null ? void 0 : _b.style) || {}
           });
           shadowLinesCache.add(polygon);
           canvas.value.add(polygon);
@@ -414,6 +373,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         pointList.push(point);
       }
     });
+    scaleValue.type === "pulse" && shadowPointCache.push(pointList);
     Promise.all(pointList).then((res) => {
       const lineListFilter = lineList.filter((v) => v);
       let prevPoint = null;

package/es/packages/form-render/src/FormRender.js

@@ -1,10 +1,10 @@
 import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, isArray, isObject } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
-import { queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
+import { arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
 import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 import { useFormContext } from './hooks/useFormContext.js';
@@ -95,9 +95,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     expose({
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
-          return Promise.reject(Array.isArray(err) ? err.map(bindInfo) : err);
+          return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);
         });
+        function errInfoNormalize(result, error) {
+          let childMessageNum = 0;
+          if (isArray(error.messages)) {
+            error.messages.forEach((message) => {
+              if (!isObject(message))
+                return;
+              result.push(...arrayed(message).map(bindInfo));
+              childMessageNum++;
+            });
+          }
+          !childMessageNum && result.push(bindInfo(error));
+          return result;
+        }
         function bindInfo(info) {
+          if (info.decoratorElement)
+            return info;
           info.title = formModel.query(info.path).get("title");
           info.decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
           Object.assign(info, queryInput(info.decoratorElement));

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

@@ -1,8 +1,9 @@
-import { defineComponent, ref, computed, watch, onMounted, createVNode, createTextVNode } from 'vue';
+import { defineComponent, onMounted, ref, computed, watch, createVNode, createTextVNode } from 'vue';
 import { isField } from '@formily/core';
 import { Path } from '../../../../../node_modules/@formily/path/esm/index.js';
-import { isNumber } from 'lodash-es';
-import { assignUpdateValue, formRenderLog } from '../../utils/index.js';
+import { flatten, isNumber } from 'lodash-es';
+import { useFormField } from '../../../../../packages/form-render';
+import { arrayed, assignUpdateValue, mergeDeepProperties, formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton } from 'naive-ui';
@@ -32,7 +33,26 @@ const script = defineComponent({
   }) {
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(_values.value));
+      formRenderRefs.value.splice(groupNum.value);
     }, 300);
+    const {
+      field
+    } = useFormField();
+    onMounted(() => {
+      if (!isField(field.value))
+        return;
+      const tempValidator = field.value.validator;
+      field.value.validator = [{
+        async validator() {
+          return Promise.allSettled(formRenderRefs.value.map((formRenderRef) => formRenderRef.validate())).then((resultList) => {
+            const rejected = resultList.filter((res) => res.status === "rejected");
+            if (!rejected.length)
+              return "";
+            return flatten(rejected.map((res) => res.reason));
+          });
+        }
+      }, ...tempValidator ? arrayed(tempValidator) : []];
+    });
     const formRenderRefs = ref([]);
     const groupNum = ref(1);
     const maxGroupNum = computed(() => {
@@ -44,7 +64,7 @@ const script = defineComponent({
     });
     function add() {
       groupNum.value++;
-      _values.value.push({});
+      _values.value.push(mergeDeepProperties({}, props.getProperties()));
       emitChange();
     }
     function remove(idx) {
@@ -56,13 +76,13 @@ const script = defineComponent({
       if (groupNum.value <= value)
         return;
       groupNum.value = value;
-      _values.value.splice(groupNum.value);
+      _values.value.splice(value);
       emitChange();
     }, {
       immediate: true
     });
     const _values = ref([{}]);
-    function initValues(data) {
+    function initValues(data, withInitialData = false) {
       if (!data)
         return;
       try {
@@ -72,10 +92,10 @@ const script = defineComponent({
         parsed.forEach((v, idx) => {
           if (idx > maxGroupNum.value - 1)
             return;
-          if (isObject(v))
-            return _values.value[idx] = v;
-          _values.value[idx] = {};
-          formRenderLog(`invalid Object value ${v} in COMBINATION => ${props.title}[${idx}]`, "warn");
+          if (isObject(v)) {
+            _values.value[idx] = v;
+            withInitialData && mergeDeepProperties(v, props.getProperties());
+          }
         });
         groupNum.value = Math.min(_values.value.length, maxGroupNum.value);
       } catch (e) {
@@ -95,7 +115,10 @@ const script = defineComponent({
       }
     }
     watch(() => props.value, (value) => initValues(value));
-    onMounted(() => initValues(props.value));
+    onMounted(() => {
+      initValues(props.value || "[{}]", true);
+      emitChange();
+    });
     function stop(event) {
       event.stopPropagation();
     }

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

@@ -1,7 +1,7 @@
 import { isObject } from '@vueuse/core';
 import { pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { fieldKeyEscape, arrayed, createLinebarId, transformDateFormat } from '../utils/index.js';
+import { fieldKeyEscape, arrayed, createLinebarId, elementIdEscape, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -31,7 +31,7 @@ function useFieldListAdaptor(collector, uuid) {
           showLabel: item.hide_title !== "1",
           propertyKey: item.val_key,
           annotation: item.annotation,
-          id: `${uuid}-${item.val_key}`,
+          id: elementIdEscape(`${uuid}-${item.val_key}`),
           ...item.decoratorProps || {}
         }
       });
@@ -96,7 +96,10 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCombinationSchema = (item) => {
     const schema = createStandardSchema(item);
-    schema["x-decorator-props"].showLabel = false;
+    Object.assign(schema["x-decorator-props"], {
+      showLabel: false,
+      showFeedback: false
+    });
     Object.assign(schema["x-component-props"], {
       title: item.alias || item.name,
       maxGroupNum: item.maxGroupNum,

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

@@ -1,14 +1,13 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
-import { SchemaReaction } from '@formily/json-schema/esm/types';
 import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
 import { DependKeyType, FormCommonState } from '../../../../../es/packages/form-render';
-import { FIELD_BUSINESS_TYPE } from '../../../../../es/packages/form-render/src/constants';
+declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 export declare type ValidateItem = Partial<{
     /**
      * 业务类型
      */
-    obj_type: FIELD_BUSINESS_TYPE;
+    obj_type: FieldBusinessType;
     /**
      * 校验类型
      */
@@ -41,6 +40,20 @@ interface SwitchProperty {
     value?: any;
     describe?: string;
 }
+interface ReactionType {
+    dependencies?: string[];
+    target?: string;
+    when?: string | boolean;
+    fulfill?: {
+        state?: AnyObject;
+        run?: string;
+    };
+    otherwise?: {
+        state?: AnyObject;
+        run?: string;
+    };
+    [key: string]: any;
+}
 export declare type FieldItem = {
     /**
      * 字段的key
@@ -181,7 +194,7 @@ export declare type FieldItem = {
     /**
      * 表单联动配置
      */
-    reactions: ArrayAble<SchemaReaction>;
+    reactions: ArrayAble<ReactionType>;
     [key: string]: any;
 }>;
 export {};

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

@@ -12,6 +12,7 @@ export declare function transformDateFormat(format?: string): "date" | "datetime
 export declare function isIdCard(idCardNo: string): boolean;
 export declare function isMobile(mobile: string): boolean;
 export declare function parseBirthday(birthday: string): AgeContext;
+export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
@@ -28,6 +29,7 @@ export declare function queryInput(decoratorElement?: HTMLElement | null): {
     widgetElementList: HTMLInputElement[];
 };
 export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
+export declare function elementIdEscape(id: string): string;
 export declare function createLinebarId(id: string): string;
 export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
 export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;

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

@@ -1,5 +1,6 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
-import { isArray, isObject, isString, isFunction } from 'lodash-es';
+import { isObject } from '@vue/shared';
+import { isArray, isString, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
@@ -46,6 +47,33 @@ function parseBirthday(birthday) {
   result.age = result.year = differenceInYears(d, birthDate);
   return result;
 }
+function mergeDeepProperties(target, fieldList, traverseProperties = ["children", "properties", "suffixConfig"], property = "val_key", targetProperty = "default_val") {
+  function traverse(_target, _fieldList) {
+    _fieldList.forEach((field) => {
+      if (!isObject(field))
+        return;
+      if (targetPropertyFor(field) != null && _target[propertyFor(field)] == null) {
+        _target[propertyFor(field)] = targetPropertyFor(field);
+      }
+      traverseProperties.forEach((p) => {
+        if (!field[p])
+          return;
+        if (!_target[propertyFor(field)]) {
+          _target[propertyFor(field)] = {};
+        }
+        traverse(_target[propertyFor(field)], arrayed(field[p]));
+      });
+    });
+  }
+  traverse(target, fieldList);
+  return target;
+  function propertyFor(field) {
+    return field[property];
+  }
+  function targetPropertyFor(field) {
+    return field[targetProperty];
+  }
+}
 function parseIdCard(idCardNo) {
   const parseInner = (certificateNo, idxSexStart, birthYearSpan) => {
     const res = {};
@@ -124,7 +152,7 @@ function createSlot(renderer, props) {
   };
 }
 function queryDecorator(key, wrapperElement, formUUID) {
-  return wrapperElement.querySelector(`#${formUUID}-${key}`);
+  return wrapperElement.querySelector(elementIdEscape(`#${formUUID}-${key}`));
 }
 function queryInput(decoratorElement) {
   var _a;
@@ -150,8 +178,11 @@ function getParentLinebar(key, fieldList) {
     return field.html_type === "LINEBAR";
   }
 }
+function elementIdEscape(id) {
+  return id.replace(".", "-");
+}
 function createLinebarId(id) {
-  return `id-${id}`;
+  return elementIdEscape(`id-${id}`);
 }
 function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
@@ -169,4 +200,4 @@ function createInputSlot(props) {
   });
 }
 
-export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, mergeDeepProperties, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

package/es/packages/index.css

@@ -396,6 +396,17 @@ body > .vxe-table--tooltip-wrapper {
   height: var(--tableImageHeight);
   width: var(--tableImageWidth);
 }
+.custom-big-table .domPropsInnerHTML-span .icon-dot-custom {
+  width: 8px;
+  height: 8px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  background: var(--table-icon-color);
+  display: inline-block;
+  margin-right: 6px;
+  box-shadow: 0px 2px 4px 0px var(--table-icon-shadow);
+}
 .custom-big-table .domPropsInnerHTML-span .icon-dot-red {
   width: 8px;
   height: 8px;

package/es/packages/shortcut-provider/index.d.ts

@@ -1,17 +1,8 @@
 import { SFCWithInstall } from '../../../es/src/types';
 export * from './src/hooks';
 export * from './src/types';
-declare const ShortcutProvider: SFCWithInstall<import("vue").DefineComponent<{
-    cacheKey: StringConstructor;
-}, {
+declare const ShortcutProvider: SFCWithInstall<import("vue").DefineComponent<{}, {
     shortcutWrapperRef: import("vue").Ref<HTMLElement | undefined>;
-    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-        cacheKey: StringConstructor;
-    }>> & {
-        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-    }>>;
     manager: import("./src/hooks").ShortcutManager;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    cacheKey: StringConstructor;
-}>>, {}>>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 export default ShortcutProvider;

package/es/packages/shortcut-provider/src/ShortcutProvider.js

@@ -5,13 +5,9 @@ import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "ShortcutProvider",
-  props: {
-    cacheKey: String
-  },
   setup(__props) {
-    const props = __props;
     const shortcutWrapperRef = ref();
-    const manager = new ShortcutManager(shortcutWrapperRef, props.cacheKey).start();
+    const manager = new ShortcutManager(shortcutWrapperRef).start();
     provide(InjectionShortcutManager, manager);
     onBeforeUnmount(() => {
       manager.destroy();

package/es/packages/shortcut-provider/src/ShortcutProvider.vue.d.ts

@@ -1,15 +1,6 @@
 import { ShortcutManager } from '../../../../es/packages/shortcut-provider';
-declare const _default: import("vue").DefineComponent<{
-    cacheKey: StringConstructor;
-}, {
+declare const _default: import("vue").DefineComponent<{}, {
     shortcutWrapperRef: import("vue").Ref<HTMLElement | undefined>;
-    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-        cacheKey: StringConstructor;
-    }>> & {
-        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-    }>>;
     manager: ShortcutManager;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    cacheKey: StringConstructor;
-}>>, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

package/es/packages/shortcut-provider/src/hooks/useShortcuts.d.ts

@@ -5,12 +5,13 @@ export declare class ShortcutManager {
     private readonly shortcutCache;
     private readonly environmentEle;
     private handle?;
+    disabled: boolean;
     static log(message: string, dryRun?: boolean): string;
-    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>, cacheKey?: string);
-    get traverse(): unknown[];
-    query(key: string): any;
-    updateState(key: string, state?: boolean): void;
-    update(key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>): void;
+    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>);
+    get traverse(): Omit<ShortcutItem, "callback">[];
+    query(key: string): Omit<ShortcutItem, "callback">;
+    updateDisabled(key: string, state?: boolean): Promise<void>;
+    update(key: string, info?: KeyboardEvent | Partial<ShortcutSignatureInfo>): Promise<void>;
     register(shortcutItem: ShortcutItem): {
         stop: () => void;
         signature: () => string;
@@ -23,8 +24,10 @@ export declare function useShortcuts(glob?: boolean): {
         stop: () => void;
         signature: () => string;
     };
-    traverse: () => unknown[];
-    query: (key: string) => any;
+    traverse: () => Omit<ShortcutItem, "callback">[];
+    query: (key: string) => Omit<ShortcutItem, "callback">;
     update: (key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>) => void;
-    updateState: (key: string, state?: boolean) => void;
+    onReset: (key: string) => void;
+    updateDisabled: (key: string, state?: boolean) => void;
+    updateManagerDisabled: (disabled?: boolean) => void;
 };

package/es/packages/shortcut-provider/src/hooks/useShortcuts.js

@@ -1,17 +1,15 @@
 import { ShortcutStatus, InjectionShortcutManager } from '../../../../packages/shortcut-provider/src/constants';
-import { getKeySignature, getDisplaySignature, isKeyboardEvent, findAncestor, isShortcutProvider } from '../../../../packages/shortcut-provider/src/utils';
-import { reactive, unref, getCurrentInstance, inject, onBeforeUnmount } from 'vue';
-import { useStorage, useEventListener, useDebounceFn } from '@vueuse/core';
+import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, findAncestor, isShortcutProvider } from '../../../../packages/shortcut-provider/src/utils';
+import { reactive, ref, unref, getCurrentInstance, inject, onBeforeUnmount } from 'vue';
+import { useEventListener, useDebounceFn } from '@vueuse/core';
 import { pick, omit, isFunction, isString } from 'lodash-es';
 
 class ShortcutManager {
-  constructor(environmentEle, cacheKey = "__shortcut__glob") {
+  constructor(environmentEle) {
     this.shortcutCallbackMap = reactive(/* @__PURE__ */ new Map());
+    this.shortcutCache = ref({});
+    this.disabled = false;
     this.environmentEle = environmentEle || window;
-    this.shortcutCache = useStorage(cacheKey, {}, localStorage, {
-      listenToStorageChanges: true,
-      deep: true
-    });
   }
   static log(message, dryRun = false) {
     const _message = `[ShortcutManager] ${message}`;
@@ -24,30 +22,43 @@ class ShortcutManager {
   query(key) {
     return this.shortcutCache.value[key];
   }
-  updateState(key, state) {
-    this.query(key) && (this.query(key).disabled = !!state);
-  }
-  update(key, info) {
+  async updateDisabled(key, state) {
     var _a;
+    const item = this.query(key);
+    await ((_a = item.onUpdateDisabled) == null ? void 0 : _a.call(item, key, state));
+    item.disabled = !!state;
+  }
+  async update(key, info) {
+    var _a, _b;
     const oldKeySignature = (_a = this.query(key)) == null ? void 0 : _a.currentKeySignature;
-    if (oldKeySignature === getKeySignature(info))
-      return;
-    if (Object.values(this.shortcutCache.value).some((v) => v.currentKeySignature === getKeySignature(info))) {
-      throw `\u91CD\u590D\u7684\u5FEB\u6377\u952E=> ${getDisplaySignature(info)}`;
-    }
+    info && checkSignature(this.shortcutCache, info);
     const item = this.query(key);
     if (!item)
       return;
-    item.currentKeySignature = getKeySignature(info);
-    this.shortcutCallbackMap.set(getKeySignature(info), this.shortcutCallbackMap.get(oldKeySignature));
+    const newInfo = await ((_b = item.onUpdate) == null ? void 0 : _b.call(item, key, info ? normalizeSignatureInfo(info) : void 0)) || info;
+    if (!newInfo)
+      return;
+    checkSignature(this.shortcutCache, newInfo);
+    item.currentKeySignature = getKeySignature(newInfo);
+    this.shortcutCallbackMap.set(item.currentKeySignature, this.shortcutCallbackMap.get(oldKeySignature));
     this.shortcutCallbackMap.delete(oldKeySignature);
+    function checkSignature(shortcutCache, info2) {
+      if (oldKeySignature === getKeySignature(info2))
+        return;
+      if (Object.values(shortcutCache.value).some((v) => v.currentKeySignature === getKeySignature(info2))) {
+        throw `\u91CD\u590D\u7684\u5FEB\u6377\u952E=> ${getDisplaySignature(info2)}`;
+      }
+      if (isInvalidSignature(info2)) {
+        throw `\u975E\u6CD5\u7684\u5FEB\u6377\u952E=>${info2.key}`;
+      }
+    }
   }
   register(shortcutItem) {
     const item = this.query(shortcutItem.key);
     if (item) {
       item.status = ShortcutStatus.ACTIVE;
       this.shortcutCallbackMap.set(item.currentKeySignature, shortcutItem.callback);
-      Object.assign(item, pick(shortcutItem, ["debounce", "debounceOption", "label", "defaultShortcut", "order", "key"]));
+      Object.assign(item, pick(shortcutItem, ["debounce", "debounceOption", "label", "order", "key"]));
       return createHandler(item);
     }
     this.shortcutCache.value[shortcutItem.key] = omit(shortcutItem, ["callback"]);
@@ -68,7 +79,7 @@ class ShortcutManager {
       return this;
     }
     this.handle = async (event) => {
-      if (!isKeyboardEvent(event))
+      if (!isKeyboardEvent(event) || this.disabled)
         return;
       const providerWrapper = findAncestor(event.target, isShortcutProvider);
       if (providerWrapper && providerWrapper !== unref(this.environmentEle)) {
@@ -107,10 +118,9 @@ function useShortcuts(glob = false) {
   function createShortcutItem(shortcut) {
     return {
       ...shortcut,
-      currentKeySignature: getKeySignature(shortcut.defaultShortcut),
+      currentKeySignature: getKeySignature(shortcut.shortcutSignature),
       key: keyFor(shortcut),
       status: ShortcutStatus.ACTIVE,
-      disabled: false,
       callback: callbackFor(shortcut)
     };
     function callbackFor(shortcut2) {
@@ -132,10 +142,10 @@ function useShortcuts(glob = false) {
   }
   function register(shortcut) {
     const { stop, signature } = manager.register(createShortcutItem(shortcut));
-    if (getCurrentInstance()) {
+    if (getCurrentInstance() && !glob) {
       onBeforeUnmount(stop);
     } else {
-      ShortcutManager.log("\u5728\u975Esetup\u8BED\u5883\u4E0B\u4F7F\u7528register\u51FD\u6570,\u7EC4\u4EF6\u9500\u6BC1\u65F6\u9700\u8981\u624B\u52A8\u8C03\u7528stop\u51FD\u6570\u4F7F\u5FEB\u6377\u952E\u5931\u6D3B");
+      ShortcutManager.log("\u5728\u975Esetup\u8BED\u5883\u4E0B\u4F7F\u7528register\u51FD\u6570,\u7EC4\u4EF6\u9500\u6BC1\u65F6\u53EF\u80FD\u9700\u8981\u624B\u52A8\u8C03\u7528stop\u51FD\u6570\u4F7F\u5FEB\u6377\u952E\u5931\u6D3B");
     }
     return { stop, signature };
   }
@@ -148,10 +158,16 @@ function useShortcuts(glob = false) {
   function update(key, info) {
     manager.update(key, info);
   }
-  function updateState(key, state) {
-    manager.updateState(key, state);
+  function onReset(key) {
+    manager.update(key);
+  }
+  function updateDisabled(key, state) {
+    manager.updateDisabled(key, state);
+  }
+  function updateManagerDisabled(disabled) {
+    manager.disabled = !!disabled;
   }
-  return { register, traverse, query, update, updateState };
+  return { register, traverse, query, update, onReset, updateDisabled, updateManagerDisabled };
 }
 
 export { ShortcutManager, useShortcuts };

package/es/packages/shortcut-provider/src/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ArrayAble } from '../../../../../es/src/types';
+import { ArrayAble, WithUndefined } from '../../../../../es/src/types';
 import { VNode } from 'vue';
 import { ShortcutStatus } from '../../../../../es/packages/shortcut-provider/src/constants';
 declare type Render = () => ArrayAble<VNode>;
@@ -8,25 +8,53 @@ export interface ShortcutSignatureInfo {
     alt?: boolean;
     key: string;
 }
+declare type UpdateResult = Promise<WithUndefined<ShortcutSignatureInfo> | void>;
 export declare type ShortcutOption = {
     label: string | Render;
-    defaultShortcut: ShortcutSignatureInfo;
+    shortcutSignature: ShortcutSignatureInfo;
     callback(): void;
 } & Partial<{
+    /**
+     * @description 重置时回调
+     * @param key
+     */
+    onReset(key: string): Promise<any>;
+    /**
+     * @description 更新快捷键回调
+     * @param key
+     * @param newSignature 用户输入的快捷键签名
+     * @return
+     */
+    onUpdate(key: string, newSignature?: ShortcutSignatureInfo): UpdateResult;
+    /**
+     * @description 更新快捷键disabled状态回调
+     * @param key
+     * @param newState
+     */
+    onUpdateDisabled(key: string, newState?: boolean): Promise<any>;
+    /**
+     * 快捷键输入框展位文本
+     */
     placeholder: string;
+    /**
+     * 快捷键输入框编辑状态下的展位文本
+     */
     editPlaceholder: string;
     key: string;
     order: number;
+    disabled: boolean;
     debounce: boolean;
     debounceOption: {
         duration?: number;
     };
-    operation: Array<'disabled' | 'reset'>;
+    /**
+     * 快捷键编辑组件的操作按钮
+     */
+    operation: Array<'state' | 'reset'>;
 }>;
 export interface ShortcutItem extends ShortcutOption {
     status: ShortcutStatus;
     currentKeySignature: string;
     key: string;
-    disabled: boolean;
 }
 export {};

package/es/packages/shortcut-provider/src/utils/index.d.ts

@@ -1,6 +1,9 @@
 import { ShortcutSignatureInfo } from '../../../../../es/packages/shortcut-provider/src/types';
 export declare function isKeyboardEvent(event: any): event is KeyboardEvent;
+export declare function normalizeSignatureInfo(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): Required<ShortcutSignatureInfo>;
 export declare function getKeySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
+export declare function inKeyBlackList(key: string): boolean | undefined;
+export declare function isInvalidSignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean | undefined;
 export declare function getDisplaySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
 export declare function transformKey2DisplaySignature(keySignature: string): string;
 export declare function isShortcutProvider(ele: HTMLElement): boolean;

package/es/packages/shortcut-provider/src/utils/index.js

@@ -1,3 +1,5 @@
+import { isString } from 'lodash-es';
+
 function isKeyboardEvent(event) {
   return Reflect.get(event, "view") === window && Reflect.get(event, "shiftKey") != void 0;
 }
@@ -21,12 +23,20 @@ function getKeySignature(info) {
   return `${ctrl ? "Ctrl_" : ""}${shift ? "Shift_" : ""}${alt ? "Alt_" : ""}${key}`;
 }
 const keyBlackList = ["CONTROL", "ALT", "SHIFT"];
-const inBlackList = (key) => {
-  return keyBlackList.includes(key);
-};
+function inKeyBlackList(key) {
+  if (!isString(key))
+    return;
+  return keyBlackList.includes(key.toUpperCase());
+}
+function isInvalidSignature(info) {
+  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
+  if (!ctrl && !shift && !alt)
+    return !/F\d/.test(key);
+  return inKeyBlackList(key);
+}
 function getDisplaySignature(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  return `${ctrl ? "Ctrl+ " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inBlackList(key) ? "" : key}`;
+  return `${ctrl ? "Ctrl+ " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inKeyBlackList(key) ? "" : key}`;
 }
 function transformKey2DisplaySignature(keySignature) {
   return keySignature.replace(/_/g, " + ");
@@ -46,4 +56,4 @@ function findAncestor(ele, finder) {
   return next;
 }
 
-export { findAncestor, getDisplaySignature, getKeySignature, isKeyboardEvent, isShortcutProvider, transformKey2DisplaySignature };
+export { findAncestor, getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };

package/es/packages/shortcut-setter/index.d.ts

@@ -59,10 +59,12 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 editPlaceholder: string;
                 operation: ("disabled" | "reset")[];
             };
-            query: (key: string) => any;
+            query: (key: string) => Omit<import("..").ShortcutItem, "callback">;
             update: (key: string, info: KeyboardEvent | Partial<import("..").ShortcutSignatureInfo>) => void;
-            updateState: (key: string, state?: boolean | undefined) => void;
-            shortcutItem: import("vue").ComputedRef<any>;
+            updateState: any;
+            onReset: (key: string) => void;
+            updateManagerDisabled: (disabled?: boolean | undefined) => void;
+            shortcutItem: import("vue").ComputedRef<Omit<import("..").ShortcutItem, "callback">>;
             disabledState: import("vue").ComputedRef<boolean>;
             currentSetShortcut: import("vue").ComputedRef<string>;
             state: import("vue").Ref<import("./constant").ShortcutInputState>;
@@ -79,7 +81,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             updateDecorator: (fn: () => unknown, afterUpdate?: (() => void) | undefined) => void;
             onInputKeyUp: import("lodash").DebouncedFuncLeading<(event: KeyboardEvent) => void>;
             onStop: () => void;
-            onReset: () => void;
+            onSignatureReset: () => void;
             NButton: import("vue").DefineComponent<{
                 readonly color: StringConstructor;
                 readonly textColor: StringConstructor;

package/es/packages/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -59,10 +59,12 @@ declare const _default: import("vue").DefineComponent<{
                 editPlaceholder: string;
                 operation: ("disabled" | "reset")[];
             };
-            query: (key: string) => any;
+            query: (key: string) => Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">;
             update: (key: string, info: KeyboardEvent | Partial<import("../../../../es/packages/shortcut-provider").ShortcutSignatureInfo>) => void;
-            updateState: (key: string, state?: boolean | undefined) => void;
-            shortcutItem: import("vue").ComputedRef<any>;
+            updateState: any;
+            onReset: (key: string) => void;
+            updateManagerDisabled: (disabled?: boolean | undefined) => void;
+            shortcutItem: import("vue").ComputedRef<Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">>;
             disabledState: import("vue").ComputedRef<boolean>;
             currentSetShortcut: import("vue").ComputedRef<string>;
             state: import("vue").Ref<import("../constant").ShortcutInputState>;
@@ -79,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
             updateDecorator: (fn: () => unknown, afterUpdate?: (() => void) | undefined) => void;
             onInputKeyUp: import("lodash").DebouncedFuncLeading<(event: KeyboardEvent) => void>;
             onStop: () => void;
-            onReset: () => void;
+            onSignatureReset: () => void;
             NButton: import("vue").DefineComponent<{
                 readonly color: StringConstructor;
                 readonly textColor: StringConstructor;

package/es/packages/shortcut-setter/src/ShortcutSetterItem.js

@@ -24,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const { query, update, updateState } = useShortcuts(props.glob);
+    const { query, update, updateState, onReset, updateManagerDisabled } = useShortcuts(props.glob);
     const shortcutItem = computed(() => {
       return query(props.fieldItem.val_key);
     });
@@ -49,11 +49,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return isEditState.value ? props.placeholder : props.editPlaceholder;
     });
     function onInputFocus() {
+      updateManagerDisabled(true);
       state.value = ShortcutInputState.EDIT;
     }
     const inputRef = ref();
     function onInputBlur() {
       var _a;
+      updateManagerDisabled(false);
       state.value = ShortcutInputState.STATIC;
       currentEditShortcut.value = "";
       (_a = inputRef.value) == null ? void 0 : _a.blur();
@@ -78,10 +80,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       updateDecorator(() => updateState(props.fieldItem.val_key, !disabledState.value), onInputBlur);
     }
-    function onReset() {
+    function onSignatureReset() {
       if (!shortcutItem.value)
         return;
-      updateDecorator(() => update(props.fieldItem.val_key, shortcutItem.value.defaultShortcut), onInputBlur);
+      updateDecorator(() => onReset(props.fieldItem.val_key), onInputBlur);
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", _hoisted_1, [
@@ -110,7 +112,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, 8, ["type"])) : createCommentVNode("v-if", true),
           hasOperation("reset") ? (openBlock(), createBlock(unref(NPopconfirm), {
             key: 1,
-            onPositiveClick: onReset
+            onPositiveClick: onSignatureReset
           }, {
             trigger: withCtx(() => [
               createVNode(unref(NButton), {

package/es/packages/shortcut-setter/src/ShortcutSetterItem.vue.d.ts

@@ -49,10 +49,12 @@ declare const _default: import("vue").DefineComponent<{
         editPlaceholder: string;
         operation: Array<'disabled' | 'reset'>;
     };
-    query: (key: string) => any;
+    query: (key: string) => Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">;
     update: (key: string, info: KeyboardEvent | Partial<import("../../../../es/packages/shortcut-provider").ShortcutSignatureInfo>) => void;
-    updateState: (key: string, state?: boolean | undefined) => void;
-    shortcutItem: import("vue").ComputedRef<any>;
+    updateState: any;
+    onReset: (key: string) => void;
+    updateManagerDisabled: (disabled?: boolean | undefined) => void;
+    shortcutItem: import("vue").ComputedRef<Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">>;
     disabledState: import("vue").ComputedRef<boolean>;
     currentSetShortcut: import("vue").ComputedRef<string>;
     state: import("vue").Ref<ShortcutInputState>;
@@ -69,7 +71,7 @@ declare const _default: import("vue").DefineComponent<{
     updateDecorator: (fn: () => unknown, afterUpdate?: () => void) => void;
     onInputKeyUp: import("lodash").DebouncedFuncLeading<(event: KeyboardEvent) => void>;
     onStop: () => void;
-    onReset: () => void;
+    onSignatureReset: () => void;
     NButton: import("vue").DefineComponent<{
         readonly color: StringConstructor;
         readonly textColor: StringConstructor;

package/package.json

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