cnhis-design-vue 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.1.1](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.1.0...v3.1.1) (2022-06-01)
+
+
+### Features
+
+* 表格编辑调接口下拉框支持关键字搜索 ([93157a8](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/93157a8e6cfca91f7f146c61ba7986eaa2716d0f))
+* 表格编辑默认状态设置、校验规则可配置 ([e9618a5](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/e9618a57b9c26dc1a354650bf631eadb91cd0552))
+
+
+### Bug Fixes
+
+* 打印组件选择格式后下拉菜单未收起，也没有选定的格式样式标识 ([f64f656](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/f64f656dc87c0efef1fea114a57fdc94c179b4b6))
+* big-table初始化会强制默认选中所有行 ([55eadeb](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/55eadebe653f366d4fa27d5d82cfef6347d7f322))
+
 ## [3.1.0](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.9...v3.1.0) (2022-05-31)
 
 

package/es/big-table/index.js

@@ -13323,21 +13323,34 @@ var script$5 = defineComponent({
     emits: ["setOptions", "formChange"],
     setup(props, { attrs, slots, emit }) {
         const state = reactive({
-            options: []
+            options: [],
+            loading: false,
+            keyword: "",
+            config: {}
         });
         const setOptions = async () => {
             if (props.col.options) {
                 state.options = JSON.parse(JSON.stringify(props.col.options));
             }
             else {
-                const optionsName = `${props.col.columnName}_options`;
-                state.options = props.row[optionsName] || await props.col.queryOptions();
-                if (!props.row[optionsName]) {
-                    emit("setOptions", state.options);
-                }
+                `${props.col.columnName}_options`;
+                const obj = {
+                    keyword: state.keyword,
+                    row: props.row,
+                    column: props.col,
+                    index: props.index
+                };
+                state.options = await props.col.queryOptions(obj);
+                state.loading = false;
+                emit("setOptions", state.options);
             }
         };
-        setOptions();
+        let selectSearch = (value) => {
+            state.keyword = value;
+            state.loading = true;
+            setOptions();
+        };
+        selectSearch = xeUtils.debounce(selectSearch, 800);
         const onUpdateValue = (value) => {
             emit("formChange", {
                 value,
@@ -13346,14 +13359,25 @@ var script$5 = defineComponent({
                 index: props.index
             });
         };
-        console.log(attrs);
-        return () => [createVNode(NSelect, mergeProps(attrs, {
+        const init = () => {
+            if (props.col.options) {
+                setOptions();
+            }
+            else {
+                state.config.remote = true;
+                state.config.onSearch = selectSearch;
+                selectSearch("");
+            }
+        };
+        init();
+        return () => [createVNode(NSelect, mergeProps(attrs, state.config, {
                 "options": state.options,
                 "consistentMenuWidth": false,
                 "clearable": true,
                 "filterable": true,
                 "to": false,
                 "placeholder": "\u8BF7\u9009\u62E9",
+                "loading": state.loading,
                 "onUpdateValue": onUpdateValue
             }), null)];
     }
@@ -39741,7 +39765,7 @@ var script = /* @__PURE__ */ defineComponent({
                 return;
             let currentPageTableData = table.getTableData()?.tableData;
             let currentPageSelectedRows = currentPageTableData.filter((row) => {
-                return currentCheckedKeys.value.includes(row[props.primaryKey]);
+                return row[props.primaryKey] ? currentCheckedKeys.value.includes(row[props.primaryKey]) : false;
             });
             setCurrentCheckedLength();
             if (!currentPageSelectedRows || !currentPageSelectedRows.length) {
@@ -39862,6 +39886,9 @@ var script = /* @__PURE__ */ defineComponent({
                             if (!isEdit || item.columnName === "operatorColumn" || !item.isEdit) {
                                 return formatter(params, item);
                             }
+                            else if (isEdit && item.isEdit && item.checkEditStatus && item.checkEditStatus(params)) {
+                                return formatterEdit(params, item);
+                            }
                             else {
                                 return createVNode("span", null, [getDefaultValue(params, item)]);
                             }
@@ -41612,6 +41639,7 @@ var script = /* @__PURE__ */ defineComponent({
                         iconClose: "iconfont icon-a-xitongtubiaotianjia"
                     },
                     "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
+                    "edit-rules": _ctx.columnConfig.editRules || {},
                     onCellDblclick: rowdblclick,
                     onCellClick: handlerClickRow,
                     onCheckboxChange: selectionChange,
@@ -41662,7 +41690,7 @@ var script = /* @__PURE__ */ defineComponent({
                             }
                         })]),
                     _: 3
-                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
                     class: "refresh",
                     onClick: hanldeClickRefresh
                 }, [createVNode(unref(NIcon), {

package/es/button-print/index.css

@@ -611,3 +611,7 @@ body > .vxe-table--tooltip-wrapper {
   margin-left: 8px;
   margin-bottom: 8px;
 }
+
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}

package/es/button-print/index.js

@@ -7898,18 +7898,65 @@ const __default__ = create({
 var script = /* @__PURE__ */ defineComponent({
     ...__default__,
     props: {
-        btnText: { type: String, required: false, default: "\u6253\u5370" },
-        printText: { type: String, required: false, default: "\u76F4\u63A5\u6253\u5370" },
-        previewText: { type: String, required: false, default: "\u6253\u5370\u9884\u89C8" },
-        formatEditText: { type: String, required: false, default: "\u683C\u5F0F\u7F16\u8F91" },
-        identityVerificationTitle: { type: String, required: false, default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C" },
-        params: { type: Array, required: false, default: () => [] },
-        prevFn: { type: Function, required: false, default: () => Promise.resolve() },
-        verifyUser: { type: Function, required: false, default: () => Promise.resolve() },
-        queryPrintFormatByNumber: { type: Function, required: true, default: () => Promise.resolve({}) },
-        queryTemplateParams: { type: Function, required: false, default: () => Promise.resolve({}) },
-        strategy: { type: String, required: false, default: "MULTI" },
-        printParams: { type: Array, required: false }
+        btnText: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370"
+        },
+        printText: {
+            type: String,
+            required: false,
+            default: "\u76F4\u63A5\u6253\u5370"
+        },
+        previewText: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370\u9884\u89C8"
+        },
+        formatEditText: {
+            type: String,
+            required: false,
+            default: "\u683C\u5F0F\u7F16\u8F91"
+        },
+        identityVerificationTitle: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C"
+        },
+        params: {
+            type: Array,
+            required: false,
+            default: () => []
+        },
+        prevFn: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve()
+        },
+        verifyUser: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve()
+        },
+        queryPrintFormatByNumber: {
+            type: Function,
+            required: true,
+            default: () => Promise.resolve({})
+        },
+        queryTemplateParams: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve({})
+        },
+        strategy: {
+            type: String,
+            required: false,
+            default: "MULTI"
+        },
+        printParams: {
+            type: Array,
+            required: false
+        }
     },
     emits: ["success", "error"],
     setup(__props, { emit }) {
@@ -7930,20 +7977,16 @@ var script = /* @__PURE__ */ defineComponent({
             watchPrintParamsReformatFn: null,
             spinTimer: null
         });
-        const options = reactive([
-            {
+        const options = reactive([{
                 label: props.printText,
                 key: "printText"
-            },
-            {
+            }, {
                 label: props.previewText,
                 key: "previewText"
-            },
-            {
+            }, {
                 label: props.formatEditText,
                 key: "formatEditText"
-            }
-        ]);
+            }]);
         const currentFormatItem = computed(() => {
             if (!state.currentFormatId)
                 return {};
@@ -7951,6 +7994,13 @@ var script = /* @__PURE__ */ defineComponent({
             return state.formatList.find((item) => item.id === id);
         });
         const formatTitle = computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+        const renderLabel = (option) => {
+            return createVNode("span", {
+                "class": {
+                    "active": option.key === state.currentFormatId
+                }
+            }, [option.label]);
+        };
         const getTemplateIdByFormatId = (id) => {
             let find = state.formatList.find((item) => item.id === id);
             return find.templateId;
@@ -8080,6 +8130,7 @@ var script = /* @__PURE__ */ defineComponent({
                     break;
                 default:
                     state.currentFormatId = key;
+                    state.visible = false;
                     break;
             }
         };
@@ -8253,48 +8304,51 @@ var script = /* @__PURE__ */ defineComponent({
             if (!val?.length)
                 return false;
             reformatPrintParams();
-        }, { deep: true });
+        }, {
+            deep: true
+        });
         return (_ctx, _cache) => {
-            return openBlock(), createElementBlock("span", { onClick: handleClickWrap }, [
-                createVNode(unref(NDropdown), {
+            return openBlock(), createElementBlock("span", {
+                onClick: handleClickWrap
+            }, [createVNode(unref(NDropdown), {
+                    class: "rowFoldHideBtnList-dropdown",
                     placement: "bottom-start",
                     show: unref(state).visible,
                     onClickoutside: handleClickOutside,
                     options: unref(options),
-                    onSelect: handleSelect
+                    onSelect: handleSelect,
+                    "render-label": renderLabel
                 }, {
-                    default: withCtx(() => [
-                        renderSlot(_ctx.$slots, "button", {
+                    default: withCtx(() => [renderSlot(_ctx.$slots, "button", {
                             handleClickPrintBtn: handleClickBtn,
                             printSpinning: unref(state).spinning,
                             printbtnText: __props.btnText,
                             printVisible: unref(state).visible
-                        }, () => [
-                            createVNode(unref(NButton), {
+                        }, () => [createVNode(unref(NButton), {
                                 class: "dropdown-button",
-                                style: { "margin": "0 8px 8px 0" },
+                                style: {
+                                    "margin": "0 8px 8px 0"
+                                },
                                 onClick: withModifiers(handleClickBtn, ["stop"])
                             }, {
-                                default: withCtx(() => [
-                                    unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
+                                default: withCtx(() => [unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
                                         key: 0,
                                         component: unref(Reload),
-                                        style: { "line-height": "10px" }
-                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true),
-                                    createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1),
-                                    createVNode(unref(NIcon), { component: unref(ChevronDown) }, null, 8, ["component"])
-                                ]),
+                                        style: {
+                                            "line-height": "10px"
+                                        }
+                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true), createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
+                                        component: unref(ChevronDown)
+                                    }, null, 8, ["component"])]),
                                 _: 1
-                            }, 8, ["onClick"])
-                        ])
-                    ]),
+                            }, 8, ["onClick"])])]),
                     _: 3
-                }, 8, ["show", "options"]),
-                createVNode(script$1, mergeProps({
+                }, 8, ["show", "options"]), createVNode(script$1, mergeProps({
                     modelValue: unref(state).identityVerification.visible,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(state).identityVerification.visible = $event)
-                }, _ctx.$attrs, { onSuccess: verifiySuccess }), null, 16, ["modelValue"])
-            ]);
+                }, _ctx.$attrs, {
+                    onSuccess: verifiySuccess
+                }), null, 16, ["modelValue"])]);
         };
     }
 });

package/es/drag-layout/index.css

@@ -593,6 +593,10 @@ body > .vxe-table--tooltip-wrapper {
   margin-bottom: 8px;
 }
 
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}
+
 .login-form[data-v-06588d4e] {
   padding-top: 15px;
 }

package/es/field-set/index.css

@@ -593,6 +593,10 @@ body > .vxe-table--tooltip-wrapper {
   margin-bottom: 8px;
 }
 
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}
+
 .login-form[data-v-06588d4e] {
   padding-top: 15px;
 }
@@ -732,48 +736,6 @@ body > .vxe-table--tooltip-wrapper {
   z-index: 2001;
 }
 
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
-  width: 100%;
-  margin-bottom: 16px;
-  overflow: hidden;
-  cursor: pointer;
-  color: #2e2e2e;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  width: 100%;
-  height: 60px;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  margin-bottom: 8px;
-  background: #f3f5f8;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
-  width: 85%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer !important;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
-  cursor: pointer !important;
-}
-
 .DragFormRightItem[data-v-2d9603cc] {
   position: relative;
 }
@@ -845,6 +807,48 @@ body > .vxe-table--tooltip-wrapper {
   color: red;
 }
 
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
+  width: 100%;
+  margin-bottom: 16px;
+  overflow: hidden;
+  cursor: pointer;
+  color: #2e2e2e;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  width: 100%;
+  height: 60px;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  margin-bottom: 8px;
+  background: #f3f5f8;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
+  width: 85%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer !important;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
+  cursor: pointer !important;
+}
+
 ul[data-v-726261b7] {
   margin: 0;
   padding: 0;

package/es/grid/index.css

@@ -592,6 +592,10 @@ body > .vxe-table--tooltip-wrapper {
   margin-bottom: 8px;
 }
 
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}
+
 .login-form[data-v-06588d4e] {
   padding-top: 15px;
 }
