@aplus-frontend/ui 7.9.0 → 7.10.0

package/es/src/ap-list/index.vue.mjs

@@ -1,14 +1,14 @@
-import { defineComponent as Z, shallowRef as _, toRef as x, unref as e, computed as p, watch as ee, createElementBlock as s, openBlock as o, normalizeStyle as h, normalizeClass as i, renderSlot as u, createElementVNode as te, createCommentVNode as P, createVNode as g, Fragment as z, createBlock as C, withCtx as b, renderList as ae, mergeProps as ne } from "vue";
-import { Empty as F, Spin as re, Pagination as oe } from "@aplus-frontend/antdv";
-import { useTablePaging as ie } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { defineComponent as ue, shallowRef as V, computed as m, toRef as ce, unref as t, watch as L, createElementBlock as s, openBlock as o, normalizeStyle as D, normalizeClass as l, renderSlot as u, createElementVNode as fe, createCommentVNode as N, createVNode as h, Fragment as O, createBlock as A, withCtx as B, renderList as de, mergeProps as me } from "vue";
+import { Empty as $, Spin as pe, Pagination as ge } from "@aplus-frontend/antdv";
+import { useTablePaging as Se } from "../ap-table/hooks/use-table-paging-ng.mjs";
 import "../config-provider/index.mjs";
-import { isUndefined as V, isNumber as le, omit as se } from "lodash-unified";
-import { useOfflineList as ue } from "./hooks/use-offline-list.mjs";
+import { throttle as ye, isUndefined as M, isNumber as ve, omit as he } from "lodash-unified";
+import { useOfflineList as be } from "./hooks/use-offline-list.mjs";
 import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
