cnhis-design-vue 3.1.29-beta.5 → 3.1.29-beta.7

package/es/components/field-set/src/FieldSet.js

@@ -20,35 +20,37 @@ const _hoisted_7 = {
   class: "width-show"
 };
 const _hoisted_8 = { class: "width-show" };
-const _hoisted_9 = /* @__PURE__ */ createElementVNode("span", { class: "width-showed" }, "\u56FA\u5B9A", -1);
-const _hoisted_10 = /* @__PURE__ */ createElementVNode("span", { class: "width-word" }, "\u81EA\u5B9A\u4E49\u6807\u9898", -1);
-const _hoisted_11 = /* @__PURE__ */ createElementVNode("span", { class: "width-showed" }, "\u5217\u5BBD", -1);
-const _hoisted_12 = ["onClick"];
-const _hoisted_13 = { class: "width-show drag-icon-wrap" };
-const _hoisted_14 = /* @__PURE__ */ createElementVNode("span", {
+const _hoisted_9 = { class: "width-show" };
+const _hoisted_10 = /* @__PURE__ */ createElementVNode("span", { class: "width-showed" }, "\u56FA\u5B9A", -1);
+const _hoisted_11 = /* @__PURE__ */ createElementVNode("span", { class: "width-word" }, "\u81EA\u5B9A\u4E49\u6807\u9898", -1);
+const _hoisted_12 = /* @__PURE__ */ createElementVNode("span", { class: "width-showed" }, "\u5217\u5BBD", -1);
+const _hoisted_13 = ["onClick"];
+const _hoisted_14 = { class: "width-show drag-icon-wrap" };
+const _hoisted_15 = /* @__PURE__ */ createElementVNode("span", {
   class: "iconfont icon-a-menzhenyishengzhanxitongtubiaotuozhuai",
   style: { "color": "#000" }
 }, null, -1);
-const _hoisted_15 = /* @__PURE__ */ createElementVNode("span", null, "\u62D6\u62FD\u8C03\u6574\u987A\u5E8F", -1);
-const _hoisted_16 = /* @__PURE__ */ createElementVNode("span", { style: { "width": "14px", "margin-right": "6px" } }, null, -1);
-const _hoisted_17 = { class: "width-show" };
-const _hoisted_18 = {
+const _hoisted_16 = /* @__PURE__ */ createElementVNode("span", null, "\u62D6\u62FD\u8C03\u6574\u987A\u5E8F", -1);
+const _hoisted_17 = /* @__PURE__ */ createElementVNode("span", { style: { "width": "14px", "margin-right": "6px" } }, null, -1);
+const _hoisted_18 = { class: "width-show" };
+const _hoisted_19 = {
   key: 0,
   class: "width-show"
 };
-const _hoisted_19 = {
+const _hoisted_20 = {
   key: 1,
   class: "width-show"
 };
-const _hoisted_20 = { class: "width-show" };
-const _hoisted_21 = { class: "width-showed" };
-const _hoisted_22 = { class: "width-word" };
+const _hoisted_21 = { class: "width-show" };
+const _hoisted_22 = { class: "width-show" };
 const _hoisted_23 = { class: "width-showed" };
-const _hoisted_24 = {
+const _hoisted_24 = { class: "width-word" };
+const _hoisted_25 = { class: "width-showed" };
+const _hoisted_26 = {
   key: 0,
   class: "check-options"
 };
-const _hoisted_25 = { class: "btn-operate" };
+const _hoisted_27 = { class: "btn-operate" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FieldSet",
   props: {
@@ -117,6 +119,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (!Reflect.has(item, "alias")) {
             item.alias = "";
           }
+          if (!Reflect.has(item, "bold")) {
+            item.bold = false;
+          }
         });
       });
       return result;
@@ -126,8 +131,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isCustomSearch: true,
       clickItem: {},
       fields: [],
-      widthShow: "10%",
-      widthLarge: "20%"
+      widthShow: "9%",
+      widthLarge: "19%"
     });
     const leftStyle = (ele) => {
       return {
@@ -155,6 +160,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               title: item.alias,
               fixed: item.fixedWay,
               minWidth: item.columnWidth,
+              bold: item.bold,
               ...props.isEdit ? {
                 required: item.required,
                 editable: item.editable
@@ -204,8 +210,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function setWidth() {
       if (props.isEdit) {
-        state.widthShow = "9%";
-        state.widthLarge = "15%";
+        state.widthShow = "8%";
+        state.widthLarge = "13%";
       }
     }
     watch(
@@ -281,12 +287,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, null, 8, ["checked"])) : createCommentVNode("v-if", true),
                     createTextVNode(" \u6392\u5E8F ")
                   ]),
+                  createElementVNode("span", _hoisted_9, [
+                    createVNode(unref(NCheckbox), {
+                      checked: calculateCheck("bold"),
+                      "onUpdate:checked": _cache[4] || (_cache[4] = ($event) => handleAllCheck($event, "bold"))
+                    }, null, 8, ["checked"]),
+                    createTextVNode(" \u52A0\u7C97 ")
+                  ]),
                   createCommentVNode(" \u56FA\u5B9A "),
-                  _hoisted_9,
-                  createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
                   _hoisted_10,
+                  createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
+                  _hoisted_11,
                   createCommentVNode(" \u5217\u5BBD "),
-                  _hoisted_11
+                  _hoisted_12
                 ], 2),
                 createElementVNode("div", {
                   ref: "setShow",
@@ -305,13 +318,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         style: normalizeStyle(leftStyle(element)),
                         onClick: ($event) => handleFieldClick(element)
                       }, [
-                        createElementVNode("span", _hoisted_13, [
+                        createElementVNode("span", _hoisted_14, [
                           createVNode(unref(NTooltip), { trigger: "hover" }, {
                             trigger: withCtx(() => [
-                              _hoisted_14
+                              _hoisted_15
                             ]),
                             default: withCtx(() => [
-                              _hoisted_15
+                              _hoisted_16
                             ]),
                             _: 1
                           })
@@ -320,11 +333,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createElementVNode("span", {
                           class: normalizeClass(["width-large title-item", { blue: element.extraField }])
                         }, [
-                          _hoisted_16,
+                          _hoisted_17,
                           createElementVNode("span", null, toDisplayString(element.title), 1)
                         ], 2),
                         createCommentVNode(" \u663E\u793A "),
-                        createElementVNode("span", _hoisted_17, [
+                        createElementVNode("span", _hoisted_18, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.show,
                             "onUpdate:checked": ($event) => element.show = $event
@@ -333,7 +346,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ]),
                         createCommentVNode(" \u662F\u5426\u53EF\u7F16\u8F91 "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_18, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_19, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             disabled: element.editableDisable,
                             checked: element.editable,
@@ -343,7 +356,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ])) : createCommentVNode("v-if", true),
                         createCommentVNode(" \u662F\u5426\u5FC5\u586B "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_19, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_20, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             disabled: element.requiredDisable,
                             checked: element.required,
@@ -353,7 +366,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ])) : createCommentVNode("v-if", true),
                         createCommentVNode(" \u6392\u5E8F "),
-                        createElementVNode("span", _hoisted_20, [
+                        createElementVNode("span", _hoisted_21, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.sort,
                             "onUpdate:checked": ($event) => element.sort = $event,
@@ -362,8 +375,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ]),
+                        createCommentVNode(" \u52A0\u7C97 "),
+                        createElementVNode("span", _hoisted_22, [
+                          withDirectives(createVNode(unref(NCheckbox), {
+                            checked: element.bold,
+                            "onUpdate:checked": ($event) => element.bold = $event
+                          }, null, 8, ["checked", "onUpdate:checked"]), [
+                            [vShow, element.id != "0001"]
+                          ])
+                        ]),
                         createCommentVNode(" \u56FA\u5B9A "),
-                        createElementVNode("span", _hoisted_21, [
+                        createElementVNode("span", _hoisted_23, [
                           createVNode(unref(NSelect), {
                             value: element.fixedWay,
                             "onUpdate:value": ($event) => element.fixedWay = $event,
@@ -372,7 +394,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           }, null, 8, ["value", "onUpdate:value"])
                         ]),
                         createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
-                        createElementVNode("span", _hoisted_22, [
+                        createElementVNode("span", _hoisted_24, [
                           withDirectives(createVNode(unref(NInput), {
                             value: element.alias,
                             "onUpdate:value": ($event) => element.alias = $event,
@@ -382,21 +404,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ]),
                         createCommentVNode(" \u5217\u5BBD "),
-                        createElementVNode("span", _hoisted_23, [
+                        createElementVNode("span", _hoisted_25, [
                           createVNode(unref(NInputNumber), {
                             value: element.columnWidth,
                             "onUpdate:value": ($event) => element.columnWidth = $event,
                             style: { width: "120px" }
                           }, null, 8, ["value", "onUpdate:value"])
                         ])
-                      ], 12, _hoisted_12)) : createCommentVNode("v-if", true)
+                      ], 12, _hoisted_13)) : createCommentVNode("v-if", true)
                     ]),
                     _: 1
                   }, 8, ["list"])
                 ], 2)
               ]),
