@aplus-frontend/ui 7.13.8 → 7.13.10

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

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

package/es/src/ap-table/style/setting.mjs

@@ -250,7 +250,7 @@ const o = (e) => {
           marginBottom: 0
         },
         "&:hover": {
-          backgroundColor: e.calc(e.colorPrimary).colorMix(5),
+          backgroundColor: e.colorBg3,
           cursor: "pointer",
           [`${e.componentCls}-template-item-action-wrapper`]: {
             display: "flex"
@@ -273,7 +273,7 @@ const o = (e) => {
       },
       [`${i}-active`]: {
         backgroundColor: e.calc(e.colorPrimary).colorMix(5),
-        "&-label": {
+        [`${i}-label`]: {
           color: e.colorPrimary
         }
       }

package/es/src/business/ag-grid-modal/modal-layout/index.vue2.mjs

@@ -1,12 +1,12 @@
-import { defineComponent as I, computed as M, createElementBlock as f, renderSlot as n, openBlock as i, normalizeStyle as v, normalizeClass as r, unref as e, createElementVNode as d, createBlock as h, createCommentVNode as b, withCtx as s, resolveDynamicComponent as O, h as V, Fragment as S, createVNode as y, createTextVNode as T, toDisplayString as k, renderList as w } from "vue";
-import { Button as L, Empty as C } from "@aplus-frontend/antdv";
-import { ApTitle as x } from "../../ap-title/index.mjs";
+import { defineComponent as M, computed as O, createElementBlock as m, renderSlot as a, openBlock as n, normalizeStyle as g, normalizeClass as o, unref as e, createElementVNode as s, createBlock as v, createCommentVNode as h, withCtx as i, resolveDynamicComponent as V, h as w, Fragment as b, createVNode as p, createTextVNode as S, toDisplayString as T, renderList as L } from "vue";
+import { Button as j, Empty as k } from "@aplus-frontend/antdv";
+import { ApTitle as C } from "../../ap-title/index.mjs";
 import "../../../config-provider/index.mjs";
-import { useAgGridModalInject as j } from "../hooks/use-ag-grid-instance.mjs";
+import { useAgGridModalInject as x } from "../hooks/use-ag-grid-instance.mjs";
 import D from "../style/index.mjs";
 import { useLocale as z } from "../../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as G } from "../../../config-provider/hooks/use-namespace.mjs";
-const W = /* @__PURE__ */ I({
+const U = /* @__PURE__ */ M({
   __name: "index",
   props: {
     leftTitle: { type: [String, Object, Number, Boolean, null, Array], default: "" },
@@ -15,93 +15,93 @@ const W = /* @__PURE__ */ I({
     bordered: { type: Boolean },
     layoutType: { default: void 0 }
   },
-  setup(l) {
-    const { t: p } = z(), c = j(), a = M(() => c?.selectedRows?.value || []), g = l, B = () => {
-      if (g.dividerOffset != null)
+  setup(B) {
+    const { t: f } = z(), d = x(), r = O(() => d?.selectedRows?.value || []), y = B, E = () => {
+      if (y.dividerOffset != null)
         return {
-          "--ag-grid-modal-layout-divider-offset": `${g.dividerOffset}px`
+          "--ag-grid-modal-layout-divider-offset": `${y.dividerOffset}px`
         };
-    }, E = () => {
-      c?.clearAllSelected();
+    }, $ = () => {
+      d?.clearAllSelected();
     }, u = (t) => {
-      c?.removeSelected(t);
-    }, { e: $, m: o, b: A } = G("ag-grid-modal"), N = D("ag-grid-modal");
-    return (t, P) => l.layoutType === "two-column" ? (i(), f("div", {
+      d?.removeSelected(t);
+    }, { e: A, m: l, b: N } = G("ag-grid-modal"), I = D("ag-grid-modal");
+    return (t, P) => t.layoutType === "two-column" ? (n(), m("div", {
       key: 0,
-      class: r([e(A)(), e(o)("table-layout"), l.bordered ? e(o)("bordered") : "", e(N)]),
-      style: v(B())
+      class: o([e(N)(), e(l)("table-layout"), t.bordered ? e(l)("bordered") : "", e(I)]),
+      style: g(E())
     }, [
-      d("div", {
-        class: r(e(o)("table-layout-left"))
+      s("div", {
+        class: o(e(l)("table-layout-left"))
       }, [
-        l.leftTitle ? (i(), h(e(x), {
+        t.leftTitle ? (n(), v(e(C), {
           key: 0,
           style: { "margin-bottom": "16px" }
         }, {
-          prefix: s(() => [
-            (i(), h(O(V(S, [l.leftTitle]))))
+          prefix: i(() => [
+            (n(), v(V(w(b, [t.leftTitle]))))
           ]),
           _: 1
-        })) : b("", !0),
-        d("div", {
-          class: r(e(o)("table-layout-left-content"))
+        })) : h("", !0),
+        s("div", {
+          class: o(e(l)("table-layout-left-content"))
         }, [
-          n(t.$slots, "default")
+          a(t.$slots, "default")
         ], 2)
       ], 2),
-      d("div", {
-        class: r(e(o)("table-layout-right")),
-        style: v(l.rightContentStyle)
+      s("div", {
+        class: o(e(l)("table-layout-right")),
+        style: g(t.rightContentStyle)
       }, [
-        y(e(x), null, {
-          prefix: s(() => [
-            n(t.$slots, "rightTitle", {
-              count: a.value.length
+        p(e(C), null, {
+          prefix: i(() => [
+            a(t.$slots, "rightTitle", {
+              count: r.value.length
             }, () => [
-              T(k(`${e(p)("ap.apTableModal.selected")} (${a.value.length})`), 1)
+              S(T(`${e(f)("ap.apTableModal.selected")} (${r.value.length})`), 1)
             ])
           ]),
-          suffix: s(() => [
-            y(e(L), {
+          suffix: i(() => [
+            p(e(j), {
               type: "link",
               style: { padding: "0px", height: "22px", "border-width": "0px" },
-              onClick: E
+              onClick: $
             }, {
-              default: s(() => [
-                T(k(e(p)("ap.apTableModal.clear")), 1)
+              default: i(() => [
+                S(T(e(f)("ap.apTableModal.clear")), 1)
               ]),
               _: 1
             })
           ]),
           _: 3
         }),
-        d("div", {
-          class: r(e(o)("table-layout-right-content"))
+        s("div", {
+          class: o(e(l)("table-layout-right-content"))
         }, [
-          (i(!0), f(S, null, w(a.value, (m) => n(t.$slots, "renderSelectedItem", {
-            key: m,
-            record: m,
-            actions: { deleteItem: u, deleteCurrent: () => u(m) }
+          (n(!0), m(b, null, L(r.value, (c) => a(t.$slots, "renderSelectedItem", {
+            key: c,
+            record: c,
+            actions: { deleteItem: u, deleteCurrent: () => u(c) }
           })), 128)),
-          a.value.length === 0 ? (i(), f("div", {
+          r.value.length === 0 ? (n(), m("div", {
             key: 0,
-            class: r(e($)("empty"))
+            class: o(e(A)("empty"))
           }, [
-            y(e(C), {
-              image: e(C).PRESENTED_IMAGE_SIMPLE
+            p(e(k), {
+              image: e(k).PRESENTED_IMAGE_SIMPLE
             }, null, 8, ["image"])
-          ], 2)) : b("", !0)
+          ], 2)) : h("", !0)
         ], 2),
-        d("div", null, [
-          n(t.$slots, "rightBottom", {
-            records: a.value,
+        s("div", null, [
+          a(t.$slots, "rightBottom", {
+            records: r.value,
             actions: { deleteItem: u }
           })
         ])
       ], 6)
-    ], 6)) : n(t.$slots, "default", { key: 1 });
+    ], 6)) : a(t.$slots, "default", { key: 1 });
   }
 });
 export {
-  W as default
+  U as default
 };

package/es/src/business/ag-grid-modal/selected-items/default.vue2.mjs

@@ -1,30 +1,30 @@
-import { defineComponent as d, createElementBlock as p, openBlock as f, normalizeClass as l, unref as e, normalizeStyle as u, createElementVNode as o, renderSlot as y, createVNode as k } from "vue";
-import { IconApAdLineCloseDrawer as C } from "@aplus-frontend/icon";
+import { defineComponent as m, createElementBlock as p, openBlock as d, normalizeClass as l, unref as e, normalizeStyle as f, createElementVNode as s, renderSlot as u, createVNode as y } from "vue";
+import { IconApAdLineCloseDrawer as k } from "@aplus-frontend/icon";
 import "../../../config-provider/index.mjs";
 import _ from "../style/selected-items.mjs";
-import { useNamespace as h } from "../../../config-provider/hooks/use-namespace.mjs";
-const v = /* @__PURE__ */ d({
+import { useNamespace as C } from "../../../config-provider/hooks/use-namespace.mjs";
+const v = /* @__PURE__ */ m({
   __name: "default",
   props: {
     style: { type: [Boolean, null, String, Object, Array] }
   },
   emits: ["clickDel"],
-  setup(s, { emit: n }) {
-    const { e: t, b: c } = h("ap-selected-items"), a = _("ap-selected-items"), r = n, i = () => r("clickDel");
-    return (m, S) => (f(), p("div", {
-      style: u(s.style),
-      class: l([e(c)(), e(t)("default"), e(a)])
+  setup(h, { emit: n }) {
+    const { e: t, b: r } = C("ap-selected-items"), a = _("ap-selected-items"), c = n, i = () => c("clickDel");
+    return (o, S) => (d(), p("div", {
+      style: f(o.style),
+      class: l([e(r)(), e(t)("default"), e(a)])
     }, [
-      o("div", {
+      s("div", {
         class: l(e(t)("default-content"))
       }, [
-        y(m.$slots, "default")
+        u(o.$slots, "default")
       ], 2),
-      o("span", {
+      s("span", {
         class: l(e(t)("del-icon")),
         onClick: i
       }, [
-        k(e(C))
+        y(e(k))
       ], 2)
     ], 6));
   }