admin/lx-admin-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 国际化 变量提示

Browse Source
This commit is contained in:
疯狂的狮子Li 2025-01-20 11:06:19 +08:00
parent 11e2695465
commit 25189f3052
3 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/layout/components/Navbar.vue
View File

@ -13,7 +13,7 @@
clearable clearable
filterable filterable
reserve-keyword reserve-keyword
:placeholder="$t('navbar.selectTenant')" :placeholder="proxy.$t('navbar.selectTenant')"
@change="dynamicTenantEvent" @change="dynamicTenantEvent"
@clear="dynamicClearEvent" @clear="dynamicClearEvent"
> >
@ -29,7 +29,7 @@
</div> </div>
</el-tooltip> </el-tooltip>
<!-- 消息 --> <!-- 消息 -->
<el-tooltip :content="$t('navbar.message')" effect="dark" placement="bottom"> <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
<div> <div>
<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false"> <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
<template #reference> <template #reference>
@ -47,19 +47,19 @@
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" /> <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('navbar.document')" effect="dark" placement="bottom"> <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" /> <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('navbar.full')" effect="dark" placement="bottom"> <el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
<screenfull id="screenfull" class="right-menu-item hover-effect" /> <screenfull id="screenfull" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('navbar.language')" effect="dark" placement="bottom"> <el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">
<lang-select id="lang-select" class="right-menu-item hover-effect" /> <lang-select id="lang-select" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('navbar.layoutSize')" effect="dark" placement="bottom"> <el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" /> <size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
</template> </template>
@ -72,13 +72,13 @@
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<router-link v-if="!dynamic" to="/user/profile"> <router-link v-if="!dynamic" to="/user/profile">
<el-dropdown-item>{{ $t('navbar.personalCenter') }}</el-dropdown-item> <el-dropdown-item>{{ proxy.$t('navbar.personalCenter') }}</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item v-if="settingsStore.showSettings" command="setLayout"> <el-dropdown-item v-if="settingsStore.showSettings" command="setLayout">
<span>{{ $t('navbar.layoutSetting') }}</span> <span>{{ proxy.$t('navbar.layoutSetting') }}</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item divided command="logout"> <el-dropdown-item divided command="logout">
<span>{{ $t('navbar.logout') }}</span> <span>{{ proxy.$t('navbar.logout') }}</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
@ -128,8 +128,8 @@ const dynamicTenantEvent = async (tenantId: string) => {
await dynamicTenant(tenantId); await dynamicTenant(tenantId);
dynamic.value = true; dynamic.value = true;
await proxy?.$router.push('/'); await proxy?.$router.push('/');
await proxy?.$tab.closeAllPage(); await proxy?.proxy.$tab.closeAllPage();
await proxy?.$tab.refreshPage(); await proxy?.proxy.$tab.refreshPage();
} }
}; };
@ -137,8 +137,8 @@ const dynamicClearEvent = async () => {
await dynamicClear(); await dynamicClear();
dynamic.value = false; dynamic.value = false;
await proxy?.$router.push('/'); await proxy?.$router.push('/');
await proxy?.$tab.closeAllPage(); await proxy?.proxy.$tab.closeAllPage();
await proxy?.$tab.refreshPage(); await proxy?.proxy.$tab.refreshPage();
}; };
/** 租户列表 */ /** 租户列表 */

28
src/views/login.vue
View File

