@aplus-frontend/ui 7.12.1 → 7.12.2

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

@@ -1,30 +1,30 @@
-import { defineComponent as $e, useSlots as je, ref as c, computed as n, unref as o, toRef as He, createVNode as p, Fragment as ae, watch as B, createElementBlock as k, openBlock as f, normalizeStyle as E, normalizeClass as m, createCommentVNode as le, createElementVNode as K, mergeProps as z, createSlots as ne, withCtx as w, renderList as se, createBlock as ue, resolveDynamicComponent as _e, renderSlot as v, normalizeProps as Ue, guardReactiveProps as qe } from "vue";
-import { Divider as Me, Table as Ge } from "@aplus-frontend/antdv";
-import { useToken as Je } from "@aplus-frontend/antdv/es/theme/internal";
-import { isUndefined as g, omit as de, isBoolean as Qe } from "lodash-unified";
+import { defineComponent as je, useSlots as He, ref as c, computed as n, unref as o, toRef as _e, createVNode as p, Fragment as ae, watch as B, createElementBlock as k, openBlock as f, normalizeStyle as E, normalizeClass as m, createCommentVNode as le, createElementVNode as L, mergeProps as z, createSlots as ne, withCtx as w, renderList as se, createBlock as ue, resolveDynamicComponent as Ue, renderSlot as v, normalizeProps as qe, guardReactiveProps as Me } from "vue";
+import { Divider as Ge, Table as Je } from "@aplus-frontend/antdv";
+import { useToken as Qe } from "@aplus-frontend/antdv/es/theme/internal";
+import { isUndefined as g, omit as de, isBoolean as Xe } from "lodash-unified";
 import "../scroll-bar/index.mjs";
-import { getValidVNodeList as Xe } from "../utils/slot.mjs";
-import { useDevWarning as Ye } from "../utils/warning.mjs";
-import { ApForm as Ze } from "../ap-form/index.mjs";
+import { getValidVNodeList as Ye } from "../utils/slot.mjs";
+import { useDevWarning as Ze } from "../utils/warning.mjs";
+import { ApForm as er } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
-import { getScrollbarSize as er } from "../utils/index.mjs";
+import { getScrollbarSize as rr } from "../utils/index.mjs";
 import "./components/paragraph-ellipsis/index.vue.mjs";
 import "./components/setting/modal/index.vue.mjs";
 import { noRenderAsFormItemValueList as ie } from "./constants.mjs";
-import { useProvideApTable as rr } from "./context.mjs";
-import { useStickyScroll as or } from "./hooks/use-sticky-scroll.mjs";
-import tr from "./hooks/use-table-content-height.mjs";
-import { useTablePaging as ar } from "./hooks/use-table-paging-ng.mjs";
-import lr from "./hooks/use-table-row-selection.mjs";
-import nr from "./style/index.mjs";
-import { getColumnOrder as ce, updateFormProps as sr, getFieldProps as ur, getSearchFormItemRenderNode as dr, recursionApColumns as pe, getTableTitle as ir, getTableRenderType as cr, getTableRenderProps as pr, getTableCellRenderNode as fr, apColumnToColumn as mr, falseToUndefined as gr, objectToString as br } from "./utils.mjs";
-import { useNamespace as yr } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as Sr } from "../config-provider/hooks/use-global-config.mjs";
+import { useProvideApTable as or } from "./context.mjs";
+import { useStickyScroll as tr } from "./hooks/use-sticky-scroll.mjs";
+import ar from "./hooks/use-table-content-height.mjs";
+import { useTablePaging as lr } from "./hooks/use-table-paging-ng.mjs";
+import nr from "./hooks/use-table-row-selection.mjs";
+import sr from "./style/index.mjs";
+import { getColumnOrder as ce, updateFormProps as ur, getFieldProps as dr, getSearchFormItemRenderNode as ir, recursionApColumns as pe, getTableTitle as cr, getTableRenderType as pr, getTableRenderProps as fr, getTableCellRenderNode as mr, apColumnToColumn as gr, falseToUndefined as br, objectToString as yr } from "./utils.mjs";
+import { useNamespace as Sr } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as hr } from "../config-provider/hooks/use-global-config.mjs";
 import { isDef as fe } from "../utils/is.mjs";
