@aplus-frontend/ui 6.26.1 → 6.26.3

package/es/src/ap-field/tree-select/use-request.mjs

@@ -1,66 +1,65 @@
-import { ref as v, watch as d, onMounted as h } from "vue";
-import { isFunction as m } from "lodash-unified";
-const w = (n) => {
-  let i = 0;
-  const t = v(
-    n.treeData || []
-  ), c = v(!1);
-  d(
-    () => n.treeData,
-    (e) => {
-      t.value = e;
+import { ref as o, watch as v, onMounted as d } from "vue";
+import { isFunction as h } from "lodash-unified";
+const y = (e) => {
+  let l = 0;
+  const a = o(
+    e.treeData || []
+  ), f = o(!1);
+  v(
+    () => e.treeData,
+    (t) => {
+      a.value = t;
     },
     {
       deep: !0
     }
   );
-  function o(e, l) {
-    var u, r;
-    if (!(e != null && e.length))
+  function c(t, r) {
+    if (!t?.length)
       return;
-    const a = ((u = n.fieldNames) == null ? void 0 : u.value) || "value";
-    for (const f of e) {
-      if (f[a] === l[a])
-        return f;
-      if ((r = f.children) != null && r.length)
-        return o(f.children, l);
+    const u = e.fieldNames?.value || "value";
+    for (const n of t) {
+      if (n[u] === r[u])
+        return n;
+      if (n.children?.length)
+        return c(n.children, r);
     }
   }
-  async function s(e, l = !1) {
-    if (!m(n.request))
+  async function i(t, r = !1) {
+    if (!h(e.request))
       return;
-    c.value = !0, i += 1;
-    const a = i;
+    f.value = !0, l += 1;
+    const u = l;
     try {
-      l && (t.value = []);
-      const u = await n.request(e, n.params);
-      if (a !== i)
+      r && (a.value = []);
+      const n = await e.request(t, e.params);
+      if (u !== l)
         return;
-      if (e) {
-        const r = o(t.value, e);
-        r && (r.children = u);
+      if (t) {
+        const s = c(a.value, t);
+        s && (s.children = n);
       } else
-        t.value = u;
+        a.value = n;
     } finally {
-      c.value = !1;
+      f.value = !1;
     }
   }
-  return h(() => {
-    n.lazy || s();
-  }), d(
-    () => n.params,
+  return d(() => {
+    e.lazy || i();
+  }), v(
+    () => e.params,
     () => {
-      s();
+      i();
     },
     {
       deep: !0
     }
   ), {
-    treeData: t,
-    request: s,
-    loading: c
+    treeData: a,
+    request: i,
+    loading: f
   };
 };
 export {
-  w as useRequest
+  y as useRequest
 };

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

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

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

@@ -1,13 +1,13 @@
 import { ApFormDrawerFormProps, CustomizeResizeType } from '../interface';
 import { VNode, ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, DefineComponent, CSSProperties } from 'vue';
 import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity } from '@aplus-frontend/antdv/es/form/interface';
-import { SizeType, ButtonSize } from '@aplus-frontend/antdv/es/config-provider';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
 import { RuleObject } from '@aplus-frontend/antdv/es/form';
 import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { Options } from '../../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../../node_modules/vue-types';
+import { ButtonSize } from '@aplus-frontend/antdv/es/config-provider';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
 import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc, ApFormSubmitterConfig } from '..';
 import { OnCleanup } from '@vue/reactivity';
@@ -27,7 +27,7 @@ declare function __VLS_template(): {
             $: ComponentInternalInstance;
             $data: {};
             $props: {
-                readonly size?: SizeType;
+                readonly size?: "small" | "large" | "middle" | undefined;
                 readonly onSubmit?: ((e: Event) => void) | undefined;
                 readonly layout?: string | undefined;
                 readonly disabled?: boolean | undefined;
@@ -975,7 +975,7 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
         $: ComponentInternalInstance;
         $data: {};
         $props: {
-            readonly size?: SizeType;
+            readonly size?: "small" | "large" | "middle" | undefined;
             readonly onSubmit?: ((e: Event) => void) | undefined;
             readonly layout?: string | undefined;
             readonly disabled?: boolean | undefined;