@keyblade/pro-components 1.15.0-alpha.10 → 1.15.0-alpha.12

package/es/pro-find-password/index.vue.d.ts

@@ -18,9 +18,10 @@ declare function __VLS_template(): {
                 readonly formItemProps?: Partial<import('@arco-design/web-vue').FormItemInstance> | undefined;
                 readonly countdown?: number | undefined;
                 readonly onSendSmsCode?: ((value: string) => void) | undefined;
+                readonly loading?: boolean | undefined;
                 readonly current?: (EFindPasswordSteps | number) | undefined;
                 readonly phoneNum?: string | undefined;
-                readonly onNext?: ((current: number) => void) | undefined;
+                readonly onNext?: ((current: number, value: VerifyUserNameFormField | ResetPasswordFormField) => void) | undefined;
                 readonly onEntry?: (() => void) | undefined;
                 readonly 'update:current'?: ((value: number) => void) | undefined;
                 readonly prefixClsName: string;
@@ -2441,9 +2442,10 @@ declare const __VLS_component: import('vue').DefineComponent<IFindPassword, {
             readonly formItemProps?: Partial<import('@arco-design/web-vue').FormItemInstance> | undefined;
             readonly countdown?: number | undefined;
             readonly onSendSmsCode?: ((value: string) => void) | undefined;
+            readonly loading?: boolean | undefined;
             readonly current?: (EFindPasswordSteps | number) | undefined;
             readonly phoneNum?: string | undefined;
-            readonly onNext?: ((current: number) => void) | undefined;
+            readonly onNext?: ((current: number, value: VerifyUserNameFormField | ResetPasswordFormField) => void) | undefined;
             readonly onEntry?: (() => void) | undefined;
             readonly 'update:current'?: ((value: number) => void) | undefined;
             readonly prefixClsName: string;

package/es/pro-find-password/index.vue.js

@@ -1,10 +1,10 @@
-import { defineComponent as L, useSlots as U, ref as p, computed as z, onBeforeUnmount as h, watch as j, createBlock as S, openBlock as a, unref as r, mergeProps as g, withCtx as o, renderSlot as d, createVNode as s, createCommentVNode as k, createElementBlock as B, createTextVNode as c, createSlots as q, normalizeClass as v, normalizeProps as T, guardReactiveProps as E, createElementVNode as x, toDisplayString as A } from "vue";
+import { defineComponent as L, useSlots as U, ref as p, computed as z, onBeforeUnmount as h, watch as j, createBlock as P, openBlock as a, unref as r, mergeProps as S, withCtx as o, renderSlot as d, createVNode as s, createCommentVNode as k, createElementBlock as B, createTextVNode as c, createSlots as q, normalizeClass as v, normalizeProps as T, guardReactiveProps as E, createElementVNode as x, toDisplayString as A } from "vue";
 import { Card as G, Space as H, Steps as J, Step as $, Form as K, FormItem as V, Button as M } from "@arco-design/web-vue";
 import { EFindPasswordSteps as b } from "./enum.js";
 import O from "./verify-user-name.vue.js";
 /* empty css                      */
 import Q from "./reset-password.vue.js";
-const W = { key: 1 }, u = "keyblade-find-password", oe = /* @__PURE__ */ L({
+const W = { key: 1 }, l = "keyblade-find-password", oe = /* @__PURE__ */ L({
   __name: "index",
   props: {
     current: { default: 1 },
@@ -20,6 +20,7 @@ const W = { key: 1 }, u = "keyblade-find-password", oe = /* @__PURE__ */ L({
       hideLabel: !0,
       validateTrigger: []
     }) },
+    loading: { type: Boolean },
     onNext: {},
     onSendSmsCode: {},
     onEntry: {},
@@ -27,25 +28,26 @@ const W = { key: 1 }, u = "keyblade-find-password", oe = /* @__PURE__ */ L({
   },
   emits: ["send-sms-code", "update:current", "next", "entry"],
   setup(F, { expose: _, emit: D }) {
-    const n = F, l = D, N = U(), y = p(), R = p(), w = z(() => ({
+    const n = F, u = D, N = U(), y = p(), R = p(), w = z(() => ({
       inputProps: n.inputProps,
       formItemProps: n.formItemProps,
-      prefixClsName: u
+      loading: n.loading,
+      prefixClsName: l
     })), i = z({
       get: () => n.current,
-      set: (e) => l("update:current", e)
+      set: (e) => u("update:current", e)
     }), m = p(), f = p(4);
     h(() => {
       m.value && I();
     });
     const C = (e) => {
-      n.current >= 3 || l("next", n.current + 1, e);
+      n.current >= 3 || u("next", n.current + 1, e);
     }, I = () => {
       f.value = 4, clearInterval(m.value), m.value = void 0;
     };
     return j(() => n.current, (e) => {
       e >= 3 && (m.value = setInterval(() => {
-        f.value > 0 ? f.value-- : (I(), l("entry"));
+        f.value > 0 ? f.value-- : (I(), u("entry"));
       }, 1e3));
     }), _({
       get resetTime() {
@@ -61,7 +63,7 @@ const W = { key: 1 }, u = "keyblade-find-password", oe = /* @__PURE__ */ L({
         var e;
         return (e = R.value) == null ? void 0 : e.formRef;
       }
-    }), (e, t) => (a(), S(r(G), g({ class: u }, e.cardProps), {
+    }), (e, t) => (a(), P(r(G), S({ class: l }, e.cardProps), {
       default: o(() => [
         d(e.$slots, "header"),
         s(r(H), {
@@ -97,7 +99,7 @@ const W = { key: 1 }, u = "keyblade-find-password", oe = /* @__PURE__ */ L({
               _: 1
             }, 8, ["current"]),
             d(e.$slots, "content"),
-            i.value === r(b).verify ? (a(), S(O, g({ key: 0 }, w.value, {
+            i.value === r(b).verify ? (a(), P(O, S({ key: 0 }, w.value, {
               ref_key: "verifyRef",
               ref: R,
               onSubmit: C
@@ -110,43 +112,43 @@ const W = { key: 1 }, u = "keyblade-find-password", oe = /* @__PURE__ */ L({
                 key: "0"
               } : void 0
             ]), 1040)) : k("", !0),
-            i.value === r(b).reset ? (a(), S(Q, g({ key: 1 }, w.value, {
+            i.value === r(b).reset ? (a(), P(Q, S({ key: 1 }, w.value, {
               ref_key: "resetRef",
               ref: y,
               countdown: e.countdown,
               "phone-num": e.phoneNum,
-              onSendSmsCode: t[0] || (t[0] = () => l("send-sms-code")),
+              onSendSmsCode: t[0] || (t[0] = () => u("send-sms-code")),
               onSubmit: C
             }), null, 16, ["countdown", "phone-num"])) : k("", !0),
             i.value === r(b).succeed ? (a(), B("div", {
               key: 2,
-              class: v(`${u}-succeed`)
+              class: v(`${l}-succeed`)
             }, [
               r(N).succeed ? d(e.$slots, "succeed", { key: 0 }) : (a(), B("div", W, [
                 s(r(K), {
                   model: {},
-                  class: v(`${u}-succeed`),
-                  onSubmit: t[1] || (t[1] = (P) => l("entry"))
+                  class: v(`${l}-succeed`),
+                  onSubmit: t[1] || (t[1] = (g) => u("entry"))
                 }, {
                   default: o(() => [
                     s(r(V), T(E(e.formItemProps)), {
                       default: o(() => [
                         x("div", {
-                          class: v(`${u}-succeed-message`)
+                          class: v(`${l}-succeed-message`)
                         }, " 重置密码成功，" + A(f.value) + "秒后自动返回 ", 3)
                       ]),
                       _: 1
                     }, 16),
                     s(r(V), T(E(e.formItemProps)), {
                       default: o(() => {
-                        var P;
+                        var g;
                         return [
                           s(r(M), {
                             type: "primary",
                             long: "",
                             "html-type": "submit",
-                            size: (P = e.inputProps) == null ? void 0 : P.size,
-                            class: v(`${u}-succeed-submit`)
+                            size: (g = e.inputProps) == null ? void 0 : g.size,
+                            class: v(`${l}-succeed-submit`)
                           }, {
                             default: o(() => t[5] || (t[5] = [
                               c(" 确认 ")

package/es/pro-find-password/interface.d.ts

@@ -15,8 +15,10 @@ export type IFindPassword = {
     countdown?: number;
     /** 表单项属性 */
     formItemProps?: Partial<FormItemInstance>;
+    /** 加载状态 */
+    loading?: boolean;
     /** 下一步 */
-    onNext?: (current: number) => void;
+    onNext?: (current: number, value: VerifyUserNameFormField | ResetPasswordFormField) => void;
     /** 获取短信验证码 */
     onSendSmsCode?: (value: string) => void;
     /** 修改成功，返回 */

package/es/pro-find-password/reset-password.vue.js

@@ -1,7 +1,7 @@
-import { defineComponent as B, ref as i, onBeforeUnmount as U, createBlock as I, openBlock as c, unref as o, normalizeClass as f, withCtx as r, createVNode as s, mergeProps as u, createElementBlock as q, createTextVNode as V, toDisplayString as F, normalizeProps as R, guardReactiveProps as T } from "vue";
-import { regexp as E, message as x } from "../pro-login/regexp.js";
-import { Form as D, FormItem as p, Input as b, Button as C, InputPassword as N } from "@arco-design/web-vue";
-const G = /* @__PURE__ */ B({
+import { defineComponent as U, ref as m, watch as q, onBeforeUnmount as F, createBlock as c, openBlock as I, unref as l, normalizeClass as v, withCtx as r, createVNode as t, mergeProps as n, createElementBlock as R, createTextVNode as N, toDisplayString as T, normalizeProps as E, guardReactiveProps as x } from "vue";
+import { regexp as D, message as L } from "../pro-login/regexp.js";
+import { Form as j, FormItem as p, Input as b, Button as C, InputPassword as y } from "@arco-design/web-vue";
+const J = /* @__PURE__ */ U({
   __name: "reset-password",
   props: {
     current: {},
@@ -14,6 +14,7 @@ const G = /* @__PURE__ */ B({
       hideLabel: !0,
       validateTrigger: []
     }) },
+    loading: { type: Boolean },
     onNext: {},
     onSendSmsCode: {},
     onEntry: {},
@@ -21,14 +22,20 @@ const G = /* @__PURE__ */ B({
     prefixClsName: {}
   },
   emits: ["submit", "send-sms-code"],
-  setup(y, { expose: h, emit: k }) {
-    const v = y, S = {
+  setup(h, { expose: k, emit: S }) {
+    const i = h, g = m();
+    q(() => i.phoneNum, (a) => {
+      g.value = a;
+    }, {
+      immediate: !0
+    });
+    const $ = {
       password: [{
         required: !0,
         message: "请输入新密码"
       }, {
         validator: (a, e) => {
-          E.password.test(a) || e(x.password);
+          D.password.test(a) || e(L.password);
         }
       }],
       again: [{
@@ -36,135 +43,137 @@ const G = /* @__PURE__ */ B({
         message: "请再次输入新密码"
       }, {
         validator: (a, e) => {
-          t.value.password !== a && e("两次输入的密码不同");
+          s.value.password !== a && e("两次输入的密码不同");
         }
       }],
       captcha: [{
         required: !0,
         message: "请输入验证码"
       }]
-    }, m = i(), t = i({
+    }, f = m(), s = m({
       password: "",
       again: "",
       captcha: ""
-    }), d = i(), n = i(v.countdown), P = k;
-    U(() => {
-      d.value && w();
+    }), d = m(), u = m(i.countdown), V = S;
+    F(() => {
+      d.value && P();
     });
-    const $ = () => {
-      P("submit", t.value);
-    }, g = (a) => {
+    const z = () => {
+      V("submit", s.value);
+    }, w = (a) => {
       var e;
-      (e = m.value) == null || e.clearValidate(a);
-    }, w = () => {
-      n.value = v.countdown, clearInterval(d.value), d.value = void 0;
-    }, z = () => {
+      (e = f.value) == null || e.clearValidate(a);
+    }, P = () => {
+      u.value = i.countdown, clearInterval(d.value), d.value = void 0;
+    }, B = () => {
       var a;
-      (a = m.value) == null || a.validateField("mobile", (e) => {
-        if (!e && n.value >= 60) {
+      (a = f.value) == null || a.validateField("mobile", (e) => {
+        if (!e && u.value >= 60) {
           if (d.value)
             return;
-          P("send-sms-code"), n.value--, d.value = setInterval(() => {
-            n.value > 0 ? n.value-- : w();
+          V("send-sms-code"), u.value--, d.value = setInterval(() => {
+            u.value > 0 ? u.value-- : P();
           }, 1e3);
         }
       });
     };
-    return h({
-      formRef: m,
-      resetTime: w
-    }), (a, e) => (c(), I(o(D), {
+    return k({
+      formRef: f,
+      resetTime: P
+    }), (a, e) => (I(), c(l(j), {
       ref_key: "formRef",
-      ref: m,
-      model: t.value,
-      rules: S,
-      class: f(`${a.prefixClsName}-reset-password`),
-      onSubmitSuccess: $
+      ref: f,
+      model: s.value,
+      rules: $,
+      class: v(`${a.prefixClsName}-reset-password`),
+      onSubmitSuccess: z
     }, {
       default: r(() => [
-        s(o(p), u({ field: "phoneNum" }, a.formItemProps), {
+        t(l(p), n({ field: "phoneNum" }, a.formItemProps), {
           default: r(() => [
-            s(o(b), u(a.inputProps, {
-              "default-value": a.phoneNum,
+            t(l(b), n(a.inputProps, {
+              modelValue: g.value,
+              "onUpdate:modelValue": e[0] || (e[0] = (o) => g.value = o),
               "max-length": 16,
               disabled: ""
-            }), null, 16, ["default-value"])
+            }), null, 16, ["modelValue"])
           ]),
           _: 1
         }, 16),
-        s(o(p), u({ field: "captcha" }, a.formItemProps), {
+        t(l(p), n({ field: "captcha" }, a.formItemProps), {
           default: r(() => [
-            s(o(b), u(a.inputProps, {
-              modelValue: t.value.captcha,
-              "onUpdate:modelValue": e[0] || (e[0] = (l) => t.value.captcha = l),
+            t(l(b), n(a.inputProps, {
+              modelValue: s.value.captcha,
+              "onUpdate:modelValue": e[1] || (e[1] = (o) => s.value.captcha = o),
               "max-length": 6,
               placeholder: "请输入短信验证码",
               autocomplete: "off",
-              onInput: e[1] || (e[1] = (l) => g("captcha"))
+              onInput: e[2] || (e[2] = (o) => w("captcha"))
             }), {
               append: r(() => [
-                n.value >= v.countdown ? (c(), I(o(C), {
+                u.value >= i.countdown ? (I(), c(l(C), {
                   key: 0,
                   type: "outline",
-                  class: f(`${a.prefixClsName}-mobile-send-code`),
-                  onClick: z
+                  class: v(`${a.prefixClsName}-mobile-send-code`),
+                  onClick: B
                 }, {
-                  default: r(() => e[6] || (e[6] = [
-                    V(" 获取短信验证码 ")
+                  default: r(() => e[7] || (e[7] = [
+                    N(" 获取短信验证码 ")
                   ])),
                   _: 1
-                }, 8, ["class"])) : (c(), q("div", {
+                }, 8, ["class"])) : (I(), R("div", {
                   key: 1,
-                  class: f(`${a.prefixClsName}-mobile-time`)
-                }, F(n.value) + "秒后可重新发送 ", 3))
+                  class: v(`${a.prefixClsName}-mobile-time`)
+                }, T(u.value) + "秒后可重新发送 ", 3))
               ]),
               _: 1
             }, 16, ["modelValue"])
           ]),
           _: 1
         }, 16),
-        s(o(p), u({ field: "password" }, a.formItemProps), {
+        t(l(p), n({ field: "password" }, a.formItemProps), {
           default: r(() => [
-            s(o(N), u(a.inputProps, {
-              modelValue: t.value.password,
-              "onUpdate:modelValue": e[2] || (e[2] = (l) => t.value.password = l),
+            t(l(y), n(a.inputProps, {
+              modelValue: s.value.password,
+              "onUpdate:modelValue": e[3] || (e[3] = (o) => s.value.password = o),
               "max-length": 32,
               placeholder: "请输入您新的登录密码",
               autocomplete: "new-password",
-              onInput: e[3] || (e[3] = (l) => g("password"))
+              onInput: e[4] || (e[4] = (o) => w("password"))
             }), null, 16, ["modelValue"])
           ]),
           _: 1
         }, 16),
-        s(o(p), u({ field: "again" }, a.formItemProps), {
+        t(l(p), n({ field: "again" }, a.formItemProps), {
           default: r(() => [
-            s(o(N), u(a.inputProps, {
-              modelValue: t.value.again,
-              "onUpdate:modelValue": e[4] || (e[4] = (l) => t.value.again = l),
+            t(l(y), n(a.inputProps, {
+              modelValue: s.value.again,
+              "onUpdate:modelValue": e[5] || (e[5] = (o) => s.value.again = o),
               "max-length": 32,
               placeholder: "请再次输入您新的登录密码",
               autocomplete: "new-password",
-              onInput: e[5] || (e[5] = (l) => g("again"))
+              onInput: e[6] || (e[6] = (o) => w("again"))
             }), null, 16, ["modelValue"])
           ]),
           _: 1
         }, 16),
-        s(o(p), R(T(a.formItemProps)), {
+        t(l(p), E(x(a.formItemProps)), {
           default: r(() => {
-            var l;
+            var o;
             return [
-              s(o(C), {
+              t(l(C), {
                 type: "primary",
                 long: "",
+                loading: a.loading,
                 "html-type": "submit",
-                size: (l = a.inputProps) == null ? void 0 : l.size,
-                class: f(`${a.prefixClsName}-reset-password-submit`)
+                size: (o = a.inputProps) == null ? void 0 : o.size,
+                class: v(`${a.prefixClsName}-reset-password-submit`)
               }, {
-                default: r(() => e[7] || (e[7] = [
-                  V(" 确认 ")
+                default: r(() => e[8] || (e[8] = [
+                  N(" 确认 ")
                 ])),
                 _: 1
-              }, 8, ["size", "class"])
+              }, 8, ["loading", "size", "class"])
             ];
           }),
           _: 1
@@ -175,5 +184,5 @@ const G = /* @__PURE__ */ B({
   }
 });
 export {
-  G as default
+  J as default
 };

package/es/pro-find-password/verify-user-name.vue.js

@@ -1,6 +1,6 @@
-import { defineComponent as b, useSlots as N, ref as d, createBlock as h, openBlock as C, unref as o, normalizeClass as i, withCtx as s, createVNode as l, mergeProps as m, renderSlot as S, createCommentVNode as z, normalizeProps as k, guardReactiveProps as $, createTextVNode as w } from "vue";
-import { testUserName as x } from "../pro-login/regexp.js";
-import { Form as B, FormItem as u, Input as f, Button as R } from "@arco-design/web-vue";
+import { defineComponent as b, useSlots as N, ref as d, createBlock as h, openBlock as C, unref as t, normalizeClass as i, withCtx as s, createVNode as l, mergeProps as n, renderSlot as S, createCommentVNode as z, normalizeProps as k, guardReactiveProps as $, createTextVNode as B } from "vue";
+import { testUserName as w } from "../pro-login/regexp.js";
+import { Form as R, FormItem as u, Input as f, Button as U } from "@arco-design/web-vue";
 const c = "keyblade-find-password", E = /* @__PURE__ */ b({
   __name: "verify-user-name",
   props: {
@@ -14,6 +14,7 @@ const c = "keyblade-find-password", E = /* @__PURE__ */ b({
       hideLabel: !0,
       validateTrigger: []
     }) },
+    loading: { type: Boolean },
     onNext: {},
     onSendSmsCode: {},
     onEntry: {},
@@ -21,8 +22,8 @@ const c = "keyblade-find-password", E = /* @__PURE__ */ b({
     prefixClsName: {}
   },
   emits: ["submit"],
-  setup(U, { expose: v, emit: y }) {
-    const P = y, g = N(), n = d(), a = d({
+  setup(q, { expose: v, emit: g }) {
+    const y = g, P = N(), m = d(), a = d({
       username: "",
       captcha: ""
     }), V = {
@@ -30,74 +31,75 @@ const c = "keyblade-find-password", E = /* @__PURE__ */ b({
         required: !0,
         message: "请输入用户名或手机号"
       }, {
-        validator: x
+        validator: w
       }],
       captcha: [{
         required: !0,
         message: "请输入验证码"
       }]
-    }, p = (r) => {
+    }, p = (o) => {
       var e;
-      (e = n.value) == null || e.clearValidate(r);
+      (e = m.value) == null || e.clearValidate(o);
     }, I = () => {
-      P("submit", a.value);
+      y("submit", a.value);
     };
     return v({
-      formRef: n
-    }), (r, e) => (C(), h(o(B), {
+      formRef: m
+    }), (o, e) => (C(), h(t(R), {
       ref_key: "formRef",
-      ref: n,
+      ref: m,
       model: a.value,
       rules: V,
       class: i(`${c}-verify-user-name`),
       onSubmitSuccess: I
     }, {
       default: s(() => [
-        l(o(u), m({ field: "username" }, r.formItemProps), {
+        l(t(u), n({ field: "username" }, o.formItemProps), {
           default: s(() => [
-            l(o(f), m(r.inputProps, {
+            l(t(f), n(o.inputProps, {
               modelValue: a.value.username,
-              "onUpdate:modelValue": e[0] || (e[0] = (t) => a.value.username = t),
+              "onUpdate:modelValue": e[0] || (e[0] = (r) => a.value.username = r),
               "max-length": 16,
               placeholder: "请输入用户名/手机号",
-              onInput: e[1] || (e[1] = (t) => p("username"))
+              onInput: e[1] || (e[1] = (r) => p("username"))
             }), null, 16, ["modelValue"])
           ]),
           _: 1
         }, 16),
-        l(o(u), m({ field: "captcha" }, r.formItemProps), {
+        l(t(u), n({ field: "captcha" }, o.formItemProps), {
           default: s(() => [
-            l(o(f), m(r.inputProps, {
+            l(t(f), n(o.inputProps, {
               modelValue: a.value.captcha,
-              "onUpdate:modelValue": e[2] || (e[2] = (t) => a.value.captcha = t),
+              "onUpdate:modelValue": e[2] || (e[2] = (r) => a.value.captcha = r),
               "max-length": 4,
               placeholder: "请输入短信验证码",
-              onInput: e[3] || (e[3] = (t) => p("captcha"))
+              onInput: e[3] || (e[3] = (r) => p("captcha"))
             }), {
               append: s(() => [
-                o(g)["verify-code"] ? S(r.$slots, "verify-code", { key: 0 }) : z("", !0)
+                t(P)["verify-code"] ? S(o.$slots, "verify-code", { key: 0 }) : z("", !0)
               ]),
               _: 3
             }, 16, ["modelValue"])
           ]),
           _: 3
         }, 16),
-        l(o(u), k($(r.formItemProps)), {
+        l(t(u), k($(o.formItemProps)), {
           default: s(() => {
-            var t;
+            var r;
             return [
-              l(o(R), {
+              l(t(U), {
                 type: "primary",
                 long: "",
+                loading: o.loading,
                 "html-type": "submit",
-                size: (t = r.inputProps) == null ? void 0 : t.size,
+                size: (r = o.inputProps) == null ? void 0 : r.size,
                 class: i(`${c}-verify-submit`)
               }, {
                 default: s(() => e[4] || (e[4] = [
-                  w(" 下一步 ")
+                  B(" 下一步 ")
                 ])),
                 _: 1
-              }, 8, ["size", "class"])
+              }, 8, ["loading", "size", "class"])
             ];
           }),
           _: 1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/pro-components",
   "description": "KeyBlade Pro Components",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.15.0-alpha.10",
+  "version": "1.15.0-alpha.12",
   "private": false,
   "type": "module",
   "main": "es/index.js",