3h1-ui 2.14.4 → 2.14.6

package/es/index.js

@@ -6,7 +6,7 @@ import { zxcvbn } from "@zxcvbn-ts/core";
 import Iconify from "@purge-icons/generated";
 import Sortablejs from "sortablejs";
 import "xe-utils";
-import { VxeTable, VxeColumn, VxeColgroup } from "vxe-table";
+import { VxeTable, VxeColumn } from "vxe-table";
 const windiBase = "";
 const windiComponents = "";
 const windiUtilities = "";
@@ -4604,7 +4604,7 @@ const _sfc_main$1a = defineComponent({
     };
   }
 });
-const StrengthMeter_vue_vue_type_style_index_0_scoped_c3da4a85_lang = "";
+const StrengthMeter_vue_vue_type_style_index_0_scoped_eda28c94_lang = "";
 const _hoisted_1$u = ["data-score"];
 function _sfc_render$J(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_InputPassword = resolveComponent("InputPassword");
@@ -4636,7 +4636,7 @@ function _sfc_render$J(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ], 2);
 }
-const StrengthMeter = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["render", _sfc_render$J], ["__scopeId", "data-v-c3da4a85"]]);
+const StrengthMeter = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["render", _sfc_render$J], ["__scopeId", "data-v-eda28c94"]]);
 const _sfc_main$19 = defineComponent({
   name: "SvgIcon",
   props: {
@@ -4672,7 +4672,7 @@ const _sfc_main$19 = defineComponent({
     return { symbolId, prefixCls: prefixCls2, getStyle };
   }
 });
-const SvgIcon_vue_vue_type_style_index_0_scoped_905fa4a6_lang = "";
+const SvgIcon_vue_vue_type_style_index_0_scoped_fa64fe87_lang = "";
 const _hoisted_1$t = ["xlink:href"];
 function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", {
@@ -4683,7 +4683,7 @@ function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) {
     createElementVNode("use", { "xlink:href": _ctx.symbolId }, null, 8, _hoisted_1$t)
   ], 6);
 }
-const SvgIcon = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$I], ["__scopeId", "data-v-905fa4a6"]]);
+const SvgIcon = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$I], ["__scopeId", "data-v-fa64fe87"]]);
 const SVG_END_WITH_FLAG = "|svg";
 const _sfc_main$18 = defineComponent({
   name: "Icon",
@@ -4979,8 +4979,8 @@ const _sfc_main$16 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicArrow_vue_vue_type_style_index_0_scoped_fea26917_lang = "";
-const BasicArrow = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["__scopeId", "data-v-fea26917"]]);
+const BasicArrow_vue_vue_type_style_index_0_scoped_03d87956_lang = "";
+const BasicArrow = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["__scopeId", "data-v-03d87956"]]);
 const props$c = {
   /**
    * Help text max-width
@@ -5122,8 +5122,8 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicTitle_vue_vue_type_style_index_0_scoped_59bc8f76_lang = "";
-const BasicTitle$1 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-59bc8f76"]]);
+const BasicTitle_vue_vue_type_style_index_0_scoped_c007dbdf_lang = "";
+const BasicTitle$1 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-c007dbdf"]]);
 const props$b = {
   prefixCls: { type: String },
   helpMessage: {
@@ -7065,11 +7065,11 @@ const _hoisted_5$3 = {
   key: 0,
   class: "flex py-2 items-center justify-center"
 };
-const _hoisted_6$2 = {
+const _hoisted_6$1 = {
   key: 1,
   class: "p-5"
 };
-const _hoisted_7$2 = {
+const _hoisted_7$1 = {
   key: 0,
   class: "cursor-pointer px-2 py-1 flex items-center"
 };
@@ -7207,12 +7207,12 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
                     onChange: handlePageChange
                   }, null, 8, ["pageSize", "total"])
                 ])) : createCommentVNode("", true)
-              ])) : (openBlock(), createElementBlock("div", _hoisted_6$2, [
+              ])) : (openBlock(), createElementBlock("div", _hoisted_6$1, [
                 createVNode(unref(AEmpty))
               ]))
             ]),
             default: withCtx(() => [
-              isSvgMode && currentSelect.value ? (openBlock(), createElementBlock("span", _hoisted_7$2, [
+              isSvgMode && currentSelect.value ? (openBlock(), createElementBlock("span", _hoisted_7$1, [
                 createVNode(SvgIcon, { name: currentSelect.value }, null, 8, ["name"])
               ])) : (openBlock(), createBlock(Icon2, {
                 key: 1,
@@ -7528,8 +7528,8 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_7465b460_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["__scopeId", "data-v-7465b460"]]);
+const Table_vue_vue_type_style_index_0_scoped_dcb554fb_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["__scopeId", "data-v-dcb554fb"]]);
 const componentMap$2 = /* @__PURE__ */ new Map();
 componentMap$2.set("Input", Input);
 componentMap$2.set("InputGroup", Input.Group);
@@ -9693,8 +9693,8 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicTitle_vue_vue_type_style_index_0_scoped_fdc837af_lang = "";
-const BasicTitle = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-fdc837af"]]);
+const BasicTitle_vue_vue_type_style_index_0_scoped_a48f9d86_lang = "";
+const BasicTitle = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-a48f9d86"]]);
 const _sfc_main$M = defineComponent({
   name: "BasicModalHeader",
   components: { BasicTitle },
@@ -10912,8 +10912,8 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TreeHeader_vue_vue_type_style_index_0_scoped_6d3f2554_lang = "";
-const TreeHeader = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-6d3f2554"]]);
+const TreeHeader_vue_vue_type_style_index_0_scoped_a0f20f9d_lang = "";
+const TreeHeader = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-a0f20f9d"]]);
 process.env.NODE_ENV !== "production" ? Object.freeze({}) : {};
 process.env.NODE_ENV !== "production" ? Object.freeze([]) : [];
 const isString = (val) => typeof val === "string";
@@ -11802,7 +11802,7 @@ const _sfc_main$F = defineComponent({
     return { prefixCls: prefixCls2, getCalcContentWidth };
   }
 });
-const PageFooter_vue_vue_type_style_index_0_scoped_44a47dbd_lang = "";
+const PageFooter_vue_vue_type_style_index_0_scoped_b4695833_lang = "";
 function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(_ctx.prefixCls),
@@ -11821,7 +11821,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ], 6);
 }
