@aplus-frontend/ui 0.2.14 → 0.2.16

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

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

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

@@ -8546,4 +8546,5 @@ export declare function getTableTitle(column: ApColumnType<any>, titleNodeClassN
     [key: string]: any;
 }> | ((props: ColumnTitleProps<any>) => VNodeArrayChildren | VueNode) | null;
 export declare function recursionApColumns<ReturnType = any>(columns: (ColumnType | ColumnGroupType<any>)[], handler: (column: ColumnType) => ReturnType): ReturnType[];
+export declare function isEqualCustom(value: any, other: any): boolean | undefined;
 export {};

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

@@ -1,32 +1,32 @@
-import { isVNode as b, createVNode as u, mergeProps as a, cloneVNode as T, Fragment as h } from "vue";
-import { isObject as f, isArray as p, isUndefined as g, isFunction as d, omit as j, isBoolean as O, isString as E } from "lodash-unified";
-import { apTableRenderItemMap as F, apTableFormItemMap as N } from "./constants.mjs";
-import { isType as S } from "@fruits-chain/utils";
+import { isVNode as g, createVNode as u, mergeProps as m, cloneVNode as h, Fragment as j } from "vue";
+import { isObject as a, isArray as l, isUndefined as E, isFunction as y, omit as O, isBoolean as F, isString as N, isEqual as S, sortBy as p, isPlainObject as d, every as I, isEmpty as v } from "lodash-unified";
+import { apTableRenderItemMap as C, apTableFormItemMap as P } from "./constants.mjs";
+import { isType as V } from "@fruits-chain/utils";
 import "../ap-form/index.mjs";
