@gx-design-vue/pro-table 0.2.0-beta.92 → 0.2.0-beta.94

package/dist/pro-table.js

@@ -1,30 +1,30 @@
-import { cloneDeep as le, omit as _e, pick as Ct } from "lodash-es";
-import { isObject as q, isBoolean as ne, getSlot as $t, isFunction as Pe, arrayRepeat as el, runFunction as tl, convertValueBoolean as Re, isArray as te, getSortIndex as ll, isDeepEqualReact as Ye, handleCurrentPage as al, genColumnKey as Ft, compareArray as nl, isNumber as Ge, isString as Rt, classNames as Ee, filterEmpty as It, getPrefixCls as ut, getRandomNumber as at, handleShowIndex as ul, hanndleEmptyField as il, getTextWidth as sl, getSlotVNode as Fe } from "@gx-design-vue/pro-utils";
-import { reactive as be, isReactive as ol, watch as V, computed as w, ref as N, toRaw as Se, createVNode as c, mergeProps as G, isVNode as Ce, watchEffect as ze, unref as y, onUnmounted as rl, onDeactivated as cl, onMounted as dl, defineComponent as re, Fragment as qe, nextTick as fl, h as Bt, cloneVNode as it, createTextVNode as Ne, renderSlot as hl, toRef as se } from "vue";
+import { cloneDeep as ae, omit as Ge, pick as Ct } from "lodash-es";
+import { isObject as X, isBoolean as ne, getSlot as $t, isFunction as Ee, arrayRepeat as el, runFunction as tl, convertValueBoolean as Ie, isArray as le, getSortIndex as ll, isDeepEqualReact as He, handleCurrentPage as al, genColumnKey as Bt, compareArray as nl, isNumber as Qe, isString as Ft, classNames as we, filterEmpty as Rt, getPrefixCls as ut, getRandomNumber as at, handleShowIndex as ul, hanndleEmptyField as il, getTextWidth as sl, getSlotVNode as Re } from "@gx-design-vue/pro-utils";
+import { reactive as pe, isReactive as ol, watch as _, computed as w, ref as E, toRaw as $e, createVNode as c, mergeProps as Q, isVNode as ce, watchEffect as Ae, unref as b, onUnmounted as rl, onDeactivated as cl, onMounted as dl, defineComponent as fe, Fragment as _e, nextTick as fl, h as It, cloneVNode as it, createTextVNode as De, renderSlot as hl, toRef as oe } from "vue";
 import "ant-design-vue/es/_util/props-util";
