From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/layout/components/Navbar.vue | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c2ed0b6..01cc22e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -13,7 +13,7 @@
clearable
filterable
reserve-keyword
- :placeholder="$t('navbar.selectTenant')"
+ :placeholder="proxy.$t('navbar.selectTenant')"
@change="dynamicTenantEvent"
@clear="dynamicClearEvent"
>
@@ -29,7 +29,7 @@
</div>
</el-tooltip>
<!-- 娑堟伅 -->
- <el-tooltip :content="$t('navbar.message')" effect="dark" placement="bottom">
+ <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
<div>
<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
<template #reference>
@@ -47,19 +47,19 @@
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</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" />
</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" />
</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" />
</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" />
</el-tooltip>
</template>
@@ -72,13 +72,13 @@
<template #dropdown>
<el-dropdown-menu>
<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>
<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 divided command="logout">
- <span>{{ $t('navbar.logout') }}</span>
+ <span>{{ proxy.$t('navbar.logout') }}</span>
</el-dropdown-item>
</el-dropdown-menu>
</template>
@@ -98,6 +98,7 @@
import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
import { TenantVO } from '@/api/types';
import notice from './notice/index.vue';
+import router from '@/router';
const appStore = useAppStore();
const userStore = useUserStore();
@@ -126,23 +127,23 @@
if (companyName.value != null && companyName.value !== '') {
await dynamicTenant(tenantId);
dynamic.value = true;
- proxy?.$tab.closeAllPage();
- proxy?.$router.push('/');
- proxy?.$tab.refreshPage();
+ await proxy?.$router.push('/');
+ await proxy?.proxy.$tab.closeAllPage();
+ await proxy?.proxy.$tab.refreshPage();
}
};
const dynamicClearEvent = async () => {
await dynamicClear();
dynamic.value = false;
- proxy?.$tab.closeAllPage();
- proxy?.$router.push('/');
- proxy?.$tab.refreshPage();
+ await proxy?.$router.push('/');
+ await proxy?.proxy.$tab.closeAllPage();
+ await proxy?.proxy.$tab.refreshPage();
};
/** 绉熸埛鍒楄〃 */
const initTenantList = async () => {
- const { data } = await getTenantList();
+ const { data } = await getTenantList(true);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
@@ -163,8 +164,14 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
});
- await userStore.logout();
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ userStore.logout().then(() => {
+ router.replace({
+ path: '/login',
+ query: {
+ redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+ }
+ });
+ });
};
const emits = defineEmits(['setLayout']);
--
Gitblit v1.9.3