@aplus-frontend/ui 0.3.9 → 0.3.11

package/es/src/ap-form/ap-form.vue2.mjs

@@ -1,13 +1,13 @@
-import { defineComponent as $, ref as M, reactive as G, unref as m, nextTick as H, toRaw as O, computed as J, openBlock as Q, createBlock as X, mergeProps as Y, withCtx as Z, renderSlot as ee } from "vue";
-import { Form as te } from "@aplus-frontend/antdv";
-import { useProvideForm as le } from "./context.mjs";
-import { isArray as f, cloneDeep as oe, isFunction as V, isPlainObject as R, omit as re } from "lodash-unified";
-import { useUrlSearchParams as se } from "@vueuse/core";
-import { INTERNAL_FORM_INSTANCE_MARK as ie } from "./constant.mjs";
-import { getRouteType as ne, isDef as U } from "../utils/index.mjs";
-import ae from "./utils/set.mjs";
+import { defineComponent as G, ref as b, reactive as H, unref as g, nextTick as J, toRaw as O, computed as Q, openBlock as X, createBlock as Y, mergeProps as Z, withCtx as ee, renderSlot as te } from "vue";
+import { Form as le } from "@aplus-frontend/antdv";
+import { useProvideForm as re } from "./context.mjs";
+import { isArray as f, cloneDeep as oe, isFunction as P, isPlainObject as R, omit as se } from "lodash-unified";
+import { useUrlSearchParams as ie } from "@vueuse/core";
+import { INTERNAL_FORM_INSTANCE_MARK as ne } from "./constant.mjs";
+import { getRouteType as ae, isDef as T } from "../utils/index.mjs";
+import ue from "./utils/set.mjs";
 import { genParams as _, setToParams as w } from "./utils/params.mjs";