-import hr from "./components/paragraph-ellipsis/index.vue2.mjs";
-import wr from "./components/setting/modal/index.vue2.mjs";
-import vr from "../scroll-bar/index.vue.mjs";
-const Jr = /* @__PURE__ */ $e({
+import wr from "./components/paragraph-ellipsis/index.vue2.mjs";
+import vr from "./components/setting/modal/index.vue2.mjs";
+import Rr from "../scroll-bar/index.vue.mjs";
+const Qr = /* @__PURE__ */ je({
   name: "ApTable",
   __name: "ap-table",
   props: {
@@ -156,26 +156,26 @@ const Jr = /* @__PURE__ */ $e({
     expose: ge
   }) {
     const r = me;
-    let L = 0;
-    const b = je(), [, be] = Je();
-    Ye("ApTable")(!1, "breaking", "ApTable has been EOL, Please use AgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/) instead.");
+    let K = 0;
+    const b = He(), [, be] = Qe();
+    Ze("ApTable")(!1, "breaking", "ApTable has been EOL, Please use AgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/) instead.");
     const {
       e: I,
       b: d,
       be: O,
       m: ye,
       cssVar: Se
-    } = yr("ap-table"), he = nr("ap-table"), W = Sr("valueTypeMap"), {
+    } = Sr("ap-table"), he = sr("ap-table"), W = hr("valueTypeMap"), {
       height: we,
       contentRef: ve
-    } = tr(), D = c(), $ = c(), {
+    } = ar(), D = c(), $ = c(), {
       isStickyMode: j,
       scrollBarRef: R
-    } = or(D), C = c(r.size), s = c([]), H = c([]), _ = er(), P = c(!0), U = n(() => (L++, r.columns?.filter((e) => !e.hideInSearch && e.dataIndex && (e.valueType || e.customRenderFormItem) && !ie.includes(e.valueType))?.sort((e, a) => {
+    } = tr(D), C = c(r.size), s = c([]), H = c([]), _ = rr(), P = c(!0), U = n(() => (K++, r.columns?.filter((e) => !e.hideInSearch && e.dataIndex && (e.valueType || e.customRenderFormItem) && !ie.includes(e.valueType))?.sort((e, a) => {
       let t = ce(e.order);
       return ce(a.order) - t;
     })?.map((e) => {
-      const a = sr(e, ur(e.fieldProps, {})), t = {
+      const a = ur(e, dr(e.fieldProps, {})), t = {
         ...e,
         fieldProps: {
           label: e.title,
@@ -183,22 +183,22 @@ const Jr = /* @__PURE__ */ $e({
           // tips: 在表格中的查询表单项默认是带边框的
           bordered: !0,
           ...a || {},
-          _signal: L
+          _signal: K
         },
         renderNode: void 0
       };
-      return t.renderNode = dr(t, o(W)), t;
+      return t.renderNode = ir(t, o(W)), t;
     }) || [])), Re = n(() => pe(o(s), (e) => {
       if (e.sorter === !0)
         return e.key || e?.dataIndex;
     }).filter(Boolean)), Ce = n(() => pe(o(s), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e?.dataIndex;
-    }).filter(Boolean)), Te = n(() => g(r.dataSource) ? y.records : r.dataSource), Fe = n(() => fe(r.manual) ? r.manual : Xe(b.searchFormExtra?.() || []).some((a) => a.type?.name === "ApView")), {
+    }).filter(Boolean)), Te = n(() => g(r.dataSource) ? y.records : r.dataSource), Fe = n(() => fe(r.manual) ? r.manual : Ye(b.searchFormExtra?.() || []).some((a) => a.type?.name === "ApView")), {
       rowSelection: T,
       selectedRows: F,
       ...x
-    } = lr({
+    } = nr({
       fixed: !0,
       ...r.rowSelection === !0 ? {} : r.rowSelection,
       rowKey: r.rowKey,
@@ -216,8 +216,9 @@ const Jr = /* @__PURE__ */ $e({
       filteredInfo: ke,
       setPaging: ze,
       getPaging: Ie,
-      submitWith: J
-    } = ar({
+      submitWith: J,
+      getLastParams: Pe
+    } = lr({
       async request(e) {
         if (!T.value.preserveSelectedRowKeys && g(r.dataSource) && !P.value && x.clearAll(), P.value && (P.value = !1), !g(r.dataSource))
           return {
@@ -232,13 +233,13 @@ const Jr = /* @__PURE__ */ $e({
       },
       filterFields: Ce,
       sortFields: Re,
-      params: He(r, "params"),
+      params: _e(r, "params"),
       defaultData: r.defaultData,
       manual: o(Fe),
       formatParams: r.beforeSearchSubmit,
       pagination: r.pagination
     });
-    rr({
+    or({
       columns: n(() => s.value),
       columnsBackup: n(() => H.value),
       size: n(() => C.value),
@@ -257,36 +258,37 @@ const Jr = /* @__PURE__ */ $e({
       refresh: M,
       getSearchFormSorterItems: Z,
       setSearchFormSorterItems: ee,
-      resetSearchFormSorterItems: re
+      resetSearchFormSorterItems: re,
+      getLastParams: Pe
     });
-    const Pe = () => {
+    const Ne = () => {
       let e = r.columns?.filter((t) => !t.hideInTable) || [];
       function a(t, u) {
         return t.map((l) => ({
           resizable: fe(l.resizable) ? l.resizable : r.columnResizable,
-          ...de(mr(l), ["ellipsis"]),
+          ...de(gr(l), ["ellipsis"]),
           // tips: 此函数内部依赖查询&筛选的相应式值
           ...G(l),
           fixed: u ? u.fixed : l.fixed,
-          title: ir(l, O("table-header", "title"), b.headerCell, o(be).colorTextTertiary),
+          title: cr(l, O("table-header", "title"), b.headerCell, o(be).colorTextTertiary),
           customRender({
             value: S,
             ...h
           }) {
-            const oe = cr(l), Oe = pr({
+            const oe = pr(l), We = fr({
               ...l,
               valueType: oe
             }, {
               value: S,
               ...h
-            }), We = fr(oe, Oe, h.record, o(W)), te = l.renderText?.({
+            }), De = mr(oe, We, h.record, o(W)), te = l.renderText?.({
               value: S,
               ...h
-            }) || S, De = l.renderText ? p(ae, null, [l.renderText?.({
+            }) || S, $e = l.renderText ? p(ae, null, [l.renderText?.({
               value: S,
               ...h
-            })]) : We;
-            let A = Ke(l, te, De);
+            })]) : De;
+            let A = Ke(l, te, $e);
             return l.customRender && (A = l.customRender({
               value: S,
               ...h,
@@ -299,7 +301,7 @@ const Jr = /* @__PURE__ */ $e({
         }));
       }
       return a(e);
-    }, Ne = () => {
+    }, Ve = () => {
       function e(a) {
         for (const t of a)
           t.children?.length ? e(t.children) : G(t, !0);
@@ -307,17 +309,17 @@ const Jr = /* @__PURE__ */ $e({
       e(s.value);
     };
     B(() => [r.columns, r.columnResizable], () => {
-      const e = Pe();
+      const e = Ne();
       s.value = e, H.value = e;
     }, {
       deep: !0,
       immediate: !0
     }), B(() => [Be.value, ke.value], () => {
-      Ne();
+      Ve();
     }, {
       deep: !0
     });
-    const Ve = n(() => {
+    const Ae = n(() => {
       if (r.adaptive && (y.total > 0 || r.dataSource?.length))
         return {
           y: o(we),
@@ -325,7 +327,7 @@ const Jr = /* @__PURE__ */ $e({
         };
       if (r.scroll)
         return r.scroll;
-    }), Ae = n(() => {
+    }), Ee = n(() => {
       if (r.tableLayout)
         return r.tableLayout;
       if (r.columns?.some((e) => e.ellipsis))
@@ -339,20 +341,20 @@ const Jr = /* @__PURE__ */ $e({
           ...a,
           // tips 如果是前端分页，则默认会走缓存
           preserveSelectedRowKeys: g(r.dataSource) ? a.preserveSelectedRowKeys : !0
-        } : gr(r.rowSelection),
+        } : br(r.rowSelection),
         loading: g(r.loading) ? e.loading : r.loading,
         pagination: r.pagination === !1 ? !1 : e.pagination,
-        scroll: o(Ve)
+        scroll: o(Ae)
       };
-    }), Ee = n(() => [d(), r.card ? null : d("wrapper"), r.adaptive ? d("adaptive") : null, j.value && R.value?.visible ? ye(`sticky-${_ === 0 ? "absolute" : "relative"}`) : null, he.value].filter(Boolean));
+    }), Le = n(() => [d(), r.card ? null : d("wrapper"), r.adaptive ? d("adaptive") : null, j.value && R.value?.visible ? ye(`sticky-${_ === 0 ? "absolute" : "relative"}`) : null, he.value].filter(Boolean));
     function Ke(e, a, t) {
       if (ie.includes(e.valueType))
         return t;
-      const u = br(a);
-      return e.copyable || e.ellipsis ? p(hr, {
+      const u = yr(a);
+      return e.copyable || e.ellipsis ? p(wr, {
         copyable: e.copyable,
         rawValue: u,
-        ellipsis: e.ellipsis ? Qe(e.ellipsis) ? {
+        ellipsis: e.ellipsis ? Xe(e.ellipsis) ? {
           tooltip: t,
           rows: 1
         } : {
@@ -385,7 +387,7 @@ const Jr = /* @__PURE__ */ $e({
     function re() {
       i.value?.resetSorterItems();
     }
-    function Le() {
+    function Oe() {
       return o(s);
     }
     return ge({
@@ -397,7 +399,7 @@ const Jr = /* @__PURE__ */ $e({
       getSearchFormValues: Y,
       setPaging: ze,
       getPaging: Ie,
-      getShownColumns: Le,
+      getShownColumns: Oe,
       dataSource: n(() => o(y).records),
       rowSelection: {
         selectedRows: n(() => o(F)),
@@ -416,7 +418,7 @@ const Jr = /* @__PURE__ */ $e({
     }), (e, a) => (f(), k("div", {
       ref_key: "tableWrapperRef",
       ref: D,
-      class: m(Ee.value),
+      class: m(Le.value),
       style: E(o(Se)({
         "scroll-bar-width": `${o(_)}px`
       }))
@@ -424,7 +426,7 @@ const Jr = /* @__PURE__ */ $e({
       key: 0,
       class: m(e.card ? o(I)("search-wrapper") : null),
       style: E(e.searchFormWrapperStyle)
-    }, [p(o(Ze).SearchForm, z(e.searchForm || {}, {
+    }, [p(o(er).SearchForm, z(e.searchForm || {}, {
       ref_key: "formRef",
       ref: i,
       "custom-reset": "",
@@ -432,7 +434,7 @@ const Jr = /* @__PURE__ */ $e({
       onSubmit: o(N),
       onReset: o(V)
     }), ne({
-      default: w(() => [(f(!0), k(ae, null, se(U.value, (t) => (f(), ue(_e(t.renderNode), {
+      default: w(() => [(f(!0), k(ae, null, se(U.value, (t) => (f(), ue(Ue(t.renderNode), {
         key: t.dataIndex
       }))), 128))]),
       _: 2
@@ -440,39 +442,39 @@ const Jr = /* @__PURE__ */ $e({
       name: "extra",
       fn: w(() => [v(e.$slots, "searchFormExtra")]),
       key: "0"
-    } : void 0]), 1040, ["submit-loading", "onSubmit", "onReset"])], 6)) : le("", !0), K("div", {
+    } : void 0]), 1040, ["submit-loading", "onSubmit", "onReset"])], 6)) : le("", !0), L("div", {
       ref_key: "contentRef",
       ref: ve,
       class: m([o(I)("table-wrapper"), e.card ? o(I)("table-wrapper-card") : null]),
       style: E(e.tableWrapperStyle)
-    }, [K("div", {
+    }, [L("div", {
       class: m(o(d)("header-wrapper"))
     }, [e.settings ? (f(), k("div", {
       key: 0,
       class: m(o(d)("header"))
-    }, [K("div", {
+    }, [L("div", {
       class: m(o(O)("header", "title"))
     }, [v(e.$slots, "title", z({
       selectedRows: o(F),
       selectedRowKeys: o(T).selectedRowKeys,
       shownColumns: s.value
-    }, x))], 2), b.title ? (f(), ue(o(Me), {
+    }, x))], 2), b.title ? (f(), ue(o(Ge), {
       key: 0,
       type: "vertical"
-    })) : le("", !0), p(wr, {
+    })) : le("", !0), p(vr, {
       config: e.settings === !0 ? {} : e.settings
     }, null, 8, ["config"])], 2)) : v(e.$slots, "title", z({
       key: 1,
       selectedRows: o(F),
       selectedRowKeys: o(T).selectedRowKeys,
       shownColumns: s.value
-    }, x))], 2), p(o(Ge), z({
+    }, x))], 2), p(o(Je), z({
       ref_key: "antdTableRef",
       ref: $,
       class: o(d)("table")
     }, Q.value, {
       size: C.value,
-      "table-layout": Ae.value,
+      "table-layout": Ee.value,
       columns: s.value,
       onResizeColumn: a[0] || (a[0] = (t, u) => u.width = t)
     }), ne({
@@ -484,7 +486,7 @@ const Jr = /* @__PURE__ */ $e({
       _: 2
     }, [o(j) ? {
       name: "bottomPaginationTop",
-      fn: w(() => [p(o(vr), {
+      fn: w(() => [p(o(Rr), {
         ref_key: "scrollBarRef",
         ref: R,
         "scroll-container": $.value?.table?.scrollBodyRef,
@@ -496,10 +498,10 @@ const Jr = /* @__PURE__ */ $e({
       key: "0"
     } : void 0, se(o(de)(b, ["title", "searchFormExtra", "headerCell", "summary"]), (t, u) => ({
       name: u,
-      fn: w((l) => [v(e.$slots, u, Ue(qe(l || {})))])
+      fn: w((l) => [v(e.$slots, u, qe(Me(l || {})))])
     }))]), 1040, ["class", "size", "table-layout", "columns"])], 6)], 6));
   }
 });
 export {
-  Jr as default
+  Qr as default
 };

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

@@ -37,6 +37,7 @@ type ApTableContextProps<RecordType> = {
     getSearchFormSorterItems?: () => ApFormSearchFormPopoverSorterItem[];
     setSearchFormSorterItems?: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
     resetSearchFormSorterItems: () => void;
+    getLastParams?: () => Recordable;
 };
 export declare const ApTableContextKey: InjectionKey<ApTableContextProps<any>>;
 export declare function useProvideApTable<ModelType>(state: ApTableContextProps<ModelType>): void;

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

@@ -1,15 +1,15 @@
-import { provide as s, inject as a, computed as o } from "vue";
+import { provide as s, inject as a, computed as t } from "vue";
 const r = Symbol("apTableContextKey");
-function n(t) {
-  s(r, t);
+function n(o) {
+  s(r, o);
 }
 const e = () => {
 };
 function c() {
   return a(r, {
-    columns: o(() => []),
+    columns: t(() => []),
     updateColumns: e,
-    size: o(() => "middle"),
+    size: t(() => "middle"),
     updateSize: e,
     dataSource: void 0,
     renderConfig: void 0,
@@ -21,7 +21,8 @@ function c() {
     refresh: e,
     getSearchFormSorterItems: () => [],
     setSearchFormSorterItems: e,
-    resetSearchFormSorterItems: e
+    resetSearchFormSorterItems: e,
+    getLastParams: () => ({})
   });
 }
 export {

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

@@ -123,5 +123,6 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
     submitWith: (resetCurrent?: boolean) => void;
     fetchNextPageAndCache: () => void;
+    getLastParams: () => Recordable;
 };
 export {};