@aplus-frontend/ui 0.6.0-beta.9 → 0.6.1

package/es/src/ap-field/tree-select/index.vue.mjs

@@ -1,13 +1,14 @@
-import { isVNode as E, defineComponent as F, useSlots as K, ref as U, computed as z, unref as o, createVNode as d, Fragment as S, createBlock as w, openBlock as C, resolveDynamicComponent as M, mergeProps as j, createSlots as q, renderList as O, withCtx as x, renderSlot as $, normalizeProps as H, guardReactiveProps as W } from "vue";
+import { isVNode as _, defineComponent as E, useSlots as K, ref as U, computed as z, unref as n, createVNode as d, Fragment as B, createBlock as w, openBlock as C, resolveDynamicComponent as M, mergeProps as j, createSlots as q, renderList as O, withCtx as x, renderSlot as $, normalizeProps as H, guardReactiveProps as W } from "vue";
 import { Space as G, Tag as J, TreeSelect as Q, Spin as X } from "@aplus-frontend/antdv";
 import "../../hooks/index.mjs";
 import { isArray as Y, omit as Z } from "lodash-unified";
 import { useRequest as ee } from "./use-request.mjs";
 import { useControllableValue as te } from "../../hooks/useControllableValue.mjs";
 function N(r) {
-  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !E(r);
+  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !_(r);
 }
-const ie = /* @__PURE__ */ F({
+const ie = /* @__PURE__ */ E({
+  name: "ApFieldTreeSelect",
   __name: "index",
   props: {
     mode: {
@@ -169,10 +170,10 @@ const ie = /* @__PURE__ */ F({
   },
   emits: ["update:value"],
   setup(r, {
-    expose: b,
-    emit: T
+    expose: T,
+    emit: b
   }) {
-    const a = r, D = K(), V = T, s = U(), {
+    const a = r, D = K(), V = b, s = U(), {
       value: c,
       updateValue: k
     } = te(a, V), {
@@ -180,66 +181,66 @@ const ie = /* @__PURE__ */ F({
       loading: y,
       request: h
     } = ee(a), I = z(() => {
-      var v, B;
+      var S, v;
       let e;
-      const t = o(c), u = Y(t) ? t : [t].filter(Boolean);
+      const t = n(c), u = Y(t) ? t : [t].filter(Boolean);
       if (!u.length)
-        return d(S, null, [a.emptyText]);
-      const n = [], f = ((v = a.fieldNames) == null ? void 0 : v.label) || "label", _ = ((B = a.fieldNames) == null ? void 0 : B.value) || "value";
+        return d(B, null, [a.emptyText]);
+      const o = [], f = ((S = a.fieldNames) == null ? void 0 : S.label) || "label", L = ((v = a.fieldNames) == null ? void 0 : v.value) || "value";
       function g(l) {
         var i;
         for (const p of l) {
-          if (u.find((A) => A === p[_]) && n.push(p[f]), n.length === u.length)
+          if (u.find((R) => R === p[L]) && o.push(p[f]), o.length === u.length)
             return;
           (i = p.children) != null && i.length && g(p.children);
         }
       }
-      return g(o(m)), n.length ? n.length === 1 ? d("span", null, [n[0]]) : d(G, {
+      return g(n(m)), o.length ? o.length === 1 ? d("span", null, [o[0]]) : d(G, {
         size: 4
-      }, N(e = n.map((l, i) => d(J, {
+      }, N(e = o.map((l, i) => d(J, {
         style: "margin-right: 0px",
         key: `${l}-${i}`
       }, N(l) ? l : {
         default: () => [l]
       }))) ? e : {
         default: () => [e]
-      }) : d(S, null, [a.emptyText]);
+      }) : d(B, null, [a.emptyText]);
     });
     function P() {
       var e, t;
       (t = (e = s.value) == null ? void 0 : e.focus) == null || t.call(e);
     }
-    function L() {
+    function A() {
       var e, t;
       (t = (e = s.value) == null ? void 0 : e.blur) == null || t.call(e);
     }
-    function R(e) {
+    function F(e) {
       return h(e);
     }
-    return b({
+    return T({
       request: h,
       focus: P,
-      blur: L
+      blur: A
     }), (e, t) => e.mode === "read" ? (C(), w(M(I.value), {
       key: 0
-    })) : (C(), w(o(Q), j({
+    })) : (C(), w(n(Q), j({
       key: 1
-    }, o(Z)(a, ["onUpdate:value", "value", "treeData", "loadData"]), {
+    }, n(Z)(a, ["onUpdate:value", "value", "treeData", "loadData"]), {
       ref_key: "treeSelectRef",
       ref: s,
-      value: o(c),
-      "tree-data": o(m),
-      loading: o(y),
-      "load-data": e.loadData ? R : void 0,
-      "onUpdate:value": o(k)
+      value: n(c),
+      "tree-data": n(m),
+      loading: n(y),
+      "load-data": e.loadData ? F : void 0,
+      "onUpdate:value": n(k)
     }), q({
       _: 2
-    }, [O(D, (u, n) => ({
-      name: n,
-      fn: x((f) => [$(e.$slots, n, H(W(f || {})))])
-    })), o(y) ? {
+    }, [O(D, (u, o) => ({
+      name: o,
+      fn: x((f) => [$(e.$slots, o, H(W(f || {})))])
+    })), n(y) ? {
       name: "notFoundContent",
-      fn: x(() => [d(o(X), {
+      fn: x(() => [d(n(X), {
         size: "small"
       })]),
       key: "0"

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

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

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

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

package/es/src/ap-form/drawer-form/index.vue.d.ts

@@ -818,7 +818,7 @@ declare function __VLS_template(): {
             hideRequiredMark: boolean;
             validateOnRuleChange: boolean;
             syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
-        }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
+        }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "registerWatch" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl")> & ShallowUnwrapRef<{
             setFieldsValue: (fields: Partial<any>) => void;
             setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
@@ -841,15 +841,17 @@ declare function __VLS_template(): {
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
-    resetFields: () => void;
+    validate: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
+    setFieldsValue: (fields: Partial<any>) => void;
+    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
+    resetFields: () => Promise<void>;
     clearValidate: (name?: NamePath) => void;
     validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
     getFieldsValue: (nameList?: true | InternalNamePath[]) => Partial<any> | undefined;
-    validate: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
-    scrollToField: (name: NamePath, options?: {}) => void;
-    setFieldValue: (key: string, newValue: any) => void;
-    setFieldsValue: (values: Record<string, any>) => void;
+    scrollToField: (name: NamePath, options?: any) => void;
     getInternalInstance: (mark: string) => ApFormInternalInstance | undefined;
+    validateFieldsReturnTransformed: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
+    getFieldsValueTransformed: (nameList?: true | InternalNamePath[]) => Partial<any> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:open": (...args: any[]) => void;
 }, string, PublicProps, Readonly<ApFormDrawerFormProps> & Readonly<{
@@ -963,6 +965,10 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
         'onUpdate:visible': PropType<(visible: boolean) => void>;
         'onUpdate:open': PropType<(open: boolean) => void>;
         onClose: PropType< MouseEventHandler | KeyboardEventHandler>;
+        animate: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>>, "open" | "onUpdate:open">;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     formRef: ({
@@ -1760,7 +1766,7 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
         hideRequiredMark: boolean;
         validateOnRuleChange: boolean;
         syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
-    }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
+    }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "registerWatch" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl")> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
         setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;