diff --git a/src/components/Verifition/src/Verify.vue b/src/components/Verifition/src/Verify.vue index b7b504861..930d0e721 100644 --- a/src/components/Verifition/src/Verify.vue +++ b/src/components/Verifition/src/Verify.vue @@ -36,14 +36,15 @@ * Verify 验证码组件 * @description 分发验证码使用 * */ -import { VerifyPoints, VerifySlide } from './Verify' +import {VerifyPictureWord, VerifyPoints, VerifySlide} from './Verify' import { computed, ref, toRefs, watchEffect } from 'vue' export default { name: 'Vue3Verify', components: { VerifySlide, - VerifyPoints + VerifyPoints, + VerifyPictureWord }, props: { captchaType: { @@ -118,6 +119,10 @@ export default { } watchEffect(() => { switch (captchaType.value) { + case 'pictureWord': + verifyType.value = '3' + componentType.value = 'VerifyPictureWord' + break case 'blockPuzzle': verifyType.value = '2' componentType.value = 'VerifySlide' @@ -438,4 +443,4 @@ export default { content: ' '; inset: 0; } - + \ No newline at end of file diff --git a/src/components/Verifition/src/Verify/VerifyPictureWord.vue b/src/components/Verifition/src/Verify/VerifyPictureWord.vue new file mode 100644 index 000000000..f996f648c --- /dev/null +++ b/src/components/Verifition/src/Verify/VerifyPictureWord.vue @@ -0,0 +1,194 @@ + + \ No newline at end of file diff --git a/src/components/Verifition/src/Verify/index.ts b/src/components/Verifition/src/Verify/index.ts index 0daa63a56..e027ab3fd 100644 --- a/src/components/Verifition/src/Verify/index.ts +++ b/src/components/Verifition/src/Verify/index.ts @@ -1,4 +1,5 @@ import VerifySlide from './VerifySlide.vue' import VerifyPoints from './VerifyPoints.vue' +import VerifyPictureWord from './VerifyPictureWord.vue' -export { VerifySlide, VerifyPoints } +export { VerifySlide, VerifyPoints, VerifyPictureWord } \ No newline at end of file diff --git a/src/locales/en.ts b/src/locales/en.ts index 505cfd80d..bd4c0b42c 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -146,9 +146,11 @@ export default { invalidTenantName:"Invalid Tenant Name" }, captcha: { + verify: 'Verify', verification: 'Please complete security verification', slide: 'Swipe right to complete verification', point: 'Please click', + code: 'Please enter the verification code', success: 'Verification succeeded', fail: 'verification failed' }, @@ -457,4 +459,4 @@ export default { btn_zoom_out: 'Zoom out', preview: 'Preivew' } -} +} \ No newline at end of file diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 768b5879a..3b6c2e904 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -147,9 +147,11 @@ export default { invalidTenantName: '无效的租户名称' }, captcha: { + verify: '验证', verification: '请完成安全验证', slide: '向右滑动完成验证', point: '请依次点击', + code: '请输入验证码', success: '验证成功', fail: '验证失败' }, @@ -453,4 +455,4 @@ export default { preview: '预览' }, 'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时,一直 warn 报错 -} +} \ No newline at end of file diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 3c4e1d1a9..cb4dd429a 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -177,7 +177,8 @@ const permissionStore = usePermissionStore() const redirect = ref('') const loginLoading = ref(false) const verify = ref() -const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字 +const captchaType = ref('pictureWord') // blockPuzzle 滑块 clickWord 点击文字 pictureWord 文字验证码 +// const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字 pictureWord 文字验证码 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN) @@ -360,4 +361,4 @@ onMounted(() => { cursor: pointer; } } - + \ No newline at end of file