@aplus-frontend/ui 0.5.4 → 0.5.5

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

@@ -1,26 +1,26 @@
-import { defineComponent as Ne, useSlots as Ie, ref as h, computed as s, unref as t, watch as I, createElementBlock as k, openBlock as f, normalizeStyle as K, normalizeClass as m, createCommentVNode as Y, createElementVNode as E, createVNode as y, mergeProps as w, createSlots as Z, withCtx as v, Fragment as ee, renderList as oe, createBlock as re, resolveDynamicComponent as Ke, renderSlot as R, normalizeProps as Ee, guardReactiveProps as Oe } from "vue";
-import { Divider as Ve, Table as Le } from "@aplus-frontend/antdv";
-import { useToken as $e } from "@aplus-frontend/antdv/es/theme/internal";
-import { ApForm as Ae } from "../ap-form/index.mjs";
-import { noRenderAsFormItemValueList as ae } from "./constants.mjs";
+import { defineComponent as Ee, useSlots as Oe, ref as h, computed as s, unref as l, watch as k, createElementBlock as B, openBlock as p, normalizeStyle as K, normalizeClass as m, createCommentVNode as Z, createElementVNode as E, createVNode as y, mergeProps as w, createSlots as ee, withCtx as v, Fragment as oe, renderList as re, createBlock as ae, resolveDynamicComponent as Ve, renderSlot as R, normalizeProps as Le, guardReactiveProps as $e } from "vue";
+import { Divider as Ae, Table as De } from "@aplus-frontend/antdv";
+import { useToken as We } from "@aplus-frontend/antdv/es/theme/internal";
+import { ApForm as je } from "../ap-form/index.mjs";
+import { noRenderAsFormItemValueList as te } from "./constants.mjs";
 import "../config-provider/index.mjs";
-import { useTablePaging as De } from "./hooks/use-table-paging-ng.mjs";
-import { isUndefined as b, omit as te, isBoolean as We } from "lodash-unified";
-import { getColumnOrder as le, updateFormProps as je, getFieldProps as _e, getSearchFormItemRenderNode as He, recursionApColumns as ne, falseToUndefined as Ue, getTableTitle as qe, getTableRenderType as Me, getTableRenderProps as Ge, getTableCellRenderNode as Je, apColumnToColumn as Qe } from "./utils.mjs";
-import Xe from "./hooks/use-table-content-height.mjs";
-import Ye from "./hooks/use-table-row-selection.mjs";
-import { getScrollbarSize as Ze, isDef as eo } from "../utils/index.mjs";
+import { useTablePaging as _e } from "./hooks/use-table-paging-ng.mjs";
+import { isUndefined as g, omit as le, isBoolean as He } from "lodash-unified";
+import { getColumnOrder as ne, updateFormProps as Ue, getFieldProps as qe, getSearchFormItemRenderNode as Me, recursionApColumns as se, falseToUndefined as Ge, getTableTitle as Je, getTableRenderType as Qe, getTableRenderProps as Xe, getTableCellRenderNode as Ye, apColumnToColumn as Ze } from "./utils.mjs";
+import eo from "./hooks/use-table-content-height.mjs";
+import oo from "./hooks/use-table-row-selection.mjs";
+import { getScrollbarSize as ro, isDef as ao } from "../utils/index.mjs";
 import "./components/setting/modal/index.vue.mjs";
 import "./components/paragraph-ellipsis/index.vue.mjs";
-import { useProvideApTable as oo } from "./context.mjs";
+import { useProvideApTable as to } from "./context.mjs";
 import "../scroll-bar/index.mjs";
