@aplus-frontend/ui 7.19.0-beta.2 → 7.19.0

package/es/src/ap-table/components/setting/modal/index.vue.mjs

@@ -1,6 +1,6 @@
-import { defineComponent as fe, ref as v, computed as U, watch as k, toRef as de, useSlots as ge, createVNode as l, cloneVNode as ve, unref as e, createElementBlock as E, openBlock as T, Fragment as ye, createBlock as K, createCommentVNode as j, resolveDynamicComponent as B, withCtx as s, withDirectives as Se, createElementVNode as m, normalizeClass as u, toDisplayString as y, createTextVNode as _, isRef as he, vShow as Te } from "vue";
+import { defineComponent as fe, ref as g, computed as U, watch as z, toRef as de, useSlots as ve, createVNode as l, cloneVNode as ge, unref as e, createElementBlock as E, openBlock as T, Fragment as ye, createBlock as B, createCommentVNode as j, resolveDynamicComponent as N, withCtx as s, withDirectives as Se, createElementVNode as m, normalizeClass as u, toDisplayString as y, createTextVNode as x, isRef as he, vShow as Te } from "vue";
 import { SettingOutlined as Ce, SaveOutlined as be } from "@ant-design/icons-vue";
-import { Button as F, Modal as ke, Divider as N, RadioGroup as _e, RadioButton as M, Flex as ze, Space as q, Popover as xe } from "@aplus-frontend/antdv";
+import { Button as F, Modal as ke, Divider as $, RadioGroup as _e, RadioButton as M, Flex as ze, Space as q, Popover as xe } from "@aplus-frontend/antdv";
 import "../../../../ap-button/index.mjs";
 import { randomStr as Ae } from "../../../../utils/index.mjs";
 import "../../../../config-provider/index.mjs";
@@ -14,7 +14,7 @@ import "../sorter/index.vue.mjs";
 import "../template/edit-form.vue.mjs";
 import "../template/index.vue.mjs";
 import "../tree-select/index.vue.mjs";
-import Re, { customCloneColumnStates as $, isEqualColumnStateIgnoreLabel as Ve } from "../utils.mjs";
+import Re, { customCloneColumnStates as I, isEqualColumnStateIgnoreLabel as Ve } from "../utils.mjs";
 import { useLocale as De } from "../../../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as G } from "../../../../config-provider/hooks/use-namespace.mjs";
 import Le from "../template/index.vue2.mjs";
@@ -41,26 +41,27 @@ const je = {
       columnsBackup: J,
       updateSize: Q,
       updateColumns: W
-    } = Ke(), f = v(), z = U(() => c.config.persistenceKey), C = v(!1), {
+    } = Ke(), f = g(), C = U(() => c.config.persistenceKey), b = g(!1), {
       basicTemplate: X,
       customizeTemplateList: S,
       addTemplate: Y,
-      deleteTemplate: I,
+      deleteTemplate: R,
       updateTemplate: Z
-    } = Ne(c.config, z, pe), {
+    } = Ne(c.config, C, pe), {
       columnState: p,
-      setColumnState: R,
+      setColumnState: V,
       isAllSelected: ee,
       toggleSelectAll: te
-    } = Be([]), V = U(() => `${z.value}__active_key`);
+    } = Be([]), k = U(() => C.value && `${C.value}__active_key`);
     function D(a) {
-      localStorage.setItem(V.value, a);
+      k.value && localStorage.setItem(k.value, a);
     }
