yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: warn

pull/1/MERGE
xingyuv 2023-03-19 00:02:10 +08:00
parent fb0a11e3f7
commit cb51ea031e
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/locales/lang/en.ts
View File

@ -1,10 +1,10 @@
import { genMessage } from '../helper' import { genMessage } from '../helper'
import antdLocale from 'ant-design-vue/es/locale/en_US' 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 { export default {
message: { message: {
...genMessage(modules, 'en'), ...genMessage(modules as Recordable<Recordable>, 'en'),
antdLocale antdLocale
}, },
dateLocale: null, dateLocale: null,

4
src/locales/lang/zh_CN.ts
View File

@ -1,10 +1,10 @@
import { genMessage } from '../helper' import { genMessage } from '../helper'
import antdLocale from 'ant-design-vue/es/locale/zh_CN' 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 { export default {
message: { message: {
...genMessage(modules, 'zh-CN'), ...genMessage(modules as Recordable<Recordable>, 'zh-CN'),
antdLocale antdLocale
} }
} }

30
src/views/base/login/LoginForm.vue
View File

@ -17,24 +17,24 @@
<InputPassword size="large" visibilityToggle v-model:value="formData.password" :placeholder="t('sys.login.password')" /> <InputPassword size="large" visibilityToggle v-model:value="formData.password" :placeholder="t('sys.login.password')" />
</FormItem> </FormItem>
<ARow class="enter-x"> <Row class="enter-x">
<ACol :span="12"> <Col :span="12">
<FormItem> <FormItem>
<!-- No logic, you need to deal with it yourself --> <!-- No logic, you need to deal with it yourself -->
<Checkbox v-model:checked="rememberMe" size="small"> <Checkbox v-model:checked="rememberMe" size="small">
{{ t('sys.login.rememberMe') }} {{ t('sys.login.rememberMe') }}
</Checkbox> </Checkbox>
</FormItem> </FormItem>
</ACol> </Col>
<ACol :span="12"> <Col :span="12">
<FormItem :style="{ 'text-align': 'right' }"> <FormItem :style="{ 'text-align': 'right' }">
<!-- No logic, you need to deal with it yourself --> <!-- No logic, you need to deal with it yourself -->
<Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)"> <Button type="link" size="small" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
{{ t('sys.login.forgetPassword') }} {{ t('sys.login.forgetPassword') }}
</Button> </Button>
</FormItem> </FormItem>
</ACol> </Col>
</ARow> </Row>
<FormItem class="enter-x"> <FormItem class="enter-x">
<Button type="primary" size="large" block @click="getCode" :loading="loading"> <Button type="primary" size="large" block @click="getCode" :loading="loading">
@ -44,23 +44,23 @@
{{ t('sys.login.registerButton') }} {{ t('sys.login.registerButton') }}
</Button> --> </Button> -->
</FormItem> </FormItem>
<ARow class="enter-x"> <Row class="enter-x">
<ACol :md="8" :xs="24"> <Col :md="8" :xs="24">
<Button block @click="setLoginState(LoginStateEnum.MOBILE)"> <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
{{ t('sys.login.mobileSignInFormTitle') }} {{ t('sys.login.mobileSignInFormTitle') }}
</Button> </Button>
</ACol> </Col>
<ACol :md="8" :xs="24" class="!my-2 !md:my-0 xs:mx-0 md:mx-2"> <Col :md="8" :xs="24" class="!my-2 !md:my-0 xs:mx-0 md:mx-2">
<Button block @click="setLoginState(LoginStateEnum.QR_CODE)"> <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
{{ t('sys.login.qrSignInFormTitle') }} {{ t('sys.login.qrSignInFormTitle') }}
</Button> </Button>
</ACol> </Col>
<ACol :md="6" :xs="24"> <Col :md="6" :xs="24">
<a-button block @click="setLoginState(LoginStateEnum.REGISTER)"> <a-button block @click="setLoginState(LoginStateEnum.REGISTER)">
{{ t('sys.login.registerButton') }} {{ t('sys.login.registerButton') }}
</a-button> </a-button>
</ACol> </Col>
</ARow> </Row>
<Divider class="enter-x">{{ t('sys.login.otherSignIn') }}</Divider> <Divider class="enter-x">{{ t('sys.login.otherSignIn') }}</Divider>
@ -96,8 +96,6 @@ import * as authUtil from '@/utils/auth'
import { Verify } from '@/components/Verifition' import { Verify } from '@/components/Verifition'
import { getTenantIdByName } from '@/api/base/login' import { getTenantIdByName } from '@/api/base/login'
const ACol = Col
const ARow = Row
const FormItem = Form.Item const FormItem = Form.Item
const InputPassword = Input.Password const InputPassword = Input.Password