diff --git a/es/aspects/wechatUser.js b/es/aspects/wechatUser.js index 2b5962a03..218b0932a 100644 --- a/es/aspects/wechatUser.js +++ b/es/aspects/wechatUser.js @@ -39,6 +39,7 @@ export async function unbindingWechat(params, context) { origin: 'mobile', content: mobile, code: captcha, + // TODO: 这里的type暂未确定,如果需要发验证码需要再添加一个验证码类型 }, sorter: [{ $attr: { @@ -54,13 +55,13 @@ export async function unbindingWechat(params, context) { if (captchaRow.expired) { throw new OakUserException('验证码已经过期'); } - fn(); + await fn(); } else { throw new OakUserException('验证码无效'); } } else { - fn(); + await fn(); } } diff --git a/es/components/user/info/web.pc.d.ts b/es/components/user/info/web.pc.d.ts index 75c4383fa..3a0527510 100644 --- a/es/components/user/info/web.pc.d.ts +++ b/es/components/user/info/web.pc.d.ts @@ -27,9 +27,7 @@ export default function Render(props: WebComponentProps void; - sendCaptcha: () => void; editPassword: () => void; goAuthenticate: () => void; - updateMyInfo: () => void; unbindingWechat: (captcha?: string) => void; }>): React.JSX.Element; diff --git a/es/components/user/info/web.pc.js b/es/components/user/info/web.pc.js index 493172219..1a7d88231 100644 --- a/es/components/user/info/web.pc.js +++ b/es/components/user/info/web.pc.js @@ -9,7 +9,7 @@ import WechatUserList from '../../../components/wechatUser/bindingList'; import Style from './web.module.less'; export default function Render(props) { const { data, methods } = props; - const { t, updateMyInfo, editMobile, goAuthenticate, sendCaptcha, unbindingWechat, editPassword, } = methods; + const { t, editMobile, goAuthenticate, unbindingWechat, editPassword, } = methods; const { nickname, name, birth, gender, mobile, oakExecuting, genderOptions, oakFullpath, oakDirty, wechatUser, editable, userStateColor, userStateStr, idStateColor, idStateStr, isRoot, isCreation, idState, changeMobileUrl, changePasswordUrl, authenticateUrl, } = data; const [open, setOpen] = useState(false); const [open2, setOpen2] = useState(false); diff --git a/lib/aspects/wechatUser.js b/lib/aspects/wechatUser.js index c32c9d6ec..0d09a806b 100644 --- a/lib/aspects/wechatUser.js +++ b/lib/aspects/wechatUser.js @@ -42,6 +42,7 @@ async function unbindingWechat(params, context) { origin: 'mobile', content: mobile, code: captcha, + // TODO: 这里的type暂未确定,如果需要发验证码需要再添加一个验证码类型 }, sorter: [{ $attr: { @@ -57,13 +58,13 @@ async function unbindingWechat(params, context) { if (captchaRow.expired) { throw new types_1.OakUserException('验证码已经过期'); } - fn(); + await fn(); } else { throw new types_1.OakUserException('验证码无效'); } } else { - fn(); + await fn(); } } diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index ab09d4f63..686b67856 100644 --- a/lib/checkers/index.d.ts +++ b/lib/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default checkers; diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index e5be399e1..1d9bc2ce2 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程,当在entity对象上进行action操作时(操作条件是filter),将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/src/aspects/wechatUser.ts b/src/aspects/wechatUser.ts index c4b81e36f..5abdb4f68 100644 --- a/src/aspects/wechatUser.ts +++ b/src/aspects/wechatUser.ts @@ -50,6 +50,7 @@ export async function unbindingWechat( origin: 'mobile', content: mobile, code: captcha, + // TODO: 这里的type暂未确定,如果需要发验证码需要再添加一个验证码类型 }, sorter: [{ $attr: { @@ -65,13 +66,13 @@ export async function unbindingWechat( if (captchaRow.expired) { throw new OakUserException('验证码已经过期'); } - fn(); + await fn(); } else { throw new OakUserException('验证码无效'); } } else { - fn(); + await fn(); } } diff --git a/src/components/user/info/web.pc.tsx b/src/components/user/info/web.pc.tsx index fb5f7154b..83f7a105e 100644 --- a/src/components/user/info/web.pc.tsx +++ b/src/components/user/info/web.pc.tsx @@ -56,10 +56,8 @@ export default function Render( }, { editMobile: () => void; - sendCaptcha: () => void; editPassword: () => void; goAuthenticate: () => void; - updateMyInfo: () => void; unbindingWechat: (captcha?: string) => void; } > @@ -67,10 +65,8 @@ export default function Render( const { data, methods } = props; const { t, - updateMyInfo, editMobile, goAuthenticate, - sendCaptcha, unbindingWechat, editPassword, } = methods;