@aplus-frontend/ui 7.9.1 → 7.10.1

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

@@ -1,6 +1,6 @@
+import { ApFieldRead as e } from "../ap-field/index.mjs";
 import "../ap-action/index.mjs";
 import "../ap-form/index.mjs";
-import { ApFieldRead as e } from "../ap-field/index.mjs";
 import "./components/index/index.vue.mjs";
 import "./components/status/index.vue.mjs";
 import m from "../ap-form/items/tree-select/index.vue.mjs";

package/es/src/ap-table/context.d.ts

@@ -1,8 +1,8 @@
 import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
-import { ApTableContextRenderConfig, ApTableProps } from './interface';
 import { Recordable } from '../type';
 import { ApFormSearchFormPopoverSorterItem } from '../ap-form';
+import { ApTableContextRenderConfig, ApTableProps } from './interface';
 type TableSize = ApTableProps['size'];
 type ApTableContextProps<RecordType> = {
     /**

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

@@ -1,5 +1,5 @@
-import { ApColumnType } from '../interface';
 import { Recordable } from '../../type';
+import { ApColumnType } from '../interface';
 import { Ref } from 'vue';
 export declare const useTableSortedAndFiltered: () => {
     getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;

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

@@ -1,5 +1,5 @@
-import { ScrollBarExpose } from '../../scroll-bar';
 import { Ref, ComputedRef } from 'vue';
+import { ScrollBarExpose } from '../../scroll-bar';
 export declare const useStickyScroll: (tableWrapper: Ref<HTMLElement | undefined>) => {
     isStickyMode: ComputedRef<boolean>;
     scrollBarRef: Ref<ScrollBarExpose | undefined, ScrollBarExpose | undefined>;

package/es/src/ap-table/hooks/use-table-column-state.mjs

@@ -1,10 +1,10 @@
-import { ref as D, shallowRef as G, unref as i, computed as W, watchEffect as X } from "vue";
-import "../../utils/index.mjs";
-import q, { customCloneColumnStates as v, getColumnStateString as H } from "../components/setting/utils.mjs";
-import { useInjectApTable as L } from "../context.mjs";
-import { isObject as T, mergeWith as A, isBoolean as P, omit as Q, isString as U, isNumber as b } from "lodash-unified";
+import { useToken as D } from "@aplus-frontend/antdv/es/theme/internal";
+import { isObject as v, mergeWith as A, isBoolean as G, omit as W, isString as X, isNumber as T } from "lodash-unified";
+import { ref as q, shallowRef as H, unref as i, computed as L, watchEffect as P } from "vue";
 import "../../config-provider/index.mjs";
-import { useToken as V } from "@aplus-frontend/antdv/es/theme/internal";
+import "../../utils/index.mjs";
+import Q, { customCloneColumnStates as b, getColumnStateString as U } from "../components/setting/utils.mjs";
+import { useInjectApTable as V } from "../context.mjs";
 import { getTableTitle as Y } from "../utils.mjs";
 import { useNamespace as Z } from "../../config-provider/hooks/use-namespace.mjs";
 import { isDef as $ } from "../../utils/is.mjs";
@@ -20,17 +20,17 @@ function K(r, o) {
   return n ? JSON.parse(n) : {};
 }
 function N(r, o) {
-  if (T(r) && T(o))
+  if (v(r) && v(o))
     return A({}, r, o, N);
 }
 const y = Number.MAX_SAFE_INTEGER;
 function ee(r, o, n, a) {
-  return a ? a.fixed : o ? o.fixed : n && "fixed" in n ? n.fixed : P(r.fixed) ? r.fixed ? "left" : void 0 : r.fixed;
+  return a ? a.fixed : o ? o.fixed : n && "fixed" in n ? n.fixed : G(r.fixed) ? r.fixed ? "left" : void 0 : r.fixed;
 }
 const de = (r, o, n) => {
-  const { be: a } = Z("ap-table"), [te, B] = V(), l = D(n), d = G(
-    v(n)
-  ), { columnsBackup: m, updateColumns: E } = L(), F = r.persistenceType || "localStorage", h = window[F];
+  const { be: a } = Z("ap-table"), [te, B] = D(), l = q(n), d = H(
+    b(n)
+  ), { columnsBackup: m, updateColumns: E } = V(), F = r.persistenceType || "localStorage", h = window[F];
   function I() {
     const e = K(
       h,
@@ -45,7 +45,7 @@ const de = (r, o, n) => {
       return R.map((f) => {
         const k = j?.[f.key] || {}, g = {
           key: f.key,
-          label: U(f.title) ? Y(
+          label: X(f.title) ? Y(
             f,
             a("table-header", "title"),
             void 0,
@@ -59,7 +59,7 @@ const de = (r, o, n) => {
             z
           ),
           disabled: !1,
-          ...Q(k, ["children", "fixed"])
+          ...W(k, ["children", "fixed"])
         };
         return g.children = f.children?.length ? u(
           f.children,
@@ -71,11 +71,11 @@ const de = (r, o, n) => {
     return u(s || [], t);
   }
   function O(e, t) {
-    const s = b(e.order) ? e.order : y;
-    let u = b(t.order) ? t.order : y;
+    const s = T(e.order) ? e.order : y;
+    let u = T(t.order) ? t.order : y;
     return e.fixed === "right" && t.fixed !== "right" && (u = s - 1), t.fixed === "left" && e.fixed !== "left" && (u = s - 1), s - u;
   }
-  const p = W(() => i(l).every((e) => e.show));
+  const p = L(() => i(l).every((e) => e.show));
   function S() {
     const e = i(l);
     c(e, (t) => {
@@ -104,18 +104,18 @@ const de = (r, o, n) => {
   }
   function w(e) {
     if (i(o)) {
-      const t = H(e);
+      const t = U(e);
       h.setItem(i(o), JSON.stringify(t));
     }
   }
-  return X(() => {
+  return P(() => {
     const e = I();
     C(e), r.onChange?.(e), E?.(
-      q(
+      Q(
         i(m),
         i(e)
       )
-    ), d.value = v(e), w(e);
+    ), d.value = b(e), w(e);
   }), {
     columnState: l,
     selectAll: S,

package/es/src/ap-table/hooks/use-table-content-height.mjs

@@ -1,6 +1,6 @@
-import "../../config-provider/index.mjs";
 import { useElementSize as m } from "@vueuse/core";
 import { ref as u, computed as d, unref as i, onUpdated as H } from "vue";
+import "../../config-provider/index.mjs";
 import { useGlobalConfig as S } from "../../config-provider/hooks/use-global-config.mjs";
 function c(t) {
   if (!t)

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

@@ -1,8 +1,8 @@
 import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
 import { Ref, ComputedRef } from 'vue';
-import { ApTablePaginationConfig, RequestData } from '../interface';
-import { Recordable } from '../../type';
 import { ApFormSearchFormExpose } from '../../ap-form';
+import { Recordable } from '../../type';
+import { ApTablePaginationConfig, RequestData } from '../interface';
 import { TablePaginationConfig } from '@aplus-frontend/antdv';
 import { FilterValue, SorterResult, TableCurrentDataSource } from '@aplus-frontend/antdv/es/table/interface';
 import { ApColumnType } from '..';
@@ -64,6 +64,16 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      */
     onAfterRequest?: (records: DataType[]) => void;
 };