-              props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_24, [
-                createElementVNode("div", _hoisted_25, [
+              props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_26, [
+                createElementVNode("div", _hoisted_27, [
                   renderSlot(_ctx.$slots, "footer", {}, () => [
                     createVNode(unref(NPopconfirm), { onPositiveClick: reset }, {
                       trigger: withCtx(() => [

package/es/components/form-config/index.d.ts

@@ -17,6 +17,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<import("./src/types").FormConfigTextFormatter>;
         };
     }>> & {}>>;
+    uuid: string;
     getCommonConfig: () => {
         move: ({ to, from, dragged }: import("sortablejs").MoveEvent) => false | undefined;
         onChoose: ({ target, item }: import("sortablejs").SortableEvent) => void;
@@ -907,7 +908,18 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             required: true;
         };
     }>>, {}>;
-    FormConfigEdit: import("vue").DefineComponent<{}, {
+    FormConfigEdit: import("vue").DefineComponent<{
+        uuid: {
+            type: StringConstructor;
+            required: true;
+        };
+    }, {
+        props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            uuid: {
+                type: StringConstructor;
+                required: true;
+            };
+        }>> & {}>>;
         key: import("vue").Ref<number>;
         formRenderRef: import("vue").Ref<import("..").FormRenderExpose | undefined>;
         currentActiveField: import("vue").Ref<import("../../../es/shared/types").UndefinedAble<import("./src/types").FormConfigItem>>;
@@ -3259,7 +3271,12 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 enterToNextWidget: boolean;
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
-    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        uuid: {
+            type: StringConstructor;
+            required: true;
+        };
+    }>>, {}>;
     FormConfigMaterialItem: import("vue").DefineComponent<{
         fieldItem: {
             type: import("vue").PropType<import("./src/types").FormConfigItem>;

package/es/components/form-config/src/FormConfig.js

@@ -1,4 +1,5 @@
-import { defineComponent, ref, provide, toRaw, openBlock, createElementBlock, normalizeStyle, createElementVNode, createVNode, unref, mergeProps, withCtx, createTextVNode } from 'vue';
+import { defineComponent, ref, provide, toRaw, openBlock, createElementBlock, normalizeStyle, unref, createElementVNode, createVNode, mergeProps, withCtx, createTextVNode } from 'vue';
+import { uuidGenerator } from '../../../shared/utils/index.js';
 import { cloneDeep, isFunction } from 'lodash-es';
 import draggableComponent from '../../../shared/components/VueDraggable/src/vuedraggable.js';
 import FormConfigCreator from './components/FormConfigCreator.js';
@@ -13,13 +14,14 @@ import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 import './utils/index.js';
 import { useSortableConfig } from './hooks/useSortalbeConfig.js';
 
-const _hoisted_1 = { class: "form-config__material" };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("header", { class: "form-config__materialHeader" }, "\u7269\u6599\u533A", -1);
-const _hoisted_3 = { class: "form-config__displayWrapper" };
-const _hoisted_4 = { class: "form-config__displayHeader" };
-const _hoisted_5 = { class: "form-config__config" };
-const _hoisted_6 = /* @__PURE__ */ createElementVNode("header", { class: "form-config__configHeader" }, "\u914D\u7F6E\u533A", -1);
-const _hoisted_7 = { class: "form-config__configContent" };
+const _hoisted_1 = ["id"];
+const _hoisted_2 = { class: "form-config__material" };
+const _hoisted_3 = /* @__PURE__ */ createElementVNode("header", { class: "form-config__materialHeader" }, "\u7269\u6599\u533A", -1);
+const _hoisted_4 = { class: "form-config__displayWrapper" };
+const _hoisted_5 = { class: "form-config__displayHeader" };
+const _hoisted_6 = { class: "form-config__config" };
+const _hoisted_7 = /* @__PURE__ */ createElementVNode("header", { class: "form-config__configHeader" }, "\u914D\u7F6E\u533A", -1);
+const _hoisted_8 = { class: "form-config__configContent" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FormConfig",
   props: {
@@ -28,6 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props, { expose }) {
     const props = __props;
+    const uuid = uuidGenerator();
     const { getCommonConfig } = useSortableConfig();
     const fieldListRef = ref([]);
     provide(InjectionFieldList, fieldListRef);
@@ -73,10 +76,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", {
         class: "form-config",
-        style: normalizeStyle({ "--max-height": __props.maxHeight })
+        style: normalizeStyle({ "--max-height": __props.maxHeight }),
+        id: unref(uuid)
       }, [
-        createElementVNode("section", _hoisted_1, [
-          _hoisted_2,
+        createElementVNode("section", _hoisted_2, [
+          _hoisted_3,
           createVNode(unref(draggableComponent), mergeProps(unref(getCommonConfig)(), {
             class: "form-config__materialContent",
             modelValue: materialListRef.value,
@@ -88,8 +92,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }, 16, ["modelValue"])
         ]),
-        createElementVNode("section", _hoisted_3, [
-          createElementVNode("header", _hoisted_4, [
+        createElementVNode("section", _hoisted_4, [
+          createElementVNode("header", _hoisted_5, [
             createTextVNode(" \u5E03\u5C40\u533A "),
             createVNode(FormConfigCreator, { onSubmit: addItem })
           ]),
@@ -101,16 +105,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => fieldListRef.value = $event)
           }, null, 8, ["group", "modelValue"])
         ]),
-        createElementVNode("section", _hoisted_5, [
-          _hoisted_6,
-          createElementVNode("section", _hoisted_7, [
+        createElementVNode("section", _hoisted_6, [
+          _hoisted_7,
+          createElementVNode("section", _hoisted_8, [
             createVNode(FormConfigEdit, {
               ref_key: "formConfigEditRef",
-              ref: formConfigEditRef
-            }, null, 512)
+              ref: formConfigEditRef,
+              uuid: unref(uuid)
+            }, null, 8, ["uuid"])
           ])
         ])
-      ], 4);
+      ], 12, _hoisted_1);
     };
   }
 });

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -18,6 +18,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<FormConfigTextFormatter>;
         };
     }>> & {}>>;
+    uuid: string;
     getCommonConfig: () => {
         move: ({ to, from, dragged }: import("sortablejs").MoveEvent) => false | undefined;
         onChoose: ({ target, item }: import("sortablejs").SortableEvent) => void;
@@ -908,7 +909,18 @@ declare const _default: import("vue").DefineComponent<{
             required: true;
         };
     }>>, {}>;
-    FormConfigEdit: import("vue").DefineComponent<{}, {
+    FormConfigEdit: import("vue").DefineComponent<{
+        uuid: {
+            type: StringConstructor;
+            required: true;
+        };
+    }, {
+        props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            uuid: {
+                type: StringConstructor;
+                required: true;
+            };
+        }>> & {}>>;
         key: import("vue").Ref<number>;
         formRenderRef: import("vue").Ref<import("../..").FormRenderExpose | undefined>;
         currentActiveField: import("vue").Ref<import("../../../../es/shared/types").UndefinedAble<FormConfigItem>>;
@@ -3260,7 +3272,12 @@ declare const _default: import("vue").DefineComponent<{
                 enterToNextWidget: boolean;
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
-    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        uuid: {
+            type: StringConstructor;
+            required: true;
+        };
+    }>>, {}>;
     FormConfigMaterialItem: import("vue").DefineComponent<{
         fieldItem: {
             type: PropType<FormConfigItem>;

package/es/components/form-config/src/components/FormConfigEdit.js

@@ -13,7 +13,9 @@ import FormRender from '../../../form-render/index.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FormConfigEdit",
+  props: { uuid: { type: String, required: true } },
   setup(__props, { expose }) {
+    const props = __props;
     const key = ref(0);
     const formRenderRef = ref();
     const currentActiveField = inject(InjectionActiveFieldItem);
@@ -43,7 +45,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         prevOldField = field;
         initialData.value = { editable: true, ...cloneDeep(toRaw(field)) };
-        fieldList.value = generateFieldListByFieldItem(field);
+        fieldList.value = generateFieldListByFieldItem(field).map((fieldItem) => {
+          return { ...fieldItem, componentProps: { to: `#${props.uuid} .form-config__config` } };
+        });
         key.value++;
       },
       { immediate: true }

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -1,6 +1,17 @@
 import { FieldItem, FormChangePayload, FormRenderExpose } from '../../../../../es/components/form-render';
 import { FormConfigItem } from '../../../../../es/components/index';
-declare const _default: import("vue").DefineComponent<{}, {
+declare const _default: import("vue").DefineComponent<{
+    uuid: {
+        type: StringConstructor;
+        required: true;
+    };
+}, {
+    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+        uuid: {
+            type: StringConstructor;
+            required: true;
+        };
+    }>> & {}>>;
     key: import("vue").Ref<number>;
     formRenderRef: import("vue").Ref<FormRenderExpose | undefined>;
     currentActiveField: import("vue").Ref<import("../../../../../es/shared/types").UndefinedAble<FormConfigItem>>;
@@ -2352,5 +2363,10 @@ declare const _default: import("vue").DefineComponent<{}, {
             enterToNextWidget: boolean;
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    uuid: {
+        type: StringConstructor;
+        required: true;
+    };
+}>>, {}>;
 export default _default;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/editSelect.d.ts

@@ -2,6 +2,10 @@ import { PropType } from 'vue';
 import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
 import { AnyObject } from '../../../../../../../../es/shared/types';
 declare const _default: import("vue").DefineComponent<{
+    value: {
+        type: PropType<string | number | (string | number)[]>;
+        default: undefined;
+    };
     column: {
         type: PropType<IhoTableFieldItem>;
         required: true;
@@ -14,7 +18,11 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         required: true;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    value: {
+        type: PropType<string | number | (string | number)[]>;
+        default: undefined;
+    };
     column: {
         type: PropType<IhoTableFieldItem>;
         required: true;
@@ -27,5 +35,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         required: true;
     };
-}>>, {}>;
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
+    value: string | number | (string | number)[];
+}>;
 export default _default;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/editSelect.js

@@ -10,6 +10,10 @@ var EditSelect = defineComponent({
     NSelect
   },
   props: {
+    value: {
+      type: [Array, String, Number],
+      default: void 0
+    },
     column: {
       type: Object,
       required: true
@@ -23,6 +27,7 @@ var EditSelect = defineComponent({
       required: true
     }
   },
+  emits: ["update:value"],
   setup(props, {
     attrs,
     slots,
@@ -34,6 +39,7 @@ var EditSelect = defineComponent({
       isShow
     } = useCommon();
     function onUpdateValue(value) {
+      emit("update:value", value);
       globEmit("formChange", {
         value,
         row: props.row,
@@ -46,8 +52,7 @@ var EditSelect = defineComponent({
       "show": isShow.value,
       "onUpdate:show": ($event) => isShow.value = $event
     }, attrs, {
-      "value": props.row[props.column.field],
-      "onUpdate:value": ($event) => props.row[props.column.field] = $event,
+      "value": props.value,
       "consistentMenuWidth": false,
       "clearable": true,
       "filterable": true,

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/index.js

@@ -29,7 +29,9 @@ function selectRendererPlugin() {
           return [createVNode(EditSelect, mergeProps((props == null ? void 0 : props.componentProps) || {}, {
             "column": column,
             "row": row,
-            "index": $rowIndex
+            "index": $rowIndex,
+            "value": row[column.field],
+            "onUpdate:value": ($event) => row[column.field] = $event
           }), null)];
         }
       });

package/es/components/iho-table/src/plugins/rendererPlugins/widgets/colorRendererPlugin.js

@@ -30,6 +30,8 @@ function colorRendererPlugin() {
           column
         }) {
           const value = row[column.field];
+          if (!value)
+            return [];
           const [color, alias] = value.split("-");
           return [createVNode("div", {
             "style": {

package/es/components/keyboard/index.d.ts

@@ -21,6 +21,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
         onKeydown?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "change" | "keydown", ...args: any[]) => void;
+    popoverRef: import("vue").Ref<null>;
     numberKeys: import("vue").Ref<string[]>;
     days: import("vue").Ref<number[]>;
     doses: import("vue").Ref<number[]>;
@@ -49,6 +50,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     InputNumber: import("vue").DefineComponent<{
         modelValue: {
             type: StringConstructor;
+            default: string;
         };
         integer: {
             type: BooleanConstructor;
@@ -58,6 +60,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             modelValue: {
                 type: StringConstructor;
+                default: string;
             };
             integer: {
                 type: BooleanConstructor;
@@ -78,6 +81,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         modelValue: {
             type: StringConstructor;
+            default: string;
         };
         integer: {
             type: BooleanConstructor;
@@ -86,6 +90,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     }>> & {
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     }, {
+        modelValue: string;
         integer: boolean;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "keydown")[], "change" | "keydown", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/keyboard/src/Keyboard.js

@@ -3,6 +3,7 @@ import { NPopover, NInputNumber, NSpace, NIcon } from 'naive-ui';
 import { ArrowUndoSharp, Close, GitCompareOutline } from '@vicons/ionicons5';
 import InputNumber from './components/InputNumber.js';
 import { useRefHistory } from '@vueuse/core';
+import { getNumber } from './utils/index.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { class: "c-keyboard" };
@@ -36,6 +37,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const ENGLISHOTHERKEY = ["switch", " ", "undo", "Enter"];
     const ENGLISHKEYS = ENGLISHKEY.split("").concat(ENGLISHOTHERKEY);
     const ENGLISHKEYS_ = ENGLISHKEY.split(".")[0].split("").sort().concat(["."], ENGLISHOTHERKEY);
+    const popoverRef = ref(null);
     const numberKeys = ref(NUMBERKEYS.split(""));
     const days = ref(DAYS);
     const doses = ref([2, 3, 4, 5, 6, 7, 8]);
@@ -50,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const isDay = computed(() => props.mode === "day");
     const isDose = computed(() => props.mode === "dose");
     function keydown(key) {
-      var _a, _b;
+      var _a, _b, _c;
       if (props.mode === "default") {
         if (key !== "switch") {
           emit("keydown", key);
@@ -66,13 +68,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         case "enter":
           value.value = +inputValue.value;
+          (_a = popoverRef.value) == null ? void 0 : _a.setShow(false);
           emit("change", value.value);
           break;
         default:
           if (typeof key === "number") {
             inputValue.value = key.toString();
           } else {
-            inputValue.value = (((_b = (_a = inputValue.value) == null ? void 0 : _a.toString) == null ? void 0 : _b.call(_a)) || "") + key;
+            inputValue.value = (((_c = (_b = inputValue.value) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) || "") + key;
           }
           break;
       }
@@ -82,22 +85,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       denominatorValue.value = value2.toString();
     }
     function calculateFraction() {
-      var _a;
-      inputValue.value = (+((_a = integerValue.value) != null ? _a : 0) + +numeratorValue.value / +denominatorValue.value).toString();
+      const value2 = getNumber(integerValue.value) + getNumber(numeratorValue.value) / getNumber(denominatorValue.value);
+      inputValue.value = (isNaN(value2) || Object.is(Infinity, value2) ? "" : value2).toString();
     }
     return (_ctx, _cache) => {
       return !unref(isDefault) ? (openBlock(), createBlock(unref(NPopover), {
         key: 0,
+        ref_key: "popoverRef",
+        ref: popoverRef,
         trigger: "click",
         "show-arrow": false,
         placement: "bottom-start",
-        style: { "padding": "0" }
+        style: { "padding": "0" },
+        "display-directive": "show"
       }, {
         trigger: withCtx(() => [
           createVNode(unref(NInputNumber), {
             value: value.value,
             "onUpdate:value": _cache[0] || (_cache[0] = ($event) => value.value = $event),
-            style: { "width": "200px" }
+            style: { "width": "200px" },
+            "show-button": false
           }, null, 8, ["value"])
         ]),
         default: withCtx(() => [
@@ -207,7 +214,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ])
         ]),
         _: 1
-      })) : (openBlock(), createElementBlock("div", _hoisted_11, [
+      }, 512)) : (openBlock(), createElementBlock("div", _hoisted_11, [
         createVNode(unref(NSpace), {
           "wrap-item": false,
           align: "center",

package/es/components/keyboard/src/Keyboard.vue.d.ts

@@ -21,6 +21,7 @@ declare const _default: import("vue").DefineComponent<{
         onKeydown?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "change" | "keydown", ...args: any[]) => void;
+    popoverRef: import("vue").Ref<null>;
     numberKeys: import("vue").Ref<string[]>;
     days: import("vue").Ref<number[]>;
     doses: import("vue").Ref<number[]>;
@@ -49,6 +50,7 @@ declare const _default: import("vue").DefineComponent<{
     InputNumber: import("vue").DefineComponent<{
         modelValue: {
             type: StringConstructor;
+            default: string;
         };
         integer: {
             type: BooleanConstructor;
@@ -58,6 +60,7 @@ declare const _default: import("vue").DefineComponent<{
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             modelValue: {
                 type: StringConstructor;
+                default: string;
             };
             integer: {
                 type: BooleanConstructor;
@@ -78,6 +81,7 @@ declare const _default: import("vue").DefineComponent<{
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         modelValue: {
             type: StringConstructor;
+            default: string;
         };
         integer: {
             type: BooleanConstructor;
@@ -86,6 +90,7 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     }, {
+        modelValue: string;
         integer: boolean;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "keydown")[], "change" | "keydown", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/keyboard/src/components/InputNumber.js

@@ -1,12 +1,13 @@
 import { defineComponent, openBlock, createBlock, unref, withCtx, createVNode } from 'vue';
 import { NInput, NSpace, NIcon } from 'naive-ui';
 import { CaretUp, CaretDown } from '@vicons/ionicons5';
+import { getNumber } from '../utils/index.js';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "InputNumber",
   props: {
-    modelValue: { type: String },
+    modelValue: { type: String, default: "" },
     integer: { type: Boolean, default: false }
   },
   emits: ["update:modelValue"],
@@ -23,8 +24,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return /^\d+\.?\d*$/.test(value);
     }
     function calculate(type) {
-      var _a, _b;
-      const newValue = type === "+" ? +((_a = props.modelValue) != null ? _a : 0) + 1 : +((_b = props.modelValue) != null ? _b : 0) - 1;
+      const value = getNumber(props.modelValue);
+      const newValue = type === "+" ? value + 1 : value - 1;
       emit("update:modelValue", newValue.toString());
     }
     return (_ctx, _cache) => {

package/es/components/keyboard/src/components/InputNumber.vue.d.ts

@@ -1,6 +1,7 @@
 declare const _default: import("vue").DefineComponent<{
     modelValue: {
         type: StringConstructor;
+        default: string;
     };
     integer: {
         type: BooleanConstructor;
@@ -10,6 +11,7 @@ declare const _default: import("vue").DefineComponent<{
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         modelValue: {
             type: StringConstructor;
+            default: string;
         };
         integer: {
             type: BooleanConstructor;
@@ -30,6 +32,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: StringConstructor;
+        default: string;
     };
     integer: {
         type: BooleanConstructor;
@@ -38,6 +41,7 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }, {
+    modelValue: string;
     integer: boolean;
 }>;
 export default _default;

package/es/components/keyboard/src/utils/index.d.ts

@@ -0,0 +1 @@
+export declare function getNumber(value: string): number;

package/es/components/keyboard/src/utils/index.js

@@ -0,0 +1,5 @@
+function getNumber(value) {
+  return +(value || 0);
+}
+
+export { getNumber };

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

@@ -3,7 +3,7 @@ import { useEventListener, useDebounceFn } from '@vueuse/core';
 import { once, pick, omit, isFunction, isString } from 'lodash-es';
 import { reactive, ref, unref, computed, getCurrentInstance, inject, onBeforeUnmount, onDeactivated, onActivated } from 'vue';
 import { ShortcutStatus, InjectionShortcutManager } from '../constants/index.js';
-import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, isShortcutProvider } from '../utils/index.js';
+import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, isShortcutProvider, isInvalidKeyboardEvent } from '../utils/index.js';
 
 const GlobalShortcutProvider = Symbol("Glob");
 const ShortcutManagerCacheMap = /* @__PURE__ */ new Map();
@@ -82,7 +82,7 @@ class ShortcutManager {
       if (!isKeyboardEvent(event) || this.disabled)
         return;
       const providerWrapper = findAncestor(event.target, isShortcutProvider);
-      if (providerWrapper && providerWrapper !== unref(this.environmentEle)) {
+      if (providerWrapper && providerWrapper !== unref(this.environmentEle) || isInvalidKeyboardEvent(event)) {
         return;
       }
       const keySignature = getKeySignature(event);
@@ -113,7 +113,9 @@ class ShortcutManager {
 }
 const globManager = new ShortcutManager().start();
 const onceSetupWarn = once(() => ShortcutManager.log("\u975Esetup\u8BED\u5883\u4E0B\u7684shortcut\u5C06\u5F71\u54CD\u5168\u5C40"));
-const onceRegisterWarn = once(() => 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"));
+const onceRegisterWarn = once(
+  () => 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")
+);
 function useShortcuts(scope) {
   function useManager() {
     return computed(() => {

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

@@ -2,8 +2,10 @@ import { ShortcutSignatureInfo } from '../../../../../es/components/shortcut-pro
 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 inKeyBlackList(key: string): boolean;
+export declare function isInvalidKeyboardEvent(event: KeyboardEvent): boolean;
+export declare function isInvalidSignatureAtInput(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean;
+export declare function isInvalidSignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean;
 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/components/shortcut-provider/src/utils/index.js

@@ -1,5 +1,14 @@
 import { isString } from 'lodash-es';
 
+function isAlphanumeric(key) {
+  return /^[\dA-Za-z]$/.test(key);
+}
+function isPunctuation(key) {
+  return /^[，。；‘【】、\-=|+,.\/;’\[\]\\ ]$/.test(key);
+}
+function isFnNumberChar(key) {
+  return /^[!@#$%^&*()_+|~！¥…（）—｜～]$/.test(key);
+}
 function isKeyboardEvent(event) {
   return Reflect.get(event, "view") === window && Reflect.get(event, "shiftKey") != void 0;
 }
@@ -25,24 +34,36 @@ function getKeySignature(info) {
 const keyBlackList = ["CONTROL", "ALT", "SHIFT"];
 function inKeyBlackList(key) {
   if (!isString(key))
-    return;
+    return false;
   return keyBlackList.includes(key.toUpperCase());
 }
-function isInvalidSignature(info) {
+function isInvalidKeyboardEvent(event) {
+  const target = event.target;
+  if (target.tagName !== "INPUT")
+    return false;
+  return isInvalidSignatureAtInput(event);
+}
+function isInvalidSignatureAtInput(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  if (!ctrl && !shift && !alt)
-    return !/F\d/.test(key);
+  if (ctrl || alt)
+    return false;
+  if (shift)
+    return isFnNumberChar(key);
+  return isAlphanumeric(key) || isPunctuation(key);
+}
+function isInvalidSignature(info) {
+  const { key } = normalizeSignatureInfo(info);
   return inKeyBlackList(key);
 }
 function getDisplaySignature(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  return `${ctrl ? "Ctrl+ " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inKeyBlackList(key) ? "" : key}`;
+  return `${ctrl ? "Ctrl + " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inKeyBlackList(key) ? "" : key.replace(" ", "SPACE")}`;
 }
 function transformKey2DisplaySignature(keySignature) {
-  return keySignature.replace(/_/g, " + ");
+  return keySignature.replace(" ", "SPACE").replace(/_/g, " + ");
 }
 function isShortcutProvider(ele) {
   return ele && ele.getAttribute("is-shortcut-capture") != void 0;
 }
 
-export { getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };
+export { getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidKeyboardEvent, isInvalidSignature, isInvalidSignatureAtInput, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.29-beta.5",
+	"version": "3.1.29-beta.7",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "971a1902ff486903e6f5e1987684970a384a5d8b"
+	"gitHead": "ebc8e3abcbc940cd42a9b65b0c307e8a6bd58138"
 }