-import { RecycleScroller as me, DynamicScroller as ce, DynamicScrollerItem as de } from "vue-virtual-scroller";
-import fe from "./style/index.mjs";
-import { useNamespace as pe } from "../config-provider/hooks/use-namespace.mjs";
-const De = /* @__PURE__ */ Z({
+import { RecycleScroller as ke, DynamicScroller as Ie, DynamicScrollerItem as Pe } from "vue-virtual-scroller";
+import we from "./style/index.mjs";
+import { useNamespace as De } from "../config-provider/hooks/use-namespace.mjs";
+const Oe = /* @__PURE__ */ ue({
   name: "ApList",
   __name: "index",
   props: {
@@ -27,173 +27,214 @@ const De = /* @__PURE__ */ Z({
     footerWarpperStyle: { type: [Boolean, null, String, Object, Array] },
     virtual: { default: void 0 },
     rowKey: {},
-    adaptive: { type: Boolean, default: !1 }
+    adaptive: { type: Boolean, default: !1 },
+    fetchMode: { default: "paging" }
   },
-  setup(E, { expose: R }) {
-    const L = F.PRESENTED_IMAGE_SIMPLE, a = E, { b: d, e: y, bm: O, m: N } = pe("ap-list"), T = fe("ap-list"), k = _(), {
-      formRef: S,
-      submit: I,
-      reset: w,
-      handleTableChange: $,
-      data: v,
-      refresh: A,
-      refreshByDelete: j,
-      tableProps: B,
-      getPaging: q,
-      setPaging: K
-    } = ie({
-      async request(t) {
-        const n = await a.request?.(t);
+  setup(j, { expose: q }) {
+    const K = $.PRESENTED_IMAGE_SIMPLE, a = j, { b: p, e: b, bm: H, m: W } = De("ap-list"), G = we("ap-list"), c = V(), g = V(), S = m(() => a.fetchMode === "paging"), {
+      formRef: k,
+      submit: U,
+      reset: J,
+      handleTableChange: Q,
+      fetchNextPageAndCache: C,
+      data: I,
+      refresh: X,
+      refreshByDelete: Y,
+      tableProps: P,
+      getPaging: Z,
+      setPaging: _
+    } = Se({
+      async request(e) {
+        const n = await a.request?.(e);
         return {
           data: n?.data || [],
           total: n?.total || 0
         };
       },
-      params: x(a, "params"),
+      params: ce(a, "params"),
       defaultData: a.defaultData,
       manual: a.manual,
       pagination: a.pagination,
       formatParams: a.beforeSearchSubmit
-    }), M = { form: S }, {
-      pagination: D,
-      dataSource: W,
-      onChange: G
-    } = ue(a);
-    function U(t, n) {
-      if (e(f)) {
-        G(t, n);
+    });
+    let y = 0;
+    function x() {
+      const e = c.value;
+      if (S.value || !e)
+        return;
+      const n = e.scrollTop, r = e.scrollHeight - e.clientHeight;
+      y >= r && (y = 0), !(y > n) && r - n <= 1 && (y = n, C());
+    }
+    function E() {
+      !S.value && C();
+    }
+    const z = ye(x, 300), ee = { form: k }, {
+      pagination: T,
+      dataSource: te,
+      onChange: ae
+    } = be(a);
+    function ne(e, n) {
+      if (t(v)) {
+        ae(e, n);
         return;
       }
-      $(
-        { current: t, pageSize: n },
+      Q(
+        { current: e, pageSize: n },
         {},
         {},
         { currentDataSource: [], action: "paginate" }
       );
     }
-    const m = p(() => e(f) ? e(W) : e(v).records), c = p(() => V(a.loading) ? e(v).loading : a.loading), H = p(() => a.pagination === !1 || a.virtual ? !1 : a.pagination?.hideOnSinglePage !== !0 ? !0 : e(f) ? (a.dataSource?.length || 0) > e(D).pageSize : e(v).total > e(B).pagination.pageSize), f = p(() => !V(a.dataSource));
-    ee(
-      () => e(c),
-      (t) => {
-        a.onLoadingChange?.(t);
+    const f = m(() => t(v) ? t(te) : [...t(I).records || []]), d = m(() => M(a.loading) ? t(I).loading : a.loading), re = m(() => a.pagination === !1 || a.virtual ? !1 : a.pagination?.hideOnSinglePage !== !0 ? !0 : t(v) ? (a.dataSource?.length || 0) > t(T).pageSize : t(I).total > t(P).pagination.pageSize), v = m(() => !M(a.dataSource));
+    L(
+      () => t(d),
+      (e) => {
+        a.onLoadingChange?.(e);
+      }
+    ), L(
+      () => a.params,
+      () => {
+        w();
+      },
+      {
+        deep: !0
       }
     );
-    function J(t) {
-      k.value?.querySelector(t || ":first-child")?.scrollIntoView({ behavior: "smooth", block: "center" });
+    function oe(e) {
+      c.value?.querySelector(e || ":first-child")?.scrollIntoView({ behavior: "smooth", block: "center" });
+    }
+    function le(e = !1) {
+      const n = k.value?.apForm;
+      return (e ? n?.getFieldsValueTransformed : n?.getFieldsValue)?.() || {};
+    }
+    function ie(e) {
+      k.value?.apForm?.setFieldsValue?.(e);
+    }
+    function w() {
+      S.value || (c.value && (c.value.scrollTop = 0), g.value && g.value.scrollToPosition?.(0));
     }
-    function Q(t = !1) {
-      const n = S.value?.apForm;
-      return (t ? n?.getFieldsValueTransformed : n?.getFieldsValue)?.() || {};
+    function F() {
+      w(), U();
     }
-    function X(t) {
-      S.value?.apForm?.setFieldsValue?.(t);
+    function R() {
+      w(), J();
     }
-    return R({
-      submit: () => I(),
-      reset: () => w(),
-      refresh: () => A(),
-      refreshByDelete: (t) => j(t),
-      scrollToFirstRow: J,
-      getSearchFormValuesIfSetted: Q,
-      setPaging: K,
-      getPaging: q,
-      setSearchFormValuesIfSetted: X
-    }), (t, n) => (o(), s("div", {
-      class: i([e(d)(), { [e(N)("adaptive")]: t.adaptive }, e(T)]),
-      style: h(t.containerStyle)
+    return q({
+      submit: F,
+      reset: R,
+      refresh: () => X(),
+      refreshByDelete: (e) => Y(e),
+      scrollToFirstRow: oe,
+      getSearchFormValuesIfSetted: le,
+      setPaging: _,
+      getPaging: Z,
+      setSearchFormValuesIfSetted: ie
+    }), (e, n) => (o(), s("div", {
+      class: l([t(p)(), { [t(W)("adaptive")]: e.adaptive }, t(G)]),
+      style: D(e.containerStyle)
     }, [
-      u(t.$slots, "header", {
-        formIns: M,
-        submit: e(I),
-        reset: e(w)
+      u(e.$slots, "header", {
+        formIns: ee,
+        submit: F,
+        reset: R,
+        loading: t(P).loading
       }),
-      te("div", {
-        class: i([
-          e(d)("content-container"),
-          { [e(O)("content-container", "spinning")]: c.value }
+      fe("div", {
+        class: l([
+          t(p)("content-container"),
+          { [t(H)("content-container", "spinning")]: d.value }
         ])
       }, [
-        c.value ? (o(), s("div", {
+        d.value ? (o(), s("div", {
           key: 0,
-          class: i(e(y)("spin-wrapper"))
+          class: l(t(b)("spin-wrapper"))
         }, [
-          g(e(re), { spinning: c.value }, null, 8, ["spinning"])
-        ], 2)) : P("", !0),
-        m.value.length === 0 ? u(t.$slots, "empty", {
+          h(t(pe), { spinning: d.value }, null, 8, ["spinning"])
+        ], 2)) : N("", !0),
+        f.value.length === 0 ? u(e.$slots, "empty", {
           key: 1,
-          loading: c.value
+          loading: d.value
         }, () => [
-          g(e(F), { image: e(L) }, null, 8, ["image"])
+          h(t($), { image: t(K) }, null, 8, ["image"])
         ]) : (o(), s("div", {
           key: 2,
           ref_key: "contentRef",
-          ref: k,
-          style: h(t.contentStyle),
-          class: i(e(y)("content"))
+          ref: c,
+          style: D(e.contentStyle),
+          class: l(t(b)("content")),
+          onScroll: n[0] || (n[0] = //@ts-ignore
+          (...r) => t(z) && t(z)(...r))
         }, [
-          t.virtual ? (o(), s(z, { key: 0 }, [
-            e(le)(t.virtual) ? (o(), C(e(me), {
+          e.virtual ? (o(), s(O, { key: 0 }, [
+            t(ve)(e.virtual) ? (o(), A(t(ke), {
               key: 0,
-              class: i(e(d)("scroll-wrapper")),
-              items: m.value,
-              "item-size": t.virtual,
-              "key-field": a.rowKey || "id"
+              ref_key: "scroller",
+              ref: g,
+              class: l(t(p)("scroll-wrapper")),
+              items: f.value,
+              "item-size": e.virtual,
+              "key-field": a.rowKey || "id",
+              onScrollEnd: E
             }, {
-              default: b(({ item: r, index: l }) => [
-                u(t.$slots, "renderItem", {
+              default: B(({ item: r, index: i }) => [
+                u(e.$slots, "renderItem", {
                   item: r,
-                  index: l
+                  index: i
                 })
               ]),
               _: 3
-            }, 8, ["class", "items", "item-size", "key-field"])) : (o(), C(e(ce), {
+            }, 8, ["class", "items", "item-size", "key-field"])) : (o(), A(t(Ie), {
               key: 1,
-              items: m.value,
-              "min-item-size": t.virtual.minItemSize,
-              class: i(e(d)("scroll-wrapper"))
+              ref_key: "scroller",
+              ref: g,
+              items: f.value,
+              "min-item-size": e.virtual.minItemSize,
+              class: l(t(p)("scroll-wrapper")),
+              "key-field": a.rowKey || "id",
+              onScrollEnd: E
             }, {
-              default: b(({ item: r, index: l, active: Y }) => [
-                g(e(de), {
+              default: B(({ item: r, index: i, active: se }) => [
+                h(t(Pe), {
                   item: r,
-                  active: Y,
-                  "data-index": l,
-                  "size-dependencies": t.virtual.sizeDependencies?.(r)
+                  active: se,
+                  "data-index": i,
+                  "size-dependencies": e.virtual.sizeDependencies?.(r)
                 }, {
-                  default: b(() => [
-                    u(t.$slots, "renderItem", {
+                  default: B(() => [
+                    u(e.$slots, "renderItem", {
                       item: r,
-                      index: l
+                      index: i
                     })
                   ]),
                   _: 2
                 }, 1032, ["item", "active", "data-index", "size-dependencies"])
               ]),
               _: 3
-            }, 8, ["items", "min-item-size", "class"]))
-          ], 64)) : u(t.$slots, "renderContent", {
+            }, 8, ["items", "min-item-size", "class", "key-field"]))
+          ], 64)) : u(e.$slots, "renderContent", {
             key: 1,
-            dataSource: m.value
+            dataSource: f.value
           }, () => [
-            (o(!0), s(z, null, ae(m.value, (r, l) => u(t.$slots, "renderItem", {
+            (o(!0), s(O, null, de(f.value, (r, i) => u(e.$slots, "renderItem", {
               item: r,
-              index: l
+              index: i
             })), 256))
           ])
-        ], 6))
+        ], 38))
       ], 2),
-      H.value ? (o(), s("div", {
+      S.value && re.value ? (o(), s("div", {
         key: 0,
-        class: i(e(y)("footer")),
-        style: h(t.footerWarpperStyle)
+        class: l(t(b)("footer")),
+        style: D(e.footerWarpperStyle)
       }, [
-        g(e(oe), ne(
-          f.value ? e(D) : e(se)(e(B).pagination, ["showTotal"]),
-          { onChange: U }
+        h(t(ge), me(
+          v.value ? t(T) : t(he)(t(P).pagination, ["showTotal"]),
+          { onChange: ne }
         ), null, 16)
-      ], 6)) : P("", !0)
+      ], 6)) : N("", !0)
     ], 6));
   }
 });
 export {
-  De as default
+  Oe as default
 };

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

@@ -90,6 +90,11 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
      * 是否自适应外部容器高度（无数据时充满容器、数据超出时内部滚动）
      */
     adaptive?: boolean;
+    /**
+     * 请求网络请求模式: `paging`分页、`infinite-scroll`无限滚动
+     * @default "paging"
+     */
+    fetchMode?: 'paging' | 'infinite-scroll';
 };
 export type ApListExpose = {
     /**

package/es/src/ap-pro-card/components/statistic/index.vue.d.ts

@@ -1,5 +1,6 @@
 import { ApProCardStatisticProps, ApProCardStatisticSolts } from '../../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, VNode, RendererNode, RendererElement, VNodeArrayChildren, ComponentProvideOptions } from 'vue';
+import { Formatter } from '@aplus-frontend/antdv/es/statistic/utils';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: Readonly<ApProCardStatisticSolts> & ApProCardStatisticSolts;
@@ -35,6 +36,7 @@ declare const __VLS_component: DefineComponent<ApProCardStatisticProps, {}, {},
     }> | null | undefined)[] | VNode<RendererNode, RendererElement, {
         [key: string]: any;
     }> | null;
+    formatter: Formatter;
     description: string | number | boolean | void | VNodeArrayChildren | VNode<RendererNode, RendererElement, {
         [key: string]: any;
     }> | null;

package/es/src/ap-pro-card/components/statistic/index.vue2.mjs

@@ -1,12 +1,12 @@
-import { defineComponent as E, useSlots as F, computed as t, createVNode as r, Fragment as a, createElementBlock as I, openBlock as o, mergeProps as x, createBlock as s, createElementVNode as C, resolveDynamicComponent as u, normalizeClass as B, unref as O, createSlots as P, withCtx as d } from "vue";
-import { QuestionCircleOutlined as V } from "@ant-design/icons-vue";
-import { Tooltip as Q, Badge as R, Statistic as T } from "@aplus-frontend/antdv";
-import { omit as q } from "lodash-unified";
+import { defineComponent as F, useSlots as I, computed as t, createVNode as r, Fragment as s, createElementBlock as P, openBlock as o, mergeProps as x, createBlock as u, createElementVNode as C, resolveDynamicComponent as a, normalizeClass as B, unref as O, createSlots as V, withCtx as d } from "vue";
+import { QuestionCircleOutlined as Q } from "@ant-design/icons-vue";
+import { Tooltip as R, Badge as T, Statistic as q } from "@aplus-frontend/antdv";
+import { omit as G } from "lodash-unified";
 import "../../../config-provider/index.mjs";
-import G from "../../style/statistic.mjs";
+import H from "../../style/statistic.mjs";
 import { mergeClass as c } from "../../../editable-table/utils.mjs";
-import { useNamespace as H } from "../../../config-provider/hooks/use-namespace.mjs";
-const te = /* @__PURE__ */ E({
+import { useNamespace as J } from "../../../config-provider/hooks/use-namespace.mjs";
+const ne = /* @__PURE__ */ F({
   name: "ApProCardStatistic",
   __name: "index",
   props: {
@@ -18,7 +18,8 @@ const te = /* @__PURE__ */ E({
     valueStyle: {},
     valueRender: {},
     formatter: {
-      type: [Boolean, String, Function]
+      type: [Boolean, String, Function],
+      default: void 0
     },
     precision: {},
     prefix: {
@@ -62,9 +63,9 @@ const te = /* @__PURE__ */ E({
     }
   },
   setup(S) {
-    const n = F(), e = S, {
+    const n = I(), e = S, {
       b: l
-    } = H("pro-card-statistic"), b = G("pro-card-statistic"), g = t(() => {
+    } = J("pro-card-statistic"), b = H("pro-card-statistic"), g = t(() => {
       const i = l();
       return c(`${i}`, [e.size ? `${i}-size-${e.size}` : void 0, b.value].filter(Boolean));
     }), $ = t(() => l("tip")), D = t(() => {
@@ -73,51 +74,54 @@ const te = /* @__PURE__ */ E({
     }), N = t(() => l("status")), M = t(() => l("icon")), A = t(() => l("wrapper")), j = t(() => l("content")), k = t(() => {
       const i = l();
       return c(`${i}-layout`, [e.layout ? `${i}-layout-${e.layout}` : void 0, e.trend ? `${i}-trend-${e.trend}` : void 0].filter(Boolean));
-    }), _ = t(() => l("description")), f = t(() => e.tip || n.tip ? r(Q, {
+    }), _ = t(() => l("description")), f = t(() => e.tip || n.tip ? r(R, {
       title: e.tip ?? n.tip?.()
     }, {
-      default: () => [r(V, {
+      default: () => [r(Q, {
         class: $.value
       }, null)]
     }) : void 0), p = t(() => e.trend ? r("div", {
       class: D.value
-    }, null) : void 0), z = t(() => e.status ? r(R, {
+    }, null) : void 0), z = t(() => e.status ? r(T, {
       class: N.value,
       status: e.status
     }, null) : void 0), h = t(() => e.icon || n.icon ? r("div", {
       class: M.value
-    }, [e.icon ?? n.icon?.()]) : void 0), m = t(() => e.title || n.title ? r(a, null, [e.title || n.title?.()]) : void 0), v = t(() => e.prefix || n.prefix ? r(a, null, [e.prefix || n.prefix?.()]) : void 0), y = t(() => e.suffix || n.suffix ? r(a, null, [e.suffix || n.suffix?.()]) : void 0), w = t(() => e.description || n.description ? r("div", {
+    }, [e.icon ?? n.icon?.()]) : void 0), m = t(() => e.title || n.title ? r(s, null, [e.title || n.title?.()]) : void 0), v = t(() => e.prefix || n.prefix ? r(s, null, [e.prefix || n.prefix?.()]) : void 0), y = t(() => e.suffix || n.suffix ? r(s, null, [e.suffix || n.suffix?.()]) : void 0), w = t(() => e.description || n.description ? r("div", {
       class: _.value
     }, [e.description || n.description?.()]) : void 0);
-    return (i, J) => (o(), I("div", x({
+    return (i, K) => (o(), P("div", x({
       ...i.$attrs
     }, {
       class: g.value
-    }), [(o(), s(u(h.value))), C("div", {
+    }), [(o(), u(a(h.value))), C("div", {
       class: B(A.value)
-    }, [(o(), s(u(z.value))), C("div", {
+    }, [(o(), u(a(z.value))), C("div", {
       class: B(j.value)
-    }, [r(O(T), x({
+    }, [r(O(q), x({
       class: k.value
     }, {
-      ...O(q)(e, ["title", "prefix"])
-    }), P({
+      ...O(G)(e, ["title", "prefix"]),
+      formatter: e.formatter ?? (({
+        value: E
+      }) => E ?? "--")
+    }), V({
       _: 2
     }, [m.value || f.value ? {
       name: "title",
-      fn: d(() => [(o(), s(u(m.value))), (o(), s(u(f.value)))]),
+      fn: d(() => [(o(), u(a(m.value))), (o(), u(a(f.value)))]),
       key: "0"
     } : void 0, p.value || v.value ? {
       name: "prefix",
-      fn: d(() => [(o(), s(u(p.value))), (o(), s(u(v.value)))]),
+      fn: d(() => [(o(), u(a(p.value))), (o(), u(a(v.value)))]),
       key: "1"
     } : void 0, y.value ? {
       name: "suffix",
-      fn: d(() => [(o(), s(u(y.value)))]),
+      fn: d(() => [(o(), u(a(y.value)))]),
       key: "2"
-    } : void 0]), 1040, ["class"]), (o(), s(u(w.value)))], 2)], 2)], 16));
+    } : void 0]), 1040, ["class"]), (o(), u(a(w.value)))], 2)], 2)], 16));
   }
 });
 export {
-  te as default
+  ne as default
 };

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

@@ -64,6 +64,16 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      */
     onAfterRequest?: (records: DataType[]) => void;
 };
+export type TablePagingRequestOptions = {
+    /**
+     * 是否缓存数据（无限滚动下适用）
+     */
+    cache?: boolean;
+    /**
+     * 单次网络请求成功后触发
+     */
+    onSuccess?: (rawParams: Recordable, hasMore: boolean) => void;
+};
 export type InternalPagingType = Partial<{
     current: number;
     pageSize: number;
@@ -112,5 +122,6 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     };
     setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
     submitWith: (resetCurrent?: boolean) => void;
+    fetchNextPageAndCache: () => void;
 };
 export {};