-    function x() {
-      return localStorage.getItem(V.value);
+    function A() {
+      if (k.value)
+        return localStorage.getItem(k.value);
     }
-    const o = v(c.config.defaultActiveKey ?? x());
-    k(() => S.value, (a) => {
+    const o = g(c.config.defaultActiveKey ?? A());
+    z(() => S.value, (a) => {
       a.length && !o.value && (o.value = a[0]?.key);
     }, {
       immediate: !0
@@ -72,27 +73,27 @@ const je = {
     const {
       t: r
     } = De(), {
-      b: g,
-      be: b
+      b: v,
+      be: _
     } = G("ap-column-setting"), {
       b: ae
-    } = G("ap-table"), ne = $e("ap-column-setting"), h = v(!1), L = v(!1), le = ge(), O = we(le.trigger) || l(F, {
+    } = G("ap-table"), ne = $e("ap-column-setting"), h = g(!1), L = g(!1), le = ve(), O = we(le.trigger) || l(F, {
       icon: l(Ce, null, null),
       class: ae("setting-trigger-button")
-    }, null), P = O ? ve(O, {
+    }, null), P = O ? ge(O, {
       onClick: () => {
         h.value = !0;
       }
     }) : null;
     function oe() {
-      R($(e(X).columnState));
+      V(I(e(X).columnState));
     }
-    function A(a, t) {
+    function w(a, t) {
       W?.(Re(e(J), a)), Q?.(t);
     }
     function ie() {
-      A(e(p), e(f)), h.value = !1;
-      const a = $(p.value), t = Z(o.value, {
+      w(e(p), e(f)), h.value = !1;
+      const a = I(p.value), t = Z(o.value, {
         columnState: a,
         size: f.value
       });
@@ -105,34 +106,33 @@ const je = {
         columnState: p.value,
         size: f.value
       };
-      Y(n), C.value = !1, o.value = t, c.config.onChange?.(n.columnState, n);
+      Y(n), b.value = !1, o.value = t, c.config.onChange?.(n.columnState, n);
     }
     function re(a, t) {
-      console.log(a, t);
       const n = [...t].find((i) => i?.key === a);
-      n && (R($(n.columnState)), f.value = n.size);
+      n && (V(I(n.columnState)), f.value = n.size);
     }
     function ue(a) {
       if (a !== o.value) {
-        I(a);
+        R(a);
         return;
       }
       const t = S.value, n = t.findIndex((d) => d.key === a), i = t[n + 1]?.key ?? t[n - 1]?.key;
-      I(a), o.value = i, D(i);
+      R(a), o.value = i, D(i);
     }
     function ce(a) {
       if (L.value = a, !a) {
-        const t = x();
+        const t = A();
         t && t !== o.value && (o.value = t);
       }
     }
     function pe(a) {
-      const t = x() ?? a[0].key;
+      const t = A() ?? a[0].key;
       o.value = t;
       const n = [...a].find((i) => i?.key === t);
-      n && A(n.columnState, n.size);
+      n && w(n.columnState, n.size);
     }
-    k(
+    z(
       [o, S],
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       ([a, t], [n, i]) => {
@@ -140,7 +140,7 @@ const je = {
           const d = [...t].find((me) => me.key === a);
           if (!d)
             return;
-          A(d.columnState, d.size);
+          w(d.columnState, d.size);
         }
         re(a, t);
       },
@@ -148,19 +148,19 @@ const je = {
         immediate: !0
       }
     );
-    const w = v(!1);
-    return k([f, p, h], ([a, t, n]) => {
+    const K = g(!1);
+    return z([f, p, h], ([a, t, n]) => {
       if (!n)
         return;
       const i = S.value.find((d) => d.key === o.value);
-      i && (i.size !== a || !Ve(t, i.columnState)) ? w.value = !0 : w.value = !1;
+      i && (i.size !== a || !Ve(t, i.columnState)) ? K.value = !0 : K.value = !1;
     }, {
       deep: !0
-    }), k(() => o.value, (a) => {
+    }), z(() => o.value, (a) => {
       c.config.onActiveChange?.(a);
     }, {
       immediate: !0
-    }), (a, t) => (T(), E(ye, null, [e(P) ? (T(), K(B(e(P)), {
+    }), (a, t) => (T(), E(ye, null, [e(P) ? (T(), B(N(e(P)), {
       key: 0
     })) : j("", !0), l(e(ke), {
       open: h.value,
@@ -173,7 +173,7 @@ const je = {
         height: "516px"
       },
       "after-open-change": ce,
-      "wrap-class-name": `${e(g)()} ${e(ne)}`,
+      "wrap-class-name": `${e(v)()} ${e(ne)}`,
       "ok-text": e(r)("ap.apTable.setting.saveAndApply"),
       "mask-closable": !1,
       onOk: ie
@@ -187,8 +187,8 @@ const je = {
           size: 12
         }, {
           default: s(() => [l(e(xe), {
-            open: C.value,
-            "onUpdate:open": t[3] || (t[3] = (i) => C.value = i),
+            open: b.value,
+            "onUpdate:open": t[3] || (t[3] = (i) => b.value = i),
             trigger: "click",
             arrow: !1,
             placement: "topLeft",
@@ -196,57 +196,57 @@ const je = {
           }, {
             content: s(() => [l(Ee, {
               onConfirm: se,
-              onCancel: t[2] || (t[2] = () => C.value = !1)
+              onCancel: t[2] || (t[2] = () => b.value = !1)
             })]),
             default: s(() => [l(e(Ue), {
               type: "borderLink",
               disabled: !a.config.persistenceKey
             }, {
               icon: s(() => [l(e(be))]),
-              default: s(() => [_(y(e(r)("ap.apTable.setting.saveAsTemplate")) + " ", 1)]),
+              default: s(() => [x(y(e(r)("ap.apTable.setting.saveAsTemplate")) + " ", 1)]),
               _: 1
             }, 8, ["disabled"])]),
             _: 1
-          }, 8, ["open"]), w.value ? (T(), E("span", {
+          }, 8, ["open"]), K.value ? (T(), E("span", {
             key: 0,
-            class: u(e(g)("modify-tip"))
+            class: u(e(v)("modify-tip"))
           }, y(e(r)("ap.apTable.setting.modifyNotification")), 3)) : j("", !0)]),
           _: 1
         }), l(e(q), {
           size: 10
         }, {
-          default: s(() => [(T(), K(B(n.cancelBtn))), (T(), K(B(n.okBtn)))]),
+          default: s(() => [(T(), B(N(n.cancelBtn))), (T(), B(N(n.okBtn)))]),
           _: 2
         }, 1024)]),
         _: 2
       }, 1024)]),
       default: s(() => [Se(m("div", {
-        class: u(e(g)("wrapper"))
+        class: u(e(v)("wrapper"))
       }, [m("div", {
-        class: u(e(g)("left"))
+        class: u(e(v)("left"))
       }, [l(Le, {
         "customize-template-list": e(S),
-        "persistence-key": z.value
-      }, null, 8, ["customize-template-list", "persistence-key"])], 2), l(e(N), {
+        "persistence-key": C.value
+      }, null, 8, ["customize-template-list", "persistence-key"])], 2), l(e($), {
         type: "vertical",
         style: {
           height: "100%",
           margin: "0px"
         }
       }), m("div", {
-        class: u(e(g)("center"))
+        class: u(e(v)("center"))
       }, [m("div", {
-        class: u(e(b)("center", "header"))
+        class: u(e(_)("center", "header"))
       }, [m("div", {
-        class: u(e(b)("center", "tip-wrapper"))
+        class: u(e(_)("center", "tip-wrapper"))
       }, [m("span", {
-        class: u(e(b)("center", "header-tips"))
+        class: u(e(_)("center", "header-tips"))
       }, y(e(r)("ap.apTable.setting.selectAllTip")), 3), l(e(F), {
         type: "link",
         size: "small",
         onClick: e(te)
       }, {
-        default: s(() => [_(y(e(ee) ? e(r)("ap.apTable.setting.unSelectAll") : e(r)("ap.apTable.setting.selectAll")), 1)]),
+        default: s(() => [x(y(e(ee) ? e(r)("ap.apTable.setting.unSelectAll") : e(r)("ap.apTable.setting.selectAll")), 1)]),
         _: 1
       }, 8, ["onClick"])], 2), l(e(_e), {
         value: f.value,
@@ -255,31 +255,31 @@ const je = {
         default: s(() => [l(e(M), {
           value: "small"
         }, {
-          default: s(() => [_(y(e(r)("ap.apTable.setting.sizeSmall")), 1)]),
+          default: s(() => [x(y(e(r)("ap.apTable.setting.sizeSmall")), 1)]),
           _: 1
         }), l(e(M), {
           value: "middle"
         }, {
-          default: s(() => [_(y(e(r)("ap.apTable.setting.sizeNormal")), 1)]),
+          default: s(() => [x(y(e(r)("ap.apTable.setting.sizeNormal")), 1)]),
           _: 1
         })]),
         _: 1
-      }, 8, ["value"])], 2), m("div", je, [l(e(N), {
+      }, 8, ["value"])], 2), m("div", je, [l(e($), {
         dashed: "",
         style: {
           margin: "0px"
         }
       })]), l(Oe, {
-        class: u(e(b)("center", "content")),
+        class: u(e(_)("center", "content")),
         value: e(p)
-      }, null, 8, ["class", "value"])], 2), l(e(N), {
+      }, null, 8, ["class", "value"])], 2), l(e($), {
         type: "vertical",
         style: {
           height: "100%",
           margin: "0px"
         }
       }), m("div", {
-        class: u(e(g)("right"))
+        class: u(e(v)("right"))
       }, [l(Pe, {
         value: e(p),
         "onUpdate:value": t[1] || (t[1] = (n) => he(p) ? p.value = n : null),

package/es/src/ap-table/hooks/use-table-template-storage.mjs

@@ -1,8 +1,8 @@
 import { useToken as G } from "@aplus-frontend/antdv/es/theme/internal";
-import { isBoolean as P, isNumber as S, isObject as b, mergeWith as z, omit as R, isString as U } from "lodash-unified";
-import { ref as y, watch as d, unref as v } from "vue";
+import { isBoolean as P, isNumber as b, isObject as y, mergeWith as E, omit as R, isString as U } from "lodash-unified";
+import { ref as k, watch as d, unref as v } from "vue";
 import "../../config-provider/index.mjs";
-import { randomStr as E } from "../../utils/index.mjs";
+import { randomStr as N } from "../../utils/index.mjs";
 import { getColumnStateString as W } from "../components/setting/utils.mjs";
 import { useInjectApTable as X } from "../context.mjs";
 import { getTableTitle as q } from "../utils.mjs";
@@ -11,16 +11,16 @@ import { useNamespace as H } from "../../config-provider/hooks/use-namespace.mjs
 function Q(r, e, o, a) {
   return a ? a.fixed : e ? e.fixed : o && "fixed" in o ? o.fixed : P(r.fixed) ? r.fixed ? "left" : void 0 : r.fixed;
 }
-const k = Number.MAX_SAFE_INTEGER, A = E();
+const A = Number.MAX_SAFE_INTEGER, I = N();
 function V(r, e) {
-  const o = S(r.order) ? r.order : k;
-  let a = S(e.order) ? e.order : k;
+  const o = b(r.order) ? r.order : A;
+  let a = b(e.order) ? e.order : A;
   return r.fixed === "right" && e.fixed !== "right" && (a = o - 1), e.fixed === "left" && r.fixed !== "left" && (a = o - 1), o - a;
 }
 function Y(r, e) {
   e && r.removeItem(e);
 }
-function I(r, e) {
+function z(r, e) {
   if (!e)
     return [];
   const o = r.getItem(e);
@@ -29,29 +29,30 @@ function I(r, e) {
   const a = JSON.parse(o);
   return Array.isArray(a) ? a : (Y(r, e), []);
 }
-function N(r, e) {
-  if (b(r) && b(e))
-    return z({}, r, e, N);
+function _(r, e) {
+  if (y(r) && y(e))
+    return E({}, r, e, _);
 }
 const ue = (r, e, o) => {
-  const { columnsBackup: a, size: s } = X(), { t: _ } = D(), { be: L } = H("ap-table"), [Z, O] = G(), c = y(), n = y([]), B = d(
+  const { columnsBackup: a, size: s } = X(), { t: L } = D(), { be: O } = H("ap-table"), [Z, B] = G(), m = k(), n = k([]);
+  let g;
+  g = d(
     () => a?.value,
     (t, i) => {
-      t?.length && !i?.length && (n.value = g(
-        I(localStorage, v(e))
-      ), B?.());
+      t?.length && !i?.length && (n.value = T(
+        z(localStorage, v(e))
+      ), g?.());
     },
     {
       immediate: !0
     }
-  );
-  d(
+  ), d(
     [a, s],
     ([t, i]) => {
-      t && (c.value = {
+      t && (m.value = {
         label: "basic_template",
         columnState: f(t),
-        key: A,
+        key: I,
         size: i
       });
     },
@@ -59,18 +60,18 @@ const ue = (r, e, o) => {
   ), d(
     () => e.value,
     (t) => {
-      const i = g(
-        I(localStorage, t)
+      const i = T(
+        z(localStorage, t)
       );
-      n.value = i, c.value = {
+      n.value = i, m.value = {
         label: "basic_template",
         columnState: f(a?.value || []),
-        key: A,
+        key: I,
         size: s?.value
       }, o(i ?? []);
     }
   );
-  function g(t) {
+  function T(t) {
     return t.length ? t.map((i) => ({
       ...i,
       columnState: f(
@@ -80,29 +81,29 @@ const ue = (r, e, o) => {
       )
     })) : [
       {
-        label: _("ap.apTable.setting.defaultTemplate"),
-        key: r.getActiveKey?.("DEFAULT_TEMPLATE") ?? E(),
+        label: L("ap.apTable.setting.defaultTemplate"),
+        key: r.getActiveKey?.("DEFAULT_TEMPLATE") ?? N(),
         size: s?.value,
         columnState: f(a?.value || [])
       }
     ];
   }
   function f(t, i = {}, l = !0) {
-    const m = z(
+    const c = E(
       {},
       l ? r.defaultValue || {} : {},
       i,
-      N
+      _
     );
-    function x(M, j, C) {
+    function h(M, j, C) {
       return M.map((u) => {
-        const h = j?.[u.key] || {}, p = {
+        const S = j?.[u.key] || {}, p = {
           key: u.key,
           label: U(u.title) ? q(
             u,
-            L("table-header", "title"),
+            O("table-header", "title"),
             void 0,
-            O.value.colorTextTertiary
+            B.value.colorTextTertiary
           ) : u.title,
           show: !0,
           fixed: Q(
@@ -112,18 +113,18 @@ const ue = (r, e, o) => {
             C
           ),
           disabled: !1,
-          ...R(h, ["children", "fixed"])
+          ...R(S, ["children", "fixed"])
         };
-        return p.children = u.children?.length ? x(
+        return p.children = u.children?.length ? h(
           u.children,
-          h.children,
+          S.children,
           p
         ) : void 0, p;
       }).sort(V);
     }
-    return x(t || [], m);
+    return h(t || [], c);
   }
-  function T(t) {
+  function x(t) {
     if (v(e)) {
       const i = t.map((l) => ({
         ...l,
@@ -143,7 +144,7 @@ const ue = (r, e, o) => {
   }
   function J(t, i) {
     const l = n.value.findIndex(
-      (m) => m.key === t
+      (c) => c.key === t
     );
     return n.value[l] = {
       ...n.value[l],
@@ -153,13 +154,13 @@ const ue = (r, e, o) => {
   return d(
     () => n.value,
     (t) => {
-      t.length && T(t);
+      t.length && x(t);
     },
     { deep: !0, immediate: !0 }
   ), {
-    basicTemplate: c,
+    basicTemplate: m,
     customizeTemplateList: n,
-    syncTemplateListToStorage: T,
+    syncTemplateListToStorage: x,
     addTemplate: F,
     deleteTemplate: w,
     updateTemplate: J