@gx-design-vue/pro-table 0.2.0-beta.38 → 0.2.0-beta.39

package/dist/pro-table.mjs

@@ -1,12 +1,12 @@
-import { computed as w, ref as O, watch as q, unref as f, watchEffect as fe, reactive as ce, onUnmounted as jt, onDeactivated as Mt, onMounted as kt, provide as Et, inject as zt, defineComponent as ae, createVNode as i, Fragment as Ie, nextTick as Kt, mergeProps as G, createTextVNode as pe, renderSlot as Yt, isVNode as Ce, cloneVNode as Lt, toRef as Q, toRaw as Ne } from "vue";
+import { computed as w, ref as O, watch as U, unref as h, watchEffect as fe, reactive as ce, onUnmounted as jt, onDeactivated as Mt, onMounted as kt, provide as Et, inject as zt, defineComponent as ae, createVNode as i, Fragment as Ie, nextTick as Kt, mergeProps as q, createTextVNode as pe, renderSlot as Yt, isVNode as Ce, cloneVNode as Lt, toRef as Q, toRaw as Ne } from "vue";
 import { isBoolean as te, isObject as ne, getSlot as ze, isFunction as $e, arrayRepeat as At, runFunction as Vt, handleCurrentPage as Ht, getSortIndex as Wt, isDeepEqualReact as nt, genColumnKey as ot, compareArray as _t, isNumber as ut, isString as Gt, isArray as Ke, getPrefixCls as Ve, getRandomNumber as Ye, handleShowIndex as qt, getSlotVNode as ge, hanndleField as Ut } from "@gx-design-vue/pro-utils";
-import { pick as it, cloneDeep as U, omit as ye } from "lodash-es";
+import { pick as it, cloneDeep as X, omit as ye } from "lodash-es";
 import { useFullscreen as st, useWindowSize as Xt } from "@vueuse/core";
 import { Form as et, Grid as He, Space as le, Button as tt, Input as at, TimePicker as Jt, DatePicker as rt, TreeSelect as Qt, Spin as Le, Select as Zt, Popover as ea, Checkbox as ta, Tooltip as Z, Tree as aa, Dropdown as la, Menu as Re, Empty as ct, Pagination as na, Table as oa, Typography as ua } from "ant-design-vue";
 import { useProAppContext as ia } from "@gx-design-vue/pro-app";
 import { useProStyle as Pe } from "@gx-design-vue/pro-provider";
 import { tryOnUnmounted as sa, useMemo as Fe } from "@gx-design-vue/pro-hooks";