-import { Tooltip as v } from "@aplus-frontend/antdv";
-import { QuestionCircleOutlined as I } from "@ant-design/icons-vue";
-import C from "../ap-form/item/index.vue.mjs";
-function V(t) {
-  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !b(t);
+import { Tooltip as w } from "@aplus-frontend/antdv";
+import { QuestionCircleOutlined as A } from "@ant-design/icons-vue";
+import x from "../ap-form/item/index.vue.mjs";
+function _(t) {
+  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !g(t);
 }
-const w = (t, e, n) => {
-  let i = {};
-  return f(t) ? Object.keys(t).forEach((o) => {
-    f(t[o]) ? i[o] = w(t[o], e[o], n) : i[o] = n(t[o], e);
-  }) : i = n(t, e), i;
-}, Q = (t, e) => {
+const q = (t, e, n) => {
+  let o = {};
+  return a(t) ? Object.keys(t).forEach((r) => {
+    a(t[r]) ? o[r] = q(t[r], e[r], n) : o[r] = n(t[r], e);
+  }) : o = n(t, e), o;
+}, X = (t, e) => {
   switch (t) {
     case "dayjs":
       return e.valueOf();
     case "dayjsRange":
       return e.map((n) => n.valueOf());
     case "dayjsDayRange": {
-      const [n, i] = e;
-      return [n.startOf("day").valueOf(), i.endOf("day").valueOf()];
+      const [n, o] = e;
+      return [n.startOf("day").valueOf(), o.endOf("day").valueOf()];
     }
     case "multiple":
     case "multipleNumber":
-      return p(e) ? e : [e];
+      return l(e) ? e : [e];
     case "boolean":
       return e;
     case "object":
@@ -35,103 +35,103 @@ const w = (t, e, n) => {
       return e;
   }
 };
-function U(t) {
-  return p(t) ? t.join(".") : t;
+function Y(t) {
+  return l(t) ? t.join(".") : t;
 }
-function A(t) {
+function W(t) {
   const e = Object.prototype.toString.call(t).match(/^\[object (.*)\]$/)[1].toLowerCase();
   return e === "string" && typeof t == "object" ? "object" : t === null ? "null" : t === void 0 ? "undefined" : e;
 }
-const P = (t) => A(t) === "map" ? t : new Map(Object.entries(t || {})), m = (t) => {
-  const e = [], n = P(t);
-  return n.forEach((i, o) => {
-    const r = n.get(o) || n.get(`${o}`);
-    if (r) {
-      if (typeof r == "object" && (r != null && r.text)) {
+const B = (t) => W(t) === "map" ? t : new Map(Object.entries(t || {})), b = (t) => {
+  const e = [], n = B(t);
+  return n.forEach((o, r) => {
+    const i = n.get(r) || n.get(`${r}`);
+    if (i) {
+      if (typeof i == "object" && (i != null && i.text)) {
         e.push({
-          text: r == null ? void 0 : r.text,
-          value: o,
-          label: r == null ? void 0 : r.text,
-          disabled: r.disabled
+          text: i == null ? void 0 : i.text,
+          value: r,
+          label: i == null ? void 0 : i.text,
+          disabled: i.disabled
         });
         return;
       }
       e.push({
-        text: r,
-        label: r,
-        value: o
+        text: i,
+        label: i,
+        value: r
       });
     }
   }), e;
-}, z = (t) => g(t) || t < 0 ? 0 : t;
-function x(t, e) {
-  return !t || !d(t) ? t : t(e);
+}, Z = (t) => E(t) || t < 0 ? 0 : t;
+function R(t, e) {
+  return !t || !y(t) ? t : t(e);
 }
-function G(t) {
+function k(t) {
   let e = t.valueType || "text";
   return t.valueEnum && (e = "status"), e;
 }
-function K(t, e, n, i) {
+function H(t, e, n, o) {
   var s;
-  const o = F[t];
-  if (o)
-    return u(o, a(e, {
+  const r = C[t];
+  if (r)
+    return u(r, m(e, {
       mode: "read"
     }), null);
-  const r = i == null ? void 0 : i[t];
-  return ((s = r == null ? void 0 : r.render) == null ? void 0 : s.call(r, e.value, n, e)) || e.value;
+  const i = o == null ? void 0 : o[t];
+  return ((s = i == null ? void 0 : i.render) == null ? void 0 : s.call(i, e.value, n, e)) || e.value;
 }
-function X(t, e) {
+function M(t, e) {
   if (t.customRenderFormItem)
     return () => {
-      const o = t.customRenderFormItem(t);
-      return T(o, {
+      const r = t.customRenderFormItem(t);
+      return h(r, {
         ...t.fieldProps,
         span: t.span,
-        ...o.props || {}
+        ...r.props || {}
       });
     };
-  const n = N[t.valueType];
+  const n = P[t.valueType];
   if (n)
     return n;
-  const i = e == null ? void 0 : e[t.valueType];
+  const o = e == null ? void 0 : e[t.valueType];
   return () => {
-    var r;
-    const o = (r = i == null ? void 0 : i.renderFormItem) == null ? void 0 : r.call(i, t.fieldProps.field);
-    return o ? u(C, a(t.fieldProps, {
+    var i;
+    const r = (i = o == null ? void 0 : o.renderFormItem) == null ? void 0 : i.call(o, t.fieldProps.field);
+    return r ? u(x, m(t.fieldProps, {
       span: t.span
-    }), V(o) ? o : {
-      default: () => [o]
+    }), _(r) ? r : {
+      default: () => [r]
     }) : null;
   };
 }
-function Y(t, e) {
-  const n = x(t.fieldProps, e), i = (n == null ? void 0 : n.field) || n || {}, o = t.valueType === "switch", r = t.valueType === "index", s = o ? {
+function tt(t, e) {
+  const n = R(t.fieldProps, e), o = (n == null ? void 0 : n.field) || n || {}, r = t.valueType === "switch", i = t.valueType === "index", s = r ? {
     checked: e.value
   } : {
-    value: r ? e.index + 1 : e.value
+    value: i ? e.index + 1 : e.value
   };
-  return t.valueEnum && (i.valueEnum = t.valueEnum), {
-    ...j(i, ["request"]),
+  return t.valueEnum && (o.valueEnum = t.valueEnum), {
+    ...O(o, ["request"]),
     ...s
   };
 }
-function Z(t) {
+function et(t) {
   const e = {
     ...t
   };
-  return O(t.filters) && t.filters && t.valueEnum && (e.filters = m(t.valueEnum)), e;
+  return F(t.filters) && t.filters && t.valueEnum && (e.filters = b(t.valueEnum)), e;
 }
-function k(t, e) {
-  var i;
+function nt(t, e) {
+  var o;
   const n = e || {};
-  return t.valueEnum && !((i = n.field) != null && i.options) && (n.field = {
+  return t.valueEnum && !((o = n.field) != null && o.options) && (n.field = {
     ...n.field,
-    options: m(t.valueEnum)
+    options: b(t.valueEnum)
   }), n;
 }
-function H(t) {
-  if (!S("Object")(t))
+function rt(t) {
+  if (!V("Object")(t))
     return t;
   try {
     return JSON.stringify(t);
@@ -139,60 +139,70 @@ function H(t) {
     return t;
   }
 }
-function M(t, e, n, i) {
-  const o = n == null ? void 0 : n({
+function ot(t, e, n, o) {
+  const r = n == null ? void 0 : n({
     title: t.title,
     column: t
-  }), r = (o == null ? void 0 : o.filter((y) => y.type !== Symbol.for("v-cmt"))) || [];
-  if (o && r.length > 0)
-    return o;
-  const l = E(t.title) ? u("span", {
+  }), i = (r == null ? void 0 : r.filter((T) => T.type !== Symbol.for("v-cmt"))) || [];
+  if (r && i.length > 0)
+    return r;
+  const c = N(t.title) ? u("span", {
     class: e,
     title: t.title
-  }, [t.title]) : t.title, c = t.tooltip ? d(t.tooltip) ? t.tooltip(t) : u(h, null, [t.tooltip]) : null;
-  return c ? u("span", {
+  }, [t.title]) : t.title, f = t.tooltip ? y(t.tooltip) ? t.tooltip(t) : u(j, null, [t.tooltip]) : null;
+  return f ? u("span", {
     style: {
       display: "inline-flex",
       alignItems: "center",
       maxWidth: "100%"
     }
-  }, [l, u(v, {
-    title: c,
+  }, [c, u(w, {
+    title: f,
     placement: "bottom"
   }, {
-    default: () => [u(I, {
+    default: () => [u(A, {
       style: {
         padding: "4px",
-        color: i,
+        color: o,
         verticalAlign: "middle"
       }
     }, null)]
-  })]) : l;
+  })]) : c;
 }
-function tt(t, e) {
+function it(t, e) {
   const n = [];
-  function i(o) {
-    var r;
-    for (const s of o)
-      (r = s.children) != null && r.length ? i(s.children) : n.push(e(s));
+  function o(r) {
+    var i;
+    for (const s of r)
+      (i = s.children) != null && i.length ? o(s.children) : n.push(e(s));
+  }
+  return o(t), n;
+}
+function st(t, e) {
+  if (l(t) && l(e))
+    return S(p(t), p(e));
+  if (d(t) && d(e)) {
+    const n = (o) => I(o, (r) => r == null) || v(o);
+    if (n(t) && n(e))
+      return !0;
   }
-  return i(t), n;
 }
 export {
-  Z as apColumnToColumn,
-  U as dataIndexToStr,
-  w as formatParamsValueType,
-  z as getColumnOrder,
-  x as getFieldProps,
-  X as getSearchFormItemRenderNode,
-  K as getTableCellRenderNode,
-  Y as getTableRenderProps,
-  G as getTableRenderType,
-  M as getTableTitle,
-  P as objectToMap,
-  H as objectToString,
-  Q as parseFieldValue,
-  tt as recursionApColumns,
-  k as updateFormProps,
-  m as valueEnumToArray
+  et as apColumnToColumn,
+  Y as dataIndexToStr,
+  q as formatParamsValueType,
+  Z as getColumnOrder,
+  R as getFieldProps,
+  M as getSearchFormItemRenderNode,
+  H as getTableCellRenderNode,
+  tt as getTableRenderProps,
+  k as getTableRenderType,
+  ot as getTableTitle,
+  st as isEqualCustom,
+  B as objectToMap,
+  rt as objectToString,
+  X as parseFieldValue,
+  it as recursionApColumns,
+  nt as updateFormProps,
+  b as valueEnumToArray
 };