+export type TablePagingRequestOptions = {
+    /**
+     * 是否缓存数据（无限滚动下适用）
+     */
+    cache?: boolean;
+    /**
+     * 单次网络请求成功后触发
+     */
+    onSuccess?: (rawParams: Recordable, hasMore: boolean) => void;
+};
 export type InternalPagingType = Partial<{
     current: number;
     pageSize: number;
@@ -112,5 +122,6 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     };
     setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
     submitWith: (resetCurrent?: boolean) => void;
+    fetchNextPageAndCache: () => void;
 };
 export {};

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

@@ -1,146 +1,170 @@
-import { ref as le, reactive as q, unref as g, nextTick as ue, onMounted as fe, watch as ge, computed as x, createVNode as T } from "vue";
-import { useTableSortedAndFiltered as de } from "./use-sorted-filtered.mjs";
+import { ref as de, reactive as k, unref as g, nextTick as pe, onMounted as he, watch as me, computed as O, createVNode as C } from "vue";
+import { isArray as B, isEqualWith as Se, isUndefined as ze } from "lodash-unified";
 import "../../config-provider/index.mjs";
-import { parseFieldValue as pe, dataIndexToStr as me, isEqualCustom as he } from "../utils.mjs";
-import { isArray as N, isEqualWith as Se, isUndefined as ze } from "lodash-unified";
 import "../../utils/index.mjs";
