@aplus-frontend/ui 0.1.27 → 0.1.29

package/es/src/ap-table/components/setting/sorter/index.vue2.mjs

@@ -1,14 +1,14 @@
-import { defineComponent as A, ref as L, unref as n, computed as O, watch as $, openBlock as c, createElementBlock as y, normalizeClass as d, createVNode as m, withCtx as v, createElementVNode as g, toDisplayString as k, createTextVNode as q, createBlock as b, createCommentVNode as p } from "vue";
-import { Flex as G, Button as H, Divider as J } from "ant-design-vue";
-import N from "vuedraggable";
+import { defineComponent as O, ref as x, unref as n, computed as $, watch as q, onMounted as G, openBlock as i, createElementBlock as _, normalizeClass as f, createVNode as N, withCtx as h, createElementVNode as g, toDisplayString as k, createTextVNode as H, createBlock as p, createCommentVNode as s } from "vue";
+import { Flex as J, Button as K, Divider as P } from "ant-design-vue";
+import M from "vuedraggable";
 import "../sortable/index.vue.mjs";
 import "../../../../config-provider/index.mjs";
 import "../../style/setting/sorter.css";
-import { useProvideSorterMethods as K } from "./context.mjs";
-import { useNamespace as P } from "../../../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as Q } from "../../../../config-provider/hooks/use-locale.mjs";
+import { useProvideSorterMethods as Q } from "./context.mjs";
+import { useNamespace as W } from "../../../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as X } from "../../../../config-provider/hooks/use-locale.mjs";
 import R from "../sortable/index.vue2.mjs";
