@gx-design-vue/pro-table 0.2.0-beta.137 → 0.2.0-beta.139

package/dist/pro-table.js

@@ -1,6 +1,6 @@
 /*!
   * Gx Design Pro
-  * Version: 0.2.0-beta.136
+  * Version: 0.2.0-beta.138
   * Author: gx12358
   * Copyright (C) 2024 gx12358
   * License: MIT License
@@ -9,15 +9,15 @@
   * Homepage: 
   * Contact: gx12358@gmail.com
 */
-import { defineComponent as Te, ref as I, watch as z, cloneVNode as Qe, reactive as Ue, toRaw as re, computed as C, createVNode as s, Fragment as Ye, isVNode as _, mergeProps as W, h as st, unref as S, onActivated as ct, nextTick as Ot, getCurrentInstance as jt, onMounted as At, onUnmounted as Nt, onDeactivated as Yt, watchEffect as zt, toRef as M, isRef as ke } from "vue";
-import { UpOutlined as Et, DownOutlined as Lt, InfoCircleOutlined as Mt, FullscreenExitOutlined as Wt, FullscreenOutlined as Ht, ReloadOutlined as kt, CopyOutlined as qt } from "@ant-design/icons-vue";
+import { defineComponent as we, ref as I, watch as z, cloneVNode as Qe, reactive as Ue, toRaw as re, computed as C, createVNode as s, Fragment as Ye, isVNode as _, mergeProps as W, h as st, unref as T, onActivated as ct, nextTick as At, getCurrentInstance as Ot, onMounted as jt, onUnmounted as Nt, onDeactivated as Yt, watchEffect as zt, toRef as M, isRef as He } from "vue";
+import { UpOutlined as Lt, DownOutlined as Et, InfoCircleOutlined as Mt, FullscreenExitOutlined as Wt, FullscreenOutlined as kt, ReloadOutlined as Ht, CopyOutlined as qt } from "@ant-design/icons-vue";
 import { useProAppContext as dt } from "@gx-design-vue/pro-app";
 import { useBreakpoint as ft, useMemo as Fe, tryOnUnmounted as Kt } from "@gx-design-vue/pro-hooks";
 import { useContext as Vt, useProStyle as Je, unit as nt, useProConfigContext as Gt } from "@gx-design-vue/pro-provider";
-import { isArray as K, cloneDeep as ee, isBoolean as Re, classNames as ae, isNumber as De, filterEmpty as mt, getPrefixCls as vt, isObject as Q, keysOf as ht, isDeepEqualReact as Ee, compareArray as Xt, runFunction as _t, getSortIndex as Qt, isFunction as ze, handleCurrentPage as Ut, getRandomNumber as gt, deepMerge as Se, arrayRepeat as Jt, isString as pt, handleShowIndex as Zt, getSlot as ot, convertValueBoolean as qe, getSlotsProps as el, handleEmptyField as tl, getTextWidth as ll, getSlotVNode as al, useDeepMerge as nl } from "@gx-design-vue/pro-utils";
-import { useDebounceFn as ol, useFullscreen as bt, useWindowSize as il } from "@vueuse/core";
-import { Grid as ul, DatePicker as yt, Space as it, Input as Ne, TimePicker as rl, TreeSelect as sl, Select as cl, InputNumber as Ke, Button as ut, Spin as Ct, Tooltip as we, theme as dl, Pagination as fl, Table as ml, message as vl, Empty as hl } from "ant-design-vue";
-import { omit as Ie, cloneDeep as xt, pick as Le } from "lodash-es";
+import { isArray as K, cloneDeep as ee, isBoolean as Re, classNames as ae, isNumber as De, filterEmpty as mt, getPrefixCls as vt, isObject as Q, keysOf as ht, isDeepEqualReact as Le, compareArray as Xt, runFunction as _t, getSortIndex as Qt, isFunction as ze, handleCurrentPage as Ut, getRandomNumber as gt, deepMerge as Se, arrayRepeat as Jt, isString as pt, handleShowIndex as Zt, getSlot as it, convertValueBoolean as qe, getSlotsProps as el, handleEmptyField as tl, getTextWidth as ll, getSlotVNode as al, useDeepMerge as nl } from "@gx-design-vue/pro-utils";
+import { useDebounceFn as il, useFullscreen as bt, useWindowSize as ol } from "@vueuse/core";
+import { Grid as ul, DatePicker as yt, Space as ot, Input as Ne, TimePicker as rl, TreeSelect as sl, Select as cl, InputNumber as Ke, Button as ut, Spin as Ct, Tooltip as Te, theme as dl, Pagination as fl, Table as ml, message as vl, Empty as hl } from "ant-design-vue";
+import { omit as Ie, cloneDeep as xt, pick as Ee } from "lodash-es";
 import { tableProps as gl } from "ant-design-vue/es/table/Table";
 import "ant-design-vue/es/_util/props-util";
 import { warning as pl } from "ant-design-vue/es/vc-util/warning";
@@ -151,6 +151,12 @@ const bl = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
       placement: "right"
     })
   },
+  // 表格标题下方的内容
+  headerAfter: {
+    type: [Object, Function, Boolean, String, Array],
+    default: () => {
+    }
+  },
   // 表格标题
   headerTitle: {
     type: [Object, Function, Boolean, String, Array],
@@ -158,7 +164,7 @@ const bl = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
     }
   },
   // 标题提示