-import { useLocale as Pe } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as Te } from "../../config-provider/hooks/use-namespace.mjs";
-import { isDef as k } from "../../utils/is.mjs";
-const d = 1, E = 20, B = {
+import { parseFieldValue as Pe, dataIndexToStr as Te, isEqualCustom as be } from "../utils.mjs";
+import { useTableSortedAndFiltered as Ce } from "./use-sorted-filtered.mjs";
+import { useLocale as xe } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as Fe } from "../../config-provider/hooks/use-namespace.mjs";
+import { isDef as J } from "../../utils/is.mjs";
+const d = 1, L = 20, K = {
   defaultCurrent: d,
-  defaultPageSize: E,
+  defaultPageSize: L,
   showLessItems: !1,
   showTotal: !0
 };
-function be(c) {
-  return c === !1 ? {} : c == null || c === !0 ? B : {
-    ...B,
-    ...c
+function we(i) {
+  return i === !1 ? {} : i == null || i === !0 ? K : {
+    ...K,
+    ...i
   };
 }
-function Ce(c) {
-  const u = {};
-  return c === !1 || (c === !0 || c == null ? (u.current = d, u.pageSize = E) : (u.current = c.defaultCurrent || d, u.pageSize = c.defaultPageSize || E)), u;
+function Ee(i) {
+  const f = {};
+  return i === !1 || (i === !0 || i == null ? (f.current = d, f.pageSize = L) : (f.current = i.defaultCurrent || d, f.pageSize = i.defaultPageSize || L)), f;
 }
-const ye = ({
-  manual: c = !1,
-  request: u,
-  params: v = {},
-  defaultData: D = [],
-  formatParams: O,
-  paramsValueTypeMap: A,
-  resetFieldsIgnores: L,
-  filterFields: J,
-  sortFields: K,
-  namespace: M = "ap-table",
+const Ne = ({
+  manual: i = !1,
+  request: f,
+  params: y = {},
+  defaultData: R = [],
+  formatParams: I,
+  paramsValueTypeMap: M,
+  resetFieldsIgnores: N,
+  filterFields: Q,
+  sortFields: W,
+  namespace: $ = "ap-table",
   pagination: p,
-  onClickReset: Q,
-  onAfterRequest: W
+  onClickReset: G,
+  onAfterRequest: Z
 }) => {
-  let b = 0, o = {};
-  const $ = be(p), G = (e) => O ? O(e) : e, m = le(), s = q(Ce(p)), {
-    getColumnSFConfig: Z,
-    setSF: H,
-    clearAll: X,
-    sortedInfo: y,
-    filteredInfo: R
-  } = de(), {
-    t: h
-  } = Pe(), {
+  let x = 0, s = {};
+  const H = we(p), X = (e) => I ? I(e) : e, h = de(), c = k(Ee(p)), {
+    getColumnSFConfig: Y,
+    setSF: ee,
+    clearAll: te,
+    sortedInfo: V,
+    filteredInfo: j
+  } = Ce(), {
+    t: m
+  } = xe(), {
     b: S
-  } = Te(M), a = q({
-    total: D.length,
-    records: D,
+  } = Fe($), a = k({
+    total: R.length,
+    records: R,
     loading: !1
-  }), z = () => m.value?.apForm?.getFieldsValueTransformed(!0) || {}, I = async (e) => {
-    const t = G(e), n = Date.now();
-    b = n, a.loading = !0;
+  }), z = () => h.value?.apForm?.getFieldsValueTransformed(!0) || {}, F = async (e, t) => {
+    const n = X(e), r = Date.now(), o = t?.cache;
+    x = r, a.loading = !0;
     try {
-      const r = await u({
-        ...g(v),
-        ...t
+      const u = await f({
+        ...g(y),
+        ...n
       });
-      b === n && (a.total = r.total || r.data?.length || 0, a.records = [...r.data || []], a.loading = !1);
+      if (x === r) {
+        a.total = u.total || u.data?.length || 0, o ? a.records.push(...u.data || []) : a.records = [...u.data || []];
+        const b = a.records.length < a.total;
+        t?.onSuccess?.(e, b), a.loading = !1;
+      }
     } catch {
-      b === n && (a.records = [], a.total = 0, a.loading = !1);
+      x === r && !o && (a.records = [], a.total = 0), a.loading = !1;
     } finally {
-      W?.(a.records);
+      Z?.(a.records);
     }
-  }, V = (e) => {
+  }, w = (e) => {
     const t = {};
     return Object.entries(e).forEach(([n, r]) => {
-      if (t[n] = r, A && r) {
-        const i = A[n];
-        i && (t[n] = pe(i, r));
+      if (t[n] = r, M && r) {
+        const o = M[n];
+        o && (t[n] = Pe(o, r));
       }
     }), t;
-  }, Y = async (e) => {
+  }, ne = async (e) => {
     const t = z(), n = {};
-    Object.entries(t).forEach(([r, i]) => {
-      L && L.indexOf(r) > -1 && (n[r] = i);
-    }), await m.value?.apForm?.resetFields(), m.value?.apForm?.setFieldsValue?.(n), ue(() => {
+    Object.entries(t).forEach(([r, o]) => {
+      N && N.indexOf(r) > -1 && (n[r] = o);
+    }), await h.value?.apForm?.resetFields(), h.value?.apForm?.setFieldsValue?.(n), pe(() => {
       e?.();
     });
   }, P = (e) => {
-    o = e;
-    const t = V(e);
-    I(t);
-  }, ee = (e) => {
+    s = e;
+    const t = w(e);
+    F(t);
+  }, re = (e) => {
     P({
-      ...o,
+      ...s,
       ...e
     });
-  }, C = () => {
-    j(!0);
-  }, j = (e = !1) => {
+  };
+  let T, E = !0;
+  function U() {
+    T = void 0, E = !0;
+  }
+  const ae = () => {
+    if (!E)
+      return;
+    const e = T ? T + 1 : 2, t = {
+      ...s,
+      current: e
+    };
+    s = t;
+    const n = w(t);
+    F(n, {
+      cache: !0,
+      onSuccess(r, o) {
+        T = r.current, E = o;
+      }
+    });
+  }, v = () => {
+    q(!0), U();
+  }, q = (e = !1) => {
     const t = z(), n = p !== !1;
-    n && e && (s.current = d), P({
+    n && e && (c.current = d), P({
       ...t,
-      filter: o.filter,
-      sort: o.sort,
-      current: n ? e ? d : o.current || s.current : void 0,
-      pageSize: n ? o.pageSize || s.pageSize : void 0
+      filter: s.filter,
+      sort: s.sort,
+      current: n ? e ? d : s.current || c.current : void 0,
+      pageSize: n ? s.pageSize || c.pageSize : void 0
     });
-  }, te = () => {
-    X(), o.sort = {}, o.filter = {}, Q?.(), Y(C);
-  }, w = () => {
-    P(o);
-  }, ne = (e) => {
+  }, oe = () => {
+    te(), s.sort = {}, s.filter = {}, G?.(), ne(v), U();
+  }, A = () => {
+    P(s);
+  }, se = (e) => {
     if (p === !1)
-      w();
+      A();
     else {
       const {
         current: t,
         pageSize: n
-      } = s, r = a.total - e, i = Math.ceil(r / n), f = t > i ? i : t;
-      ee({
-        current: f > 0 ? f : 1
+      } = c, r = a.total - e, o = Math.ceil(r / n), u = t > o ? o : t;
+      re({
+        current: u > 0 ? u : 1
       });
     }
-  }, F = (e, t, n) => {
+  }, D = (e, t, n) => {
     const r = z();
-    s.current = e.current, s.pageSize = e.pageSize, H(t, n);
-    const i = N(n) ? [...n] : [n], f = {};
-    for (const l of i)
-      g(K)?.includes(l.columnKey || l.field) && l.order && (f[me(l.columnKey || l.field)] = l.order);
-    const U = {};
+    c.current = e.current, c.pageSize = e.pageSize, ee(t, n);
+    const o = B(n) ? [...n] : [n], u = {};
+    for (const l of o)
+      g(W)?.includes(l.columnKey || l.field) && l.order && (u[Te(l.columnKey || l.field)] = l.order);
+    const b = {};
     for (const l of Object.keys(t))
-      g(J)?.includes(l) && t[l] && (U[l] = t[l]);
+      g(Q)?.includes(l) && t[l] && (b[l] = t[l]);
     const _ = {
       ...r,
-      filter: U,
-      sort: f,
+      filter: b,
+      sort: u,
       current: e.current,
       pageSize: e.pageSize
     };
-    Se(o, _, he) || P(_);
-  }, re = (e, t = R.value || {}, n = y.value || {}) => {
-    const r = e?.current ?? s.current, i = e?.pageSize ?? s.pageSize;
-    F(
+    Se(s, _, be) || P(_);
+  }, ce = (e, t = j.value || {}, n = V.value || {}) => {
+    const r = e?.current ?? c.current, o = e?.pageSize ?? c.pageSize;
+    D(
       {
         current: r,
-        pageSize: i
+        pageSize: o
       },
       t,
       n,
@@ -151,101 +175,102 @@ const ye = ({
       }
     );
   };
-  fe(() => {
+  he(() => {
     const e = z(), {
       current: t,
       pageSize: n
-    } = s;
-    if (o = {
+    } = c;
+    if (s = {
       current: t,
       pageSize: n,
       filter: {},
       sort: {},
       ...e
-    }, !c) {
-      const r = V(o);
-      I(r);
+    }, !i) {
+      const r = w(s);
+      F(r);
     }
-  }), ge(() => g(v), () => {
-    C();
+  }), me(() => g(y), () => {
+    v();
   }, {
     deep: !0
   });
-  const ae = x(() => {
+  const ie = O(() => {
     if (a.total === 0)
       return "-";
     const {
       current: e,
       pageSize: t
-    } = s;
+    } = c;
     return `${e}/${Math.ceil(a.total / t)}`;
   });
-  function oe(e) {
-    N(e) && (a.records = e, a.total = e.length);
+  function ue(e) {
+    B(e) && (a.records = e, a.total = e.length);
   }
-  const se = x(() => {
+  const le = O(() => {
     const {
       showLessItems: e,
       showTotal: t,
       showQuickJumper: n,
       showSizeChanger: r,
-      pageSizeOptions: i
-    } = $;
+      pageSizeOptions: o
+    } = H;
     return {
       loading: a.loading,
       pagination: {
-        current: s.current,
-        pageSize: s.pageSize,
+        current: c.current,
+        pageSize: c.pageSize,
         total: a.total,
-        showSizeChanger: k(r) ? r : !e,
-        showQuickJumper: k(n) ? n : !e,
+        showSizeChanger: J(r) ? r : !e,
+        showQuickJumper: J(n) ? n : !e,
         showLessItems: e,
         size: "default",
-        pageSizeOptions: ze(i) ? ["10", "20", "50", "100"] : i,
-        showTotal: t ? (f) => T("span", {
+        pageSizeOptions: ze(o) ? ["10", "20", "50", "100"] : o,
+        showTotal: t ? (u) => C("span", {
           class: S("pagination-total-wrapper")
-        }, [h("ap.apTable.pagination.totalLeftPrefix"), " ", T("span", {
+        }, [m("ap.apTable.pagination.totalLeftPrefix"), " ", C("span", {
           class: S("pagination-count-text")
-        }, [f]), " ", h("ap.apTable.pagination.totalLeftSuffix"), T("span", {
+        }, [u]), " ", m("ap.apTable.pagination.totalLeftSuffix"), C("span", {
           class: S("pagination--total-right")
-        }, [h("ap.apTable.pagination.totalRightPrefix"), " ", T("span", {
+        }, [m("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
           class: S("pagination-count-text")
-        }, [g(ae)]), " ", h("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [g(ie)]), " ", m("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
-      onChange: F,
+      onChange: D,
       dataSource: a.records
     };
   });
-  function ie(e, t = !0) {
-    Object.assign(s, e), o.current = e.current, o.pageSize = e.pageSize, t && w();
+  function fe(e, t = !0) {
+    Object.assign(c, e), s.current = e.current, s.pageSize = e.pageSize, t && A();
   }
-  function ce() {
+  function ge() {
     return {
-      ...s
+      ...c
     };
   }
   return {
-    formRef: m,
-    submit: C,
-    reset: te,
-    refresh: w,
-    refreshByDelete: ne,
+    formRef: h,
+    submit: v,
+    reset: oe,
+    refresh: A,
+    refreshByDelete: se,
     data: a,
-    handleTableChange: F,
-    handleTableChangeOptional: re,
-    tableProps: se,
-    dataSource: x(() => a.records),
-    setDataSource: oe,
-    getColumnSFConfig: Z,
-    sortedInfo: y,
-    filteredInfo: R,
-    getPaging: ce,
-    setPaging: ie,
-    submitWith: j
+    handleTableChange: D,
+    handleTableChangeOptional: ce,
+    tableProps: le,
+    dataSource: O(() => a.records),
+    setDataSource: ue,
+    getColumnSFConfig: Y,
+    sortedInfo: V,
+    filteredInfo: j,
+    getPaging: ge,
+    setPaging: fe,
+    submitWith: q,
+    fetchNextPageAndCache: ae
   };
 };
 export {
   d as DEFAULT_CURRENT,
-  E as DEFAULT_PAGE_SIZE,
-  ye as useTablePaging
+  L as DEFAULT_PAGE_SIZE,
+  Ne as useTablePaging
 };

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

@@ -1,7 +1,7 @@
+import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
 import { ComputedRef, Ref } from 'vue';
-import { RequestData } from '../interface';
 import { ApFormSearchFormExpose } from '../../ap-form';
-import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
+import { RequestData } from '../interface';
 import { TablePaginationConfig } from '@aplus-frontend/antdv';
 import { FilterValue, SorterResult, TableCurrentDataSource } from '@aplus-frontend/antdv/es/table/interface';
 import { ApColumnType } from '..';

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

@@ -1,7 +1,7 @@
 import { ref as v, nextTick as I, unref as a, onMounted as ee, computed as b, createVNode as S } from "vue";
-import { parseFieldValue as te, dataIndexToStr as ae, isEqualCustom as re } from "../utils.mjs";
-import { isArray as R, isEqualWith as oe } from "lodash-unified";
+import { isArray as R, isEqualWith as te } from "lodash-unified";
 import "../../config-provider/index.mjs";
+import { parseFieldValue as ae, dataIndexToStr as re, isEqualCustom as oe } from "../utils.mjs";
 import { useTableSortedAndFiltered as ne } from "./use-sorted-filtered.mjs";
 import { useLocale as se } from "../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as le } from "../../config-provider/hooks/use-namespace.mjs";
@@ -53,7 +53,7 @@ const me = ({
     return Object.entries(e).forEach(([r, n]) => {
       if (t[r] = n, z && n) {
         const i = z[r];
-        i && (t[r] = te(i, n));
+        i && (t[r] = ae(i, n));
       }
     }), t;
   }, W = async (e) => {
@@ -99,7 +99,7 @@ const me = ({
     u.value = e.current, d.value = e.pageSize, L(t, r);
     const i = R(r) ? [...r] : [r], p = {};
     for (const l of i)
-      a(_)?.includes(l.columnKey || l.field) && l.order && (p[ae(l.columnKey || l.field)] = l.order);
+      a(_)?.includes(l.columnKey || l.field) && l.order && (p[re(l.columnKey || l.field)] = l.order);
     const E = {};
     for (const l of Object.keys(t))
       a(N)?.includes(l) && t[l] && (E[l] = t[l]);
@@ -110,7 +110,7 @@ const me = ({
       current: e.current,
       pageSize: e.pageSize
     };
-    oe(s, O, re) || h(O);
+    te(s, O, oe) || h(O);
   };
   ee(() => {
     const e = c.value?.apForm?.getFieldsValueTransformed(!0) || {};

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

@@ -1,7 +1,7 @@
 import { TableRowSelection } from '@aplus-frontend/antdv/lib/table/interface';
 import { ComputedRef, Ref } from 'vue';
-import { ApTableProps, ApTableRowSelection } from '../interface';
 import { Recordable } from '../../type';
+import { ApTableProps, ApTableRowSelection } from '../interface';
 export interface RowSelectionReturnType<RecordType = any> {
     rowSelection: ComputedRef<TableRowSelection<RecordType>>;
     selectedRows: Ref<RecordType[]>;