@aplus-frontend/ui 6.13.2 → 6.13.4

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

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

package/es/src/business/ap-table-modal/index.d.ts

@@ -78,6 +78,7 @@ declare const ApTableModal: {
             submit: () => void;
             reset: () => void;
             refresh: () => void;
+            submitWith: () => void;
             setSearchFormValues: (fields: any) => void;
             getSearchFormValues: (transform?: boolean) => Partial<any> | undefined;
             setPaging: (nextPaging: Partial<{

package/es/src/business/ap-table-modal/table-modal.vue.d.ts

@@ -67,6 +67,7 @@ declare const _default: DefineComponent<__VLS_Props, {
         submit: () => void;
         reset: () => void;
         refresh: () => void;
+        submitWith: () => void;
         setSearchFormValues: (fields: any) => void;
         getSearchFormValues: (transform?: boolean) => Partial<any> | undefined;
         setPaging: (nextPaging: Partial<{

package/es/src/business/ap-view/ap-view.vue2.mjs

@@ -7,12 +7,12 @@ import "./components/menu-list-content.vue.mjs";
 import { useViewProvide as le } from "./hooks/use-view-provide.mjs";
 import { useInjectApTable as se } from "../../ap-table/context.mjs";
 import { SYSTEM_VIEW_KEY as V } from "./utils/enum.mjs";
-import { isValid as re } from "@aplus-frontend/utils";
-import { useGlobalConfig as me } from "../../config-provider/hooks/use-global-config.mjs";
-import { useNamespace as ne } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as oe } from "../../config-provider/hooks/use-locale.mjs";
+import { isValid as me } from "@aplus-frontend/utils";
+import { useGlobalConfig as ne } from "../../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as oe } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as re } from "../../config-provider/hooks/use-locale.mjs";
 import fe from "./components/main-button-content.vue2.mjs";
-import ae from "./components/menu-list-content.vue2.mjs";
+import ue from "./components/menu-list-content.vue2.mjs";
 const Ie = /* @__PURE__ */ Z({
   name: "ApView",
   __name: "ap-view",
@@ -39,63 +39,63 @@ const Ie = /* @__PURE__ */ Z({
   setup(k, {
     expose: A
   }) {
-    const o = k, L = me("viewCacheOption"), {
+    const r = k, L = ne("viewCacheOption"), {
       b: g
-    } = ne("ap-view"), {
+    } = oe("ap-view"), {
       t: P
-    } = oe(), v = E(() => ({
+    } = re(), v = E(() => ({
       viewKey: V,
       viewName: P("ap.apView.systemView")
     })), {
       getSearchFormValues: T,
-      setSearchFormValues: j,
-      submit: G,
-      reset: $,
-      refresh: Y,
-      getSearchFormSorterItems: z,
-      setSearchFormSorterItems: M,
-      resetSearchFormSorterItems: W
+      setSearchFormValues: W,
+      submit: j,
+      reset: G,
+      submitWith: $,
+      getSearchFormSorterItems: Y,
+      setSearchFormSorterItems: z,
+      resetSearchFormSorterItems: M
     } = se(), q = K(!1), F = K(!1), d = K("");
     let c = !1, _ = !1;
     const H = {
       dropdownType: "dropdown",
       content: N(fe, {
-        maxViewNum: o.maxViewNum
+        maxViewNum: r.maxViewNum
       }, null)
-    }, r = K([v.value]), J = E(() => r.value.map((t) => ({
+    }, m = K([v.value]), J = E(() => m.value.map((t) => ({
       id: t.viewKey,
-      content: N(ae, {
+      content: N(ue, {
         view: t
       }, null)
     }))), e = {
       getSearchFormValues: T,
-      setSearchFormValues: j,
-      submit: G,
-      reset: $,
-      refresh: Y,
-      getSearchFormSorterItems: z,
-      setSearchFormSorterItems: M,
-      resetSearchFormSorterItems: W,
-      ...o.saveDataSource
+      setSearchFormValues: W,
+      submit: j,
+      reset: G,
+      submitWith: $,
+      getSearchFormSorterItems: Y,
+      setSearchFormSorterItems: z,
+      resetSearchFormSorterItems: M,
+      ...r.saveDataSource
     }, l = {
       ...L.value,
-      ...o.viewCacheOption
+      ...r.viewCacheOption
     }, h = () => {
-      if (o.isDefaultSystemView)
+      if (r.isDefaultSystemView)
         return V;
-      if ((o.isFirstDefaultSystemView || _) && c)
+      if ((r.isFirstDefaultSystemView || _) && c)
         return V;
-      const t = r.value.find((i) => i.isDefault);
+      const t = m.value.find((i) => i.isDefault);
       return (t == null ? void 0 : t.viewKey) ?? V;
     }, p = (t) => {
       d.value = t;
-      const i = r.value.find((s) => s.viewKey === d.value);
+      const i = m.value.find((s) => s.viewKey === d.value);
       i && setTimeout(() => {
-        var s, m, n, a, f, u, y, I, x, B;
-        i.viewKey === V ? c ? o.manual || (s = e == null ? void 0 : e.refresh) == null || s.call(e) : ((m = e == null ? void 0 : e.resetSearchFormSorterItems) == null || m.call(e), o.manual || (n = e == null ? void 0 : e.reset) == null || n.call(e)) : ((u = e == null ? void 0 : e.setSearchFormValues) == null || u.call(e, {
-          ...Object.fromEntries(Object.keys(((a = e == null ? void 0 : e.getSearchFormValues) == null ? void 0 : a.call(e)) ?? {}).map((X) => [X, void 0])) ?? {},
+        var s, n, o, u, f, a, y, I, x, B;
+        i.viewKey === V ? c ? r.manual || (s = e == null ? void 0 : e.submitWith) == null || s.call(e) : ((n = e == null ? void 0 : e.resetSearchFormSorterItems) == null || n.call(e), r.manual || (o = e == null ? void 0 : e.reset) == null || o.call(e)) : ((a = e == null ? void 0 : e.setSearchFormValues) == null || a.call(e, {
+          ...Object.fromEntries(Object.keys(((u = e == null ? void 0 : e.getSearchFormValues) == null ? void 0 : u.call(e)) ?? {}).map((X) => [X, void 0])) ?? {},
           ...((f = i.viewConfig) == null ? void 0 : f.searchForm) ?? {}
-        }), (I = e == null ? void 0 : e.setSearchFormSorterItems) == null || I.call(e, ((y = i.viewConfig) == null ? void 0 : y.sorterItems) ?? []), c ? o.manual || (x = e == null ? void 0 : e.refresh) == null || x.call(e) : (B = e == null ? void 0 : e.submit) == null || B.call(e)), c = !1;
+        }), (I = e == null ? void 0 : e.setSearchFormSorterItems) == null || I.call(e, ((y = i.viewConfig) == null ? void 0 : y.sorterItems) ?? []), c ? r.manual || (x = e == null ? void 0 : e.submitWith) == null || x.call(e) : (B = e == null ? void 0 : e.submit) == null || B.call(e)), c = !1;
       });
     }, w = {
       getViewList: async (t) => {
@@ -103,12 +103,12 @@ const Ie = /* @__PURE__ */ Z({
         try {
           const {
             tableKey: s
-          } = t, m = await ((i = l == null ? void 0 : l.getViewList) == null ? void 0 : i.call(l, {
+          } = t, n = await ((i = l == null ? void 0 : l.getViewList) == null ? void 0 : i.call(l, {
             tableKey: s
           }));
-          return r.value = [v.value, ...m ?? []], p(h()), r.value;
+          return m.value = [v.value, ...n ?? []], p(h()), m.value;
         } catch {
-          return r.value = [v.value], p(V), r.value;
+          return m.value = [v.value], p(V), m.value;
         }
       },
       addView: async (t) => {
@@ -116,72 +116,72 @@ const Ie = /* @__PURE__ */ Z({
         const {
           tableKey: i,
           viewKey: s,
-          viewName: m,
-          isDefault: n,
-          viewConfig: a
+          viewName: n,
+          isDefault: o,
+          viewConfig: u
         } = t;
         await ((f = l == null ? void 0 : l.addView) == null ? void 0 : f.call(l, {
           tableKey: i,
           viewKey: s,
-          viewName: m,
-          isDefault: n,
-          viewConfig: a
-        })), n && (r.value = r.value.map((u) => ({
-          ...u,
+          viewName: n,
+          isDefault: o,
+          viewConfig: u
+        })), o && (m.value = m.value.map((a) => ({
+          ...a,
           isDefault: !1
-        }))), r.value = [...r.value, {
+        }))), m.value = [...m.value, {
           viewKey: s,
-          viewName: m,
-          isDefault: n,
-          viewConfig: a
+          viewName: n,
+          isDefault: o,
+          viewConfig: u
         }], p(s);
       },
       changeView: async (t) => {
-        var u;
+        var a;
         const {
           tableKey: i,
           viewKey: s,
-          viewName: m,
-          isDefault: n,
-          viewConfig: a
+          viewName: n,
+          isDefault: o,
+          viewConfig: u
         } = t;
-        await ((u = l == null ? void 0 : l.changeView) == null ? void 0 : u.call(l, {
+        await ((a = l == null ? void 0 : l.changeView) == null ? void 0 : a.call(l, {
           tableKey: i,
           viewKey: s,
-          viewName: m,
-          isDefault: n,
-          viewConfig: a
-        })), n && (r.value = r.value.map((y) => ({
+          viewName: n,
+          isDefault: o,
+          viewConfig: u
+        })), o && (m.value = m.value.map((y) => ({
           ...y,
           isDefault: !1
         })));
-        const f = r.value.find((y) => y.viewKey === s);
-        f && (f.viewName = m, f.isDefault = n, f.viewConfig = a), p(s);
+        const f = m.value.find((y) => y.viewKey === s);
+        f && (f.viewName = n, f.isDefault = o, f.viewConfig = u), p(s);
       },
       removeView: async (t) => {
-        var m;
+        var n;
         const {
           tableKey: i,
           viewKey: s
         } = t;
-        await ((m = l == null ? void 0 : l.removeView) == null ? void 0 : m.call(l, {
+        await ((n = l == null ? void 0 : l.removeView) == null ? void 0 : n.call(l, {
           tableKey: i,
           viewKey: s
-        })), r.value = r.value.filter((n) => n.viewKey !== s), s === d.value && p(h());
+        })), m.value = m.value.filter((o) => o.viewKey !== s), s === d.value && p(h());
       }
     }, Q = {
-      tableKey: o.tableKey,
+      tableKey: r.tableKey,
       currentViewKey: d,
       changeCurrentViewKey: p,
       popoverOpen: q,
       menuOpen: F,
-      viewList: r,
+      viewList: m,
       viewListCRUD: w,
       saveDataSource: e
     };
-    return le(Q), U(() => o.tableKey, (t) => {
+    return le(Q), U(() => r.tableKey, (t) => {
       var i;
-      re(t) && (c = !0, (i = w == null ? void 0 : w.getViewList) == null || i.call(w, {
+      me(t) && (c = !0, (i = w == null ? void 0 : w.getViewList) == null || i.call(w, {
         tableKey: t
       }));
     }, {

package/es/src/business/ap-view/interface.d.ts

@@ -4,8 +4,8 @@ export interface SaveDataSource {
     getSearchFormValues?: (transform?: boolean) => (Partial<Recordable> & Recordable<any>) | undefined;
     setSearchFormValues?: (values: Partial<Recordable>) => void;
     submit?: () => void;
+    submitWith?: () => void;
     reset?: () => void;
-    refresh?: () => void;
     getSearchFormSorterItems?: () => ApFormSearchFormPopoverSorterItem[];
     setSearchFormSorterItems?: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
     resetSearchFormSorterItems?: () => void;