@aplus-frontend/ui 6.13.3 → 6.14.0

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

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

package/es/src/ap-form/dependency/index.vue.mjs

@@ -1,43 +1,41 @@
-import { defineComponent as m, ref as y, watchEffect as _, unref as d, renderSlot as g } from "vue";
-import { useInjectForm as h } from "../context.mjs";
-import { isArray as V, isNumber as x, cloneDeep as b } from "lodash-unified";
-const F = /* @__PURE__ */ m({
+import { defineComponent as p, ref as i, watchEffect as d, unref as v, renderSlot as _ } from "vue";
+import { useInjectForm as g } from "../context.mjs";
+import { isNumber as h, cloneDeep as y } from "lodash-unified";
+import { getModelValue as V } from "../utils/get.mjs";
+const D = /* @__PURE__ */ p({
   name: "ApFormDependency",
   __name: "index",
   props: {
     nameList: {}
   },
-  setup(c) {
-    function f(e, n) {
-      return V(n) ? n.reduce((o, t) => o == null ? void 0 : o[t], e) : e == null ? void 0 : e[n];
-    }
-    const a = c, {
-      model: l
-    } = h(), u = y({});
-    function i(e, n, o) {
-      let t = n;
-      for (let s = 0; s < e.length; s++) {
-        const r = e[s];
-        if (s === e.length - 1)
-          t[r] = o;
+  setup(a) {
+    const c = a, {
+      model: f
+    } = g(), r = i({});
+    function u(e, s, l) {
+      let t = s;
+      for (let o = 0; o < e.length; o++) {
+        const n = e[o];
+        if (o === e.length - 1)
+          t[n] = l;
         else {
-          const p = e[s + 1];
-          (typeof t[r] != "object" || t[r] === null) && (t[r] = x(p) ? [] : {}), t = t[r];
+          const m = e[o + 1];
+          (typeof t[n] != "object" || t[n] === null) && (t[n] = h(m) ? [] : {}), t = t[n];
         }
       }
     }
-    return _(() => {
-      const e = b(u.value);
-      for (const n of a.nameList) {
-        const o = [n].flat(1), t = f(d(l), o);
-        i(o, e, t);
+    return d(() => {
+      const e = y(r.value);
+      for (const s of c.nameList) {
+        const l = [s].flat(1), t = V(v(f), l);
+        u(l, e, t);
       }
-      u.value = e;
-    }), (e, n) => g(e.$slots, "default", {
-      values: u.value
+      r.value = e;
+    }), (e, s) => _(e.$slots, "default", {
+      values: r.value
     });
   }
 });
 export {
-  F as default
+  D as default
 };

package/es/src/ap-form/hooks/use-watch.mjs

@@ -1,42 +1,39 @@
-import { useInjectForm as M } from "../context.mjs";
-import { ref as R, watchEffect as d, unref as s, watch as y } from "vue";
-import { isArray as E } from "lodash-unified";
-import { INTERNAL_FORM_INSTANCE_MARK as _ } from "../constant.mjs";
-function N(e, t) {
-  return E(t) ? t.reduce((n, l) => n == null ? void 0 : n[l], e) : e == null ? void 0 : e[t];
-}
-function V(e) {
+import { useInjectForm as N } from "../context.mjs";
+import { ref as M, watchEffect as R, unref as f, watch as A } from "vue";
+import { INTERNAL_FORM_INSTANCE_MARK as E } from "../constant.mjs";
+import { getModelValue as w } from "../utils/get.mjs";
+function V(a) {
   try {
-    return JSON.stringify(e);
+    return JSON.stringify(a);
   } catch {
     return Math.random();
   }
 }
-function W(e, t, n) {
-  const { internalInstance: l, model: v } = M(), g = (n == null ? void 0 : n.initialValue) || (t == null ? void 0 : t.initialValue) || void 0, r = R(g);
-  let u = V(g), h = !0;
-  const i = t && "value" in t ? t : void 0;
-  return d((f) => {
-    var w;
-    const a = ((w = i == null ? void 0 : i.value) == null ? void 0 : w.getInternalInstance(_)) || l;
-    if (!a) {
-      h = !1;
+function C(a, e, c) {
+  const { internalInstance: I, model: S } = N(), s = (c == null ? void 0 : c.initialValue) || (e == null ? void 0 : e.initialValue) || void 0, u = M(s);
+  let n = V(s), v = !0;
+  const r = e && "value" in e ? e : void 0;
+  return R((i) => {
+    var d;
+    const t = ((d = r == null ? void 0 : r.value) == null ? void 0 : d.getInternalInstance(E)) || I;
+    if (!t) {
+      v = !1;
       return;
     }
-    const c = a.registerWatch((A) => {
-      const I = N(A, s(e)), S = V(I);
-      S !== u && (r.value = I, u = S);
-    }, h);
-    f(c);
-  }), y(
-    () => s(e),
-    (f) => {
-      const a = N(s(v), f), c = V(a);
-      c !== u && (r.value = a, u = c);
+    const l = t.registerWatch((o) => {
+      const g = w(o, f(a)), h = V(g);
+      h !== n && (u.value = g, n = h);
+    }, v);
+    i(l);
+  }), A(
+    () => f(a),
+    (i) => {
+      const t = w(f(S), i), l = V(t);
+      l !== n && (u.value = t, n = l);
     }
-  ), r;
+  ), u;
 }
 export {
-  W as default,
-  W as useWatch
+  C as default,
+  C as useWatch
 };

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

@@ -129,6 +129,11 @@ export type ApFormInternalInstance = {
      * @returns
      */
     setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
+    /**
+     * 获取表单的初始值（随着表单项组件的注册，initialValues可能会发生改变）
+     * @returns
+     */
+    getInitialValues: () => Recordable;
 };
 export type ApFormItemExpose = FormItemExpose & {
     /**

package/es/src/ap-form/search-form/hooks/use-collapse-input-count.mjs

@@ -1,24 +1,22 @@
-import { computed as m } from "vue";
+import { computed as a } from "vue";
 import { useInjectForm as d } from "../../context.mjs";
-import { isArray as a, isObject as g, isFunction as h } from "lodash-unified";
+import { isArray as F, isObject as g, isFunction as h } from "lodash-unified";
 import "../../../config-provider/index.mjs";
-import { useGlobalConfig as y } from "../../../config-provider/hooks/use-global-config.mjs";
-function C(t, r) {
-  return a(r) ? r.reduce((n, i) => n == null ? void 0 : n[i], t) : t == null ? void 0 : t[r];
-}
-function c(t) {
+import { getModelValue as y } from "../../utils/get.mjs";
+import { useGlobalConfig as C } from "../../../config-provider/hooks/use-global-config.mjs";
+function s(t) {
   if (t == null)
     return !1;
   if (typeof t == "string")
     return t.trim() !== "";
-  if (a(t))
-    return t.some((n) => c(n));
+  if (F(t))
+    return t.some((e) => s(e));
   if (g(t)) {
-    const r = Object.keys(t);
-    if (r.length === 0)
+    const o = Object.keys(t);
+    if (o.length === 0)
       return !1;
-    for (const n of r)
-      if (c(t[n]))
+    for (const e of o)
+      if (s(t[e]))
         return !0;
     return !1;
   }
@@ -27,21 +25,21 @@ function c(t) {
 function b(t) {
   return h(t.type) ? t.type() : t;
 }
-const x = (t) => {
-  const { model: r } = d(), n = y("searchForm");
+const E = (t) => {
+  const { model: o } = d(), e = C("searchForm");
   return {
-    count: m(() => {
-      let s = 0;
-      return t.value.forEach((p) => {
-        var u;
-        const o = b(p.node), F = [o.props.name].flat(1), f = C(r == null ? void 0 : r.value, F), l = o.props.customFilled || o.props["custom-filled"], e = (u = n.value) == null ? void 0 : u.customFilled;
-        !l && e ? e != null && e(o, f) && (s += 1) : (l || c)(f) && (s += 1);
-      }), s;
+    count: a(() => {
+      let i = 0;
+      return t.value.forEach((m) => {
+        var f;
+        const r = b(m.node), p = [r.props.name].flat(1), l = y(o == null ? void 0 : o.value, p), c = r.props.customFilled || r.props["custom-filled"], n = (f = e.value) == null ? void 0 : f.customFilled;
+        !c && n ? n != null && n(r, l) && (i += 1) : (c || s)(l) && (i += 1);
+      }), i;
     })
   };
 };
 export {
-  c as defaultFilled,
+  s as defaultFilled,
   b as getTargetNode,
-  x as useCollapseInputCount
+  E as useCollapseInputCount
 };

package/es/src/ap-form/utils/get.d.ts

@@ -1 +1,3 @@
+import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
 export default function get(entity: any, path: (string | number | symbol)[] | readonly (string | number | symbol)[]): any;
+export declare function getModelValue(model: any, name: NamePath): any;

package/es/src/ap-form/utils/get.mjs

@@ -1,12 +1,17 @@
-function l(n, r) {
-  let e = n;
-  for (let t = 0; t < r.length; t += 1) {
-    if (e == null)
+import { isArray as n } from "lodash-unified";
+function e(r, u) {
+  let t = r;
+  for (let i = 0; i < u.length; i += 1) {
+    if (t == null)
       return;
-    e = e[r[t]];
+    t = t[u[i]];
   }
-  return e;
+  return t;
+}
+function c(r, u) {
+  return n(u) ? u.reduce((t, i) => t == null ? void 0 : t[i], r) : r == null ? void 0 : r[u];
 }
 export {
-  l as default
+  e as default,
+  c as getModelValue
 };