-  titleTip: {
+  headerTitleTip: {
     type: [Object, Function, Boolean, String, Array],
     default: () => {
     }
@@ -178,17 +184,6 @@ const bl = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
     type: [Object, Boolean],
     default: !1
   },
-  /**
-   * @Author      gx12358
-   * @DateTime    2022/2/8
-   * @lastTime    2022/2/8
-   * @description 列设置额外的元素
-   */
-  settingExtra: {
-    type: [Object, Function, Array],
-    default: () => {
-    }
-  },
   // 针对 keepalive 缓存的页面 是否重新reload
   keepAliveReload: {
     type: Boolean,
@@ -308,7 +303,7 @@ const bl = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
   onLoadingChange: Function,
   onRequestError: Function,
   onBeforeSearchSubmit: Function
-}, Cl = /* @__PURE__ */ Te({
+}, Cl = /* @__PURE__ */ we({
   name: "RequestSelect",
   props: {
     fetch: Function,
@@ -329,14 +324,14 @@ const bl = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
   setup(e, {
     slots: a
   }) {
-    const l = I([]), n = I(e.loading ?? !1), i = I("init"), o = ol(e.fetch, e.debounceTime || 10);
+    const l = I([]), n = I(e.loading ?? !1), o = I("init"), i = il(e.fetch, e.debounceTime || 10);
     return z([() => e.fetch, () => e.manual], () => {
-      if (i.value !== "init" && n.value) return;
+      if (o.value !== "init" && n.value) return;
       const d = e.manual ?? !1;
-      e.fetch && !d && (n.value = !0, o().then((v) => {
-        l.value = xt(v), i.value = "success";
-      }).catch((v) => {
-        console.error(v), i.value = "error";
+      e.fetch && !d && (n.value = !0, i().then((m) => {
+        l.value = xt(m), o.value = "success";
+      }).catch((m) => {
+        console.error(m), o.value = "error";
       }).finally(() => {
         n.value = !1;
       }));
@@ -355,22 +350,22 @@ function xl(e, a) {
   const l = Ue({});
   function n() {
     Object.assign(l, ee(re(e)));
-    const o = a.find((d) => d.valueType === "dateRange");
-    o && i(o.name || "", e[o.rangeStartName || "start"] ? [
-      e[o.rangeStartName || "start"],
-      e[o.rangeEndName || "end"]
+    const i = a.find((d) => d.valueType === "dateRange");
+    i && o(i.name || "", e[i.rangeStartName || "start"] ? [
+      e[i.rangeStartName || "start"],
+      e[i.rangeEndName || "end"]
     ] : []);
   }
   z(() => e, () => {
     n();
   }, { deep: !0, immediate: !0 });
-  function i(o, d) {
-    l[o] = d;
+  function o(i, d) {
+    l[i] = d;
   }
   return {
     formState: l,
     resetFormState: n,
-    changeFormState: i
+    changeFormState: o
   };
 }
 const Sl = (e) => ({
@@ -475,20 +470,20 @@ function Pe(e, a) {
 }
 const rt = (e, a, l = "string") => {
   if (K(e)) {
-    const [n, i] = e;
-    let o, d;
-    if (Array.isArray(a) ? (o = a[0], d = a[1]) : typeof a == "object" && a.type === "mask" ? (o = a.format, d = a.format) : (o = a, d = a), l === "string") {
-      const v = n ? fe(n, o) : "", p = i ? fe(i, d) : "";
-      return [v, p];
+    const [n, o] = e;
+    let i, d;
+    if (Array.isArray(a) ? (i = a[0], d = a[1]) : typeof a == "object" && a.type === "mask" ? (i = a.format, d = a.format) : (i = a, d = a), l === "string") {
+      const m = n ? fe(n, i) : "", p = o ? fe(o, d) : "";
+      return [m, p];
     }
-    return [V(n), V(i)];
+    return [V(n), V(o)];
   }
 };
-function wl(e) {
+function Tl(e) {
   return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !_(e);
 }
 const {
-  useBreakpoint: Tl
+  useBreakpoint: wl
 } = ul, {
   MonthPicker: Rl,
   RangePicker: $l,
@@ -516,7 +511,7 @@ const Bl = {
     default: () => ({})
   },
   onSearch: Function
-}, Ol = /* @__PURE__ */ Te({
+}, Al = /* @__PURE__ */ we({
   name: "ProTableForm",
   inheritAttrs: !1,
   props: Bl,
@@ -526,20 +521,20 @@ const Bl = {
   }) {
     const {
       wrapSSR: n,
-      hashId: i
-    } = Je("ProTableForm", [Sl], e.prefixCls), o = dt(), d = Tl(), {
-      formAutoRequest: v,
+      hashId: o
+    } = Je("ProTableForm", [Sl], e.prefixCls), i = dt(), d = wl(), {
+      formAutoRequest: m,
       formConfig: p,
       formActions: F
     } = Ze(), {
       formState: r,
       resetFormState: B,
       changeFormState: h
-    } = xl(e.defaultFormSearch, e.formCols), f = I(p.value?.collapsed ?? p.value?.defaultCollapsed), x = C(() => Re(F.value?.reset) ? F.value?.reset : !v.value), b = C(() => ie(p.value?.span)), A = C(() => p.value?.label);
+    } = xl(e.defaultFormSearch, e.formCols), f = I(p.value?.collapsed ?? p.value?.defaultCollapsed), x = C(() => Re(F.value?.reset) ? F.value?.reset : !m.value), b = C(() => oe(p.value?.span)), j = C(() => p.value?.label);
     z(() => p.value?.collapsed, (t) => {
       f.value = t;
     });
-    function ie(t) {
+    function oe(t) {
       let u = 4;
       for (let y = 0; y < Ve.length; y += 1) {
         const g = Ve[y].value;
@@ -562,8 +557,8 @@ const Bl = {
       const t = xt(r), u = e.formCols.find((R) => R.valueType === "text") || "", y = e.formCols.find((R) => R.valueType === "dateRange") || "", g = e.formCols.find((R) => R.valueType === "treeSelect");
       return u && (t[u.name] = r[u.name] || u.initialValue || ""), y && (t[y.rangeStartName || "start"] = t[y.name] ? t[y.name][0] : "", t[y.rangeEndName || "end"] = t[y.name] ? t[y.name][1] : "", delete t[y.name]), g && (g?.name && K(r[g?.name]) && (t[g.name] = r[g.name].length ? r[g.name].map((R) => R[g.valueKey === "text" ? "label" : "value"]).join() : ""), g?.name && K(t[g?.name]) && (t[g.name] = t[g.name].length ? t[g.name].map((R) => R[g.valueKey === "text" ? "label" : "value"]) : "")), t;
     }, le = (t = !1, u) => {
-      (v.value || t) && e.onSearch?.(pe(), t ? u ? "reset" : "submit" : void 0);
-    }, O = (t, u, y) => {
+      (m.value || t) && e.onSearch?.(pe(), t ? u ? "reset" : "submit" : void 0);
+    }, A = (t, u, y) => {
       const g = r[u.name || ""];
       switch (u.valueType) {
         case "text":
@@ -612,19 +607,19 @@ const Bl = {
       resetForm: me
     });
     const Y = () => {
-      const t = o?.emptyText?.value;
+      const t = i?.emptyText?.value;
       if (t) {
         const u = _(t), y = u ? st(t) : mt(t || []);
         return s("div", {
-          class: ae(`${e.prefixCls}-search-empty-text`, i.value)
+          class: ae(`${e.prefixCls}-search-empty-text`, o.value)
         }, [u ? y : K(y) ? y.map((g) => Qe(g)) : void 0]);
       }
-    }, G = () => (!v.value || x.value) && s(it, null, {
+    }, G = () => (!m.value || x.value) && s(ot, null, {
       default: () => [x.value && s(ut, {
         onClick: () => me()
       }, {
         default: () => [F.value?.resetText || "重置"]
-      }), !v.value && s(ut, {
+      }), !m.value && s(ut, {
         loading: e.loading,
         type: "primary",
         onClick: () => le(!0)
@@ -637,32 +632,32 @@ const Bl = {
       collapseRender: y = !0
     }) => s("div", {
       style: t,
-      class: `${e.prefixCls}-search-collapse-buttons ${i.value}`
-    }, [s(it, {
+      class: `${e.prefixCls}-search-collapse-buttons ${o.value}`
+    }, [s(ot, {
       size: 16
     }, {
       default: () => [G(), p.value?.collapseRender !== !1 && y && s(Ye, null, [typeof p.value?.collapseRender == "function" ? p.value?.collapseRender(u) : s("span", {
-        class: `${e.prefixCls}-a ${i.value}`,
+        class: `${e.prefixCls}-a ${o.value}`,
         onClick: () => te(!u)
-      }, [u ? "收起" : "展开", u ? s(Et, null, null) : s(Lt, null, null)])])]
+      }, [u ? "收起" : "展开", u ? s(Lt, null, null) : s(Et, null, null)])])]
     })]);
     function ne(t) {
       return t === void 0 ? void 0 : t ? s(Ct, {
         size: "small",
-        indicator: o?.indicator?.value
+        indicator: i?.indicator?.value
       }, null) : Y();
     }
     function be(t, u) {
       return s(Cl, W(t.request, {
         loading: t.loading,
         notFoundContent: ne
-      }), wl(u) ? u : {
+      }), Tl(u) ? u : {
         default: () => [u]
       });
     }
     const J = (t) => {
       let u;
-      const y = v.value ? Ne.Search : Ne, g = Ie(t.field || {}, "rules");
+      const y = m.value ? Ne.Search : Ne, g = Ie(t.field || {}, "rules");
       let R = null;
       switch (t.valueType) {
         case "text":
@@ -673,7 +668,7 @@ const Bl = {
             value: r[t.name],
             placeholder: t.placeholder || "请输入",
             allowClear: t.allowClear ?? !0,
-            onChange: (c) => O(c.target.value, t),
+            onChange: (c) => A(c.target.value, t),
             onSearch: (c) => le()
           }, g), null);
           break;
@@ -684,17 +679,17 @@ const Bl = {
             },
             value: r[t.name],
             placeholder: t.placeholder || "请输入",
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "numberRange":
           u = s(Ne.Group, {
             compact: !0,
-            class: ae(i.value, `${e.prefixCls}-search-input-compact`)
+            class: ae(o.value, `${e.prefixCls}-search-input-compact`)
           }, {
             default: () => [s(Ke, {
               value: r[t.name]?.[0],
-              onChange: (c) => O(c, t, {
+              onChange: (c) => A(c, t, {
                 key: 0
               }),
               placeholder: K(t.placeholder) && t.placeholder?.[0] || "请输入"
@@ -703,7 +698,7 @@ const Bl = {
               placeholder: "~"
             }, null), s(Ke, {
               value: r[t.name]?.[1],
-              onChange: (c) => O(c, t, {
+              onChange: (c) => A(c, t, {
                 key: 1
               }),
               placeholder: K(t.placeholder) && t.placeholder?.[1] || "请输入"
@@ -722,7 +717,7 @@ const Bl = {
             allowClear: t.allowClear ?? !0,
             getPopupContainer: (c) => c && c.parentNode ? c.parentNode : c,
             notFoundContent: ne(t.loading),
-            onChange: (c) => O(c, t),
+            onChange: (c) => A(c, t),
             options: t.loading ? [] : t?.valueEnum || []
           }, g), null);
           break;
@@ -737,7 +732,7 @@ const Bl = {
             treeData: t.loading ? [] : t.valueEnum || [],
             getPopupContainer: (c) => c && c.parentNode ? c.parentNode : c,
             notFoundContent: ne(t.loading),
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "date":
@@ -752,7 +747,7 @@ const Bl = {
             format: Pe(t.valueFormat, t.showTime),
             showTime: t.showTime,
             showToday: t.showToday || !0,
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "dateWeek":
@@ -764,7 +759,7 @@ const Bl = {
             getPopupContainer: (c) => c && c.parentNode ? c.parentNode : c,
             allowClear: t.allowClear ?? !0,
             placeholder: t.placeholder || "请选择",
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "dateMonth":
@@ -776,7 +771,7 @@ const Bl = {
             getPopupContainer: (c) => c && c.parentNode ? c.parentNode : c,
             allowClear: t.allowClear ?? !0,
             placeholder: t.placeholder || "请选择",
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "dateQuarter":
@@ -788,7 +783,7 @@ const Bl = {
             getPopupContainer: (c) => c && c.parentNode ? c.parentNode : c,
             allowClear: t.allowClear ?? !0,
             placeholder: t.placeholder || "请选择",
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "dateYear":
@@ -800,7 +795,7 @@ const Bl = {
             getPopupContainer: (c) => c && c.parentNode ? c.parentNode : c,
             allowClear: t.allowClear ?? !0,
             placeholder: t.placeholder || "请选择",
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "dateRange":
@@ -813,7 +808,7 @@ const Bl = {
             placeholder: t.placeholder || ["开始日期", "结束日期"],
             format: Pe(t.valueFormat, t.showTime),
             showTime: t.showTime,
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
         case "time":
@@ -827,7 +822,7 @@ const Bl = {
             allowClear: t.allowClear || t.allowClear === !1 ? t.allowClear : !0,
             use12Hours: t.use12Hours,
             format: t.valueFormat || "HH:mm:ss",
-            onChange: (c) => O(c, t)
+            onChange: (c) => A(c, t)
           }, g), null);
           break;
       }
@@ -836,15 +831,15 @@ const Bl = {
       formItemStyle: t = {},
       item: u
     }) => {
-      const y = _(u) ? u.props?.label : u.label, g = (_(u) ? u.props?.labelWidth : u.labelWidth) || A.value?.width, R = (_(u) ? u.props?.labelAlign : u.labelAlign) || A.value?.align;
+      const y = _(u) ? u.props?.label : u.label, g = (_(u) ? u.props?.labelWidth : u.labelWidth) || j.value?.width, R = (_(u) ? u.props?.labelAlign : u.labelAlign) || j.value?.align;
       return s("div", {
         class: `${e.prefixCls}-search-item`,
         style: {
           ...t,
-          gap: A.value?.gap ? nt(A.value?.gap) : void 0
+          gap: j.value?.gap ? nt(j.value?.gap) : void 0
         }
       }, [y && s("div", {
-        class: ae(`${e.prefixCls}-search-item-label`, A.value?.colon === !1 && `${e.prefixCls}-search-item-label-no-colon`, R && `${e.prefixCls}-search-item-label-${R}`),
+        class: ae(`${e.prefixCls}-search-item-label`, j.value?.colon === !1 && `${e.prefixCls}-search-item-label-no-colon`, R && `${e.prefixCls}-search-item-label-${R}`),
         style: {
           width: g ? nt(g) : void 0
         }
@@ -891,11 +886,11 @@ const Bl = {
     return () => {
       const t = e.cardBordered && `${e.prefixCls}-search-border`;
       return n(s("div", {
-        class: ae(i.value, `${e.prefixCls}-search`, t, i.value, p.value?.className)
+        class: ae(o.value, `${e.prefixCls}-search`, t, o.value, p.value?.className)
       }, [se()]));
     };
   }
-}), jl = (e) => ({
+}), Ol = (e) => ({
   [`${e.componentCls}`]: {
     lineHeight: 1,
     "&-container": {
@@ -967,37 +962,37 @@ const Bl = {
     }
   }
 });
-function Al(e) {
+function jl(e) {
   if (_(e))
     return e;
   if (e) {
     const a = e, {
       icon: l,
       tooltip: n,
-      onClick: i,
-      key: o
+      onClick: o,
+      key: i
     } = a;
-    return l && n ? s(we, {
+    return l && n ? s(Te, {
       title: n,
-      key: o
+      key: i
     }, {
       default: () => [s("span", {
-        key: o,
+        key: i,
         onClick: () => {
-          i && i(o);
+          o && o(i);
         }
       }, [l])]
     }) : l;
   }
   return null;
 }
-const wt = /* @__PURE__ */ Te({
+const Tt = /* @__PURE__ */ we({
   props: {
     actions: [Array],
     settings: [Array],
-    titleTip: ge.titleTip,
     prefixCls: String,
     headerTitle: ge.headerTitle,
+    headerTitleTip: ge.headerTitleTip,
     titleTipText: ge.titleTipText,
     actionsPlacement: String
   },
@@ -1005,9 +1000,9 @@ const wt = /* @__PURE__ */ Te({
     const {
       wrapSSR: a,
       hashId: l
-    } = Je("ListToolBar", [jl], e.prefixCls), n = ft(), {
-      isMobile: i
-    } = Ze(), o = C(() => !!(e.titleTip || e.headerTitle)), d = Fe(() => {
+    } = Je("ListToolBar", [Ol], e.prefixCls), n = ft(), {
+      isMobile: o
+    } = Ze(), i = C(() => !!(e.headerTitleTip || e.headerTitle)), d = Fe(() => {
       if (!Array.isArray(e.actions) || e.actions?.length < 1)
         return {
           left: null,
@@ -1022,24 +1017,24 @@ const wt = /* @__PURE__ */ Te({
           class: `${e.prefixCls}-actions ${l.value}`
         }, [f]) : null
       };
-    }, [() => e.actions, () => e.actionsPlacement]), v = C(() => !!(e.titleTip || e.headerTitle || d.value.left)), p = C(() => !!(e.settings?.length || d.value.right)), F = Fe(() => {
-      if (!v.value && p.value)
+    }, [() => e.actions, () => e.actionsPlacement]), m = C(() => !!(e.headerTitleTip || e.headerTitle || d.value.left)), p = C(() => !!(e.settings?.length || d.value.right)), F = Fe(() => {
+      if (!m.value && p.value)
         return s("div", {
           class: `${e.prefixCls}-left ${l.value}`
         }, null);
       const h = d.value.left;
-      return o.value ? s("div", {
+      return i.value ? s("div", {
         class: `${e.prefixCls}-left ${l.value}`
       }, [s("div", {
         class: `${e.prefixCls}-title ${l.value}`
-      }, [e.headerTitle, e.titleTip && s(we, {
+      }, [e.headerTitle, e.headerTitleTip && s(Te, {
         title: e.titleTipText
       }, {
-        default: () => [Re(e.titleTip) && e.titleTip ? s(Mt, null, null) : e.titleTip]
+        default: () => [Re(e.headerTitleTip) && e.headerTitleTip ? s(Mt, null, null) : e.headerTitleTip]
       })]), h]) : s("div", {
         class: `${e.prefixCls}-left ${l.value}`
       }, [h]);
-    }, [() => v.value, () => p.value, () => o.value, () => e.prefixCls, () => e.headerTitle, () => e.titleTipText, () => e.titleTip]), r = Fe(() => {
+    }, [() => m.value, () => p.value, () => i.value, () => e.prefixCls, () => e.headerTitle, () => e.titleTipText, () => e.headerTitleTip]), r = Fe(() => {
       if (!p.value) return null;
       const h = d.value.right;
       return s("div", {
@@ -1051,42 +1046,42 @@ const wt = /* @__PURE__ */ Te({
       }, [h, e.settings?.length ? s("div", {
         class: ae(`${e.prefixCls}-setting-items`, l.value)
       }, [e.settings.map((f, x) => {
-        const b = Al(f);
+        const b = jl(f);
         return s("div", {
           key: x,
           class: ae(`${e.prefixCls}-setting-item`, l.value)
         }, [b]);
       })]) : null]);
-    }, [() => n.value, () => p.value, () => e.prefixCls, () => o.value, () => d.value, () => e.settings]), B = Fe(() => {
-      if (!p.value && !v.value) return null;
+    }, [() => n.value, () => p.value, () => e.prefixCls, () => i.value, () => d.value, () => e.settings]), B = Fe(() => {
+      if (!p.value && !m.value) return null;
       const h = {
         [`${l.value}`]: !0,
         [`${e.prefixCls}-container`]: !0,
-        [`${e.prefixCls}-container-mobile`]: i.value
+        [`${e.prefixCls}-container-mobile`]: o.value
       };
       return s("div", {
         class: h
       }, [F.value, r.value]);
-    }, [() => i.value, () => v.value, () => p.value, () => F.value, () => e.prefixCls, () => r.value]);
+    }, [() => o.value, () => m.value, () => p.value, () => F.value, () => e.prefixCls, () => r.value]);
     return () => a(s("div", {
       class: `${e.prefixCls} ${l.value}`
     }, [B.value]));
   }
 });
-wt.inheritAttrs = !1;
-const Tt = /* @__PURE__ */ Te({
+Tt.inheritAttrs = !1;
+const wt = /* @__PURE__ */ we({
   setup() {
     const {
       isFullscreen: e
     } = bt();
-    return () => e.value ? s(we, {
+    return () => e.value ? s(Te, {
       title: "退出全屏"
     }, {
       default: () => [s(Wt, null, null)]
-    }) : s(we, {
+    }) : s(Te, {
       title: "全屏"
     }, {
-      default: () => [s(Ht, null, null)]
+      default: () => [s(kt, null, null)]
     });
   }
 });
@@ -1094,11 +1089,11 @@ function Nl() {
   return {
     reload: {
       text: "刷新",
-      icon: s(kt, null, null)
+      icon: s(Ht, null, null)
     },
     fullScreen: {
       text: "全屏",
-      icon: s(Tt, null, null)
+      icon: s(wt, null, null)
     }
   };
 }
@@ -1107,33 +1102,32 @@ function Yl(e, a) {
     const n = e[l];
     if (!n)
       return null;
-    let i = n === !0 ? a[l] : () => n?.();
-    if (typeof i != "function" && (i = () => {
+    let o = n === !0 ? a[l] : () => n?.();
+    if (typeof o != "function" && (o = () => {
     }), l === "fullScreen")
       return s("span", {
         key: l,
-        onClick: i
-      }, [s(Tt, null, null)]);
-    const o = Nl()[l];
-    return o ? s("span", {
+        onClick: o
+      }, [s(wt, null, null)]);
+    const i = Nl()[l];
+    return i ? s("span", {
       key: l,
-      onClick: i
-    }, [s(we, {
-      title: o.text
+      onClick: o
+    }, [s(Te, {
+      title: i.text
     }, {
-      default: () => [o.icon]
+      default: () => [i.icon]
     })]) : null;
   }).filter((l) => l);
 }
 const zl = {
   options: [Boolean, Object, Array],
   actionsPlacement: [String],
-  titleTip: [Function, Boolean, Object, String],
-  settingExtra: [Function, Boolean, Object, Array],
+  headerTitleTip: [Function, Boolean, Object, String],
   titleTipText: [String],
   actionsRender: [Array],
   headerTitle: [Function, Boolean, Object, Array, String]
-}, El = /* @__PURE__ */ Te({
+}, Ll = /* @__PURE__ */ we({
   props: zl,
   inheritAttrs: !1,
   setup(e) {
@@ -1147,26 +1141,26 @@ const zl = {
       fullScreen: () => l?.toggle()
     }, Q(e.options) ? e.options : {}), [() => e.options]);
     return () => {
-      const i = e.actionsRender || [];
-      return s(wt, {
+      const o = e.actionsRender || [];
+      return s(Tt, {
         prefixCls: a,
-        headerTitle: e.headerTitle,
-        actions: i,
+        actions: o,
         actionsPlacement: e.actionsPlacement,
-        settings: S(n),
-        titleTip: e.titleTip,
+        settings: T(n),
+        headerTitle: e.headerTitle,
+        headerTitleTip: e.headerTitleTip,
         titleTipText: e.titleTipText
       }, null);
     };
   }
 });
-function Ll(e) {
-  return jt();
+function El(e) {
+  return Ot();
 }
 function Ml(e, a = !0, l) {
-  Ll() ? ct(e, l) : a ? e() : Ot(e);
+  El() ? ct(e, l) : a ? e() : At(e);
 }
-function Wl({ scroll: e, columns: a, breakpoint: l, draggable: n, autoScroll: i, neverScroll: o }) {
+function Wl({ scroll: e, columns: a, breakpoint: l, draggable: n, autoScroll: o, neverScroll: i }) {
   const d = I([]);
   z([
     () => e.value,
@@ -1174,17 +1168,17 @@ function Wl({ scroll: e, columns: a, breakpoint: l, draggable: n, autoScroll: i,
     () => l.value,
     () => n.value,
     () => l.value,
-    () => i.value,
-    () => o.value
+    () => o.value,
+    () => i.value
   ], () => {
     const h = F(re(a.value));
-    Ee(h, re(d.value)) || (d.value = ee(h));
+    Le(h, re(d.value)) || (d.value = ee(h));
   }, {
     deep: !0,
     immediate: !0
   });
-  const v = C(() => {
-    const h = p(S(d).filter((b) => b.fixed === "left")), f = p(S(d).filter((b) => b.fixed !== "left" && b.fixed !== "right")), x = p(S(d).filter((b) => b.fixed === "right"));
+  const m = C(() => {
+    const h = p(T(d).filter((b) => b.fixed === "left")), f = p(T(d).filter((b) => b.fixed !== "left" && b.fixed !== "right")), x = p(T(d).filter((b) => b.fixed === "right"));
     return [
       ...h,
       ...f,
@@ -1196,13 +1190,13 @@ function Wl({ scroll: e, columns: a, breakpoint: l, draggable: n, autoScroll: i,
   }
   function F(h) {
     return ee(h).map((f, x) => {
-      if (f.dataIndex === "action" || x === h.length - 1 ? f.resizable = !1 : f.resizable = Re(f.resizable) ? f.resizable : !!(De(f.width) && S(n)), !f.width || S(o))
+      if (f.dataIndex === "action" || x === h.length - 1 ? f.resizable = !1 : f.resizable = Re(f.resizable) ? f.resizable : !!(De(f.width) && T(n)), !f.width || T(i))
         return f;
-      if (f.dataIndex === "action" && S(i))
-        if (S(e)?.x || !S(l))
+      if (f.dataIndex === "action" && T(o))
+        if (T(e)?.x || !T(l))
           f.width = f.width || 100, f.fixed = "right";
         else {
-          const b = S(a).find((A) => A.dataIndex === f.dataIndex);
+          const b = T(a).find((j) => j.dataIndex === f.dataIndex);
           f.width = b?.width || "", f.fixed = b?.fixed;
         }
       return f;
@@ -1216,108 +1210,108 @@ function Wl({ scroll: e, columns: a, breakpoint: l, draggable: n, autoScroll: i,
       d.value = [];
       return;
     }
-    Ee(F(h), re(d.value)) || (d.value = F(h));
+    Le(F(h), re(d.value)) || (d.value = F(h));
   }
   return {
     breakpoint: l,
-    proColumns: v,
+    proColumns: m,
     setColumns: B,
     resizeColumnWidth: r
   };
 }
-function Hl(e, a) {
-  const l = C(() => a), n = I(), i = I(e);
-  function o() {
+function kl(e, a) {
+  const l = C(() => a), n = I(), o = I(e);
+  function i() {
     n.value && (clearTimeout(n.value), n.value = null);
   }
-  async function d(...v) {
-    return l.value === 0 || l.value === void 0 ? i.value(...v) : (o(), new Promise(async (p) => {
-      v[0]?.immediate ? p(await i.value(...v)) : n.value = setTimeout(async () => {
-        p(await i.value(...v));
+  async function d(...m) {
+    return l.value === 0 || l.value === void 0 ? o.value(...m) : (i(), new Promise(async (p) => {
+      m[0]?.immediate ? p(await o.value(...m)) : n.value = setTimeout(async () => {
+        p(await o.value(...m));
       }, l.value);
     }));
   }
-  return Kt(o), {
-    cancel: o,
+  return Kt(i), {
+    cancel: i,
     run: d
   };
 }
-function kl(e) {
-  const a = C(() => e.rowKey), l = C(() => e.polling), n = C(() => e.debounceTime), i = C(() => e.dataSource), o = C(() => e.autoRequest);
+function Hl(e) {
+  const a = C(() => e.rowKey), l = C(() => e.polling), n = C(() => e.debounceTime), o = C(() => e.dataSource), i = C(() => e.autoRequest);
   return {
     rowKey: a,
     polling: l,
     request: e.request,
     postData: e.postData,
     debounceTime: n,
-    dataSource: i,
-    autoRequest: o
+    dataSource: o,
+    autoRequest: i
   };
 }
-function ql({ rowKey: e, autoRequest: a, polling: l, request: n, postData: i, dataSource: o, waitRequest: d, debounceTime: v }, { params: p, columns: F, setLoading: r, setColumns: B, removeRowKeys: h, syncSelectedRows: f, defaultFormSearch: x, setPagination: b, pageInfo: A, onRequestError: ie, onBeforeSearchSubmit: te, hasCustomRender: $e }, pe) {
-  const le = I(""), O = I(!1), me = I(!1), Y = I([]), G = I(), U = I(null), ne = ($ = !1) => {
-    (O.value || $) && r(!1), y(!1);
+function ql({ rowKey: e, autoRequest: a, polling: l, request: n, postData: o, dataSource: i, waitRequest: d, debounceTime: m }, { params: p, columns: F, setLoading: r, setColumns: B, removeRowKeys: h, syncSelectedRows: f, defaultFormSearch: x, setPagination: b, pageInfo: j, onRequestError: oe, onBeforeSearchSubmit: te, hasCustomRender: $e }, pe) {
+  const le = I(""), A = I(!1), me = I(!1), Y = I([]), G = I(), U = I(null), ne = ($ = !1) => {
+    (A.value || $) && r(!1), y(!1);
   }, be = async ($ = {}) => {
-    const { pagination: N, filters: D = {}, sorter: H = {}, removeKeys: ue = [], isPolling: Z = !1, extra: ce } = $;
+    const { pagination: N, filters: D = {}, sorter: k = {}, removeKeys: ue = [], isPolling: Z = !1, extra: ce } = $;
     if (!n || !ze(n))
-      return o.value || [];
+      return i.value || [];
     Z ? y(!0) : r(!0), N && b(N);
     try {
       ue.length && h(ue);
-      const k = Q(H) ? Object.keys(H).length ? [H] : [] : H;
-      B(S(F).map((Ce) => {
-        const xe = k.find((ve) => (ve?.columnKey || ve?.field) === Ce.dataIndex);
+      const H = Q(k) ? Object.keys(k).length ? [k] : [] : k;
+      B(T(F).map((Ce) => {
+        const xe = H.find((ve) => (ve?.columnKey || ve?.field) === Ce.dataIndex);
         return {
           ...Ce,
           sortOrder: xe?.order
         };
       }));
       let ye = {
-        ...re(A),
-        current: Ut(re(A), ue.length),
-        ...S(x),
-        ...S(p),
+        ...re(j),
+        current: Ut(re(j), ue.length),
+        ...T(x),
+        ...T(p),
         ...$.params
       };
       te && ze(te) && (ye = await te({
         params: ye,
-        sorter: k,
+        sorter: H,
         filter: D,
         extra: ce
       }));
       let de = [];
       const Be = `table_request_${gt().uuid(10)}`;
       le.value = Be;
-      const oe = await n?.({
+      const ie = await n?.({
         params: ee(re(ye)),
-        sorter: k,
+        sorter: H,
         filter: D,
         extra: ce
       });
       if (le.value !== Be)
         return [];
-      if (oe) {
-        const { success: Ce = !0, data: xe = [] } = oe;
+      if (ie) {
+        const { success: Ce = !0, data: xe = [] } = ie;
         if (!Ce)
           return [];
-        de = typeof i == "function" ? await i?.(xe) : xe, f(de);
-        const ve = oe.total || de?.length || 0;
-        ve !== A.total && b({
+        de = typeof o == "function" ? await o?.(xe) : xe, f(de);
+        const ve = ie.total || de?.length || 0;
+        ve !== j.total && b({
           total: ve
         });
-        const he = S(Y).map((Me) => Ie(Me, "sortIndex"));
-        return Ee(de, he) ? S(Y) : (R(de), de);
+        const he = T(Y).map((Me) => Ie(Me, "sortIndex"));
+        return Le(de, he) ? T(Y) : (R(de), de);
       } else
         return [];
-    } catch (k) {
-      if (ie === void 0)
-        throw new Error(k);
-      Y.value === void 0 && R([]), ie(k);
+    } catch (H) {
+      if (oe === void 0)
+        throw new Error(H);
+      Y.value === void 0 && R([]), oe(H);
     } finally {
       ne(!0);
     }
     return [];
-  }, J = Hl(async ($ = {}) => {
+  }, J = kl(async ($ = {}) => {
     if (G.value && clearTimeout(G.value), !n)
       return;
     const N = new AbortController();
@@ -1333,57 +1327,57 @@ function ql({ rowKey: e, autoRequest: a, polling: l, request: n, postData: i, da
       ]);
       if (N.signal.aborted)
         return;
-      const H = _t(l.value, D);
-      return H && !O.value && (G.value = setTimeout(() => {
-        J.run({ ...$, isPolling: H });
-      }, Math.max(H, 2e3))), D;
+      const k = _t(l.value, D);
+      return k && !A.value && (G.value = setTimeout(() => {
+        J.run({ ...$, isPolling: k });
+      }, Math.max(k, 2e3))), D;
     } catch (D) {
       if (D === "aborted")
         return;
       throw D;
     }
-  }, v.value || 30), q = () => {
+  }, m.value || 30), q = () => {
     U.value?.abort(), J.cancel(), ne();
   };
-  At(() => {
-    O.value = !1;
+  jt(() => {
+    A.value = !1;
   }), ct(() => {
-    O.value = !1;
+    A.value = !1;
   }), Nt(() => {
-    q(), O.value = !0, clearTimeout(G.value);
+    q(), A.value = !0, clearTimeout(G.value);
   }), Yt(() => {
-    q(), O.value = !0, clearTimeout(G.value);
+    q(), A.value = !0, clearTimeout(G.value);
   }), z(() => l.value, () => {
     d.value || (l.value ? J.run({ isPolling: !0 }) : clearTimeout(G.value));
   }, { immediate: !0 }), z(() => d.value, () => {
     d.value ? r(!0) : J.run({ isPolling: !1 });
-  }, { immediate: !0 }), z(() => o.value, () => {
-    o.value && R(o.value || []);
+  }, { immediate: !0 }), z(() => i.value, () => {
+    i.value && R(i.value || []);
   }, { deep: !0, immediate: !0 }), z(() => p.value, () => {
     d.value || a.value && (b({ current: 1 }), se());
   }, { deep: !0, immediate: !0 }), z(() => x.value, ($, N) => {
-    d.value || Ee($, N) || (b({ current: 1 }), se());
+    d.value || Le($, N) || (b({ current: 1 }), se());
   }, { deep: !0, immediate: !0 });
   function se() {
-    n ? l.value || (q(), J.run({ isPolling: !1 })) : R(o.value || []);
+    n ? l.value || (q(), J.run({ isPolling: !1 })) : R(i.value || []);
   }
   const t = C(() => {
     if ($e.value)
-      return S(Y);
+      return T(Y);
     const $ = F.value.filter((N) => N.show || N.show === void 0);
-    return !S(Y) || !$ || $.length === 0 ? [] : S(Y);
-  }), u = C(() => S(Y).some(($) => K($.children) && $.children.length > 0));
+    return !T(Y) || !$ || $.length === 0 ? [] : T(Y);
+  }), u = C(() => T(Y).some(($) => K($.children) && $.children.length > 0));
   function y($) {
     me.value = $;
   }
-  function g($, N = {}, D = {}, H) {
-    q(), J.run({ pagination: $, filters: N, sorter: D, extra: H, isPolling: !1 });
+  function g($, N = {}, D = {}, k) {
+    q(), J.run({ pagination: $, filters: N, sorter: D, extra: k, isPolling: !1 });
   }
   function R($) {
-    const N = Qt(ee($), re(A));
+    const N = Qt(ee($), re(j));
     if (Y.value = N, !n || !ze(n)) {
       const D = N.length || 0;
-      D !== A.total && b({
+      D !== j.total && b({
         total: D
       });
     }
@@ -1393,10 +1387,10 @@ function ql({ rowKey: e, autoRequest: a, polling: l, request: n, postData: i, da
     isTreeDataRef: u,
     setTableDataList: R,
     operateTableDataRow: ($) => {
-      const { key: N, row: D, value: H, type: ue = "update" } = $, Z = N ?? e.value, ce = D?.[Z] ?? H;
+      const { key: N, row: D, value: k, type: ue = "update" } = $, Z = N ?? e.value, ce = D?.[Z] ?? k;
       switch (!D && ue !== "delete" && console.warn("row is required"), ue) {
         case "update":
-          Z && ce && D && (Y.value = Y.value.map((k) => ce === k[Z] ? Se(k, D) : k));
+          Z && ce && D && (Y.value = Y.value.map((H) => ce === H[Z] ? Se(H, D) : H));
           break;
         case "push":
           D && Y.value.push(D);
@@ -1405,7 +1399,7 @@ function ql({ rowKey: e, autoRequest: a, polling: l, request: n, postData: i, da
           D && Y.value.unshift(D);
           break;
         case "delete":
-          Z && (Y.value = Y.value.filter((k) => H !== k[Z]));
+          Z && (Y.value = Y.value.filter((H) => k !== H[Z]));
           break;
       }
     },
@@ -1417,14 +1411,14 @@ function ql({ rowKey: e, autoRequest: a, polling: l, request: n, postData: i, da
 }
 function Kl(e) {
   const a = I(l(e.loading.value));
-  z(() => e.loading.value, (i) => {
-    a.value = l(i, a.value);
+  z(() => e.loading.value, (o) => {
+    a.value = l(o, a.value);
   });
-  function l(i, o = !1) {
-    return Re(i) ? i : Q(i) ? i?.spinning ?? o : o;
+  function l(o, i = !1) {
+    return Re(o) ? o : Q(o) ? o?.spinning ?? i : i;
   }
-  function n(i) {
-    a.value = i;
+  function n(o) {
+    a.value = o;
   }
   return [a, n];
 }
@@ -1442,44 +1436,44 @@ function Vl({
 }) {
   const l = I({
     ...Ge
-  }), n = Ue(Le(Ge, ["current", "pageSize", "total"]));
+  }), n = Ue(Ee(Ge, ["current", "pageSize", "total"]));
   z(() => e.value, () => {
     if (e.value === !1) {
       l.value = !1;
       return;
     }
-    const o = ze(a) ? {
+    const i = ze(a) ? {
       itemRender: ({
-        page: v,
+        page: m,
         type: p,
         originalElement: F
       }) => a ? a({
-        page: v,
+        page: m,
         type: p,
         originalElement: F
       }) : null
     } : null, d = {
       ...Ge,
       ...e.value || {},
-      ...o || {}
+      ...i || {}
     };
-    e.value?.showTotal || (d.showTotal = (v) => `共${v < d.pageSize ? 1 : Math.ceil(v / (d.pageSize || 10))}页 ${v}条记录`), l.value = d, Object.assign(n, Le(d, ["current", "pageSize", "total"]));
+    e.value?.showTotal || (d.showTotal = (m) => `共${m < d.pageSize ? 1 : Math.ceil(m / (d.pageSize || 10))}页 ${m}条记录`), l.value = d, Object.assign(n, Ee(d, ["current", "pageSize", "total"]));
   }, {
     deep: 1,
     immediate: !0
   });
-  function i(o) {
-    if (Q(l.value) && Q(o)) {
+  function o(i) {
+    if (Q(l.value) && Q(i)) {
       const d = {};
-      Object.keys(o).forEach((v) => {
-        Object.prototype.hasOwnProperty.call(o, v) && l.value[v] === o[v] || (d[v] = o[v]);
+      Object.keys(i).forEach((m) => {
+        Object.prototype.hasOwnProperty.call(i, m) && l.value[m] === i[m] || (d[m] = i[m]);
       }), Object.keys(d).length > 0 && (Object.assign(l.value, d), Gl(d) && Object.assign(n, d));
     }
   }
   return {
     paginationInfo: l,
     requestPagination: n,
-    setPagination: i
+    setPagination: o
   };
 }
 function Gl(e) {
@@ -1501,23 +1495,23 @@ function Xl(e, a) {
     deep: !0,
     immediate: !0
   });
-  const i = (r, B) => {
+  const o = (r, B) => {
     const h = a.value?.type || "checkbox";
     e.value && (B ? r?.[e.value] && h === "checkbox" ? (l.value.push(r[e.value]), n.value.push(r)) : (l.value = [r[e.value]], n.value = [r]) : (l.value = l.value.filter((f) => f !== r[e.value]), n.value = n.value.filter((f) => f[e.value] !== r[e.value])));
-  }, o = () => {
+  }, i = () => {
     a.value && a.value?.onChange?.(l.value, n.value);
   };
   return {
     selectedKeys: l,
     selectedItems: n,
-    selectRowKey: i,
+    selectRowKey: o,
     selectAllRowKey: (r, B, h) => {
       e.value && (r ? B.map((f) => (l.value.every((x) => x !== f?.[e.value]) && f?.[e.value] && (l.value.push(f[e.value]), n.value.push(f)), f)) : h.map((f) => (l.value.includes(f?.[e.value]) && (l.value = l.value.filter((x) => x !== f[e.value]), n.value = n.value.filter((x) => x[e.value] !== f[e.value])), f)));
     },
     removeRowKeys: (r) => {
-      l.value = l.value.filter((B) => !r.includes(B)), n.value = n.value.filter((B) => !r.includes(B?.[e.value || ""])), o();
+      l.value = l.value.filter((B) => !r.includes(B)), n.value = n.value.filter((B) => !r.includes(B?.[e.value || ""])), i();
     },
-    changeRowKey: o,
+    changeRowKey: i,
     syncSelectedRows: (r) => {
       if (e.value && l.value.length !== n.value.length) {
         const B = n.value.map((f) => f[e.value]), h = l.value.filter((f) => !B.includes(f));
@@ -1527,7 +1521,7 @@ function Xl(e, a) {
       }
     },
     clearAllRowKeys: () => {
-      l.value = [], n.value = [], o();
+      l.value = [], n.value = [], i();
     }
   };
 }
@@ -1535,40 +1529,40 @@ function _l(e) {
   const a = {};
   return e.forEach((l) => {
     let n = l.initialValue;
-    const i = ["select", "number"], o = ["date", "time", "dateRange"], d = ["treeSelect", "numberRange"];
-    l.valueType ? !n && i.includes(l.valueType) ? n = void 0 : !n && o.includes(l.valueType) ? n = null : !n && d.includes(l.valueType) ? n = [] : n || (n = "") : n || (n = ""), l.name === "dateRange" ? (a[l.rangeStartName || "start"] = n ? n[0] : null, a[l.rangeEndName || "end"] = n ? n[1] : null) : l.name && (a[l.name] = n);
+    const o = ["select", "number"], i = ["date", "time", "dateRange"], d = ["treeSelect", "numberRange"];
+    l.valueType ? !n && o.includes(l.valueType) ? n = void 0 : !n && i.includes(l.valueType) ? n = null : !n && d.includes(l.valueType) ? n = [] : n || (n = "") : n || (n = ""), l.name === "dateRange" ? (a[l.rangeStartName || "start"] = n ? n[0] : null, a[l.rangeEndName || "end"] = n ? n[1] : null) : l.name && (a[l.name] = n);
   }), a;
 }
 function Ql({ searchMap: e, columns: a }) {
   const l = I([]), n = I({});
-  function i(o) {
-    o.forEach((v) => {
-      l.value.some((p) => p.name === v.name) ? l.value = l.value.map((p) => p.name === v.name ? { ...p, ...v } : p) : l.value.push(v);
+  function o(i) {
+    i.forEach((m) => {
+      l.value.some((p) => p.name === m.name) ? l.value = l.value.map((p) => p.name === m.name ? { ...p, ...m } : p) : l.value.push(m);
     });
-    const d = _l(o);
+    const d = _l(i);
     n.value = { ...n.value, ...d };
   }
   return z(() => e.value, () => {
-    const o = [];
-    e.value?.forEach((d) => o.push(d)), i(o);
+    const i = [];
+    e.value?.forEach((d) => i.push(d)), o(i);
   }, { deep: !0, immediate: !0 }), z(() => a.value, () => {
-    const o = [];
+    const i = [];
     a.value && a.value?.length && a.value.forEach((d) => {
-      d.searchConfig && o.push(d.searchConfig);
-    }), i(o);
+      d.searchConfig && i.push(d.searchConfig);
+    }), o(i);
   }, { deep: !0, immediate: !0 }), { formCols: l, defaultFormSearch: n };
 }
-function Ul({ scroll: e, columns: a, autoScroll: l, modalScroll: n, neverScroll: i, rowSelection: o, screens: d, innerWidth: v, scrollBreakpoint: p }) {
-  const F = C(() => p.value ? De(p.value) ? v.value > p.value : pt(p.value) ? d.value?.[p.value] : d.value?.xl : d.value?.xl), r = C(() => {
+function Ul({ scroll: e, columns: a, autoScroll: l, modalScroll: n, neverScroll: o, rowSelection: i, screens: d, innerWidth: m, scrollBreakpoint: p }) {
+  const F = C(() => p.value ? De(p.value) ? m.value > p.value : pt(p.value) ? d.value?.[p.value] : d.value?.xl : d.value?.xl), r = C(() => {
     let h = 0;
-    const f = S(o) ? 60 : 0, x = 150, b = ee(S(a));
+    const f = T(i) ? 60 : 0, x = 150, b = ee(T(a));
     b.forEach((te) => {
       h += Number.parseInt(String(te.width)) || 0;
     });
-    const ie = b.filter((te) => !Reflect.has(te, "width")).length;
-    return ie !== 0 && (h += ie * x), f && (h += f), h;
+    const oe = b.filter((te) => !Reflect.has(te, "width")).length;
+    return oe !== 0 && (h += oe * x), f && (h += f), h;
   });
-  return { proScroll: C(() => i.value ? {} : e.value && ht(e.value).length ? S(e) : n.value ? {
+  return { proScroll: C(() => o.value ? {} : e.value && ht(e.value).length ? T(e) : n.value ? {
     y: e.value?.y || (d.value?.xl ? 400 : 235)
   } : l.value ? F.value ? {} : Re(F.value) ? { x: r.value } : {} : {}), breakpoint: F };
 }
@@ -1597,12 +1591,8 @@ const Xe = (e) => ({
   const a = `${e.antCls}-table`;
   return {
     [e.componentCls]: {
-      [`${a}-cell a`]: {
-        cursor: "pointer",
-        color: e.colorText,
-        "&:hover": {
-          color: e.colorPrimaryHover
-        }
+      "&-header-after": {
+        marginBlockEnd: e.margin
       },
       "&-a": {
         cursor: "pointer",
@@ -1809,10 +1799,10 @@ function ea(e) {
 }
 function ta(e, a, l, n) {
   if (!a) return e;
-  let i = e;
+  let o = e;
   if (Q(a)) {
-    const o = a.node === "a" ? "span" : a.node;
-    return s(o, W(a?.attr || {}, {
+    const i = a.node === "a" ? "span" : a.node;
+    return s(i, W(a?.attr || {}, {
       class: [a.class, a.node === "a" ? `${l}-a` : ""],
       onClick: a.click
     }), ea(e) ? e : {
@@ -1821,28 +1811,28 @@ function ta(e, a, l, n) {
   }
   switch (a) {
     case "link":
-      i = s("span", {
+      o = s("span", {
         class: [`${l}-a`, n]
       }, [e]);
       break;
     case "time":
-      i = V(e).format("HH:mm:ss");
+      o = V(e).format("HH:mm:ss");
       break;
     case "dateMonth":
-      i = `${V(e).month() + 1}月`;
+      o = `${V(e).month() + 1}月`;
       break;
     case "date":
-      i = V(e).format("YYYY-MM-DD");
+      o = V(e).format("YYYY-MM-DD");
       break;
     case "dateTime":
-      i = V(e).format("YYYY-MM-DD HH:mm:ss");
+      o = V(e).format("YYYY-MM-DD HH:mm:ss");
       break;
   }
-  return i;
+  return o;
 }
 function la(e, a) {
   const l = a && a.current || 1, n = a && a.pageSize || 10;
-  return e.filter((i, o) => o < l * n && o >= n * (l - 1));
+  return e.filter((o, i) => i < l * n && i >= n * (l - 1));
 }
 function aa(e) {
   const a = document.createElement("textarea");
@@ -1851,10 +1841,10 @@ function aa(e) {
 function na(e) {
   return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !_(e);
 }
-const oa = {
+const ia = {
   reload: !0,
   fullScreen: !0
-}, ia = dl.useToken, _e = /* @__PURE__ */ Te({
+}, oa = dl.useToken, _e = /* @__PURE__ */ we({
   name: "GProTable",
   inheritAttrs: !1,
   props: ge,
@@ -1864,39 +1854,39 @@ const oa = {
     emit: a,
     slots: l,
     attrs: n,
-    expose: i
+    expose: o
   }) {
-    const o = vt({
+    const i = vt({
       suffixCls: "table",
       isPor: !0
     }), {
       wrapSSR: d,
-      hashId: v
-    } = Je("ProBaseTable", [Zl], o), {
+      hashId: m
+    } = Je("ProBaseTable", [Zl], i), {
       token: p
-    } = ia(), F = Gt(), r = ft(), {
+    } = oa(), F = Gt(), r = ft(), {
       width: B
-    } = il(), h = I(!1), f = dt(), x = I(), b = I(), A = I(e.waitRequest);
-    zt(() => A.value = e.waitRequest);
+    } = ol(), h = I(!1), f = dt(), x = I(), b = I(), j = I(e.waitRequest);
+    zt(() => j.value = e.waitRequest);
     const {
-      toggle: ie,
+      toggle: oe,
       isFullscreen: te
     } = bt(x), $e = C(() => !r.value.xl), pe = C(() => (e.virtualScroll && pl(!e.scroll?.y, "参数scroll的Y值不能为空！"), !!(e.scroll?.y && e.virtualScroll))), le = C(() => {
       if (e.form === !1) return !1;
-      const m = {
+      const v = {
         actions: {
           resetReload: !0
         },
         resetText: "重置",
         searchText: "查询"
       };
-      return Q(e.form) ? Se(m, e.form) : m;
-    }), O = C(() => le.value === !1 ? {} : le.value), me = C(() => O.value?.autoRequest ?? e.autoRequest), Y = C(() => O.value?.actions), G = C(() => {
-      const m = e.columns.filter((T) => T.key || T.dataIndex).map((T) => {
-        const w = T.key || T.dataIndex;
-        return T.key = w, T.dataIndex = w, T.align = T.align || e.align, T.uuid = T.uuid || gt().uuid(15), T;
+      return Q(e.form) ? Se(v, e.form) : v;
+    }), A = C(() => le.value === !1 ? {} : le.value), me = C(() => A.value?.autoRequest ?? e.autoRequest), Y = C(() => A.value?.actions), G = C(() => {
+      const v = e.columns.filter((w) => w.key || w.dataIndex).map((w) => {
+        const S = w.key || w.dataIndex;
+        return w.key = S, w.dataIndex = S, w.align = w.align || e.align, w.uuid = w.uuid || gt().uuid(15), w;
       });
-      return Zt(m, {
+      return Zt(v, {
         align: e.align || "left",
         showIndex: e.showIndex ?? !1
       });
@@ -1910,7 +1900,7 @@ const oa = {
       setPagination: t
     } = Vl({
       pagination: M(e, "pagination"),
-      pageItemRender: ot({
+      pageItemRender: it({
         slots: l,
         props: e,
         key: "pageItemRender"
@@ -1947,15 +1937,15 @@ const oa = {
       columns: G
     }), {
       selectedKeys: D,
-      selectedItems: H,
+      selectedItems: k,
       changeRowKey: ue,
       selectRowKey: Z,
       selectAllRowKey: ce,
-      syncSelectedRows: k,
+      syncSelectedRows: H,
       removeRowKeys: ye,
       clearAllRowKeys: de
-    } = Xl(M(e, "rowKey"), M(e, "rowSelection")), Be = kl(e), {
-      run: oe,
+    } = Xl(M(e, "rowKey"), M(e, "rowSelection")), Be = Hl(e), {
+      run: ie,
       setTableDataList: Ce,
       operateTableDataRow: xe,
       isTreeDataRef: ve,
@@ -1963,13 +1953,13 @@ const oa = {
       handleTableChange: Me
     } = ql({
       ...Be,
-      waitRequest: A
+      waitRequest: j
     }, {
       loading: U,
       pageInfo: se,
       setPagination: t,
       removeRowKeys: ye,
-      syncSelectedRows: k,
+      syncSelectedRows: H,
       setLoading: ne,
       setColumns: R,
       columns: g,
@@ -1979,87 +1969,87 @@ const oa = {
       onBeforeSearchSubmit: e.onBeforeSearchSubmit,
       hasCustomRender: C(() => qe(e.customRender || l?.customRender))
     }, a), Rt = C(() => ({
-      size: S(be),
-      scroll: S(u),
-      dataSource: S(he),
-      pagination: S(q),
+      size: T(be),
+      scroll: T(u),
+      dataSource: T(he),
+      pagination: T(q),
       virtualScroll: pe.value,
-      columns: S(g).filter((m) => m.show || m.show === void 0)
+      columns: T(g).filter((v) => v.show || v.show === void 0)
     })), et = C(() => {
-      const m = Q(e.loading) ? Ie(e.loading, "spinning") : {};
-      return !m.indicator && f?.indicator?.value && (m.indicator = f?.indicator?.value), {
+      const v = Q(e.loading) ? Ie(e.loading, "spinning") : {};
+      return !v.indicator && f?.indicator?.value && (v.indicator = f?.indicator?.value), {
         spinning: e.showLoading ? qe(U.value) : !1,
-        ...m
+        ...v
       };
     }), tt = C(() => {
-      let m;
-      const T = e.direction === "rtl" ? "bottomLeft" : "right", w = S(q)?.position;
-      if (w !== null && Array.isArray(w)) {
-        const P = w.find((X) => X.includes("top")), j = w.find((X) => X.includes("bottom")), L = w.every((X) => `${X}` == "none");
-        !P && !j && !L && (m = T), P && (m = P.toLowerCase().replace("top", "")), j && (m = j.toLowerCase().replace("bottom", ""));
+      let v;
+      const w = e.direction === "rtl" ? "bottomLeft" : "right", S = T(q)?.position;
+      if (S !== null && Array.isArray(S)) {
+        const P = S.find((X) => X.includes("top")), O = S.find((X) => X.includes("bottom")), E = S.every((X) => `${X}` == "none");
+        !P && !O && !E && (v = w), P && (v = P.toLowerCase().replace("top", "")), O && (v = O.toLowerCase().replace("bottom", ""));
       } else
-        m = T;
-      return m;
+        v = w;
+      return v;
     });
     Ml(() => {
-      h.value && e.keepAliveReload ? oe() : h.value = !0;
+      h.value && e.keepAliveReload ? ie() : h.value = !0;
     });
-    const $t = async (m, T) => {
+    const $t = async (v, w) => {
       if (me.value) {
-        oe({
-          params: m
+        ie({
+          params: v
         });
         return;
       }
-      T === "reset" ? (a("reset", m), e.request && Y.value?.resetReload && oe({
-        params: m
-      })) : e.request && (a("submit", m), oe({
-        params: m
+      w === "reset" ? (a("reset", v), e.request && Y.value?.resetReload && ie({
+        params: v
+      })) : e.request && (a("submit", v), ie({
+        params: v
       }));
-    }, We = (m, T, w, P) => {
-      t(Le(m, ["current", "pageSize"])), Me(m, T, w, P), a("change", m, T, w, P);
-    }, Pt = (m) => {
-      a("expandedRowsChange", m);
-    }, Ft = (m, T) => {
-      a("expand", m, T);
-    }, Dt = (m, T) => c(m, T), It = (m, T, w) => {
-      let P = m;
-      if (T) {
-        const j = K(m) ? typeof m?.[0]?.children == "string" ? m?.[0]?.children : "" : m ? m.toString() : "", L = w.tooltip === !1 ? {} : w.tooltip, X = w.tooltip === !1 ? 1 : De(L?.hiddenLine) && L?.hiddenLine > 0 ? L?.hiddenLine : 1, E = w.tooltip === !1 ? 0 : De(L?.width) ? L?.width : 0, Oe = w.tooltip !== !1 && pt(j) && E > 0 ? ll(j, {
+    }, We = (v, w, S, P) => {
+      t(Ee(v, ["current", "pageSize"])), Me(v, w, S, P), a("change", v, w, S, P);
+    }, Pt = (v) => {
+      a("expandedRowsChange", v);
+    }, Ft = (v, w) => {
+      a("expand", v, w);
+    }, Dt = (v, w) => c(v, w), It = (v, w, S) => {
+      let P = v;
+      if (w) {
+        const O = K(v) ? typeof v?.[0]?.children == "string" ? v?.[0]?.children : "" : v ? v.toString() : "", E = S.tooltip === !1 ? {} : S.tooltip, X = S.tooltip === !1 ? 1 : De(E?.hiddenLine) && E?.hiddenLine > 0 ? E?.hiddenLine : 1, L = S.tooltip === !1 ? 0 : De(E?.width) ? E?.width : 0, Ae = S.tooltip !== !1 && pt(O) && L > 0 ? ll(O, {
           cssObject: {
             fontSize: "14px",
             lineHeight: "22px",
             fontFamily: F?.token?.value?.fontFamily || p?.value?.fontFamily,
-            ...L?.targetStyle || {}
+            ...E?.targetStyle || {}
           }
-        }) : 0, je = document.querySelector(`.${o} .ant-table-tbody`), Ae = s("div", {
-          class: `${o}-ellipsis-text`
-        }, [m]), at = () => w.tooltip === !1 || Q(w.tooltip) && Oe < E && E > 0 ? Ae : s(we, W({
-          title: m,
-          getPopupContainer: (He) => je ?? He?.parentNode?.parentNode
-        }, Q(w.tooltip) ? w.tooltip : {}, {
+        }) : 0, Oe = document.querySelector(`.${i} .ant-table-tbody`), je = s("div", {
+          class: `${i}-ellipsis-text`
+        }, [v]), at = () => S.tooltip === !1 || Q(S.tooltip) && Ae < L && L > 0 ? je : s(Te, W({
+          title: v,
+          getPopupContainer: (ke) => Oe ?? ke?.parentNode?.parentNode
+        }, Q(S.tooltip) ? S.tooltip : {}, {
           destroyTooltipOnHide: !0
-        }), na(Ae) ? Ae : {
-          default: () => [Ae]
+        }), na(je) ? je : {
+          default: () => [je]
         });
         if (P = s("div", {
-          class: `${o}-ellipsis ${L?.class ?? ""}`,
+          class: `${i}-ellipsis ${E?.class ?? ""}`,
           style: {
             "-webkit-line-clamp": X
           }
-        }, [at()]), w.copyable) {
-          const He = typeof w.copyText == "function" ? w.copyText?.(w) : w.copyText || j;
+        }, [at()]), S.copyable) {
+          const ke = typeof S.copyText == "function" ? S.copyText?.(S) : S.copyText || O;
           P = s("div", {
-            class: `${o}-copyable`
+            class: `${i}-copyable`
           }, [s("div", {
-            class: `${o}-ellipsis ${L?.class ?? ""}`,
+            class: `${i}-ellipsis ${E?.class ?? ""}`,
             style: {
               "-webkit-line-clamp": X
             }
           }, [at()]), s(qt, {
-            class: `${o}-copyable-icon`,
+            class: `${i}-copyable-icon`,
             onClick: () => {
-              aa(He), vl.success("复制成功");
+              aa(ke), vl.success("复制成功");
             }
           }, null)]);
         }
@@ -2067,32 +2057,32 @@ const oa = {
       return P;
     };
     function lt() {
-      const m = al({
+      const v = al({
         slots: l,
         props: e,
         key: "emptyText"
       });
-      if (m !== !1 && f?.emptyText?.value !== !1) {
-        const w = e.emptyTextProps?.extraProps || {}, P = m || f?.emptyText?.value, j = _(P), L = j ? st(P, w) : mt(K(P) ? P : [P]);
+      if (v !== !1 && f?.emptyText?.value !== !1) {
+        const S = e.emptyTextProps?.extraProps || {}, P = v || f?.emptyText?.value, O = _(P), E = O ? st(P, S) : mt(K(P) ? P : [P]);
         return s("div", {
-          class: ae(`${o}-empty-text`, v.value, e.emptyTextProps?.class),
+          class: ae(`${i}-empty-text`, m.value, e.emptyTextProps?.class),
           style: e.emptyTextProps?.style
-        }, [j ? L : K(L) ? L.map((X) => Qe(X, w)) : s(hl, null, null)]);
+        }, [O ? E : K(E) ? E.map((X) => Qe(X, S)) : s(hl, null, null)]);
       }
       return null;
     }
     const Bt = () => {
-      const m = ot({
+      const v = it({
         slots: l,
         props: e,
         key: "customRender"
       });
-      if (m) {
+      if (v) {
         if (he.value?.length) {
-          const T = ee(S(he));
-          return m?.({
-            dataSource: T,
-            currentData: la(T, q.value)
+          const w = ee(T(he));
+          return v?.({
+            dataSource: w,
+            currentData: la(w, q.value)
           });
         }
         return lt();
@@ -2104,25 +2094,25 @@ const oa = {
       columns: g,
       cacheColumns: G,
       isMobile: $e,
-      formConfig: O,
+      formConfig: A,
       formAutoRequest: me,
       formActions: Y,
       action: {
         setTableSize: J,
-        reload: (m) => oe(m),
-        toggle: ie
+        reload: (v) => ie(v),
+        toggle: oe
       },
       setPagination: t
-    }), i({
+    }), o({
       formRef: () => ({
         getFormSearch: () => ({
-          ...S(N),
+          ...T(N),
           ...b.value?.getFormSearch(),
           ...e.params
         }),
         getFormInnerState: () => b.value?.getFormSearch() || {},
-        restFormState: (m) => {
-          A.value = !0, m && m?.(), b.value?.resetForm(!1), A.value = !1;
+        restFormState: (v) => {
+          j.value = !0, v && v?.(), b.value?.resetForm(!1), j.value = !1;
         }
       }),
       actionRef: () => ({
@@ -2131,21 +2121,21 @@ const oa = {
         pageInfo: se,
         pagination: q.value,
         selectedKeys: C(() => D.value),
-        selectedItems: C(() => H.value),
+        selectedItems: C(() => k.value),
         rowsSelection: {
           clear: de,
           select: Z,
           remove: ye,
-          sync: k,
+          sync: H,
           selectAll: ce
         },
-        reload: oe,
-        getLoadingStatus: () => S(U),
-        reloadAndReset: async (m) => {
-          A.value = !0, t({
+        reload: ie,
+        getLoadingStatus: () => T(U),
+        reloadAndReset: async (v) => {
+          j.value = !0, t({
             current: 1,
             pageSize: se?.pageSize || 10
-          }), m && m?.callBack && (m.wait ? await m.callBack() : m.callBack()), b.value?.resetForm(!0), A.value = !1;
+          }), v && v?.callBack && (v.wait ? await v.callBack() : v.callBack()), b.value?.resetForm(!0), j.value = !1;
         },
         setPageInfo: We,
         setTableDataList: Ce,
@@ -2154,68 +2144,69 @@ const oa = {
         setLoading: ne
       })
     }), () => {
-      const m = qe(e.customRender || l.customRender), T = l.actions?.() || e.actionProps?.actions, w = el({
+      const v = qe(e.customRender || l.customRender), w = l.actions?.() || e.actionProps?.actions, S = el({
         slots: l,
         props: e,
-        keys: ["headerTitle", "titleTip", "settingExtra"],
+        keys: ["headerTitle", "headerTitleTip", "headerAfter"],
         render: !0
       });
       return d(s("div", {
         ref: x,
         class: ae([{
-          [`${v.value}`]: !0,
-          [`${o}`]: !0,
+          [`${m.value}`]: !0,
+          [`${i}`]: !0,
           [`${n.class}`]: n.class,
-          [`${o}-beautify-scroll`]: Re(e.useDefaultScrollStyle) ? !e.useDefaultScrollStyle : !0,
-          [`${o}-no-scroll`]: !Object.keys(S(u) || {}).length,
-          [`${o}-table-tree`]: ve.value,
-          [`${o}-full-screen`]: te.value
+          [`${i}-beautify-scroll`]: Re(e.useDefaultScrollStyle) ? !e.useDefaultScrollStyle : !0,
+          [`${i}-no-scroll`]: !Object.keys(T(u) || {}).length,
+          [`${i}-table-tree`]: ve.value,
+          [`${i}-full-screen`]: te.value
         }]),
         style: n.style
       }, [s("div", {
-        class: [`${o}-content`, v.value]
-      }, [($.value.length > 0 || !!l.form) && e.form !== !1 && s(Ol, {
+        class: [`${i}-content`, m.value]
+      }, [($.value.length > 0 || !!l.form) && e.form !== !1 && s(Al, {
         ref: b,
         modalScroll: e.modalScroll,
         cardBordered: e.cardBordered,
         formCols: $.value,
-        prefixCls: o,
-        loading: S(U),
+        prefixCls: i,
+        loading: T(U),
         onSearch: $t,
         defaultFormSearch: N.value
       }, {
         default: l.form ? () => l.form?.() : null
       }), s("div", {
-        class: ae(v.value, `${o}-card`, e.cardBordered && `${o}-card-border`)
-      }, [s(El, {
+        class: ae(m.value, `${i}-card`, e.cardBordered && `${i}-card-border`)
+      }, [s(Ll, {
         options: e.options ? {
-          ...oa,
+          ...ia,
           ...Q(e.options) ? e.options : {}
         } : !1,
         titleTipText: e.titleTipText,
         actionsPlacement: e.actionProps?.placement,
-        actionsRender: T,
-        headerTitle: w.headerTitle,
-        titleTip: w.titleTip,
-        settingExtra: w.settingExtra
-      }, null), m ? s(Ct, et.value, {
+        actionsRender: w,
+        headerTitle: S.headerTitle,
+        headerTitleTip: S.headerTitleTip
+      }, null), S.headerAfter && s("div", {
+        class: `${i}-header-after ${m.value}`
+      }, [S.headerAfter]), v ? s(Ct, et.value, {
         default: () => [s("div", {
-          class: `${o}-wrapper ${v.value}`
+          class: `${i}-wrapper ${m.value}`
         }, [s("div", {
-          class: ae(`${o}-list`, v.value, e.tableProps?.class),
+          class: ae(`${i}-list`, m.value, e.tableProps?.class),
           style: e.tableProps?.style
         }, [Bt()]), e.pagination !== !1 && he.value?.length > 0 && s(fl, W({
           class: {
-            [`${o}-pagination ${v.value}`]: !0,
-            [`${o}-pagination-${tt.value} ${v.value}`]: !!tt.value
+            [`${i}-pagination ${m.value}`]: !0,
+            [`${i}-pagination-${tt.value} ${m.value}`]: !!tt.value
           }
-        }, re(S(q)), {
-          onChange: (P, j) => We({
+        }, re(T(q)), {
+          onChange: (P, O) => We({
             current: P,
-            pageSize: j
+            pageSize: O
           })
         }), null)])]
-      }) : s(ml, W(Le(e, Object.keys(St)), Rt.value, {
+      }) : s(ml, W(Ee(e, Object.keys(St)), Rt.value, {
         style: e.tableProps?.style,
         class: e.tableProps?.class,
         loading: et.value,
@@ -2223,18 +2214,18 @@ const oa = {
         transformCellText: (P) => {
           e.transformCellText && typeof e.transformCellText && e.transformCellText?.(P);
           const {
-            column: j
+            column: O
           } = P;
-          if (!j) return P.text;
-          const L = j?.key || j?.dataIndex;
-          let X = !0, E = P.text;
-          if (K(E))
-            if (E.length === 0 || E.length === 1 && !_(E[0])) {
-              E = E?.[0];
-              const Oe = tl(E, j?.columnEmptyText || e?.columnEmptyText || "");
-              X = Oe.success, E = ta(Oe.value, j?.valueType || e.columns?.find((je) => (je.key || je.dataIndex) === L)?.valueType, o, v.value);
-            } else E[0]?.type === "template" && (E = E[0]?.children);
-          return j?.ellipsis ? It(E, X, j) : E;
+          if (!O) return P.text;
+          const E = O?.key || O?.dataIndex;
+          let X = !0, L = P.text;
+          if (K(L))
+            if (L.length === 0 || L.length === 1 && !_(L[0])) {
+              L = L?.[0];
+              const Ae = tl(L, O?.columnEmptyText || e?.columnEmptyText || "");
+              X = Ae.success, L = ta(Ae.value, O?.valueType || e.columns?.find((Oe) => (Oe.key || Oe.dataIndex) === E)?.valueType, i, m.value);
+            } else L[0]?.type === "template" && (L = L[0]?.children);
+          return O?.ellipsis ? It(L, X, O) : L;
         },
         rowSelection: e.rowSelection ? {
           ...Ie(e.rowSelection, ["onSelect", "onSelectAll", "onChange", "selectedRowKeys"]),
@@ -2246,7 +2237,7 @@ const oa = {
         onChange: We,
         onExpandedRowsChange: Pt,
         onExpand: Ft,
-        onResizeColumn: (P, j) => Dt(P, j)
+        onResizeColumn: (P, O) => Dt(P, O)
       }), {
         ...l,
         emptyText: () => lt()
@@ -2262,9 +2253,9 @@ function Ca(e, a) {
       searchMap: []
     };
     if (a?.state) {
-      if (ke(a.state) && Q(a.state.value))
+      if (He(a.state) && Q(a.state.value))
         return Se(r, ee(a.state.value));
-      if (Q(a.state) && !ke(a.state))
+      if (Q(a.state) && !He(a.state))
         return Se(r, ee(a.state));
     }
     return r;
@@ -2272,17 +2263,17 @@ function Ca(e, a) {
   const n = Ue(Se(l(), {
     request: a?.request
   }));
-  a?.state && z(() => a.state && ke(a.state) ? a.state.value : a.state, () => {
+  a?.state && z(() => a.state && He(a.state) ? a.state.value : a.state, () => {
     p();
   }, { deep: !0 });
-  const i = C(() => e.value ? e.value.actionRef() : {}), o = C(() => e.value ? e.value.formRef() : {}), d = C(() => ({
-    ...i.value.pageInfo || {},
-    ...o.value.getFormSearch?.() || {}
-  })), v = I(!!i.value.loading?.value);
-  z(() => i.value.loading?.value, (r) => {
-    v.value = !!r;
-  }), z(v, (r) => {
-    i.value?.setLoading?.(!!r);
+  const o = C(() => e.value ? e.value.actionRef() : {}), i = C(() => e.value ? e.value.formRef() : {}), d = C(() => ({
+    ...o.value.pageInfo || {},
+    ...i.value.getFormSearch?.() || {}
+  })), m = I(!!o.value.loading?.value);
+  z(() => o.value.loading?.value, (r) => {
+    m.value = !!r;
+  }), z(m, (r) => {
+    o.value?.setLoading?.(!!r);
   });
   function p() {
     nl(n, l());
@@ -2291,22 +2282,22 @@ function Ca(e, a) {
     n.searchMap && (n.searchMap = ee(n.searchMap).map((h) => h.name === r ? Se(h, B) : h));
   }
   return {
-    formRef: o,
-    actionRef: i,
+    formRef: i,
+    actionRef: o,
     tableState: n,
     requestSearch: d,
-    loading: v,
-    dataSource: C(() => i?.value?.dataSource?.value || []),
-    selectedKeys: C(() => i?.value?.selectedKeys?.value || []),
-    selectedItems: C(() => i?.value?.selectedItems?.value || []),
-    rowsSelection: i?.value?.rowsSelection,
-    setTableDataList: (r) => i.value?.setTableDataList?.(r),
-    reloadAndReset: (r) => i.value?.reloadAndReset?.(r),
-    setPageInfo: (r, B, h, f) => i.value?.setPageInfo?.(r, B, h, f),
-    setPagination: (r) => i.value?.setPagination?.(r),
-    setLoading: (r) => v.value = r,
-    operateTableDataRow: (r) => i.value?.operateTableDataRow?.(r),
-    reload: (r) => i.value?.reload?.(r),
+    loading: m,
+    dataSource: C(() => o?.value?.dataSource?.value || []),
+    selectedKeys: C(() => o?.value?.selectedKeys?.value || []),
+    selectedItems: C(() => o?.value?.selectedItems?.value || []),
+    rowsSelection: o?.value?.rowsSelection,
+    setTableDataList: (r) => o.value?.setTableDataList?.(r),
+    reloadAndReset: (r) => o.value?.reloadAndReset?.(r),
+    setPageInfo: (r, B, h, f) => o.value?.setPageInfo?.(r, B, h, f),
+    setPagination: (r) => o.value?.setPagination?.(r),
+    setLoading: (r) => m.value = r,
+    operateTableDataRow: (r) => o.value?.operateTableDataRow?.(r),
+    reload: (r) => o.value?.reload?.(r),
     updateSearchMap: F
   };
 }