lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-05-16 21:27:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2-dev' into v2-dev-buy

Browse Source 
# Conflicts:
#	packages/core/basic/src/utils/util.hash.ts
This commit is contained in:
xiaojunnuo
2025-09-24 01:58:11 +08:00
parent 81e588a896 2ae193092d
commit c4ebbaba74
56 changed files with 869 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-client/src/views/framework/forgot-password/index.vue
+18 -4
View File
@@ -21,10 +21,17 @@
</a-input>
</a-form-item>
<a-form-item has-feedback name="captchaForEmail" label="验证码">
<CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
<CaptchaInput ref="captchaForEmailRef" v-model:model-value="formState.captchaForEmail"></CaptchaInput>
</a-form-item>
<a-form-item has-feedback name="validateCode" label="邮件验证码">
<email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.input" :random-str="formState.randomStr" verification-type="forgotPassword" />
<email-code
v-model:value="formState.validateCode"
:captcha="formState.captchaForEmail"
:email="formState.input"
:random-str="formState.randomStr"
verification-type="forgotPassword"
@error="formState.captchaForEmail = null"
/>
</a-form-item>
</a-tab-pane>
<a-tab-pane key="mobile" tab="手机号找回">
@@ -36,10 +43,17 @@
</a-input>
</a-form-item>
<a-form-item has-feedback name="captchaForSms" label="验证码">
<CaptchaInput v-model:model-value="formState.captchaForSms"></CaptchaInput>
<CaptchaInput ref="captchaForSmsRef" v-model:model-value="formState.captchaForSms"></CaptchaInput>
</a-form-item>
<a-form-item name="validateCode" label="手机验证码">
<sms-code v-model:value="formState.validateCode" :captcha="formState.captchaForSms" :mobile="formState.input" :phone-code="formState.phoneCode" verification-type="forgotPassword" />
<sms-code
v-model:value="formState.validateCode"
:captcha="formState.captchaForSms"
:mobile="formState.input"
:phone-code="formState.phoneCode"
verification-type="forgotPassword"
@error="formState.captchaForSms = null"
/>
</a-form-item>
</a-tab-pane>
</a-tabs>
packages/ui/certd-client/src/views/framework/login/index.vue
+2 -13
View File
@@ -41,7 +41,7 @@
</a-form-item>
<a-form-item name="smsCode" :rules="rules.smsCode">
<sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" />
<sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" @error="formState.smsCaptcha = null" />
</a-form-item>
</template>
</a-tab-pane>
@@ -188,6 +188,7 @@ export default defineComponent({
}
} finally {
loading.value = false;
formState.captcha = null;
}
};
@@ -209,18 +210,6 @@ export default defineComponent({
const captchaInputRef = ref();
const captchaInputForSmsCode = ref();
async function doCaptchaValidate() {
if (!sysPublicSettings.captchaEnabled) {
return {};
}
const res = await captchaInputRef.value.getValidatedForm();
if (!res) {
return false;
}
return {
...res,
};
}
return {
t,
packages/ui/certd-client/src/views/framework/login/sms-code.vue
+4 -1
View File
@@ -24,7 +24,7 @@ const props = defineProps<{
captcha?: any;
verificationType?: string;
}>();
const emit = defineEmits(["update:value", "change"]);
const emit = defineEmits(["update:value", "change", "error"]);
function onChange(value: string) {
emit("update:value", value);
@@ -59,6 +59,9 @@ async function sendSmsCode() {
captcha: props.captcha,
verificationType: props.verificationType,
});
} catch (e) {
emit("error", e);
throw e;
} finally {
loading.value = false;
}
packages/ui/certd-client/src/views/framework/register/email-code.vue
+4 -1
View File
@@ -23,7 +23,7 @@ const props = defineProps<{
captcha?: any;
verificationType?: string;
}>();
const emit = defineEmits(["update:value", "change"]);
const emit = defineEmits(["update:value", "change", "error"]);
function onChange(value: string) {
emit("update:value", value);
@@ -54,6 +54,9 @@ async function sendSmsCode() {
captcha: props.captcha,
verificationType: props.verificationType,
});
} catch (e) {
emit("error", e);
throw e;
} finally {
loading.value = false;
}
packages/ui/certd-client/src/views/framework/register/index.vue
+15 -11
View File
@@ -66,7 +66,7 @@
</a-form-item>
<a-form-item has-feedback name="validateCode" :rules="rules.validateCode" label="邮件验证码">
<email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.email" />
<email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.email" @error="formState.captchaForEmail = null" />
</a-form-item>
</template>
</a-tab-pane>
@@ -182,16 +182,20 @@ export default defineComponent({
};
const handleFinish = async (values: any) => {
await userStore.register(
toRaw({
type: registerType.value,
password: formState.password,
username: formState.username,
email: formState.email,
captcha: formState.captcha,
validateCode: formState.validateCode,
}) as any
);
try {
await userStore.register(
toRaw({
type: registerType.value,
password: formState.password,
username: formState.username,
email: formState.email,
captcha: formState.captcha,
validateCode: formState.validateCode,
}) as any
);
} finally {
formState.captcha = null;
}
};
const handleFinishFailed = (errors: any) => {