@aplus-frontend/ui 0.1.38 → 0.1.40

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

@@ -1,4 +1,4 @@
-import { defineComponent as Ce, useSlots as Te, ref as P, computed as s, unref as r, createVNode as p, Fragment as U, watchEffect as Fe, watch as G, openBlock as f, createElementBlock as T, normalizeClass as m, normalizeStyle as M, mergeProps as h, createSlots as J, withCtx as w, renderList as Q, createBlock as X, resolveDynamicComponent as Be, renderSlot as b, createCommentVNode as Y, createElementVNode as I, h as xe, normalizeProps as ke, guardReactiveProps as ze } from "vue";
+import { defineComponent as Ce, useSlots as Te, ref as P, computed as s, unref as t, createVNode as f, Fragment as U, watchEffect as Fe, watch as G, openBlock as m, createElementBlock as T, normalizeClass as c, normalizeStyle as M, mergeProps as h, createSlots as J, withCtx as w, renderList as Q, createBlock as X, resolveDynamicComponent as xe, renderSlot as S, createCommentVNode as Y, createElementVNode as I, h as Be, normalizeProps as ke, guardReactiveProps as ze } from "vue";
 import { Typography as Pe, Divider as Ie, Button as Ne, Table as Le } from "ant-design-vue";
 import { useToken as Ee } from "ant-design-vue/es/theme/internal";
 import { ApForm as Ke } from "../ap-form/index.mjs";
@@ -7,7 +7,7 @@ import "../config-provider/index.mjs";
 import { useTablePaging as Oe } from "./hooks/use-table-paging.mjs";
 import { omit as _, isUndefined as g, isBoolean as Ve } from "lodash-unified";
 import "./style/ap-table.css";
-import { apColumnToColumn as je, getTableTitle as Ae, getTableRenderType as We, getTableRenderProps as $e, getTableCellRenderNode as De, getColumnOrder as ee, updateFormProps as He, getFieldProps as qe, getPlaceholder as Ue, getSearchFormItemRenderNode as Ge, objectToString as Me } from "./utils.mjs";
+import { apColumnToColumn as De, getTableTitle as je, getTableRenderType as Ae, getTableRenderProps as We, getTableCellRenderNode as $e, getColumnOrder as ee, updateFormProps as He, getFieldProps as qe, getPlaceholder as Ue, getSearchFormItemRenderNode as Ge, objectToString as Me } from "./utils.mjs";
 import Je from "./hooks/use-table-content-height.mjs";
 import { getRawDisplayValue as Qe } from "../editable-table/utils.mjs";
 import Xe from "./hooks/use-table-row-selection.mjs";