-const PageFooter = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_render$r], ["__scopeId", "data-v-44a47dbd"]]);
+const PageFooter = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_render$r], ["__scopeId", "data-v-b4695833"]]);
 const _sfc_main$E = defineComponent({
   name: "PageWrapper",
   components: { PageFooter, PageHeader },
@@ -12368,6 +12368,9 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
     clickOutside: ClickOutside
   },
   props: {
+    zzz: {
+      type: Object
+    },
     value: {
       type: [String, Number, Boolean, Object],
       default: ""
@@ -12428,8 +12431,6 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
           index: index2
         }) ?? {};
       }
-      compProps.onChangeTemp = compProps.onChange;
-      delete compProps.onChange;
       const component = unref(getComponent);
       const apiSelectProps = {};
       if (component === "ApiSelect") {
@@ -12437,7 +12438,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       }
       upEditDynamicDisabled(record, column, value);
       return {
-        // showCount: true,
+        showCount: true,
         maxlength: 100,
         size: "small",
         getPopupContainer: () => unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body,
@@ -12552,7 +12553,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       } else if (isString$3(e) || isBoolean(e) || isNumber$2(e) || isArray$3(e)) {
         currentValueRef.value = e;
       }
-      const onChange = (_a2 = unref(getComponentProps)) == null ? void 0 : _a2.onChangeTemp;
+      const onChange = (_a2 = unref(getComponentProps)) == null ? void 0 : _a2.onChange;
       if (onChange && isFunction$4(onChange))
         onChange(...arguments);
       (_b = table2.emit) == null ? void 0 : _b.call(table2, "edit-change", {
@@ -12560,9 +12561,9 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
         value: unref(currentValueRef),
         record: toRaw(props2.record)
       });
-      handleSubmitRule();
+      handleSubmiRule();
     }