-const ye = /* @__PURE__ */ $({
+const Ve = /* @__PURE__ */ G({
   __name: "ap-form",
   props: {
     layout: { default: "horizontal" },
@@ -38,8 +38,11 @@ const ye = /* @__PURE__ */ $({
     syncToUrlPriority: { type: Boolean }
   },
   setup(E, { expose: j }) {
-    const s = E;
-    function y(e, t, l = !0) {
+    function x(e, t) {
+      return f(t) ? t.reduce((l, s) => l == null ? void 0 : l[s], e) : e == null ? void 0 : e[t];
+    }
+    const o = E;
+    function V(e, t, l = !0) {
       var i;
       if (f(e)) {
         let r = n;
@@ -48,105 +51,108 @@ const ye = /* @__PURE__ */ $({
         r[e[e.length - 1]] = t;
       } else
         n[e] = t;
-      let o = f(e) ? e[0] : e;
-      l && ((i = s.onValuesChange) == null || i.call(s, { [o]: n[o] }, n, e)), g();
+      let s = f(e) ? e[0] : e;
+      l && ((i = o.onValuesChange) == null || i.call(o, { [s]: n[s] }, n, e)), y();
     }
-    const a = M(), v = se(ne()), B = M(
-      s.syncToUrl ? _(s.syncToUrl, v, "get") : {}
+    const a = b(), m = ie(ae()), v = b(
+      o.syncToUrl ? _(o.syncToUrl, m, "get") : {}
     );
-    let h = oe(I()), d = {};
-    const n = G(I());
+    let p = oe(B()), d = {};
+    const n = H(B());
     let F = [];
-    function I() {
-      const e = s.initialValues || {};
-      return s.syncToUrlPriority ? {
+    function B() {
+      const e = o.initialValues || {};
+      return o.syncToUrlPriority ? {
         ...e,
-        ...m(B)
+        ...g(v)
       } : {
-        ...m(B),
+        ...g(v),
         ...e
       };
     }
-    function x(e) {
+    function A(e) {
       var l;
-      const t = p(e, d);
-      s.syncToUrl && w(v, _(s.syncToUrl, t, "set")), (l = s.onFinish) == null || l.call(s, t);
+      const t = h(e, d);
+      o.syncToUrl && w(m, _(o.syncToUrl, t, "set")), (l = o.onFinish) == null || l.call(o, t);
     }
-    const A = async () => {
+    const N = async () => {
       var e;
-      (e = a.value) == null || e.resetFields(), await H(() => {
-        Object.keys(n).forEach((t) => delete n[t]), Object.assign(n, h), g(), s.syncToUrl && w(
-          v,
+      (e = a.value) == null || e.resetFields(), await J(() => {
+        Object.keys(n).forEach((t) => delete n[t]), Object.assign(n, p), y(), o.syncToUrl && w(
+          m,
           _(
-            s.syncToUrl,
-            p(h, d),
+            o.syncToUrl,
+            h(p, d),
             "set"
           )
         );
       });
-    }, N = (e) => {
+    }, S = (e) => {
       var t;
       (t = a.value) == null || t.clearValidate(e);
-    }, S = (e, t) => {
+    }, W = (e, t) => {
       var l;
       return (l = a.value) == null ? void 0 : l.validateFields(e, t);
-    }, W = async (e, t) => {
-      var o;
-      const l = await ((o = a.value) == null ? void 0 : o.validateFields(
+    }, q = async (e, t) => {
+      var s;
+      const l = await ((s = a.value) == null ? void 0 : s.validateFields(
         e,
         t
       ));
-      return p(l, d);
-    }, q = (e) => {
+      return h(l, d);
+    }, z = (e) => {
       var t;
       return (t = a.value) == null ? void 0 : t.getFieldsValue(e);
-    }, z = (e) => {
+    }, C = (e) => {
       var l;
       const t = (l = a.value) == null ? void 0 : l.getFieldsValue(e);
-      return p(t, d);
-    }, C = (e, t) => {
+      return h(t, d);
+    }, D = (e, t) => {
       var l;
       return (l = a.value) == null ? void 0 : l.validate(e, t);
-    }, D = (e, t = {}) => {
+    }, L = (e, t = {}) => {
       var l;
       (l = a.value) == null || l.scrollToField(e, t);
-    }, L = (e) => {
-      Object.assign(n, e), g();
-    }, P = (e, t, l = !0) => {
-      y(e, t, l), g();
+    }, k = (e) => {
+      Object.assign(n, e), y();
+    }, I = (e, t, l = !0) => {
+      V(e, t, l), y();
     };
-    function T(e, t) {
+    function U(e, t) {
       return t || e(O(n)), F.push(e), () => {
         F = F.filter((l) => l !== e);
       };
     }
-    function b({ initialValue: e, name: t, transform: l }) {
-      if (U(e) && U(t))
-        if (y(t, e, !1), f(t)) {
-          let o = h;
-          for (let i = 0; i < t.length - 1; i++)
-            U(o[t[i]]) || (o[t[i]] = {}), o = o[t[i]];
-          o[t[t.length - 1]] = e;
-        } else
-          h[t] = e;
-      l && (d = ae(
+    function M({ initialValue: e, name: t, transform: l }) {
+      if (T(e) && T(t)) {
+        const s = x(g(v), t);
+        if (!T(s) || !o.syncToUrlPriority)
+          if (V(t, e, !1), f(t)) {
+            let i = p;
+            for (let r = 0; r < t.length - 1; r++)
+              T(i[t[r]]) || (i[t[r]] = {}), i = i[t[r]];
+            i[t[t.length - 1]] = e;
+          } else
+            p[t] = e;
+      }
+      l && (d = ue(
         d,
         [t].flat(1),
         l,
         !0
       ));
     }
-    function k(e) {
-      if (e !== ie) {
+    function K(e) {
+      if (e !== ne) {
         console.warn("getInternalInstance should only used at internal");
         return;
       }
       return {
-        registerField: b,
-        registerWatch: T
+        registerField: M,
+        registerWatch: U
       };
     }
-    function g() {
+    function y() {
       if (F.length) {
         const e = O(n);
         F.forEach((t) => {
@@ -154,63 +160,63 @@ const ye = /* @__PURE__ */ $({
         });
       }
     }
-    function p(e, t) {
+    function h(e, t) {
       if (e == null)
         return;
       let l = f(e) ? [] : {};
-      return Object.keys(e).forEach((o) => {
-        const i = e[o], r = t == null ? void 0 : t[o], u = V(r) ? r : r == null ? void 0 : r.transformer, K = V(r) ? !0 : r == null ? void 0 : r.flat;
-        if (V(u)) {
+      return Object.keys(e).forEach((s) => {
+        const i = e[s], r = t == null ? void 0 : t[s], u = P(r) ? r : r == null ? void 0 : r.transformer, $ = P(r) ? !0 : r == null ? void 0 : r.flat;
+        if (P(u)) {
           const c = u(i);
-          K ? f(c) && f(l) ? l = [...l, ...c] : R(c) && R(l) ? l = {
+          $ ? f(c) && f(l) ? l = [...l, ...c] : R(c) && R(l) ? l = {
             ...l,
             ...c
-          } : l[o] = c : l[o] = c;
+          } : l[s] = c : l[s] = c;
         } else if (R(i) || f(i)) {
-          const c = p(
+          const c = h(
             i,
             r
           );
-          l[o] = c;
+          l[s] = c;
         } else
-          l[o] = i;
+          l[s] = i;
       }), l;
     }
-    return le({
-      model: J(() => n),
-      updateModel: y,
+    return re({
+      model: Q(() => n),
+      updateModel: V,
       internalInstance: {
-        registerWatch: T,
-        registerField: b,
-        setFieldValue: P
+        registerWatch: U,
+        registerField: M,
+        setFieldValue: I
       }
     }), j({
-      resetFields: A,
-      clearValidate: N,
-      validateFields: S,
-      getFieldsValue: q,
-      validate: C,
-      scrollToField: D,
-      setFieldsValue: L,
-      setFieldValue: P,
-      registerWatch: T,
-      validateFieldsReturnTransformed: W,
-      getFieldsValueTransformed: z,
-      getInternalInstance: k
-    }), (e, t) => (Q(), X(m(te), Y({
+      resetFields: N,
+      clearValidate: S,
+      validateFields: W,
+      getFieldsValue: z,
+      validate: D,
+      scrollToField: L,
+      setFieldsValue: k,
+      setFieldValue: I,
+      registerWatch: U,
+      validateFieldsReturnTransformed: q,
+      getFieldsValueTransformed: C,
+      getInternalInstance: K
+    }), (e, t) => (X(), Y(g(le), Z({
       ref_key: "formRef",
       ref: a
-    }, m(re)(s, ["initialValues", "onValuesChange", "onFinish"]), {
+    }, g(se)(o, ["initialValues", "onValuesChange", "onFinish"]), {
       model: n,
-      onFinish: x
+      onFinish: A
     }), {
-      default: Z(() => [
-        ee(e.$slots, "default")
+      default: ee(() => [
+        te(e.$slots, "default")
       ]),
       _: 3
     }, 16, ["model"]));
   }
 });
 export {
-  ye as default
+  Ve as default
 };

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

@@ -1,13 +1,12 @@
-import { defineComponent as H, ref as J, unref as t, computed as c, watch as Q, openBlock as i, createBlock as S, normalizeClass as u, withCtx as f, createElementVNode as X, normalizeStyle as v, renderSlot as l, createVNode as h, createElementBlock as p, Fragment as I, renderList as Y, mergeProps as Z, createCommentVNode as _ } from "vue";
+import { defineComponent as H, ref as J, unref as t, computed as d, watch as Q, openBlock as i, createBlock as S, normalizeClass as u, withCtx as f, createElementVNode as X, normalizeStyle as h, renderSlot as l, createVNode as v, createElementBlock as p, Fragment as I, renderList as Y, mergeProps as Z, createCommentVNode as _ } from "vue";
 import { Empty as E, Spin as x, Pagination as ee } from "@aplus-frontend/antdv";
-import "../ap-table/index.mjs";
+import { useTablePaging as te } from "../ap-table/hooks/use-table-paging-ng.mjs";
 import "../config-provider/index.mjs";
-import { isUndefined as O, isNumber as te, omit as ae } from "lodash-unified";
-import { useOfflineList as ne } from "./hooks/use-offline-list.mjs";
+import { isUndefined as O, isNumber as ae, omit as ne } from "lodash-unified";
+import { useOfflineList as re } from "./hooks/use-offline-list.mjs";
 import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
-import { RecycleScroller as re, DynamicScroller as oe, DynamicScrollerItem as ie } from "vue-virtual-scroller";
-import { useNamespace as le } from "../config-provider/hooks/use-namespace.mjs";
-import { useTablePaging as se } from "../ap-table/hooks/use-table-paging.mjs";
+import { RecycleScroller as oe, DynamicScroller as ie, DynamicScrollerItem as le } from "vue-virtual-scroller";
+import { useNamespace as se } from "../config-provider/hooks/use-namespace.mjs";
 const he = /* @__PURE__ */ H({
   __name: "index",
   props: {
@@ -28,16 +27,16 @@ const he = /* @__PURE__ */ H({
     rowKey: {}
   },
   setup(V, { expose: F }) {
-    const L = E.PRESENTED_IMAGE_SIMPLE, n = V, { b: d, e: N } = le("ap-list"), b = J(), {
+    const L = E.PRESENTED_IMAGE_SIMPLE, n = V, { b: m, e: N } = se("ap-list"), b = J(), {
       formRef: k,
-      submit: z,
-      reset: C,
+      submit: D,
+      reset: w,
       handleTableChange: R,
       data: g,
       refresh: T,
       refreshByDelete: $,
-      tableProps: P
-    } = se({
+      tableProps: z
+    } = te({
       async request(e) {
         var r;
         const a = await ((r = n.request) == null ? void 0 : r.call(n, e));
@@ -49,16 +48,15 @@ const he = /* @__PURE__ */ H({
       defaultParams: n.params,
       defaultData: n.defaultData,
       manual: n.manual,
-      defaultCurrent: n.pagination ? n.pagination.defaultCurrent : void 0,
-      defaultPageSize: n.pagination ? n.pagination.defaultPageSize : void 0,
+      pagination: n.pagination,
       formatParams: n.beforeSearchSubmit
     }), j = { form: k }, {
-      pagination: D,
+      pagination: B,
       dataSource: q,
       onChange: A
-    } = ne(n);
+    } = re(n);
     function K(e, a) {
-      if (t(m)) {
+      if (t(c)) {
         A(e, a);
         return;
       }
@@ -69,10 +67,10 @@ const he = /* @__PURE__ */ H({
         { currentDataSource: [], action: "paginate" }
       );
     }
-    const s = c(() => t(m) ? t(q) : t(g).records), y = c(() => O(n.loading) ? t(g).loading : n.loading), M = c(() => {
+    const s = d(() => t(c) ? t(q) : t(g).records), y = d(() => O(n.loading) ? t(g).loading : n.loading), M = d(() => {
       var e, a;
-      return n.pagination === !1 || n.virtual ? !1 : ((e = n.pagination) == null ? void 0 : e.hideOnSinglePage) !== !0 ? !0 : t(m) ? (((a = n.dataSource) == null ? void 0 : a.length) || 0) > t(D).pageSize : t(g).total > t(P).pagination.pageSize;
-    }), m = c(() => !O(n.dataSource));
+      return n.pagination === !1 || n.virtual ? !1 : ((e = n.pagination) == null ? void 0 : e.hideOnSinglePage) !== !0 ? !0 : t(c) ? (((a = n.dataSource) == null ? void 0 : a.length) || 0) > t(B).pageSize : t(g).total > t(z).pagination.pageSize;
+    }), c = d(() => !O(n.dataSource));
     Q(
       () => t(y),
       (e) => {
@@ -90,41 +88,41 @@ const he = /* @__PURE__ */ H({
       return (r == null ? void 0 : r()) || {};
     }
     return F({
-      submit: () => z(),
-      reset: () => C(),
+      submit: () => D(),
+      reset: () => w(),
       refresh: () => T(),
       refreshByDelete: (e) => $(e),
       scrollToFirstRow: W,
       getSearchFormValuesIfSetted: G
     }), (e, a) => (i(), S(t(x), {
       spinning: y.value,
-      class: u(t(d)("spin"))
+      class: u(t(m)("spin"))
     }, {
       default: f(() => [
         X("div", {
-          class: u(t(d)()),
-          style: v(e.containerStyle)
+          class: u(t(m)()),
+          style: h(e.containerStyle)
         }, [
           l(e.$slots, "header", {
             formIns: j,
-            submit: t(z),
-            reset: t(C)
+            submit: t(D),
+            reset: t(w)
           }),
           s.value.length === 0 ? l(e.$slots, "empty", {
             key: 0,
             loading: y.value
           }, () => [
-            h(t(E), { image: t(L) }, null, 8, ["image"])
+            v(t(E), { image: t(L) }, null, 8, ["image"])
           ]) : (i(), p("div", {
             key: 1,
             ref_key: "contentRef",
             ref: b,
-            style: v(e.contentStyle)
+            style: h(e.contentStyle)
           }, [
             e.virtual ? (i(), p(I, { key: 0 }, [
-              t(te)(e.virtual) ? (i(), S(t(re), {
+              t(ae)(e.virtual) ? (i(), S(t(oe), {
                 key: 0,
-                class: u(t(d)("scroll-wrapper")),
+                class: u(t(m)("scroll-wrapper")),
                 items: s.value,
                 "item-size": e.virtual,
                 "key-field": n.rowKey || "id"
@@ -136,20 +134,20 @@ const he = /* @__PURE__ */ H({
                   })
                 ]),
                 _: 3
-              }, 8, ["class", "items", "item-size", "key-field"])) : (i(), S(t(oe), {
+              }, 8, ["class", "items", "item-size", "key-field"])) : (i(), S(t(ie), {
                 key: 1,
                 items: s.value,
                 "min-item-size": e.virtual.minItemSize,
-                class: u(t(d)("scroll-wrapper"))
+                class: u(t(m)("scroll-wrapper"))
               }, {
                 default: f(({ item: r, index: o, active: U }) => {
-                  var w, B;
+                  var C, P;
                   return [
-                    h(t(ie), {
+                    v(t(le), {
                       item: r,
                       active: U,
                       "data-index": o,
-                      "size-dependencies": (B = (w = e.virtual).sizeDependencies) == null ? void 0 : B.call(w, r)
+                      "size-dependencies": (P = (C = e.virtual).sizeDependencies) == null ? void 0 : P.call(C, r)
                     }, {
                       default: f(() => [
                         l(e.$slots, "renderItem", {
@@ -176,10 +174,10 @@ const he = /* @__PURE__ */ H({
           M.value ? (i(), p("div", {
             key: 2,
             class: u(t(N)("footer")),
-            style: v(e.footerWarpperStyle)
+            style: h(e.footerWarpperStyle)
           }, [
-            h(t(ee), Z(
-              m.value ? t(D) : t(ae)(t(P).pagination, ["showTotal"]),
+            v(t(ee), Z(
+              c.value ? t(B) : t(ne)(t(z).pagination, ["showTotal"]),
               { onChange: K }
             ), null, 16)
           ], 6)) : _("", !0)

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

@@ -1,4 +1,4 @@
-import { StyleValue } from 'vue';
+import { Ref, StyleValue } from 'vue';
 import { RequestData } from '../ap-table';
 import { Recordable } from '../type';
 export type ApListProps<RecordType = any, ParamsType = Recordable> = {
@@ -16,9 +16,9 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
      */
     onItem?: (record: RecordType, index: number) => void;
     /**
-     * 依赖的额外的参数（该参数变更不会触发网络请求）
+     * 依赖的额外的参数，传入响应式参数会在变更后重新执行
      */
-    params?: ParamsType;
+    params?: ParamsType | Ref<ParamsType>;
     /**
      * 请求数据
      * @param params