@aplus-frontend/ui 0.5.27 → 0.5.29

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

@@ -1,4 +1,4 @@
-import { ref as ae, reactive as j, unref as h, nextTick as se, onMounted as ie, watch as ce, computed as A, createVNode as x } from "vue";
+import { ref as ae, reactive as j, unref as m, nextTick as se, onMounted as ie, watch as ce, computed as A, createVNode as x } from "vue";
 import { useTableSortedAndFiltered as ue } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
 import { parseFieldValue as le, dataIndexToStr as fe, isEqualCustom as ge } from "../utils.mjs";
@@ -6,8 +6,8 @@ import { isArray as q, isEqualWith as de, isUndefined as pe } from "lodash-unifi
 import { isDef as N } from "../../utils/index.mjs";
 import { useLocale as me } from "../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
-const S = 1, D = 10, B = {
-  defaultCurrent: S,
+const h = 1, D = 10, B = {
+  defaultCurrent: h,
   defaultPageSize: D,
   showLessItems: !1,
   showTotal: !0
@@ -20,7 +20,7 @@ function Se(s) {
 }
 function ze(s) {
   const f = {};
-  return s === !1 || (s === !0 || s == null ? (f.current = S, f.pageSize = D) : (f.current = s.defaultCurrent || S, f.pageSize = s.defaultPageSize || D)), f;
+  return s === !1 || (s === !0 || s == null ? (f.current = h, f.pageSize = D) : (f.current = s.defaultCurrent || h, f.pageSize = s.defaultPageSize || D)), f;
 }
 const Ae = ({
   manual: s = !1,
@@ -33,10 +33,10 @@ const Ae = ({
   filterFields: J,
   sortFields: K,
   namespace: M = "ap-table",
-  pagination: d
+  pagination: S
 }) => {
   let b = 0, i = {};
-  const Q = Se(d), $ = (e) => y ? y(e) : e, z = ae(), c = j(ze(d)), {
+  const Q = Se(S), $ = (e) => y ? y(e) : e, z = ae(), c = j(ze(S)), {
     getColumnSFConfig: G,
     setSF: W,
     clearAll: Z,
@@ -54,34 +54,34 @@ const Ae = ({
     var e, t;
     return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
   }, I = async (e) => {
-    var n;
-    const t = $(e), r = Date.now();
-    b = r, a.loading = !0;
+    var r;
+    const t = $(e), n = Date.now();
+    b = n, a.loading = !0;
     try {
       const o = await f({
-        ...h(L),
+        ...m(L),
         ...t
       });
-      b === r && (a.total = o.total || ((n = o.data) == null ? void 0 : n.length) || 0, a.records = [...o.data || []]);
+      b === n && (a.total = o.total || ((r = o.data) == null ? void 0 : r.length) || 0, a.records = [...o.data || []]);
     } catch {
-      b === r && (a.records = [], a.total = 0);
+      b === n && (a.records = [], a.total = 0);
     } finally {
       a.loading = !1;
     }
   }, V = (e) => {
     const t = {};
-    return Object.entries(e).forEach(([r, n]) => {
-      if (t[r] = n, O && n) {
-        const o = O[r];
-        o && (t[r] = le(o, n));
+    return Object.entries(e).forEach(([n, r]) => {
+      if (t[n] = r, O && r) {
+        const o = O[n];
+        o && (t[n] = le(o, r));
       }
     }), t;
   }, Y = async (e) => {
-    var n, o, l, g, p;
-    const t = w(), r = {};
-    Object.entries(t).forEach(([m, F]) => {
-      R && R.indexOf(m) > -1 && (r[m] = F);
-    }), await ((o = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : o.resetFields()), (p = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || p.call(g, r), se(() => {
+    var r, o, l, g, d;
+    const t = w(), n = {};
+    Object.entries(t).forEach(([p, F]) => {
+      R && R.indexOf(p) > -1 && (n[p] = F);
+    }), await ((o = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : o.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), se(() => {
       e == null || e();
     });
   }, C = (e) => {
@@ -94,70 +94,70 @@ const Ae = ({
       ...e
     });
   }, E = () => {
-    const e = w();
-    d && (c.current = S), C({
+    const e = w(), t = S !== !1;
+    t && (c.current = h), C({
       ...e,
       filter: i.filter,
       sort: i.sort,
-      current: d ? S : void 0,
-      pageSize: d ? i.pageSize || c.pageSize : void 0
+      current: t ? h : void 0,
+      pageSize: t ? i.pageSize || c.pageSize : void 0
     });
   }, ee = () => {
     Z(), i.sort = {}, i.filter = {}, Y(E);
   }, U = () => {
     C(i);
   }, te = (e) => {
-    if (!d)
+    if (S === !1)
       U();
     else {
       const {
         current: t,
-        pageSize: r
-      } = c, n = a.total - e, o = Math.ceil(n / r), l = t > o ? o : t;
+        pageSize: n
+      } = c, r = a.total - e, o = Math.ceil(r / n), l = t > o ? o : t;
       k({
         current: l > 0 ? l : 1
       });
     }
-  }, _ = (e, t, r) => {
-    var m, F;
-    const n = w();
-    c.current = e.current, c.pageSize = e.pageSize, W(t, r);
-    const o = q(r) ? [...r] : [r], l = {};
+  }, _ = (e, t, n) => {
+    var p, F;
+    const r = w();
+    c.current = e.current, c.pageSize = e.pageSize, W(t, n);
+    const o = q(n) ? [...n] : [n], l = {};
     for (const u of o)
-      (m = h(K)) != null && m.includes(u.columnKey || u.field) && u.order && (l[fe(u.columnKey || u.field)] = u.order);
+      (p = m(K)) != null && p.includes(u.columnKey || u.field) && u.order && (l[fe(u.columnKey || u.field)] = u.order);
     const g = {};
     for (const u of Object.keys(t))
-      (F = h(J)) != null && F.includes(u) && t[u] && (g[u] = t[u]);
-    const p = {
-      ...n,
+      (F = m(J)) != null && F.includes(u) && t[u] && (g[u] = t[u]);
+    const d = {
+      ...r,
       filter: g,
       sort: l,
       current: e.current,
       pageSize: e.pageSize
     };
-    de(i, p, ge) || C(p);
+    de(i, d, ge) || C(d);
   };
   ie(() => {
     const e = w(), {
       current: t,
-      pageSize: r
+      pageSize: n
     } = c;
     if (i = {
       current: t,
-      pageSize: r,
+      pageSize: n,
       filter: {},
       sort: {},
       ...e
     }, !s) {
-      const n = V(i);
-      I(n);
+      const r = V(i);
+      I(r);
     }
-  }), ce(() => h(L), () => {
+  }), ce(() => m(L), () => {
     E();
   }, {
     deep: !0
   });
-  const re = A(() => {
+  const ne = A(() => {
     if (a.total === 0)
       return "-";
     const {
@@ -166,15 +166,15 @@ const Ae = ({
     } = c;
     return `${e}/${Math.ceil(a.total / t)}`;
   });
-  function ne(e) {
+  function re(e) {
     q(e) && (a.records = e, a.total = e.length);
   }
   const oe = A(() => {
     const {
       showLessItems: e,
       showTotal: t,
-      showQuickJumper: r,
-      showSizeChanger: n,
+      showQuickJumper: n,
+      showSizeChanger: r,
       pageSizeOptions: o
     } = Q;
     return {
@@ -183,8 +183,8 @@ const Ae = ({
         current: c.current,
         pageSize: c.pageSize,
         total: a.total,
-        showSizeChanger: N(n) ? n : !e,
-        showQuickJumper: N(r) ? r : !e,
+        showSizeChanger: N(r) ? r : !e,
+        showQuickJumper: N(n) ? n : !e,
         showLessItems: e,
         size: "default",
         pageSizeOptions: pe(o) ? ["10", "20", "50", "100"] : o,
@@ -196,7 +196,7 @@ const Ae = ({
           class: P("pagination--total-right")
         }, [T("ap.apTable.pagination.totalRightPrefix"), " ", x("span", {
           class: P("pagination-count-text")
-        }, [h(re)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [m(ne)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
       onChange: _,
       dataSource: a.records
@@ -214,14 +214,14 @@ const Ae = ({
     handleTableChange: _,
     tableProps: oe,
     dataSource: A(() => a.records),
-    setDataSource: ne,
+    setDataSource: re,
     getColumnSFConfig: G,
     sortedInfo: H,
     filteredInfo: X
   };
 };
 export {
-  S as DEFAULT_CURRENT,
+  h as DEFAULT_CURRENT,
   D as DEFAULT_PAGE_SIZE,
   Ae as useTablePaging
 };

package/es/src/business/hooks/index.d.ts

@@ -1,3 +1,4 @@
 export * from './usePageListApTable';
 export * from './useTableRefresh';
 export * from './usePageListApGrid';
+export * from './useGridRefresh';

package/es/src/business/hooks/index.mjs

@@ -1,8 +1,10 @@
 import { usePageListApTable as o } from "./usePageListApTable.mjs";
-import { useTableRefresh as p } from "./useTableRefresh.mjs";
-import { usePageListApGrid as a } from "./usePageListApGrid.mjs";
+import { useTableRefresh as f } from "./useTableRefresh.mjs";
+import { usePageListApGrid as t } from "./usePageListApGrid.mjs";
+import { useGridRefresh as i } from "./useGridRefresh.mjs";
 export {
-  a as usePageListApGrid,
+  i as useGridRefresh,
+  t as usePageListApGrid,
   o as usePageListApTable,
-  p as useTableRefresh
+  f as useTableRefresh
 };

package/es/src/business/hooks/useGridRefresh.d.ts

@@ -0,0 +1,17 @@
+import { Ref } from 'vue';
+import { ApGridExpose } from '../../ap-grid';
+export interface UseGridRefreshOption {
+    /**
+     * apTable实例
+     */
+    apTableRef?: Ref<ApGridExpose | undefined | null>;
+    /**
+     * 刷新类型，reset：重置，submit：提交
+     */
+    refreshType?: 'reset' | 'submit';
+    /**
+     * 刷新前执行，返回false则不执行
+     */
+    refreshBefore?: () => boolean;
+}
+export declare function useGridRefresh(option?: UseGridRefreshOption): void;

package/es/src/business/hooks/useGridRefresh.mjs

@@ -0,0 +1,17 @@
+import { onMounted as m, onActivated as b } from "vue";
+function l(e) {
+  const a = (["reset", "submit", void 0].includes(e == null ? void 0 : e.refreshType) ? e == null ? void 0 : e.refreshType : "submit") ?? "submit", r = (e == null ? void 0 : e.refreshBefore) ?? (() => !0);
+  let s = !0;
+  m(() => {
+    s = !1;
+  }), b(() => {
+    const c = r == null ? void 0 : r();
+    s || c && setTimeout(() => {
+      var u, f;
+      (f = (u = e == null ? void 0 : e.apTableRef) == null ? void 0 : u.value) == null || f[a]();
+    });
+  });
+}
+export {
+  l as useGridRefresh
+};

package/es/src/business/hooks/usePageListApGrid.mjs

@@ -9,17 +9,17 @@ function k(s) {
     isShowRowSelection: c = !0,
     clearSelectionOnRequest: i = !0,
     transformSearchFormValues: a,
-    api: l,
-    tableRefresh: f = !1,
-    ...d
+    api: n,
+    tableRefresh: d = !0,
+    ...f
   } = s || {};
-  let n = null;
+  let l = null;
   const m = v("uiMode", "aplus"), u = () => {
     var e, r;
     (r = (e = o.value) == null ? void 0 : e.rowSelection) == null || r.clearAll();
   };
   return b({
-    ...R(f),
+    ...R(d),
     apTableRef: o
   }), [h(
     {
@@ -28,12 +28,12 @@ function k(s) {
       columnResizable: !0,
       // 表格分页器吸底效果
       sticky: !0,
-      request: l ? async (e) => {
-        n = e.sort;
+      request: n ? async (e) => {
+        l = e.sort;
         const r = a ? a(e) : e;
         try {
-          if (!l) throw new Error("api is not defined");
-          const { records: t, total: p } = await l(r);
+          if (!n) throw new Error("api is not defined");
+          const { records: t, total: p } = await n(r);
           return i && u(), {
             data: t,
             total: p
@@ -56,7 +56,7 @@ function k(s) {
       card: !0,
       bordered: m.value === "admin"
     },
-    d
+    f
   ), {
     reload: () => {
       var e;
@@ -75,7 +75,7 @@ function k(s) {
     getSearchFormValuesAndSorted: (e = !0) => {
       var t;
       const r = ((t = o.value) == null ? void 0 : t.getSearchFormValues(!!e)) || {};
-      return r.sort = n && S(n), a ? a(r) : r;
+      return r.sort = l && S(l), a ? a(r) : r;
     },
     clearSelection: u
   }];

package/es/src/full-screen/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as R, ref as i, watch as E, unref as a, computed as n, createBlock as m, openBlock as d, withCtx as v, resolveDynamicComponent as z, mergeProps as C, renderSlot as F, createElementVNode as N, normalizeClass as S } from "vue";
+import { defineComponent as R, ref as i, watch as E, unref as a, computed as n, createBlock as d, openBlock as m, withCtx as v, resolveDynamicComponent as z, mergeProps as C, renderSlot as F, createElementVNode as N, normalizeClass as S } from "vue";
 import "../hooks/index.mjs";
 import "../portal/index.mjs";
 import "../config-provider/index.mjs";
@@ -11,7 +11,8 @@ const H = /* @__PURE__ */ R({
   __name: "index",
   props: {
     wrapperElementName: { default: "div" },
-    zIndex: { default: 2147483647 }
+    zIndex: { default: 2147483647 },
+    to: { default: "body" }
   },
   setup(L, { expose: w }) {
     const {
@@ -19,49 +20,49 @@ const H = /* @__PURE__ */ R({
       full: b,
       enter: y,
       exit: _
-    } = I(), { b: x, bm: g, be: k } = $("full-screen"), t = i(!1), l = i(), p = h(document.body), u = i();
+    } = I(), { b: g, bm: k, be: x } = $("full-screen"), t = i(!1), l = i(), p = h(document.body), u = i();
     E(
       () => a(b),
       (e) => {
         e || (t.value = !1, l.value = void 0);
       }
     );
-    async function o(e, r = !1) {
-      await s(), t.value = !0, l.value = e, e === "browser" ? y(r) : p.value = !0;
+    async function r(e, o = !1) {
+      await s(), t.value = !0, l.value = e, e === "browser" ? y(o) : p.value = !0;
     }
     async function s(e = !1) {
       t.value = !1, l.value === "browser" ? await _(e) : p.value = !1, l.value = void 0;
     }
-    async function c(e, r = !1) {
-      t.value ? l.value !== e ? await o(e, r) : await s(r) : await o(e, r);
+    async function c(e, o = !1) {
+      t.value ? l.value !== e ? await r(e, o) : await s(o) : await r(e, o);
     }
     return w({
       target: n(() => a(f)),
       portalRoot: n(() => a(u)),
       full: n(() => a(t)),
       mode: n(() => a(l)),
-      enter: o,
+      enter: r,
       exit: s,
       toggle: c
-    }), (e, r) => (d(), m(a(B), {
-      to: "body",
+    }), (e, o) => (m(), d(a(B), {
+      to: e.to,
       disabled: l.value !== "window"
     }, {
       default: v(() => [
-        (d(), m(z(e.wrapperElementName), C({
+        (m(), d(z(e.wrapperElementName), C({
           ref_key: "target",
           ref: f
         }, e.$attrs, {
           class: [
-            a(x)("wrapper"),
-            t.value && l.value === "window" ? a(g)("wrapper", "full") : null
+            a(g)("wrapper"),
+            t.value && l.value === "window" ? a(k)("wrapper", "full") : null
           ],
           style: { zIndex: t.value && l.value === "window" ? e.zIndex : "unset" }
         }), {
           default: v(() => [
             F(e.$slots, "default", {
               full: t.value,
-              enter: o,
+              enter: r,
               exit: s,
               toggle: c,
               mode: l.value,
@@ -70,14 +71,14 @@ const H = /* @__PURE__ */ R({
             N("div", {
               ref_key: "portalRootRef",
               ref: u,
-              class: S(a(k)("wrapper", "portal-root"))
+              class: S(a(x)("wrapper", "portal-root"))
             }, null, 2)
           ]),
           _: 3
         }, 16, ["class", "style"]))
       ]),
       _: 3
-    }, 8, ["disabled"]));
+    }, 8, ["to", "disabled"]));
   }
 });
 export {

package/es/src/full-screen/interface.d.ts

@@ -1,4 +1,5 @@
 import { ComputedRef } from 'vue';
+import { PortalProps } from '../portal';
 export type FullScreenMode = 'browser' | 'window';
 export type FullScreenProps = {
     /**
@@ -9,7 +10,7 @@ export type FullScreenProps = {
      * 全屏状态下的css zIndex 默认为2^31 - 1
      */
     zIndex?: number;
-};
+} & Pick<PortalProps, 'to'>;
 export type FullScreenExpose = {
     /**
      * 全屏的目标元素