-import { useStickyScroll as ro } from "./hooks/use-sticky-scroll.mjs";
-import { useNamespace as ao } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as to } from "../config-provider/hooks/use-global-config.mjs";
-import lo from "./components/setting/modal/index.vue2.mjs";
-import no from "../scroll-bar/index.vue.mjs";
-import so from "./components/paragraph-ellipsis/index.vue2.mjs";
-const No = /* @__PURE__ */ Ne({
+import { useStickyScroll as lo } from "./hooks/use-sticky-scroll.mjs";
+import { useNamespace as no } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as so } from "../config-provider/hooks/use-global-config.mjs";
+import uo from "./components/setting/modal/index.vue2.mjs";
+import io from "../scroll-bar/index.vue.mjs";
+import co from "./components/paragraph-ellipsis/index.vue2.mjs";
+const Eo = /* @__PURE__ */ Ee({
   name: "ApTable",
   __name: "ap-table",
   props: {
@@ -144,187 +144,200 @@ const No = /* @__PURE__ */ Ne({
       default: void 0
     }
   },
-  setup(se, {
-    expose: de
+  setup(de, {
+    expose: ue
   }) {
-    const o = se;
+    const o = de;
     let O = 0;
-    const C = Ie(), [, ue] = $e(), {
-      e: B,
+    const C = Oe(), [, ie] = We(), {
+      e: z,
       b: c,
       be: V,
-      m: ie,
-      cssVar: ce
-    } = ao("ap-table"), L = to("valueTypeMap"), {
+      m: ce,
+      cssVar: fe
+    } = no("ap-table"), L = so("valueTypeMap"), {
       height: pe,
-      contentRef: fe
-    } = Xe(), $ = h(), A = h(), {
+      contentRef: me
+    } = eo(), $ = h(), A = h(), {
       isStickyMode: D,
       scrollBarRef: i
-    } = ro($), z = h(o.size), u = h([]), W = h([]), j = Ze();
-    oo({
+    } = lo($), P = h(o.size), u = h([]), W = h([]), j = ro();
+    to({
       columns: s(() => u.value),
       columnsBackup: s(() => W.value),
-      size: s(() => z.value),
+      size: s(() => P.value),
       updateColumns(e) {
         u.value = e;
       },
       updateSize(e) {
-        z.value = e;
+        P.value = e;
       },
-      dataSource: s(() => t(g).records)
+      dataSource: s(() => l(b).records)
     });
     const _ = s(() => {
       var e, a, r;
-      return O++, ((r = (a = (e = o.columns) == null ? void 0 : e.filter((l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !ae.includes(l.valueType))) == null ? void 0 : a.sort((l, d) => {
-        let n = le(l.order);
-        return le(d.order) - n;
-      })) == null ? void 0 : r.map((l) => {
-        const d = je(l, _e(l.fieldProps, {})), n = {
-          ...l,
+      return O++, ((r = (a = (e = o.columns) == null ? void 0 : e.filter((t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !te.includes(t.valueType))) == null ? void 0 : a.sort((t, d) => {
+        let n = ne(t.order);
+        return ne(d.order) - n;
+      })) == null ? void 0 : r.map((t) => {
+        const d = Ue(t, qe(t.fieldProps, {})), n = {
+          ...t,
           fieldProps: {
-            label: l.title,
-            name: l.dataIndex,
+            label: t.title,
+            name: t.dataIndex,
             ...d || {},
             _signal: O
           },
           renderNode: void 0
         };
-        return n.renderNode = He(n, t(L)), n;
+        return n.renderNode = Me(n, l(L)), n;
       })) || [];
-    }), me = s(() => ne(t(u), (e) => {
+    }), ye = s(() => se(l(u), (e) => {
       if (e.sorter === !0)
-        return e.key || e.dataIndex;
-    }).filter(Boolean)), ye = s(() => ne(t(u), (e) => {
+        return e.key || (e == null ? void 0 : e.dataIndex);
+    }).filter(Boolean)), ge = s(() => se(l(u), (e) => {
       if (e.filters && !e.onFilter)
-        return e.key || e.dataIndex;
-    }).filter(Boolean)), be = s(() => b(o.dataSource) ? g.records : o.dataSource), {
+        return e.key || (e == null ? void 0 : e.dataIndex);
+    }).filter(Boolean)), be = s(() => g(o.dataSource) ? b.records : o.dataSource), {
       rowSelection: T,
       selectedRows: F,
       ...x
-    } = Ye({
+    } = oo({
       fixed: !0,
       ...o.rowSelection === !0 ? {} : o.rowSelection,
       rowKey: o.rowKey,
       dataSource: be
     }), {
-      formRef: P,
+      formRef: I,
       submit: H,
       reset: U,
       tableProps: q,
-      refresh: ge,
-      data: g,
-      setDataSource: Se,
-      getColumnSFConfig: he
-    } = De({
+      refresh: Se,
+      data: b,
+      setDataSource: he,
+      getColumnSFConfig: M,
+      sortedInfo: we,
+      filteredInfo: ve
+    } = _e({
       async request(e) {
-        var r, l;
-        if (!T.value.preserveSelectedRowKeys && b(o.dataSource) && x.clearAll(), !b(o.dataSource))
+        var r, t;
+        if (!T.value.preserveSelectedRowKeys && g(o.dataSource) && x.clearAll(), !g(o.dataSource))
           return {
             data: o.dataSource || [],
             total: o.dataSource.length || 0
           };
         const a = await ((r = o.request) == null ? void 0 : r.call(o, e));
-        return (l = o.onLoad) == null || l.call(o, (a == null ? void 0 : a.data) || []), {
+        return (t = o.onLoad) == null || t.call(o, (a == null ? void 0 : a.data) || []), {
           data: (a == null ? void 0 : a.data) || [],
           total: (a == null ? void 0 : a.total) || 0
         };
       },
-      filterFields: ye,
-      sortFields: me,
+      filterFields: ge,
+      sortFields: ye,
       defaultParams: o.params,
       defaultData: o.defaultData,
       manual: o.manual,
       formatParams: o.beforeSearchSubmit,
       pagination: o.pagination
-    }), we = () => {
+    }), Re = () => {
       var r;
-      let e = ((r = o.columns) == null ? void 0 : r.filter((l) => !l.hideInTable)) || [];
-      function a(l, d) {
-        return l.map((n) => ({
-          resizable: eo(n.resizable) ? n.resizable : o.columnResizable,
-          ...te(Qe(n), ["ellipsis"]),
+      let e = ((r = o.columns) == null ? void 0 : r.filter((t) => !t.hideInTable)) || [];
+      function a(t, d) {
+        return t.map((n) => ({
+          resizable: ao(n.resizable) ? n.resizable : o.columnResizable,
+          ...le(Ze(n), ["ellipsis"]),
           // tips: 此函数内部依赖查询&筛选的相应式值
-          ...he(n),
+          ...M(n),
           fixed: d ? d.fixed : n.fixed,
-          title: qe(n, V("table-header", "title"), C.headerCell, t(ue).colorPrimary),
+          title: Je(n, V("table-header", "title"), C.headerCell, l(ie).colorPrimary),
           customRender({
-            value: p,
+            value: f,
             ...S
           }) {
-            var Q, X;
-            const G = Me(n), Be = Ge({
+            var X, Y;
+            const J = Qe(n), Ie = Xe({
               ...n,
-              valueType: G
+              valueType: J
             }, {
-              value: p,
+              value: f,
               ...S
-            }), ze = Je(G, Be, S.record, t(L)), J = ((Q = n.renderText) == null ? void 0 : Q.call(n, {
-              value: p,
+            }), Ne = Ye(J, Ie, S.record, l(L)), Q = ((X = n.renderText) == null ? void 0 : X.call(n, {
+              value: f,
               ...S
-            })) || p, Pe = n.renderText ? y(ee, null, [(X = n.renderText) == null ? void 0 : X.call(n, {
-              value: p,
+            })) || f, Ke = n.renderText ? y(oe, null, [(Y = n.renderText) == null ? void 0 : Y.call(n, {
+              value: f,
               ...S
-            })]) : ze;
-            let N = Te(n, J, Pe);
+            })]) : Ne;
+            let N = ke(n, Q, Ke);
             return n.customRender && (N = n.customRender({
-              value: p,
+              value: f,
               ...S,
               column: n,
               originalNode: N,
-              originalText: J
+              originalText: Q
             })), N;
           },
           children: a(n.children || [], d || n)
         }));
       }
       return a(e);
+    }, Ce = () => {
+      function e(a) {
+        var r;
+        for (const t of a)
+          (r = t.children) != null && r.length ? e(t.children) : M(t, !0);
+      }
+      e(u.value);
     };
-    I(() => [o.columnResizable, o.columns], () => {
-      const e = we();
+    k(() => [o.columns, o.columnResizable], () => {
+      const e = Re();
       u.value = e, W.value = e;
     }, {
       deep: !0,
       immediate: !0
+    }), k(() => [we.value, ve.value], () => {
+      Ce();
+    }, {
+      deep: !0
     });
-    const ve = s(() => {
+    const Te = s(() => {
       var a, r;
-      if (o.adaptive && (g.total > 0 || ((a = o.dataSource) == null ? void 0 : a.length)))
+      if (o.adaptive && (b.total > 0 || ((a = o.dataSource) == null ? void 0 : a.length)))
         return {
-          y: t(pe),
+          y: l(pe),
           x: ((r = o.scroll) == null ? void 0 : r.x) || "100%"
         };
       if (o.scroll)
         return o.scroll;
-    }), Re = s(() => {
+    }), Fe = s(() => {
       var e;
       if (o.tableLayout)
         return o.tableLayout;
       if ((e = o.columns) != null && e.some((a) => a.ellipsis))
         return "fixed";
-    }), M = s(() => {
+    }), G = s(() => {
       var r;
-      const e = t(q), a = t(T);
+      const e = l(q), a = l(T);
       return {
         ...o,
         ...e,
         rowSelection: o.rowSelection === !0 || ((r = o.rowSelection) == null ? void 0 : r.mode) === "internal" ? {
           ...a,
           // tips 如果是前端分页，则默认会走缓存
-          preserveSelectedRowKeys: b(o.dataSource) ? a.preserveSelectedRowKeys : !0
-        } : Ue(o.rowSelection),
-        loading: b(o.loading) ? e.loading : o.loading,
+          preserveSelectedRowKeys: g(o.dataSource) ? a.preserveSelectedRowKeys : !0
+        } : Ge(o.rowSelection),
+        loading: g(o.loading) ? e.loading : o.loading,
         pagination: o.pagination === !1 ? !1 : e.pagination,
-        scroll: t(ve)
+        scroll: l(Te)
       };
-    }), Ce = s(() => {
+    }), xe = s(() => {
       var e;
-      return [c(), o.card ? null : c("wrapper"), o.adaptive ? c("adaptive") : null, D.value && ((e = i.value) != null && e.visible) ? ie(`sticky-${j === 0 ? "absolute" : "relative"}`) : null].filter(Boolean);
+      return [c(), o.card ? null : c("wrapper"), o.adaptive ? c("adaptive") : null, D.value && ((e = i.value) != null && e.visible) ? ce(`sticky-${j === 0 ? "absolute" : "relative"}`) : null].filter(Boolean);
     });
-    function Te(e, a, r) {
-      return ae.includes(e.valueType) ? r : e.copyable || e.ellipsis ? y(so, {
+    function ke(e, a, r) {
+      return te.includes(e.valueType) ? r : e.copyable || e.ellipsis ? y(co, {
         copyable: e.copyable,
-        ellipsis: e.ellipsis ? We(e.ellipsis) ? {
+        ellipsis: e.ellipsis ? He(e.ellipsis) ? {
           tooltip: r,
           rows: 1
         } : {
@@ -334,36 +347,36 @@ const No = /* @__PURE__ */ Ne({
         content: r
       }, null) : r;
     }
-    I(() => t(g).loading, (e) => {
+    k(() => l(b).loading, (e) => {
       var a;
       (a = o.onLoadingChange) == null || a.call(o, e);
-    }), I(() => o.dataSource, (e) => {
-      Se(e);
+    }), k(() => o.dataSource, (e) => {
+      he(e);
     }, {
       immediate: !0
     });
-    function Fe(e) {
-      var a, r, l;
-      (l = (r = (a = P.value) == null ? void 0 : a.apForm) == null ? void 0 : r.setFieldsValue) == null || l.call(r, e);
+    function Be(e) {
+      var a, r, t;
+      (t = (r = (a = I.value) == null ? void 0 : a.apForm) == null ? void 0 : r.setFieldsValue) == null || t.call(r, e);
     }
-    function xe(e = !1) {
-      var r, l, d;
+    function ze(e = !1) {
+      var r, t, d;
       const a = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (d = (l = (r = P.value) == null ? void 0 : r.apForm) == null ? void 0 : l[a]) == null ? void 0 : d.call(l, !0);
+      return (d = (t = (r = I.value) == null ? void 0 : r.apForm) == null ? void 0 : t[a]) == null ? void 0 : d.call(t, !0);
     }
-    function ke() {
-      return t(u);
+    function Pe() {
+      return l(u);
     }
-    return de({
+    return ue({
       submit: () => H(),
       reset: () => U(),
-      refresh: () => ge(),
-      setSearchFormValues: Fe,
-      getSearchFormValues: xe,
-      getShownColumns: ke,
-      dataSource: s(() => t(g).records),
+      refresh: () => Se(),
+      setSearchFormValues: Be,
+      getSearchFormValues: ze,
+      getShownColumns: Pe,
+      dataSource: s(() => l(b).records),
       rowSelection: {
-        selectedRows: s(() => t(F)),
+        selectedRows: s(() => l(F)),
         ...x
       },
       scrollBar: {
@@ -379,26 +392,26 @@ const No = /* @__PURE__ */ Ne({
         },
         y: void 0
       }
-    }), (e, a) => (f(), k("div", {
+    }), (e, a) => (p(), B("div", {
       ref_key: "tableWrapperRef",
       ref: $,
-      class: m(Ce.value),
-      style: K(t(ce)({
-        "scroll-bar-width": `${t(j)}px`
+      class: m(xe.value),
+      style: K(l(fe)({
+        "scroll-bar-width": `${l(j)}px`
       }))
-    }, [t(b)(e.dataSource) && e.searchForm !== !1 && _.value.length > 0 ? (f(), k("div", {
+    }, [l(g)(e.dataSource) && e.searchForm !== !1 && _.value.length > 0 ? (p(), B("div", {
       key: 0,
-      class: m(e.card ? t(B)("search-wrapper") : null),
+      class: m(e.card ? l(z)("search-wrapper") : null),
       style: K(e.searchFormWrapperStyle)
-    }, [y(t(Ae).SearchForm, w(e.searchForm || {}, {
+    }, [y(l(je).SearchForm, w(e.searchForm || {}, {
       ref_key: "formRef",
-      ref: P,
+      ref: I,
       "custom-reset": "",
-      "submit-loading": t(q).loading,
-      onSubmit: t(H),
-      onReset: t(U)
-    }), Z({
-      default: v(() => [(f(!0), k(ee, null, oe(_.value, (r) => (f(), re(Ke(r.renderNode.Comp), w({
+      "submit-loading": l(q).loading,
+      onSubmit: l(H),
+      onReset: l(U)
+    }), ee({
+      default: v(() => [(p(!0), B(oe, null, re(_.value, (r) => (p(), ae(Ve(r.renderNode.Comp), w({
         key: r.dataIndex,
         item: r,
         ref_for: !0
@@ -411,66 +424,66 @@ const No = /* @__PURE__ */ Ne({
       name: "extra",
       fn: v(() => [R(e.$slots, "searchFormExtra")]),
       key: "0"
-    } : void 0]), 1040, ["submit-loading", "onSubmit", "onReset"])], 6)) : Y("", !0), E("div", {
+    } : void 0]), 1040, ["submit-loading", "onSubmit", "onReset"])], 6)) : Z("", !0), E("div", {
       ref_key: "contentRef",
-      ref: fe,
-      class: m([t(B)("table-wrapper"), e.card ? t(B)("table-wrapper-card") : null]),
+      ref: me,
+      class: m([l(z)("table-wrapper"), e.card ? l(z)("table-wrapper-card") : null]),
       style: K(e.tableWrapperStyle)
     }, [E("div", {
-      class: m(t(c)("header-wrapper"))
-    }, [e.settings ? (f(), k("div", {
+      class: m(l(c)("header-wrapper"))
+    }, [e.settings ? (p(), B("div", {
       key: 0,
-      class: m(t(c)("header"))
+      class: m(l(c)("header"))
     }, [E("div", {
-      class: m(t(V)("header", "title"))
+      class: m(l(V)("header", "title"))
     }, [R(e.$slots, "title", w({
-      selectedRows: t(F),
-      selectedRowKeys: t(T).selectedRowKeys,
+      selectedRows: l(F),
+      selectedRowKeys: l(T).selectedRowKeys,
       shownColumns: u.value
-    }, x))], 2), C.title ? (f(), re(t(Ve), {
+    }, x))], 2), C.title ? (p(), ae(l(Ae), {
       key: 0,
       type: "vertical"
-    })) : Y("", !0), y(lo, {
+    })) : Z("", !0), y(uo, {
       config: e.settings === !0 ? {} : e.settings
     }, null, 8, ["config"])], 2)) : R(e.$slots, "title", w({
       key: 1,
-      selectedRows: t(F),
-      selectedRowKeys: t(T).selectedRowKeys,
+      selectedRows: l(F),
+      selectedRowKeys: l(T).selectedRowKeys,
       shownColumns: u.value
-    }, x))], 2), y(t(Le), w({
+    }, x))], 2), y(l(De), w({
       ref_key: "antdTableRef",
       ref: A,
-      class: t(c)("table")
-    }, M.value, {
-      size: z.value,
-      "table-layout": Re.value,
+      class: l(c)("table")
+    }, G.value, {
+      size: P.value,
+      "table-layout": Fe.value,
       columns: u.value,
-      onResizeColumn: a[0] || (a[0] = (r, l) => l.width = r)
-    }), Z({
+      onResizeColumn: a[0] || (a[0] = (r, t) => t.width = r)
+    }), ee({
       summary: v(() => [R(e.$slots, "summary", {
         columns: u.value,
-        records: M.value.dataSource,
-        selectedRows: t(F)
+        records: G.value.dataSource,
+        selectedRows: l(F)
       })]),
       _: 2
-    }, [t(D) ? {
+    }, [l(D) ? {
       name: "bottomPaginationTop",
       fn: v(() => {
-        var r, l;
-        return [y(t(no), {
+        var r, t;
+        return [y(l(io), {
           ref_key: "scrollBarRef",
           ref: i,
-          "scroll-container": (l = (r = A.value) == null ? void 0 : r.table) == null ? void 0 : l.scrollBodyRef,
+          "scroll-container": (t = (r = A.value) == null ? void 0 : r.table) == null ? void 0 : t.scrollBodyRef,
           direction: "horizontal"
         }, null, 8, ["scroll-container"])];
       }),
       key: "0"
-    } : void 0, oe(t(te)(C, ["title", "searchFormExtra", "headerCell", "summary"]), (r, l) => ({
-      name: l,
-      fn: v((d) => [R(e.$slots, l, Ee(Oe(d || {})))])
+    } : void 0, re(l(le)(C, ["title", "searchFormExtra", "headerCell", "summary"]), (r, t) => ({
+      name: t,
+      fn: v((d) => [R(e.$slots, t, Le($e(d || {})))])
     }))]), 1040, ["class", "size", "table-layout", "columns"])], 6)], 6));
   }
 });
 export {
-  No as default
+  Eo as default
 };

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

@@ -1,4 +1,4 @@
-import { ColumnType } from '@aplus-frontend/antdv/es/table';
+import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
 import { ApTableContextRenderConfig, ApTableProps } from './interface';
 type TableSize = ApTableProps['size'];
@@ -6,11 +6,11 @@ type ApTableContextProps<RecordType> = {
     /**
      * 表格列配置
      */
-    columns?: ComputedRef<ColumnType<RecordType>[]>;
+    columns?: ComputedRef<ColumnsType<RecordType>>;
     /**
      * 表格列配置备份（只有在props变更后才会变更）
      */
-    columnsBackup?: ComputedRef<ColumnType<RecordType>[]>;
+    columnsBackup?: ComputedRef<ColumnsType<RecordType>>;
     /**
      * 更新数据源的方法
      * @param name
@@ -18,7 +18,7 @@ type ApTableContextProps<RecordType> = {
      * @param triggerChange 是否触发外部的`onValuesChange`函数
      * @returns
      */
-    updateColumns?: (nextColumns: ColumnType<RecordType>[]) => void;
+    updateColumns?: (nextColumns: ColumnsType<RecordType>) => void;
     /**
      * ApForm内部实例
      */

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

@@ -1,9 +1,12 @@
 import { ApColumnType } from '../interface';
 import { Recordable } from '../../type';
+import { Ref } from 'vue';
 export declare const useTableSortedAndFiltered: () => {
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
     setSF: (filters: any, sorter: any) => void;
     clearSorter: () => void;
     clearFilters: () => void;
     clearAll: () => void;
+    sortedInfo: Ref<any, any>;
+    filteredInfo: Ref<any, any>;
 };

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

@@ -1,11 +1,11 @@
 import { ref as i, unref as s } from "vue";
-const F = () => {
+const S = () => {
   const r = i(), t = i();
-  function c(e) {
-    const n = s(t) || {}, u = s(r) || {}, l = {};
-    return e.filters && (l.filteredValue = n[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
+  function c(e, n = !1) {
+    const v = s(t) || {}, u = s(r) || {}, l = n ? e : {};
+    return e.filters && (l.filteredValue = v[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
   }
-  function d(e, n) {
+  function a(e, n) {
     t.value = e, r.value = n;
   }
   function o() {
@@ -14,17 +14,19 @@ const F = () => {
   function f() {
     t.value = null;
   }
-  function a() {
+  function d() {
     o(), f();
   }
   return {
     getColumnSFConfig: c,
-    setSF: d,
+    setSF: a,
     clearSorter: o,
     clearFilters: f,
-    clearAll: a
+    clearAll: d,
+    sortedInfo: r,
+    filteredInfo: t
   };
 };
 export {
-  F as useTableSortedAndFiltered
+  S as useTableSortedAndFiltered
 };

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

@@ -88,6 +88,8 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
+    sortedInfo: Ref<any, any>;
+    filteredInfo: Ref<any, any>;
 };
 export {};

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

@@ -1,23 +1,23 @@
-import { ref as te, reactive as I, unref as h, nextTick as re, onMounted as oe, watch as ne, computed as A, createVNode as C } from "vue";
-import { useTableSortedAndFiltered as ae } from "./use-sorted-filtered.mjs";
+import { ref as oe, reactive as q, unref as h, nextTick as ne, onMounted as ae, watch as se, computed as A, createVNode as C } from "vue";
+import { useTableSortedAndFiltered as ce } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
-import { parseFieldValue as se, dataIndexToStr as ce, isEqualCustom as ie } from "../utils.mjs";
-import { isArray as N, isEqualWith as le } from "lodash-unified";
-import { useLocale as ue } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as fe } from "../../config-provider/hooks/use-namespace.mjs";
+import { parseFieldValue as ie, dataIndexToStr as le, isEqualCustom as ue } from "../utils.mjs";
+import { isArray as N, isEqualWith as fe } from "lodash-unified";
+import { useLocale as ge } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as pe } from "../../config-provider/hooks/use-namespace.mjs";
 const S = 1, L = 10;
-function ge(g) {
+function de(g) {
   const l = {};
   return g && (g === !0 ? (l.current = S, l.pageSize = L) : (l.current = g.defaultCurrent || S, l.pageSize = g.defaultPageSize || L)), l;
 }
-const Pe = ({
+const we = ({
   manual: g = !1,
   request: l,
   defaultParams: v = {},
   defaultData: y = [],
   formatParams: D,
   paramsValueTypeMap: R,
-  resetFieldsIgnores: V,
+  resetFieldsIgnores: I,
   filterFields: U,
   sortFields: B,
   namespace: K = "ap-table",
@@ -29,22 +29,24 @@ const Pe = ({
   }
 }) => {
   let b = 0, s = {};
-  const M = p ?? {}, $ = (e) => D ? D(e) : e, z = te(), c = I(ge(p)), {
+  const M = p ?? {}, $ = (e) => D ? D(e) : e, z = oe(), c = q(de(p)), {
     getColumnSFConfig: G,
     setSF: J,
-    clearAll: Q
-  } = ae(), {
+    clearAll: Q,
+    sortedInfo: W,
+    filteredInfo: Z
+  } = ce(), {
     t: T
-  } = ue(), {
+  } = ge(), {
     b: P
-  } = fe(K), o = I({
+  } = pe(K), o = q({
     total: y.length,
     records: y,
     loading: !1
   }), F = () => {
     var e, t;
     return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
-  }, O = async (e) => {
+  }, V = async (e) => {
     var n;
     const t = $(e), r = Date.now();
     b = r, o.loading = !0;
@@ -59,27 +61,27 @@ const Pe = ({
     } finally {
       o.loading = !1;
     }
-  }, _ = (e) => {
+  }, O = (e) => {
     const t = {};
     return Object.entries(e).forEach(([r, n]) => {
       if (t[r] = n, R && n) {
         const a = R[r];
-        a && (t[r] = se(a, n));
+        a && (t[r] = ie(a, n));
       }
     }), t;
-  }, W = async (e) => {
+  }, H = async (e) => {
     var n, a, u, f, d;
     const t = F(), r = {};
     Object.entries(t).forEach(([m, x]) => {
-      V && V.indexOf(m) > -1 && (r[m] = x);
-    }), await ((a = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : a.resetFields()), (d = (f = (u = z.value) == null ? void 0 : u.apForm) == null ? void 0 : f.setFieldsValue) == null || d.call(f, r), re(() => {
+      I && I.indexOf(m) > -1 && (r[m] = x);
+    }), await ((a = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : a.resetFields()), (d = (f = (u = z.value) == null ? void 0 : u.apForm) == null ? void 0 : f.setFieldsValue) == null || d.call(f, r), ne(() => {
       e == null || e();
     });
   }, w = (e) => {
     s = e;
-    const t = _(e);
-    O(t);
-  }, Z = (e) => {
+    const t = O(e);
+    V(t);
+  }, X = (e) => {
     w({
       ...s,
       ...e
@@ -93,29 +95,29 @@ const Pe = ({
       current: p ? S : void 0,
       pageSize: p ? s.pageSize || c.pageSize : void 0
     });
-  }, H = () => {
-    Q(), s.sort = {}, s.filter = {}, W(E);
-  }, j = () => {
+  }, Y = () => {
+    Q(), s.sort = {}, s.filter = {}, H(E);
+  }, _ = () => {
     w(s);
-  }, X = (e) => {
+  }, k = (e) => {
     if (!p)
-      j();
+      _();
     else {
       const {
         current: t,
         pageSize: r
       } = c, n = o.total - e, a = Math.ceil(n / r), u = t > a ? a : t;
-      Z({
+      X({
         current: u > 0 ? u : 1
       });
     }
-  }, q = (e, t, r) => {
+  }, j = (e, t, r) => {
     var m, x;
     const n = F();
     c.current = e.current, c.pageSize = e.pageSize, J(t, r);
     const a = N(r) ? [...r] : [r], u = {};
     for (const i of a)
-      (m = h(B)) != null && m.includes(i.columnKey || i.field) && i.order && (u[ce(i.columnKey || i.field)] = i.order);
+      (m = h(B)) != null && m.includes(i.columnKey || i.field) && i.order && (u[le(i.columnKey || i.field)] = i.order);
     const f = {};
     for (const i of Object.keys(t))
       (x = h(U)) != null && x.includes(i) && t[i] && (f[i] = t[i]);
@@ -126,9 +128,9 @@ const Pe = ({
       current: e.current,
       pageSize: e.pageSize
     };
-    le(s, d, ie) || w(d);
+    fe(s, d, ue) || w(d);
   };
-  oe(() => {
+  ae(() => {
     const e = F(), {
       current: t,
       pageSize: r
@@ -140,15 +142,15 @@ const Pe = ({
       sort: {},
       ...e
     }, !g) {
-      const n = _(s);
-      O(n);
+      const n = O(s);
+      V(n);
     }
-  }), ne(() => h(v), () => {
+  }), se(() => h(v), () => {
     E();
   }, {
     deep: !0
   });
-  const Y = A(() => {
+  const ee = A(() => {
     if (o.total === 0)
       return "-";
     const {
@@ -157,10 +159,10 @@ const Pe = ({
     } = c;
     return `${e}/${Math.ceil(o.total / t)}`;
   });
-  function k(e) {
+  function te(e) {
     N(e) && (o.records = e, o.total = e.length);
   }
-  const ee = A(() => {
+  const re = A(() => {
     const {
       showLessItems: e,
       showTotal: t
@@ -183,30 +185,32 @@ const Pe = ({
           class: P("pagination--total-right")
         }, [T("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
           class: P("pagination-count-text")
-        }, [h(Y)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [h(ee)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
-      onChange: q,
+      onChange: j,
       dataSource: o.records
     };
   });
   return {
     formRef: z,
     submit: E,
-    reset: H,
-    refresh: j,
-    refreshByDelete: X,
+    reset: Y,
+    refresh: _,
+    refreshByDelete: k,
     data: o,
     current: c.current,
     pageSize: c.pageSize,
-    handleTableChange: q,
-    tableProps: ee,
+    handleTableChange: j,
+    tableProps: re,
     dataSource: A(() => o.records),
-    setDataSource: k,
-    getColumnSFConfig: G
+    setDataSource: te,
+    getColumnSFConfig: G,
+    sortedInfo: W,
+    filteredInfo: Z
   };
 };
 export {
   S as DEFAULT_CURRENT,
   L as DEFAULT_PAGE_SIZE,
-  Pe as useTablePaging
+  we as useTablePaging
 };

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

@@ -108,5 +108,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
 };

package/es/src/business/ap-batch-action-group/ApBatchActionGroup.vue.d.ts

@@ -1,9 +1,9 @@
 import { ApBatchActionGroupProps } from './interface';
 import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-import { TableColumnType } from '@aplus-frontend/antdv';
+import { TableColumnsType } from '@aplus-frontend/antdv';
 type __VLS_Props = ApBatchActionGroupProps;
 declare const _default: DefineComponent<__VLS_Props, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 export default _default;

package/es/src/business/ap-batch-action-group/index.d.ts

@@ -4,7 +4,7 @@ import { ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { MouseEventHandler, FocusEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
 import { DropdownArrowOptions, Trigger, Align } from '@aplus-frontend/antdv/es/dropdown/props';
-import { ItemType, MenuTheme, MenuMode, TableColumnType, ButtonProps } from '@aplus-frontend/antdv';
+import { ItemType, MenuTheme, MenuMode, TableColumnsType, ButtonProps } from '@aplus-frontend/antdv';
 import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { CSSMotionProps } from '@aplus-frontend/antdv/es/_util/transition';
 import { BuiltinPlacements, TriggerSubMenuAction, SelectEventHandler, MenuClickEventHandler } from '@aplus-frontend/antdv/es/menu/src/interface';
@@ -303,7 +303,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {}, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
         P: {};
@@ -604,7 +604,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, {}>;
     __isFragment?: never;
@@ -902,7 +902,7 @@ declare const ApBatchActionGroup: {
     }) | undefined;
     menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
 }> & Readonly<{}>, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {

package/lib/src/ap-table/ap-table.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),U=require("@aplus-frontend/antdv"),me=require("@aplus-frontend/antdv/es/theme/internal"),ye=require("../ap-form/index.js"),$=require("./constants.js");require("../config-provider/index.js");const ge=require("./hooks/use-table-paging-ng.js"),c=require("lodash-unified"),s=require("./utils.js"),Se=require("./hooks/use-table-content-height.js"),be=require("./hooks/use-table-row-selection.js"),D=require("../utils/index.js");require("./components/setting/modal/index.vue.js");require("./components/paragraph-ellipsis/index.vue.js");const he=require("./context.js");require("../scroll-bar/index.js");const we=require("./hooks/use-sticky-scroll.js"),ve=require("../config-provider/hooks/use-namespace.js"),Ce=require("../config-provider/hooks/use-global-config.js"),Re=require("./components/setting/modal/index.vue2.js"),xe=require("../scroll-bar/index.vue.js"),ke=require("./components/paragraph-ellipsis/index.vue2.js"),Te=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1},settings:{type:[Boolean,Object],default:void 0}},setup(j,{expose:W}){const t=j;let x=0;const g=e.useSlots(),[,H]=me.useToken(),{e:w,b:f,be:k,m:M,cssVar:G}=ve.useNamespace("ap-table"),T=Ce.useGlobalConfig("valueTypeMap"),{height:J,contentRef:Q}=Se.default(),B=e.ref(),F=e.ref(),{isStickyMode:z,scrollBarRef:i}=we.useStickyScroll(B),v=e.ref(t.size),d=e.ref([]),N=e.ref([]),q=D.getScrollbarSize();he.useProvideApTable({columns:e.computed(()=>d.value),columnsBackup:e.computed(()=>N.value),size:e.computed(()=>v.value),updateColumns(r){d.value=r},updateSize(r){v.value=r},dataSource:e.computed(()=>e.unref(m).records)});const P=e.computed(()=>{var r,n,o;return x++,((o=(n=(r=t.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!$.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let l=s.getColumnOrder(a.order);return s.getColumnOrder(u.order)-l}))==null?void 0:o.map(a=>{const u=s.updateFormProps(a,s.getFieldProps(a.fieldProps,{})),l={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:x},renderNode:void 0};return l.renderNode=s.getSearchFormItemRenderNode(l,e.unref(T)),l}))||[]}),X=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),Y=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),Z=e.computed(()=>c.isUndefined(t.dataSource)?m.records:t.dataSource),{rowSelection:S,selectedRows:b,...h}=be.default({fixed:!0,...t.rowSelection===!0?{}:t.rowSelection,rowKey:t.rowKey,dataSource:Z}),{formRef:C,submit:_,reset:V,tableProps:E,refresh:ee,data:m,setDataSource:re,getColumnSFConfig:te}=ge.useTablePaging({async request(r){var o,a;if(!S.value.preserveSelectedRowKeys&&c.isUndefined(t.dataSource)&&h.clearAll(),!c.isUndefined(t.dataSource))return{data:t.dataSource||[],total:t.dataSource.length||0};const n=await((o=t.request)==null?void 0:o.call(t,r));return(a=t.onLoad)==null||a.call(t,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:Y,sortFields:X,defaultParams:t.params,defaultData:t.defaultData,manual:t.manual,formatParams:t.beforeSearchSubmit,pagination:t.pagination}),oe=()=>{var o;let r=((o=t.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[];function n(a,u){return a.map(l=>({resizable:D.isDef(l.resizable)?l.resizable:t.columnResizable,...c.omit(s.apColumnToColumn(l),["ellipsis"]),...te(l),fixed:u?u.fixed:l.fixed,title:s.getTableTitle(l,k("table-header","title"),g.headerCell,e.unref(H).colorPrimary),customRender({value:p,...y}){var L,A;const O=s.getTableRenderType(l),ie=s.getTableRenderProps({...l,valueType:O},{value:p,...y}),fe=s.getTableCellRenderNode(O,ie,y.record,e.unref(T)),K=((L=l.renderText)==null?void 0:L.call(l,{value:p,...y}))||p,pe=l.renderText?e.createVNode(e.Fragment,null,[(A=l.renderText)==null?void 0:A.call(l,{value:p,...y})]):fe;let R=se(l,K,pe);return l.customRender&&(R=l.customRender({value:p,...y,column:l,originalNode:R,originalText:K})),R},children:n(l.children||[],u||l)}))}return n(r)};e.watch(()=>[t.columnResizable,t.columns],()=>{const r=oe();d.value=r,N.value=r},{deep:!0,immediate:!0});const ne=e.computed(()=>{var n,o;if(t.adaptive&&(m.total>0||((n=t.dataSource)==null?void 0:n.length)))return{y:e.unref(J),x:((o=t.scroll)==null?void 0:o.x)||"100%"};if(t.scroll)return t.scroll}),ae=e.computed(()=>{var r;if(t.tableLayout)return t.tableLayout;if((r=t.columns)!=null&&r.some(n=>n.ellipsis))return"fixed"}),I=e.computed(()=>{var o;const r=e.unref(E),n=e.unref(S);return{...t,...r,rowSelection:t.rowSelection===!0||((o=t.rowSelection)==null?void 0:o.mode)==="internal"?{...n,preserveSelectedRowKeys:c.isUndefined(t.dataSource)?n.preserveSelectedRowKeys:!0}:s.falseToUndefined(t.rowSelection),loading:c.isUndefined(t.loading)?r.loading:t.loading,pagination:t.pagination===!1?!1:r.pagination,scroll:e.unref(ne)}}),le=e.computed(()=>{var r;return[f(),t.card?null:f("wrapper"),t.adaptive?f("adaptive"):null,z.value&&((r=i.value)!=null&&r.visible)?M(`sticky-${q===0?"absolute":"relative"}`):null].filter(Boolean)});function se(r,n,o){return $.noRenderAsFormItemValueList.includes(r.valueType)?o:r.copyable||r.ellipsis?e.createVNode(ke.default,{copyable:r.copyable,ellipsis:r.ellipsis?c.isBoolean(r.ellipsis)?{tooltip:o,rows:1}:{...r.ellipsis,tooltip:o}:!1,content:o},null):o}e.watch(()=>e.unref(m).loading,r=>{var n;(n=t.onLoadingChange)==null||n.call(t,r)}),e.watch(()=>t.dataSource,r=>{re(r)},{immediate:!0});function ue(r){var n,o,a;(a=(o=(n=C.value)==null?void 0:n.apForm)==null?void 0:o.setFieldsValue)==null||a.call(o,r)}function de(r=!1){var o,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(o=C.value)==null?void 0:o.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function ce(){return e.unref(d)}return W({submit:()=>_(),reset:()=>V(),refresh:()=>ee(),setSearchFormValues:ue,getSearchFormValues:de,getShownColumns:ce,dataSource:e.computed(()=>e.unref(m).records),rowSelection:{selectedRows:e.computed(()=>e.unref(b)),...h},scrollBar:{x:{getCurrentScroll:()=>{var r;return((r=i==null?void 0:i.value)==null?void 0:r.currentScroll)??0},scroll:r=>{var n,o;return(o=(n=i==null?void 0:i.value)==null?void 0:n.scroll)==null?void 0:o.call(n,r)}},y:void 0}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{ref_key:"tableWrapperRef",ref:B,class:e.normalizeClass(le.value),style:e.normalizeStyle(e.unref(G)({"scroll-bar-width":`${e.unref(q)}px`}))},[e.unref(c.isUndefined)(r.dataSource)&&r.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(w)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(ye.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:C,"custom-reset":"","submit-loading":e.unref(E).loading,onSubmit:e.unref(_),onReset:e.unref(V)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,o=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.renderNode.Comp),e.mergeProps({key:o.dataIndex,item:o,ref_for:!0},o.fieldProps||{},{span:o.span,"custom-render":o.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:Q,class:e.normalizeClass([e.unref(w)("table-wrapper"),r.card?e.unref(w)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("header-wrapper"))},[r.settings?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("header"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(k)("header","title"))},[e.renderSlot(r.$slots,"title",e.mergeProps({selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),g.title?(e.openBlock(),e.createBlock(e.unref(U.Divider),{key:0,type:"vertical"})):e.createCommentVNode("",!0),e.createVNode(Re.default,{config:r.settings===!0?{}:r.settings},null,8,["config"])],2)):e.renderSlot(r.$slots,"title",e.mergeProps({key:1,selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),e.createVNode(e.unref(U.Table),e.mergeProps({ref_key:"antdTableRef",ref:F,class:e.unref(f)("table")},I.value,{size:v.value,"table-layout":ae.value,columns:d.value,onResizeColumn:n[0]||(n[0]=(o,a)=>a.width=o)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(r.$slots,"summary",{columns:d.value,records:I.value.dataSource,selectedRows:e.unref(b)})]),_:2},[e.unref(z)?{name:"bottomPaginationTop",fn:e.withCtx(()=>{var o,a;return[e.createVNode(e.unref(xe.default),{ref_key:"scrollBarRef",ref:i,"scroll-container":(a=(o=F.value)==null?void 0:o.table)==null?void 0:a.scrollBodyRef,direction:"horizontal"},null,8,["scroll-container"])]}),key:"0"}:void 0,e.renderList(e.unref(c.omit)(g,["title","searchFormExtra","headerCell","summary"]),(o,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["class","size","table-layout","columns"])],6)],6))}});exports.default=Te;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),$=require("@aplus-frontend/antdv"),Se=require("@aplus-frontend/antdv/es/theme/internal"),be=require("../ap-form/index.js"),D=require("./constants.js");require("../config-provider/index.js");const he=require("./hooks/use-table-paging-ng.js"),i=require("lodash-unified"),s=require("./utils.js"),we=require("./hooks/use-table-content-height.js"),ve=require("./hooks/use-table-row-selection.js"),j=require("../utils/index.js");require("./components/setting/modal/index.vue.js");require("./components/paragraph-ellipsis/index.vue.js");const Ce=require("./context.js");require("../scroll-bar/index.js");const Re=require("./hooks/use-sticky-scroll.js"),xe=require("../config-provider/hooks/use-namespace.js"),ke=require("../config-provider/hooks/use-global-config.js"),Te=require("./components/setting/modal/index.vue2.js"),Be=require("../scroll-bar/index.vue.js"),Fe=require("./components/paragraph-ellipsis/index.vue2.js"),ze=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1},settings:{type:[Boolean,Object],default:void 0}},setup(W,{expose:H}){const t=W;let x=0;const g=e.useSlots(),[,M]=Se.useToken(),{e:w,b:f,be:k,m:G,cssVar:J}=xe.useNamespace("ap-table"),T=ke.useGlobalConfig("valueTypeMap"),{height:Q,contentRef:X}=we.default(),B=e.ref(),F=e.ref(),{isStickyMode:z,scrollBarRef:c}=Re.useStickyScroll(B),v=e.ref(t.size),d=e.ref([]),N=e.ref([]),q=j.getScrollbarSize();Ce.useProvideApTable({columns:e.computed(()=>d.value),columnsBackup:e.computed(()=>N.value),size:e.computed(()=>v.value),updateColumns(r){d.value=r},updateSize(r){v.value=r},dataSource:e.computed(()=>e.unref(m).records)});const P=e.computed(()=>{var r,n,o;return x++,((o=(n=(r=t.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!D.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let l=s.getColumnOrder(a.order);return s.getColumnOrder(u.order)-l}))==null?void 0:o.map(a=>{const u=s.updateFormProps(a,s.getFieldProps(a.fieldProps,{})),l={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:x},renderNode:void 0};return l.renderNode=s.getSearchFormItemRenderNode(l,e.unref(T)),l}))||[]}),Y=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.sorter===!0)return r.key||(r==null?void 0:r.dataIndex)}).filter(Boolean)),Z=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.filters&&!r.onFilter)return r.key||(r==null?void 0:r.dataIndex)}).filter(Boolean)),ee=e.computed(()=>i.isUndefined(t.dataSource)?m.records:t.dataSource),{rowSelection:S,selectedRows:b,...h}=ve.default({fixed:!0,...t.rowSelection===!0?{}:t.rowSelection,rowKey:t.rowKey,dataSource:ee}),{formRef:C,submit:_,reset:V,tableProps:I,refresh:re,data:m,setDataSource:te,getColumnSFConfig:E,sortedInfo:oe,filteredInfo:ne}=he.useTablePaging({async request(r){var o,a;if(!S.value.preserveSelectedRowKeys&&i.isUndefined(t.dataSource)&&h.clearAll(),!i.isUndefined(t.dataSource))return{data:t.dataSource||[],total:t.dataSource.length||0};const n=await((o=t.request)==null?void 0:o.call(t,r));return(a=t.onLoad)==null||a.call(t,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:Z,sortFields:Y,defaultParams:t.params,defaultData:t.defaultData,manual:t.manual,formatParams:t.beforeSearchSubmit,pagination:t.pagination}),ae=()=>{var o;let r=((o=t.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[];function n(a,u){return a.map(l=>({resizable:j.isDef(l.resizable)?l.resizable:t.columnResizable,...i.omit(s.apColumnToColumn(l),["ellipsis"]),...E(l),fixed:u?u.fixed:l.fixed,title:s.getTableTitle(l,k("table-header","title"),g.headerCell,e.unref(M).colorPrimary),customRender({value:p,...y}){var A,U;const K=s.getTableRenderType(l),me=s.getTableRenderProps({...l,valueType:K},{value:p,...y}),ye=s.getTableCellRenderNode(K,me,y.record,e.unref(T)),L=((A=l.renderText)==null?void 0:A.call(l,{value:p,...y}))||p,ge=l.renderText?e.createVNode(e.Fragment,null,[(U=l.renderText)==null?void 0:U.call(l,{value:p,...y})]):ye;let R=ie(l,L,ge);return l.customRender&&(R=l.customRender({value:p,...y,column:l,originalNode:R,originalText:L})),R},children:n(l.children||[],u||l)}))}return n(r)},le=()=>{function r(n){var o;for(const a of n)(o=a.children)!=null&&o.length?r(a.children):E(a,!0)}r(d.value)};e.watch(()=>[t.columns,t.columnResizable],()=>{const r=ae();d.value=r,N.value=r},{deep:!0,immediate:!0}),e.watch(()=>[oe.value,ne.value],()=>{le()},{deep:!0});const se=e.computed(()=>{var n,o;if(t.adaptive&&(m.total>0||((n=t.dataSource)==null?void 0:n.length)))return{y:e.unref(Q),x:((o=t.scroll)==null?void 0:o.x)||"100%"};if(t.scroll)return t.scroll}),ue=e.computed(()=>{var r;if(t.tableLayout)return t.tableLayout;if((r=t.columns)!=null&&r.some(n=>n.ellipsis))return"fixed"}),O=e.computed(()=>{var o;const r=e.unref(I),n=e.unref(S);return{...t,...r,rowSelection:t.rowSelection===!0||((o=t.rowSelection)==null?void 0:o.mode)==="internal"?{...n,preserveSelectedRowKeys:i.isUndefined(t.dataSource)?n.preserveSelectedRowKeys:!0}:s.falseToUndefined(t.rowSelection),loading:i.isUndefined(t.loading)?r.loading:t.loading,pagination:t.pagination===!1?!1:r.pagination,scroll:e.unref(se)}}),de=e.computed(()=>{var r;return[f(),t.card?null:f("wrapper"),t.adaptive?f("adaptive"):null,z.value&&((r=c.value)!=null&&r.visible)?G(`sticky-${q===0?"absolute":"relative"}`):null].filter(Boolean)});function ie(r,n,o){return D.noRenderAsFormItemValueList.includes(r.valueType)?o:r.copyable||r.ellipsis?e.createVNode(Fe.default,{copyable:r.copyable,ellipsis:r.ellipsis?i.isBoolean(r.ellipsis)?{tooltip:o,rows:1}:{...r.ellipsis,tooltip:o}:!1,content:o},null):o}e.watch(()=>e.unref(m).loading,r=>{var n;(n=t.onLoadingChange)==null||n.call(t,r)}),e.watch(()=>t.dataSource,r=>{te(r)},{immediate:!0});function ce(r){var n,o,a;(a=(o=(n=C.value)==null?void 0:n.apForm)==null?void 0:o.setFieldsValue)==null||a.call(o,r)}function fe(r=!1){var o,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(o=C.value)==null?void 0:o.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function pe(){return e.unref(d)}return H({submit:()=>_(),reset:()=>V(),refresh:()=>re(),setSearchFormValues:ce,getSearchFormValues:fe,getShownColumns:pe,dataSource:e.computed(()=>e.unref(m).records),rowSelection:{selectedRows:e.computed(()=>e.unref(b)),...h},scrollBar:{x:{getCurrentScroll:()=>{var r;return((r=c==null?void 0:c.value)==null?void 0:r.currentScroll)??0},scroll:r=>{var n,o;return(o=(n=c==null?void 0:c.value)==null?void 0:n.scroll)==null?void 0:o.call(n,r)}},y:void 0}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{ref_key:"tableWrapperRef",ref:B,class:e.normalizeClass(de.value),style:e.normalizeStyle(e.unref(J)({"scroll-bar-width":`${e.unref(q)}px`}))},[e.unref(i.isUndefined)(r.dataSource)&&r.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(w)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(be.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:C,"custom-reset":"","submit-loading":e.unref(I).loading,onSubmit:e.unref(_),onReset:e.unref(V)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,o=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.renderNode.Comp),e.mergeProps({key:o.dataIndex,item:o,ref_for:!0},o.fieldProps||{},{span:o.span,"custom-render":o.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:X,class:e.normalizeClass([e.unref(w)("table-wrapper"),r.card?e.unref(w)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("header-wrapper"))},[r.settings?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("header"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(k)("header","title"))},[e.renderSlot(r.$slots,"title",e.mergeProps({selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),g.title?(e.openBlock(),e.createBlock(e.unref($.Divider),{key:0,type:"vertical"})):e.createCommentVNode("",!0),e.createVNode(Te.default,{config:r.settings===!0?{}:r.settings},null,8,["config"])],2)):e.renderSlot(r.$slots,"title",e.mergeProps({key:1,selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),e.createVNode(e.unref($.Table),e.mergeProps({ref_key:"antdTableRef",ref:F,class:e.unref(f)("table")},O.value,{size:v.value,"table-layout":ue.value,columns:d.value,onResizeColumn:n[0]||(n[0]=(o,a)=>a.width=o)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(r.$slots,"summary",{columns:d.value,records:O.value.dataSource,selectedRows:e.unref(b)})]),_:2},[e.unref(z)?{name:"bottomPaginationTop",fn:e.withCtx(()=>{var o,a;return[e.createVNode(e.unref(Be.default),{ref_key:"scrollBarRef",ref:c,"scroll-container":(a=(o=F.value)==null?void 0:o.table)==null?void 0:a.scrollBodyRef,direction:"horizontal"},null,8,["scroll-container"])]}),key:"0"}:void 0,e.renderList(e.unref(i.omit)(g,["title","searchFormExtra","headerCell","summary"]),(o,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["class","size","table-layout","columns"])],6)],6))}});exports.default=ze;

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

@@ -1,4 +1,4 @@
-import { ColumnType } from '@aplus-frontend/antdv/es/table';
+import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
 import { ApTableContextRenderConfig, ApTableProps } from './interface';
 type TableSize = ApTableProps['size'];
@@ -6,11 +6,11 @@ type ApTableContextProps<RecordType> = {
     /**
      * 表格列配置
      */
-    columns?: ComputedRef<ColumnType<RecordType>[]>;
+    columns?: ComputedRef<ColumnsType<RecordType>>;
     /**
      * 表格列配置备份（只有在props变更后才会变更）
      */
-    columnsBackup?: ComputedRef<ColumnType<RecordType>[]>;
+    columnsBackup?: ComputedRef<ColumnsType<RecordType>>;
     /**
      * 更新数据源的方法
      * @param name
@@ -18,7 +18,7 @@ type ApTableContextProps<RecordType> = {
      * @param triggerChange 是否触发外部的`onValuesChange`函数
      * @returns
      */
-    updateColumns?: (nextColumns: ColumnType<RecordType>[]) => void;
+    updateColumns?: (nextColumns: ColumnsType<RecordType>) => void;
     /**
      * ApForm内部实例
      */

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

@@ -1,9 +1,12 @@
 import { ApColumnType } from '../interface';
 import { Recordable } from '../../type';
+import { Ref } from 'vue';
 export declare const useTableSortedAndFiltered: () => {
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
     setSF: (filters: any, sorter: any) => void;
     clearSorter: () => void;
     clearFilters: () => void;
     clearAll: () => void;
+    sortedInfo: Ref<any, any>;
+    filteredInfo: Ref<any, any>;
 };

package/lib/src/ap-table/hooks/use-sorted-filtered.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("vue"),a=()=>{const t=r.ref(),n=r.ref();function s(e){const l=r.unref(n)||{},i=r.unref(t)||{},o={};return e.filters&&(o.filteredValue=l[e.key]||null),e.sorter&&(o.sortOrder=i.columnKey===e.key?i.order:null),o}function c(e,l){n.value=e,t.value=l}function u(){t.value=null}function f(){n.value=null}function d(){u(),f()}return{getColumnSFConfig:s,setSF:c,clearSorter:u,clearFilters:f,clearAll:d}};exports.useTableSortedAndFiltered=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),S=()=>{const r=n.ref(),t=n.ref();function s(e,l=!1){const a=n.unref(t)||{},i=n.unref(r)||{},o=l?e:{};return e.filters&&(o.filteredValue=a[e.key]||null),e.sorter&&(o.sortOrder=i.columnKey===e.key?i.order:null),o}function d(e,l){t.value=e,r.value=l}function u(){r.value=null}function f(){t.value=null}function c(){u(),f()}return{getColumnSFConfig:s,setSF:d,clearSorter:u,clearFilters:f,clearAll:c,sortedInfo:r,filteredInfo:t}};exports.useTableSortedAndFiltered=S;

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

@@ -88,6 +88,8 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
+    sortedInfo: Ref<any, any>;
+    filteredInfo: Ref<any, any>;
 };
 export {};

package/lib/src/ap-table/hooks/use-table-paging-ng.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),k=require("./use-sorted-filtered.js");require("../../config-provider/index.js");const q=require("../utils.js"),x=require("lodash-unified"),ee=require("../../config-provider/hooks/use-locale.js"),te=require("../../config-provider/hooks/use-namespace.js"),S=1,w=10;function re(g){const l={};return g&&(g===!0?(l.current=S,l.pageSize=w):(l.current=g.defaultCurrent||S,l.pageSize=g.defaultPageSize||w)),l}const ne=({manual:g=!1,request:l,defaultParams:L={},defaultData:v=[],formatParams:y,paramsValueTypeMap:D,resetFieldsIgnores:N,filterFields:O,sortFields:j,namespace:I="ap-table",pagination:p={defaultCurrent:S,defaultPageSize:w,showLessItems:!1,showTotal:!0}})=>{let C=0,c={};const M=p??{},B=e=>y?y(e):e,T=n.ref(),i=n.reactive(re(p)),{getColumnSFConfig:G,setSF:K,clearAll:Z}=k.useTableSortedAndFiltered(),{t:z}=ee.useLocale(),{b:P}=te.useNamespace(I),a=n.reactive({total:v.length,records:v,loading:!1}),F=()=>{var e,t;return((t=(e=T.value)==null?void 0:e.apForm)==null?void 0:t.getFieldsValueTransformed(!0))||{}},R=async e=>{var o;const t=B(e),r=Date.now();C=r,a.loading=!0;try{const s=await l({...n.unref(L),...t});C===r&&(a.total=s.total||((o=s.data)==null?void 0:o.length)||0,a.records=[...s.data||[]])}catch{C===r&&(a.records=[],a.total=0)}finally{a.loading=!1}},V=e=>{const t={};return Object.entries(e).forEach(([r,o])=>{if(t[r]=o,D&&o){const s=D[r];s&&(t[r]=q.parseFieldValue(s,o))}}),t},$=async e=>{var o,s,f,d,h;const t=F(),r={};Object.entries(t).forEach(([m,b])=>{N&&N.indexOf(m)>-1&&(r[m]=b)}),await((s=(o=T.value)==null?void 0:o.apForm)==null?void 0:s.resetFields()),(h=(d=(f=T.value)==null?void 0:f.apForm)==null?void 0:d.setFieldsValue)==null||h.call(d,r),n.nextTick(()=>{e==null||e()})},E=e=>{c=e;const t=V(e);R(t)},J=e=>{E({...c,...e})},A=()=>{const e=F();p&&(i.current=S),E({...e,filter:c.filter,sort:c.sort,current:p?S:void 0,pageSize:p?c.pageSize||i.pageSize:void 0})},Q=()=>{Z(),c.sort={},c.filter={},$(A)},U=()=>{E(c)},W=e=>{if(!p)U();else{const{current:t,pageSize:r}=i,o=a.total-e,s=Math.ceil(o/r),f=t>s?s:t;J({current:f>0?f:1})}},_=(e,t,r)=>{var m,b;const o=F();i.current=e.current,i.pageSize=e.pageSize,K(t,r);const s=x.isArray(r)?[...r]:[r],f={};for(const u of s)(m=n.unref(j))!=null&&m.includes(u.columnKey||u.field)&&u.order&&(f[q.dataIndexToStr(u.columnKey||u.field)]=u.order);const d={};for(const u of Object.keys(t))(b=n.unref(O))!=null&&b.includes(u)&&t[u]&&(d[u]=t[u]);const h={...o,filter:d,sort:f,current:e.current,pageSize:e.pageSize};x.isEqualWith(c,h,q.isEqualCustom)||E(h)};n.onMounted(()=>{const e=F(),{current:t,pageSize:r}=i;if(c={current:t,pageSize:r,filter:{},sort:{},...e},!g){const o=V(c);R(o)}}),n.watch(()=>n.unref(L),()=>{A()},{deep:!0});const H=n.computed(()=>{if(a.total===0)return"-";const{current:e,pageSize:t}=i;return`${e}/${Math.ceil(a.total/t)}`});function X(e){x.isArray(e)&&(a.records=e,a.total=e.length)}const Y=n.computed(()=>{const{showLessItems:e,showTotal:t}=M;return{loading:a.loading,pagination:{current:i.current,pageSize:i.pageSize,total:a.total,showSizeChanger:!e,showQuickJumper:!e,showLessItems:e,size:"default",showTotal:t?r=>n.createVNode("span",{class:P("pagination-total-wrapper")},[z("ap.apTable.pagination.totalLeftPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[r])," ",z("ap.apTable.pagination.totalLeftSuffix"),n.createVNode("span",{class:P("pagination--total-right")},[z("ap.apTable.pagination.totalRightPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[n.unref(H)])," ",z("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:_,dataSource:a.records}});return{formRef:T,submit:A,reset:Q,refresh:U,refreshByDelete:W,data:a,current:i.current,pageSize:i.pageSize,handleTableChange:_,tableProps:Y,dataSource:n.computed(()=>a.records),setDataSource:X,getColumnSFConfig:G}};exports.DEFAULT_CURRENT=S;exports.DEFAULT_PAGE_SIZE=w;exports.useTablePaging=ne;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),te=require("./use-sorted-filtered.js");require("../../config-provider/index.js");const q=require("../utils.js"),x=require("lodash-unified"),re=require("../../config-provider/hooks/use-locale.js"),ne=require("../../config-provider/hooks/use-namespace.js"),S=1,w=10;function ae(g){const l={};return g&&(g===!0?(l.current=S,l.pageSize=w):(l.current=g.defaultCurrent||S,l.pageSize=g.defaultPageSize||w)),l}const oe=({manual:g=!1,request:l,defaultParams:L={},defaultData:v=[],formatParams:y,paramsValueTypeMap:D,resetFieldsIgnores:N,filterFields:I,sortFields:O,namespace:j="ap-table",pagination:p={defaultCurrent:S,defaultPageSize:w,showLessItems:!1,showTotal:!0}})=>{let C=0,c={};const M=p??{},B=e=>y?y(e):e,T=n.ref(),i=n.reactive(ae(p)),{getColumnSFConfig:G,setSF:K,clearAll:Z,sortedInfo:$,filteredInfo:J}=te.useTableSortedAndFiltered(),{t:z}=re.useLocale(),{b:P}=ne.useNamespace(j),a=n.reactive({total:v.length,records:v,loading:!1}),F=()=>{var e,t;return((t=(e=T.value)==null?void 0:e.apForm)==null?void 0:t.getFieldsValueTransformed(!0))||{}},R=async e=>{var o;const t=B(e),r=Date.now();C=r,a.loading=!0;try{const s=await l({...n.unref(L),...t});C===r&&(a.total=s.total||((o=s.data)==null?void 0:o.length)||0,a.records=[...s.data||[]])}catch{C===r&&(a.records=[],a.total=0)}finally{a.loading=!1}},V=e=>{const t={};return Object.entries(e).forEach(([r,o])=>{if(t[r]=o,D&&o){const s=D[r];s&&(t[r]=q.parseFieldValue(s,o))}}),t},Q=async e=>{var o,s,f,d,h;const t=F(),r={};Object.entries(t).forEach(([m,b])=>{N&&N.indexOf(m)>-1&&(r[m]=b)}),await((s=(o=T.value)==null?void 0:o.apForm)==null?void 0:s.resetFields()),(h=(d=(f=T.value)==null?void 0:f.apForm)==null?void 0:d.setFieldsValue)==null||h.call(d,r),n.nextTick(()=>{e==null||e()})},E=e=>{c=e;const t=V(e);R(t)},W=e=>{E({...c,...e})},A=()=>{const e=F();p&&(i.current=S),E({...e,filter:c.filter,sort:c.sort,current:p?S:void 0,pageSize:p?c.pageSize||i.pageSize:void 0})},H=()=>{Z(),c.sort={},c.filter={},Q(A)},U=()=>{E(c)},X=e=>{if(!p)U();else{const{current:t,pageSize:r}=i,o=a.total-e,s=Math.ceil(o/r),f=t>s?s:t;W({current:f>0?f:1})}},_=(e,t,r)=>{var m,b;const o=F();i.current=e.current,i.pageSize=e.pageSize,K(t,r);const s=x.isArray(r)?[...r]:[r],f={};for(const u of s)(m=n.unref(O))!=null&&m.includes(u.columnKey||u.field)&&u.order&&(f[q.dataIndexToStr(u.columnKey||u.field)]=u.order);const d={};for(const u of Object.keys(t))(b=n.unref(I))!=null&&b.includes(u)&&t[u]&&(d[u]=t[u]);const h={...o,filter:d,sort:f,current:e.current,pageSize:e.pageSize};x.isEqualWith(c,h,q.isEqualCustom)||E(h)};n.onMounted(()=>{const e=F(),{current:t,pageSize:r}=i;if(c={current:t,pageSize:r,filter:{},sort:{},...e},!g){const o=V(c);R(o)}}),n.watch(()=>n.unref(L),()=>{A()},{deep:!0});const Y=n.computed(()=>{if(a.total===0)return"-";const{current:e,pageSize:t}=i;return`${e}/${Math.ceil(a.total/t)}`});function k(e){x.isArray(e)&&(a.records=e,a.total=e.length)}const ee=n.computed(()=>{const{showLessItems:e,showTotal:t}=M;return{loading:a.loading,pagination:{current:i.current,pageSize:i.pageSize,total:a.total,showSizeChanger:!e,showQuickJumper:!e,showLessItems:e,size:"default",showTotal:t?r=>n.createVNode("span",{class:P("pagination-total-wrapper")},[z("ap.apTable.pagination.totalLeftPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[r])," ",z("ap.apTable.pagination.totalLeftSuffix"),n.createVNode("span",{class:P("pagination--total-right")},[z("ap.apTable.pagination.totalRightPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[n.unref(Y)])," ",z("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:_,dataSource:a.records}});return{formRef:T,submit:A,reset:H,refresh:U,refreshByDelete:X,data:a,current:i.current,pageSize:i.pageSize,handleTableChange:_,tableProps:ee,dataSource:n.computed(()=>a.records),setDataSource:k,getColumnSFConfig:G,sortedInfo:$,filteredInfo:J}};exports.DEFAULT_CURRENT=S;exports.DEFAULT_PAGE_SIZE=w;exports.useTablePaging=oe;

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

@@ -108,5 +108,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
 };

package/lib/src/business/ap-batch-action-group/ApBatchActionGroup.vue.d.ts

@@ -1,9 +1,9 @@
 import { ApBatchActionGroupProps } from './interface';
 import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-import { TableColumnType } from '@aplus-frontend/antdv';
+import { TableColumnsType } from '@aplus-frontend/antdv';
 type __VLS_Props = ApBatchActionGroupProps;
 declare const _default: DefineComponent<__VLS_Props, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 export default _default;

package/lib/src/business/ap-batch-action-group/index.d.ts

@@ -4,7 +4,7 @@ import { ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { MouseEventHandler, FocusEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
 import { DropdownArrowOptions, Trigger, Align } from '@aplus-frontend/antdv/es/dropdown/props';
-import { ItemType, MenuTheme, MenuMode, TableColumnType, ButtonProps } from '@aplus-frontend/antdv';
+import { ItemType, MenuTheme, MenuMode, TableColumnsType, ButtonProps } from '@aplus-frontend/antdv';
 import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { CSSMotionProps } from '@aplus-frontend/antdv/es/_util/transition';
 import { BuiltinPlacements, TriggerSubMenuAction, SelectEventHandler, MenuClickEventHandler } from '@aplus-frontend/antdv/es/menu/src/interface';
@@ -303,7 +303,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {}, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
         P: {};
@@ -604,7 +604,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, {}>;
     __isFragment?: never;
@@ -902,7 +902,7 @@ declare const ApBatchActionGroup: {
     }) | undefined;
     menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
 }> & Readonly<{}>, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "main": "./lib/index.js",
   "type": "module",
   "files": [