3h1-ui 3.0.0-next.44 → 3.0.0-next.46

package/es/index.js

@@ -5396,7 +5396,7 @@ const _sfc_main$1F = defineComponent({
     };
   }
 });
-const StrengthMeter_vue_vue_type_style_index_0_scoped_678d40fd_lang = "";
+const StrengthMeter_vue_vue_type_style_index_0_scoped_c8d77eaa_lang = "";
 const _hoisted_1$G = ["data-score"];
 function _sfc_render$X(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_InputPassword = resolveComponent("InputPassword");
@@ -5428,7 +5428,7 @@ function _sfc_render$X(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ], 2);
 }
-const StrengthMeter = /* @__PURE__ */ _export_sfc(_sfc_main$1F, [["render", _sfc_render$X], ["__scopeId", "data-v-678d40fd"]]);
+const StrengthMeter = /* @__PURE__ */ _export_sfc(_sfc_main$1F, [["render", _sfc_render$X], ["__scopeId", "data-v-c8d77eaa"]]);
 const _sfc_main$1E = defineComponent({
   name: "SvgIcon",
   props: {
@@ -5464,7 +5464,7 @@ const _sfc_main$1E = 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$F = ["xlink:href"];
 function _sfc_render$W(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("svg", {
@@ -5475,7 +5475,7 @@ function _sfc_render$W(_ctx, _cache, $props, $setup, $data, $options) {
     createElementVNode("use", { "xlink:href": _ctx.symbolId }, null, 8, _hoisted_1$F)
   ], 6);
 }
-const SvgIcon = /* @__PURE__ */ _export_sfc(_sfc_main$1E, [["render", _sfc_render$W], ["__scopeId", "data-v-905fa4a6"]]);
+const SvgIcon = /* @__PURE__ */ _export_sfc(_sfc_main$1E, [["render", _sfc_render$W], ["__scopeId", "data-v-fa64fe87"]]);
 const SVG_END_WITH_FLAG = "|svg";
 const _sfc_main$1D = defineComponent({
   name: "Icon",
@@ -5786,8 +5786,8 @@ const _sfc_main$1B = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicArrow_vue_vue_type_style_index_0_scoped_fea26917_lang = "";
-const BasicArrow = /* @__PURE__ */ _export_sfc(_sfc_main$1B, [["__scopeId", "data-v-fea26917"]]);
+const BasicArrow_vue_vue_type_style_index_0_scoped_03d87956_lang = "";
+const BasicArrow = /* @__PURE__ */ _export_sfc(_sfc_main$1B, [["__scopeId", "data-v-03d87956"]]);
 const props$c = {
   /**
    * Help text max-width
@@ -5964,8 +5964,8 @@ const _sfc_main$1z = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicTitle_vue_vue_type_style_index_0_scoped_df3764dc_lang = "";
-const Divider = /* @__PURE__ */ _export_sfc(_sfc_main$1z, [["__scopeId", "data-v-df3764dc"]]);
+const BasicTitle_vue_vue_type_style_index_0_scoped_c885e8af_lang = "";
+const Divider = /* @__PURE__ */ _export_sfc(_sfc_main$1z, [["__scopeId", "data-v-c885e8af"]]);
 const props$b = {
   prefixCls: { type: String },
   helpMessage: {
@@ -9550,8 +9550,8 @@ const _sfc_main$1p = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_95018c58_lang = "";
-const Table$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1p, [["__scopeId", "data-v-95018c58"]]);
+const Table_vue_vue_type_style_index_0_scoped_9232fde4_lang = "";
+const Table$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1p, [["__scopeId", "data-v-9232fde4"]]);
 const modal = "";
 const modalProps = {
   visible: { type: Boolean },
@@ -10596,8 +10596,8 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicTitle_vue_vue_type_style_index_0_scoped_fdc837af_lang = "";
-const BasicTitle = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__scopeId", "data-v-fdc837af"]]);
+const BasicTitle_vue_vue_type_style_index_0_scoped_a48f9d86_lang = "";
+const BasicTitle = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__scopeId", "data-v-a48f9d86"]]);
 const _sfc_main$1i = defineComponent({
   name: "BasicModalHeader",
   components: { BasicTitle },
@@ -14623,8 +14623,8 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TreeHeader_vue_vue_type_style_index_0_scoped_14537c01_lang = "";
-const TreeHeader = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-14537c01"]]);
+const TreeHeader_vue_vue_type_style_index_0_scoped_340c1177_lang = "";
+const TreeHeader = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-340c1177"]]);
 process.env.NODE_ENV !== "production" ? Object.freeze({}) : {};
 process.env.NODE_ENV !== "production" ? Object.freeze([]) : [];
 const isString$1 = (val) => typeof val === "string";
@@ -15514,7 +15514,7 @@ const _sfc_main$11 = 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$F(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(_ctx.prefixCls),
@@ -15533,7 +15533,7 @@ function _sfc_render$F(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ], 6);
 }
-const PageFooter = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["render", _sfc_render$F], ["__scopeId", "data-v-44a47dbd"]]);
+const PageFooter = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["render", _sfc_render$F], ["__scopeId", "data-v-b4695833"]]);
 const _sfc_main$10 = defineComponent({
   name: "PageWrapper",
   components: { PageFooter, PageHeader },
@@ -18149,8 +18149,8 @@ const _sfc_main$U = defineComponent({
     return { isVisibleAdvancedSearch, handleIconClick };
   }
 });
-const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_f74ee46a_lang = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-f74ee46a"), n = n(), popScopeId(), n);
+const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_c5892da8_lang = "";
+const _withScopeId$2 = (n) => (pushScopeId("data-v-c5892da8"), n = n(), popScopeId(), n);
 const _hoisted_1$r = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", null, "高级搜索", -1));
 function _sfc_render$z(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FilterOutlined = resolveComponent("FilterOutlined");
@@ -18168,7 +18168,7 @@ function _sfc_render$z(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["render", _sfc_render$z], ["__scopeId", "data-v-f74ee46a"]]);
+const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["render", _sfc_render$z], ["__scopeId", "data-v-c5892da8"]]);
 const index$4 = "";
 const searchType = [
   {
@@ -19541,8 +19541,8 @@ const _sfc_main$N = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_90331d26_lang = "";
-const _withScopeId$1 = (n) => (pushScopeId("data-v-90331d26"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_5f6e7403_lang = "";
+const _withScopeId$1 = (n) => (pushScopeId("data-v-5f6e7403"), n = n(), popScopeId(), n);
 const _hoisted_1$m = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$8 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$4 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -19600,7 +19600,7 @@ function _sfc_render$u(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch$1 = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_render$u], ["__scopeId", "data-v-90331d26"]]);
+const TableGlobalSearch$1 = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_render$u], ["__scopeId", "data-v-5f6e7403"]]);
 const _sfc_main$M = defineComponent({
   components: {
     TableAdvancedSearch: TableAdvancedSearch$1,
@@ -20154,7 +20154,7 @@ const _sfc_main$K = defineComponent({
   setup() {
   }
 });
-const TableDict_vue_vue_type_style_index_0_scoped_7d89a0e9_lang = "";
+const TableDict_vue_vue_type_style_index_0_scoped_21146269_lang = "";
 function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
   var _a2;
   const _component_Icon = resolveComponent("Icon");
@@ -20183,7 +20183,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
     ]), 1032, ["color"])
   ]);
 }