-    async function handleSubmitRule() {
+    async function handleSubmiRule() {
       const {
         column,
         record
@@ -12580,7 +12581,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
         }
         if (isFunction$4(editRule)) {
           const res = await editRule(currentValue, record);
-          if (res) {
+          if (!!res) {
             ruleMessage.value = res;
             ruleVisible.value = true;
             return false;
@@ -12596,7 +12597,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
     async function handleSubmit(needEmit = true, valid = true) {
       var _a2;
       if (valid) {
-        const isPass = await handleSubmitRule();
+        const isPass = await handleSubmiRule();
         if (!isPass)
           return false;
       }
@@ -12724,31 +12725,34 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
         isArray$3(props2.record[cbs]) ? (_a2 = props2.record[cbs]) == null ? void 0 : _a2.push(handle) : props2.record[cbs] = [handle];
       }
     }
-    if (props2.record) {
-      initCbs("submitCbs", handleSubmit);
-      initCbs("validCbs", handleSubmitRule);
-      initCbs("cancelCbs", handleCancel);
-      if (props2.column.dataIndex) {
-        if (!props2.record.editValueRefs)
-          props2.record.editValueRefs = {};
-        props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
-      }
-      props2.record.onCancelEdit = () => {
-        var _a2, _b;
-        isArray$3((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
-      };
-      props2.record.onSubmitEdit = async () => {
-        var _a2, _b, _c, _d, _e;
-        if (isArray$3((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
-          if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
-            return;
-          const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
-          submitFns.forEach((fn) => fn(false, false));
-          (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
-          return true;
+    const editHandler = () => {
+      if (props2.record) {
+        initCbs("submitCbs", handleSubmit);
+        initCbs("validCbs", handleSubmiRule);
+        initCbs("cancelCbs", handleCancel);
+        if (props2.column.dataIndex) {
+          if (!props2.record.editValueRefs)
+            props2.record.editValueRefs = {};
+          props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
         }
-      };
-    }
+        props2.record.onCancelEdit = () => {
+          var _a2, _b;
+          isArray$3((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
+        };
+        props2.record.onSubmitEdit = async () => {
+          var _a2, _b, _c, _d, _e;
+          if (isArray$3((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
+            if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
+              return;
+            const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
+            submitFns.forEach((fn) => fn(false, false));
+            (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
+            return true;
+          }
+        };
+      }
+    };
+    editHandler();
     return {
       isEdit,
       prefixCls: prefixCls2,
@@ -12771,7 +12775,8 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       getValues,
       handleEnter,
       handleSubmitClick,
-      spinning
+      spinning,
+      editHandler
     };
   },
   render() {
@@ -12791,7 +12796,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       record: this.record,
       column: this.column,
       index: this.index
-    }) : this.getValues ?? " "]), !this.column.editRow && createVNode(FormOutlined$1, {
+    }) : this.getValues ? this.getValues : " "]), !this.column.editRow && createVNode(FormOutlined$1, {
       "class": `${this.prefixCls}__normal-icon`
     }, null)]), [[vShow, !this.isEdit]]), this.isEdit && createVNode(Spin, {
       "spinning": this.spinning
@@ -12822,13 +12827,10 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
   }
 });
 const EditableCell_vue_vue_type_style_index_0_lang = "";
-let rowIndex = 0;
-function isNeedRefresh() {
-  rowIndex++;
-}
 function renderEditCell(column) {
   return ({ text: value, record, index: index2 }) => {
-    toRaw(record).onValid = async () => {
+    const editableCellRef = ref();
+    record.onValid = async () => {
       if (isArray$3(record == null ? void 0 : record.validCbs)) {
         const validFns = ((record == null ? void 0 : record.validCbs) || []).map((fn) => fn());
         const res = await Promise.all(validFns);
@@ -12837,15 +12839,16 @@ function renderEditCell(column) {
         return false;
       }
     };
-    toRaw(record).onEdit = async (edit, submit = false) => {
-      var _a2, _b;
+    record.onEdit = async (edit, submit = false) => {
+      var _a2, _b, _c;
+      (_a2 = editableCellRef.value) == null ? void 0 : _a2.editHandler();
       if (!submit) {
         record.editable = edit;
       }
       if (!edit && submit) {
         if (!await record.onValid())
           return false;
-        const res = await ((_a2 = record.onSubmitEdit) == null ? void 0 : _a2.call(record));
+        const res = await ((_b = record.onSubmitEdit) == null ? void 0 : _b.call(record));
         if (res) {
           record.editable = false;
           return true;
@@ -12853,16 +12856,16 @@ function renderEditCell(column) {
         return false;
       }
       if (!edit && !submit) {
-        (_b = record.onCancelEdit) == null ? void 0 : _b.call(record);
+        (_c = record.onCancelEdit) == null ? void 0 : _c.call(record);
       }
       return true;
     };
     return h(_sfc_main$B, {
+      ref: editableCellRef,
       value,
       record,
       column,
-      index: index2,
-      key: rowIndex
+      index: index2
     });
   };
 }
@@ -13784,7 +13787,6 @@ function useCustomRow(propsRef, {
   emit
 }) {
   const customRow = (record, index2) => {
-    isNeedRefresh();
     return {
       onClick: (e) => {
         e == null ? void 0 : e.stopPropagation();
@@ -14383,8 +14385,8 @@ const _sfc_main$w = defineComponent({
     return { isVisibleAdvancedSearch, handleIconClick };
   }
 });
-const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_f74ee46a_lang = "";
-const _withScopeId$1 = (n) => (pushScopeId("data-v-f74ee46a"), n = n(), popScopeId(), n);
+const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_c5892da8_lang = "";
+const _withScopeId$1 = (n) => (pushScopeId("data-v-c5892da8"), n = n(), popScopeId(), n);
 const _hoisted_1$j = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", null, "高级搜索", -1));
 function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FilterOutlined = resolveComponent("FilterOutlined");
@@ -14402,7 +14404,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["render", _sfc_render$l], ["__scopeId", "data-v-f74ee46a"]]);
+const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["render", _sfc_render$l], ["__scopeId", "data-v-c5892da8"]]);
 const index$2 = "";
 const searchType = [
   {
@@ -14501,13 +14503,13 @@ const _hoisted_5$2 = {
   key: 0,
   class: "shy-ui-advanced-search-item-value-range"
 };
-const _hoisted_6$1 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_7$1 = {
+const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
+const _hoisted_7 = {
   key: 1,
   style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
   class: "shy-ui-advanced-minus-icon"
 };
-const _hoisted_8$1 = ["onClick"];
+const _hoisted_8 = ["onClick"];
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "AdvancedSearch",
   props: {
@@ -14760,7 +14762,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                   ]),
                                   _: 2
                                 }, 1024),
-                                _hoisted_6$1,
+                                _hoisted_6,
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(DatePicker), {
@@ -14809,12 +14811,12 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                           ]),
                           _: 2
                         }, 1024)) : createCommentVNode("", true),
-                        (schemasCurrent == null ? void 0 : schemasCurrent.length) !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7$1, [
+                        (schemasCurrent == null ? void 0 : schemasCurrent.length) !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7, [
                           createElementVNode("div", {
                             style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
                             class: "shy-basic-minus-icon",
                             onClick: ($event) => handleMinus(index2)
-                          }, null, 8, _hoisted_8$1),
+                          }, null, 8, _hoisted_8),
                           createVNode(unref(MinusCircleTwoTone$1), { class: "shy-ui-advanced-minus-icon" })
                         ])) : createCommentVNode("", true)
                       ])