@@ -731,48 +735,6 @@ body > .vxe-table--tooltip-wrapper {
   z-index: 2001;
 }
 
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
-  width: 100%;
-  margin-bottom: 16px;
-  overflow: hidden;
-  cursor: pointer;
-  color: #2e2e2e;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  width: 100%;
-  height: 60px;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  margin-bottom: 8px;
-  background: #f3f5f8;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
-  width: 85%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer !important;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
-  cursor: pointer !important;
-}
-
 .DragFormRightItem[data-v-2d9603cc] {
   position: relative;
 }
@@ -844,6 +806,48 @@ body > .vxe-table--tooltip-wrapper {
   color: red;
 }
 
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
+  width: 100%;
+  margin-bottom: 16px;
+  overflow: hidden;
+  cursor: pointer;
+  color: #2e2e2e;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  width: 100%;
+  height: 60px;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  margin-bottom: 8px;
+  background: #f3f5f8;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
+  width: 85%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer !important;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
+  cursor: pointer !important;
+}
+
 
 .popver-content {
   height: 400px;

package/es/index.css

@@ -1043,6 +1043,10 @@ ul[data-v-726261b7] {
   margin-bottom: 8px;
 }
 
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}
+
 .df[data-v-3b67e11b] {
   display: -webkit-box;
   display: -webkit-flex;

package/es/index.js

@@ -38481,21 +38481,34 @@ var script$d = defineComponent({
     emits: ["setOptions", "formChange"],
     setup(props, { attrs, slots, emit }) {
         const state = reactive({
-            options: []
+            options: [],
+            loading: false,
+            keyword: "",
+            config: {}
         });
         const setOptions = async () => {
             if (props.col.options) {
                 state.options = JSON.parse(JSON.stringify(props.col.options));
             }
             else {
-                const optionsName = `${props.col.columnName}_options`;
-                state.options = props.row[optionsName] || await props.col.queryOptions();
-                if (!props.row[optionsName]) {
-                    emit("setOptions", state.options);
-                }
+                `${props.col.columnName}_options`;
+                const obj = {
+                    keyword: state.keyword,
+                    row: props.row,
+                    column: props.col,
+                    index: props.index
+                };
+                state.options = await props.col.queryOptions(obj);
+                state.loading = false;
+                emit("setOptions", state.options);
             }
         };
-        setOptions();
+        let selectSearch = (value) => {
+            state.keyword = value;
+            state.loading = true;
+            setOptions();
+        };
+        selectSearch = xeUtils.debounce(selectSearch, 800);
         const onUpdateValue = (value) => {
             emit("formChange", {
                 value,
@@ -38504,14 +38517,25 @@ var script$d = defineComponent({
                 index: props.index
             });
         };
-        console.log(attrs);
-        return () => [createVNode(NSelect, mergeProps(attrs, {
+        const init = () => {
+            if (props.col.options) {
+                setOptions();
+            }
+            else {
+                state.config.remote = true;
+                state.config.onSearch = selectSearch;
+                selectSearch("");
+            }
+        };
+        init();
+        return () => [createVNode(NSelect, mergeProps(attrs, state.config, {
                 "options": state.options,
                 "consistentMenuWidth": false,
                 "clearable": true,
                 "filterable": true,
                 "to": false,
                 "placeholder": "\u8BF7\u9009\u62E9",
+                "loading": state.loading,
                 "onUpdateValue": onUpdateValue
             }), null)];
     }
@@ -39742,7 +39766,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
                 return;
             let currentPageTableData = table.getTableData()?.tableData;
             let currentPageSelectedRows = currentPageTableData.filter((row) => {
-                return currentCheckedKeys.value.includes(row[props.primaryKey]);
+                return row[props.primaryKey] ? currentCheckedKeys.value.includes(row[props.primaryKey]) : false;
             });
             setCurrentCheckedLength();
             if (!currentPageSelectedRows || !currentPageSelectedRows.length) {
@@ -39863,6 +39887,9 @@ var script$8 = /* @__PURE__ */ defineComponent({
                             if (!isEdit || item.columnName === "operatorColumn" || !item.isEdit) {
                                 return formatter(params, item);
                             }
+                            else if (isEdit && item.isEdit && item.checkEditStatus && item.checkEditStatus(params)) {
+                                return formatterEdit(params, item);
+                            }
                             else {
                                 return createVNode("span", null, [getDefaultValue(params, item)]);
                             }
@@ -41613,6 +41640,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
                         iconClose: "iconfont icon-a-xitongtubiaotianjia"
                     },
                     "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
+                    "edit-rules": _ctx.columnConfig.editRules || {},
                     onCellDblclick: rowdblclick,
                     onCellClick: handlerClickRow,
                     onCheckboxChange: selectionChange,
@@ -41663,7 +41691,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
                             }
                         })]),
                     _: 3
-                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
                     class: "refresh",
                     onClick: hanldeClickRefresh
                 }, [createVNode(unref(NIcon), {
@@ -45290,18 +45318,65 @@ const __default__$1 = create({
 var script$2 = /* @__PURE__ */ defineComponent({
     ...__default__$1,
     props: {
-        btnText: { type: String, required: false, default: "\u6253\u5370" },
-        printText: { type: String, required: false, default: "\u76F4\u63A5\u6253\u5370" },
-        previewText: { type: String, required: false, default: "\u6253\u5370\u9884\u89C8" },
-        formatEditText: { type: String, required: false, default: "\u683C\u5F0F\u7F16\u8F91" },
-        identityVerificationTitle: { type: String, required: false, default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C" },
-        params: { type: Array, required: false, default: () => [] },
-        prevFn: { type: Function, required: false, default: () => Promise.resolve() },
-        verifyUser: { type: Function, required: false, default: () => Promise.resolve() },
-        queryPrintFormatByNumber: { type: Function, required: true, default: () => Promise.resolve({}) },
-        queryTemplateParams: { type: Function, required: false, default: () => Promise.resolve({}) },
-        strategy: { type: String, required: false, default: "MULTI" },
-        printParams: { type: Array, required: false }
+        btnText: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370"
+        },
+        printText: {
+            type: String,
+            required: false,
+            default: "\u76F4\u63A5\u6253\u5370"
+        },
+        previewText: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370\u9884\u89C8"
+        },
+        formatEditText: {
+            type: String,
+            required: false,
+            default: "\u683C\u5F0F\u7F16\u8F91"
+        },
+        identityVerificationTitle: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C"
+        },
+        params: {
+            type: Array,
+            required: false,
+            default: () => []
+        },
+        prevFn: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve()
+        },
+        verifyUser: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve()
+        },
+        queryPrintFormatByNumber: {
+            type: Function,
+            required: true,
+            default: () => Promise.resolve({})
+        },
+        queryTemplateParams: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve({})
+        },
+        strategy: {
+            type: String,
+            required: false,
+            default: "MULTI"
+        },
+        printParams: {
+            type: Array,
+            required: false
+        }
     },
     emits: ["success", "error"],
     setup(__props, { emit }) {
@@ -45322,20 +45397,16 @@ var script$2 = /* @__PURE__ */ defineComponent({
             watchPrintParamsReformatFn: null,
             spinTimer: null
         });
-        const options = reactive([
-            {
+        const options = reactive([{
                 label: props.printText,
                 key: "printText"
-            },
-            {
+            }, {
                 label: props.previewText,
                 key: "previewText"
-            },
-            {
+            }, {
                 label: props.formatEditText,
                 key: "formatEditText"
-            }
-        ]);
+            }]);
         const currentFormatItem = computed(() => {
             if (!state.currentFormatId)
                 return {};
@@ -45343,6 +45414,13 @@ var script$2 = /* @__PURE__ */ defineComponent({
             return state.formatList.find((item) => item.id === id);
         });
         const formatTitle = computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+        const renderLabel = (option) => {
+            return createVNode("span", {
+                "class": {
+                    "active": option.key === state.currentFormatId
+                }
+            }, [option.label]);
+        };
         const getTemplateIdByFormatId = (id) => {
             let find = state.formatList.find((item) => item.id === id);
             return find.templateId;
@@ -45472,6 +45550,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
                     break;
                 default:
                     state.currentFormatId = key;
+                    state.visible = false;
                     break;
             }
         };
@@ -45645,48 +45724,51 @@ var script$2 = /* @__PURE__ */ defineComponent({
             if (!val?.length)
                 return false;
             reformatPrintParams();
-        }, { deep: true });
+        }, {
+            deep: true
+        });
         return (_ctx, _cache) => {
-            return openBlock(), createElementBlock("span", { onClick: handleClickWrap }, [
-                createVNode(unref(NDropdown), {
+            return openBlock(), createElementBlock("span", {
+                onClick: handleClickWrap
+            }, [createVNode(unref(NDropdown), {
+                    class: "rowFoldHideBtnList-dropdown",
                     placement: "bottom-start",
                     show: unref(state).visible,
                     onClickoutside: handleClickOutside,
                     options: unref(options),
-                    onSelect: handleSelect
+                    onSelect: handleSelect,
+                    "render-label": renderLabel
                 }, {
-                    default: withCtx(() => [
-                        renderSlot(_ctx.$slots, "button", {
+                    default: withCtx(() => [renderSlot(_ctx.$slots, "button", {
                             handleClickPrintBtn: handleClickBtn,
                             printSpinning: unref(state).spinning,
                             printbtnText: __props.btnText,
                             printVisible: unref(state).visible
-                        }, () => [
-                            createVNode(unref(NButton), {
+                        }, () => [createVNode(unref(NButton), {
                                 class: "dropdown-button",
-                                style: { "margin": "0 8px 8px 0" },
+                                style: {
+                                    "margin": "0 8px 8px 0"
+                                },
                                 onClick: withModifiers(handleClickBtn, ["stop"])
                             }, {
-                                default: withCtx(() => [
-                                    unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
+                                default: withCtx(() => [unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
                                         key: 0,
                                         component: unref(Reload),
-                                        style: { "line-height": "10px" }
-                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true),
-                                    createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1),
-                                    createVNode(unref(NIcon), { component: unref(ChevronDown) }, null, 8, ["component"])
-                                ]),
+                                        style: {
+                                            "line-height": "10px"
+                                        }
+                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true), createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
+                                        component: unref(ChevronDown)
+                                    }, null, 8, ["component"])]),
                                 _: 1
-                            }, 8, ["onClick"])
-                        ])
-                    ]),
+                            }, 8, ["onClick"])])]),
                     _: 3
-                }, 8, ["show", "options"]),
-                createVNode(script$3, mergeProps({
+                }, 8, ["show", "options"]), createVNode(script$3, mergeProps({
                     modelValue: unref(state).identityVerification.visible,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(state).identityVerification.visible = $event)
-                }, _ctx.$attrs, { onSuccess: verifiySuccess }), null, 16, ["modelValue"])
-            ]);
+                }, _ctx.$attrs, {
+                    onSuccess: verifiySuccess
+                }), null, 16, ["modelValue"])]);
         };
     }
 });

