From cb51ea031ee2ad7ad05df41d8cd499a9332bbb43 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Sun, 19 Mar 2023 00:02:10 +0800 Subject: [PATCH] fix: warn --- src/locales/lang/en.ts | 4 ++-- src/locales/lang/zh_CN.ts | 4 ++-- src/views/base/login/LoginForm.vue | 30 ++++++++++++++---------------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 2dd493cb..1f57c661 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -1,10 +1,10 @@ import { genMessage } from '../helper' import antdLocale from 'ant-design-vue/es/locale/en_US' -const modules = import.meta.globEager('./en/**/*.ts') +const modules = import.meta.glob('./en/**/*.ts', { eager: true }) export default { message: { - ...genMessage(modules, 'en'), + ...genMessage(modules as Recordable, 'en'), antdLocale }, dateLocale: null, diff --git a/src/locales/lang/zh_CN.ts b/src/locales/lang/zh_CN.ts index 04643ae0..7782673d 100644 --- a/src/locales/lang/zh_CN.ts +++ b/src/locales/lang/zh_CN.ts @@ -1,10 +1,10 @@ import { genMessage } from '../helper' import antdLocale from 'ant-design-vue/es/locale/zh_CN' -const modules = import.meta.globEager('./zh-CN/**/*.ts') +const modules = import.meta.glob('./zh-CN/**/*.ts', { eager: true }) export default { message: { - ...genMessage(modules, 'zh-CN'), + ...genMessage(modules as Recordable, 'zh-CN'), antdLocale } } diff --git a/src/views/base/login/LoginForm.vue b/src/views/base/login/LoginForm.vue index 679a7ea2..aff968fa 100644 --- a/src/views/base/login/LoginForm.vue +++ b/src/views/base/login/LoginForm.vue @@ -17,24 +17,24 @@ - - + + {{ t('sys.login.rememberMe') }} - - + + - - + + --> - - + + - - + + - - + + {{ t('sys.login.registerButton') }} - - + + {{ t('sys.login.otherSignIn') }} @@ -96,8 +96,6 @@ import * as authUtil from '@/utils/auth' import { Verify } from '@/components/Verifition' import { getTenantIdByName } from '@/api/base/login' -const ACol = Col -const ARow = Row const FormItem = Form.Item const InputPassword = Input.Password