From 7b6078a178b2bc72d2e0f182919ce0267d4ca5fc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 28 六月 2023 14:28:45 +0800
Subject: [PATCH] !15 适配登录重构的修改 Merge pull request !15 from MichelleChung/ts
---
src/layout/components/Navbar.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9e4f470..156011f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -11,7 +11,7 @@
clearable
filterable
reserve-keyword
- placeholder="璇烽�夋嫨绉熸埛"
+ :placeholder="$t('navbar.selectTenant')"
v-if="userId === 1 && tenantEnabled"
@change="dynamicTenantEvent"
@clear="dynamicClearEvent"
@@ -22,19 +22,23 @@
<header-search id="header-search" class="right-menu-item" />
- <el-tooltip content="婧愮爜鍦板潃" effect="dark" placement="bottom">
+ <el-tooltip content="Github" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
- <el-tooltip content="鏂囨。鍦板潃" effect="dark" placement="bottom">
+ <el-tooltip :content="$t('navbar.document')" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
- <el-tooltip content="鍏ㄥ睆" effect="dark" placement="bottom">
+ <el-tooltip :content="$t('navbar.full')" effect="dark" placement="bottom">
<screenfull id="screenfull" class="right-menu-item hover-effect" />
</el-tooltip>
- <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">
+ <el-tooltip :content="$t('navbar.language')" effect="dark" placement="bottom">
+ <lang-select id="lang-select" class="right-menu-item hover-effect" />
+ </el-tooltip>
+
+ <el-tooltip :content="$t('navbar.layoutSize')" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
</template>
@@ -47,13 +51,13 @@
<template #dropdown>
<el-dropdown-menu>
<router-link to="/user/profile" v-if="!dynamic">
- <el-dropdown-item>涓汉涓績</el-dropdown-item>
+ <el-dropdown-item>{{ $t('navbar.personalCenter') }}</el-dropdown-item>
</router-link>
<el-dropdown-item command="setLayout">
- <span>甯冨眬璁剧疆</span>
+ <span>{{ $t('navbar.layoutSetting') }}</span>
</el-dropdown-item>
<el-dropdown-item divided command="logout">
- <span>閫�鍑虹櫥褰�</span>
+ <span>{{ $t('navbar.logout') }}</span>
</el-dropdown-item>
</el-dropdown-menu>
</template>
@@ -117,7 +121,7 @@
})
const toggleSideBar = () => {
- appStore.toggleSideBar()
+ appStore.toggleSideBar(false)
}
const logout = async () => {
--
Gitblit v1.9.3