-const TableDict = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["render", _sfc_render$r], ["__scopeId", "data-v-7d89a0e9"]]);
+const TableDict = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["render", _sfc_render$r], ["__scopeId", "data-v-21146269"]]);
 const index$3 = "";
 function useTable(tableProps) {
   const tableRef = ref(null);
@@ -20455,8 +20455,8 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Modal_vue_vue_type_style_index_0_scoped_4dc415ac_lang = "";
-const Modal$1 = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__scopeId", "data-v-4dc415ac"]]);
+const Modal_vue_vue_type_style_index_0_scoped_24f758b3_lang = "";
+const Modal$1 = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__scopeId", "data-v-24f758b3"]]);
 const _hoisted_1$i = { class: "api-modal-select" };
 const _sfc_main$H = /* @__PURE__ */ defineComponent({
   __name: "ApiModalSelect",
@@ -20604,8 +20604,8 @@ const _sfc_main$H = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ApiModalSelect_vue_vue_type_style_index_0_scoped_fb4fe18d_lang = "";
-const ApiModalSelect$1 = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__scopeId", "data-v-fb4fe18d"]]);
+const ApiModalSelect_vue_vue_type_style_index_0_scoped_5427533c_lang = "";
+const ApiModalSelect$1 = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__scopeId", "data-v-5427533c"]]);
 const Description$1 = "";
 const basicColProps = 24;
 const basicProps$3 = reactive({
@@ -24638,7 +24638,7 @@ const _sfc_main$B = defineComponent({
     };
   }
 });
-const CropperAvatar_vue_vue_type_style_index_0_scoped_31315934_lang = "";
+const CropperAvatar_vue_vue_type_style_index_0_scoped_6ac45907_lang = "";
 const _hoisted_1$e = ["src"];
 function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Icon = resolveComponent("Icon");
@@ -24689,7 +24689,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["onRegister", "onUploadSuccess", "onBeforeUpload", "uploadApi", "src"])
   ], 6);
 }
