@aplus-frontend/ui 0.5.36 → 0.6.0-beta.0

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

@@ -1,6 +1,7 @@
 import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
 import { ApTableContextRenderConfig, ApTableProps } from './interface';
+import { Recordable } from '../type';
 type TableSize = ApTableProps['size'];
 type ApTableContextProps<RecordType> = {
     /**
@@ -26,6 +27,10 @@ type ApTableContextProps<RecordType> = {
     updateSize?: (nextSize: TableSize) => void;
     dataSource?: ComputedRef<RecordType[]>;
     renderConfig?: ComputedRef<ApTableContextRenderConfig>;
+    getSearchFormValues?: (transform?: boolean) => (Partial<Recordable> & Recordable<any>) | undefined;
+    setSearchFormValues?: (values: Partial<Recordable>) => void;
+    submit?: () => void;
+    reset?: () => void;
 };
 export declare const ApTableContextKey: InjectionKey<ApTableContextProps<any>>;
 export declare function useProvideApTable<ModelType>(state: ApTableContextProps<ModelType>): void;

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

@@ -1,9 +1,9 @@
-import { provide as n, inject as i, computed as e } from "vue";
+import { provide as r, inject as i, computed as e } from "vue";
 const o = Symbol("apTableContextKey");
 function u(t) {
-  n(o, t);
+  r(o, t);
 }
-function p() {
+function a() {
   return i(o, {
     columns: e(() => []),
     updateColumns: () => {
@@ -12,11 +12,19 @@ function p() {
     updateSize: () => {
     },
     dataSource: void 0,
-    renderConfig: void 0
+    renderConfig: void 0,
+    getSearchFormValues: () => {
+    },
+    setSearchFormValues: () => {
+    },
+    submit: () => {
+    },
+    reset: () => {
+    }
   });
 }
 export {
   o as ApTableContextKey,
-  p as useInjectApTable,
+  a as useInjectApTable,
   u as useProvideApTable
 };

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

@@ -27,16 +27,16 @@ const Ae = ({
   request: f,
   defaultParams: L = {},
   defaultData: v = [],
-  formatParams: y,
-  paramsValueTypeMap: O,
-  resetFieldsIgnores: R,
+  formatParams: O,
+  paramsValueTypeMap: R,
+  resetFieldsIgnores: y,
   filterFields: J,
   sortFields: K,
   namespace: M = "ap-table",
   pagination: S
 }) => {
   let b = 0, i = {};
-  const Q = Se(S), $ = (e) => y ? y(e) : e, z = ae(), c = j(ze(S)), {
+  const Q = Se(S), $ = (e) => O ? O(e) : e, z = ae(), c = j(ze(S)), {
     getColumnSFConfig: G,
     setSF: W,
     clearAll: Z,
@@ -46,7 +46,7 @@ const Ae = ({
     t: T
   } = me(), {
     b: P
-  } = he(M), a = j({
+  } = he(M), o = j({
     total: v.length,
     records: v,
     loading: !1
@@ -56,32 +56,30 @@ const Ae = ({
   }, I = async (e) => {
     var r;
     const t = $(e), n = Date.now();
-    b = n, a.loading = !0;
+    b = n, o.loading = !0;
     try {
-      const o = await f({
+      const a = await f({
         ...m(L),
         ...t
       });
-      b === n && (a.total = o.total || ((r = o.data) == null ? void 0 : r.length) || 0, a.records = [...o.data || []]);
+      b === n && (o.total = a.total || ((r = a.data) == null ? void 0 : r.length) || 0, o.records = [...a.data || []], o.loading = !1);
     } catch {
-      b === n && (a.records = [], a.total = 0);
-    } finally {
-      a.loading = !1;
+      b === n && (o.records = [], o.total = 0, o.loading = !1);
     }
   }, V = (e) => {
     const t = {};
     return Object.entries(e).forEach(([n, r]) => {
-      if (t[n] = r, O && r) {
-        const o = O[n];
-        o && (t[n] = le(o, r));
+      if (t[n] = r, R && r) {
+        const a = R[n];
+        a && (t[n] = le(a, r));
       }
     }), t;
   }, Y = async (e) => {
-    var r, o, l, g, d;
+    var r, a, l, g, d;
     const t = w(), n = {};
     Object.entries(t).forEach(([p, F]) => {
-      R && R.indexOf(p) > -1 && (n[p] = F);
-    }), await ((o = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : o.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), se(() => {
+      y && y.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), se(() => {
       e == null || e();
     });
   }, C = (e) => {
@@ -113,7 +111,7 @@ const Ae = ({
       const {
         current: t,
         pageSize: n
-      } = c, r = a.total - e, o = Math.ceil(r / n), l = t > o ? o : t;
+      } = c, r = o.total - e, a = Math.ceil(r / n), l = t > a ? a : t;
       k({
         current: l > 0 ? l : 1
       });
@@ -122,8 +120,8 @@ const Ae = ({
     var p, F;
     const r = w();
     c.current = e.current, c.pageSize = e.pageSize, W(t, n);
-    const o = q(n) ? [...n] : [n], l = {};
-    for (const u of o)
+    const a = q(n) ? [...n] : [n], l = {};
+    for (const u of a)
       (p = m(K)) != null && p.includes(u.columnKey || u.field) && u.order && (l[fe(u.columnKey || u.field)] = u.order);
     const g = {};
     for (const u of Object.keys(t))
@@ -158,16 +156,16 @@ const Ae = ({
     deep: !0
   });
   const ne = A(() => {
-    if (a.total === 0)
+    if (o.total === 0)
       return "-";
     const {
       current: e,
       pageSize: t
     } = c;
-    return `${e}/${Math.ceil(a.total / t)}`;
+    return `${e}/${Math.ceil(o.total / t)}`;
   });
   function re(e) {
-    q(e) && (a.records = e, a.total = e.length);
+    q(e) && (o.records = e, o.total = e.length);
   }
   const oe = A(() => {
     const {
@@ -175,19 +173,19 @@ const Ae = ({
       showTotal: t,
       showQuickJumper: n,
       showSizeChanger: r,
-      pageSizeOptions: o
+      pageSizeOptions: a
     } = Q;
     return {
-      loading: a.loading,
+      loading: o.loading,
       pagination: {
         current: c.current,
         pageSize: c.pageSize,
-        total: a.total,
+        total: o.total,
         showSizeChanger: N(r) ? r : !e,
         showQuickJumper: N(n) ? n : !e,
         showLessItems: e,
         size: "default",
-        pageSizeOptions: pe(o) ? ["10", "20", "50", "100"] : o,
+        pageSizeOptions: pe(a) ? ["10", "20", "50", "100"] : a,
         showTotal: t ? (l) => x("span", {
           class: P("pagination-total-wrapper")
         }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", x("span", {
@@ -199,7 +197,7 @@ const Ae = ({
         }, [m(ne)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
       onChange: _,
-      dataSource: a.records
+      dataSource: o.records
     };
   });
   return {
@@ -208,12 +206,12 @@ const Ae = ({
     reset: ee,
     refresh: U,
     refreshByDelete: te,
-    data: a,
+    data: o,
     current: c.current,
     pageSize: c.pageSize,
     handleTableChange: _,
     tableProps: oe,
-    dataSource: A(() => a.records),
+    dataSource: A(() => o.records),
     setDataSource: re,
     getColumnSFConfig: G,
     sortedInfo: H,