@@ -15742,8 +15744,8 @@ const _sfc_main$p = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_d97ebae4_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-d97ebae4"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_7ebad8bb_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-7ebad8bb"), n = n(), popScopeId(), n);
 const _hoisted_1$e = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -15801,7 +15803,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$g], ["__scopeId", "data-v-d97ebae4"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$g], ["__scopeId", "data-v-7ebad8bb"]]);
 const _sfc_main$o = defineComponent({
   components: {
     TableAdvancedSearch,
@@ -16578,7 +16580,7 @@ const _sfc_main$k = defineComponent({
   setup() {
   }
 });
-const TableDict_vue_vue_type_style_index_0_scoped_b15bfa99_lang = "";
+const TableDict_vue_vue_type_style_index_0_scoped_1ab38c8b_lang = "";
 function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   var _a2;
   const _component_Icon = resolveComponent("Icon");
@@ -16607,7 +16609,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
     ]), 1032, ["color"])
   ]);
 }
-const TableDict = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$d], ["__scopeId", "data-v-b15bfa99"]]);
+const TableDict = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$d], ["__scopeId", "data-v-1ab38c8b"]]);
 const index$1 = "";
 var RoleEnum = /* @__PURE__ */ ((RoleEnum2) => {
   RoleEnum2["SUPER"] = "super";
@@ -16651,53 +16653,42 @@ function useTable(tableProps) {
   }
   const methods2 = {
     reload: async (opt) => {
-      var _a2;
-      return await ((_a2 = getTableInstance()) == null ? void 0 : _a2.reload(opt));
+      return await getTableInstance().reload(opt);
     },
     setProps: (props2) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.setProps(props2);
+      getTableInstance().setProps(props2);
     },
     redoHeight: () => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.redoHeight();
+      getTableInstance().redoHeight();
     },
     setSelectedRows: (rows) => {
-      var _a2;
-      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.setSelectedRows(rows));
+      return toRaw(getTableInstance().setSelectedRows(rows));
     },
     setLoading: (loading) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.setLoading(loading);
+      getTableInstance().setLoading(loading);
     },
     getDataSource: () => {
       var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.getDataSource();
+      return ((_a2 = getTableInstance()) == null ? void 0 : _a2.getDataSource()) || false;
     },
     getRawDataSource: () => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.getRawDataSource();
+      return getTableInstance().getRawDataSource();
     },
     getColumns: ({ ignoreIndex = false } = {}) => {
-      var _a2;
-      const columns = ((_a2 = getTableInstance()) == null ? void 0 : _a2.getColumns({ ignoreIndex })) || [];
+      const columns = getTableInstance().getColumns({ ignoreIndex }) || [];
       return toRaw(columns);
     },
     setColumns: (columns) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.setColumns(columns);
