@aplus-frontend/ui 0.6.0-beta.1 → 0.6.0-beta.10

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

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

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

@@ -133,12 +133,12 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly onMousedown?: MouseEventHandler | undefined;
                     readonly value?: string | number | undefined;
                     readonly disabled?: boolean | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly name?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((val: string) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
                     readonly placeholder?: string | number | undefined;
@@ -344,12 +344,12 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly onMousedown?: MouseEventHandler | undefined;
                     readonly value?: string | number | undefined;
                     readonly disabled?: boolean | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly name?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((val: string) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
                     readonly placeholder?: string | number | undefined;
@@ -899,11 +899,11 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly onInput?: ((text: string) => void) | undefined;
                     readonly value?: ValueType | undefined;
                     readonly disabled?: boolean | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly keyboard?: boolean | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((value: ValueType) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly max?: ValueType | undefined;
                     readonly min?: ValueType | undefined;
                     readonly defaultValue?: ValueType | undefined;
@@ -1282,8 +1282,8 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 }, string, {
                     step: ValueType;
                     disabled: boolean;
-                    bordered: boolean;
                     keyboard: boolean;
+                    bordered: boolean;
                     max: ValueType;
                     min: ValueType;
                     controls: boolean;
@@ -1312,8 +1312,8 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
             } & Readonly<{
                 step: ValueType;
                 disabled: boolean;
-                bordered: boolean;
                 keyboard: boolean;
+                bordered: boolean;
                 max: ValueType;
                 min: ValueType;
                 controls: boolean;
@@ -1321,7 +1321,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 thousands: boolean;
             }> & Omit<Readonly< ApFieldNumberProps> & Readonly<{
                 "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-            }>, "blur" | "focus" | ("step" | "disabled" | "bordered" | "keyboard" | "max" | "min" | "controls" | "emptyText" | "thousands")> & ShallowUnwrapRef<{
+            }>, "blur" | "focus" | ("step" | "disabled" | "keyboard" | "bordered" | "max" | "min" | "controls" | "emptyText" | "thousands")> & ShallowUnwrapRef<{
                 focus: () => void;
                 blur: () => void;
             }> & {} & ComponentCustomProperties & {} & {
@@ -1727,11 +1727,11 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly direction?: "ltr" | "rtl" | undefined;
                     readonly animation?: string | undefined;
                     readonly children?: VueNode[] | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly transitionName?: string | undefined;
                     readonly autofocus?: boolean | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly getPopupContainer?: RenderDOMFunc | undefined;
                     readonly placeholder?: any;
                     readonly defaultValue?: SelectValue;
@@ -2225,9 +2225,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     open: boolean;
                     multiple: boolean;
                     disabled: boolean;
-                    bordered: boolean;
                     loading: boolean;
                     autofocus: boolean;
+                    bordered: boolean;
                     virtual: boolean;
                     lazy: boolean;
                     allowClear: boolean;
@@ -2266,9 +2266,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 open: boolean;
                 multiple: boolean;
                 disabled: boolean;
-                bordered: boolean;
                 loading: boolean;
                 autofocus: boolean;
+                bordered: boolean;
                 virtual: boolean;
                 lazy: boolean;
                 allowClear: boolean;
@@ -2284,7 +2284,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 searchDelay: number;
             }> & Omit<Readonly< ApFieldSelectProps> & Readonly<{
                 "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "bordered" | "loading" | "autofocus" | "virtual" | "lazy" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "defaultActiveFirstOption" | "labelInValue" | "emptyText" | "searchMode" | "refetchOnFocus" | "searchDelay")> & ShallowUnwrapRef<{
+            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "loading" | "autofocus" | "bordered" | "virtual" | "lazy" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "defaultActiveFirstOption" | "labelInValue" | "emptyText" | "searchMode" | "refetchOnFocus" | "searchDelay")> & ShallowUnwrapRef<{
                 focus: () => void;
                 blur: () => void;
                 request: (clear?: boolean) => Promise<void>;
@@ -2515,12 +2515,12 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly direction?: "ltr" | "rtl" | undefined;
                     readonly animation?: string | undefined;
                     readonly children?: VueNode[] | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly transitionName?: string | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((value: any) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly getPopupContainer?: RenderDOMFunc | undefined;
                     readonly placeholder?: any;
                     readonly defaultValue?: unknown;
@@ -3158,9 +3158,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     open: boolean;
                     multiple: boolean;
                     disabled: boolean;
-                    bordered: boolean;
                     loading: boolean;
                     autofocus: boolean;
+                    bordered: boolean;
                     virtual: boolean;
                     dropdownMatchSelectWidth: number | boolean;
                     allowClear: boolean;
@@ -3198,9 +3198,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 open: boolean;
                 multiple: boolean;
                 disabled: boolean;
-                bordered: boolean;
                 loading: boolean;
                 autofocus: boolean;
+                bordered: boolean;
                 virtual: boolean;
                 dropdownMatchSelectWidth: number | boolean;
                 allowClear: boolean;
@@ -3215,7 +3215,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 emptyText: string;
             }> & Omit<Readonly< ApFieldTreeSelectProps> & Readonly<{
                 "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "bordered" | "loading" | "autofocus" | "virtual" | "dropdownMatchSelectWidth" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "labelInValue" | "treeCheckable" | "treeDefaultExpandAll" | "treeCheckStrictly" | "emptyText")> & ShallowUnwrapRef<{
+            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "loading" | "autofocus" | "bordered" | "virtual" | "dropdownMatchSelectWidth" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "labelInValue" | "treeCheckable" | "treeDefaultExpandAll" | "treeCheckStrictly" | "emptyText")> & ShallowUnwrapRef<{
                 blur: () => void;
                 focus: () => void;
                 request: (currentNode?: LegacyDataNode, clear?: boolean) => Promise<void>;