@aplus-frontend/ui 0.0.32 → 0.0.34

package/es/src/ap-table/ap-table.vue.mjs

@@ -1,22 +1,23 @@
-import { defineComponent as te, useSlots as oe, computed as s, createVNode as d, mergeProps as f, unref as l, watch as re, openBlock as i, createElementBlock as m, normalizeClass as F, normalizeStyle as R, createSlots as L, withCtx as p, Fragment as le, renderList as E, createBlock as ne, resolveDynamicComponent as se, renderSlot as w, createCommentVNode as O, createElementVNode as V, toDisplayString as de, normalizeProps as ue, guardReactiveProps as ie } from "vue";
-import { Typography as pe, Table as ce, Tooltip as fe } from "ant-design-vue";
-import { useToken as me } from "ant-design-vue/es/theme/internal";
-import { ApForm as ge } from "../ap-form/index.mjs";
-import { apTableRenderItemMap as ye, noRenderAsFormItemValueList as z, apTableFormItemMap as be } from "./constants.mjs";
+import { defineComponent as ne, useSlots as se, computed as s, createVNode as d, mergeProps as p, unref as r, watch as de, openBlock as c, createElementBlock as y, normalizeClass as F, normalizeStyle as T, createSlots as V, withCtx as f, Fragment as ue, renderList as z, createBlock as ie, resolveDynamicComponent as pe, renderSlot as x, createCommentVNode as D, createElementVNode as K, toDisplayString as ce, normalizeProps as fe, guardReactiveProps as me } from "vue";
+import { Typography as ge, Table as ye, Tooltip as be } from "ant-design-vue";
+import { useToken as Se } from "ant-design-vue/es/theme/internal";
+import { ApForm as he } from "../ap-form/index.mjs";
+import { apTableRenderItemMap as we, noRenderAsFormItemValueList as N, apTableFormItemMap as Ce } from "./constants.mjs";
 import "../config-provider/index.mjs";
-import { useTablePaging as he } from "./hooks/use-table-paging.mjs";
-import { omit as N, isUndefined as x, isBoolean as Ce } from "lodash-unified";
+import { useTablePaging as Re } from "./hooks/use-table-paging.mjs";
+import { omit as W, isUndefined as u, isBoolean as Fe } from "lodash-unified";
 import "./style/ap-table.css";