-const W = { key: 0 }, X = { key: 1 }, Y = { key: 2 }, ce = /* @__PURE__ */ A({
+const Y = { key: 0 }, Z = { key: 1 }, ee = { key: 2 }, fe = /* @__PURE__ */ O({
   __name: "index",
   props: {
     value: {},
@@ -16,11 +16,11 @@ const W = { key: 0 }, X = { key: 1 }, Y = { key: 2 }, ce = /* @__PURE__ */ A({
   },
   emits: ["update:value"],
   setup(V, { emit: B }) {
-    const i = L([]), s = L([]), r = L([]), { b: u } = P("column-setting-sorter"), { t: h } = Q(), x = V, S = B;
-    K({
+    const u = x([]), r = x([]), c = x([]), y = x(!1), { b: d } = W("column-setting-sorter"), { t: v } = X(), C = V, S = B;
+    Q({
       fixedToLeft: I,
-      fixedToRight: M,
-      unFixed: U
+      fixedToRight: U,
+      unFixed: z
     });
     function F(e, t) {
       const o = t[0].findIndex(
@@ -35,8 +35,8 @@ const W = { key: 0 }, X = { key: 1 }, Y = { key: 2 }, ce = /* @__PURE__ */ A({
         t[1].splice(a, 1);
       }
     }
-    function _(e, t) {
-      const o = [...n(i.value)], a = [...n(r.value)], l = [...n(s.value)], w = {
+    function T(e, t) {
+      const o = [...n(u.value)], a = [...n(c.value)], l = [...n(r.value)], b = {
         left: {
           target: o,
           search: [l, a]
@@ -50,150 +50,154 @@ const W = { key: 0 }, X = { key: 1 }, Y = { key: 2 }, ce = /* @__PURE__ */ A({
           search: [o, a]
         }
       }[t];
-      return t === "right" ? w.target.unshift(e) : w.target.push(e), F(
+      return t === "right" ? b.target.unshift(e) : b.target.push(e), F(
         e,
-        w.search
+        b.search
       ), [...o, ...l, ...a];
     }
     function I(e) {
-      const t = _(e, "left");
-      f(t);
-    }
-    function M(e) {
-      const t = _(e, "right");
-      f(t);
+      const t = T(e, "left");
+      m(t);
     }
     function U(e) {
-      const t = _(e, "normal");
-      f(t);
+      const t = T(e, "right");
+      m(t);
     }
-    function C(e) {
+    function z(e) {
+      const t = T(e, "normal");
+      m(t);
+    }
+    function w(e) {
       var t;
       return (t = e.children) != null && t.length ? e.children.some((o) => o.show) : e.show;
     }
-    function T(e, t) {
+    function L(e, t) {
       e.value ? e.value.push(t) : e.value = [t];
     }
-    const z = O(() => {
+    const D = $(() => {
       let e = 0;
       function t(o) {
         var a;
         for (const l of o)
           (a = l.children) != null && a.length ? t(l.children) : l.show && (e += 1);
       }
-      return t(x.value), e;
+      return t(C.value), e;
     });
-    function D(e) {
-      f([...e, ...n(s), ...n(r)]);
-    }
     function E(e) {
-      f([...n(i), ...e, ...n(r)]);
+      m([...e, ...n(r), ...n(c)]);
     }
     function j(e) {
-      f([...n(i), ...n(s), ...e]);
+      m([...n(u), ...e, ...n(c)]);
+    }
+    function A(e) {
+      m([...n(u), ...n(r), ...e]);
+    }
+    function m(e) {
+      S("update:value", e);
     }
-    $(
-      () => x.value,
+    return q(
+      () => C.value,
       (e) => {
         if (e) {
-          i.value = [], s.value = [], r.value = [];
+          u.value = [], r.value = [], c.value = [];
           for (const t of e)
-            t.fixed === "left" ? T(i, t) : t.fixed === "right" ? T(r, t) : T(s, t);
+            t.fixed === "left" ? L(u, t) : t.fixed === "right" ? L(c, t) : L(r, t);
         }
       },
       { immediate: !0 }
-    );
-    function f(e) {
-      S("update:value", e);
-    }
-    return (e, t) => (c(), y("div", {
-      class: d(n(u)())
+    ), G(() => {
+      y.value = !0;
+    }), (e, t) => (i(), _("div", {
+      class: f(n(d)())
     }, [
-      m(n(G), {
-        class: d(n(u)("header")),
+      N(n(J), {
+        class: f(n(d)("header")),
         align: "center",
         justify: "space-between"
       }, {
-        default: v(() => [
+        default: h(() => [
           g("span", {
-            class: d(n(u)("header-title"))
-          }, k(n(h)("ap.apTable.setting.selectCount", { count: z.value })), 3),
-          m(n(H), {
+            class: f(n(d)("header-title"))
+          }, k(n(v)("ap.apTable.setting.selectCount", { count: D.value })), 3),
+          N(n(K), {
             type: "link",
             size: "small",
             style: { padding: "0" },
-            onClick: x.onReset
+            onClick: C.onReset
           }, {
-            default: v(() => [
-              q(k(n(h)("ap.apTable.setting.reset")), 1)
+            default: h(() => [
+              H(k(n(v)("ap.apTable.setting.reset")), 1)
             ]),
             _: 1
           }, 8, ["onClick"])
         ]),
         _: 1
       }, 8, ["class"]),
-      m(n(J), { style: { margin: "0px" } }),
+      N(n(P), { style: { margin: "0px" } }),
       g("div", {
-        class: d(n(u)("content"))
+        class: f(n(d)("content"))
       }, [
-        i.value.length ? (c(), y("div", W, [
+        u.value.length ? (i(), _("div", Y, [
           g("span", {
-            class: d(n(u)("section-title"))
-          }, k(n(h)("ap.apTable.setting.fixToLeft")), 3),
-          m(n(N), {
-            "model-value": i.value,
-            "onUpdate:modelValue": D,
+            class: f(n(d)("section-title"))
+          }, k(n(v)("ap.apTable.setting.fixToLeft")), 3),
+          y.value ? (i(), p(n(M), {
+            key: 0,
+            "model-value": u.value,
+            "onUpdate:modelValue": E,
             "item-key": "key"
           }, {
-            item: v(({ element: o }) => [
-              C(o) ? (c(), b(R, {
+            item: h(({ element: o }) => [
+              w(o) ? (i(), p(R, {
                 key: 0,
                 value: o
-              }, null, 8, ["value"])) : p("", !0)
+              }, null, 8, ["value"])) : s("", !0)
             ]),
             _: 1
-          }, 8, ["model-value"])
-        ])) : p("", !0),
-        s.value.length ? (c(), y("div", X, [
+          }, 8, ["model-value"])) : s("", !0)
+        ])) : s("", !0),
+        r.value.length ? (i(), _("div", Z, [
           g("span", {
-            class: d(n(u)("section-title"))
-          }, k(n(h)("ap.apTable.setting.unFixed")), 3),
-          m(n(N), {
-            "model-value": s.value,
-            "onUpdate:modelValue": E,
+            class: f(n(d)("section-title"))
+          }, k(n(v)("ap.apTable.setting.unFixed")), 3),
+          y.value ? (i(), p(n(M), {
+            key: 0,
+            "model-value": r.value,
+            "onUpdate:modelValue": j,
             "item-key": "key"
           }, {
-            item: v(({ element: o }) => [
-              C(o) ? (c(), b(R, {
+            item: h(({ element: o }) => [
+              w(o) ? (i(), p(R, {
                 key: 0,
                 value: o
-              }, null, 8, ["value"])) : p("", !0)
+              }, null, 8, ["value"])) : s("", !0)
             ]),
             _: 1
-          }, 8, ["model-value"])
-        ])) : p("", !0),
-        r.value.length ? (c(), y("div", Y, [
+          }, 8, ["model-value"])) : s("", !0)
+        ])) : s("", !0),
+        c.value.length ? (i(), _("div", ee, [
           g("span", {
-            class: d(n(u)("section-title"))
-          }, k(n(h)("ap.apTable.setting.fixToRight")), 3),
-          m(n(N), {
-            "model-value": r.value,
-            "onUpdate:modelValue": j,
+            class: f(n(d)("section-title"))
+          }, k(n(v)("ap.apTable.setting.fixToRight")), 3),
+          y.value ? (i(), p(n(M), {
+            key: 0,
+            "model-value": c.value,
+            "onUpdate:modelValue": A,
             "item-key": "key"
           }, {
-            item: v(({ element: o }) => [
-              C(o) ? (c(), b(R, {
+            item: h(({ element: o }) => [
+              w(o) ? (i(), p(R, {
                 key: 0,
                 value: o
-              }, null, 8, ["value"])) : p("", !0)
+              }, null, 8, ["value"])) : s("", !0)
             ]),
             _: 1
-          }, 8, ["model-value"])
-        ])) : p("", !0)
+          }, 8, ["model-value"])) : s("", !0)
+        ])) : s("", !0)
       ], 2)
     ], 2));
   }
 });
 export {
-  ce as default
+  fe as default
 };

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

@@ -1,5 +1,5 @@
 import { ColumnsType } from 'ant-design-vue/es/table';
-import { ApColumnState } from '../../interface';
+import { ApColumnState, ApTableSettingDefaultValueType } from '../../interface';
 /**
  * 根据列状态重新生成表格列配置
  * @param columns 表格列数组
@@ -15,3 +15,9 @@ export declare function customCloneColumnStates<T extends ApColumnState | ApColu
  * @returns
  */
 export declare function cloneLabelNode(node: any): any;
+/**
+ * 生成可用于缓存的列状态对象
+ * @param columnStates
+ * @returns
+ */
+export declare function getColumnStateString(columnStates: ApColumnState[]): ApTableSettingDefaultValueType;

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

@@ -1,32 +1,32 @@
-import { cloneDeepWith as s } from "lodash-unified";
-import { isVNode as u, cloneVNode as c } from "vue";
-function f(e, i) {
-  var r;
+import { cloneDeepWith as s, omit as u } from "lodash-unified";
+import { isVNode as c, cloneVNode as f } from "vue";
+function d(t, o) {
+  var i;
   const n = [];
-  for (const t of i) {
-    const l = e.find((o) => o.key === t.key);
-    if ((r = t.children) != null && r.length) {
-      const o = f(
+  for (const e of o) {
+    const l = t.find((r) => r.key === e.key);
+    if ((i = e.children) != null && i.length) {
+      const r = d(
         l.children,
-        t.children
+        e.children
       );
-      o.length && n.push({
+      r.length && n.push({
         ...l,
-        fixed: t.fixed,
-        children: o
+        fixed: e.fixed,
+        children: r
       });
     } else {
-      if (!t.show)
+      if (!e.show)
         continue;
-      n.push({ ...l, fixed: t.fixed });
+      n.push({ ...l, fixed: e.fixed });
     }
   }
   return n;
 }
-function h(e) {
-  return s(e, (i, n) => {
+function p(t) {
+  return s(t, (o, n) => {
     if (n === "label")
-      return i;
+      return o;
   });
 }
 const a = {
@@ -38,11 +38,26 @@ const a = {
   "white-space": "unset",
   wordBreak: "unset"
 };
-function p(e) {
-  return u(e) ? c(e, { style: a }) : e;
+function y(t) {
+  return c(t) ? f(t, { style: a }) : t;
+}
+function b(t) {
+  function o(n) {
+    const i = {};
+    return n.forEach((e, l) => {
+      var r;
+      i[e.key] = {
+        ...u(e, ["label", "key", "children"]),
+        order: l,
+        children: (r = e.children) != null && r.length ? o(e.children) : void 0
+      };
+    }), i;
+  }
+  return o(t);
 }
 export {
-  p as cloneLabelNode,
-  h as customCloneColumnStates,
-  f as default
+  y as cloneLabelNode,
+  p as customCloneColumnStates,
+  d as default,
+  b as getColumnStateString
 };

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

@@ -9528,6 +9528,9 @@ export declare const apTableRenderItemMap: {
             timezone: {
                 type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
+            readModeSeparator: {
+                type: PropType<any>;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -9741,6 +9744,9 @@ export declare const apTableRenderItemMap: {
             timezone: {
                 type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
+            readModeSeparator: {
+                type: PropType<any>;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {
@@ -9991,6 +9997,9 @@ export declare const apTableRenderItemMap: {
             timezone: {
                 type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
+            readModeSeparator: {
+                type: PropType<any>;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {}, {}, {}, {}, {
@@ -10238,6 +10247,9 @@ export declare const apTableRenderItemMap: {
         timezone: {
             type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
         };
+        readModeSeparator: {
+            type: PropType<any>;
+        };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {

package/es/src/ap-table/hooks/use-table-column-state.d.ts

@@ -1,6 +1,6 @@
-import { ApColumnState } from '../interface';
+import { ApColumnState, ApTableSettingType } from '../interface';
 import { Ref, ComputedRef } from 'vue';
-export declare const useTableColumnState: (initialColumnState: ApColumnState[]) => {
+export declare const useTableColumnState: (columnSetting: ApTableSettingType, initialColumnState: ApColumnState[]) => {
     columnState: Ref<{
         key: string | number;
         show?: boolean | undefined;
@@ -8,6 +8,7 @@ export declare const useTableColumnState: (initialColumnState: ApColumnState[])
         disabled?: boolean | undefined;
         label?: any;
         children?: any[] | undefined;
+        order?: number | undefined;
     }[]>;
     selectAll: () => void;
     unSelectAll: () => void;
@@ -15,4 +16,7 @@ export declare const useTableColumnState: (initialColumnState: ApColumnState[])
     setColumnState: (nextColumnState: ApColumnState[]) => void;
     isAllSelected: ComputedRef<boolean>;
     toggleSelectAll: () => void;
+    columnStateBackup: ApColumnState[];
+    setColumnStateBackup: (nextBackup: ApColumnState[]) => void;
+    cacheColumnStateIfNeeded: (nextColumnState: ApColumnState[]) => void;
 };

package/es/src/ap-table/hooks/use-table-column-state.mjs

@@ -1,46 +1,114 @@
-import { ref as d, computed as h, unref as r } from "vue";
-import { isDef as w } from "../../utils/index.mjs";
-function s(c, e) {
-  c.forEach((n) => {
-    var o;
-    e(n), (o = n.children) != null && o.length && s(n.children, e);
+import { ref as _, unref as i, computed as j, watchEffect as z } from "vue";
+import { isDef as D } from "../../utils/index.mjs";
+import G, { customCloneColumnStates as k, getColumnStateString as R } from "../components/setting/utils.mjs";
+import { useInjectApTable as W } from "../context.mjs";
+import { isObject as v, mergeWith as E, isBoolean as X, omit as q, isNumber as N } from "lodash-unified";
+function f(r, o) {
+  r.forEach((t) => {
+    var c;
+    o(t), (c = t.children) != null && c.length && f(t.children, o);
   });
 }
-const p = (c) => {
-  const e = d(c), n = h(() => r(e).every((t) => t.show));
-  function o() {
-    const t = r(e);
-    s(t, (l) => {
-      !l.disabled && (l.show = !0);
+function H(r, o) {
+  if (!o)
+    return {};
+  const t = r.getItem(o);
+  return t ? JSON.parse(t) : {};
+}
+function I(r, o) {
+  if (v(r) && v(o))
+    return E({}, r, o, I);
+}
+const B = Number.MAX_SAFE_INTEGER, Z = (r, o) => {
+  const t = _(o);
+  let c = k(o);
+  const { columnsBackup: h, updateColumns: u } = W(), T = r.persistenceType || "localStorage", S = window[T];
+  function F() {
+    const e = H(
+      S,
+      r.persistenceKey
+    ), n = E(
+      {},
+      r.defaultValue || {},
+      e,
+      I
+    ), l = i(h);
+    function b(M, d, x) {
+      return M.map((s) => {
+        var A;
+        const a = (d == null ? void 0 : d[s.key]) || {}, m = {
+          key: s.key,
+          label: s.title,
+          show: !0,
+          fixed: x ? x.fixed : X(s.fixed) ? s.fixed ? "left" : void 0 : s.fixed,
+          disabled: !1,
+          ...q(a, "children")
+        };
+        return m.children = (A = s.children) != null && A.length ? b(
+          s.children,
+          a.children,
+          m
+        ) : void 0, m;
+      }).sort(
+        (s, a) => (N(s.order) ? s.order : B) - (N(a.order) ? a.order : B)
+      );
+    }
+    return b(l || [], n);
+  }
+  const g = j(() => i(t).every((e) => e.show));
+  function p() {
+    const e = i(t);
+    f(e, (n) => {
+      !n.disabled && (n.show = !0);
     });
   }
-  function u() {
-    const t = r(e);
-    s(t, (l) => {
-      !l.disabled && (l.show = !1);
+  function C() {
+    const e = i(t);
+    f(e, (n) => {
+      !n.disabled && (n.show = !1);
     });
   }
-  function i() {
-    r(n) ? u() : o();
+  function O() {
+    i(g) ? C() : p();
   }
-  function a(t, l) {
-    s(r(e), (f) => {
-      f.key === t && (f.show = w(l) ? l : !f.show);
+  function K(e, n) {
+    f(i(t), (l) => {
+      l.key === e && (l.show = D(n) ? n : !l.show);
     });
   }
-  function S(t) {
-    e.value = t;
-  }
-  return {
-    columnState: e,
-    selectAll: o,
-    unSelectAll: u,
-    toggleSelect: a,
-    setColumnState: S,
-    isAllSelected: n,
-    toggleSelectAll: i
+  function w(e) {
+    t.value = e;
+  }
+  function J(e) {
+    c = e;
+  }
+  function y(e) {
+    if (r.persistenceKey) {
+      const n = R(e);
+      S.setItem(r.persistenceKey, JSON.stringify(n));
+    }
+  }
+  return z(() => {
+    const e = F();
+    w(e), u == null || u(
+      G(
+        i(h),
+        i(e)
+      )
+    ), c = k(e), y(e);
+  }), {
+    columnState: t,
+    selectAll: p,
+    unSelectAll: C,
+    toggleSelect: K,
+    setColumnState: w,
+    isAllSelected: g,
+    toggleSelectAll: O,
+    columnStateBackup: c,
+    setColumnStateBackup: J,
+    cacheColumnStateIfNeeded: y
   };
 };
 export {
-  p as useTableColumnState
+  Z as useTableColumnState
 };

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

@@ -84,7 +84,7 @@ export type ApTableSettingType = {
     /**
      * 列的默认状态
      */
-    defaultValue?: Recordable<Omit<ApColumnState, 'children' | 'key'>>;
+    defaultValue?: ApTableSettingDefaultValueType;
     /**
      * 列状态变更时的回调（注意，返回的是全量状态）
      * @param val
@@ -92,6 +92,9 @@ export type ApTableSettingType = {
      */
     onChange?: (val: ApColumnState[]) => void;
 };
+export type ApTableSettingDefaultValueType = Recordable<Omit<ApColumnState, 'label' | 'key' | 'children'> & {
+    children?: ApTableSettingDefaultValueType;
+}>;
 export type ApColumnState = {
     /**
      * 列的唯一标识
@@ -117,6 +120,10 @@ export type ApColumnState = {
      * 子节点状态
      */
     children?: ApColumnState[];
+    /**
+     * 字段排序（和其同级的表头排序）
+     */
+    order?: number;
 };
 export type FieldPropsType<ReturnType, RecordType, ExtraValueType, ValueType extends ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType> = ReturnType | ((opt: Partial<{
     value: any;