@@ -148,7 +148,7 @@ const Fa = /* @__PURE__ */ Ce({
   }) {
     const a = ae;
     let N = 0;
-    const S = Te(), [, te] = Ee(), {
+    const b = Te(), [, te] = Ee(), {
       t: re
     } = ea(), {
       e: F,
@@ -157,52 +157,52 @@ const Fa = /* @__PURE__ */ Ce({
     } = aa("ap-table"), E = oa("valueTypeMap"), {
       height: le,
       contentRef: ne
-    } = Je(), B = P(a.size), u = P([]), K = P([]);
+    } = Je(), x = P(a.size), u = P([]), K = P([]);
     _e({
       columns: s(() => u.value),
       columnsBackup: s(() => K.value),
-      size: s(() => B.value),
+      size: s(() => x.value),
       updateColumns(e) {
         u.value = e;
       },
       updateSize(e) {
-        B.value = e;
+        x.value = e;
       }
     });
     const se = () => {
-      var t;
-      let e = ((t = a.columns) == null ? void 0 : t.filter((l) => !l.hideInTable)) || [];
+      var r;
+      let e = ((r = a.columns) == null ? void 0 : r.filter((l) => !l.hideInTable)) || [];
       function o(l, d) {
         return l.map((n) => ({
           resizable: Ye(n.resizable) ? n.resizable : a.columnResizable,
-          ..._(je(n), ["ellipsis"]),
+          ..._(De(n), ["ellipsis"]),
           fixed: d ? d.fixed : n.fixed,
-          title: Ae(n, L("table-header", "title"), S.headerCell, r(te).colorPrimary),
+          title: je(n, L("table-header", "title"), b.headerCell, t(te).colorPrimary),
           customRender({
-            value: c,
+            value: p,
             ...y
           }) {
             var H, q;
-            const $ = We(n), Se = $e({
+            const W = Ae(n), be = We({
               ...n,
-              valueType: $
+              valueType: W
             }, {
-              value: c,
+              value: p,
               ...y
-            }), Re = De($, Se, y.record, r(E)), D = ((H = n.renderText) == null ? void 0 : H.call(n, {
-              value: c,
+            }), Re = $e(W, be, y.record, t(E)), $ = ((H = n.renderText) == null ? void 0 : H.call(n, {
+              value: p,
               ...y
-            })) || c, ve = n.renderText ? p(U, null, [(q = n.renderText) == null ? void 0 : q.call(n, {
-              value: c,
+            })) || p, ve = n.renderText ? f(U, null, [(q = n.renderText) == null ? void 0 : q.call(n, {
+              value: p,
               ...y
             })]) : Re;
-            let z = ye(n, D, ve);
+            let z = ye(n, $, ve);
             return n.customRender && (z = n.customRender({
-              value: c,
+              value: p,
               ...y,
               column: n,
               originalNode: z,
-              originalText: D
+              originalText: $
             })), z;
           },
           children: o(n.children || [], d || n)
@@ -215,11 +215,11 @@ const Fa = /* @__PURE__ */ Ce({
       u.value = e, K.value = e;
     });
     const O = s(() => {
-      var e, o, t;
-      return N++, ((t = (o = (e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !Z.includes(l.valueType))) == null ? void 0 : o.sort((l, d) => {
+      var e, o, r;
+      return N++, ((r = (o = (e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !Z.includes(l.valueType))) == null ? void 0 : o.sort((l, d) => {
         let n = ee(l.order);
         return ee(d.order) - n;
-      })) == null ? void 0 : t.map((l) => {
+      })) == null ? void 0 : r.map((l) => {
         const d = He(l, qe(l.fieldProps, {})), n = {
           ...l,
           fieldProps: {
@@ -232,11 +232,11 @@ const Fa = /* @__PURE__ */ Ce({
           },
           renderNode: void 0
         };
-        return n.renderNode = Ge(n, r(E)), n;
+        return n.renderNode = Ge(n, t(E)), n;
       })) || [];
-    }), de = s(() => r(u).filter((e) => e.sorter === !0).map((e) => e.dataIndex).filter(Boolean)), ue = s(() => r(u).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex).filter(Boolean)), ie = s(() => g(a.dataSource) ? C.value.records : a.dataSource), {
+    }), de = s(() => t(u).filter((e) => e.sorter === !0).map((e) => e.dataIndex).filter(Boolean)), ue = s(() => t(u).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex).filter(Boolean)), ie = s(() => g(a.dataSource) ? C.value.records : a.dataSource), {
       rowSelection: R,
-      selectedRows: x,
+      selectedRows: B,
       ...v
     } = Xe({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
@@ -245,20 +245,20 @@ const Fa = /* @__PURE__ */ Ce({
     }), {
       formRef: k,
       submit: V,
-      reset: j,
-      tableProps: A,
+      reset: D,
+      tableProps: j,
       refresh: ce,
       data: C,
       setDataSource: pe
     } = Oe({
       async request(e) {
-        var t, l;
+        var r, l;
         if (!R.value.preserveSelectedRowKeys && g(a.dataSource) && v.clearAll(), !g(a.dataSource))
           return {
             data: a.dataSource || [],
             total: a.dataSource.length || 0
           };
-        const o = await ((t = a.request) == null ? void 0 : t.call(a, e));
+        const o = await ((r = a.request) == null ? void 0 : r.call(a, e));
         return (l = a.onLoad) == null || l.call(a, (o == null ? void 0 : o.data) || []), {
           data: (o == null ? void 0 : o.data) || [],
           total: (o == null ? void 0 : o.total) || 0
@@ -275,11 +275,11 @@ const Fa = /* @__PURE__ */ Ce({
       showLessItems: a.pagination ? a.pagination.showLessItems : void 0,
       showTotal: a.pagination ? a.pagination.showTotal : void 0
     }), fe = s(() => {
-      var o, t;
+      var o, r;
       if (a.adaptive && (C.value.total > 0 || ((o = a.dataSource) == null ? void 0 : o.length)))
         return {
-          y: r(le),
-          x: ((t = a.scroll) == null ? void 0 : t.x) || "100%"
+          y: t(le),
+          x: ((r = a.scroll) == null ? void 0 : r.x) || "100%"
         };
       if (a.scroll)
         return a.scroll;
@@ -289,27 +289,27 @@ const Fa = /* @__PURE__ */ Ce({
         return a.tableLayout;
       if ((e = a.columns) != null && e.some((o) => o.ellipsis))
         return "fixed";
-    }), W = s(() => {
-      var t;
-      const e = r(A), o = r(R);
+    }), A = s(() => {
+      var r;
+      const e = t(j), o = t(R);
       return {
         ...a,
         ...e,
-        rowSelection: a.rowSelection === !0 || ((t = a.rowSelection) == null ? void 0 : t.mode) === "internal" ? {
+        rowSelection: a.rowSelection === !0 || ((r = a.rowSelection) == null ? void 0 : r.mode) === "internal" ? {
           ...o,
           // tips 如果是前端分页，则默认会走缓存
           preserveSelectedRowKeys: g(a.dataSource) ? o.preserveSelectedRowKeys : !0
         } : a.rowSelection,
         loading: g(a.loading) ? e.loading : a.loading,
         pagination: a.pagination === !1 ? !1 : e.pagination,
-        scroll: r(fe)
+        scroll: t(fe)
       };
     }), ge = s(() => [i(), a.card ? null : i("wrapper"), a.adaptive ? i("adaptive") : null].filter(Boolean));
-    function ye(e, o, t) {
+    function ye(e, o, r) {
       if (Z.includes(e.valueType))
-        return t;
+        return r;
       const l = Me(o);
-      return e.copyable || e.ellipsis ? p(Pe.Paragraph, {
+      return e.copyable || e.ellipsis ? f(Pe.Paragraph, {
         copyable: e.copyable ? {
           text: l,
           tooltip: !1
@@ -320,112 +320,113 @@ const Fa = /* @__PURE__ */ Ce({
           ...e.ellipsis,
           tooltip: l
         } : !1,
-        content: e.ellipsis ? Qe(e, o) : t
-      }, null) : t;
+        content: e.ellipsis ? Qe(e, o) : r
+      }, null) : r;
     }
-    G(() => r(C).loading, (e) => {
+    G(() => t(C).loading, (e) => {
       var o;
       (o = a.onLoadingChange) == null || o.call(a, e);
     }), G(() => a.dataSource, (e) => {
-      e != null && e.length && pe(e);
+      pe(e);
     }, {
       immediate: !0
     });
     function he(e) {
-      var o, t, l;
-      (l = (t = (o = k.value) == null ? void 0 : o.apForm) == null ? void 0 : t.setFieldsValue) == null || l.call(t, e);
+      var o, r, l;
+      (l = (r = (o = k.value) == null ? void 0 : o.apForm) == null ? void 0 : r.setFieldsValue) == null || l.call(r, e);
     }
     function we() {
-      var e, o, t;
-      return (t = (o = (e = k.value) == null ? void 0 : e.apForm) == null ? void 0 : o.getFieldsValue) == null ? void 0 : t.call(o, !0);
+      var e, o, r;
+      return (r = (o = (e = k.value) == null ? void 0 : e.apForm) == null ? void 0 : o.getFieldsValue) == null ? void 0 : r.call(o, !0);
     }
-    function be() {
-      return r(u);
+    function Se() {
+      return t(u);
     }
     return oe({
       submit: () => V(),
-      reset: () => j(),
+      reset: () => D(),
       refresh: () => ce(),
       setSearchFormValues: he,
       getSearchFormValues: we,
-      getShownColumns: be,
-      dataSource: s(() => r(C).records),
+      getShownColumns: Se,
+      dataSource: s(() => t(C).records),
       rowSelection: {
-        selectedRows: s(() => r(x)),
+        selectedRows: s(() => t(B)),
         ...v
       }
-    }), (e, o) => (f(), T("div", {
-      class: m(ge.value)
-    }, [r(g)(e.dataSource) && e.searchForm !== !1 && O.value.length > 0 ? (f(), T("div", {
+    }), (e, o) => (m(), T("div", {
+      class: c(ge.value)
+    }, [t(g)(e.dataSource) && e.searchForm !== !1 && O.value.length > 0 ? (m(), T("div", {
       key: 0,
-      class: m(e.card ? r(F)("search-wrapper") : null),
+      class: c(e.card ? t(F)("search-wrapper") : null),
       style: M(e.searchFormWrapperStyle)
-    }, [p(r(Ke).SearchForm, h(e.searchForm || {}, {
+    }, [f(t(Ke).SearchForm, h(e.searchForm || {}, {
       ref_key: "formRef",
       ref: k,
       "custom-reset": "",
-      onSubmit: r(V),
-      onReset: r(j),
-      "submit-loading": r(A).loading
+      onSubmit: t(V),
+      onReset: t(D),
+      "submit-loading": t(j).loading
     }), J({
-      default: w(() => [(f(!0), T(U, null, Q(O.value, (t) => (f(), X(Be(t.renderNode), h({
-        key: t.dataIndex,
+      default: w(() => [(m(!0), T(U, null, Q(O.value, (r) => (m(), X(xe(r.renderNode), h({
+        key: r.dataIndex,
         ref_for: !0
-      }, t.fieldProps || {}, {
-        span: t.span
+      }, r.fieldProps || {}, {
+        span: r.span
       }), null, 16, ["span"]))), 128))]),
       _: 2
-    }, [S.searchFormExtra ? {
+    }, [b.searchFormExtra ? {
       name: "extra",
-      fn: w(() => [b(e.$slots, "searchFormExtra")]),
+      fn: w(() => [S(e.$slots, "searchFormExtra")]),
       key: "0"
     } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : Y("", !0), I("div", {
       ref_key: "contentRef",
       ref: ne,
-      class: m([r(F)("table-wrapper"), e.card ? r(F)("table-wrapper-card") : null]),
+      class: c([t(F)("table-wrapper"), e.card ? t(F)("table-wrapper-card") : null]),
       style: M(e.tableWrapperStyle)
     }, [I("div", {
-      class: m(r(i)("header-wrapper"))
-    }, [e.settings ? (f(), T("div", {
+      class: c(t(i)("header-wrapper"))
+    }, [e.settings ? (m(), T("div", {
       key: 0,
-      class: m(r(i)("header"))
+      class: c(t(i)("header"))
     }, [I("div", {
-      class: m(r(L)("header", "title"))
-    }, [b(e.$slots, "title", h({
-      selectedRows: r(x),
-      selectedRowKeys: r(R).selectedRowKeys,
+      class: c(t(L)("header", "title"))
+    }, [S(e.$slots, "title", h({
+      selectedRows: t(B),
+      selectedRowKeys: t(R).selectedRowKeys,
       shownColumns: u.value
-    }, v))], 2), S.title ? (f(), X(r(Ie), {
+    }, v))], 2), b.title ? (m(), X(t(Ie), {
       key: 0,
       type: "vertical"
-    })) : Y("", !0), p(ta, {
+    })) : Y("", !0), f(ta, {
       config: e.settings === !0 ? {} : e.settings
     }, {
-      trigger: w(() => [p(r(Ne), {
-        icon: xe(r(Ze))
-      }, null, 8, ["icon"])]),
+      trigger: w(() => [f(t(Ne), {
+        class: c(t(i)("setting-trigger-button")),
+        icon: Be(t(Ze))
+      }, null, 8, ["class", "icon"])]),
       _: 1
-    }, 8, ["config"])], 2)) : b(e.$slots, "title", h({
+    }, 8, ["config"])], 2)) : S(e.$slots, "title", h({
       key: 1,
-      selectedRows: r(x),
-      selectedRowKeys: r(R).selectedRowKeys,
+      selectedRows: t(B),
+      selectedRowKeys: t(R).selectedRowKeys,
       shownColumns: u.value
-    }, v))], 2), p(r(Le), h({
-      class: r(i)("table")
-    }, W.value, {
-      size: B.value,
+    }, v))], 2), f(t(Le), h({
+      class: t(i)("table")
+    }, A.value, {
+      size: x.value,
       "table-layout": me.value,
       columns: u.value,
-      onResizeColumn: o[0] || (o[0] = (t, l) => l.width = t)
+      onResizeColumn: o[0] || (o[0] = (r, l) => l.width = r)
     }), J({
-      summary: w(() => [b(e.$slots, "summary", {
+      summary: w(() => [S(e.$slots, "summary", {
         columns: u.value,
-        records: W.value.dataSource
+        records: A.value.dataSource
       })]),
       _: 2
-    }, [Q(r(_)(S, ["title", "searchFormExtra", "headerCell", "summary"]), (t, l) => ({
+    }, [Q(t(_)(b, ["title", "searchFormExtra", "headerCell", "summary"]), (r, l) => ({
       name: l,
-      fn: w((d) => [b(e.$slots, l, ke(ze(d || {})))])
+      fn: w((d) => [S(e.$slots, l, ke(ze(d || {})))])
     }))]), 1040, ["class", "size", "table-layout", "columns"])], 6)], 2));
   }
 });

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

@@ -47,7 +47,7 @@ const ne = {
       }
     }) : null;
     function I() {
-      V(B(w));
+      V(B(e(w)));
     }
     function O() {
       var t, o;

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

@@ -1,5 +1,5 @@
 import { ApColumnState, ApTableSettingType } from '../interface';
-import { Ref, ComputedRef } from 'vue';
+import { Ref, ComputedRef, ShallowRef } from 'vue';
 export declare const useTableColumnState: (columnSetting: ApTableSettingType, initialColumnState: ApColumnState[]) => {
     columnState: Ref<{
         key: string | number;
@@ -16,7 +16,7 @@ export declare const useTableColumnState: (columnSetting: ApTableSettingType, in
     setColumnState: (nextColumnState: ApColumnState[]) => void;
     isAllSelected: ComputedRef<boolean>;
     toggleSelectAll: () => void;
-    columnStateBackup: ApColumnState[];
+    columnStateBackup: ShallowRef<ApColumnState[]>;
     setColumnStateBackup: (nextBackup: ApColumnState[]) => void;
     cacheColumnStateIfNeeded: (nextColumnState: ApColumnState[]) => void;
 };

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

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

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

@@ -91,5 +91,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
         dataSource: DataType[];
     }>;
     dataSource: ComputedRef<DataType[]>;
-    setDataSource: (dataSource: DataType[]) => void;
+    setDataSource: (dataSource?: DataType[]) => void;
 };