+      getTableInstance().setColumns(columns);
     },
     setTableData: (values) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.setTableData(values);
+      return getTableInstance().setTableData(values);
     },
     setPagination: (info) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.setPagination(info);
+      return getTableInstance().setPagination(info);
     },
     deleteSelectRowByKey: (key2) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.deleteSelectRowByKey(key2);
+      getTableInstance().deleteSelectRowByKey(key2);
     },
     getSelectRowKeys: () => {
       var _a2;
@@ -16708,75 +16699,58 @@ function useTable(tableProps) {
       return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getSelectRows());
     },
     clearSelectedRowKeys: () => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.clearSelectedRowKeys();
+      getTableInstance().clearSelectedRowKeys();
     },
     setSelectedRowKeys: (keys2) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.setSelectedRowKeys(keys2);
+      getTableInstance().setSelectedRowKeys(keys2);
     },
     getPaginationRef: () => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.getPaginationRef();
+      return getTableInstance().getPaginationRef();
     },
     getSize: () => {
-      var _a2;
-      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getSize());
+      return toRaw(getTableInstance().getSize());
     },
     updateTableData: (index2, key2, value) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.updateTableData(index2, key2, value);
+      return getTableInstance().updateTableData(index2, key2, value);
     },
     deleteTableDataRecord: (rowKey) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.deleteTableDataRecord(rowKey);
+      return getTableInstance().deleteTableDataRecord(rowKey);
     },
     insertTableDataRecord: (record, index2) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.insertTableDataRecord(record, index2);
+      return getTableInstance().insertTableDataRecord(record, index2);
     },
     updateTableDataRecord: (rowKey, record) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.updateTableDataRecord(rowKey, record);
+      return getTableInstance().updateTableDataRecord(rowKey, record);
     },
     findTableDataRecord: (rowKey) => {
-      var _a2;
-      return (_a2 = getTableInstance()) == null ? void 0 : _a2.findTableDataRecord(rowKey);
+      return getTableInstance().findTableDataRecord(rowKey);
     },
     getRowSelection: () => {
-      var _a2;
-      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getRowSelection());
+      return toRaw(getTableInstance().getRowSelection());
     },
     getCacheColumns: () => {
-      var _a2;
-      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getCacheColumns());
+      return toRaw(getTableInstance().getCacheColumns());
     },
     getForm: () => {
       return unref(formRef);
     },
     setShowPagination: async (show) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.setShowPagination(show);
+      getTableInstance().setShowPagination(show);
     },
     getShowPagination: () => {
-      var _a2;
-      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getShowPagination());
+      return toRaw(getTableInstance().getShowPagination());
     },
     expandAll: () => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.expandAll();
+      getTableInstance().expandAll();
     },
     expandRows: (keys2) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.expandRows(keys2);
+      getTableInstance().expandRows(keys2);
     },
     collapseAll: () => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.collapseAll();
+      getTableInstance().collapseAll();
     },
     scrollTo: (pos) => {
-      var _a2;
-      (_a2 = getTableInstance()) == null ? void 0 : _a2.scrollTo(pos);
+      getTableInstance().scrollTo(pos);
     }
   };
   return [register, methods2];
@@ -16883,8 +16857,8 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Modal_vue_vue_type_style_index_0_scoped_4dc415ac_lang = "";
-const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-4dc415ac"]]);
+const Modal_vue_vue_type_style_index_0_scoped_24f758b3_lang = "";
+const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-24f758b3"]]);
 const _hoisted_1$9 = { class: "api-modal-select" };
 const _sfc_main$h = /* @__PURE__ */ defineComponent({
   __name: "ApiModalSelect",
@@ -17031,8 +17005,8 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ApiModalSelect_vue_vue_type_style_index_0_scoped_fb4fe18d_lang = "";
-const ApiModalSelect = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-fb4fe18d"]]);
+const ApiModalSelect_vue_vue_type_style_index_0_scoped_5427533c_lang = "";
+const ApiModalSelect = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-5427533c"]]);
 const Description$1 = "";
 const basicColProps = 24;
 const basicProps$2 = {
@@ -20946,7 +20920,7 @@ const _sfc_main$b = defineComponent({
     };
   }
 });
-const CropperAvatar_vue_vue_type_style_index_0_scoped_763b4191_lang = "";
+const CropperAvatar_vue_vue_type_style_index_0_scoped_d163dca1_lang = "";
 const _hoisted_1$5 = ["src"];
 function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Icon = resolveComponent("Icon");
@@ -20996,7 +20970,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["onRegister", "onUploadSuccess", "uploadApi", "src"])
   ], 6);
 }