-const CropperAvatar = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["render", _sfc_render$l], ["__scopeId", "data-v-31315934"]]);
+const CropperAvatar = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["render", _sfc_render$l], ["__scopeId", "data-v-6ac45907"]]);
 const props = {
   startVal: { type: Number, default: 0 },
   endVal: { type: Number, default: 2021 },
@@ -24861,7 +24861,7 @@ const _sfc_main$y = 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$j(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Spin = resolveComponent("Spin");
   return withDirectives((openBlock(), createElementBlock("section", {
@@ -24877,7 +24877,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, _ctx.loading]
   ]);
 }
-const Loading = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["render", _sfc_render$j], ["__scopeId", "data-v-ee545744"]]);
+const Loading = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["render", _sfc_render$j], ["__scopeId", "data-v-33b23b82"]]);
 function createLoading(props2, target, wait = false) {
   let vm = null;
   const data = reactive({
@@ -26670,7 +26670,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
   },
   setup(__props, { expose: __expose }) {
     useCssVars((_ctx) => ({
-      "989efb00": props2.labelWidth
+      "7210fae1": props2.labelWidth
     }));
     const props2 = __props;
     const form = ref({});
@@ -26841,8 +26841,8 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DescriptionsForm_vue_vue_type_style_index_0_scoped_2d2eda80_lang = "";
-const descriptionsForm = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-2d2eda80"]]);
+const DescriptionsForm_vue_vue_type_style_index_0_scoped_b1ced086_lang = "";
+const descriptionsForm = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-b1ced086"]]);
 const DescriptionsForm = withInstall$8(descriptionsForm);
 const basicResizeWrapperProps = reactive({
   designWidth: {
@@ -26887,8 +26887,8 @@ const __default__$1 = defineComponent({
 });
 const __injectCSSVars__ = () => {
   useCssVars((_ctx) => ({
-    "0aaa544f": _ctx.designWidth,
-    "30d13bbe": _ctx.designHeight
+    "1a93f028": _ctx.designWidth,
+    "1e1b1b05": _ctx.designHeight
   }));
 };
 const __setup__ = __default__$1.setup;
@@ -27368,7 +27368,7 @@ const styles = `.vue-colorful {
   border-color: transparent;
   border-bottom: 12px solid #000;
   border-radius: 8px 8px 0 0;
-  background-image: linear-gradient(to top, #000, rgba(0, 0, 0, 0)),
+  background-image: linear-gradient(to top, #000, rgba(0, 0, 0, 0)),\r
       linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
 }
 .vue-colorful__pointer-fill, .vue-colorful__alpha-gradient {
@@ -27389,15 +27389,15 @@ const styles = `.vue-colorful {
   height: 24px;
 }
 .vue-colorful__hue {
-  background: linear-gradient(
-      to right,
-      #f00 0%,
-      #ff0 17%,
-      #0f0 33%,
-      #0ff 50%,
-      #00f 67%,
-      #f0f 83%,
-      #f00 100%
+  background: linear-gradient(\r
+      to right,\r
+      #f00 0%,\r
+      #ff0 17%,\r
+      #0f0 33%,\r
+      #0ff 50%,\r
+      #00f 67%,\r
+      #f0f 83%,\r
+      #f00 100%\r
     );
 }
 .vue-colorful__last-control {
@@ -33447,8 +33447,8 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_abb4b35a_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-abb4b35a"]]);
+const Table_vue_vue_type_style_index_0_scoped_0d7f83ba_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-0d7f83ba"]]);
 const ShyComponentMap = /* @__PURE__ */ new Map();
 ShyComponentMap.set("Input", Input);
 ShyComponentMap.set("InputGroup", Input.Group);
@@ -35337,8 +35337,8 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Modal_vue_vue_type_style_index_0_scoped_0ca4fd85_lang = "";
-const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-0ca4fd85"]]);
+const Modal_vue_vue_type_style_index_0_scoped_15e2dcbb_lang = "";
+const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-15e2dcbb"]]);
 const _hoisted_1$4 = { class: "api-modal-select" };
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "ApiModalSelect",
@@ -35486,8 +35486,8 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ApiModalSelect_vue_vue_type_style_index_0_scoped_45845a8d_lang = "";
-const ApiModalSelect = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-45845a8d"]]);
+const ApiModalSelect_vue_vue_type_style_index_0_scoped_5019fbdf_lang = "";
+const ApiModalSelect = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-5019fbdf"]]);
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "FormWrapper",
   props: {
@@ -37065,7 +37065,7 @@ function _isSlot$2(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
 const ShyTableColumn = /* @__PURE__ */ defineComponent({
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit
   }) {
@@ -37073,9 +37073,9 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
     const table2 = useTableContext();
     const defaultRowSelection = omit$1(table2.getRowSelection(), "selectedRowKeys");
     let inited = false;
+    let inset = false;
     const cachePlainOptions = ref([]);
     const plainOptions = ref([]);
-    const plainSortOptions = ref([]);
     const columnListRef = ref(null);
     const state = reactive({
       checkAll: true,
@@ -37091,7 +37091,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       return unref(table2 == null ? void 0 : table2.getBindValues) || {};
     });
     watch(() => table2.getColumns(), () => {
-      if (!state.isInit)
+      if (!state.isInit || inset)
         return;
       reInit();
     }, {
@@ -37117,9 +37117,9 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
         ignoreAction: true
       }).forEach((item) => {
         ret.push({
-          label: item.title || item.customTitle,
-          value: item.dataIndex || item.title,
-          ...item
+          ...item,
+          title: item.title || item.customTitle,
+          dataIndex: item.dataIndex || item.title
         });
       });
       return ret;
@@ -37137,7 +37137,6 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       }).filter(Boolean);
       if (!plainOptions.value.length) {
         plainOptions.value = columns;
-        plainSortOptions.value = columns;
         cachePlainOptions.value = columns;
         state.defaultCheckList = checkList;
       } else {
@@ -37154,8 +37153,6 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
     }
     const reInit = () => {
       const columns = getColumns();
-      plainOptions.value = columns;
-      cachePlainOptions.value = columns;
       unref(plainOptions).forEach((item) => {
         const findItem = columns.find((col) => col.dataIndex === item.dataIndex);
         if (findItem) {
@@ -37163,17 +37160,16 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
           item.width = findItem.width;
         }
       });
-      const data = getResult(columns);
-      emit("columns-change", data);
+      handleEmit(columns, false);
     };
     function onCheckAllChange(e) {
-      const checkList = plainOptions.value.map((item) => item.value);
+      const checkList = plainOptions.value.map((item) => item.dataIndex);
       if (e.target.checked) {
         state.checkedList = checkList;
-        setColumns(checkList);
+        handleEmit(checkList);
       } else {
         state.checkedList = [];
-        setColumns([]);
+        handleEmit([]);
       }
     }
     const indeterminate = computed(() => {
@@ -37182,13 +37178,13 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       return checkedLen > 0 && checkedLen < len;
     });
     function onChange(checkedList) {
-      const len = plainSortOptions.value.length;
+      const len = plainOptions.value.length;
       state.checkAll = checkedList.length === len;
-      const sortList = unref(plainSortOptions).map((item) => item.value);
+      const sortList = unref(plainOptions).map((item) => item.dataIndex);
       checkedList.sort((prev2, next2) => {
         return sortList.indexOf(prev2) - sortList.indexOf(next2);
       });
-      setColumns(checkedList);
+      handleEmit(checkedList);
     }
     let sortable;
     let sortableOrder = [];
@@ -37196,9 +37192,12 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       state.checkedList = [...state.defaultCheckList];
       state.checkAll = true;
       plainOptions.value = unref(cachePlainOptions);
-      plainSortOptions.value = unref(cachePlainOptions);
-      setColumns(table2.getCacheColumns());
       sortable.sort(sortableOrder);
+      inset = true;
+      emit("columns-reset");
+      setTimeout(() => {
+        inset = false;
+      });
     }
     function handleVisibleChange() {
       if (inited)
@@ -37223,7 +37222,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
             if (isNullAndUnDef(oldIndex) || isNullAndUnDef(newIndex) || oldIndex === newIndex) {
               return;
             }
-            const columns = cloneDeep(plainSortOptions.value);
+            const columns = cloneDeep(plainOptions.value);
             if (oldIndex > newIndex) {
               columns.splice(newIndex, 0, columns[oldIndex]);
               columns.splice(oldIndex + 1, 1);
@@ -37231,8 +37230,8 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
               columns.splice(newIndex + 1, 0, columns[oldIndex]);
               columns.splice(oldIndex, 1);
             }
-            plainSortOptions.value = columns;
-            setColumns(columns.map((col) => col.value).filter((value) => state.checkedList.includes(value)));
+            const tempCol = columns.map((col) => col.dataIndex).filter((value) => state.checkedList.includes(value));
+            handleEmit(tempCol);
           }
         });
         sortableOrder = sortable.toArray();
@@ -37266,27 +37265,51 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       (_a2 = table2.setCacheColumnsByField) == null ? void 0 : _a2.call(table2, item.dataIndex, {
         fixed: isFixed
       });
-      setColumns(columns);
+      handleEmit(columns);
     }
     function getResult(columns) {
-      return unref(plainOptions).map((col) => {
-        const defaultHidden = columns.findIndex((c) => c === col.value || typeof c !== "string" && c.dataIndex === col.value && (isBoolean(c.defaultHidden) ? !c.defaultHidden : false)) !== -1;
+      const tempOptions = unref(plainOptions).map((col) => {
+        let defaultHidden = false;
+        if (columns.every((val) => typeof val === "string")) {
+          defaultHidden = columns.findIndex((val) => val === col.dataIndex) === -1;
+        } else {
+          const find = columns.find((val) => val.dataIndex === col.dataIndex);
+          defaultHidden = find ? isBoolean(find.defaultHidden) ? find.defaultHidden : false : true;
+        }
         return {
-          dataIndex: col.value,
+          title: col.title,
+          dataIndex: col.dataIndex,
           fixed: col.fixed,
           defaultHidden,
           width: col.width
         };
       });
-    }
-    function setColumns(columns) {
-      table2.setColumns(columns);
-      const data = getResult(columns);
-      emit("columns-change", data);
+      if (!columns.every((val) => typeof val === "string")) {
+        const sortList = columns.map((item) => item.dataIndex);
+        tempOptions.sort((prev2, next2) => {
+          return sortList.indexOf(prev2.dataIndex) - sortList.indexOf(next2.dataIndex);
+        });
+        return tempOptions;
+      }
+      tempOptions.sort((prev2, next2) => {
+        return columns.indexOf(prev2.dataIndex) - columns.indexOf(next2.dataIndex);
+      });
+      return tempOptions;
     }
     function getPopupContainer2() {
       return isFunction$4(attrs.getPopupContainer) ? attrs.getPopupContainer() : getPopupContainer$1();
     }
+    const handleEmit = useDebounceFn$1((columns, set2 = true) => {
+      const data = getResult(columns);
+      emit("columns-change", data);
+      if (set2) {
+        inset = true;
+        table2.setColumns(columns);
+        setTimeout(() => {
+          inset = false;
+        });
+      }
+    }, 100);
     return () => {
       return createVNode(Tooltip, {
         "placement": "top"
@@ -37342,9 +37365,9 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
                 }, [createVNode(DragOutlined$1, {
                   "class": "table-column-drag-icon"
                 }, null), createVNode(Checkbox, {
-                  "value": item.value
+                  "value": item.dataIndex
                 }, {
-                  default: () => [item.label]
+                  default: () => [item.title]
                 }), createVNode(Tooltip, {
                   "placement": "bottomLeft",
                   "mouseLeaveDelay": 0.4,
@@ -37354,7 +37377,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
                     "rotate": 90,
                     "class": [`${prefixCls2}__fixed-left`, {
                       active: item.fixed === "left",
-                      disabled: !state.checkedList.includes(item.value)
+                      disabled: !state.checkedList.includes(item.dataIndex)
                     }],
                     "onClick": () => handleColumnFixed(item, "left")
                   }, null)],
@@ -37370,7 +37393,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
                     "rotate": 90,
                     "class": [`${prefixCls2}__fixed-right`, {
                       active: item.fixed === "right",
-                      disabled: !state.checkedList.includes(item.value)
+                      disabled: !state.checkedList.includes(item.dataIndex)
                     }],
                     "onClick": () => handleColumnFixed(item, "right")
                   }, null)],
@@ -37418,7 +37441,7 @@ const ShyTableSetting = /* @__PURE__ */ defineComponent({
       default: () => ({})
     }
   },
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit
   }) {
@@ -37441,6 +37464,9 @@ const ShyTableSetting = /* @__PURE__ */ defineComponent({
     const handleColumnChange = (data) => {
       emit("columns-change", data);
     };
+    const handleColumnsReset = () => {
+      emit("columns-reset");
+    };
     const getTableContainer = () => {
       return table2 ? unref(table2.wrapRef) : document.body;
     };
@@ -37468,6 +37494,7 @@ const ShyTableSetting = /* @__PURE__ */ defineComponent({
     const renderTableColumn = computed(() => {
       return getSetting.value.setting ? createVNode(ShyTableColumn, {
         "onColumnsChange": handleColumnChange,
+        "onColumnsReset": handleColumnsReset,
         "getPopupContainer": getTableContainer
       }, null) : null;
     });
@@ -37533,7 +37560,7 @@ const ShyTableHeader = /* @__PURE__ */ defineComponent({
       type: Boolean
     }
   },
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit,
     slots
@@ -37541,10 +37568,17 @@ const ShyTableHeader = /* @__PURE__ */ defineComponent({
     const {
       prefixCls: prefixCls2
     } = useDesign$1("table-header");
+    const handleColumnChange = (data) => {
+      emit("columns-change", data);
+    };
+    const handleColumnsReset = () => {
+      emit("columns-reset");
+    };
     const isShowSetting = () => {
       return props2.showTableSetting ? createVNode(ShyTableSetting, {
         "setting": props2.tableSetting,
-        "onColumnsChange": handleColumnChange
+        "onColumnsChange": handleColumnChange,
+        "onColumnsReset": handleColumnsReset
       }, null) : null;
     };
     const isShowTitle = () => {
@@ -37557,9 +37591,6 @@ const ShyTableHeader = /* @__PURE__ */ defineComponent({
         "class": `${prefixCls2}-placeholder`
       }, null);
     };
-    const handleColumnChange = (data) => {
-      emit("columns-change", data);
-    };
     const getAlignClass = computed(() => [`${prefixCls2}-align`, `${prefixCls2}-align-${props2.headerAlign}`]);
     return () => {
       var _a2;
@@ -37599,7 +37630,8 @@ const useTableHeader = (propsRef, slots, handlers2) => {
       titleHelpMessage,
       showTableSetting,
       tableSetting,
-      onColumnsChange: handlers2.onColumnsChange
+      onColumnsChange: handlers2.onColumnsChange,
+      onColumnsReset: handlers2.onColumnsReset
     };
     return {
       title: hideTitle ? null : () => createVNode(ShyTableHeader, headerProps, {
@@ -38351,8 +38383,8 @@ const _sfc_main$3 = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_b3419d34_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-b3419d34"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_ac81b595_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-ac81b595"), n = n(), popScopeId(), n);
 const _hoisted_1$2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -38410,7 +38442,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$1], ["__scopeId", "data-v-b3419d34"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$1], ["__scopeId", "data-v-ac81b595"]]);
 const _sfc_main$2 = defineComponent({
   name: "EditTableHeaderIcon",
   components: { FormOutlined: FormOutlined$1 },
@@ -38542,7 +38574,7 @@ function _isSlot$1(s) {
 }
 const ShyTable = /* @__PURE__ */ defineComponent({
   name: "ShyTable",
-  emits: ["fetch-success", "fetch-error", "selection-change", "register", "row-click", "row-dbClick", "row-contextmenu", "row-mouseenter", "row-mouseleave", "edit-end", "edit-cancel", "edit-row-end", "edit-change", "expanded-rows-change", "change", "columns-change"],
+  emits: ["fetch-success", "fetch-error", "selection-change", "register", "row-click", "row-dbClick", "row-contextmenu", "row-mouseenter", "row-mouseleave", "edit-end", "edit-cancel", "edit-row-end", "edit-change", "expanded-rows-change", "change", "columns-change", "columns-reset"],
   props: shyTableBasicProps,
   setup(props2, {
     attrs,
@@ -38772,6 +38804,12 @@ const ShyTable = /* @__PURE__ */ defineComponent({
         var _a2, _b;
         emit("columns-change", data);
         (_b = (_a2 = unref(getProps)).onColumnsChange) == null ? void 0 : _b.call(_a2, data);
+      },
+      onColumnsReset: () => {
+        var _a2, _b;
+        setColumns(getCacheColumns());
+        emit("columns-reset");
+        (_b = (_a2 = unref(getProps)).onColumnsReset) == null ? void 0 : _b.call(_a2);
       }
     };
     const {
@@ -39623,8 +39661,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Process_vue_vue_type_style_index_0_scoped_6d2645fc_lang = "";
-const Process = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6d2645fc"]]);
+const Process_vue_vue_type_style_index_0_scoped_e7917888_lang = "";
+const Process = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e7917888"]]);
 export {
   _sfc_main$T as AdvancedSearch,
   ApiCascader$1 as ApiCascader,