package/es/select-person/index.css

@@ -593,6 +593,10 @@ body > .vxe-table--tooltip-wrapper {
   margin-bottom: 8px;
 }
 
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}
+
 .login-form[data-v-06588d4e] {
   padding-top: 15px;
 }
@@ -732,48 +736,6 @@ body > .vxe-table--tooltip-wrapper {
   z-index: 2001;
 }
 
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
-  width: 100%;
-  margin-bottom: 16px;
-  overflow: hidden;
-  cursor: pointer;
-  color: #2e2e2e;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  width: 100%;
-  height: 60px;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  margin-bottom: 8px;
-  background: #f3f5f8;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
-  width: 85%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer !important;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
-  cursor: pointer !important;
-}
-
 .DragFormRightItem[data-v-2d9603cc] {
   position: relative;
 }
@@ -845,6 +807,48 @@ body > .vxe-table--tooltip-wrapper {
   color: red;
 }
 
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
+  width: 100%;
+  margin-bottom: 16px;
+  overflow: hidden;
+  cursor: pointer;
+  color: #2e2e2e;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  width: 100%;
+  height: 60px;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  margin-bottom: 8px;
+  background: #f3f5f8;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
+  width: 85%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer !important;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
+  cursor: pointer !important;
+}
+
 
 .popver-content {
   height: 400px;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "es/index.js",
   "module": "es/index.js",
   "scripts": {

package/packages/big-table/src/BigTable.vue

@@ -97,6 +97,7 @@
         iconClose: 'iconfont icon-a-xitongtubiaotianjia',
       }"
       :keyboard-config="columnConfig.keyboardConfig || {}"
+      :edit-rules="columnConfig.editRules || {}"
       @cell-dblclick="rowdblclick"
       @cell-click="handlerClickRow"
       @checkbox-change="selectionChange"
@@ -475,7 +476,7 @@ const setCurrentPageRowChecked = () => {
   if (!table) return;
   let currentPageTableData = table.getTableData()?.tableData;
   let currentPageSelectedRows = currentPageTableData.filter((row: any) => {
-    return currentCheckedKeys.value.includes(row[props.primaryKey]);
+    return (row[props.primaryKey] ? currentCheckedKeys.value.includes(row[props.primaryKey]) : false)
   });
   setCurrentCheckedLength();
   if (!currentPageSelectedRows || !currentPageSelectedRows.length) {
@@ -655,6 +656,8 @@ const formatColumns = (map: any) => {
         default: (params: any) => {
           if(!isEdit || item.columnName === 'operatorColumn' || !item.isEdit) {
             return formatter(params, item)
+          } else if (isEdit && item.isEdit && item.checkEditStatus && item.checkEditStatus(params)) {
+            return formatterEdit(params, item)
           } else {
             return <span>{getDefaultValue(params, item)}</span>
           }

package/packages/big-table/src/components/edit-form/edit-select.vue

@@ -1,6 +1,7 @@
 <script lang="tsx">
 import { defineComponent, ref, reactive } from 'vue'
 import { NSelect } from 'naive-ui'
+import vexutils from '@/utils/vexutils.js'
 
 export default defineComponent({
   name: 'EditSelect',
@@ -26,8 +27,12 @@ export default defineComponent({
   setup (props, { attrs, slots, emit }) {
     
     const state = reactive({
-      options: [] as any
+      options: [] as any,
+      loading: false,
+      keyword: '',
+      config: {} as any
     })
+
     const setOptions = async () => {
       if (props.col.options) {
         state.options = JSON.parse(JSON.stringify(props.col.options))
@@ -35,29 +40,53 @@ export default defineComponent({
         // 此处需要缓存第一次请求到的options,不需要每次都请求,
         // 此处的row参数应当是selectTable的row
         const optionsName = `${props.col.columnName}_options`
-        state.options = props.row[optionsName] || await props.col.queryOptions()
-        if (!props.row[optionsName]) {
-          emit('setOptions', state.options)
+        const obj = {
+          keyword: state.keyword,
+          row: props.row, 
+          column: props.col, 
+          index: props.index
         }
+        // state.options = props.row[optionsName] || await props.col.queryOptions(obj)
+        state.options = await props.col.queryOptions(obj)
+        state.loading = false
+        // if (!props.row[optionsName]) {
+          emit('setOptions', state.options)
+        // }
       }
     }
-
-    setOptions()
-
+    
+    let selectSearch = (value: string) => {
+      state.keyword = value
+      state.loading = true
+      setOptions()
+    }
+    selectSearch = vexutils.debounce(selectSearch, 800)
     const onUpdateValue = (value: any[] | string | number | null) => {
       emit('formChange', { value, row: props.row, column: props.col, index: props.index })
     }
 
-    console.log(attrs) 
+    const init = () => {
+      if (props.col.options) {
+        setOptions()
+      } else {
+        state.config.remote = true
+        state.config.onSearch = selectSearch
+        // 初始化搜索
+        selectSearch('')    
+      }
+    }
+    init()
     return () => [
       <NSelect
         {...attrs} 
+        {...state.config}
         options={state.options}
         consistentMenuWidth={false}
         clearable
         filterable
         to={false}
         placeholder="请选择"
+        loading={state.loading}
         onUpdateValue={onUpdateValue}
       />
     ]

package/packages/button-print/src/ButtonPrint.vue

@@ -1,11 +1,13 @@
 <template>
   <span @click="handleClickWrap">
     <NDropdown
+      class="rowFoldHideBtnList-dropdown"
       placement="bottom-start"
       :show="state.visible"
       @clickoutside="handleClickOutside"
       :options="options"
       @select="handleSelect"
+      :render-label="renderLabel"
     >
       <slot
         name="button" 
@@ -30,14 +32,14 @@
   </span>
 </template>
 
-<script lang="ts">
+<script lang="tsx">
 import create from '@/core/create.js';
 export default create({
   name: "ButtonPrint"
 })
 </script>
 
-<script setup lang="ts">
+<script setup lang="tsx">
 import { ref, reactive, computed, watch, onMounted, nextTick } from 'vue'
 import { NDropdown, NButton, NIcon } from 'naive-ui'
 import { ChevronDown, Reload } from "@vicons/ionicons5";
@@ -117,6 +119,9 @@ const currentFormatItem = computed(() => {
 })
 const formatTitle = computed(() => (currentFormatItem.value as any).name || '格式选择')
 
+const renderLabel = (option: DropdownOption) => {
+  return <span class={{'active': option.key === state.currentFormatId}}>{option.label}</span>
+}
 const getTemplateIdByFormatId = (id: string | number) => {
   let find: any = state.formatList.find((item: any) => item.id === id);
   return find.templateId;
@@ -266,6 +271,7 @@ const handleSelect = (key: string) => {
       break;
     default:
       state.currentFormatId = key;
+      state.visible = false
       break;
   }
 }
@@ -393,7 +399,6 @@ const initCRM = async (formatListResult: any) => {
   } else {
     return requestError();
   }
-
   state.printParams = formatParams(state.templateParams, props.params);
 }
 const init = async () => {
@@ -474,3 +479,10 @@ watch(() => props.params,
   margin-bottom: 8px;
 }
 </style>
+<style lang="less">
+  .rowFoldHideBtnList-dropdown {
+    .n-dropdown-menu-wrapper span.active {
+      color: #5585f5;
+    }
+  }
+</style>