-import { QuestionCircleOutlined as Se } from "@ant-design/icons-vue";
-import { apColumnToColumn as Fe, getTableRenderType as Re, getTableRenderProps as we, getColumnOrder as D, updateFormProps as xe, getFieldProps as Te, getPlaceholder as Be } from "./utils.mjs";
-import Pe from "./hooks/use-table-content-height.mjs";
-import { getRawDisplayValue as ve } from "../editable-table/utils.mjs";
-import { useLocale as Ie } from "../config-provider/hooks/use-locale.mjs";
-import { useNamespace as ke } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as Le } from "../config-provider/hooks/use-global-config.mjs";
-const Ee = {
+import { QuestionCircleOutlined as Te } from "@ant-design/icons-vue";
+import { apColumnToColumn as xe, getTableRenderType as ve, getTableRenderProps as Be, getColumnOrder as _, updateFormProps as Pe, getFieldProps as Ie, getPlaceholder as ke } from "./utils.mjs";
+import Le from "./hooks/use-table-content-height.mjs";
+import { getRawDisplayValue as Ee } from "../editable-table/utils.mjs";
+import Oe from "./hooks/use-table-row-selection.mjs";
+import { useLocale as Ve } from "../config-provider/hooks/use-locale.mjs";
+import { useNamespace as ze } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as De } from "../config-provider/hooks/use-global-config.mjs";
+const Ke = {
   key: 0
-}, Ue = /* @__PURE__ */ te({
+}, aa = /* @__PURE__ */ ne({
   name: "ApTable",
   __name: "ap-table",
   props: {
@@ -32,7 +33,6 @@ const Ee = {
     locale: {},
     onChange: {},
     onResizeColumn: {},
-    rowSelection: {},
     getPopupContainer: {},
     scroll: {},
     sortDirections: {
@@ -96,6 +96,9 @@ const Ee = {
     },
     transformCellText: {},
     columns: {},
+    rowSelection: {
+      type: Boolean
+    },
     card: {
       type: Boolean,
       default: !1
@@ -130,206 +133,226 @@ const Ee = {
       default: !1
     }
   },
-  setup(W, {
-    expose: _
+  setup(j, {
+    expose: A
   }) {
-    const o = W;
-    let T = 0;
-    const B = oe(), [, j] = me(), {
-      t: A
-    } = Ie(), {
-      e: g,
-      b: u
-    } = ke("ap-table"), M = Le("uiMode", "aplus"), {
-      height: q,
-      contentRef: H
-    } = Pe(), y = s(() => {
+    const a = j;
+    let v = 0;
+    const B = se(), [, M] = Se(), {
+      t: q
+    } = Ve(), {
+      e: b,
+      b: i
+    } = ze("ap-table"), H = De("uiMode", "aplus"), {
+      height: $,
+      contentRef: G
+    } = Le(), S = s(() => {
       var t;
-      let e = ((t = o.columns) == null ? void 0 : t.filter((a) => !a.hideInTable)) || [];
-      return e = e.map((a) => ({
-        ...N(Fe(a), ["ellipsis"]),
+      let e = ((t = a.columns) == null ? void 0 : t.filter((o) => !o.hideInTable)) || [];
+      return e = e.map((o) => ({
+        ...W(xe(o), ["ellipsis"]),
         customRender({
-          value: r,
+          value: l,
           ...n
         }) {
-          const C = Re(a), k = ye[C], ae = we(a, {
-            value: r,
+          const C = ve(o), O = we[C], le = Be(o, {
+            value: l,
             ...n
           });
-          let S = Y(a, r, d(k, f(ae, {
+          let R = oe(o, l, d(O, p(le, {
             mode: "read"
           }), null));
-          return a.customRender && (S = a.customRender({
-            value: r,
+          return o.customRender && (R = o.customRender({
+            value: l,
             ...n,
-            column: a,
-            originalNode: S
-          })), S;
+            column: o,
+            originalNode: R
+          })), R;
         }
       })), e;
     }), P = s(() => {
-      var e, t, a;
-      return T++, ((a = (t = (e = o.columns) == null ? void 0 : e.filter((r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !z.includes(r.valueType))) == null ? void 0 : t.sort((r, n) => {
-        let C = D(r.order);
-        return D(n.order) - C;
-      })) == null ? void 0 : a.map((r) => {
-        const n = xe(r, Te(r.fieldProps, {}));
+      var e, t, o;
+      return v++, ((o = (t = (e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !N.includes(l.valueType))) == null ? void 0 : t.sort((l, n) => {
+        let C = _(l.order);
+        return _(n.order) - C;
+      })) == null ? void 0 : o.map((l) => {
+        const n = Pe(l, Ie(l.fieldProps, {}));
         return {
-          ...r,
+          ...l,
           fieldProps: {
-            label: r.title,
-            name: r.dataIndex,
+            label: l.title,
+            name: l.dataIndex,
             ...n || {},
             // 格式化placeholder
-            placeholder: Be(A, r.valueType, n == null ? void 0 : n.placeholder),
-            _signal: T
+            placeholder: ke(q, l.valueType, n == null ? void 0 : n.placeholder),
+            _signal: v
           }
         };
       })) || [];
-    }), K = s(() => l(y).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), $ = s(() => l(y).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), {
-      formRef: b,
-      submit: v,
-      reset: I,
-      tableProps: c,
-      handleTableChange: G,
-      data: h
-    } = he({
+    }), Q = s(() => r(S).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), U = s(() => r(S).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), J = s(() => u(a.dataSource) ? g.value.records : a.dataSource), {
+      rowSelection: I,
+      selectedRows: k,
+      ...h
+    } = Oe({
+      ...a.rowSelection === !0 ? {} : a.rowSelection,
+      rowKey: a.rowKey,
+      dataSource: J
+    }), {
+      formRef: w,
+      submit: L,
+      reset: E,
+      tableProps: m,
+      handleTableChange: X,
+      data: g
+    } = Re({
       async request(e) {
-        var a, r;
-        const t = await ((a = o.request) == null ? void 0 : a.call(o, e));
-        return (r = o.onLoad) == null || r.call(o, (t == null ? void 0 : t.data) || []), {
+        var o, l;
+        !I.value.preserveSelectedRowKeys && u(a.dataSource) && h.clearAll();
+        const t = await ((o = a.request) == null ? void 0 : o.call(a, e));
+        return (l = a.onLoad) == null || l.call(a, (t == null ? void 0 : t.data) || []), {
           data: (t == null ? void 0 : t.data) || [],
           total: (t == null ? void 0 : t.total) || 0
         };
       },
-      filterFields: l($),
-      sortFields: l(K),
-      defaultParams: o.params,
-      defaultData: o.defaultData,
-      manual: o.manual,
-      defaultCurrent: o.pagination ? o.pagination.defaultCurrent : void 0,
-      defaultPageSize: o.pagination ? o.pagination.defaultPageSize : void 0,
-      formatParams: o.beforeSearchSubmit
-    }), Q = s(() => {
+      filterFields: r(U),
+      sortFields: r(Q),
+      defaultParams: a.params,
+      defaultData: a.defaultData,
+      manual: a.manual,
+      defaultCurrent: a.pagination ? a.pagination.defaultCurrent : void 0,
+      defaultPageSize: a.pagination ? a.pagination.defaultPageSize : void 0,
+      formatParams: a.beforeSearchSubmit
+    }), Y = s(() => {
       var e;
-      return o.scroll ? o.scroll : o.adaptive && (h.value.total > 0 || (e = o.dataSource) != null && e.length) ? {
-        y: l(q),
+      return a.scroll ? a.scroll : a.adaptive && (g.value.total > 0 || (e = a.dataSource) != null && e.length) ? {
+        y: r($),
         x: "100%"
       } : {
         x: !0
       };
-    }), U = s(() => {
+    }), Z = s(() => {
       var e;
-      if (o.tableLayout)
-        return o.tableLayout;
-      if ((e = o.columns) != null && e.some((t) => t.ellipsis))
+      if (a.tableLayout)
+        return a.tableLayout;
+      if ((e = a.columns) != null && e.some((t) => t.ellipsis))
         return "fixed";
-    }), J = s(() => {
-      const e = l(c), t = x(o.dataSource) ? e : {
+    }), ee = s(() => {
+      const e = r(m), t = u(a.dataSource) ? e : {
         ...e,
-        dataSource: o.dataSource,
-        onChange: o.onChange
-      };
+        dataSource: a.dataSource,
+        onChange: a.onChange
+      }, o = r(I);
       return {
-        ...o,
+        ...a,
         ...t,
-        loading: x(o.loading) ? l(c).loading : o.loading,
-        pagination: o.pagination === !1 ? !1 : l(c).pagination,
-        scroll: l(Q)
+        rowSelection: a.rowSelection ? {
+          ...o,
+          // tips 如果是前端分页，则默认会走缓存
+          preserveSelectedRowKeys: u(a.dataSource) ? o.preserveSelectedRowKeys : !0
+        } : void 0,
+        loading: u(a.loading) ? r(m).loading : a.loading,
+        pagination: a.pagination === !1 ? !1 : r(m).pagination,
+        scroll: r(Y)
       };
-    }), X = s(() => [u(), o.card ? null : u("wrapper"), o.adaptive ? u("adaptive") : null].filter(Boolean));
-    function Y(e, t, a) {
-      return z.includes(e.valueType) ? a : e.copyable || e.ellipsis ? d(pe.Paragraph, {
+    }), ae = s(() => [i(), a.card ? null : i("wrapper"), a.adaptive ? i("adaptive") : null].filter(Boolean));
+    function oe(e, t, o) {
+      return N.includes(e.valueType) ? o : e.copyable || e.ellipsis ? d(ge.Paragraph, {
         copyable: e.copyable ? {
           text: t,
           tooltip: !1
         } : !1,
-        ellipsis: e.ellipsis ? Ce(e.ellipsis) ? {
+        ellipsis: e.ellipsis ? Fe(e.ellipsis) ? {
           tooltip: t
         } : {
           ...e.ellipsis,
           tooltip: t
         } : !1,
-        content: e.ellipsis ? ve(e, t) : a
-      }, null) : a;
+        content: e.ellipsis ? Ee(e, t) : o
+      }, null) : o;
     }
-    re(() => l(h).loading, (e) => {
+    de(() => r(g).loading, (e) => {
       var t;
-      (t = o.onLoadingChange) == null || t.call(o, e);
+      (t = a.onLoadingChange) == null || t.call(a, e);
     });
-    function Z(e) {
-      var t, a, r;
-      (r = (a = (t = b.value) == null ? void 0 : t.apForm) == null ? void 0 : a.setFieldsValue) == null || r.call(a, e);
+    function te(e) {
+      var t, o, l;
+      (l = (o = (t = w.value) == null ? void 0 : t.apForm) == null ? void 0 : o.setFieldsValue) == null || l.call(o, e);
     }
-    function ee() {
-      var e, t, a;
-      return (a = (t = (e = b.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValue) == null ? void 0 : a.call(t, !0);
+    function re() {
+      var e, t, o;
+      return (o = (t = (e = w.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValue) == null ? void 0 : o.call(t, !0);
     }
-    return _({
-      submit: () => v(),
-      reset: () => I(),
-      setSearchFormValues: Z,
-      getSearchFormValues: ee,
-      dataSource: s(() => l(h).records)
-    }), (e, t) => (i(), m("div", {
-      class: F(X.value)
-    }, [l(x)(e.dataSource) && e.searchForm !== !1 && P.value.length > 0 ? (i(), m("div", {
+    return A({
+      submit: () => L(),
+      reset: () => E(),
+      setSearchFormValues: te,
+      getSearchFormValues: re,
+      dataSource: s(() => r(g).records),
+      rowSelection: {
+        selectedRows: s(() => r(k)),
+        ...h
+      }
+    }), (e, t) => (c(), y("div", {
+      class: F(ae.value)
+    }, [r(u)(e.dataSource) && e.searchForm !== !1 && P.value.length > 0 ? (c(), y("div", {
       key: 0,
-      class: F(e.card ? l(g)("search-wrapper") : null),
-      style: R(e.searchFormWrapperStyle)
-    }, [d(l(ge).SearchForm, f(e.searchForm || {}, {
+      class: F(e.card ? r(b)("search-wrapper") : null),
+      style: T(e.searchFormWrapperStyle)
+    }, [d(r(he).SearchForm, p(e.searchForm || {}, {
       ref_key: "formRef",
-      ref: b,
+      ref: w,
       "custom-reset": "",
-      onSubmit: l(v),
-      onReset: l(I),
-      "submit-loading": l(c).loading
-    }), L({
-      default: p(() => [(i(!0), m(le, null, E(P.value, (a) => (i(), ne(se(a.customRenderFormItem ? a.customRenderFormItem(a) : l(be)[a.valueType || "text"]), f({
-        key: a.dataIndex,
+      onSubmit: r(L),
+      onReset: r(E),
+      "submit-loading": r(m).loading
+    }), V({
+      default: f(() => [(c(!0), y(ue, null, z(P.value, (o) => (c(), ie(pe(o.customRenderFormItem ? o.customRenderFormItem(o) : r(Ce)[o.valueType || "text"]), p({
+        key: o.dataIndex,
         ref_for: !0
-      }, a.fieldProps || {}, {
-        span: a.span
+      }, o.fieldProps || {}, {
+        span: o.span
       }), null, 16, ["span"]))), 128))]),
       _: 2
     }, [B.searchFormExtra ? {
       name: "extra",
-      fn: p(() => [w(e.$slots, "searchFormExtra")]),
+      fn: f(() => [x(e.$slots, "searchFormExtra")]),
       key: "0"
-    } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : O("", !0), V("div", {
+    } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : D("", !0), K("div", {
       ref_key: "contentRef",
-      ref: H,
-      class: F([l(g)("table-wrapper"), e.card ? l(g)("table-wrapper-card") : null]),
-      style: R(e.tableWrapperStyle)
-    }, [w(e.$slots, "title"), d(l(ce), f({
-      class: l(M) === "admin" ? l(u)("table-admin") : l(u)("table")
-    }, J.value, {
-      "table-layout": U.value,
-      onChange: l(G),
-      columns: y.value
-    }), L({
-      headerCell: p(({
-        column: a,
-        title: r
-      }) => [a.tooltip ? (i(), m("span", Ee, [V("span", null, de(r), 1), d(l(fe), {
-        title: a.tooltip,
+      ref: G,
+      class: F([r(b)("table-wrapper"), e.card ? r(b)("table-wrapper-card") : null]),
+      style: T(e.tableWrapperStyle)
+    }, [x(e.$slots, "title", p({
+      selectedRows: r(k)
+    }, h)), d(r(ye), p({
+      class: r(H) === "admin" ? r(i)("table-admin") : r(i)("table")
+    }, ee.value, {
+      "table-layout": Z.value,
+      onChange: r(X),
+      columns: S.value
+    }), V({
+      headerCell: f(({
+        column: o,
+        title: l
+      }) => [o.tooltip ? (c(), y("span", Ke, [K("span", null, ce(l), 1), d(r(be), {
+        title: o.tooltip,
         placement: "bottom"
       }, {
-        default: p(() => [d(l(Se), {
-          style: R({
+        default: f(() => [d(r(Te), {
+          style: T({
             paddingLeft: "4px",
-            color: l(j).colorPrimary
+            color: r(M).colorPrimary
           })
         }, null, 8, ["style"])]),
         _: 2
-      }, 1032, ["title"])])) : O("", !0)]),
+      }, 1032, ["title"])])) : D("", !0)]),
       _: 2
-    }, [E(l(N)(B, ["title", "searchFormExtra"]), (a, r) => ({
-      name: r,
-      fn: p((n) => [w(e.$slots, r, ue(ie(n || {})))])
+    }, [z(r(W)(B, ["title", "searchFormExtra"]), (o, l) => ({
+      name: l,
+      fn: f((n) => [x(e.$slots, l, fe(me(n || {})))])
     }))]), 1040, ["class", "table-layout", "onChange", "columns"])], 6)], 2));
   }
 });
 export {
-  Ue as default
+  aa as default
 };

package/es/src/ap-table/hooks/use-table-paging.d.ts

@@ -79,4 +79,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
         onChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
         dataSource: DataType[];
     }>;
+    dataSource: ComputedRef<DataType[]>;
 };

package/es/src/ap-table/hooks/use-table-paging.mjs

@@ -1,4 +1,4 @@
-import { ref as v, nextTick as N, unref as r, onMounted as U, computed as $ } from "vue";
+import { ref as v, nextTick as N, unref as o, onMounted as U, computed as S } from "vue";
 import { parseFieldValue as W, dataIndexToStr as X } from "../utils.mjs";
 import { isArray as Y } from "lodash-unified";
 import "../../config-provider/index.mjs";
@@ -6,23 +6,23 @@ import { useLocale as Z } from "../../config-provider/hooks/use-locale.mjs";
 const oe = ({
   manual: j = !1,
   defaultCurrent: y = 1,
-  defaultPageSize: S = 10,
+  defaultPageSize: T = 10,
   request: D,
   defaultParams: R = {},
   defaultData: A = [],
-  formatParams: T,
-  paramsValueTypeMap: z,
-  resetFieldsIgnores: P,
+  formatParams: z,
+  paramsValueTypeMap: P,
+  resetFieldsIgnores: V,
   filterFields: B = [],
   sortFields: E = []
 }) => {
   let F = 0, f = {};
-  const L = (e) => T ? T(e) : e, l = v(), i = v(y), g = v(S), { t: V } = Z(), n = v({
+  const L = (e) => z ? z(e) : e, l = v(), i = v(y), g = v(T), { t: b } = Z(), n = v({
     total: 0,
     records: A,
     loading: !1
-  }), b = async (e) => {
-    var o;
+  }), w = async (e) => {
+    var r;
     const a = L(e), t = Date.now();
     F = t, n.value.loading = !0;
     try {
@@ -30,57 +30,57 @@ const oe = ({
         ...R,
         ...a
       });
-      F === t && (n.value.total = s.total || ((o = s.data) == null ? void 0 : o.length) || 0, n.value.records = [...s.data || []]);
+      F === t && (n.value.total = s.total || ((r = s.data) == null ? void 0 : r.length) || 0, n.value.records = [...s.data || []]);
     } catch {
       F === t && (n.value.records = [], n.value.total = 0);
     } finally {
       n.value.loading = !1;
     }
-  }, w = (e) => {
+  }, C = (e) => {
     const a = {};
-    return Object.entries(e).forEach(([t, o]) => {
-      if (a[t] = o, z && o) {
-        const s = z[t];
-        s && (a[t] = W(s, o));
+    return Object.entries(e).forEach(([t, r]) => {
+      if (a[t] = r, P && r) {
+        const s = P[t];
+        s && (a[t] = W(s, r));
       }
     }), a;
   }, M = (e) => {
-    var o, s, d, p, m, u, c;
-    const a = ((s = (o = l.value) == null ? void 0 : o.apForm) == null ? void 0 : s.getFieldsValue()) || {}, t = {};
-    Object.entries(a).forEach(([O, K]) => {
-      P && P.indexOf(O) > -1 && (t[O] = K);
+    var r, s, d, p, m, u, c;
+    const a = ((s = (r = l.value) == null ? void 0 : r.apForm) == null ? void 0 : s.getFieldsValue()) || {}, t = {};
+    Object.entries(a).forEach(([$, K]) => {
+      V && V.indexOf($) > -1 && (t[$] = K);
     }), (p = (d = l.value) == null ? void 0 : d.apForm) == null || p.resetFields(), (c = (u = (m = l.value) == null ? void 0 : m.apForm) == null ? void 0 : u.setFieldsValue) == null || c.call(u, t), N(() => {
       e == null || e();
     });
   }, h = (e) => {
     f = e;
-    const a = w(e);
-    b(a);
+    const a = C(e);
+    w(a);
   }, q = (e) => {
     h({
       ...f,
       ...e
     });
-  }, C = () => {
+  }, x = () => {
     var a, t;
     const e = ((t = (a = l.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
     i.value = 1, h({
       ...e,
       current: 1,
-      pageSize: f.pageSize || S
+      pageSize: f.pageSize || T
     });
   }, J = () => {
-    M(C);
+    M(x);
   }, Q = () => {
     h(f);
   }, G = (e) => {
-    const a = r(n).total - e, t = Math.ceil(a / r(g)), o = r(i) > t ? t : r(i);
+    const a = o(n).total - e, t = Math.ceil(a / o(g)), r = o(i) > t ? t : o(i);
     q({
-      current: o > 0 ? o : 1
+      current: r > 0 ? r : 1
     });
-  }, x = (e, a, t) => {
+  }, O = (e, a, t) => {
     var m, u;
-    const o = ((u = (m = l.value) == null ? void 0 : m.apForm) == null ? void 0 : u.getFieldsValue(!0)) || {};
+    const r = ((u = (m = l.value) == null ? void 0 : m.apForm) == null ? void 0 : u.getFieldsValue(!0)) || {};
     i.value = e.current, g.value = e.pageSize;
     const s = Y(t) ? [...t] : [t], d = {};
     for (const c of s)
@@ -89,7 +89,7 @@ const oe = ({
     for (const c of Object.keys(a))
       B.includes(c) && (p[c] = a[c]);
     h({
-      ...o,
+      ...r,
       filter: p,
       sort: d,
       current: e.current,
@@ -100,43 +100,44 @@ const oe = ({
     var a, t;
     const e = ((t = (a = l.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
     if (f = {
-      current: r(i),
-      pageSize: r(g),
+      current: o(i),
+      pageSize: o(g),
       ...e
     }, !j) {
-      const o = w(f);
-      b(o);
+      const r = C(f);
+      w(r);
     }
   });
-  const H = $(() => r(n).total === 0 ? "-" : `${r(i.value)}/${Math.ceil(
-    r(n).total / r(g)
-  )}`), I = $(() => ({
-    loading: r(n).loading,
+  const H = S(() => o(n).total === 0 ? "-" : `${o(i.value)}/${Math.ceil(
+    o(n).total / o(g)
+  )}`), I = S(() => ({
+    loading: o(n).loading,
     pagination: {
-      current: r(i),
-      pageSize: r(g),
-      total: r(n).total,
+      current: o(i),
+      pageSize: o(g),
+      total: o(n).total,
       showSizeChanger: !0,
       showQuickJumper: !0,
-      showTotal: (e) => `${V("ap.apTable.pagination.totalLeft", { total: e })} ${V(
+      showTotal: (e) => `${b("ap.apTable.pagination.totalLeft", { total: e })} ${b(
         "ap.apTable.pagination.totalRight",
-        { page: r(H) }
+        { page: o(H) }
       )}`
     },
-    onChange: x,
-    dataSource: r(n).records
+    onChange: O,
+    dataSource: o(n).records
   }));
   return {
     formRef: l,
-    submit: C,
+    submit: x,
     reset: J,
     refresh: Q,
     refreshByDelete: G,
     data: n,
     current: i,
     pageSize: g,
-    handleTableChange: x,
-    tableProps: I
+    handleTableChange: O,
+    tableProps: I,
+    dataSource: S(() => o(n).records)
   };
 };
 export {