@aplus-frontend/ui 7.13.11 → 7.14.0

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

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

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

@@ -120,6 +120,7 @@ declare function __VLS_template(): {
                 readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
+                readonly autoFocusFirstInput?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
             $attrs: {
                 [x: string]: unknown;
@@ -845,6 +846,7 @@ declare function __VLS_template(): {
         }> & {} & ComponentCustomProperties & {} & {
             $slots: {
                 default?(_: {}): any;
+                default?(_: {}): any;
             };
         }) | null;
     };
@@ -1088,6 +1090,7 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
             readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
             readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
             readonly syncToUrlPriority?: boolean | undefined;
+            readonly autoFocusFirstInput?: boolean | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
         $attrs: {
             [x: string]: unknown;
@@ -1813,6 +1816,7 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
     }> & {} & ComponentCustomProperties & {} & {
         $slots: {
             default?(_: {}): any;
+            default?(_: {}): any;
         };
     }) | null;
 }, any>;

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

@@ -9,8 +9,8 @@ import "../ap-form.vue.mjs";
 import he from "../style/drawer-form.mjs";
 import { useControllableValue as ve } from "../../hooks/useControllableValue.mjs";
 import { useLocale as be } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as ge } from "../../config-provider/hooks/use-namespace.mjs";
-import Fe from "../ap-form.vue2.mjs";
+import { useNamespace as Fe } from "../../config-provider/hooks/use-namespace.mjs";
+import ge from "../ap-form.vue2.mjs";
 function L(r) {
   return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !Q(r);
 }
@@ -67,6 +67,9 @@ const De = /* @__PURE__ */ Y({
     syncToUrlPriority: {
       type: Boolean
     },
+    autoFocusFirstInput: {
+      type: Boolean
+    },
     open: {
       type: Boolean,
       default: void 0
@@ -122,12 +125,12 @@ const De = /* @__PURE__ */ Y({
         resizeOnOpen: me(t.resize?.resizeOnOpen) ? e.onResize : t.resize.resizeOnOpen
       };
     }), u = y(T()), {
-      t: g
+      t: F
     } = be(), D = he("ap-form-drawer-form"), {
       b: $,
       e: q,
       em: V
-    } = ge("ap-form-drawer-form"), A = w(() => [q("resize-bar"), {
+    } = Fe("ap-form-drawer-form"), A = w(() => [q("resize-bar"), {
       [V("resize-bar", "min-disabled")]: n(u) === n(l).minWidth
     }, {
       [V("resize-bar", "max-disabled")]: n(u) === n(l).maxWidth
@@ -154,7 +157,7 @@ const De = /* @__PURE__ */ Y({
         e.push(s(z, {
           onClick: k,
           disabled: a.value
-        }, L(i = g("ap.common.cancelText")) ? i : {
+        }, L(i = F("ap.common.cancelText")) ? i : {
           default: () => [i]
         }));
       }
@@ -163,7 +166,7 @@ const De = /* @__PURE__ */ Y({
         disabled: a.value,
         onClick: H
       }), {
-        default: () => [t.submitter?.resetText || g("ap.common.resetText")]
+        default: () => [t.submitter?.resetText || F("ap.common.resetText")]
       })), t.submitter?.submitButtonProps !== !1 && e.push(s(z, p({
         type: "primary",
         key: "submit"
@@ -171,7 +174,7 @@ const De = /* @__PURE__ */ Y({
         loading: a.value,
         onClick: J
       }), {
-        default: () => [t.submitter?.submitText || g("ap.common.okText")]
+        default: () => [t.submitter?.submitText || F("ap.common.okText")]
       })), s(le, {
         justify: "flex-end"
       }, {
@@ -185,8 +188,8 @@ const De = /* @__PURE__ */ Y({
     }
     function B(e) {
       const i = n(l), c = (document.body.offsetWidth || 1e3) - (e.clientX - document.body.offsetLeft), f = i?.minWidth ?? (t.width || 800), O = i?.maxWidth ?? window.innerWidth * 0.8;
-      let F = c;
-      c < f && (F = f), c > O && (F = O), u.value = F;
+      let g = c;
+      c < f && (g = f), c > O && (g = O), u.value = g;
     }
     function x() {
       document.removeEventListener("mousemove", B), document.removeEventListener("mouseup", x);
@@ -252,7 +255,7 @@ const De = /* @__PURE__ */ Y({
     }), {
       title: v(() => [_(e.$slots, "title", {}, () => [ae(se(t.title), 1)])]),
       footer: v(() => [(h(), S(I(X.value)))]),
-      default: v(() => [s(Fe, p({
+      default: v(() => [s(ge, p({
         ref_key: "formRef",
         ref: o
       }, n(ce)(t, ["drawerProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {

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

@@ -50,6 +50,7 @@ export type ApFormItemProps = FormItemProps & Partial<ApFormColProps> & {
      * 是否禁用，禁用时将会有特殊样式，配合bordered=true使用生效
      */
     disabled?: boolean;
+    autoFocus?: boolean;
 };
 export type ApFormItemGroupProps = RowProps & {
     countPerRow?: number;
@@ -72,6 +73,10 @@ export type ApFormProps = Omit<FormProps, 'model' | 'onValuesChange'> & {
      * syncToUrl和initialValues合并是否优先，默认为false
      */
     syncToUrlPriority?: boolean;
+    /**
+     * 是否自动聚焦第一个控件（仅支持聚焦的控件）
+     */
+    autoFocusFirstInput?: boolean;
 };
 export type WatchFunc = (values?: Recordable) => void;
 export type UpdateModelOptimizeFn = (currentModelValue: any, name: string | number) => void;

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

@@ -802,6 +802,7 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
     hasFeedback: boolean;
     autoLink: boolean;
     validateFirst: boolean;
+    autoFocus: boolean;
     valuePropName: string;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     formItemRef: ({