-import { warning as vl } from "ant-design-vue/es/vc-util/warning";
-import { tableProps as ml } from "ant-design-vue/es/table/Table";
-import { UpOutlined as gl, DownOutlined as yl, SettingOutlined as Ot, VerticalAlignTopOutlined as bl, VerticalAlignMiddleOutlined as Cl, VerticalAlignBottomOutlined as xl, FullscreenExitOutlined as Sl, FullscreenOutlined as wl, ColumnHeightOutlined as Tl, InfoCircleOutlined as pl, ReloadOutlined as $l, CopyOutlined as Fl } from "@ant-design/icons-vue";
-import { useFullscreen as kt, useWindowSize as Rl } from "@vueuse/core";
-import { Form as xt, Grid as st, Space as ye, Button as St, Input as wt, TimePicker as Il, DatePicker as jt, TreeSelect as Bl, Spin as nt, Select as Ol, Popover as kl, Checkbox as jl, Tooltip as oe, Tree as Pl, Dropdown as El, Menu as He, Pagination as Nl, Table as Dl, message as Ml, Empty as zl } from "ant-design-vue";
-import { useProAppContext as Pt } from "@gx-design-vue/pro-app";
-import { useContext as Kl, useProStyle as Ue } from "@gx-design-vue/pro-provider";
-import ae from "dayjs";
-import { tryOnUnmounted as Al, useMemo as Ve } from "@gx-design-vue/pro-hooks";
-function Wa(e, t) {
-  var x, C, f, S;
+import { warning as ml } from "ant-design-vue/es/vc-util/warning";
+import { tableProps as vl } from "ant-design-vue/es/table/Table";
+import { UpOutlined as gl, DownOutlined as yl, SettingOutlined as Ot, VerticalAlignTopOutlined as bl, VerticalAlignMiddleOutlined as Cl, VerticalAlignBottomOutlined as xl, FullscreenExitOutlined as Sl, FullscreenOutlined as wl, ColumnHeightOutlined as pl, InfoCircleOutlined as Tl, ReloadOutlined as $l, CopyOutlined as Bl } from "@ant-design/icons-vue";
+import { useFullscreen as Pt, useWindowSize as Fl } from "@vueuse/core";
+import { Grid as st, Space as Se, Button as xt, Input as St, TimePicker as Rl, DatePicker as kt, TreeSelect as Il, Spin as nt, Select as Ol, Popover as Pl, Checkbox as kl, Tooltip as de, Tree as jl, Dropdown as Nl, Menu as We, Pagination as El, Table as Dl, message as Ml, Empty as Al } from "ant-design-vue";
+import { useProAppContext as jt } from "@gx-design-vue/pro-app";
+import { useContext as zl, useProStyle as qe, unit as wt } from "@gx-design-vue/pro-provider";
+import q from "dayjs";
+import { tryOnUnmounted as Kl, useMemo as Ve } from "@gx-design-vue/pro-hooks";
+function Va(e, l) {
+  var C, x, d, S;
   function a() {
-    return t != null && t.state && q(t == null ? void 0 : t.state) ? le(Se(t == null ? void 0 : t.state)) : {};
+    return l != null && l.state && X(l == null ? void 0 : l.state) ? ae($e(l == null ? void 0 : l.state)) : {};
   }
-  const o = be({
-    params: ((x = t == null ? void 0 : t.state) == null ? void 0 : x.params) || {},
+  const o = pe({
+    params: ((C = l == null ? void 0 : l.state) == null ? void 0 : C.params) || {},
     // @ts-ignore
     request: async (...u) => {
       var n;
-      return t != null && t.request ? await ((n = t == null ? void 0 : t.request) == null ? void 0 : n.call(t, ...u)) : void 0;
+      return l != null && l.request ? await ((n = l == null ? void 0 : l.request) == null ? void 0 : n.call(l, ...u)) : void 0;
     }
   });
-  t != null && t.state && (ol(t.state) ? V(() => t == null ? void 0 : t.state, () => {
+  l != null && l.state && (ol(l.state) ? _(() => l == null ? void 0 : l.state, () => {
     Object.assign(o, a());
   }, { deep: !0, immediate: !0 }) : Object.assign(o, a()));
   const s = w(() => {
@@ -33,27 +33,27 @@ function Wa(e, t) {
   }), i = w(() => {
     var u, n;
     return (n = (u = e == null ? void 0 : e.value) == null ? void 0 : u.formRef) == null ? void 0 : n.call(u);
-  }), d = w(() => {
+  }), f = w(() => {
     var u, n, r;
     return {
       ...((u = s.value) == null ? void 0 : u.pageState) || {},
       ...((r = (n = i.value) == null ? void 0 : n.getFormState) == null ? void 0 : r.call(n)) || {}
     };
-  }), v = N(!!((f = (C = s.value) == null ? void 0 : C.loading) != null && f.value));
-  return V(() => {
+  }), m = E(!!((d = (x = s.value) == null ? void 0 : x.loading) != null && d.value));
+  return _(() => {
     var u, n;
     return (n = (u = s.value) == null ? void 0 : u.loading) == null ? void 0 : n.value;
   }, (u) => {
-    v.value = !!u;
-  }), V(v, (u) => {
+    m.value = !!u;
+  }), _(m, (u) => {
     var n, r;
     (r = (n = s.value) == null ? void 0 : n.setLoading) == null || r.call(n, !!u);
   }), {
     formRef: i,
     actionRef: s,
     tableState: o,
-    requestParams: d,
-    loading: v,
+    requestParams: f,
+    loading: m,
     dataSource: w(() => {
       var u, n;
       return ((n = (u = s == null ? void 0 : s.value) == null ? void 0 : u.dataSource) == null ? void 0 : n.value) || [];
@@ -75,15 +75,15 @@ function Wa(e, t) {
       var n, r;
       return (r = (n = s.value) == null ? void 0 : n.reloadAndReset) == null ? void 0 : r.call(n, u);
     },
-    setPageAndReload: (u, n, r, m) => {
-      var $, O;
-      return (O = ($ = s.value) == null ? void 0 : $.setPageAndReload) == null ? void 0 : O.call($, u, n, r, m);
+    setPageAndReload: (u, n, r, g) => {
+      var T, P;
+      return (P = (T = s.value) == null ? void 0 : T.setPageAndReload) == null ? void 0 : P.call(T, u, n, r, g);
     },
     setPagination: (u) => {
       var n, r;
       return (r = (n = s.value) == null ? void 0 : n.setPagination) == null ? void 0 : r.call(n, u);
     },
-    setLoading: (u) => v.value = u,
+    setLoading: (u) => m.value = u,
     setData: (u) => {
       var n, r;
       return (r = (n = s.value) == null ? void 0 : n.setData) == null ? void 0 : r.call(n, u);
@@ -94,8 +94,8 @@ function Wa(e, t) {
     }
   };
 }
-const Ll = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered", "loading"], Et = {
-  ..._e(ml(), Ll),
+const Yl = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered", "loading"], Nt = {
+  ...Ge(vl(), Yl),
   transformCellText: Function,
   /**
    * @Author      gx12358
@@ -115,8 +115,8 @@ const Ll = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
     type: Object,
     default: void 0
   }
-}, we = {
-  ...Et,
+}, re = {
+  ...Nt,
   rowSelection: {
     type: Object,
     default: void 0
@@ -278,6 +278,16 @@ const Ll = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
     type: Boolean,
     default: !1
   },
+  /**
+   * @Author      gx12358
+   * @DateTime    2024/11/15
+   * @lastTime    2024/11/15
+   * @description 是否已card分割
+   */
+  cardBordered: {
+    type: Boolean,
+    default: !1
+  },
   /**
    * @Author      gx12358
    * @DateTime    2022/2/8
@@ -374,92 +384,92 @@ const Ll = ["rowKey", "rowSelection", "columns", "pagination", "size", "bordered
   onBeforeSearchSubmit: Function,
   onColumnsStateChange: Function
 };
-function Wl(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !Ce(e);
+function Ll(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !ce(e);
 }
-function Hl(e, t, a, o) {
-  if (!t) return e;
+function Wl(e, l, a, o) {
+  if (!l) return e;
   let s = e;
-  if (q(t)) {
-    const i = t.node === "a" ? "span" : t.node;
-    return c(i, G((t == null ? void 0 : t.attr) || {}, {
-      class: [t.class, t.node === "a" ? `${a}-a` : ""],
-      onClick: t.click
-    }), Wl(e) ? e : {
+  if (X(l)) {
+    const i = l.node === "a" ? "span" : l.node;
+    return c(i, Q((l == null ? void 0 : l.attr) || {}, {
+      class: [l.class, l.node === "a" ? `${a}-a` : ""],
+      onClick: l.click
+    }), Ll(e) ? e : {
       default: () => [e]
     });
   }
-  switch (t) {
+  switch (l) {
     case "link":
       s = c("span", {
         class: [`${a}-a`, o]
       }, [e]);
       break;
     case "time":
-      s = ae(e).format("HH:mm:ss");
+      s = q(e).format("HH:mm:ss");
       break;
     case "dateMonth":
-      s = `${ae(e).month() + 1}月`;
+      s = `${q(e).month() + 1}月`;
       break;
     case "dateTime":
-      s = ae(e).format("YYYY-MM-DD HH:mm:ss");
+      s = q(e).format("YYYY-MM-DD HH:mm:ss");
       break;
   }
   return s;
 }
-function Yl(e, t) {
-  const a = t && t.current || 1, o = t && t.pageSize || 10;
+function Hl(e, l) {
+  const a = l && l.current || 1, o = l && l.pageSize || 10;
   return e.filter((s, i) => i < a * o && i >= o * (a - 1));
 }
 function Vl(e) {
-  const t = document.createElement("textarea");
-  t.style.position = "absolute", t.style.opacity = "0", t.value = e, document.body.appendChild(t), t.select(), document.execCommand("copy"), document.body.removeChild(t);
+  const l = document.createElement("textarea");
+  l.style.position = "absolute", l.style.opacity = "0", l.value = e, document.body.appendChild(l), l.select(), document.execCommand("copy"), document.body.removeChild(l);
 }
-function _l({ emit: e, loading: t }) {
+function Gl({ emit: e, loading: l }) {
   var i;
-  const a = N(ne(t.value) ? t.value : q(t.value) ? (i = t.value) == null ? void 0 : i.spinning : !1);
-  V(() => t.value, (d) => {
-    a.value = ne(d) ? d : q(d) ? d == null ? void 0 : d.spinning : a.value;
+  const a = E(ne(l.value) ? l.value : X(l.value) ? (i = l.value) == null ? void 0 : i.spinning : !1);
+  _(() => l.value, (f) => {
+    a.value = ne(f) ? f : X(f) ? f == null ? void 0 : f.spinning : a.value;
   });
   const o = w(() => a.value);
-  function s(d) {
-    a.value = d, e("loadingChange", !0);
+  function s(f) {
+    a.value = f, e("loadingChange", !0);
   }
   return { loadingComputed: o, loading: a, setLoading: s };
 }
-function Gl({ size: e, emit: t }) {
-  const a = N("middle");
-  ze(() => {
+function Ql({ size: e, emit: l }) {
+  const a = E("middle");
+  Ae(() => {
     a.value = e.value;
   });
   function o(s) {
-    a.value = s, t("sizeChange", s);
+    a.value = s, l("sizeChange", s);
   }
   return { sizeRef: a, setTableSize: o };
 }
-function ql({
+function _l({
   slots: e,
-  props: t,
+  props: l,
   pagination: a
 }) {
-  const o = be({}), s = N();
-  V(() => a.value, () => {
-    var C;
+  const o = pe({}), s = E();
+  _(() => a.value, () => {
+    var x;
     if (ne(a.value) && !a.value) {
       s.value = !1;
       return;
     }
-    const d = $t(e, y(t), "pageItemRender"), v = Pe(d) ? {
+    const f = $t(e, b(l), "pageItemRender"), m = Ee(f) ? {
       itemRender: ({
-        page: f,
+        page: d,
         type: S,
         originalElement: u
-      }) => d ? d({
-        page: f,
+      }) => f ? f({
+        page: d,
         type: S,
         originalElement: u
       }) : null
-    } : null, x = {
+    } : null, C = {
       current: 1,
       pageSize: 10,
       size: "default",
@@ -467,22 +477,22 @@ function ql({
       showSizeChanger: !0,
       pageSizeOptions: ["10", "20", "50", "100"],
       ...a.value || {},
-      ...v || {}
+      ...m || {}
     };
-    (C = a.value) != null && C.showTotal || (x.showTotal = (f) => `共${f < x.pageSize ? 1 : Math.ceil(f / (x.pageSize || 10))}页 ${f}条记录`), s.value = x, Object.assign(o, {
-      pageNum: x.current,
-      pageSize: x.pageSize
+    (x = a.value) != null && x.showTotal || (C.showTotal = (d) => `共${d < C.pageSize ? 1 : Math.ceil(d / (C.pageSize || 10))}页 ${d}条记录`), s.value = C, Object.assign(o, {
+      pageNum: C.current,
+      pageSize: C.pageSize
     });
   }, {
     deep: 1,
     immediate: !0
   });
-  function i(d) {
-    if (q(s.value) && q(d)) {
-      const v = {};
-      Object.keys(d).forEach((x) => {
-        Object.prototype.hasOwnProperty.call(d, x) && s.value[x] === d[x] || (v[x] = d[x]);
-      }), Object.keys(v).length > 0 && (Object.assign(s.value, v), Ul(v) && Object.assign(o, v));
+  function i(f) {
+    if (X(s.value) && X(f)) {
+      const m = {};
+      Object.keys(f).forEach((C) => {
+        Object.prototype.hasOwnProperty.call(f, C) && s.value[C] === f[C] || (m[C] = f[C]);
+      }), Object.keys(m).length > 0 && (Object.assign(s.value, m), ql(m) && Object.assign(o, m));
     }
   }
   return {
@@ -491,45 +501,45 @@ function ql({
     setPagination: i
   };
 }
-function Ul(e) {
+function ql(e) {
   if (typeof e != "object" || e === null)
     return !1;
-  const t = Object.keys(e);
-  return t.length === 2 && t.includes("pageNum") && t.includes("pageSize");
+  const l = Object.keys(e);
+  return l.length === 2 && l.includes("pageNum") && l.includes("pageSize");
 }
-function Xl(e, t) {
-  const a = N([]), o = N([]);
-  V(() => {
-    var f;
-    return (f = t.value) == null ? void 0 : f.selectedRowKeys;
-  }, (f) => {
-    a.value = el([...f || []]);
+function Xl(e, l) {
+  const a = E([]), o = E([]);
+  _(() => {
+    var d;
+    return (d = l.value) == null ? void 0 : d.selectedRowKeys;
+  }, (d) => {
+    a.value = el([...d || []]);
   }, {
     deep: !0,
     immediate: !0
   });
-  const s = (f, S) => {
-    e.value && (S ? f != null && f[e.value] && (a.value.push(f[e.value]), o.value.push(f)) : (a.value = a.value.filter((u) => u !== f[e.value]), o.value = o.value.filter((u) => u[e.value] !== f[e.value])));
+  const s = (d, S) => {
+    e.value && (S ? d != null && d[e.value] && (a.value.push(d[e.value]), o.value.push(d)) : (a.value = a.value.filter((u) => u !== d[e.value]), o.value = o.value.filter((u) => u[e.value] !== d[e.value])));
   }, i = () => {
-    var f, S;
-    t.value && ((S = (f = t.value) == null ? void 0 : f.onChange) == null || S.call(f, a.value, o.value));
+    var d, S;
+    l.value && ((S = (d = l.value) == null ? void 0 : d.onChange) == null || S.call(d, a.value, o.value));
   };
   return {
     selectedKeys: a,
     selectedItems: o,
     selectRowKey: s,
-    selectAllRowKey: (f, S, u) => {
-      e.value && (f ? S.map((n) => (a.value.every((r) => r !== (n == null ? void 0 : n[e.value])) && n != null && n[e.value] && (a.value.push(n[e.value]), o.value.push(n)), n)) : u.map((n) => (a.value.includes(n == null ? void 0 : n[e.value]) && (a.value = a.value.filter((r) => r !== n[e.value]), o.value = o.value.filter((r) => r[e.value] !== n[e.value])), n)));
+    selectAllRowKey: (d, S, u) => {
+      e.value && (d ? S.map((n) => (a.value.every((r) => r !== (n == null ? void 0 : n[e.value])) && n != null && n[e.value] && (a.value.push(n[e.value]), o.value.push(n)), n)) : u.map((n) => (a.value.includes(n == null ? void 0 : n[e.value]) && (a.value = a.value.filter((r) => r !== n[e.value]), o.value = o.value.filter((r) => r[e.value] !== n[e.value])), n)));
     },
-    removeRowKeys: (f) => {
-      a.value = a.value.filter((S) => !f.includes(S)), o.value = o.value.filter((S) => !f.includes(S == null ? void 0 : S[e.value || ""])), i();
+    removeRowKeys: (d) => {
+      a.value = a.value.filter((S) => !d.includes(S)), o.value = o.value.filter((S) => !d.includes(S == null ? void 0 : S[e.value || ""])), i();
     },
     changeRowKey: i,
-    syncSelectedRows: (f) => {
+    syncSelectedRows: (d) => {
       if (e.value && a.value.length !== o.value.length) {
         const S = o.value.map((n) => n[e.value]), u = a.value.filter((n) => !S.includes(n));
-        f.forEach((n) => {
-          u.includes(n[e.value]) && o.value.push(le(n));
+        d.forEach((n) => {
+          u.includes(n[e.value]) && o.value.push(ae(n));
         });
       }
     },
@@ -538,366 +548,366 @@ function Xl(e, t) {
     }
   };
 }
-function Jl(e, t) {
-  const a = w(() => t || 0), o = N(), s = N(e);
+function Ul(e, l) {
+  const a = w(() => l || 0), o = E(), s = E(e);
   function i() {
     o.value && clearTimeout(o.value);
   }
-  async function d(...v) {
-    return a.value === 0 || a.value === void 0 ? s.value(...v) : (i(), new Promise(async (x) => {
-      var C;
-      (C = v[0]) != null && C.immediate ? x(await s.value(...v)) : o.value = setTimeout(async () => {
-        x(await s.value(...v));
+  async function f(...m) {
+    return a.value === 0 || a.value === void 0 ? s.value(...m) : (i(), new Promise(async (C) => {
+      var x;
+      (x = m[0]) != null && x.immediate ? C(await s.value(...m)) : o.value = setTimeout(async () => {
+        C(await s.value(...m));
       }, a.value);
     }));
   }
-  return Al(i), {
+  return Kl(i), {
     cancel: i,
-    run: d
+    run: f
   };
 }
-function Ql(e) {
-  const t = w(() => e.polling), a = w(() => e.debounceTime), o = w(() => e.dataSource);
+function Jl(e) {
+  const l = w(() => e.polling), a = w(() => e.debounceTime), o = w(() => e.dataSource);
   return {
-    polling: t,
+    polling: l,
     request: e.request,
     postData: e.postData,
     debounceTime: a,
     dataSource: o
   };
 }
-function Zl({ polling: e, request: t, postData: a, dataSource: o, waitRequest: s, debounceTime: i }, { search: d, columns: v, loading: x, setLoading: C, setColumns: f, removeRowKeys: S, syncSelectedRows: u, formParamsRef: n, setPagination: r, paginationInfo: m, onBeforeSearchSubmit: $, hasCustomRender: O }, R) {
-  const D = N(), K = N(!0), A = N(!1), Q = N(!1), M = N([]), _ = N(), L = w(() => {
-    var k;
-    return q(d.value) ? ((k = d.value) == null ? void 0 : k.type) === "button" : !!d.value;
-  }), de = async (k = {}) => {
-    var Ke;
-    const { pagination: g, filters: Y = {}, sorter: W = {}, removeKeys: pe = [], isPolling: Xe = !1 } = k;
-    if (!t || !Pe(t) || y(s) && x.value || A.value)
+function Zl({ polling: e, request: l, postData: a, dataSource: o, waitRequest: s, debounceTime: i }, { search: f, columns: m, loading: C, setLoading: x, setColumns: d, removeRowKeys: S, syncSelectedRows: u, formParamsRef: n, setPagination: r, paginationInfo: g, onBeforeSearchSubmit: T, hasCustomRender: P }, R) {
+  const M = E(), W = E(!0), Y = E(!1), L = E(!1), A = E([]), G = E(), H = w(() => {
+    var I;
+    return X(f.value) ? ((I = f.value) == null ? void 0 : I.type) === "button" : !!f.value;
+  }), ue = async (I = {}) => {
+    var ze;
+    const { pagination: j, filters: v = {}, sorter: K = {}, removeKeys: Be = [], isPolling: Xe = !1 } = I;
+    if (!l || !Ee(l) || b(s) && C.value || Y.value)
       return o.value || [];
-    if (A.value = !0, !Xe || y(s) || K.value ? C(!0) : B(!0), y(s)) {
-      K.value = !1, A.value = !1;
+    if (Y.value = !0, !Xe || b(s) || W.value ? x(!0) : y(!0), b(s)) {
+      W.value = !1, Y.value = !1;
       return;
     }
-    g && r(g);
+    j && r(j);
     try {
-      let fe = {};
-      if (ne(g) && !g || ne(m))
-        fe = {};
+      let ve = {};
+      if (ne(j) && !j || ne(g))
+        ve = {};
       else {
-        const { current: z = 1, pageSize: ve = 10, total: X } = y(m) || {};
-        fe.pageNum = al({ current: z, pageSize: ve, total: X }, pe.length), pe.length && S(pe), fe.pageSize = ve;
+        const { current: z = 1, pageSize: ye = 10, total: J } = b(g) || {};
+        ve.pageNum = al({ current: z, pageSize: ye, total: J }, Be.length), Be.length && S(Be), ve.pageSize = ye;
       }
-      const Ae = q(W) ? [W] : W;
-      Ae.forEach((z) => {
-        const ve = (z == null ? void 0 : z.columnKey) || (z == null ? void 0 : z.field);
-        z && (z != null && z.order) ? f(y(v).map((X) => (X.dataIndex === ve ? X.sortOrder = z == null ? void 0 : z.order : X.sortOrder = null, X))) : z && f(y(v).map((X) => (X.dataIndex === ve && (X.sortOrder = null), X)));
+      const Ke = X(K) ? [K] : K;
+      Ke.forEach((z) => {
+        const ye = (z == null ? void 0 : z.columnKey) || (z == null ? void 0 : z.field);
+        z && (z != null && z.order) ? d(b(m).map((J) => (J.dataIndex === ye ? J.sortOrder = z == null ? void 0 : z.order : J.sortOrder = null, J))) : z && d(b(m).map((J) => (J.dataIndex === ye && (J.sortOrder = null), J)));
       });
-      let Ie = {
-        ...fe || {},
-        ...k.params,
+      let Oe = {
+        ...ve || {},
+        ...I.params,
         ...n
       };
-      $ && Pe($) && (Ie = await $(Ie, W, Y));
-      let J = [];
-      const he = await (t == null ? void 0 : t(Ie, Ae, Y));
-      if (A.value = !1, he && (he != null && he.success)) {
-        J = he.data || [], a && Pe(a) && (J = await (a == null ? void 0 : a(J))), u(J);
-        const z = he.total || (J == null ? void 0 : J.length) || 0;
-        return z !== ((Ke = y(m)) == null ? void 0 : Ke.total) && r({
+      T && Ee(T) && (Oe = await T(Oe, K, v));
+      let Z = [];
+      const ge = await (l == null ? void 0 : l(Oe, Ke, v));
+      if (Y.value = !1, ge && (ge != null && ge.success)) {
+        Z = ge.data || [], a && Ee(a) && (Z = await (a == null ? void 0 : a(Z))), u(Z);
+        const z = ge.total || (Z == null ? void 0 : Z.length) || 0;
+        return z !== ((ze = b(g)) == null ? void 0 : ze.total) && r({
           total: z || 0
-        }), P(J), J;
+        }), p(Z), Z;
       } else
         return [];
-    } catch (fe) {
-      M.value === void 0 && P([]), R("requestError", fe);
+    } catch (ve) {
+      A.value === void 0 && p([]), R("requestError", ve);
     } finally {
-      K.value = !1, C(!1);
+      W.value = !1, x(!1);
     }
     return [];
-  }, U = Jl(async (k) => {
-    _.value && clearTimeout(_.value);
-    const g = await de(k), Y = tl(e.value, g);
-    return Y && !D.value && (_.value = setTimeout(() => {
-      U.run({ ...k, isPolling: Y });
-    }, Math.max(Y, 2e3))), g;
+  }, ee = Ul(async (I) => {
+    G.value && clearTimeout(G.value);
+    const j = await ue(I), v = tl(e.value, j);
+    return v && !M.value && (G.value = setTimeout(() => {
+      ee.run({ ...I, isPolling: v });
+    }, Math.max(v, 2e3))), j;
   }, i.value || 10);
   rl(() => {
-    D.value = !0, clearTimeout(_.value);
+    M.value = !0, clearTimeout(G.value);
   }), cl(() => {
-    D.value = !0, clearTimeout(_.value);
-  }), V(() => e.value, () => {
-    e.value ? U.run({ isPolling: !0 }) : clearTimeout(_.value);
-  }, { immediate: !0 }), V([() => s.value, () => o.value], () => {
-    Te();
-  }, { deep: !0, immediate: !0 }), V([() => n], () => {
-    L.value || Te();
+    M.value = !0, clearTimeout(G.value);
+  }), _(() => e.value, () => {
+    e.value ? ee.run({ isPolling: !0 }) : clearTimeout(G.value);
+  }, { immediate: !0 }), _([() => s.value, () => o.value], () => {
+    me();
+  }, { deep: !0, immediate: !0 }), _([() => n], () => {
+    H.value || me();
   }, {
     deep: !0,
     immediate: !0
   });
-  function Te() {
-    Re(t) ? (!K.value || !e.value) && U.run({ isPolling: !1 }) : P(o.value || []);
+  function me() {
+    Ie(l) ? (!W.value || !e.value) && ee.run({ isPolling: !1 }) : p(o.value || []);
   }
-  const l = w(() => {
-    if (O.value)
-      return y(M);
-    const k = v.value.filter((g) => g.show || g.show === void 0);
-    return !y(M) || !k || k.length === 0 ? [] : y(M);
-  }), b = w(() => y(M).some((k) => te(k.children) && k.children.length > 0));
-  function B(k) {
-    Q.value = k;
+  const U = w(() => {
+    if (P.value)
+      return b(A);
+    const I = m.value.filter((j) => j.show || j.show === void 0);
+    return !b(A) || !I || I.length === 0 ? [] : b(A);
+  }), t = w(() => b(A).some((I) => le(I.children) && I.children.length > 0));
+  function y(I) {
+    L.value = I;
   }
-  function I(k, g, Y, W) {
-    U.run({ pagination: k, filters: g, sorter: Y, extra: W, isPolling: !1 }), R("change", k, g, Y, W);
+  function O(I, j, v, K) {
+    ee.run({ pagination: I, filters: j, sorter: v, extra: K, isPolling: !1 }), R("change", I, j, v, K);
   }
-  function P(k) {
-    var Y;
-    const g = ll(le(k), y(m.value));
-    if (!Ye(g, M.value) && (M.value = g, !t || !Pe(t))) {
-      const W = g.length || 0;
-      W !== ((Y = y(m)) == null ? void 0 : Y.total) && r({
-        total: W
+  function p(I) {
+    var v;
+    const j = ll(ae(I), b(g.value));
+    if (!He(j, A.value) && (A.value = j, !l || !Ee(l))) {
+      const K = j.length || 0;
+      K !== ((v = b(g)) == null ? void 0 : v.total) && r({
+        total: K
       });
     }
   }
-  function Z({ key: k, record: g, type: Y = "update" }) {
-    switch (Y) {
+  function D({ key: I, record: j, type: v = "update" }) {
+    switch (v) {
       case "update":
-        M.value = M.value.map((W) => k && g[k] === W[k] ? { ...W, ...g } : W);
+        A.value = A.value.map((K) => I && j[I] === K[I] ? { ...K, ...j } : K);
         break;
       case "push":
-        M.value.push(g);
+        A.value.push(j);
         break;
       case "unshift":
-        M.value.unshift(g);
+        A.value.unshift(j);
         break;
       case "delete":
-        M.value = M.value.filter((W) => k ? k && g[k] !== W[k] : !0);
+        A.value = A.value.filter((K) => I ? I && j[I] !== K[I] : !0);
         break;
     }
   }
   return {
-    dataSource: l,
-    isTreeDataRef: b,
-    reSetDataList: P,
-    changeDataValue: Z,
-    handleTableChange: I,
-    reload: async (k) => {
-      Re(t) ? await U.run({ ...k, isPolling: !1 }) : R("reload");
+    dataSource: U,
+    isTreeDataRef: t,
+    reSetDataList: p,
+    changeDataValue: D,
+    handleTableChange: O,
+    reload: async (I) => {
+      Ie(l) ? await ee.run({ ...I, isPolling: !1 }) : R("reload");
     }
   };
 }
 function ea(e) {
-  const t = {};
+  const l = {};
   return e.forEach((a) => {
     let o = a.initialValue;
     const s = ["select"], i = ["date", "time", "dateRange"];
-    !o && s.includes(a.valueType) ? o = void 0 : !o && i.includes(a.valueType) ? o = null : o || (o = ""), a.name === "dateRange" ? (t[a.rangeStartName || "start"] = o ? o[0] : null, t[a.rangeEndName || "end"] = o ? o[1] : null) : a.name && (t[a.name] = o);
-  }), t;
+    !o && s.includes(a.valueType) ? o = void 0 : !o && i.includes(a.valueType) ? o = null : o || (o = ""), a.name === "dateRange" ? (l[a.rangeStartName || "start"] = o ? o[0] : null, l[a.rangeEndName || "end"] = o ? o[1] : null) : a.name && (l[a.name] = o);
+  }), l;
 }
-function ta({ searchMap: e, params: t, columns: a, setPagination: o }) {
-  const s = be({}), i = be({}), d = N([]), v = (C) => {
+function ta({ searchMap: e, params: l, columns: a, setPagination: o }) {
+  const s = pe({}), i = pe({}), f = E([]), m = (x) => {
     var S, u;
-    const f = [];
-    if ((C === "all" || C === "searchMap") && ((S = e.value) == null || S.forEach((n) => f.push(n)), f.forEach((n) => {
-      d.value.some((r) => r.name === n.name) ? d.value = d.value.map((r) => r.name === n.name ? {
+    const d = [];
+    if ((x === "all" || x === "searchMap") && ((S = e.value) == null || S.forEach((n) => d.push(n)), d.forEach((n) => {
+      f.value.some((r) => r.name === n.name) ? f.value = f.value.map((r) => r.name === n.name ? {
         ...r,
         ...n
-      } : r) : d.value.push(n);
-    })), (C === "all" || C === "columns") && ((u = a.value) != null && u.length) && (a.value && a.value.forEach((n) => {
-      n.searchConfig && f.push(n.searchConfig);
-    }), f.forEach((n) => {
-      d.value.some((r) => r.name === n.name) ? d.value = d.value.map((r) => r.name === n.name ? {
+      } : r) : f.value.push(n);
+    })), (x === "all" || x === "columns") && ((u = a.value) != null && u.length) && (a.value && a.value.forEach((n) => {
+      n.searchConfig && d.push(n.searchConfig);
+    }), d.forEach((n) => {
+      f.value.some((r) => r.name === n.name) ? f.value = f.value.map((r) => r.name === n.name ? {
         ...r,
         ...n
-      } : r) : d.value.push(n);
-    })), C === "all" || C === "searchMap" || C === "columns") {
+      } : r) : f.value.push(n);
+    })), x === "all" || x === "searchMap" || x === "columns") {
       o({ current: 1 });
-      const n = ea(f);
+      const n = ea(d);
       Object.assign(i, { ...n });
       for (const r in n)
         s[r] || (s[r] = n[r]);
     }
-    (C === "all" || C === "params") && (o({ current: 1 }), Object.assign(s, t.value));
+    (x === "all" || x === "params") && (o({ current: 1 }), Object.assign(s, l.value));
   };
   dl(() => {
-    v("all");
-  }), V(() => t.value, () => {
-    v("params");
-  }, { deep: !0 }), V(() => e.value, () => {
-    v("searchMap");
-  }, { deep: !0 }), V(() => a.value, () => {
-    v("columns");
+    m("all");
+  }), _(() => l.value, () => {
+    m("params");
+  }, { deep: !0 }), _(() => e.value, () => {
+    m("searchMap");
+  }, { deep: !0 }), _(() => a.value, () => {
+    m("columns");
   }, { deep: !0 });
-  function x(C) {
-    o({ current: 1 }), Object.assign(s, C);
+  function C(x) {
+    o({ current: 1 }), Object.assign(s, x);
   }
-  return { formDataRef: d, formParamsRef: s, defaultParamsRef: i, setFormParams: x };
+  return { formDataRef: f, formParamsRef: s, defaultParamsRef: i, setFormParams: C };
 }
-function la({ columns: e, columnsState: t, changeColumns: a }) {
-  const o = N(void 0), s = be({}), i = be({}), d = be({}), v = N([]);
-  V(() => e.value, () => {
+function la({ columns: e, columnsState: l, changeColumns: a }) {
+  const o = E(void 0), s = pe({}), i = pe({}), f = pe({}), m = E([]);
+  _(() => e.value, () => {
     var S;
-    (S = y(e)) == null || S.forEach(({ show: u, key: n, fixed: r }, m) => {
-      const $ = Ft(n, m);
-      $ && (d[$] = { show: u === void 0 ? !0 : u, fixed: r });
+    (S = b(e)) == null || S.forEach(({ show: u, key: n, fixed: r }, g) => {
+      const T = Bt(n, g);
+      T && (f[T] = { show: u === void 0 ? !0 : u, fixed: r });
     });
-    const f = y(e).map((u) => u.key);
-    C(f);
-  }, { deep: !0, immediate: !0 }), ze(() => {
+    const d = b(e).map((u) => u.key);
+    x(d);
+  }, { deep: !0, immediate: !0 }), Ae(() => {
     var S;
-    const f = {
-      ...(S = y(t)) == null ? void 0 : S.value,
-      ...y(d)
+    const d = {
+      ...(S = b(l)) == null ? void 0 : S.value,
+      ...b(f)
     };
-    Object.assign(s, f), Object.assign(i, f);
+    Object.assign(s, d), Object.assign(i, d);
   });
-  function x(f, S) {
-    o.value = S, Object.assign(s, f), a == null || a(s, S === "fixed");
+  function C(d, S) {
+    o.value = S, Object.assign(s, d), a == null || a(s, S === "fixed");
   }
-  function C(f) {
-    v.value = f;
+  function x(d) {
+    m.value = d;
   }
   return {
     columnsMap: s,
     operationType: o,
-    setColumnsMap: x,
-    sortKeyColumns: v,
+    setColumnsMap: C,
+    sortKeyColumns: m,
     cacheColumnsMap: i,
-    setSortKeyColumns: C
+    setSortKeyColumns: x
   };
 }
 function aa(e) {
-  const t = w(() => e.draggabled), a = w(() => e.neverScroll), o = w(() => e.autoScroll);
+  const l = w(() => e.draggabled), a = w(() => e.neverScroll), o = w(() => e.autoScroll);
   return {
-    draggabled: t,
+    draggabled: l,
     neverScroll: a,
     autoScroll: o
   };
 }
-function na({ scroll: e, columns: t, breakpoint: a, draggabled: o, autoScroll: s, neverScroll: i }) {
-  const d = N([]), v = N([]);
-  V([
+function na({ scroll: e, columns: l, breakpoint: a, draggabled: o, autoScroll: s, neverScroll: i }) {
+  const f = E([]), m = E([]);
+  _([
     () => e.value,
-    () => t.value,
+    () => l.value,
     () => a.value,
     () => o.value,
     () => a.value,
     () => s.value,
     () => i.value
   ], () => {
-    const r = f(Se(t.value));
-    Ye(r, Se(d.value)) || (d.value = le(r)), Ye(r, Se(v.value)) || (v.value = le(r));
+    const r = d($e(l.value));
+    He(r, $e(f.value)) || (f.value = ae(r)), He(r, $e(m.value)) || (m.value = ae(r));
   }, {
     deep: !0,
     immediate: !0
   });
-  const x = w(() => {
-    const r = C(y(d).filter((O) => O.fixed === "left")), m = C(y(d).filter((O) => O.fixed !== "left" && O.fixed !== "right")), $ = C(y(d).filter((O) => O.fixed === "right"));
+  const C = w(() => {
+    const r = x(b(f).filter((P) => P.fixed === "left")), g = x(b(f).filter((P) => P.fixed !== "left" && P.fixed !== "right")), T = x(b(f).filter((P) => P.fixed === "right"));
     return [
       ...r,
-      ...m,
-      ...$
+      ...g,
+      ...T
     ];
   });
-  function C(r) {
-    return r.sort((m, $) => nl(m, $, "order", 0));
+  function x(r) {
+    return r.sort((g, T) => nl(g, T, "order", 0));
   }
-  function f(r) {
-    return le(r).map((m, $) => {
-      var O;
-      if (m.dataIndex === "action" || $ === r.length - 1 ? m.resizable = !1 : m.resizable = ne(m.resizable) ? m.resizable : !!(Ge(m.width) && y(o)), !m.width || y(i))
-        return m;
-      if (m.dataIndex === "action" && y(s))
-        if ((O = y(e)) != null && O.x || !y(a))
-          m.width = m.width || 100, m.fixed = "right";
+  function d(r) {
+    return ae(r).map((g, T) => {
+      var P;
+      if (g.dataIndex === "action" || T === r.length - 1 ? g.resizable = !1 : g.resizable = ne(g.resizable) ? g.resizable : !!(Qe(g.width) && b(o)), !g.width || b(i))
+        return g;
+      if (g.dataIndex === "action" && b(s))
+        if ((P = b(e)) != null && P.x || !b(a))
+          g.width = g.width || 100, g.fixed = "right";
         else {
-          const R = y(t).find((D) => D.dataIndex === m.dataIndex);
-          m.width = (R == null ? void 0 : R.width) || "", m.fixed = R == null ? void 0 : R.fixed;
+          const R = b(l).find((M) => M.dataIndex === g.dataIndex);
+          g.width = (R == null ? void 0 : R.width) || "", g.fixed = R == null ? void 0 : R.fixed;
         }
-      return m;
+      return g;
     });
   }
-  function S(r, m) {
-    d.value = d.value.map(($) => ($.uuid === m.uuid && ($.width = r), $));
+  function S(r, g) {
+    f.value = f.value.map((T) => (T.uuid === g.uuid && (T.width = r), T));
   }
   function u(r) {
     if (r.length <= 0) {
-      d.value = [];
+      f.value = [];
       return;
     }
-    Ye(f(r), Se(d.value)) || (d.value = f(r));
+    He(d(r), $e(f.value)) || (f.value = d(r));
   }
   function n(r) {
-    u(le(Se(t.value)).map((m) => {
-      var O, R, D;
-      const $ = m.key ? {
-        show: (O = r[m.key]) == null ? void 0 : O.show,
-        fixed: (R = r[m.key]) == null ? void 0 : R.fixed,
-        order: (D = r[m.key]) == null ? void 0 : D.order
+    u(ae($e(l.value)).map((g) => {
+      var P, R, M;
+      const T = g.key ? {
+        show: (P = r[g.key]) == null ? void 0 : P.show,
+        fixed: (R = r[g.key]) == null ? void 0 : R.fixed,
+        order: (M = r[g.key]) == null ? void 0 : M.order
       } : {};
-      return { ...m, ...$ };
+      return { ...g, ...T };
     }));
   }
   return {
     breakpoint: a,
-    proColumns: x,
-    cacheProColumns: v,
+    proColumns: C,
+    cacheProColumns: m,
     setColumns: u,
     changeColumns: n,
     resizeColumnWidth: S
   };
 }
 function ua(e) {
-  const t = w(() => e.scroll), a = w(() => e.autoScroll), o = w(() => e.modalScroll), s = w(() => e.neverScroll), i = w(() => e.rowSelection), d = w(() => e.scrollBreakpoint);
+  const l = w(() => e.scroll), a = w(() => e.autoScroll), o = w(() => e.modalScroll), s = w(() => e.neverScroll), i = w(() => e.rowSelection), f = w(() => e.scrollBreakpoint);
   return {
-    scroll: t,
+    scroll: l,
     neverScroll: s,
     rowSelection: i,
     autoScroll: a,
     modalScroll: o,
-    scrollBreakpoint: d
+    scrollBreakpoint: f
   };
 }
-function ia({ scroll: e, columns: t, autoScroll: a, modalScroll: o, neverScroll: s, rowSelection: i, screens: d, innerWidth: v, scrollBreakpoint: x }) {
-  const C = w(() => {
+function ia({ scroll: e, columns: l, autoScroll: a, modalScroll: o, neverScroll: s, rowSelection: i, screens: f, innerWidth: m, scrollBreakpoint: C }) {
+  const x = w(() => {
     var u, n, r;
-    return y(x) ? Ge(y(x)) ? v.value > y(x) : Rt(y(x)) ? (u = d.value) == null ? void 0 : u[y(x)] : (n = d.value) == null ? void 0 : n.xl : (r = d.value) == null ? void 0 : r.xl;
-  }), f = w(() => {
+    return b(C) ? Qe(b(C)) ? m.value > b(C) : Ft(b(C)) ? (u = f.value) == null ? void 0 : u[b(C)] : (n = f.value) == null ? void 0 : n.xl : (r = f.value) == null ? void 0 : r.xl;
+  }), d = w(() => {
     let u = 0;
-    const n = y(i) ? 60 : 0, r = 150, m = le(y(t));
-    m.forEach((R) => {
+    const n = b(i) ? 60 : 0, r = 150, g = ae(b(l));
+    g.forEach((R) => {
       u += Number.parseInt(String(R.width)) || 0;
     });
-    const O = m.filter((R) => !Reflect.has(R, "width")).length;
-    return O !== 0 && (u += O * r), n && (u += n), u;
+    const P = g.filter((R) => !Reflect.has(R, "width")).length;
+    return P !== 0 && (u += P * r), n && (u += n), u;
   });
   return { proScroll: w(() => {
     var u, n;
-    return y(s) ? {} : y(e) && Object.keys(y(e)).length ? y(e) : y(o) ? {
-      y: ((u = y(e)) == null ? void 0 : u.y) || ((n = d.value) != null && n.xl ? 400 : 235)
-    } : y(a) ? C.value ? {} : ne(C.value) ? { x: y(f) } : {} : {};
-  }), breakpoint: C };
+    return b(s) ? {} : b(e) && Object.keys(b(e)).length ? b(e) : b(o) ? {
+      y: ((u = b(e)) == null ? void 0 : u.y) || ((n = f.value) != null && n.xl ? 400 : 235)
+    } : b(a) ? x.value ? {} : ne(x.value) ? { x: b(d) } : {} : {};
+  }), breakpoint: x };
 }
-const { provideContext: sa, useInjectContext: ce } = Kl("pro-table");
-function oa(e, t) {
-  const a = be({});
+const { provideContext: sa, useInjectContext: he } = zl("pro-table");
+function oa(e, l) {
+  const a = pe({});
   function o() {
-    Object.keys(e).forEach((d) => {
-      s(d, e[d]);
+    Object.keys(e).forEach((f) => {
+      s(f, e[f]);
     });
-    const i = t.find((d) => d.valueType === "dateRange");
+    const i = l.find((f) => f.valueType === "dateRange");
     i && s(i.name || "", e[i.rangeStartName || "start"] ? [
       e[i.rangeStartName || "start"],
       e[i.rangeEndName || "end"]
     ] : []);
   }
-  ze(() => {
+  Ae(() => {
     o();
   });
-  function s(i, d) {
-    a[i] = d;
+  function s(i, f) {
+    a[i] = f;
   }
   return {
     formState: a,
@@ -906,7 +916,19 @@ function oa(e, t) {
   };
 }
 const ra = (e) => ({
-  [`${e.componentCls}-form`]: {
+  [`${e.componentCls}-search`]: {
+    position: "relative",
+    display: "flex",
+    flexWrap: "wrap",
+    alignItems: "center",
+    "&-border": {
+      paddingInline: e.paddingLG,
+      paddingBlock: e.paddingLG,
+      paddingBlockEnd: e.paddingLG - 16,
+      border: `${e.lineWidth}px ${e.lineType} ${e.colorSplit}`,
+      borderRadius: e.borderRadius,
+      marginBottom: 20
+    },
     "&-collapse-button": {
       display: "flex",
       alignItems: "center",
@@ -922,13 +944,34 @@ const ra = (e) => ({
         marginLeft: 2
       }
     },
-    [`${e.componentCls}-form-container`]: {
-      position: "relative",
+    [`${e.componentCls}-search-item`]: {
       display: "flex",
-      flexWrap: "wrap",
       alignItems: "center",
-      [`${e.antCls}-form-item`]: {
-        marginBottom: 16
+      marginBottom: 20,
+      "&-label": {
+        flexShrink: 0,
+        "&::after": {
+          content: '":"',
+          position: "relative",
+          marginBlock: 0,
+          marginInlineStart: e.marginXXS / 2,
+          marginInlineEnd: e.marginXS
+        },
+        [`&${e.componentCls}-search-item-label-no-colon::after`]: {
+          content: '" "'
+        },
+        [`&${e.componentCls}-search-item-label-left`]: {
+          textAlign: "left"
+        },
+        [`&${e.componentCls}-search-item-label-center`]: {
+          textAlign: "center"
+        },
+        [`&${e.componentCls}-search-item-label-right`]: {
+          textAlign: "right"
+        }
+      },
+      "&-children": {
+        width: "100%"
       }
     }
   },
@@ -939,28 +982,31 @@ const ra = (e) => ({
     alignItems: "center"
   }
 });
-function De(e, t) {
-  return typeof t == "function" ? t(ae(e)) : ae(e).format(t);
+function xe(e, l) {
+  return typeof l == "function" ? l(q(e)) : q(e).format(l);
 }
-function je(e, t) {
-  return t ? "YYYY-MM-DD HH:mm:ss" : e ?? "YYYY-MM-DD";
+function Ne(e, l) {
+  return l ? "YYYY-MM-DD HH:mm:ss" : e ?? "YYYY-MM-DD";
 }
-const Tt = (e, t, a = "string") => {
-  if (te(e)) {
+const pt = (e, l, a = "string") => {
+  if (le(e)) {
     const [o, s] = e;
-    let i, d;
-    if (Array.isArray(t) ? (i = t[0], d = t[1]) : typeof t == "object" && t.type === "mask" ? (i = t.format, d = t.format) : (i = t, d = t), a === "string") {
-      const v = o ? De(o, i) : "", x = s ? De(s, d) : "";
-      return [v, x];
+    let i, f;
+    if (Array.isArray(l) ? (i = l[0], f = l[1]) : typeof l == "object" && l.type === "mask" ? (i = l.format, f = l.format) : (i = l, f = l), a === "string") {
+      const m = o ? xe(o, i) : "", C = s ? xe(s, f) : "";
+      return [m, C];
     }
-    return [ae(o), ae(s)];
+    return [q(o), q(s)];
   }
 }, {
   useBreakpoint: ca
 } = st, {
   MonthPicker: da,
-  RangePicker: fa
-} = jt, Qe = [{
+  RangePicker: fa,
+  YearPicker: ha,
+  WeekPicker: ma,
+  QuarterPicker: va
+} = kt, Je = [{
   value: "xxl",
   span: 4
 }, {
@@ -978,326 +1024,378 @@ const Tt = (e, t, a = "string") => {
 }, {
   value: "xs",
   span: 1
-}], Nt = /* @__PURE__ */ re({
+}], Et = /* @__PURE__ */ fe({
   name: "ProTableForm",
   props: {
-    modal: we.modalScroll,
+    modal: re.modalScroll,
     searchMap: {
       type: Array,
       default: () => []
     },
-    loading: Boolean,
+    loading: re.loading,
+    cardBordered: re.cardBordered,
     prefixCls: String,
     defaultParams: Object,
     onSearch: Function
   },
   setup(e, {
-    slots: t,
+    slots: l,
     expose: a
   }) {
     const {
       wrapSSR: o,
       hashId: s
-    } = Ue("ProTableForm", [ra], e.prefixCls), i = Pt(), d = ca(), {
-      manualSearch: v,
-      searchConfig: x,
-      searchActions: C
-    } = ce(), {
-      formState: f,
+    } = qe("ProTableForm", [ra], e.prefixCls), i = jt(), f = ca(), {
+      manualSearch: m,
+      searchConfig: C,
+      searchActions: x
+    } = he(), {
+      formState: d,
       resetFormState: S,
       changeFormState: u
-    } = oa(e.defaultParams || {}, e.searchMap || []), n = N(!1), r = w(() => {
-      var l, b;
-      return ne((l = C.value) == null ? void 0 : l.reset) ? (b = C.value) == null ? void 0 : b.reset : v.value;
-    }), m = w(() => {
-      var l;
-      return $((l = x.value) == null ? void 0 : l.span);
+    } = oa(e.defaultParams || {}, e.searchMap || []), n = E(!1), r = w(() => {
+      var t, y;
+      return ne((t = x.value) == null ? void 0 : t.reset) ? (y = x.value) == null ? void 0 : y.reset : m.value;
+    }), g = w(() => {
+      var t;
+      return P((t = C.value) == null ? void 0 : t.span);
+    }), T = w(() => {
+      var t;
+      return (t = C.value) == null ? void 0 : t.label;
     });
-    V(() => {
-      var l;
-      return (l = x.value) == null ? void 0 : l.defaultCollapsed;
-    }, (l) => {
-      n.value = n.value || !!l;
+    _(() => {
+      var t;
+      return (t = C.value) == null ? void 0 : t.defaultCollapsed;
+    }, (t) => {
+      n.value = n.value || !!t;
     });
-    function $(l) {
-      let b = 4;
-      for (let B = 0; B < Qe.length; B += 1) {
-        const I = Qe[B].value;
-        if (d.value[I]) {
-          b = (l == null ? void 0 : l[I]) || (e.modal ? 3 : Qe[B].span);
+    function P(t) {
+      let y = 4;
+      for (let O = 0; O < Je.length; O += 1) {
+        const p = Je[O].value;
+        if (f.value[p]) {
+          y = (t == null ? void 0 : t[p]) || (e.modal ? 3 : Je[O].span);
           break;
         }
       }
-      return b;
+      return y;
     }
-    const O = (l) => {
-      n.value = l;
-    }, R = (l, b, B) => (l + 1) % b === 0 ? {
-      ...B,
+    const R = (t) => {
+      n.value = t;
+    }, M = (t, y, O) => (t + 1) % y === 0 ? {
+      ...O,
       marginRight: 0
     } : {
-      ...B,
+      ...O,
       marginRight: "2%"
-    }, D = () => {
-      const l = le(f), b = e.searchMap.find((P) => P.valueType === "text") || "", B = e.searchMap.find((P) => P.valueType === "dateRange") || "", I = e.searchMap.find((P) => P.valueType === "treeSelect");
-      return b && (l[b.name] = f[b.name] || b.initialValue || ""), B && (l[B.rangeStartName || "start"] = l[B.name] ? l[B.name][0] : "", l[B.rangeEndName || "end"] = l[B.name] ? l[B.name][1] : "", delete l[B.name]), I && (I != null && I.name && te(f[I == null ? void 0 : I.name]) && (l[I.name] = f[I.name].length ? f[I.name].map((P) => P[I.valueKey === "text" ? "label" : "value"]).join() : ""), I != null && I.name && te(l[I == null ? void 0 : I.name]) && (l[I.name] = l[I.name].length ? l[I.name].map((P) => P[I.valueKey === "text" ? "label" : "value"]) : "")), l;
-    }, K = (l = !1, b) => {
+    }, W = () => {
+      const t = ae(d), y = e.searchMap.find((D) => D.valueType === "text") || "", O = e.searchMap.find((D) => D.valueType === "dateRange") || "", p = e.searchMap.find((D) => D.valueType === "treeSelect");
+      return y && (t[y.name] = d[y.name] || y.initialValue || ""), O && (t[O.rangeStartName || "start"] = t[O.name] ? t[O.name][0] : "", t[O.rangeEndName || "end"] = t[O.name] ? t[O.name][1] : "", delete t[O.name]), p && (p != null && p.name && le(d[p == null ? void 0 : p.name]) && (t[p.name] = d[p.name].length ? d[p.name].map((D) => D[p.valueKey === "text" ? "label" : "value"]).join() : ""), p != null && p.name && le(t[p == null ? void 0 : p.name]) && (t[p.name] = t[p.name].length ? t[p.name].map((D) => D[p.valueKey === "text" ? "label" : "value"]) : "")), t;
+    }, Y = (t = !1, y) => {
       fl(() => {
-        var B;
-        (v.value || l) && ((B = e.onSearch) == null || B.call(e, D(), l ? b ? "reset" : "submit" : void 0));
+        var O;
+        (m.value || t) && ((O = e.onSearch) == null || O.call(e, W(), t ? y ? "reset" : "submit" : void 0));
       });
-    }, A = (l, b) => {
-      var B, I;
-      switch (b.valueType) {
+    }, L = (t, y) => {
+      var O, p;
+      switch (y.valueType) {
         case "text":
-          u(b.name || "", l || "");
+          u(y.name || "", t || "");
           break;
         case "select":
-          u(b.name || "", l ?? void 0);
+          u(y.name || "", t ?? void 0);
           break;
         case "treeSelect":
-          u(b.name || "", l ?? ((B = b.field) != null && B.treeCheckable || (I = b.field) != null && I.multiple ? [] : null));
+          u(y.name || "", t ?? ((O = y.field) != null && O.treeCheckable || (p = y.field) != null && p.multiple ? [] : null));
           break;
         case "date":
-          u(b.name || "", l ? De(l, je(b.valueFormat, b.showTime)) : null);
+          u(y.name || "", t ? xe(t, Ne(y.valueFormat, y.showTime)) : null);
+          break;
+        case "dateWeek":
+          u(y.name || "", t ? xe(t, "YYYY-wo") : null);
           break;
         case "dateMonth":
-          u(b.name || "", l ? De(l, "YYYY-MM") : null);
+          u(y.name || "", t ? xe(t, "YYYY-MM") : null);
+          break;
+        case "dateQuarter":
+          u(y.name || "", t ? xe(t, "YYYY-QQ") : null);
+          break;
+        case "dateYear":
+          u(y.name || "", t ? xe(t, "YYYY") : null);
           break;
         case "dateRange":
-          u(b.name || "", l && te(l) && l.length === 2 ? Tt(l, je(b.valueFormat, b.showTime)) : null);
+          u(y.name || "", t && le(t) && t.length === 2 ? pt(t, Ne(y.valueFormat, y.showTime)) : null);
           break;
         case "time":
-          u(b.name || "", l ? De(l, b.valueFormat || "HH:mm:ss") : null);
+          u(y.name || "", t ? xe(t, y.valueFormat || "HH:mm:ss") : null);
           break;
       }
-      b.valueType === "treeSelect" || b.valueType, K();
-    }, Q = (l = !0) => {
-      S(), K(!0, l);
+      y.valueType === "treeSelect" || y.valueType, Y();
+    }, A = (t = !0) => {
+      S(), Y(!0, t);
     };
     a({
-      getFormState: () => D(),
-      resetForm: Q
+      getFormState: () => W(),
+      resetForm: A
     });
-    const M = () => {
-      var b;
-      const l = (b = i == null ? void 0 : i.emptyText) == null ? void 0 : b.value;
-      if (l) {
-        const B = Ce(l), I = B ? Bt(l) : It(l || []);
+    const G = () => {
+      var y;
+      const t = (y = i == null ? void 0 : i.emptyText) == null ? void 0 : y.value;
+      if (t) {
+        const O = ce(t), p = O ? It(t) : Rt(t || []);
         return c("div", {
-          class: Ee(`${e.prefixCls}-search-empty-text`, s.value)
-        }, [B ? I : te(I) ? I.map((P) => it(P)) : void 0]);
+          class: we(`${e.prefixCls}-search-empty-text`, s.value)
+        }, [O ? p : le(p) ? p.map((D) => it(D)) : void 0]);
       }
-    }, _ = () => (v.value || r.value) && c(ye, null, {
-      default: () => [r.value && c(St, {
-        onClick: () => Q()
+    }, H = () => (m.value || r.value) && c(Se, null, {
+      default: () => [r.value && c(xt, {
+        onClick: () => A()
       }, {
         default: () => {
-          var l;
-          return [((l = C.value) == null ? void 0 : l.resetText) || "重置"];
+          var t;
+          return [((t = x.value) == null ? void 0 : t.resetText) || "重置"];
         }
-      }), v.value && c(St, {
+      }), m.value && c(xt, {
         loading: e.loading,
         type: "primary",
-        onClick: () => K(!0)
+        onClick: () => Y(!0)
       }, {
         default: () => {
-          var l;
-          return [((l = C.value) == null ? void 0 : l.searchText) || "查询"];
+          var t;
+          return [((t = x.value) == null ? void 0 : t.searchText) || "查询"];
         }
       })]
-    }), L = ({
-      formItemStyle: l,
-      advanced: b,
-      showAdvanced: B = !0
+    }), ue = ({
+      formItemStyle: t,
+      advanced: y,
+      showAdvanced: O = !0
     }) => c("div", {
-      style: l,
-      class: `${e.prefixCls}-form-collapse-button ${s.value}`
-    }, [c(ye, {
+      style: t,
+      class: `${e.prefixCls}-search-collapse-button ${s.value}`
+    }, [c(Se, {
       size: 16
     }, {
       default: () => {
-        var I, P;
-        return [_(), B && c("span", {
+        var p, D;
+        return [H(), O && c("span", {
           class: `${e.prefixCls}-a ${s.value}`,
-          onClick: () => O(!b)
-        }, [b ? "收起" : "展开", (I = x.value) != null && I.collapseRender ? (P = x.value) == null ? void 0 : P.collapseRender(b) : b ? c(gl, null, null) : c(yl, null, null)])];
+          onClick: () => R(!y)
+        }, [y ? "收起" : "展开", (p = C.value) != null && p.collapseRender ? (D = C.value) == null ? void 0 : D.collapseRender(y) : y ? c(gl, null, null) : c(yl, null, null)])];
       }
-    })]), de = (l) => {
-      var I, P, Z, k;
-      let b;
-      const B = v.value ? wt : wt.Search;
-      switch (l.valueType) {
+    })]), ee = (t) => {
+      var p, D, I, j;
+      let y;
+      const O = m.value ? St : St.Search;
+      switch (t.valueType) {
         case "text":
-          b = c(B, G({
+          y = c(O, Q({
             style: {
               width: "100%"
             },
-            value: f[l.name],
-            placeholder: l.placeholder || "请输入",
-            allowClear: l.allowClear || l.allowClear === !1 ? l.allowClear : !0,
-            onChange: (g) => A(g.target.value, l),
-            onSearch: (g) => K()
-          }, l.field || {}), null);
+            value: d[t.name],
+            placeholder: t.placeholder || "请输入",
+            allowClear: t.allowClear || t.allowClear === !1 ? t.allowClear : !0,
+            onChange: (v) => L(v.target.value, t),
+            onSearch: (v) => Y()
+          }, t.field || {}), null);
           break;
         case "select":
-          b = c(Ol, G({
+          y = c(Ol, Q({
             style: {
               width: "100%"
             },
-            value: l.loading ? void 0 : f[l.name],
+            value: t.loading ? void 0 : d[t.name],
             optionFilterProp: "label",
-            placeholder: l.placeholder || "请选择",
-            showSearch: l.showSearch,
-            allowClear: l.allowClear || l.allowClear === !1 ? l.allowClear : !0,
-            getPopupContainer: (g) => g && g.parentNode ? g.parentNode : g,
-            notFoundContent: l.loading === void 0 ? void 0 : l.loading ? c(nt, {
+            placeholder: t.placeholder || "请选择",
+            showSearch: t.showSearch,
+            allowClear: t.allowClear || t.allowClear === !1 ? t.allowClear : !0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            notFoundContent: t.loading === void 0 ? void 0 : t.loading ? c(nt, {
               size: "small",
-              indicator: (I = i == null ? void 0 : i.indicator) == null ? void 0 : I.value
-            }, null) : M(),
-            onChange: (g) => A(g, l),
-            options: l.loading ? [] : (P = l == null ? void 0 : l.valueEnum) == null ? void 0 : P.map((g) => ({
-              label: g.text,
-              value: g.value
+              indicator: (p = i == null ? void 0 : i.indicator) == null ? void 0 : p.value
+            }, null) : G(),
+            onChange: (v) => L(v, t),
+            options: t.loading ? [] : (D = t == null ? void 0 : t.valueEnum) == null ? void 0 : D.map((v) => ({
+              label: v.text,
+              value: v.value
             }))
-          }, l.field || {}), null);
+          }, t.field || {}), null);
           break;
         case "treeSelect":
-          b = c(Bl, G({
+          y = c(Il, Q({
             style: {
               width: "100%"
             },
-            value: f[l.name],
-            placeholder: l.placeholder || "请选择",
-            allowClear: l.allowClear || l.allowClear === !1 ? l.allowClear : !0,
-            treeData: l.loading ? [] : l.valueEnum,
-            getPopupContainer: (g) => g && g.parentNode ? g.parentNode : g,
-            notFoundContent: l.loading === void 0 ? void 0 : l.loading ? c(nt, {
+            value: d[t.name],
+            placeholder: t.placeholder || "请选择",
+            allowClear: t.allowClear || t.allowClear === !1 ? t.allowClear : !0,
+            treeData: t.loading ? [] : t.valueEnum,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            notFoundContent: t.loading === void 0 ? void 0 : t.loading ? c(nt, {
               size: "small",
-              indicator: (Z = i == null ? void 0 : i.indicator) == null ? void 0 : Z.value
-            }, null) : M(),
-            onChange: (g) => A(g, l)
-          }, l.field || {}), null);
+              indicator: (I = i == null ? void 0 : i.indicator) == null ? void 0 : I.value
+            }, null) : G(),
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
           break;
         case "date":
-          b = c(jt, G({
+          y = c(kt, Q({
             style: {
               width: "100%"
             },
-            value: f[l.name] ? ae(f[l.name]) : void 0,
-            getPopupContainer: (g) => g && g.parentNode ? g.parentNode : g,
-            placeholder: l.placeholder || "请选择",
-            allowClear: l.allowClear || l.allowClear === !1 ? l.allowClear : !0,
-            format: je(l.valueFormat, l.showTime),
-            showTime: l.showTime,
-            showToday: l.showToday || !0,
-            onChange: (g) => A(g, l)
-          }, l.field || {}), null);
+            value: d[t.name] ? q(d[t.name]) : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || "请选择",
+            allowClear: t.allowClear || t.allowClear === !1 ? t.allowClear : !0,
+            format: Ne(t.valueFormat, t.showTime),
+            showTime: t.showTime,
+            showToday: t.showToday || !0,
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
+          break;
+        case "dateWeek":
+          y = c(ma, Q({
+            style: {
+              width: "100%"
+            },
+            value: d[t.name] ? q(d[t.name], t.valueFormat || "YYYY-wo") : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || "请选择",
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
           break;
         case "dateMonth":
-          b = c(da, G({
+          y = c(da, Q({
+            style: {
+              width: "100%"
+            },
+            value: d[t.name] ? q(d[t.name], t.valueFormat || "YYYY-MM") : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || "请选择",
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
+          break;
+        case "dateQuarter":
+          y = c(va, Q({
             style: {
               width: "100%"
             },
-            value: f[l.name] ? ae(f[l.name], l.valueFormat || "YYYY-MM") : void 0,
-            getPopupContainer: (g) => g && g.parentNode ? g.parentNode : g,
-            placeholder: l.placeholder || "请选择",
-            onChange: (g) => A(g, l)
-          }, l.field || {}), null);
+            value: d[t.name] ? q(d[t.name], t.valueFormat || "YYYY-QQ") : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || "请选择",
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
+          break;
+        case "dateYear":
+          y = c(ha, Q({
+            style: {
+              width: "100%"
+            },
+            value: d[t.name] ? q(d[t.name], t.valueFormat || "YYYY") : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || "请选择",
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
           break;
         case "dateRange":
-          b = c(fa, G({
+          y = c(fa, Q({
             style: {
               width: "100%"
             },
-            value: f[l.name] && te(f[l.name]) && ((k = f[l.name]) == null ? void 0 : k.length) === 2 ? Tt(f[l.name], je(l.valueFormat, l.showTime), "dayjs") : void 0,
-            getPopupContainer: (g) => g && g.parentNode ? g.parentNode : g,
-            placeholder: l.placeholder || ["开始日期", "结束日期"],
-            format: je(l.valueFormat, l.showTime),
-            showTime: l.showTime,
-            onChange: (g) => A(g, l)
-          }, l.field || {}), null);
+            value: d[t.name] && le(d[t.name]) && ((j = d[t.name]) == null ? void 0 : j.length) === 2 ? pt(d[t.name], Ne(t.valueFormat, t.showTime), "dayjs") : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || ["开始日期", "结束日期"],
+            format: Ne(t.valueFormat, t.showTime),
+            showTime: t.showTime,
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
           break;
         case "time":
-          b = c(Il, G({
+          y = c(Rl, Q({
             style: {
               width: "100%"
             },
-            value: f[l.name] ? ae(f[l.name], l.valueFormat || "HH:mm:ss") : void 0,
-            getPopupContainer: (g) => g && g.parentNode ? g.parentNode : g,
-            placeholder: l.placeholder || "请选择",
-            allowClear: l.allowClear || l.allowClear === !1 ? l.allowClear : !0,
-            use12Hours: l.use12Hours,
-            format: l.valueFormat || "HH:mm:ss",
-            onChange: (g) => A(g, l)
-          }, l.field || {}), null);
+            value: d[t.name] ? q(d[t.name], t.valueFormat || "HH:mm:ss") : void 0,
+            getPopupContainer: (v) => v && v.parentNode ? v.parentNode : v,
+            placeholder: t.placeholder || "请选择",
+            allowClear: t.allowClear || t.allowClear === !1 ? t.allowClear : !0,
+            use12Hours: t.use12Hours,
+            format: t.valueFormat || "HH:mm:ss",
+            onChange: (v) => L(v, t)
+          }, t.field || {}), null);
           break;
       }
-      return b;
-    }, U = ({
-      formItemStyle: l,
-      item: b
-    }) => c("div", {
-      class: `${e.prefixCls}-form-item`,
-      style: l
-    }, [c(xt.Item, null, {
-      default: () => [b.__v_isVNode ? b : de(b)]
-    })]), Te = () => {
-      var B;
-      const l = [...e.searchMap, ...((B = t.default) == null ? void 0 : B.call(t)) || []], b = {
-        width: `${(100 - (m.value - 1) * 2) / m.value}%`
+      return y;
+    }, me = ({
+      formItemStyle: t = {},
+      item: y
+    }) => {
+      var p, D, I, j, v, K;
+      const O = y.labelAlign || ((p = T.value) == null ? void 0 : p.align);
+      return c("div", {
+        class: `${e.prefixCls}-search-item`,
+        style: {
+          ...t,
+          gap: (D = T.value) != null && D.gap ? wt((I = T.value) == null ? void 0 : I.gap) : void 0
+        }
+      }, [y.label && c("div", {
+        class: we(`${e.prefixCls}-search-item-label`, ((j = T.value) == null ? void 0 : j.colon) === !1 && `${e.prefixCls}-search-item-label-no-colon`, O && `${e.prefixCls}-search-item-label-${O}`),
+        style: {
+          width: (v = T.value) != null && v.width ? wt((K = T.value) == null ? void 0 : K.width) : void 0
+        }
+      }, [y.label]), c("div", {
+        class: we(`${e.prefixCls}-search-item-children`)
+      }, [ce(y) ? y : ee(y)])]);
+    }, U = () => {
+      var O;
+      const t = [...e.searchMap, ...((O = l.default) == null ? void 0 : O.call(l)) || []], y = {
+        width: `${(100 - (g.value - 1) * 2) / g.value}%`
       };
-      return l.map((I, P) => {
-        const Z = R(P, m.value, b);
-        return l.length < m.value || n.value ? c(qe, null, [U({
-          formItemStyle: Z,
-          item: I
-        }), P === l.length - 1 && L({
+      return t.map((p, D) => {
+        const I = M(D, g.value, y);
+        return t.length < g.value || n.value ? c(_e, null, [me({
+          formItemStyle: I,
+          item: p
+        }), D === t.length - 1 && ue({
           formItemStyle: {
             flex: 1,
             justifyContent: "flex-end"
           },
           advanced: n.value,
           showAdvanced: n.value
-        })]) : c(qe, null, [P < m.value - 1 && U({
-          formItemStyle: Z,
-          item: I
-        }), P === m.value - 1 && (m.value - 1 === 0 || l.length === m.value) && U({
-          formItemStyle: Z,
-          item: I
-        }), P === m.value - 1 && l.length >= m.value && L({
+        })]) : c(_e, null, [D < g.value - 1 && me({
+          formItemStyle: I,
+          item: p
+        }), D === g.value - 1 && (g.value - 1 === 0 || t.length === g.value) && me({
+          formItemStyle: I,
+          item: p
+        }), D === g.value - 1 && t.length >= g.value && ue({
           formItemStyle: {
             flex: 1,
             justifyContent: "flex-end"
           },
           advanced: !1,
-          showAdvanced: l.length !== m.value
+          showAdvanced: t.length !== g.value
         })]);
       });
     };
     return () => {
-      var l;
+      var y;
+      const t = e.cardBordered && `${e.prefixCls}-search-border`;
       return o(c("div", {
-        class: Ee(s.value, `${e.prefixCls}-search`, (l = x.value) == null ? void 0 : l.className)
-      }, [c(xt, {
-        class: `${e.prefixCls}-form ${s.value}`,
-        layout: "horizontal"
-      }, {
-        default: () => [c("div", {
-          class: `${e.prefixCls}-form-container ${s.value}`
-        }, [Te()])]
-      })]));
+        class: we(s.value, `${e.prefixCls}-search`, t, s.value, (y = C.value) == null ? void 0 : y.className)
+      }, [U()]));
     };
   }
 });
-Nt.inheritAttrs = !1;
+Et.inheritAttrs = !1;
 const Me = (e) => {
-  const t = N(null);
-  return t.value = e, (...a) => {
+  const l = E(null);
+  return l.value = e, (...a) => {
     var o;
-    return (o = t.value) == null ? void 0 : o.call(t, ...a);
+    return (o = l.value) == null ? void 0 : o.call(l, ...a);
   };
-}, ha = (e) => ({
+}, ga = (e) => ({
   [`${e.componentCls}`]: {
     width: "auto",
     "&-title": {
@@ -1381,7 +1479,7 @@ const Me = (e) => {
   }
 }), Ze = ({
   title: e,
-  show: t,
+  show: l,
   treeKey: a,
   fixed: o
 }, {
@@ -1389,32 +1487,32 @@ const Me = (e) => {
 }) => {
   const {
     cacheColumns: i,
-    settingsAction: d
-  } = ce();
-  return t ? c(oe, {
+    settingsAction: f
+  } = he();
+  return l ? c(de, {
     title: e
   }, {
     default: () => {
-      var v;
+      var m;
       return [c("span", {
-        onClick: (x) => {
-          var n, r, m;
-          x.stopPropagation(), x.preventDefault();
-          const C = ((r = (n = y(i)) == null ? void 0 : n.find(($) => $.uuid === a)) == null ? void 0 : r.key) || "", f = (d == null ? void 0 : d.columnsMap[C]) || {};
-          if (typeof f.disable == "boolean" ? f.disable : (m = f.disable) == null ? void 0 : m.icon) return;
+        onClick: (C) => {
+          var n, r, g;
+          C.stopPropagation(), C.preventDefault();
+          const x = ((r = (n = b(i)) == null ? void 0 : n.find((T) => T.uuid === a)) == null ? void 0 : r.key) || "", d = (f == null ? void 0 : f.columnsMap[x]) || {};
+          if (typeof d.disable == "boolean" ? d.disable : (g = d.disable) == null ? void 0 : g.icon) return;
           const u = {
-            ...d == null ? void 0 : d.columnsMap,
-            [C]: {
-              ...f,
+            ...f == null ? void 0 : f.columnsMap,
+            [x]: {
+              ...d,
               fixed: o
             }
           };
-          d == null || d.setColumnsMap(u, "fixed");
+          f == null || f.setColumnsMap(u, "fixed");
         }
-      }, [(v = s.default) == null ? void 0 : v.call(s)])];
+      }, [(m = s.default) == null ? void 0 : m.call(s)])];
     }
   }) : null;
-}, va = /* @__PURE__ */ re({
+}, ya = /* @__PURE__ */ fe({
   props: {
     treeKey: String,
     hashId: String,
@@ -1425,10 +1523,10 @@ const Me = (e) => {
   },
   setup(e) {
     const {
-      cacheColumns: t
-    } = ce(), a = w(() => {
+      cacheColumns: l
+    } = he(), a = w(() => {
       var s, i;
-      return ((i = (s = y(t)) == null ? void 0 : s.find((d) => d.uuid === e.treeKey)) == null ? void 0 : i.key) || "";
+      return ((i = (s = b(l)) == null ? void 0 : s.find((f) => f.uuid === e.treeKey)) == null ? void 0 : i.key) || "";
     }), o = w(() => a.value === "action" && e.autoScroll);
     return () => {
       const s = c("span", {
@@ -1463,7 +1561,7 @@ const Me = (e) => {
       }, [e.title]), s]);
     };
   }
-}), et = /* @__PURE__ */ re({
+}), et = /* @__PURE__ */ fe({
   props: {
     list: Array,
     keys: Array,
@@ -1478,75 +1576,75 @@ const Me = (e) => {
     }
   },
   setup(e) {
-    const t = N(at().uuid(15)), a = w(() => e.list && e.list.length > 0), o = N([]), s = N([]), {
+    const l = E(at().uuid(15)), a = w(() => e.list && e.list.length > 0), o = E([]), s = E([]), {
       cacheColumns: i,
-      slots: d,
-      settingsAction: v
-    } = ce(), x = (u, n) => u.map(({
+      slots: f,
+      settingsAction: m
+    } = he(), C = (u, n) => u.map(({
       key: r,
-      children: m,
-      uuid: $,
-      ...O
+      children: g,
+      uuid: T,
+      ...P
     }) => {
-      var A;
-      const R = (v == null ? void 0 : v.columnsMap[r || "null"]) || {
+      var Y;
+      const R = (m == null ? void 0 : m.columnsMap[r || "null"]) || {
         show: !0
       };
-      let D = !1;
-      R.show !== !1 && (n == null ? void 0 : n.show) !== !1 && !m && (D = !0);
-      const K = {
-        key: $ || "",
-        ..._e(O, ["dataIndex"]),
-        checked: D,
+      let M = !1;
+      R.show !== !1 && (n == null ? void 0 : n.show) !== !1 && !g && (M = !0);
+      const W = {
+        key: T || "",
+        ...Ge(P, ["dataIndex"]),
+        checked: M,
         selectable: !1,
         disabled: R.disable === !0,
-        disableCheckbox: typeof R.disable == "boolean" ? R.disable : (A = R.disable) == null ? void 0 : A.checkbox,
+        disableCheckbox: typeof R.disable == "boolean" ? R.disable : (Y = R.disable) == null ? void 0 : Y.checkbox,
         isLeaf: !0
       };
-      return m && (K.children = x(m, R)), K;
+      return g && (W.children = C(g, R)), W;
     });
-    ze(() => {
-      const u = x(e.list || []);
-      o.value = u, s.value = u.filter((n) => n.checked).map((n) => n.key), (v == null ? void 0 : v.operationType.value) === "fixed" && (t.value = at().uuid(15));
+    Ae(() => {
+      const u = C(e.list || []);
+      o.value = u, s.value = u.filter((n) => n.checked).map((n) => n.key), (m == null ? void 0 : m.operationType.value) === "fixed" && (l.value = at().uuid(15));
     });
-    const C = Me((u, n, r) => {
-      var M, _;
-      const m = ((M = y(i).find((L) => L.uuid === u)) == null ? void 0 : M.key) || "", $ = ((_ = y(i).find((L) => L.uuid === n)) == null ? void 0 : _.key) || "", O = {
-        ...v == null ? void 0 : v.columnsMap
-      }, R = [...v.sortKeyColumns.value], D = R.findIndex((L) => L === m), K = R.findIndex((L) => L === $), A = r > D;
-      if (D < 0)
+    const x = Me((u, n, r) => {
+      var A, G;
+      const g = ((A = b(i).find((H) => H.uuid === u)) == null ? void 0 : A.key) || "", T = ((G = b(i).find((H) => H.uuid === n)) == null ? void 0 : G.key) || "", P = {
+        ...m == null ? void 0 : m.columnsMap
+      }, R = [...m.sortKeyColumns.value], M = R.findIndex((H) => H === g), W = R.findIndex((H) => H === T), Y = r > M;
+      if (M < 0)
         return;
-      const Q = R[D];
-      R.splice(D, 1), r === 0 ? R.unshift(Q) : R.splice(A ? K : K + 1, 0, Q), R.forEach((L, de) => {
-        O[L] = {
-          ...O[L] || {},
-          order: de
+      const L = R[M];
+      R.splice(M, 1), r === 0 ? R.unshift(L) : R.splice(Y ? W : W + 1, 0, L), R.forEach((H, ue) => {
+        P[H] = {
+          ...P[H] || {},
+          order: ue
         };
-      }), v == null || v.setColumnsMap(O, "drop"), v == null || v.setSortKeyColumns(R);
-    }), f = Me((u) => {
+      }), m == null || m.setColumnsMap(P, "drop"), m == null || m.setSortKeyColumns(R);
+    }), d = Me((u) => {
       var R;
-      const n = u.node.key, r = ((R = y(i).find((D) => D.uuid === n)) == null ? void 0 : R.key) || "", $ = {
-        ...(v == null ? void 0 : v.columnsMap[r]) || {}
+      const n = u.node.key, r = ((R = b(i).find((M) => M.uuid === n)) == null ? void 0 : R.key) || "", T = {
+        ...(m == null ? void 0 : m.columnsMap[r]) || {}
       };
-      $.show = u.checked;
-      const O = {
-        ...v == null ? void 0 : v.columnsMap,
-        [r]: $
+      T.show = u.checked;
+      const P = {
+        ...m == null ? void 0 : m.columnsMap,
+        [r]: T
       };
-      v == null || v.setColumnsMap(O, "show");
+      m == null || m.setColumnsMap(P, "show");
     }), S = (u) => {
-      const n = y(i).find((r) => r.uuid === u.key);
-      return u.title || hl(d, "headerCell", {
+      const n = b(i).find((r) => r.uuid === u.key);
+      return u.title || hl(f, "headerCell", {
         title: n.title,
         column: n
       }, () => [n.title]);
     };
     return () => {
       var u, n;
-      return a.value ? c(qe, null, [e.showTitle && c("span", {
+      return a.value ? c(_e, null, [e.showTitle && c("span", {
         class: [`${e.className}-list-title`, e.hashId]
-      }, [e.title]), c(Pl, {
-        key: t.value,
+      }, [e.title]), c(jl, {
+        key: l.value,
         draggable: e.draggable && !!((u = o.value) != null && u.length) && ((n = o.value) == null ? void 0 : n.length) > 1,
         checkable: e.checkable,
         blockNode: !0,
@@ -1554,34 +1652,34 @@ const Me = (e) => {
         checkedKeys: s.value,
         height: 280,
         onDrop: (r) => {
-          const m = r.node.key, $ = r.dragNode.key, {
-            dropPosition: O,
+          const g = r.node.key, T = r.dragNode.key, {
+            dropPosition: P,
             dropToGap: R
-          } = r, D = O === -1 || !R ? O + 1 : O;
-          C($, m, D);
+          } = r, M = P === -1 || !R ? P + 1 : P;
+          x(T, g, M);
         },
-        onCheck: (r, m) => f(m),
+        onCheck: (r, g) => d(g),
         treeData: o.value
       }, {
         title: (r) => {
-          var $;
-          const m = {
+          var T;
+          const g = {
             ...r,
             children: void 0,
             title: S(r),
-            autoScroll: ($ = v == null ? void 0 : v.autoScroll) == null ? void 0 : $.value
+            autoScroll: (T = m == null ? void 0 : m.autoScroll) == null ? void 0 : T.value
           };
-          return c(va, G({
+          return c(ya, Q({
             hashId: e.hashId,
             className: e.className
-          }, m, {
-            treeKey: m.key
+          }, g, {
+            treeKey: g.key
           }), null);
         }
       })]) : null;
     };
   }
-}), ma = /* @__PURE__ */ re({
+}), ba = /* @__PURE__ */ fe({
   props: {
     hashId: String,
     className: String,
@@ -1590,36 +1688,36 @@ const Me = (e) => {
   },
   setup(e) {
     const {
-      columns: t
-    } = ce(), a = N([]), o = N([]), s = N([]), i = N([]);
-    V(() => t.value, (x) => {
-      a.value = [], o.value = [], s.value = [], x.forEach((C) => {
-        if (C.hideInSetting)
+      columns: l
+    } = he(), a = E([]), o = E([]), s = E([]), i = E([]);
+    _(() => l.value, (C) => {
+      a.value = [], o.value = [], s.value = [], C.forEach((x) => {
+        if (x.hideInSetting)
           return;
         const {
-          fixed: f,
+          fixed: d,
           show: S,
           uuid: u
-        } = C;
-        if ((S || S === void 0) && u && i.value.push(u), f === "left") {
-          o.value.push(C);
+        } = x;
+        if ((S || S === void 0) && u && i.value.push(u), d === "left") {
+          o.value.push(x);
           return;
         }
-        if (f === "right") {
-          a.value.push(C);
+        if (d === "right") {
+          a.value.push(x);
           return;
         }
-        s.value.push(C);
+        s.value.push(x);
       });
     }, {
       immediate: !0
     });
-    const d = w(() => a.value && a.value.length > 0), v = w(() => o.value && o.value.length > 0);
+    const f = w(() => a.value && a.value.length > 0), m = w(() => o.value && o.value.length > 0);
     return () => c("div", {
       class: {
         [`${e.hashId}`]: !0,
         [`${e.className}-list`]: !0,
-        [`${e.className}-list-group`]: d.value || v.value
+        [`${e.className}-list-group`]: f.value || m.value
       }
     }, [c(et, {
       title: "固定在左侧",
@@ -1636,7 +1734,7 @@ const Me = (e) => {
       draggable: e.draggable,
       checkable: e.checkable,
       title: "不固定",
-      showTitle: v.value || d.value,
+      showTitle: m.value || f.value,
       className: e.className
     }, null), c(et, {
       title: "固定在右侧",
@@ -1648,7 +1746,7 @@ const Me = (e) => {
       className: e.className
     }, null)]);
   }
-}), ga = /* @__PURE__ */ re({
+}), Ca = /* @__PURE__ */ fe({
   props: {
     draggable: {
       type: Boolean,
@@ -1662,98 +1760,98 @@ const Me = (e) => {
     extra: [Function, Object, String, Boolean]
   },
   setup(e) {
-    const t = ut({
+    const l = ut({
       suffixCls: "table-column-setting",
       isPor: !0
     }), {
       wrapSSR: a,
       hashId: o
-    } = Ue("ColumnSetting", [ha], t), {
+    } = qe("ColumnSetting", [ga], l), {
       columns: s,
       settingsAction: i
-    } = ce(), d = Me((S = !0) => {
+    } = he(), f = Me((S = !0) => {
       const u = {}, n = (r) => {
         r.forEach(({
-          key: m,
-          fixed: $,
-          index: O,
+          key: g,
+          fixed: T,
+          index: P,
           children: R
         }) => {
-          const D = Ft(m, O);
-          D && (u[D] = {
+          const M = Bt(g, P);
+          M && (u[M] = {
             show: S,
-            fixed: $
+            fixed: T
           }), R && n(R);
         });
       };
       n(s.value), i == null || i.setColumnsMap(u, "show");
-    }), v = Me((S) => {
-      S.target.checked ? d() : d(!1);
-    }), x = Me(() => {
+    }), m = Me((S) => {
+      S.target.checked ? f() : f(!1);
+    }), C = Me(() => {
       i == null || i.setColumnsMap(i == null ? void 0 : i.cacheColumnsMap, "fixed");
-    }), C = w(() => (
+    }), x = w(() => (
       // @ts-ignore
       Object.values(i == null ? void 0 : i.columnsMap).filter((S) => !S || S.show === !1)
-    )), f = w(() => y(C).length > 0 && y(C).length !== s.value.length);
-    return () => a(c(kl, {
+    )), d = w(() => b(x).length > 0 && b(x).length !== s.value.length);
+    return () => a(c(Pl, {
       arrowPointAtCenter: !0,
       title: c("div", {
-        class: [`${t}-title`, o.value]
-      }, [c(jl, {
-        indeterminate: f.value,
-        checked: y(C).length === 0 && y(C).length !== s.value.length,
-        onChange: (S) => v(S)
+        class: [`${l}-title`, o.value]
+      }, [c(kl, {
+        indeterminate: d.value,
+        checked: b(x).length === 0 && b(x).length !== s.value.length,
+        onChange: (S) => m(S)
       }, {
-        default: () => [Ne("列展示")]
+        default: () => [De("列展示")]
       }), e.checkedReset ? c("a", {
-        onClick: x,
-        class: [`${t}-action-rest-button`, o.value]
-      }, [Ne("重置")]) : null, e != null && e.extra ? c(ye, {
+        onClick: C,
+        class: [`${l}-action-rest-button`, o.value]
+      }, [De("重置")]) : null, e != null && e.extra ? c(Se, {
         size: 12,
         align: "center"
       }, {
         default: () => [e.extra]
       }) : null]),
-      overlayClassName: `${t}-overlay ${o.value}`,
+      overlayClassName: `${l}-overlay ${o.value}`,
       trigger: "click",
       placement: "bottomRight",
-      content: c(ma, {
+      content: c(ba, {
         hashId: o.value,
         checkable: e.checkable ?? !0,
         draggable: e.draggable ?? !0,
-        className: t
+        className: l
       }, null)
     }, {
-      default: () => [c(oe, {
+      default: () => [c(de, {
         title: "列设置"
       }, {
         default: () => [c(Ot, null, null)]
       })]
     }));
   }
-}), Dt = /* @__PURE__ */ re({
+}), Dt = /* @__PURE__ */ fe({
   setup() {
     const {
       isFullscreen: e
-    } = kt();
-    return () => e.value ? c(oe, {
+    } = Pt();
+    return () => e.value ? c(de, {
       title: "退出全屏"
     }, {
       default: () => [c(Sl, null, null)]
-    }) : c(oe, {
+    }) : c(de, {
       title: "全屏"
     }, {
       default: () => [c(wl, null, null)]
     });
   }
-}), ya = () => {
+}), xa = () => {
   const {
     action: e,
-    tableSize: t
-  } = ce();
-  return c(El, {
-    overlay: c(He, {
-      selectedKeys: [t.value],
+    tableSize: l
+  } = he();
+  return c(Nl, {
+    overlay: c(We, {
+      selectedKeys: [l.value],
       onClick: ({
         key: a
       }) => {
@@ -1764,29 +1862,29 @@ const Me = (e) => {
         width: 80
       }
     }, {
-      default: () => [c(He.Item, {
+      default: () => [c(We.Item, {
         key: "large"
       }, {
-        default: () => [Ne("默认")]
-      }), c(He.Item, {
+        default: () => [De("默认")]
+      }), c(We.Item, {
         key: "middle"
       }, {
-        default: () => [Ne("中等")]
-      }), c(He.Item, {
+        default: () => [De("中等")]
+      }), c(We.Item, {
         key: "small"
       }, {
-        default: () => [Ne("紧凑")]
+        default: () => [De("紧凑")]
       })]
     }),
     trigger: ["click"]
   }, {
-    default: () => [c(oe, {
+    default: () => [c(de, {
       title: "表格密度"
     }, {
-      default: () => [c(Tl, null, null)]
+      default: () => [c(pl, null, null)]
     })]
   });
-}, ba = (e) => ({
+}, Sa = (e) => ({
   [`${e.componentCls}`]: {
     lineHeight: 1,
     "&-container": {
@@ -1828,23 +1926,23 @@ const Me = (e) => {
     }
   }
 });
-function pt(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !Ce(e);
+function Tt(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !ce(e);
 }
 const {
-  useBreakpoint: Ca
+  useBreakpoint: wa
 } = st;
-function xa(e) {
-  if (Ce(e))
+function pa(e) {
+  if (ce(e))
     return e;
   if (e) {
-    const t = e, {
+    const l = e, {
       icon: a,
       tooltip: o,
       onClick: s,
       key: i
-    } = t;
-    return a && o ? c(oe, {
+    } = l;
+    return a && o ? c(de, {
       title: o
     }, {
       default: () => [c("span", {
@@ -1857,64 +1955,64 @@ function xa(e) {
   }
   return null;
 }
-const Mt = /* @__PURE__ */ re({
+const Mt = /* @__PURE__ */ fe({
   props: {
-    actions: we.toolBarBtn,
+    actions: re.toolBarBtn,
     settings: [Array],
-    titleTip: we.titleTip,
+    titleTip: re.titleTip,
     prefixCls: String,
-    headerTitle: we.headerTitle,
-    titleTipText: we.titleTipText,
-    optionsExtra: we.optionsExtra
+    headerTitle: re.headerTitle,
+    titleTipText: re.titleTipText,
+    optionsExtra: re.optionsExtra
   },
   setup(e) {
     const {
-      wrapSSR: t,
+      wrapSSR: l,
       hashId: a
-    } = Ue("ListToolBar", [ba], e.prefixCls), o = Ca(), {
+    } = qe("ListToolBar", [Sa], e.prefixCls), o = wa(), {
       isMobile: s
-    } = ce(), i = w(() => {
+    } = he(), i = w(() => {
       var u;
       return !!(e.titleTip || e.headerTitle || (u = e.actions) != null && u.length);
-    }), d = w(() => {
+    }), f = w(() => {
       var u;
       return !!((u = e.settings) != null && u.length || e.optionsExtra);
-    }), v = w(() => !!(e.titleTip || e.headerTitle)), x = w(() => {
+    }), m = w(() => !!(e.titleTip || e.headerTitle)), C = w(() => {
       var n;
       let u;
-      return Array.isArray(e.actions) ? ((n = e.actions) == null ? void 0 : n.length) < 1 ? null : c(ye, {
+      return Array.isArray(e.actions) ? ((n = e.actions) == null ? void 0 : n.length) < 1 ? null : c(Se, {
         align: "center"
-      }, pt(u = e.actions.map((r, m) => Ce(r) ? it(r, {
-        key: m,
+      }, Tt(u = e.actions.map((r, g) => ce(r) ? it(r, {
+        key: g,
         ...r == null ? void 0 : r.props
       }) : c("template", {
-        key: m
+        key: g
       }, [r]))) ? u : {
         default: () => [u]
       }) : e.actions;
-    }), C = Ve(() => !i.value && d.value ? c("div", {
+    }), x = Ve(() => !i.value && f.value ? c("div", {
       class: `${e.prefixCls}-left ${a.value}`
-    }, null) : v.value ? c(ye, {
+    }, null) : m.value ? c(Se, {
       class: `${e.prefixCls}-left ${a.value}`
     }, {
       default: () => [c("div", {
         class: `${e.prefixCls}-title ${a.value}`
-      }, [e.headerTitle, e.titleTip && c(oe, {
+      }, [e.headerTitle, e.titleTip && c(de, {
         title: e.titleTipText
       }, {
-        default: () => [ne(e.titleTip) && e.titleTip ? c(pl, null, null) : e.titleTip]
-      })]), x.value && c("div", {
+        default: () => [ne(e.titleTip) && e.titleTip ? c(Tl, null, null) : e.titleTip]
+      })]), C.value && c("div", {
         class: `${e.prefixCls}-actions ${a.value}`
-      }, [x.value])]
-    }) : c(ye, {
+      }, [C.value])]
+    }) : c(Se, {
       class: `${e.prefixCls}-left ${a.value}`
     }, {
-      default: () => [x.value && c("div", {
+      default: () => [C.value && c("div", {
         class: `${e.prefixCls}-actions`
-      }, [x.value])]
-    }), [() => i.value, () => d.value, () => v.value, () => e.prefixCls, () => e.headerTitle, () => e.titleTipText, () => e.titleTip]), f = Ve(() => {
+      }, [C.value])]
+    }), [() => i.value, () => f.value, () => m.value, () => e.prefixCls, () => e.headerTitle, () => e.titleTipText, () => e.titleTip]), d = Ve(() => {
       let u;
-      return d.value ? c(ye, {
+      return f.value ? c(Se, {
         size: 16,
         class: `${e.prefixCls}-right ${a.value}`,
         align: o.value.lg ? "center" : "end",
@@ -1922,23 +2020,23 @@ const Mt = /* @__PURE__ */ re({
       }, {
         default: () => {
           var n;
-          return [e.optionsExtra, (n = e.settings) != null && n.length ? c(ye, {
+          return [e.optionsExtra, (n = e.settings) != null && n.length ? c(Se, {
             size: 12,
             align: "center",
             class: `${e.prefixCls}-setting-items`
-          }, pt(u = e.settings.map((r, m) => {
-            const $ = xa(r);
+          }, Tt(u = e.settings.map((r, g) => {
+            const T = pa(r);
             return c("div", {
-              key: m,
+              key: g,
               class: `${e.prefixCls}-setting-item`
-            }, [$]);
+            }, [T]);
           })) ? u : {
             default: () => [u]
           }) : null];
         }
       }) : null;
-    }, [() => o.value, () => d.value, () => e.prefixCls, () => v.value, () => x.value, () => e.settings]), S = Ve(() => {
-      if (!d.value && !i.value) return null;
+    }, [() => o.value, () => f.value, () => e.prefixCls, () => m.value, () => C.value, () => e.settings]), S = Ve(() => {
+      if (!f.value && !i.value) return null;
       const u = {
         [`${a.value}`]: !0,
         [`${e.prefixCls}-container`]: !0,
@@ -1946,15 +2044,15 @@ const Mt = /* @__PURE__ */ re({
       };
       return c("div", {
         class: u
-      }, [C.value, f.value]);
-    }, [() => s.value, () => i.value, () => d.value, () => C.value, () => e.prefixCls, () => f.value]);
-    return () => t(c("div", {
+      }, [x.value, d.value]);
+    }, [() => s.value, () => i.value, () => f.value, () => x.value, () => e.prefixCls, () => d.value]);
+    return () => l(c("div", {
       class: `${e.prefixCls} ${a.value}`
     }, [S.value]));
   }
 });
 Mt.inheritAttrs = !1;
-function Sa() {
+function Ta() {
   return {
     reload: {
       text: "刷新",
@@ -1962,7 +2060,7 @@ function Sa() {
     },
     density: {
       text: "表格密度",
-      icon: c(ya, null, null)
+      icon: c(xa, null, null)
     },
     setting: {
       text: "列设置",
@@ -1974,15 +2072,15 @@ function Sa() {
     }
   };
 }
-function wa(e, t) {
+function $a(e, l) {
   return Object.keys(e).filter((a) => a).map((a) => {
     const o = e[a];
     if (!o)
       return null;
-    let s = o === !0 ? t[a] : () => o == null ? void 0 : o();
+    let s = o === !0 ? l[a] : () => o == null ? void 0 : o();
     if (typeof s != "function" && (s = () => {
     }), a === "setting")
-      return c(ga, G(e[a], {
+      return c(Ca, Q(e[a], {
         key: a
       }), null);
     if (a === "fullScreen")
@@ -1990,18 +2088,18 @@ function wa(e, t) {
         key: a,
         onClick: s
       }, [c(Dt, null, null)]);
-    const i = Sa()[a];
+    const i = Ta()[a];
     return i ? c("span", {
       key: a,
       onClick: s
-    }, [c(oe, {
+    }, [c(de, {
       title: i.text
     }, {
       default: () => [i.icon]
     })]) : null;
   }).filter((a) => a);
 }
-const Ta = {
+const Ba = {
   options: [Boolean, Object, Array],
   titleTip: [Function, Boolean, Object, String],
   settingExtra: [Function, Boolean, Object, Array],
@@ -2009,40 +2107,40 @@ const Ta = {
   titleTipText: [String],
   toolBarBtn: [Function, Boolean, Object, Array],
   headerTitle: [Function, Boolean, Object, Array, String]
-}, pa = /* @__PURE__ */ re({
-  props: Ta,
+}, Fa = /* @__PURE__ */ fe({
+  props: Ba,
   inheritAttrs: !1,
   setup(e) {
-    const t = ut({
+    const l = ut({
       suffixCls: "table-list-toolbar",
       isPor: !0
     }), {
       action: a
-    } = ce(), o = Ve(() => {
-      var d;
+    } = he(), o = Ve(() => {
+      var f;
       const s = {
         reload: () => a == null ? void 0 : a.reload(),
         density: !0,
         setting: !0,
         fullScreen: () => a == null ? void 0 : a.toggle()
       };
-      if (e.options === !1 || ((d = Object.keys(e.options)) == null ? void 0 : d.length) === 0) return [];
+      if (e.options === !1 || ((f = Object.keys(e.options)) == null ? void 0 : f.length) === 0) return [];
       const i = {
         ...s,
         ...e.options
       };
-      return i.setting !== !1 && e.settingExtra && (i.setting = {}, i.setting.extra = e.settingExtra), wa(i, {
+      return i.setting !== !1 && e.settingExtra && (i.setting = {}, i.setting.extra = e.settingExtra), $a(i, {
         ...s
       });
     }, [() => a, () => e.options]);
     return () => {
       const s = e.toolBarBtn || [];
       return c(Mt, {
-        prefixCls: t,
+        prefixCls: l,
         optionsExtra: e.optionsExtra,
         headerTitle: e.headerTitle,
         actions: s,
-        settings: y(o),
+        settings: b(o),
         titleTip: e.titleTip,
         titleTipText: e.titleTipText
       }, null);
@@ -2061,8 +2159,8 @@ const Ta = {
     backgroundColor: "transparent",
     borderRadius: 2
   }
-}, $a = (e) => {
-  const t = `${e.antCls}-table`;
+}, Ra = (e) => {
+  const l = `${e.antCls}-table`;
   return {
     [e.componentCls]: {
       "&-a": {
@@ -2080,8 +2178,8 @@ const Ta = {
         opacity: 0,
         visibility: "hidden"
       },
-      [`${t}`]: {
-        [`${t}-cell-ellipsis`]: {
+      [`${l}`]: {
+        [`${l}-cell-ellipsis`]: {
           overflow: "unset",
           whiteSpace: "unset"
         }
@@ -2159,6 +2257,13 @@ const Ta = {
           }
         }
       },
+      "&-card-border": {
+        paddingInline: e.paddingLG,
+        paddingBlock: e.paddingLG,
+        border: `${e.lineWidth}px ${e.lineType} ${e.colorSplit}`,
+        borderRadius: e.borderRadius,
+        marginBottom: 20
+      },
       [`${e.componentCls}-copyable`]: {
         display: "flex",
         alignItems: "center",
@@ -2261,24 +2366,24 @@ const Ta = {
     }
   };
 };
-function Fa(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !Ce(e);
+function Ia(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !ce(e);
 }
 const {
-  useBreakpoint: Ra
-} = st, Ia = {
+  useBreakpoint: Oa
+} = st, Pa = {
   reload: !0,
   density: !0,
   setting: !0,
   fullScreen: !0
-}, lt = /* @__PURE__ */ re({
+}, lt = /* @__PURE__ */ fe({
   name: "GProTable",
   inheritAttrs: !1,
-  props: we,
+  props: re,
   emits: ["reset", "reload", "submit", "sizeChange", "expandedRowsChange", "expand", "change", "requestError", "beforeSearchSubmit", "columnsStateChange", "loadingChange"],
   slots: Object,
   setup(e, {
-    emit: t,
+    emit: l,
     slots: a,
     attrs: o,
     expose: s
@@ -2287,35 +2392,35 @@ const {
       suffixCls: "table",
       isPor: !0
     }), {
-      wrapSSR: d,
-      hashId: v
-    } = Ue("ProBaseTable", [$a], i), x = Ra(), {
-      width: C
-    } = Rl(), f = Pt(), S = N(), u = N(), n = N(e.waitRequest);
-    ze(() => n.value = e.waitRequest);
+      wrapSSR: f,
+      hashId: m
+    } = qe("ProBaseTable", [Ra], i), C = Oa(), {
+      width: x
+    } = Fl(), d = jt(), S = E(), u = E(), n = E(e.waitRequest);
+    Ae(() => n.value = e.waitRequest);
     const {
       toggle: r,
-      isFullscreen: m
-    } = kt(S), $ = w(() => ({
+      isFullscreen: g
+    } = Pt(S), T = w(() => ({
       ...e
-    })), O = w(() => !x.value.xl), R = w(() => {
-      var h, p;
-      return e.virtualScroll && vl(!((h = e.scroll) != null && h.y), "参数scroll的Y值不能为空！"), !!((p = e.scroll) != null && p.y && e.virtualScroll);
-    }), D = w(() => e.search === !1 ? !1 : q(e.search) ? e.search : {
+    })), P = w(() => !C.value.xl), R = w(() => {
+      var h, B;
+      return e.virtualScroll && ml(!((h = e.scroll) != null && h.y), "参数scroll的Y值不能为空！"), !!((B = e.scroll) != null && B.y && e.virtualScroll);
+    }), M = w(() => e.search === !1 ? !1 : X(e.search) ? e.search : {
       type: "auto",
       resetText: "重置",
       searchText: "查询"
-    }), K = w(() => D.value === !1 ? {} : D.value), A = w(() => {
+    }), W = w(() => M.value === !1 ? {} : M.value), Y = w(() => {
       var h;
-      return ((h = K.value) == null ? void 0 : h.type) === "button";
-    }), Q = w(() => {
+      return ((h = W.value) == null ? void 0 : h.type) === "button";
+    }), L = w(() => {
       var h;
-      return (h = K.value) == null ? void 0 : h.actions;
-    }), M = w(() => {
-      const h = (e.columns || []).filter((p) => p.key || p.dataIndex).map((p) => ({
-        ...p,
-        key: p.key || p.dataIndex,
-        align: p.align || e.align,
+      return (h = W.value) == null ? void 0 : h.actions;
+    }), A = w(() => {
+      const h = (e.columns || []).filter((B) => B.key || B.dataIndex).map((B) => ({
+        ...B,
+        key: B.key || B.dataIndex,
+        align: B.align || e.align,
         uuid: at().uuid(15)
       }));
       return ul(h, {
@@ -2323,386 +2428,389 @@ const {
         showIndex: e.showIndex || !1
       });
     }), {
-      loadingComputed: _,
-      loading: L,
-      setLoading: de
-    } = _l({
-      emit: t,
-      loading: se(e, "loading")
-    }), {
-      sizeRef: U,
-      setTableSize: Te
+      loadingComputed: G,
+      loading: H,
+      setLoading: ue
     } = Gl({
-      emit: t,
-      size: se(e, "size")
+      emit: l,
+      loading: oe(e, "loading")
     }), {
-      paginationInfo: l,
-      requestPagination: b,
-      setPagination: B
-    } = ql({
+      sizeRef: ee,
+      setTableSize: me
+    } = Ql({
+      emit: l,
+      size: oe(e, "size")
+    }), {
+      paginationInfo: U,
+      requestPagination: t,
+      setPagination: y
+    } = _l({
       slots: a,
-      props: $,
-      pagination: se(e, "pagination")
-    }), I = ua(e), {
-      proScroll: P,
-      breakpoint: Z
+      props: T,
+      pagination: oe(e, "pagination")
+    }), O = ua(e), {
+      proScroll: p,
+      breakpoint: D
     } = ia({
-      ...I,
-      innerWidth: C,
-      columns: M,
-      screens: x
-    }), k = aa(e), {
-      proColumns: g,
-      cacheProColumns: Y,
-      setColumns: W,
-      changeColumns: pe,
+      ...O,
+      innerWidth: x,
+      columns: A,
+      screens: C
+    }), I = aa(e), {
+      proColumns: j,
+      cacheProColumns: v,
+      setColumns: K,
+      changeColumns: Be,
       resizeColumnWidth: Xe
     } = na({
-      ...k,
-      breakpoint: Z,
-      scroll: P,
-      columns: M
+      ...I,
+      breakpoint: D,
+      scroll: p,
+      columns: A
     }), {
-      columnsMap: Ke,
-      operationType: fe,
-      setColumnsMap: Ae,
-      sortKeyColumns: Ie,
-      cacheColumnsMap: J,
-      setSortKeyColumns: he
+      columnsMap: ze,
+      operationType: ve,
+      setColumnsMap: Ke,
+      sortKeyColumns: Oe,
+      cacheColumnsMap: Z,
+      setSortKeyColumns: ge
     } = la({
-      columns: Y,
-      columnsState: se(e, "columnsState"),
-      changeColumns: pe
+      columns: v,
+      columnsState: oe(e, "columnsState"),
+      changeColumns: Be
     }), {
       formDataRef: z,
-      formParamsRef: ve,
-      defaultParamsRef: X,
-      setFormParams: Je
+      formParamsRef: ye,
+      defaultParamsRef: J,
+      setFormParams: Ue
     } = ta({
-      searchMap: se(e, "searchMap"),
-      params: se(e, "params"),
-      columns: M,
-      setPagination: B
+      searchMap: oe(e, "searchMap"),
+      params: oe(e, "params"),
+      columns: A,
+      setPagination: y
     }), {
       selectedKeys: ot,
-      selectedItems: zt,
-      changeRowKey: Kt,
+      selectedItems: At,
+      changeRowKey: zt,
       selectRowKey: rt,
       selectAllRowKey: ct,
       syncSelectedRows: dt,
       removeRowKeys: ft,
-      clearAllRowKeys: At
-    } = Xl(se(e, "rowKey"), se(e, "rowSelection")), Lt = Ql(e), {
-      reload: Le,
-      reSetDataList: Wt,
-      changeDataValue: Ht,
-      isTreeDataRef: Yt,
-      dataSource: Be,
+      clearAllRowKeys: Kt
+    } = Xl(oe(e, "rowKey"), oe(e, "rowSelection")), Yt = Jl(e), {
+      reload: Ye,
+      reSetDataList: Lt,
+      changeDataValue: Wt,
+      isTreeDataRef: Ht,
+      dataSource: Pe,
       handleTableChange: ht
     } = Zl({
-      ...Lt,
+      ...Yt,
       waitRequest: n
     }, {
-      loading: _,
-      paginationInfo: l,
-      setPagination: B,
+      loading: G,
+      paginationInfo: U,
+      setPagination: y,
       removeRowKeys: ft,
       syncSelectedRows: dt,
-      setLoading: de,
-      setColumns: W,
-      search: D,
-      columns: g,
-      formParamsRef: ve,
+      setLoading: ue,
+      setColumns: K,
+      search: M,
+      columns: j,
+      formParamsRef: ye,
       onBeforeSearchSubmit: e.onBeforeSearchSubmit,
-      hasCustomRender: w(() => Re(e.customRender || (a == null ? void 0 : a.customRender)))
-    }, t), Oe = w(() => e.options ? {
-      ...Ia,
-      ...q(e.options) ? e.options : {}
+      hasCustomRender: w(() => Ie(e.customRender || (a == null ? void 0 : a.customRender)))
+    }, l), ke = w(() => e.options ? {
+      ...Pa,
+      ...X(e.options) ? e.options : {}
     } : !1), Vt = w(() => ({
-      size: y(U),
-      scroll: y(P),
-      dataSource: y(Be),
-      pagination: y(l),
+      size: b(ee),
+      scroll: b(p),
+      dataSource: b(Pe),
+      pagination: b(U),
       virtualScroll: R.value,
-      columns: y(g).filter((h) => h.show || h.show === void 0)
-    })), vt = w(() => {
-      var p, F;
-      const h = q(e.loading) ? _e(e.loading, "spinning") : {};
-      return !h.indicator && ((p = f == null ? void 0 : f.indicator) != null && p.value) && (h.indicator = (F = f == null ? void 0 : f.indicator) == null ? void 0 : F.value), {
-        spinning: e.showLoading ? Re(L.value) : !1,
+      columns: b(j).filter((h) => h.show || h.show === void 0)
+    })), mt = w(() => {
+      var B, F;
+      const h = X(e.loading) ? Ge(e.loading, "spinning") : {};
+      return !h.indicator && ((B = d == null ? void 0 : d.indicator) != null && B.value) && (h.indicator = (F = d == null ? void 0 : d.indicator) == null ? void 0 : F.value), {
+        spinning: e.showLoading ? Ie(H.value) : !1,
         ...h
       };
-    }), mt = w(() => {
-      var E;
+    }), vt = w(() => {
+      var N;
       let h;
-      const p = y($).direction === "rtl" ? "bottomLeft" : "right", F = (E = y(l)) == null ? void 0 : E.position;
+      const B = b(T).direction === "rtl" ? "bottomLeft" : "right", F = (N = b(U)) == null ? void 0 : N.position;
       if (F !== null && Array.isArray(F)) {
-        const j = F.find((T) => T.includes("top")), H = F.find((T) => T.includes("bottom")), ee = F.every((T) => `${T}` == "none");
-        !j && !H && !ee && (h = p), j && (h = j.toLowerCase().replace("top", "")), H && (h = H.toLowerCase().replace("bottom", ""));
+        const k = F.find(($) => $.includes("top")), V = F.find(($) => $.includes("bottom")), te = F.every(($) => `${$}` == "none");
+        !k && !V && !te && (h = B), k && (h = k.toLowerCase().replace("top", "")), V && (h = V.toLowerCase().replace("bottom", ""));
       } else
-        h = p;
+        h = B;
       return h;
-    }), gt = async (h, p) => {
+    }), gt = async (h, B) => {
       var F;
-      A.value ? (F = Q.value) != null && F.reload && p ? (Je(h), await Le()) : Je(h) : (Je({
+      Y.value ? (F = L.value) != null && F.reload && B ? (Ue(h), await Ye()) : Ue(h) : (Ue({
         ...e.params || {},
         ...h
-      }), await Le());
-    }, _t = async (h, p) => {
-      p === "reset" ? (t("reset", h), e.request && await gt(h, p)) : e.request ? (t("submit", h), await gt(h, p)) : t("submit", h);
-    }, yt = (h, p, F, E) => {
-      B(Ct(h, ["current", "pageSize"])), ht(h, p, F, E);
-    }, Gt = (h, p) => {
+      }), await Ye());
+    }, Gt = async (h, B) => {
+      B === "reset" ? (l("reset", h), e.request && await gt(h, B)) : e.request ? (l("submit", h), await gt(h, B)) : l("submit", h);
+    }, yt = (h, B, F, N) => {
+      y(Ct(h, ["current", "pageSize"])), ht(h, B, F, N);
+    }, Qt = (h, B) => {
       var F;
-      B({
+      y({
         current: h,
-        pageSize: p
+        pageSize: B
       }), ht({
         current: h,
-        pageSize: p,
-        total: l.value && ((F = l.value) == null ? void 0 : F.total) || 0
+        pageSize: B,
+        total: U.value && ((F = U.value) == null ? void 0 : F.total) || 0
       }, {}, {});
-    }, qt = (h) => {
-      t("expandedRowsChange", h);
-    }, Ut = (h, p) => {
-      t("expand", h, p);
-    }, Xt = (h, p) => Xe(h, p), Jt = (h, p, F) => {
-      var j, H, ee;
-      let E = h;
-      if (p) {
-        const T = F.tooltip === !1 ? {} : F.tooltip, ue = F.tooltip === !1 ? 1 : Ge(T == null ? void 0 : T.hiddenLine) && (T == null ? void 0 : T.hiddenLine) > 0 ? T == null ? void 0 : T.hiddenLine : 1, ie = F.tooltip === !1 ? 0 : Ge(T == null ? void 0 : T.width) ? T == null ? void 0 : T.width : 0, me = F.tooltip !== !1 && Rt(h) && ie > 0 ? sl(h, {
+    }, _t = (h) => {
+      l("expandedRowsChange", h);
+    }, qt = (h, B) => {
+      l("expand", h, B);
+    }, Xt = (h, B) => Xe(h, B), Ut = (h, B, F) => {
+      var k, V, te;
+      let N = h;
+      if (B) {
+        const $ = F.tooltip === !1 ? {} : F.tooltip, ie = F.tooltip === !1 ? 1 : Qe($ == null ? void 0 : $.hiddenLine) && ($ == null ? void 0 : $.hiddenLine) > 0 ? $ == null ? void 0 : $.hiddenLine : 1, se = F.tooltip === !1 ? 0 : Qe($ == null ? void 0 : $.width) ? $ == null ? void 0 : $.width : 0, be = F.tooltip !== !1 && Ft(h) && se > 0 ? sl(h, {
           root: `.${i}-hidden`,
-          cssObject: T == null ? void 0 : T.targetStyle
-        }) : 0, $e = document.querySelector(`.${i} .ant-table-tbody`), xe = c("div", {
+          cssObject: $ == null ? void 0 : $.targetStyle
+        }) : 0, Fe = document.querySelector(`.${i} .ant-table-tbody`), Te = c("div", {
           class: `${i}-ellipsis-text`
-        }, [h]), ke = () => F.tooltip === !1 || q(F.tooltip) && me < ie && ie > 0 ? xe : c(oe, G({
+        }, [h]), je = () => F.tooltip === !1 || X(F.tooltip) && be < se && se > 0 ? Te : c(de, Q({
           title: h,
-          getPopupContainer: (ge) => {
-            var We;
-            return $e ?? ((We = ge == null ? void 0 : ge.parentNode) == null ? void 0 : We.parentNode);
+          getPopupContainer: (Ce) => {
+            var Le;
+            return Fe ?? ((Le = Ce == null ? void 0 : Ce.parentNode) == null ? void 0 : Le.parentNode);
           }
-        }, q(F.tooltip) ? F.tooltip : {}, {
+        }, X(F.tooltip) ? F.tooltip : {}, {
           destroyTooltipOnHide: !0
-        }), Fa(xe) ? xe : {
-          default: () => [xe]
+        }), Ia(Te) ? Te : {
+          default: () => [Te]
         });
-        if (E = c("div", {
-          class: `${i}-ellipsis ${T == null ? void 0 : T.class}`,
+        if (N = c("div", {
+          class: `${i}-ellipsis ${$ == null ? void 0 : $.class}`,
           style: {
-            "-webkit-line-clamp": ue
+            "-webkit-line-clamp": ie
           }
-        }, [ke()]), F.copyable) {
-          const ge = te(h) ? typeof ((j = h == null ? void 0 : h[0]) == null ? void 0 : j.children) == "string" ? (H = h == null ? void 0 : h[0]) == null ? void 0 : H.children : "" : h.toString(), We = typeof F.copyText == "function" ? (ee = F.copyText) == null ? void 0 : ee.call(F, F) : F.copyText || ge;
-          E = c("div", {
+        }, [je()]), F.copyable) {
+          const Ce = le(h) ? typeof ((k = h == null ? void 0 : h[0]) == null ? void 0 : k.children) == "string" ? (V = h == null ? void 0 : h[0]) == null ? void 0 : V.children : "" : h.toString(), Le = typeof F.copyText == "function" ? (te = F.copyText) == null ? void 0 : te.call(F, F) : F.copyText || Ce;
+          N = c("div", {
             class: `${i}-copyable`
           }, [c("div", {
-            class: `${i}-ellipsis ${T == null ? void 0 : T.class}`,
+            class: `${i}-ellipsis ${$ == null ? void 0 : $.class}`,
             style: {
-              "-webkit-line-clamp": ue
+              "-webkit-line-clamp": ie
             }
-          }, [ke()]), c(Fl, {
+          }, [je()]), c(Bl, {
             class: `${i}-copyable-icon`,
             onClick: () => {
-              Vl(We), Ml.success("复制成功");
+              Vl(Le), Ml.success("复制成功");
             }
           }, null)]);
         }
       }
-      return E;
+      return N;
     };
     function bt() {
-      var F, E, j, H, ee;
-      const h = Fe(a, e, "emptyText");
-      if (h !== !1 && ((F = f == null ? void 0 : f.emptyText) == null ? void 0 : F.value) !== !1) {
-        const T = ((E = e.emptyTextProps) == null ? void 0 : E.extraProps) || {}, ue = h || ((j = f == null ? void 0 : f.emptyText) == null ? void 0 : j.value), ie = Ce(ue), me = ie ? Bt(ue, T) : It(ue || []);
+      var F, N, k, V, te;
+      const h = Re(a, e, "emptyText");
+      if (h !== !1 && ((F = d == null ? void 0 : d.emptyText) == null ? void 0 : F.value) !== !1) {
+        const $ = ((N = e.emptyTextProps) == null ? void 0 : N.extraProps) || {}, ie = h || ((k = d == null ? void 0 : d.emptyText) == null ? void 0 : k.value), se = ce(ie), be = se ? It(ie, $) : Rt(ie || []);
         return c("div", {
-          class: Ee(`${i}-empty-text`, v.value, (H = e.emptyTextProps) == null ? void 0 : H.class),
-          style: (ee = e.emptyTextProps) == null ? void 0 : ee.style
-        }, [ie ? me : te(me) ? me.map(($e) => it($e, T)) : c(zl, null, null)]);
+          class: we(`${i}-empty-text`, m.value, (V = e.emptyTextProps) == null ? void 0 : V.class),
+          style: (te = e.emptyTextProps) == null ? void 0 : te.style
+        }, [se ? be : le(be) ? be.map((Fe) => it(Fe, $)) : c(Al, null, null)]);
       }
       return null;
     }
-    const Qt = () => {
-      var p;
+    const Jt = () => {
+      var B;
       const h = $t(a, e, "customRender");
       if (h) {
-        if ((p = Be.value) != null && p.length) {
-          const F = le(y(Be));
+        if ((B = Pe.value) != null && B.length) {
+          const F = ae(b(Pe));
           return h == null ? void 0 : h({
             dataSource: F,
-            currentData: Yl(F, l.value)
+            currentData: Hl(F, U.value)
           });
         }
         return bt();
       }
-      return c(qe, null, null);
+      return c(_e, null, null);
     }, Zt = (h) => {
-      var j, H;
-      const p = Fe(a, e, "headerTitle"), F = Fe(a, e, "titleTip"), E = Fe(a, e, "toolBarBtn");
-      return c(pa, {
-        headerTitle: p,
+      var k, V;
+      const B = Re(a, e, "headerTitle"), F = Re(a, e, "titleTip"), N = Re(a, e, "toolBarBtn");
+      return c(Fa, {
+        headerTitle: B,
         titleTip: F,
         titleTipText: e.titleTipText,
-        options: ne(Oe.value) ? Oe.value : {
-          ...Oe.value,
-          setting: h ? !1 : (j = Oe.value) == null ? void 0 : j.setting,
-          density: h ? !1 : (H = Oe.value) == null ? void 0 : H.density
+        options: ne(ke.value) ? ke.value : {
+          ...ke.value,
+          setting: h ? !1 : (k = ke.value) == null ? void 0 : k.setting,
+          density: h ? !1 : (V = ke.value) == null ? void 0 : V.density
         },
-        settingExtra: Fe(a, e, "settingExtra"),
-        optionsExtra: Fe(a, e, "optionsExtra"),
-        toolBarBtn: E
+        settingExtra: Re(a, e, "settingExtra"),
+        optionsExtra: Re(a, e, "optionsExtra"),
+        toolBarBtn: N
       }, null);
     };
     return sa({
-      tableSize: U,
-      columns: g,
-      cacheColumns: M,
-      isMobile: O,
-      searchConfig: K,
-      manualSearch: A,
-      searchActions: Q,
+      tableSize: ee,
+      columns: j,
+      cacheColumns: A,
+      isMobile: P,
+      searchConfig: W,
+      manualSearch: Y,
+      searchActions: L,
       action: {
-        setTableSize: Te,
-        reload: (h) => Le(h),
+        setTableSize: me,
+        reload: (h) => Ye(h),
         toggle: r
       },
       settingsAction: {
-        autoScroll: se(e, "autoScroll"),
-        columnsMap: Ke,
-        operationType: fe,
-        setColumnsMap: Ae,
-        sortKeyColumns: Ie,
-        cacheColumnsMap: J,
-        setSortKeyColumns: he
+        autoScroll: oe(e, "autoScroll"),
+        columnsMap: ze,
+        operationType: ve,
+        setColumnsMap: Ke,
+        sortKeyColumns: Oe,
+        cacheColumnsMap: Z,
+        setSortKeyColumns: ge
       },
-      setPagination: B,
-      changeColumns: pe,
+      setPagination: y,
+      changeColumns: Be,
       slots: a
     }), s({
       formRef: () => ({
-        getFormState: () => y(ve),
+        getFormState: () => b(ye),
         getFormInnerState: () => {
           var h;
           return ((h = u.value) == null ? void 0 : h.getFormState()) || {};
         },
         restFormState: (h) => {
-          var p;
-          n.value = !0, h && (h == null || h()), (p = u.value) == null || p.resetForm(!1), n.value = !1;
+          var B;
+          n.value = !0, h && (h == null || h()), (B = u.value) == null || B.resetForm(!1), n.value = !1;
         }
       }),
       actionRef: () => ({
-        loading: L,
-        dataSource: Be,
-        pageState: b,
-        pagination: l.value,
+        loading: H,
+        dataSource: Pe,
+        pageState: t,
+        pagination: U.value,
         selectedKeys: w(() => ot.value),
-        selectedItems: w(() => zt.value),
+        selectedItems: w(() => At.value),
         rowsSelection: {
-          clear: At,
+          clear: Kt,
           select: rt,
           remove: ft,
           sync: dt,
           selectAll: ct
         },
-        reload: Le,
-        getLoadingStatus: () => y(_),
+        reload: Ye,
+        getLoadingStatus: () => b(G),
         reloadAndReset: async (h) => {
-          var p, F, E;
-          n.value = !0, B({
+          var B, F, N;
+          n.value = !0, y({
             current: 1,
-            pageSize: (b == null ? void 0 : b.pageSize) || 10
-          }), h != null && h.callBack && (h != null && h.wait ? await ((p = h == null ? void 0 : h.callBack) == null ? void 0 : p.call(h)) : (F = h == null ? void 0 : h.callBack) == null || F.call(h)), (E = u.value) == null || E.resetForm(!1), n.value = !1;
+            pageSize: (t == null ? void 0 : t.pageSize) || 10
+          }), h != null && h.callBack && (h != null && h.wait ? await ((B = h == null ? void 0 : h.callBack) == null ? void 0 : B.call(h)) : (F = h == null ? void 0 : h.callBack) == null || F.call(h)), (N = u.value) == null || N.resetForm(!1), n.value = !1;
         },
-        reSetDataList: Wt,
+        reSetDataList: Lt,
         setPageAndReload: yt,
-        setPagination: B,
-        setData: Ht,
-        setLoading: de
+        setPagination: y,
+        setData: Wt,
+        setLoading: ue
       })
     }), () => {
-      var p, F;
-      const h = Re(e.customRender || a.customRender);
-      return d(c("div", {
+      var B, F;
+      const h = Ie(e.customRender || a.customRender);
+      return f(c("div", {
         ref: S,
-        class: Ee([{
-          [`${v.value}`]: !0,
+        class: we([{
+          [`${m.value}`]: !0,
           [`${i}`]: !0,
           [`${o.class}`]: o.class,
-          [`${i}-no-scroll`]: !Object.keys(y(P) || {}).length,
-          [`${i}-table-tree`]: Yt.value,
-          [`${i}-full-screen`]: m.value
+          [`${i}-no-scroll`]: !Object.keys(b(p) || {}).length,
+          [`${i}-table-tree`]: Ht.value,
+          [`${i}-full-screen`]: g.value
         }]),
         style: o.style
       }, [c("div", {
-        class: [`${i}-content`, v.value]
-      }, [(z.value.length > 0 || Re(a.search)) && e.search !== !1 && c(Nt, {
+        class: [`${i}-content`, m.value]
+      }, [(z.value.length > 0 || Ie(a.search)) && e.search !== !1 && c(Et, {
         ref: u,
         modal: e.modalScroll,
+        cardBordered: e.cardBordered,
         searchMap: z.value,
         prefixCls: i,
-        loading: !!y(_),
-        onSearch: _t,
-        defaultParams: X
+        loading: !!b(G),
+        onSearch: Gt,
+        defaultParams: J
       }, {
         default: a.search ? () => {
-          var E;
-          return (E = a.search) == null ? void 0 : E.call(a);
+          var N;
+          return (N = a.search) == null ? void 0 : N.call(a);
         } : null
-      }), Zt(h), h ? c(nt, vt.value, {
+      }), c("div", {
+        class: we(m.value, `${i}-card`, e.cardBordered && `${i}-card-border`)
+      }, [Zt(h), h ? c(nt, mt.value, {
         default: () => {
-          var E, j, H;
+          var N, k, V;
           return [c("div", {
-            class: `${i}-wrapper ${v.value}`
+            class: `${i}-wrapper ${m.value}`
           }, [c("div", {
-            class: Ee(`${i}-list`, v.value, (E = e.tableProps) == null ? void 0 : E.class),
-            style: (j = e.tableProps) == null ? void 0 : j.style
-          }, [Qt()]), e.pagination !== !1 && ((H = Be.value) == null ? void 0 : H.length) > 0 && c(Nl, G({
+            class: we(`${i}-list`, m.value, (N = e.tableProps) == null ? void 0 : N.class),
+            style: (k = e.tableProps) == null ? void 0 : k.style
+          }, [Jt()]), e.pagination !== !1 && ((V = Pe.value) == null ? void 0 : V.length) > 0 && c(El, Q({
             class: {
-              [`${i}-pagination ${v.value}`]: !0,
-              [`${i}-pagination-${mt.value} ${v.value}`]: !!mt.value
+              [`${i}-pagination ${m.value}`]: !0,
+              [`${i}-pagination-${vt.value} ${m.value}`]: !!vt.value
             }
-          }, Se(y(l)), {
-            onChange: Gt
+          }, $e(b(U)), {
+            onChange: Qt
           }), null)])];
         }
-      }) : c(Dl, G(Ct(e, Object.keys(Et)), Vt.value, {
-        style: (p = e.tableProps) == null ? void 0 : p.style,
+      }) : c(Dl, Q(Ct(e, Object.keys(Nt)), Vt.value, {
+        style: (B = e.tableProps) == null ? void 0 : B.style,
         class: (F = e.tableProps) == null ? void 0 : F.class,
-        loading: vt.value,
-        rowKey: (E) => E[e.rowKey],
-        transformCellText: (E) => {
-          var ue, ie, me, $e, xe;
-          e.transformCellText && typeof e.transformCellText && ((ue = e.transformCellText) == null || ue.call(e, E));
+        loading: mt.value,
+        rowKey: (N) => N[e.rowKey],
+        transformCellText: (N) => {
+          var ie, se, be, Fe, Te;
+          e.transformCellText && typeof e.transformCellText && ((ie = e.transformCellText) == null || ie.call(e, N));
           const {
-            column: j
-          } = E;
-          if (!j) return E.text;
-          const H = (j == null ? void 0 : j.key) || (j == null ? void 0 : j.dataIndex);
-          let ee = !0, T = E.text;
-          if (te(T))
-            if (T.length === 0 || T.length === 1 && !Ce(T[0])) {
-              T = T == null ? void 0 : T[0];
-              const ke = il(T, (j == null ? void 0 : j.columnEmptyText) || (e == null ? void 0 : e.columnEmptyText) || "");
-              ee = ke.success, T = Hl(ke.value, (j == null ? void 0 : j.valueType) || ((me = (ie = e.columns) == null ? void 0 : ie.find((ge) => (ge.key || ge.dataIndex) === H)) == null ? void 0 : me.valueType), i, v.value);
-            } else (($e = T[0]) == null ? void 0 : $e.type) === "template" && (T = (xe = T[0]) == null ? void 0 : xe.children);
-          return j != null && j.ellipsis ? Jt(T, ee, j) : T;
+            column: k
+          } = N;
+          if (!k) return N.text;
+          const V = (k == null ? void 0 : k.key) || (k == null ? void 0 : k.dataIndex);
+          let te = !0, $ = N.text;
+          if (le($))
+            if ($.length === 0 || $.length === 1 && !ce($[0])) {
+              $ = $ == null ? void 0 : $[0];
+              const je = il($, (k == null ? void 0 : k.columnEmptyText) || (e == null ? void 0 : e.columnEmptyText) || "");
+              te = je.success, $ = Wl(je.value, (k == null ? void 0 : k.valueType) || ((be = (se = e.columns) == null ? void 0 : se.find((Ce) => (Ce.key || Ce.dataIndex) === V)) == null ? void 0 : be.valueType), i, m.value);
+            } else ((Fe = $[0]) == null ? void 0 : Fe.type) === "template" && ($ = (Te = $[0]) == null ? void 0 : Te.children);
+          return k != null && k.ellipsis ? Ut($, te, k) : $;
         },
         rowSelection: e.rowSelection ? {
-          ..._e(e.rowSelection, ["onSelect", "onSelectAll", "onChange", "selectedRowKeys"]),
+          ...Ge(e.rowSelection, ["onSelect", "onSelectAll", "onChange", "selectedRowKeys"]),
           selectedRowKeys: ot.value,
           onSelect: rt,
           onSelectAll: ct,
-          onChange: Kt
+          onChange: zt
         } : void 0,
         onChange: yt,
-        onExpandedRowsChange: qt,
-        onExpand: Ut,
-        onResizeColumn: (E, j) => Xt(E, j)
+        onExpandedRowsChange: _t,
+        onExpand: qt,
+        onResizeColumn: (N, k) => Xt(N, k)
       }), {
         ...a,
         emptyText: () => bt()
-      })]), c("div", {
-        class: [`${i}-hidden`, v.value]
+      })])]), c("div", {
+        class: [`${i}-hidden`, m.value]
       }, null)]));
     };
   }
@@ -2711,6 +2819,6 @@ lt.install = (e) => (e.component(lt.name, lt), e);
 export {
   lt as GProTable,
   lt as default,
-  we as proTableProps,
-  Wa as useTable
+  re as proTableProps,
+  Va as useTable
 };