@ -6,13 +6,13 @@
<lang-select /> <lang-select />
</div> </div>
<el-form-item v-if="tenantEnabled" prop="tenantId"> <el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="loginForm.tenantId" filterable :placeholder="$t('login.selectPlaceholder')" style="width: 100%"> <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option> <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="$t('login.username')"> <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -22,7 +22,7 @@
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
:placeholder="$t('login.password')" :placeholder="proxy.$t('login.password')"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@ -33,7 +33,7 @@
v-model="loginForm.code" v-model="loginForm.code"
size="large" size="large"
auto-complete="off" auto-complete="off"
:placeholder="$t('login.code')" :placeholder="proxy.$t('login.code')"
style="width: 63%" style="width: 63%"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
@ -43,31 +43,31 @@
<img :src="codeUrl" class="login-code-img" @click="getCode" /> <img :src="codeUrl" class="login-code-img" @click="getCode" />
</div> </div>
</el-form-item> </el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ $t('login.rememberPassword') }}</el-checkbox> <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button circle :title="$t('login.social.wechat')" @click="doSocialLogin('wechat')"> <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">
<svg-icon icon-class="wechat" /> <svg-icon icon-class="wechat" />
</el-button> </el-button>
<el-button circle :title="$t('login.social.maxkey')" @click="doSocialLogin('maxkey')"> <el-button circle :title="proxy.$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">
<svg-icon icon-class="maxkey" /> <svg-icon icon-class="maxkey" />
</el-button> </el-button>
<el-button circle :title="$t('login.social.topiam')" @click="doSocialLogin('topiam')"> <el-button circle :title="proxy.$t('login.social.topiam')" @click="doSocialLogin('topiam')">
<svg-icon icon-class="topiam" /> <svg-icon icon-class="topiam" />
</el-button> </el-button>
<el-button circle :title="$t('login.social.gitee')" @click="doSocialLogin('gitee')"> <el-button circle :title="proxy.$t('login.social.gitee')" @click="doSocialLogin('gitee')">
<svg-icon icon-class="gitee" /> <svg-icon icon-class="gitee" />
</el-button> </el-button>
<el-button circle :title="$t('login.social.github')" @click="doSocialLogin('github')"> <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">
<svg-icon icon-class="github" /> <svg-icon icon-class="github" />
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item style="width: 100%"> <el-form-item style="width: 100%">
<el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin"> <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
<span v-if="!loading">{{ $t('login.login') }}</span> <span v-if="!loading">{{ proxy.$t('login.login') }}</span>
<span v-else>{{ $t('login.logging') }}</span> <span v-else>{{ proxy.$t('login.logging') }}</span>
</el-button> </el-button>
<div v-if="register" style="float: right"> <div v-if="register" style="float: right">
<router-link class="link-type" :to="'/register'">{{ $t('login.switchRegisterPage') }}</router-link> <router-link class="link-type" :to="'/register'">{{ proxy.$t('login.switchRegisterPage') }}</router-link>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -87,6 +87,8 @@ import { to } from 'await-to-js';
import { HttpStatus } from '@/enums/RespEnum'; import { HttpStatus } from '@/enums/RespEnum';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const userStore = useUserStore(); const userStore = useUserStore();
const router = useRouter(); const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();

18
src/views/register.vue
View File

@ -6,13 +6,13 @@
<lang-select /> <lang-select />
</div> </div>
<el-form-item v-if="tenantEnabled" prop="tenantId"> <el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="registerForm.tenantId" filterable :placeholder="$t('register.selectPlaceholder')" style="width: 100%"> <el-select v-model="registerForm.tenantId" filterable :placeholder="proxy.$t('register.selectPlaceholder')" style="width: 100%">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option> <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" :placeholder="$t('register.username')"> <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('register.username')">
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -22,7 +22,7 @@
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
:placeholder="$t('register.password')" :placeholder="proxy.$t('register.password')"
@keyup.enter="handleRegister" @keyup.enter="handleRegister"
> >
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@ -34,7 +34,7 @@
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
:placeholder="$t('register.confirmPassword')" :placeholder="proxy.$t('register.confirmPassword')"
@keyup.enter="handleRegister" @keyup.enter="handleRegister"
> >
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
@ -45,7 +45,7 @@
v-model="registerForm.code" v-model="registerForm.code"
size="large" size="large"
auto-complete="off" auto-complete="off"
:placeholder="$t('register.code')" :placeholder="proxy.$t('register.code')"
style="width: 63%" style="width: 63%"
@keyup.enter="handleRegister" @keyup.enter="handleRegister"
> >
@ -57,11 +57,11 @@
</el-form-item> </el-form-item>
<el-form-item style="width: 100%"> <el-form-item style="width: 100%">
<el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleRegister"> <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleRegister">
<span v-if="!loading">{{ $t('register.register') }}</span> <span v-if="!loading">{{ proxy.$t('register.register') }}</span>
<span v-else>{{ $t('register.registering') }}</span> <span v-else>{{ proxy.$t('register.registering') }}</span>
</el-button> </el-button>
<div style="float: right"> <div style="float: right">
<router-link class="link-type" :to="'/login'">{{ $t('register.switchLoginPage') }}</router-link> <router-link class="link-type" :to="'/login'">{{ proxy.$t('register.switchLoginPage') }}</router-link>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -78,6 +78,8 @@ import { RegisterForm, TenantVO } from '@/api/types';
import { to } from 'await-to-js'; import { to } from 'await-to-js';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const router = useRouter(); const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();