-const CropperAvatar = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["render", _sfc_render$7], ["__scopeId", "data-v-763b4191"]]);
+const CropperAvatar = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["render", _sfc_render$7], ["__scopeId", "data-v-d163dca1"]]);
 const props = {
   startVal: { type: Number, default: 0 },
   endVal: { type: Number, default: 2021 },
@@ -21167,7 +21141,7 @@ const _sfc_main$8 = defineComponent({
     }
   }
 });
-const Loading_vue_vue_type_style_index_0_scoped_ee545744_lang = "";
+const Loading_vue_vue_type_style_index_0_scoped_33b23b82_lang = "";
 function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Spin = resolveComponent("Spin");
   return withDirectives((openBlock(), createElementBlock("section", {
@@ -21183,7 +21157,7 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, _ctx.loading]
   ]);
 }
-const Loading = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$5], ["__scopeId", "data-v-ee545744"]]);
+const Loading = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$5], ["__scopeId", "data-v-33b23b82"]]);
 function createLoading(props2, target, wait = false) {
   let vm = null;
   const data = reactive({
@@ -21407,14 +21381,13 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit }) {
     const props2 = __props;
     const getActions = computed(() => {
-      var _a2;
       return [
         {
           label: "编辑",
           onClick: () => {
             emit("updateStatusEdit", true);
           },
-          ifShow: ((_a2 = props2 == null ? void 0 : props2.row) == null ? void 0 : _a2._isEdit) === false
+          ifShow: props2.row._isEdit === false
         },
         {
           label: "删除",
@@ -22012,14 +21985,7 @@ const TableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_r
 const useColumns = (getProps, tableRef) => {
   const getColumnsRef = computed(() => {
     return getProps.value.columns.map((column) => {
-      if (column == null ? void 0 : column.children) {
-        column.children = column.children.map((item) => {
-          return deepMergeObjects(basicColumn, item);
-        });
-        return column;
-      } else {
-        return deepMergeObjects(basicColumn, column);
-      }
+      return deepMergeObjects(basicColumn, column);
     });
   });
   const getColumns = () => {
@@ -22124,11 +22090,7 @@ const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 1 };
 const _hoisted_3 = { key: 2 };
 const _hoisted_4 = { style: { "display": "flex", "justify-content": "space-between" } };
-const _hoisted_5 = { key: 0 };
-const _hoisted_6 = { key: 1 };
-const _hoisted_7 = { key: 2 };
-const _hoisted_8 = { style: { "display": "flex", "justify-content": "space-between" } };
-const _hoisted_9 = { class: "flex items-center" };
+const _hoisted_5 = { class: "flex items-center" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "TablePlus",
   props: {
@@ -22311,6 +22273,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return tableRef.value;
     };
     const setSelectRowByKeys = (keys2, checked) => {
+      tableRef.value.getTableData();
       const rows = [];
       keys2.forEach((key2) => {
         const row = tableRef.value.getRowById(key2);
@@ -22326,9 +22289,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       resetColumn,
       refreshColumn
     } = useColumns(getProps, tableRef);
-    watchEffect(() => {
-      console.log("getColumnsRef", getColumnsRef.value);
-    });
     const tableAction = {
       reload,
       setTableData,
@@ -22436,121 +22396,56 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   align: "center",
                   title: "序号"
                 }, unref(getProps).columnSeq), null, 16)) : createCommentVNode("", true),
-                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getColumnsRef), (column) => {
-                  return openBlock(), createElementBlock(Fragment, {
-                    key: column.field
-                  }, [
-                    (column == null ? void 0 : column.groupName) ? (openBlock(), createBlock(unref(VxeColgroup), {
-                      key: 0,
-                      title: column.groupName
-                    }, {
-                      default: withCtx(() => [
-                        (openBlock(true), createElementBlock(Fragment, null, renderList(column.children, (c) => {
-                          return openBlock(), createBlock(unref(VxeColumn), {
-                            key: c.field,
-                            title: "a",
-                            field: c.field,
-                            "edit-render": (c == null ? void 0 : c.editRender) || void 0
-                          }, {
-                            default: withCtx((config) => [
-                              renderSlot(_ctx.$slots, c.field, normalizeProps(guardReactiveProps(config)), () => {
-                                var _a3, _b2, _c2, _d2;
-                                return [
-                                  config.row._isEdit && (column == null ? void 0 : column.isEdit) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                                    ((_a3 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _a3.component) === "Switch" ? (openBlock(), createBlock(unref(CellComponent), mergeProps({
-                                      key: 0,
-                                      checkedValue: 1,
-                                      unCheckedValue: 0
-                                    }, (c == null ? void 0 : c.editComponentProps) || {}, {
-                                      checked: config.row[c.field],
-                                      "onUpdate:checked": ($event) => config.row[c.field] = $event
-                                    }), null, 16, ["checked", "onUpdate:checked"])) : (openBlock(), createBlock(unref(CellComponent), mergeProps({ key: 1 }, (c == null ? void 0 : c.editComponentProps) || {}, {
-                                      value: config.row[c.field],
-                                      "onUpdate:value": ($event) => config.row[c.field] = $event
-                                    }), null, 16, ["value", "onUpdate:value"]))
-                                  ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                                    (c == null ? void 0 : c.isEdit) && ((_b2 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _b2.component) === "Select" || ((_c2 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _c2.component) === "ApiSelect" ? (openBlock(), createElementBlock("span", _hoisted_1, [
-                                      createVNode(unref(CellComponent), mergeProps((c == null ? void 0 : c.editComponentProps) || {}, {
-                                        value: config.row[c.field],
-                                        "onUpdate:value": ($event) => config.row[c.field] = $event,
-                                        bordered: false,
-                                        showArrow: false,
-                                        open: false,
-                                        popoverVisible: false
-                                      }), null, 16, ["value", "onUpdate:value"])
-                                    ])) : (c == null ? void 0 : c.isEdit) && ((_d2 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _d2.component) === "Switch" ? (openBlock(), createElementBlock("span", _hoisted_2, [
-                                      createElementVNode("span", null, toDisplayString(getSwitchShowText(c, config.row)), 1)
-                                    ])) : (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(config.row[c.field]), 1))
-                                  ], 64))
-                                ];
-                              })
-                            ]),
-                            header: withCtx(() => [
-                              renderSlot(_ctx.$slots, `${c.field}Header`, normalizeProps(guardReactiveProps({ c })), () => [
-                                createElementVNode("div", _hoisted_4, [
-                                  createElementVNode("div", null, toDisplayString(c.title), 1),
-                                  (column == null ? void 0 : column.sortable) ? (openBlock(), createBlock(_sfc_main$1, {
-                                    key: 0,
-                                    onChange: (type) => handleSortChange(column.field, type)
-                                  }, null, 8, ["onChange"])) : createCommentVNode("", true)
-                                ])
-                              ])
-                            ]),
-                            _: 2
-                          }, 1032, ["field", "edit-render"]);
-                        }), 128))
-                      ]),
-                      _: 2
-                    }, 1032, ["title"])) : (openBlock(), createBlock(unref(VxeColumn), mergeProps({ key: 1 }, column, {
-                      "edit-render": (column == null ? void 0 : column.editRender) || void 0
-                    }), {
-                      default: withCtx((config) => [
-                        renderSlot(_ctx.$slots, column.field, normalizeProps(guardReactiveProps(config)), () => {
-                          var _a3, _b2, _c2, _d2;
-                          return [
-                            config.row._isEdit && (column == null ? void 0 : column.isEdit) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                              ((_a3 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _a3.component) === "Switch" ? (openBlock(), createBlock(unref(CellComponent), mergeProps({
-                                key: 0,
-                                checkedValue: 1,
-                                unCheckedValue: 0
-                              }, (column == null ? void 0 : column.editComponentProps) || {}, {
-                                checked: config.row[column.field],
-                                "onUpdate:checked": ($event) => config.row[column.field] = $event
-                              }), null, 16, ["checked", "onUpdate:checked"])) : (openBlock(), createBlock(unref(CellComponent), mergeProps({ key: 1 }, (column == null ? void 0 : column.editComponentProps) || {}, {
-                                value: config.row[column.field],
-                                "onUpdate:value": ($event) => config.row[column.field] = $event
-                              }), null, 16, ["value", "onUpdate:value"]))
-                            ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                              (column == null ? void 0 : column.isEdit) && ((_b2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _b2.component) === "Select" || ((_c2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _c2.component) === "ApiSelect" ? (openBlock(), createElementBlock("span", _hoisted_5, [
-                                createVNode(unref(CellComponent), mergeProps((column == null ? void 0 : column.editComponentProps) || {}, {
-                                  value: config.row[column.field],
-                                  "onUpdate:value": ($event) => config.row[column.field] = $event,
-                                  bordered: false,
-                                  showArrow: false,
-                                  open: false,
-                                  popoverVisible: false
-                                }), null, 16, ["value", "onUpdate:value"])
-                              ])) : (column == null ? void 0 : column.isEdit) && ((_d2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _d2.component) === "Switch" ? (openBlock(), createElementBlock("span", _hoisted_6, [
-                                createElementVNode("span", null, toDisplayString(getSwitchShowText(column, config.row)), 1)
-                              ])) : (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(config.row[column.field]), 1))
-                            ], 64))
-                          ];
-                        })
-                      ]),
-                      header: withCtx(() => [
-                        renderSlot(_ctx.$slots, `${column.field}Header`, normalizeProps(guardReactiveProps({ column })), () => [
-                          createElementVNode("div", _hoisted_8, [
-                            createElementVNode("div", null, toDisplayString(column.title), 1),
-                            (column == null ? void 0 : column.sortable) ? (openBlock(), createBlock(_sfc_main$1, {
+                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getColumnsRef), (column, index2) => {
+                  return openBlock(), createBlock(unref(VxeColumn), mergeProps({ key: index2 }, column, {
+                    "edit-render": (column == null ? void 0 : column.editRender) || void 0
+                  }), {
+                    default: withCtx((config) => [
+                      renderSlot(_ctx.$slots, column.field, normalizeProps(guardReactiveProps(config)), () => {
+                        var _a3, _b2, _c2, _d2;
+                        return [
+                          config.row._isEdit && (column == null ? void 0 : column.isEdit) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                            ((_a3 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _a3.component) === "Switch" ? (openBlock(), createBlock(unref(CellComponent), mergeProps({
                               key: 0,
-                              onChange: (type) => handleSortChange(column.field, type)
-                            }, null, 8, ["onChange"])) : createCommentVNode("", true)
-                          ])
+                              checkedValue: 1,
+                              unCheckedValue: 0
+                            }, (column == null ? void 0 : column.editComponentProps) || {}, {
+                              checked: config.row[column.field],
+                              "onUpdate:checked": ($event) => config.row[column.field] = $event
+                            }), null, 16, ["checked", "onUpdate:checked"])) : (openBlock(), createBlock(unref(CellComponent), mergeProps({ key: 1 }, (column == null ? void 0 : column.editComponentProps) || {}, {
+                              value: config.row[column.field],
+                              "onUpdate:value": ($event) => config.row[column.field] = $event
+                            }), null, 16, ["value", "onUpdate:value"]))
+                          ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                            (column == null ? void 0 : column.isEdit) && ((_b2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _b2.component) === "Select" || ((_c2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _c2.component) === "ApiSelect" ? (openBlock(), createElementBlock("span", _hoisted_1, [
+                              createVNode(unref(CellComponent), mergeProps((column == null ? void 0 : column.editComponentProps) || {}, {
+                                value: config.row[column.field],
+                                "onUpdate:value": ($event) => config.row[column.field] = $event,
+                                bordered: false,
+                                showArrow: false,
+                                open: false,
+                                popoverVisible: false
+                              }), null, 16, ["value", "onUpdate:value"])
+                            ])) : (column == null ? void 0 : column.isEdit) && ((_d2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _d2.component) === "Switch" ? (openBlock(), createElementBlock("span", _hoisted_2, [
+                              createElementVNode("span", null, toDisplayString(getSwitchShowText(column, config.row)), 1)
+                            ])) : (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(config.row[column.field]), 1))
+                          ], 64))
+                        ];
+                      })
+                    ]),
+                    header: withCtx(() => [
+                      renderSlot(_ctx.$slots, `${column.field}Header`, normalizeProps(guardReactiveProps({ column })), () => [
+                        createElementVNode("div", _hoisted_4, [
+                          createElementVNode("div", null, toDisplayString(column.title), 1),
+                          (column == null ? void 0 : column.sortable) ? (openBlock(), createBlock(_sfc_main$1, {
+                            key: 0,
+                            onChange: (type) => handleSortChange(column.field, type)
+                          }, null, 8, ["onChange"])) : createCommentVNode("", true)
                         ])
-                      ]),
-                      _: 2
-                    }, 1040, ["edit-render"]))
-                  ], 64);
+                      ])
+                    ]),
+                    _: 2
+                  }, 1040, ["edit-render"]);
                 }), 128)),
                 unref(getProps).isShowAction ? (openBlock(), createBlock(unref(VxeColumn), mergeProps({
                   key: 3,
@@ -22559,7 +22454,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   align: "center"
                 }, unref(getProps).actionColumn), {
                   default: withCtx((config) => [
-                    createElementVNode("div", _hoisted_9, [
+                    createElementVNode("div", _hoisted_5, [
                       renderSlot(_ctx.$slots, "action", normalizeProps(guardReactiveProps(config)), () => [
                         unref(getProps).isUseDefaultEditAction ? (openBlock(), createBlock(_sfc_main$7, {
                           key: 0,