-import H from "dayjs";
+import W from "dayjs";
 import { UpOutlined as ra, DownOutlined as ca, SettingOutlined as dt, VerticalAlignTopOutlined as da, VerticalAlignMiddleOutlined as fa, VerticalAlignBottomOutlined as ha, FullscreenExitOutlined as va, FullscreenOutlined as ma, ColumnHeightOutlined as ga, InfoCircleOutlined as ya, ReloadOutlined as pa } from "@ant-design/icons-vue";
 function pl(e) {
   const o = w(() => {
@@ -36,8 +36,8 @@ function pl(e) {
       return (u = o == null ? void 0 : o.value) == null ? void 0 : u.dataSource;
     }),
     setPageAndReload: (u, l, r, s) => {
-      var T, h;
-      return (h = (T = o.value) == null ? void 0 : T.setPageAndReload) == null ? void 0 : h.call(T, u, l, r, s);
+      var T, v;
+      return (v = (T = o.value) == null ? void 0 : T.setPageAndReload) == null ? void 0 : v.call(T, u, l, r, s);
     },
     setPagination: (u) => {
       var l, r;
@@ -515,10 +515,10 @@ const Ca = () => ({
 function Sa({ emit: e, loading: o }) {
   var l;
   const t = O(te(o.value) ? o.value : ne(o.value) ? (l = o.value) == null ? void 0 : l.spinning : !1);
-  q(() => o.value, (r) => {
+  U(() => o.value, (r) => {
     t.value = te(r) ? r : ne(r) ? r == null ? void 0 : r.spinning : t.value;
   });
-  const n = w(() => f(t) || !1);
+  const n = w(() => h(t) || !1);
   function u(r) {
     t.value = r, e("loadingChange", !0);
   }
@@ -550,10 +550,10 @@ function wa({
         delete n[r];
   });
   const u = w(() => {
-    var h;
+    var v;
     if (te(t.value) && !t.value)
       return !1;
-    const r = ze(e, f(o), "pageItemRender"), s = $e(r) ? {
+    const r = ze(e, h(o), "pageItemRender"), s = $e(r) ? {
       itemRender: ({
         page: y,
         type: d,
@@ -571,13 +571,13 @@ function wa({
       showSizeChanger: !0,
       pageSizeOptions: ["10", "20", "50", "100"],
       ...t.value || {},
-      ...f(n),
+      ...h(n),
       ...s || {}
     };
-    return (h = t.value) != null && h.showTotal || (T.showTotal = (y) => `共${y < T.pageSize ? 1 : Math.ceil(y / (T.pageSize || 10))}页 ${y}条记录`), T;
+    return (v = t.value) != null && v.showTotal || (T.showTotal = (y) => `共${y < T.pageSize ? 1 : Math.ceil(y / (T.pageSize || 10))}页 ${y}条记录`), T;
   });
   function l(r) {
-    const s = f(u);
+    const s = h(u);
     Object.assign(n, {
       ...s || {},
       ...r
@@ -590,36 +590,36 @@ function wa({
 }
 function Ta(e, o) {
   const t = O([]), n = O([]);
-  q(() => {
-    var h;
-    return (h = o.value) == null ? void 0 : h.selectedRowKeys;
-  }, (h) => {
-    t.value = At([...h || []]);
+  U(() => {
+    var v;
+    return (v = o.value) == null ? void 0 : v.selectedRowKeys;
+  }, (v) => {
+    t.value = At([...v || []]);
   }, {
     deep: !0,
     immediate: !0
   });
-  const u = (h, y) => {
-    e.value && (y ? h != null && h[e.value] && (t.value.push(h[e.value]), n.value.push(h)) : (t.value = t.value.filter((d) => d !== h[e.value]), n.value = n.value.filter((d) => d[e.value] !== h[e.value])));
+  const u = (v, y) => {
+    e.value && (y ? v != null && v[e.value] && (t.value.push(v[e.value]), n.value.push(v)) : (t.value = t.value.filter((d) => d !== v[e.value]), n.value = n.value.filter((d) => d[e.value] !== v[e.value])));
   }, l = () => {
-    var h, y;
-    o.value && ((y = (h = o.value) == null ? void 0 : h.onChange) == null || y.call(h, t.value, n.value));
+    var v, y;
+    o.value && ((y = (v = o.value) == null ? void 0 : v.onChange) == null || y.call(v, t.value, n.value));
   };
   return {
     selectedKey: t,
     selectRowKey: u,
-    selectAllRowKey: (h, y, d) => {
-      e.value && (h ? y.map((c) => (t.value.every((p) => p !== (c == null ? void 0 : c[e.value])) && c != null && c[e.value] && (t.value.push(c[e.value]), n.value.push(c)), c)) : d.map((c) => (t.value.some((p) => p === (c == null ? void 0 : c[e.value])) && (t.value = t.value.filter((p) => p !== c[e.value]), n.value = n.value.filter((p) => p[e.value] !== c[e.value])), c)));
+    selectAllRowKey: (v, y, d) => {
+      e.value && (v ? y.map((c) => (t.value.every((p) => p !== (c == null ? void 0 : c[e.value])) && c != null && c[e.value] && (t.value.push(c[e.value]), n.value.push(c)), c)) : d.map((c) => (t.value.some((p) => p === (c == null ? void 0 : c[e.value])) && (t.value = t.value.filter((p) => p !== c[e.value]), n.value = n.value.filter((p) => p[e.value] !== c[e.value])), c)));
     },
-    removeRowKeys: (h) => {
-      t.value = t.value.filter((y) => !h.includes(y)), n.value = n.value.filter((y) => !h.includes(y == null ? void 0 : y[e.value || ""])), l();
+    removeRowKeys: (v) => {
+      t.value = t.value.filter((y) => !v.includes(y)), n.value = n.value.filter((y) => !v.includes(y == null ? void 0 : y[e.value || ""])), l();
     },
     changeRowKey: l,
-    syncSelectedRows: (h) => {
+    syncSelectedRows: (v) => {
       if (e.value && t.value.length !== n.value.length) {
         const y = n.value.map((c) => c[e.value]), d = t.value.filter((c) => !y.includes(c));
-        h.forEach((c) => {
-          d.includes(c[e.value]) && n.value.push(U(c));
+        v.forEach((c) => {
+          d.includes(c[e.value]) && n.value.push(X(c));
         });
       }
     }
@@ -632,8 +632,8 @@ function Ra(e, o) {
   }
   async function r(...s) {
     return t.value === 0 || t.value === void 0 ? u.value(...s) : (l(), new Promise(async (T) => {
-      var h;
-      (h = s[0]) != null && h.immediate ? T(await u.value(...s)) : n.value = setTimeout(async () => {
+      var v;
+      (v = s[0]) != null && v.immediate ? T(await u.value(...s)) : n.value = setTimeout(async () => {
         T(await u.value(...s));
       }, t.value);
     }));
@@ -653,48 +653,48 @@ function $a(e) {
     dataSource: l
   };
 }
-function Fa({ polling: e, request: o, postData: t, dataSource: n, waitRequest: u, debounceTime: l }, { columns: r, loadingStatus: s, setLoading: T, setColumns: h, removeRowKeys: y, syncSelectedRows: d, formParamsRef: c, setPagination: p, getPaginationInfo: g, onBeforeSearchSubmit: v, hasCustomRender: S }, F) {
-  const x = O(), I = O(!0), B = O(!1), W = O(!1), K = O([]), A = O(), E = Ra(async (m) => {
+function Fa({ polling: e, request: o, postData: t, dataSource: n, waitRequest: u, debounceTime: l }, { columns: r, loadingStatus: s, setLoading: T, setColumns: v, removeRowKeys: y, syncSelectedRows: d, formParamsRef: c, setPagination: p, getPaginationInfo: g, onBeforeSearchSubmit: m, hasCustomRender: S }, F) {
+  const x = O(), I = O(!0), B = O(!1), _ = O(!1), M = O([]), A = O(), z = Ra(async (f) => {
     A.value && clearTimeout(A.value);
-    const j = await P(m), Y = Vt(e.value, j);
-    return Y && !x.value && (A.value = setTimeout(() => {
-      E.run({ ...m, isPolling: Y });
-    }, Math.max(Y, 2e3))), j;
+    const j = await P(f), V = Vt(e.value, j);
+    return V && !x.value && (A.value = setTimeout(() => {
+      z.run({ ...f, isPolling: V });
+    }, Math.max(V, 2e3))), j;
   }, l.value || 10);
   jt(() => {
     x.value = !0, clearTimeout(A.value);
   }), Mt(() => {
     x.value = !0, clearTimeout(A.value);
-  }), q(() => e.value, () => {
-    e.value ? E.run({ isPolling: !0 }) : clearTimeout(A.value);
-  }, { immediate: !0 }), q([
+  }), U(() => e.value, () => {
+    e.value ? z.run({ isPolling: !0 }) : clearTimeout(A.value);
+  }, { immediate: !0 }), U([
     () => u.value,
     () => n.value,
     () => c
   ], () => {
-    o.value ? (!I.value || !e.value) && E.run({ isPolling: !1 }) : $(n.value || []);
+    o.value ? (!I.value || !e.value) && z.run({ isPolling: !1 }) : $(n.value || []);
   }, {
     deep: !0,
     immediate: !0
   });
   const D = w(() => {
     if (S.value)
-      return f(K);
-    const m = f(r).filter((j) => j.show || j.show === void 0);
-    return !f(K) || !m || m.length === 0 ? [] : f(K);
-  }), oe = w(() => f(K).some((m) => m.children && m.children.length > 0));
-  function a(m) {
-    W.value = m;
+      return h(M);
+    const f = h(r).filter((j) => j.show || j.show === void 0);
+    return !h(M) || !f || f.length === 0 ? [] : h(M);
+  }), oe = w(() => h(M).some((f) => f.children && f.children.length > 0));
+  function a(f) {
+    _.value = f;
   }
-  function b(m, j, Y, X) {
-    E.run({ pagination: m, filters: j, sorter: Y, extra: X, isPolling: !1 }), F("change", m, j, Y, X);
+  function b(f, j, V, Y) {
+    z.run({ pagination: f, filters: j, sorter: V, extra: Y, isPolling: !1 }), F("change", f, j, V, Y);
   }
-  const P = async (m = {}) => {
+  const P = async (f = {}) => {
     var Se, xe, we;
-    const { pagination: j, filters: Y = {}, sorter: X = {}, removeKeys: he = [], isPolling: Oe = !1 } = m;
-    if (!f(o) || !$e(f(o)) || f(u) && s.value || B.value)
+    const { pagination: j, filters: V = {}, sorter: Y = {}, removeKeys: he = [], isPolling: Oe = !1 } = f;
+    if (!h(o) || !$e(h(o)) || h(u) && s.value || B.value)
       return n.value || [];
-    if (B.value = !0, !Oe || f(u) || I.value ? T(!0) : a(!0), f(u)) {
+    if (B.value = !0, !Oe || h(u) || I.value ? T(!0) : a(!0), h(u)) {
       I.value = !1, B.value = !1;
       return;
     }
@@ -704,37 +704,47 @@ function Fa({ polling: e, request: o, postData: t, dataSource: n, waitRequest: u
       if (te(j) && !j || te(g))
         ee = {};
       else {
-        const { current: k = 1, pageSize: ie = 10, total: _ } = f(g) || {};
-        ee.pageNum = Ht({ current: k, pageSize: ie, total: _ }, he.length), he.length && y(he), ee.pageSize = ie;
+        const { current: E = 1, pageSize: ie = 10, total: G } = h(g) || {};
+        ee.pageNum = Ht({ current: E, pageSize: ie, total: G }, he.length), he.length && y(he), ee.pageSize = ie;
       }
-      (ne(X) ? [X] : X).forEach((k) => {
-        const ie = (k == null ? void 0 : k.columnKey) || (k == null ? void 0 : k.field);
-        k && (k != null && k.order) ? h(f(r).map((_) => (_.dataIndex === ie ? _.sortOrder = k == null ? void 0 : k.order : _.sortOrder = null, _))) : k && h(f(r).map((_) => (_.dataIndex === ie && (_.sortOrder = null), _)));
+      (ne(Y) ? [Y] : Y).forEach((E) => {
+        const ie = (E == null ? void 0 : E.columnKey) || (E == null ? void 0 : E.field);
+        E && (E != null && E.order) ? v(h(r).map((G) => (G.dataIndex === ie ? G.sortOrder = E == null ? void 0 : E.order : G.sortOrder = null, G))) : E && v(h(r).map((G) => (G.dataIndex === ie && (G.sortOrder = null), G)));
       });
       let ve = {
         ...ee || {},
-        ...m.params,
+        ...f.params,
         ...c
       };
-      v && $e(v) && (ve = await v(ve, X, Y));
+      m && $e(m) && (ve = await m(ve, Y, V));
       let L = [];
-      const ue = await ((Se = f(o)) == null ? void 0 : Se(ve, X, Y));
-      return B.value = !1, ue && ue.success ? (L = ue.data || [], f(t) && $e(f(t)) && (L = await ((xe = f(t)) == null ? void 0 : xe(L))), d(L), (ue.total || (L == null ? void 0 : L.length) || 0) !== ((we = f(g)) == null ? void 0 : we.total) && p({
+      const ue = await ((Se = h(o)) == null ? void 0 : Se(ve, Y, V));
+      return B.value = !1, ue && ue.success ? (L = ue.data || [], h(t) && $e(h(t)) && (L = await ((xe = h(t)) == null ? void 0 : xe(L))), d(L), (ue.total || (L == null ? void 0 : L.length) || 0) !== ((we = h(g)) == null ? void 0 : we.total) && p({
         total: ue.total || (L == null ? void 0 : L.length) || 0
       }), $(L), L) : [];
     } catch (ee) {
-      K.value === void 0 && $([]), F("requestError", ee);
+      M.value === void 0 && $([]), F("requestError", ee);
     } finally {
       I.value = !1, T(!1);
     }
     return [];
   };
-  function $(m) {
-    const j = Wt(U(m), f(g.value));
-    nt(j, K.value) || (K.value = j);
+  function $(f) {
+    const j = Wt(X(f), h(g.value));
+    nt(j, M.value) || (M.value = j);
   }
-  function N({ key: m, params: j }) {
-    K.value = K.value.map((Y) => m && j[m] === Y[m] ? { ...Y, ...j } : Y);
+  function N({ key: f, params: j, type: V = "update" }) {
+    switch (V) {
+      case "update":
+        M.value = M.value.map((Y) => f && j[f] === Y[f] ? { ...Y, ...j } : Y);
+        break;
+      case "add":
+        M.value.push(j);
+        break;
+      case "delete":
+        M.value = M.value.filter((Y) => f ? f && j[f] !== Y[f] : !0);
+        break;
+    }
   }
   return {
     getDataSourceRef: D,
@@ -742,8 +752,8 @@ function Fa({ polling: e, request: o, postData: t, dataSource: n, waitRequest: u
     reSetDataList: $,
     changeDataValue: N,
     handleTableChange: b,
-    reload: async (m) => {
-      f(o) ? await E.run({ ...m, isPolling: !1 }) : F("reload");
+    reload: async (f) => {
+      h(o) ? await z.run({ ...f, isPolling: !1 }) : F("reload");
     }
   };
 }
@@ -761,41 +771,41 @@ function Pa({ search: e, searchMap: o, params: t, columns: n, setPagination: u }
     return ne(e.value) ? !!((d = e.value) != null && d.showSearch) : !!e.value;
   });
   kt(() => {
-    h("all");
-  }), q(() => t.value, () => {
-    h("params");
+    v("all");
+  }), U(() => t.value, () => {
+    v("params");
   }, {
     deep: !0
-  }), q(() => o.value, () => {
-    h("searchMap");
+  }), U(() => o.value, () => {
+    v("searchMap");
   }, {
     deep: !0
-  }), q(() => n.value, () => {
-    h("columns");
+  }), U(() => n.value, () => {
+    v("columns");
   }, {
     deep: !0
   });
-  const h = (d) => {
+  const v = (d) => {
     var p, g;
     const c = [];
-    if ((d === "all" || d === "searchMap") && ((p = o.value) == null || p.forEach((v) => c.push(v)), c.forEach((v) => {
-      s.value.some((S) => S.name === v.name) ? s.value = s.value.map((S) => S.name === v.name ? {
+    if ((d === "all" || d === "searchMap") && ((p = o.value) == null || p.forEach((m) => c.push(m)), c.forEach((m) => {
+      s.value.some((S) => S.name === m.name) ? s.value = s.value.map((S) => S.name === m.name ? {
         ...S,
-        ...v
-      } : S) : s.value.push(v);
-    })), (d === "all" || d === "columns") && ((g = n.value) != null && g.length) && (n.value && n.value.forEach((v) => {
-      v.searchConfig && c.push(v.searchConfig);
-    }), c.forEach((v) => {
-      s.value.some((S) => S.name === v.name) ? s.value = s.value.map((S) => S.name === v.name ? {
+        ...m
+      } : S) : s.value.push(m);
+    })), (d === "all" || d === "columns") && ((g = n.value) != null && g.length) && (n.value && n.value.forEach((m) => {
+      m.searchConfig && c.push(m.searchConfig);
+    }), c.forEach((m) => {
+      s.value.some((S) => S.name === m.name) ? s.value = s.value.map((S) => S.name === m.name ? {
         ...S,
-        ...v
-      } : S) : s.value.push(v);
+        ...m
+      } : S) : s.value.push(m);
     })), d === "all" || d === "searchMap" || d === "columns") {
       u({ current: 1 });
-      const v = Ia(c);
-      Object.assign(r, { ...v });
-      for (const S in v)
-        l[S] || (l[S] = v[S]);
+      const m = Ia(c);
+      Object.assign(r, { ...m });
+      for (const S in m)
+        l[S] || (l[S] = m[S]);
     }
     (d === "all" || d === "params") && !T.value && (u({ current: 1 }), Object.assign(l, t.value));
   };
@@ -806,33 +816,33 @@ function Pa({ search: e, searchMap: o, params: t, columns: n, setPagination: u }
 }
 function Oa({ columns: e, columnsState: o, changeColumns: t }) {
   const n = O(void 0), u = ce({}), l = ce({}), r = ce({}), s = O([]);
-  q(() => e.value, () => {
+  U(() => e.value, () => {
     var y;
-    (y = f(e)) == null || y.forEach(({ show: d, key: c, fixed: p }, g) => {
-      const v = ot(c, g);
-      v && (r[v] = { show: d === void 0 ? !0 : d, fixed: p });
+    (y = h(e)) == null || y.forEach(({ show: d, key: c, fixed: p }, g) => {
+      const m = ot(c, g);
+      m && (r[m] = { show: d === void 0 ? !0 : d, fixed: p });
     });
   }, {
     deep: !0,
     immediate: !0
-  }), q(() => e.value, () => {
-    const y = f(e).map((d) => d.key);
-    h(y);
+  }), U(() => e.value, () => {
+    const y = h(e).map((d) => d.key);
+    v(y);
   }, {
     deep: !0,
     immediate: !0
   }), fe(() => {
     var d;
     const y = {
-      ...(d = f(o)) == null ? void 0 : d.value,
-      ...f(r)
+      ...(d = h(o)) == null ? void 0 : d.value,
+      ...h(r)
     };
     Object.assign(u, y), Object.assign(l, y);
   });
   function T(y, d) {
     n.value = d, Object.assign(u, y), t == null || t(u, d === "fixed");
   }
-  function h(y) {
+  function v(y) {
     s.value = y;
   }
   return {
@@ -841,7 +851,7 @@ function Oa({ columns: e, columnsState: o, changeColumns: t }) {
     setColumnsMap: T,
     sortKeyColumns: s,
     cacheColumnsMap: l,
-    setSortKeyColumns: h
+    setSortKeyColumns: v
   };
 }
 function Ba(e) {
@@ -854,7 +864,7 @@ function Ba(e) {
 }
 function Da({ scroll: e, columns: o, breakpoint: t, draggabled: n, autoScroll: u, neverScroll: l }) {
   const r = O([]), s = O([]);
-  q([
+  U([
     () => e.value,
     () => o.value,
     () => t.value,
@@ -862,50 +872,50 @@ function Da({ scroll: e, columns: o, breakpoint: t, draggabled: n, autoScroll: u
     () => u.value,
     () => l.value
   ], () => {
-    r.value = U(y(f(o))), s.value = U(y(f(o)));
+    r.value = X(y(h(o))), s.value = X(y(h(o)));
   }, {
     deep: !0,
     immediate: !0
   });
   const T = w(() => {
-    const g = h(f(r).filter((F) => F.fixed === "left")), v = h(f(r).filter((F) => F.fixed !== "left" && F.fixed !== "right")), S = h(f(r).filter((F) => F.fixed === "right"));
+    const g = v(h(r).filter((F) => F.fixed === "left")), m = v(h(r).filter((F) => F.fixed !== "left" && F.fixed !== "right")), S = v(h(r).filter((F) => F.fixed === "right"));
     return [
       ...g,
-      ...v,
+      ...m,
       ...S
     ];
   });
-  function h(g) {
-    return g.sort((v, S) => _t(v, S, "order", 0));
+  function v(g) {
+    return g.sort((m, S) => _t(m, S, "order", 0));
   }
   function y(g) {
-    return U(g).map((v, S) => {
+    return X(g).map((m, S) => {
       var F;
-      if (v.dataIndex === "action" || S === g.length - 1 ? v.resizable = !1 : v.resizable = te(v.resizable) ? v.resizable : !!(ut(v.width) && f(n)), !v.width || f(l))
-        return v;
-      if (v.dataIndex === "action" && f(u))
-        if ((F = f(e)) != null && F.x || !f(t))
-          v.width = v.width || 100, v.fixed = "right";
+      if (m.dataIndex === "action" || S === g.length - 1 ? m.resizable = !1 : m.resizable = te(m.resizable) ? m.resizable : !!(ut(m.width) && h(n)), !m.width || h(l))
+        return m;
+      if (m.dataIndex === "action" && h(u))
+        if ((F = h(e)) != null && F.x || !h(t))
+          m.width = m.width || 100, m.fixed = "right";
         else {
-          const x = f(o).find((I) => I.dataIndex === v.dataIndex);
-          v.width = (x == null ? void 0 : x.width) || "", v.fixed = x == null ? void 0 : x.fixed;
+          const x = h(o).find((I) => I.dataIndex === m.dataIndex);
+          m.width = (x == null ? void 0 : x.width) || "", m.fixed = x == null ? void 0 : x.fixed;
         }
-      return v;
+      return m;
     });
   }
-  function d(g, v) {
-    r.value = r.value.map((S) => (S.uuid === v.uuid && (S.width = g), S));
+  function d(g, m) {
+    r.value = r.value.map((S) => (S.uuid === m.uuid && (S.width = g), S));
   }
   function c(g) {
     if (g.length <= 0) {
       r.value = [];
       return;
     }
-    nt(y(U(g)), r.value) || (r.value = y(U(g)));
+    nt(y(X(g)), r.value) || (r.value = y(X(g)));
   }
   function p(g) {
-    let v = U(o.value);
-    v = v.map((S) => {
+    let m = X(o.value);
+    m = m.map((S) => {
       var x, I, B;
       const F = S.key ? {
         show: (x = g[S.key]) == null ? void 0 : x.show,
@@ -916,7 +926,7 @@ function Da({ scroll: e, columns: o, breakpoint: t, draggabled: n, autoScroll: u
         ...S,
         ...F
       };
-    }), c(v);
+    }), c(m);
   }
   return {
     breakpoint: t,
@@ -939,25 +949,25 @@ function Na(e) {
   };
 }
 function ja({ scroll: e, columns: o, autoScroll: t, modalScroll: n, neverScroll: u, rowSelection: l, screensRef: r, innerWidth: s, scrollBreakpoint: T }) {
-  const h = w(() => {
+  const v = w(() => {
     var c, p, g;
-    return f(T) ? ut(f(T)) ? s.value > f(T) : Gt(f(T)) ? (c = r.value) == null ? void 0 : c[f(T)] : (p = r.value) == null ? void 0 : p.xl : (g = r.value) == null ? void 0 : g.xl;
+    return h(T) ? ut(h(T)) ? s.value > h(T) : Gt(h(T)) ? (c = r.value) == null ? void 0 : c[h(T)] : (p = r.value) == null ? void 0 : p.xl : (g = r.value) == null ? void 0 : g.xl;
   }), y = w(() => {
     let c = 0;
-    const p = f(l) ? 60 : 0, g = 150, v = U(f(o));
-    v.forEach((x) => {
+    const p = h(l) ? 60 : 0, g = 150, m = X(h(o));
+    m.forEach((x) => {
       c += Number.parseInt(x.width) || 0;
     });
-    const F = v.filter((x) => !Reflect.has(x, "width")).length;
+    const F = m.filter((x) => !Reflect.has(x, "width")).length;
     return F !== 0 && (c += F * g), p && (c += p), c;
   });
   return { getScrollRef: w(() => {
     var p;
     const { xl: c } = r.value;
-    return f(u) ? {} : f(e) && Object.keys(f(e)).length ? f(e) : f(n) ? {
-      y: ((p = f(e)) == null ? void 0 : p.y) || (c ? 400 : 235)
-    } : f(t) ? h.value ? {} : te(h.value) ? { x: f(y) } : {} : {};
-  }), breakpoint: h };
+    return h(u) ? {} : h(e) && Object.keys(h(e)).length ? h(e) : h(n) ? {
+      y: ((p = h(e)) == null ? void 0 : p.y) || (c ? 400 : 235)
+    } : h(t) ? v.value ? {} : te(v.value) ? { x: h(y) } : {} : {};
+  }), breakpoint: v };
 }
 const ft = Symbol("table-context"), Ma = (e = Symbol(), o) => zt(e, o || {}), ka = (e) => {
   Et(ft, e);
@@ -1049,7 +1059,7 @@ const za = (e) => ({
     } = Pe("ProTableForm", [za], e.prefixCls), r = Ka(), {
       formState: s,
       resetFormState: T,
-      changeFormState: h
+      changeFormState: v
     } = Ea(e.defaultParams || {}, e.searchMap || []), y = O(!1), d = w(() => {
       var a;
       return !!((a = e.search) != null && a.showSearch);
@@ -1076,15 +1086,15 @@ const za = (e) => ({
       span: 1
     }], g = w(() => {
       var a;
-      return v((a = e.search) == null ? void 0 : a.span);
+      return m((a = e.search) == null ? void 0 : a.span);
     });
-    q(() => {
+    U(() => {
       var a;
       return (a = e.search) == null ? void 0 : a.defaultCollapsed;
     }, (a) => {
       y.value = y.value || !!a;
     });
-    const v = (a) => {
+    const m = (a) => {
       let b = 4;
       for (let P = 0; P < p.length; P += 1) {
         const $ = p[P].value;
@@ -1106,45 +1116,45 @@ const za = (e) => ({
       var P, $, N;
       switch (b.valueType) {
         case "text":
-          h(b.name || "", a || b.initialValue || "");
+          v(b.name || "", a || b.initialValue || "");
           break;
         case "select":
-          h(b.name || "", a || a === 0 ? a : b.initialValue || void 0);
+          v(b.name || "", a || a === 0 ? a : b.initialValue || void 0);
           break;
         case "treeSelect":
-          h(b.name || "", a || a === 0 ? a : b.initialValue || ((P = b.field) != null && P.treeCheckable || ($ = b.field) != null && $.multiple ? [] : null));
+          v(b.name || "", a || a === 0 ? a : b.initialValue || ((P = b.field) != null && P.treeCheckable || ($ = b.field) != null && $.multiple ? [] : null));
           break;
         case "date":
-          h(b.name || "", a ? H(a).format(b.valueFormat || "YYYY-MM-DD") : b.initialValue || null);
+          v(b.name || "", a ? W(a).format(b.valueFormat || "YYYY-MM-DD") : b.initialValue || null);
           break;
         case "dateMonth":
-          h(b.name || "", a ? H(a).format("YYYY-MM") : b.initialValue || null);
+          v(b.name || "", a ? W(a).format("YYYY-MM") : b.initialValue || null);
           break;
         case "dateRange":
-          h(b.name || "", a && a.length > 0 ? [H(a[0]).format(b.valueFormat || "YYYY-MM-DD"), H(a[1]).format(b.valueFormat || "YYYY-MM-DD")] : b.initialValue || null);
+          v(b.name || "", a && a.length > 0 ? [W(a[0]).format(b.valueFormat || "YYYY-MM-DD"), W(a[1]).format(b.valueFormat || "YYYY-MM-DD")] : b.initialValue || null);
           break;
         case "time":
-          h(b.name || "", a ? H(a).format(b.valueFormat || "HH:mm:ss") : b.initialValue || null);
+          v(b.name || "", a ? W(a).format(b.valueFormat || "HH:mm:ss") : b.initialValue || null);
           break;
       }
       (N = e.search) != null && N.showSearch || b.valueType === "text" || (b.valueType === "treeSelect" || b.valueType, B());
     }, I = () => {
-      const a = U(s), b = e.searchMap.find((N) => N.valueType === "text") || "", P = e.searchMap.find((N) => N.valueType === "dateRange") || "", $ = e.searchMap.find((N) => N.valueType === "treeSelect") || "";
+      const a = X(s), b = e.searchMap.find((N) => N.valueType === "text") || "", P = e.searchMap.find((N) => N.valueType === "dateRange") || "", $ = e.searchMap.find((N) => N.valueType === "treeSelect") || "";
       return b && (a[b.name] = s[b.name] || b.initialValue || ""), P && (a[P.rangeStartName || "start"] = a[P.name] ? a[P.name][0] : "", a[P.rangeEndName || "end"] = a[P.name] ? a[P.name][1] : "", delete a[P.name]), $ && (Ke(s[$.name]) && (a[$.name] = s[$.name].length ? s[$.name].map((N) => N[$.valueKey === "text" ? "label" : "value"]).join() : ""), $ && Ke(a[$.name]) && (a[$.name] = a[$.name].length ? a[$.name].map((N) => N[$.valueKey === "text" ? "label" : "value"]) : "")), a;
     }, B = (a = !1, b) => {
       Kt(() => {
         (!d.value || a) && o("search", I(), !!b);
       });
-    }, W = (a = !0) => {
+    }, _ = (a = !0) => {
       T(), B(!0, a);
     };
     n({
       getFormState: () => I(),
-      resetForm: W
+      resetForm: _
     });
-    const K = () => (d.value || c.value) && i(le, null, {
+    const M = () => (d.value || c.value) && i(le, null, {
       default: () => [c.value && i(tt, {
-        onClick: () => W()
+        onClick: () => _()
       }, {
         default: () => {
           var a;
@@ -1172,30 +1182,30 @@ const za = (e) => ({
     }, {
       default: () => {
         var $, N;
-        return [K(), P && i("span", {
+        return [M(), P && i("span", {
           class: `${e.prefixCls}-a ${l.value}`,
           onClick: () => S(!b)
         }, [b ? "收起" : "展开", ($ = e.search) != null && $.collapseRender ? (N = e.search) == null ? void 0 : N.collapseRender() : b ? i(ra, null, null) : i(ca, null, null)])];
       }
-    })]), E = (a) => {
+    })]), z = (a) => {
       var $, N;
       let b;
       const P = d.value ? at : at.Search;
       switch (a.valueType) {
         case "text":
-          b = i(P, G({
+          b = i(P, q({
             style: {
               width: "100%"
             },
             value: s[a.name],
             placeholder: a.placeholder || "请输入",
             allowClear: a.allowClear || a.allowClear === !1 ? a.allowClear : !0,
-            onChange: (m) => x(m.target.value, a),
-            onSearch: (m) => B()
+            onChange: (f) => x(f.target.value, a),
+            onSearch: (f) => B()
           }, a.field || {}), null);
           break;
         case "select":
-          b = i(Zt, G({
+          b = i(Zt, q({
             style: {
               width: "100%"
             },
@@ -1204,19 +1214,19 @@ const za = (e) => ({
             placeholder: a.placeholder || "请选择",
             showSearch: a.showSearch,
             allowClear: a.allowClear || a.allowClear === !1 ? a.allowClear : !0,
-            getPopupContainer: (m) => m && m.parentNode ? m.parentNode : m,
+            getPopupContainer: (f) => f && f.parentNode ? f.parentNode : f,
             notFoundContent: a.loading === void 0 ? void 0 : a.loading ? i(Le, {
               size: "small"
             }, null) : void 0,
-            onChange: (m) => x(m, a),
-            options: ($ = a == null ? void 0 : a.valueEnum) == null ? void 0 : $.map((m) => ({
-              label: m.text,
-              value: m.value
+            onChange: (f) => x(f, a),
+            options: ($ = a == null ? void 0 : a.valueEnum) == null ? void 0 : $.map((f) => ({
+              label: f.text,
+              value: f.value
             }))
           }, a.field || {}), null);
           break;
         case "treeSelect":
-          b = i(Qt, G({
+          b = i(Qt, q({
             style: {
               width: "100%"
             },
@@ -1224,64 +1234,64 @@ const za = (e) => ({
             placeholder: a.placeholder || "请选择",
             allowClear: a.allowClear || a.allowClear === !1 ? a.allowClear : !0,
             treeData: a.valueEnum,
-            getPopupContainer: (m) => m && m.parentNode ? m.parentNode : m,
+            getPopupContainer: (f) => f && f.parentNode ? f.parentNode : f,
             notFoundContent: a.loading === void 0 ? void 0 : a.loading ? i(Le, {
               size: "small"
             }, null) : void 0,
-            onChange: (m) => x(m, a)
+            onChange: (f) => x(f, a)
           }, a.field || {}), null);
           break;
         case "date":
-          b = i(rt, G({
+          b = i(rt, q({
             style: {
               width: "100%"
             },
-            value: s[a.name] ? H(s[a.name], a.valueFormat || "YYYY-MM-DD") : void 0,
-            getPopupContainer: (m) => m && m.parentNode ? m.parentNode : m,
+            value: s[a.name] ? W(s[a.name], a.valueFormat || "YYYY-MM-DD") : void 0,
+            getPopupContainer: (f) => f && f.parentNode ? f.parentNode : f,
             placeholder: a.placeholder || "请选择",
             allowClear: a.allowClear || a.allowClear === !1 ? a.allowClear : !0,
             format: a.valueFormat || "YYYY-MM-DD",
             showTime: a.showTime,
             showToday: a.showToday || !0,
-            onChange: (m) => x(m, a)
+            onChange: (f) => x(f, a)
           }, a.field || {}), null);
           break;
         case "dateMonth":
-          b = i(Ya, G({
+          b = i(Ya, q({
             style: {
               width: "100%"
             },
-            value: s[a.name] ? H(s[a.name], a.valueFormat || "YYYY-MM") : void 0,
-            getPopupContainer: (m) => m && m.parentNode ? m.parentNode : m,
+            value: s[a.name] ? W(s[a.name], a.valueFormat || "YYYY-MM") : void 0,
+            getPopupContainer: (f) => f && f.parentNode ? f.parentNode : f,
             placeholder: a.placeholder || "请选择",
-            onChange: (m) => x(m, a)
+            onChange: (f) => x(f, a)
           }, a.field || {}), null);
           break;
         case "dateRange":
-          b = i(La, G({
+          b = i(La, q({
             style: {
               width: "100%"
             },
-            value: (N = s[a.name]) != null && N.length ? [H(s[a.name][0], a.valueFormat || "YYYY-MM-DD HH:mm:ss"), H(s[a.name][1], a.valueFormat || "YYYY-MM-DD HH:mm:ss")] : void 0,
-            getPopupContainer: (m) => m && m.parentNode ? m.parentNode : m,
+            value: (N = s[a.name]) != null && N.length ? [W(s[a.name][0], a.valueFormat || "YYYY-MM-DD HH:mm:ss"), W(s[a.name][1], a.valueFormat || "YYYY-MM-DD HH:mm:ss")] : void 0,
+            getPopupContainer: (f) => f && f.parentNode ? f.parentNode : f,
             placeholder: a.placeholder || ["开始日期", "结束日期"],
             format: a.valueFormat || "YYYY-MM-DD HH:mm:ss",
             showTime: a.showTime,
-            onChange: (m) => x(m, a)
+            onChange: (f) => x(f, a)
           }, a.field || {}), null);
           break;
         case "time":
-          b = i(Jt, G({
+          b = i(Jt, q({
             style: {
               width: "100%"
             },
-            value: s[a.name] ? H(s[a.name], a.valueFormat || "HH:mm:ss") : void 0,
-            getPopupContainer: (m) => m && m.parentNode ? m.parentNode : m,
+            value: s[a.name] ? W(s[a.name], a.valueFormat || "HH:mm:ss") : void 0,
+            getPopupContainer: (f) => f && f.parentNode ? f.parentNode : f,
             placeholder: a.placeholder || "请选择",
             allowClear: a.allowClear || a.allowClear === !1 ? a.allowClear : !0,
             use12Hours: a.use12Hours,
             format: a.valueFormat || "HH:mm:ss",
-            onChange: (m) => x(m, a)
+            onChange: (f) => x(f, a)
           }, a.field || {}), null);
           break;
       }
@@ -1293,16 +1303,16 @@ const za = (e) => ({
       class: `${e.prefixCls}-form-item`,
       style: a
     }, [i(et.Item, null, {
-      default: () => [b.__v_isVNode ? b : E(b)]
+      default: () => [b.__v_isVNode ? b : z(b)]
     })]), oe = () => {
       var b;
       const a = [...e.searchMap, ...((b = t.default) == null ? void 0 : b.call(t)) || []];
       return a.map((P, $) => {
         const N = {
           width: `${(100 - (g.value - 1) * 2) / g.value}%`
-        }, m = F($, g.value, N);
+        }, f = F($, g.value, N);
         return a.length < g.value || y.value ? i(Ie, null, [D({
-          formItemStyle: m,
+          formItemStyle: f,
           item: P
         }), $ === a.length - 1 && A({
           formItemStyle: {
@@ -1312,10 +1322,10 @@ const za = (e) => ({
           advanced: y.value,
           showAdvanced: y.value
         })]) : i(Ie, null, [$ < g.value - 1 && D({
-          formItemStyle: m,
+          formItemStyle: f,
           item: P
         }), $ === g.value - 1 && g.value - 1 === 0 && D({
-          formItemStyle: m,
+          formItemStyle: f,
           item: P
         }), $ === g.value - 1 && A({
           formItemStyle: {
@@ -1332,15 +1342,15 @@ const za = (e) => ({
       return u(i("div", {
         class: {
           [`${l.value}`]: !0,
-          [`${f(e.prefixCls)}-search`]: !0,
+          [`${h(e.prefixCls)}-search`]: !0,
           [`${(a = e.search) == null ? void 0 : a.className}`]: (b = e.search) == null ? void 0 : b.className
         }
       }, [i(et, {
-        class: `${f(e.prefixCls)}-form ${l.value}`,
+        class: `${h(e.prefixCls)}-form ${l.value}`,
         layout: "horizontal"
       }, {
         default: () => [i("div", {
-          class: `${f(e.prefixCls)}-form-container ${l.value}`
+          class: `${h(e.prefixCls)}-form-container ${l.value}`
         }, [oe()])]
       })]));
     };
@@ -1460,12 +1470,12 @@ const be = (e) => {
         onClick: (T) => {
           var p, g;
           T.stopPropagation(), T.preventDefault();
-          const h = ((p = f(l).find((v) => v.uuid === t)) == null ? void 0 : p.key) || "", y = (r == null ? void 0 : r.columnsMap[h]) || {};
+          const v = ((p = h(l).find((m) => m.uuid === t)) == null ? void 0 : p.key) || "", y = (r == null ? void 0 : r.columnsMap[v]) || {};
           if (typeof y.disable == "boolean" ? y.disable : (g = y.disable) == null ? void 0 : g.icon)
             return;
           const c = {
             ...r == null ? void 0 : r.columnsMap,
-            [h]: {
+            [v]: {
               ...y,
               fixed: n
             }
@@ -1545,40 +1555,40 @@ const be = (e) => {
       settingsAction: s
     } = de(), T = (c, p) => c.map(({
       key: g,
-      children: v,
+      children: m,
       uuid: S,
       ...F
     }) => {
-      var W;
+      var _;
       const x = (s == null ? void 0 : s.columnsMap[g || "null"]) || {
         show: !0
       };
       let I = !1;
-      x.show !== !1 && (p == null ? void 0 : p.show) !== !1 && !v && (I = !0);
+      x.show !== !1 && (p == null ? void 0 : p.show) !== !1 && !m && (I = !0);
       const B = {
         key: S || "",
         ...Aa(F, ["dataIndex"]),
         checked: I,
         selectable: !1,
         disabled: x.disable === !0,
-        disableCheckbox: typeof x.disable == "boolean" ? x.disable : (W = x.disable) == null ? void 0 : W.checkbox,
+        disableCheckbox: typeof x.disable == "boolean" ? x.disable : (_ = x.disable) == null ? void 0 : _.checkbox,
         isLeaf: !0
       };
-      return v && (B.children = T(v, x)), B;
+      return m && (B.children = T(m, x)), B;
     });
     fe(() => {
       const c = T(e.list || []);
       n.value = c, u.value = c.filter((p) => p.checked).map((p) => p.key), (s == null ? void 0 : s.operationType.value) === "fixed" && (o.value = Ye().uuid(15));
     });
-    const h = be((c, p, g) => {
-      var A, E;
-      const v = ((A = f(l).find((D) => D.uuid === c)) == null ? void 0 : A.key) || "", S = ((E = f(l).find((D) => D.uuid === p)) == null ? void 0 : E.key) || "", F = {
+    const v = be((c, p, g) => {
+      var A, z;
+      const m = ((A = h(l).find((D) => D.uuid === c)) == null ? void 0 : A.key) || "", S = ((z = h(l).find((D) => D.uuid === p)) == null ? void 0 : z.key) || "", F = {
         ...s == null ? void 0 : s.columnsMap
-      }, x = [...s.sortKeyColumns.value], I = x.findIndex((D) => D === v), B = x.findIndex((D) => D === S), W = g > I;
+      }, x = [...s.sortKeyColumns.value], I = x.findIndex((D) => D === m), B = x.findIndex((D) => D === S), _ = g > I;
       if (I < 0)
         return;
-      const K = x[I];
-      x.splice(I, 1), g === 0 ? x.unshift(K) : x.splice(W ? B : B + 1, 0, K), x.forEach((D, oe) => {
+      const M = x[I];
+      x.splice(I, 1), g === 0 ? x.unshift(M) : x.splice(_ ? B : B + 1, 0, M), x.forEach((D, oe) => {
         F[D] = {
           ...F[D] || {},
           order: oe
@@ -1586,7 +1596,7 @@ const be = (e) => {
       }), s == null || s.setColumnsMap(F, "drop"), s == null || s.setSortKeyColumns(x);
     }), y = be((c) => {
       var x;
-      const p = c.node.key, g = ((x = f(l).find((I) => I.uuid === p)) == null ? void 0 : x.key) || "", S = {
+      const p = c.node.key, g = ((x = h(l).find((I) => I.uuid === p)) == null ? void 0 : x.key) || "", S = {
         ...(s == null ? void 0 : s.columnsMap[g]) || {}
       };
       S.show = c.checked;
@@ -1596,7 +1606,7 @@ const be = (e) => {
       };
       s == null || s.setColumnsMap(F, "show");
     }), d = (c) => {
-      const p = f(l).find((g) => g.uuid === c.key);
+      const p = h(l).find((g) => g.uuid === c.key);
       return c.title || Yt(r, "headerCell", {
         title: p.title,
         column: p
@@ -1615,28 +1625,28 @@ const be = (e) => {
         checkedKeys: u.value,
         height: 280,
         onDrop: (g) => {
-          const v = g.node.key, S = g.dragNode.key, {
+          const m = g.node.key, S = g.dragNode.key, {
             dropPosition: F,
             dropToGap: x
           } = g, I = F === -1 || !x ? F + 1 : F;
-          h(S, v, I);
+          v(S, m, I);
         },
-        onCheck: (g, v) => y(v),
+        onCheck: (g, m) => y(m),
         treeData: n.value
       }, {
         title: (g) => {
           var S;
-          const v = {
+          const m = {
             ...g,
             children: void 0,
             title: d(g),
             autoScroll: (S = s == null ? void 0 : s.autoScroll) == null ? void 0 : S.value
           };
-          return i(Ha, G({
+          return i(Ha, q({
             hashId: e.hashId,
             className: e.className
-          }, v, {
-            treeKey: v.key
+          }, m, {
+            treeKey: m.key
           }), null);
         }
       })]) : null;
@@ -1653,24 +1663,24 @@ const be = (e) => {
     const {
       columns: o
     } = de(), t = O([]), n = O([]), u = O([]), l = O([]);
-    q(() => o.value, (T) => {
-      t.value = [], n.value = [], u.value = [], T.forEach((h) => {
-        if (h.hideInSetting)
+    U(() => o.value, (T) => {
+      t.value = [], n.value = [], u.value = [], T.forEach((v) => {
+        if (v.hideInSetting)
           return;
         const {
           fixed: y,
           show: d,
           uuid: c
-        } = h;
+        } = v;
         if ((d || d === void 0) && c && l.value.push(c), y === "left") {
-          n.value.push(h);
+          n.value.push(v);
           return;
         }
         if (y === "right") {
-          t.value.push(h);
+          t.value.push(v);
           return;
         }
-        u.value.push(h);
+        u.value.push(v);
       });
     }, {
       immediate: !0
@@ -1735,12 +1745,12 @@ const be = (e) => {
     } = de(), r = be((d = !0) => {
       const c = {}, p = (g) => {
         g.forEach(({
-          key: v,
+          key: m,
           fixed: S,
           index: F,
           children: x
         }) => {
-          const I = ot(v, F);
+          const I = ot(m, F);
           I && (c[I] = {
             show: d,
             fixed: S
@@ -1752,17 +1762,17 @@ const be = (e) => {
       d.target.checked ? r() : r(!1);
     }), T = be(() => {
       l == null || l.setColumnsMap(l == null ? void 0 : l.cacheColumnsMap, "fixed");
-    }), h = w(() => (
+    }), v = w(() => (
       // @ts-ignore
       Object.values(l == null ? void 0 : l.columnsMap).filter((d) => !d || d.show === !1)
-    )), y = w(() => f(h).length > 0 && f(h).length !== u.value.length);
+    )), y = w(() => h(v).length > 0 && h(v).length !== u.value.length);
     return () => t(i(ea, {
       arrowPointAtCenter: !0,
       title: i("div", {
         class: [`${o}-title`, n.value]
       }, [i(ta, {
         indeterminate: y.value,
-        checked: f(h).length === 0 && f(h).length !== u.value.length,
+        checked: h(v).length === 0 && h(v).length !== u.value.length,
         onChange: (d) => s(d)
       }, {
         default: () => [pe("列展示")]
@@ -1971,7 +1981,7 @@ const mt = /* @__PURE__ */ ae({
       default: () => [s.value && i("div", {
         class: `${e.prefixCls}-actions`
       }, [s.value])]
-    }), [() => u.value, () => l.value, () => r.value, () => e.prefixCls, () => e.headerTitle, () => e.titleTipText, () => e.titleTip]), h = Fe(() => {
+    }), [() => u.value, () => l.value, () => r.value, () => e.prefixCls, () => e.headerTitle, () => e.titleTipText, () => e.titleTip]), v = Fe(() => {
       let d;
       return l.value ? i(le, {
         size: 16,
@@ -1986,11 +1996,11 @@ const mt = /* @__PURE__ */ ae({
             align: "center",
             class: `${e.prefixCls}-setting-items`
           }, lt(d = e.settings.map((p, g) => {
-            const v = Xa(p);
+            const m = Xa(p);
             return i("div", {
               key: g,
               class: `${e.prefixCls}-setting-item`
-            }, [v]);
+            }, [m]);
           })) ? d : {
             default: () => [d]
           }) : null];
@@ -2006,8 +2016,8 @@ const mt = /* @__PURE__ */ ae({
       };
       return i("div", {
         class: d
-      }, [T.value, h.value]);
-    }, [() => u.value, () => l.value, () => T.value, () => e.prefixCls, () => h.value]);
+      }, [T.value, v.value]);
+    }, [() => u.value, () => l.value, () => T.value, () => e.prefixCls, () => v.value]);
     return () => o(i("div", {
       class: `${e.prefixCls} ${t.value}`
     }, [y.value]));
@@ -2042,7 +2052,7 @@ function Qa(e, o) {
     let u = n === !0 ? o[t] : () => n == null ? void 0 : n();
     if (typeof u != "function" && (u = () => {
     }), t === "setting")
-      return i(_a, G(e[t], {
+      return i(_a, q(e[t], {
         key: t
       }), null);
     if (t === "fullScreen")
@@ -2103,7 +2113,7 @@ const Za = {
         optionsExtra: e.optionsExtra,
         headerTitle: e.headerTitle,
         actions: u,
-        settings: f(n),
+        settings: h(n),
         titleTip: e.titleTip,
         titleTipText: e.titleTipText
       }, null);
@@ -2128,7 +2138,7 @@ function ll(e, o, t, n) {
   let u = e;
   if (ne(o)) {
     const l = o.node === "a" ? "span" : o.node;
-    return i(l, G((o == null ? void 0 : o.attr) || {}, {
+    return i(l, q((o == null ? void 0 : o.attr) || {}, {
       class: [o.class, o.node === "a" ? `${t}-a` : ""],
       onClick: o.click
     }), al(e) ? e : {
@@ -2142,13 +2152,13 @@ function ll(e, o, t, n) {
       }, [e]);
       break;
     case "time":
-      u = H(e).format("HH:mm:ss");
+      u = W(e).format("HH:mm:ss");
       break;
     case "dateMonth":
-      u = `${H(e).month() + 1}月`;
+      u = `${W(e).month() + 1}月`;
       break;
     case "dateTime":
-      u = H(e).format("YYYY-MM-DD HH:mm:ss");
+      u = W(e).format("YYYY-MM-DD HH:mm:ss");
       break;
   }
   return u;
@@ -2373,14 +2383,14 @@ const ke = {
       wrapSSR: r,
       hashId: s
     } = Pe("ProBaseTable", [nl], l), T = ul(), {
-      width: h
+      width: v
     } = Xt(), {
       emptyText: y,
       indicator: d
     } = ia(), c = O(), p = O(), g = O(e.waitRequest);
     fe(() => g.value = e.waitRequest);
     const {
-      toggle: v,
+      toggle: m,
       isFullscreen: S
     } = st(c), F = w(() => ({
       ...e
@@ -2400,18 +2410,18 @@ const ke = {
       });
     }), {
       loadingStatus: B,
-      setLoading: W
+      setLoading: _
     } = Sa({
       emit: o,
       loading: Q(e, "loading")
     }), {
-      sizeRef: K,
+      sizeRef: M,
       setTableSize: A
     } = xa({
       emit: o,
       size: Q(e, "size")
     }), {
-      getPaginationInfo: E,
+      getPaginationInfo: z,
       setPagination: D
     } = wa({
       slots: t,
@@ -2422,22 +2432,22 @@ const ke = {
       breakpoint: b
     } = ja({
       ...oe,
-      innerWidth: h,
+      innerWidth: v,
       columns: I,
       screensRef: T
     }), P = Ba(e), {
       getProColumns: $,
       cacheProColumns: N,
-      setColumns: m,
+      setColumns: f,
       changeColumns: j,
-      resizeColumnWidth: Y
+      resizeColumnWidth: V
     } = Da({
       ...P,
       breakpoint: b,
       scroll: a,
       columns: I
     }), {
-      columnsMap: X,
+      columnsMap: Y,
       operationType: he,
       setColumnsMap: Oe,
       sortKeyColumns: Se,
@@ -2460,9 +2470,9 @@ const ke = {
       setPagination: D
     }), {
       selectedKey: ue,
-      changeRowKey: k,
+      changeRowKey: E,
       selectRowKey: ie,
-      selectAllRowKey: _,
+      selectAllRowKey: G,
       syncSelectedRows: gt,
       removeRowKeys: yt
     } = Ta(Q(e, "rowKey"), Q(e, "rowSelection")), pt = $a(e), {
@@ -2477,49 +2487,49 @@ const ke = {
       waitRequest: g
     }, {
       loadingStatus: B,
-      getPaginationInfo: E,
+      getPaginationInfo: z,
       setPagination: D,
       removeRowKeys: yt,
       syncSelectedRows: gt,
-      setLoading: W,
-      setColumns: m,
+      setLoading: _,
+      setColumns: f,
       columns: $,
       formParamsRef: Be,
       onBeforeSearchSubmit: e.onBeforeSearchSubmit,
       hasCustomRender: w(() => !!ze(t, e, "customRender"))
     }, o), St = w(() => e.options ? {
       ...il,
-      ...U(ne(e.options) ? e.options : {})
+      ...X(ne(e.options) ? e.options : {})
     } : !1), Ge = w(() => {
       const C = ne(e.loading) ? ye(e.loading, "spinning") : {};
       return !C.indicator && (d != null && d.value) && (C.indicator = d == null ? void 0 : d.value), ye({
         ...(ye(n), ["class", "style", "id"]),
         ...e,
         virtualScroll: x.value,
-        size: f(K),
-        scroll: f(a),
+        size: h(M),
+        scroll: h(a),
         loading: {
-          spinning: e.showLoading ? !!f(B) : !1,
+          spinning: e.showLoading ? !!h(B) : !1,
           ...C
         },
-        columns: Ne(f($).filter((R) => R.show || R.show === void 0)),
-        pagination: Ne(f(E)),
-        dataSource: f(me)
+        columns: Ne(h($).filter((R) => R.show || R.show === void 0)),
+        pagination: Ne(h(z)),
+        dataSource: h(me)
       }, ["class", "onChange", "onExpand", "onExpandedRowsChange"]);
     }), xt = w(() => [{
       [`${s.value}`]: !0,
       [`${l}`]: !0,
       [`${n.class}`]: n.class,
-      [`${l}-no-scroll`]: !Object.keys(f(a) || {}).length,
+      [`${l}-no-scroll`]: !Object.keys(h(a) || {}).length,
       [`${l}-table-tree`]: We.value,
       [`${l}-full-screen`]: S.value
     }]), qe = w(() => {
       var J;
       let C;
-      const R = f(F).direction === "rtl" ? "bottomLeft" : "right", M = (J = f(E)) == null ? void 0 : J.position;
-      if (M !== null && Array.isArray(M)) {
-        const z = M.find((se) => se.indexOf("top") !== -1), V = M.find((se) => se.indexOf("bottom") !== -1), Te = M.every((se) => `${se}` == "none");
-        !z && !V && !Te && (C = R), z && (C = z.toLowerCase().replace("top", "")), V && (C = V.toLowerCase().replace("bottom", ""));
+      const R = h(F).direction === "rtl" ? "bottomLeft" : "right", k = (J = h(z)) == null ? void 0 : J.position;
+      if (k !== null && Array.isArray(k)) {
+        const K = k.find((se) => se.indexOf("top") !== -1), H = k.find((se) => se.indexOf("bottom") !== -1), Te = k.every((se) => `${se}` == "none");
+        !K && !H && !Te && (C = R), K && (C = K.toLowerCase().replace("top", "")), H && (C = H.toLowerCase().replace("bottom", ""));
       } else
         C = R;
       return C;
@@ -2531,25 +2541,25 @@ const ke = {
       }), await De()) : L(C);
     }, wt = async (C, R) => {
       R ? (o("reset", C), e.request && await Ue(C)) : e.request ? (o("submit", C), await Ue(C)) : o("submit", C);
-    }, Xe = (C, R, M, J) => {
-      D(it(C, ["current", "pageSize"])), _e(C, R, M, J);
+    }, Xe = (C, R, k, J) => {
+      D(it(C, ["current", "pageSize"])), _e(C, R, k, J);
     }, Tt = (C, R) => {
-      var M;
+      var k;
       D({
         current: C,
         pageSize: R
       }), _e({
         current: C,
         pageSize: R,
-        total: E.value && ((M = E.value) == null ? void 0 : M.total) || 0
+        total: z.value && ((k = z.value) == null ? void 0 : k.total) || 0
       }, {}, {});
     }, Rt = (C) => {
       o("expandedRowsChange", C);
     }, $t = (C, R) => {
       o("expand", C, R);
-    }, Ft = (C, R) => Y(C, R), It = (C, R, M) => {
-      const J = M.align === "center" ? "top" : M.align === "left" || !M.align ? "topLeft" : "topRight";
-      return R && M.copyable ? i(ua.Paragraph, {
+    }, Ft = (C, R) => V(C, R), It = (C, R, k) => {
+      const J = k.align === "center" ? "top" : k.align === "left" || !k.align ? "topLeft" : "topRight";
+      return R && k.copyable ? i(ua.Paragraph, {
         class: `${l}-copyable`,
         style: {
           margin: "0",
@@ -2566,7 +2576,7 @@ const ke = {
             class: `${l}-ellipsis`
           }, [C])]
         })]
-      }) : R && !M.copyable ? i(Z, {
+      }) : R && !k.copyable ? i(Z, {
         title: C,
         placement: J
       }, {
@@ -2580,27 +2590,27 @@ const ke = {
       return C ? (R = me.value) != null && R.length ? C(me.value) : (y == null ? void 0 : y.value) || i(ct, {
         image: ol
       }, null) : i(Ie, null, null);
-    }, Ot = (C, R, M) => i(el, {
+    }, Ot = (C, R, k) => i(el, {
       headerTitle: C,
-      titleTip: M,
+      titleTip: k,
       titleTipText: e.titleTipText,
-      options: f(St),
+      options: h(St),
       settingExtra: ge(t, e, "settingExtra"),
       optionsExtra: ge(t, e, "optionsExtra"),
       toolBarBtn: R
     }, null);
     ka({
-      tableSize: K,
+      tableSize: M,
       columns: $,
       cacheColumns: I,
       action: {
         setTableSize: A,
         reload: (C) => De(C),
-        toggle: v
+        toggle: m
       },
       settingsAction: {
         autoScroll: Q(e, "autoScroll"),
-        columnsMap: X,
+        columnsMap: Y,
         operationType: he,
         setColumnsMap: Oe,
         sortKeyColumns: Se,
@@ -2617,7 +2627,7 @@ const ke = {
           var C;
           return ((C = p.value) == null ? void 0 : C.getFormState()) || {};
         },
-        getTableFormState: () => f(Be),
+        getTableFormState: () => h(Be),
         restForm: (C) => {
           var R;
           g.value = !0, C && (C == null || C()), (R = p.value) == null || R.resetForm(!1), g.value = !1;
@@ -2625,9 +2635,9 @@ const ke = {
       }),
       actionRef: () => ({
         dataSource: me.value,
-        pageParams: E.value,
+        pageParams: z.value,
         reload: De,
-        getLoadingStatus: () => f(B),
+        getLoadingStatus: () => h(B),
         reloadAndRest: async (C) => {
           g.value = !0, D({
             current: 1,
@@ -2638,13 +2648,13 @@ const ke = {
         setPageAndReload: Xe,
         setPagination: D,
         changeDataValue: Ct,
-        loadingOperation: W
+        loadingOperation: _
       })
     });
     const Bt = w(() => (n == null ? void 0 : n.style) || {});
     return () => {
       var J;
-      const C = ge(t, e, "headerTitle"), R = ge(t, e, "titleTip"), M = ge(t, e, "toolBarBtn");
+      const C = ge(t, e, "headerTitle"), R = ge(t, e, "titleTip"), k = ge(t, e, "toolBarBtn");
       return r(i("div", {
         ref: c,
         class: xt.value,
@@ -2657,52 +2667,52 @@ const ke = {
         modal: e.modalScroll,
         searchMap: ee.value,
         prefixCls: l,
-        loading: !!f(B),
+        loading: !!h(B),
         onSearch: wt,
         defaultParams: ve
       }, {
         default: t.search ? () => {
-          var z;
-          return (z = t.search) == null ? void 0 : z.call(t);
+          var K;
+          return (K = t.search) == null ? void 0 : K.call(t);
         } : null
-      }), !x.value && Ot(C, M, R), e.customRender ?? t.customRender ? i(Le, f(Ge).loading, {
+      }), !x.value && Ot(C, k, R), e.customRender ?? t.customRender ? i(Le, h(Ge).loading, {
         default: () => {
-          var z;
+          var K;
           return [i("div", {
             class: `${l}-wrapper ${s.value}`
-          }, [Pt(), e.pagination !== !1 && ((z = me.value) == null ? void 0 : z.length) > 0 && i(na, G({
+          }, [Pt(), e.pagination !== !1 && ((K = me.value) == null ? void 0 : K.length) > 0 && i(na, q({
             class: {
               [`${l}-pagination ${s.value}`]: !0,
               [`${l}-pagination-${qe.value} ${s.value}`]: !!qe.value
             }
-          }, Ne(f(E)), {
+          }, Ne(h(z)), {
             onChange: Tt
           }), null)])];
         }
-      }) : i(oa, G(Ge.value, {
+      }) : i(oa, q(Ge.value, {
         style: e.tableStyle || void 0,
         class: e.tableClassName,
-        rowKey: (z) => z[e.rowKey || "sortIndex"],
+        rowKey: (K) => K[e.rowKey || "sortIndex"],
         transformCellText: ({
-          text: z,
-          column: V
+          text: K,
+          column: H
         }) => {
           var Qe, Ze;
-          const Te = Ke(z) ? z == null ? void 0 : z[0] : z;
+          const Te = Ke(K) ? K == null ? void 0 : K[0] : K;
           if (Ce(Te))
-            return z;
+            return K;
           const {
             value: se,
             success: Dt
-          } = Ut(Te, (V == null ? void 0 : V.columnEmptyText) || (e == null ? void 0 : e.columnEmptyText) || ""), Je = ll(se, ((Ze = (Qe = e.columns) == null ? void 0 : Qe.find((Nt) => Nt.key === V.key)) == null ? void 0 : Ze.valueType) || V.valueType, l, s.value);
-          return V != null && V.ellipsis ? It(Je, Dt, V) : Je;
+          } = Ut(Te, (H == null ? void 0 : H.columnEmptyText) || (e == null ? void 0 : e.columnEmptyText) || ""), Je = ll(se, ((Ze = (Qe = e.columns) == null ? void 0 : Qe.find((Nt) => Nt.key === H.key)) == null ? void 0 : Ze.valueType) || H.valueType, l, s.value);
+          return H != null && H.ellipsis ? It(Je, Dt, H) : Je;
         },
         rowSelection: e.rowSelection ? {
           ...ye(e.rowSelection, ["onSelect", "onSelectAll", "onChange", "selectedRowKeys"]),
           selectedRowKeys: ue.value,
           onSelect: ie,
-          onSelectAll: _,
-          onChange: k
+          onSelectAll: G,
+          onChange: E
         } : void 0,
         onChange: Xe,
         onExpandedRowsChange: Rt,