From 362bc84cfb217c173fd4cb32925bc1b7d51df79f Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Tue, 1 Apr 2025 19:59:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=88=87=E6=8D=A2=E4=B8=8D=E5=86=8D=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=A6=96=E9=A1=B5=20=E7=9B=B4=E6=8E=A5=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=BD=93=E5=89=8D=E9=A1=B5(=E9=99=A4=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E9=A1=B5=E9=9D=A2=E5=A4=96=E4=BC=9A=E5=9B=9E=E5=88=B0?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../components/tenant-toggle/src/index.vue    | 43 +++++++++++++------
 apps/web-antd/src/router/routes/local.ts      |  6 +++
 .../@core/base/typings/src/vue-router.d.ts    |  6 +++
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c47ae04f..165a1b8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - 文件上传/图片上传重构(破坏性更新 不兼容之前的api)
 - 文件上传/图片上传**不再支持**url用法 强制使用ossId
 - TableSwitch组件重构
+- 管理员租户切换不再返回首页 直接刷新当前页(除特殊页面外会回到首页)
 
 **BUG FIX**
 
diff --git a/apps/web-antd/src/components/tenant-toggle/src/index.vue b/apps/web-antd/src/components/tenant-toggle/src/index.vue
index a3398f0b..2ca5f243 100644
--- a/apps/web-antd/src/components/tenant-toggle/src/index.vue
+++ b/apps/web-antd/src/components/tenant-toggle/src/index.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
+import type { MessageType } from 'ant-design-vue/es/message';
 import type { SelectHandler } from 'ant-design-vue/es/vc-select/Select';
 
 import type { TenantOption } from '#/api';
 
-import { computed, onMounted, ref, unref } from 'vue';
-import { useRouter } from 'vue-router';
+import { computed, onMounted, ref, shallowRef, unref } from 'vue';
+import { useRoute } from 'vue-router';
 
 import { useAccess } from '@vben/access';
-import { DEFAULT_HOME_PATH } from '@vben/constants';
 import { useTabs } from '@vben/hooks';
 import { $t } from '@vben/locales';
 
@@ -41,15 +41,26 @@ onMounted(async () => {
   await initTenant();
 });
 
-const { closeAllTabs } = useTabs();
-const router = useRouter();
-function close(checked: boolean) {
+const route = useRoute();
+
+const messageInstance = shallowRef<MessageType | null>();
+
+const { closeOtherTabs, refreshTab, closeAllTabs } = useTabs();
+async function close(checked: boolean) {
   // store设置状态
   setChecked(checked);
-  // 需要关闭全部标签页
-  closeAllTabs();
-  // 切换完加载首页
-  router.push(DEFAULT_HOME_PATH);
+
+  /**
+   * 切换租户需要回到首页的页面 一般为带id的页面
+   * 其他则直接刷新页面
+   */
+  if (route.meta.requireHomeRedirect) {
+    await closeAllTabs();
+  } else {
+    // 先关闭再刷新 这里不用Promise.all()
+    await closeOtherTabs();
+    await refreshTab();
+  }
 }
 
 const dictStore = useDictStore();
@@ -65,9 +76,13 @@ const onSelected: SelectHandler = async (tenantId: string, option: any) => {
   }
   await tenantDynamicToggle(tenantId);
   lastSelected.value = tenantId;
-  message.success(
+
+  // 关闭之前的message 只保留一条
+  messageInstance.value?.();
+  messageInstance.value = message.success(
     `${$t('component.tenantToggle.switch')} ${option.companyName}`,
   );
+
   close(true);
   // 需要放在宏队列处理 直接清空页面由于没有字典会有样式问题(标签变成unknown)
   setTimeout(() => dictStore.resetCache());
@@ -75,7 +90,11 @@ const onSelected: SelectHandler = async (tenantId: string, option: any) => {
 
 async function onDeselect() {
   await tenantDynamicClear();
-  message.success($t('component.tenantToggle.reset'));
+
+  // 关闭之前的message 只保留一条
+  messageInstance.value?.();
+  messageInstance.value = message.success($t('component.tenantToggle.reset'));
+
   lastSelected.value = '';
   close(false);
   // 需要放在宏队列处理 直接清空页面由于没有字典会有样式问题(标签变成unknown)
diff --git a/apps/web-antd/src/router/routes/local.ts b/apps/web-antd/src/router/routes/local.ts
index 1407879f..67835073 100644
--- a/apps/web-antd/src/router/routes/local.ts
+++ b/apps/web-antd/src/router/routes/local.ts
@@ -12,6 +12,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       icon: 'mingcute:profile-line',
       title: $t('ui.widgets.profile'),
       hideInMenu: true,
+      requireHomeRedirect: true,
     },
     name: 'Profile',
     path: '/profile',
@@ -23,6 +24,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       icon: 'ant-design:setting-outlined',
       title: 'oss配置',
       hideInMenu: true,
+      requireHomeRedirect: true,
     },
     name: 'OssConfig',
     path: '/system/oss-config',
@@ -34,6 +36,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       icon: 'tabler:code',
       title: '生成配置',
       hideInMenu: true,
+      requireHomeRedirect: true,
     },
     name: 'GenConfig',
     path: '/code-gen/edit/:tableId',
@@ -45,6 +48,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       icon: 'eos-icons:role-binding-outlined',
       title: '分配角色',
       hideInMenu: true,
+      requireHomeRedirect: true,
     },
     name: 'RoleAssign',
     path: '/system/role-assign/:roleId',
@@ -56,6 +60,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       icon: 'fluent-mdl2:flow',
       title: '流程设计',
       hideInMenu: true,
+      requireHomeRedirect: true,
     },
     name: 'WorkflowDesigner',
     path: '/workflow/designer',
@@ -70,6 +75,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       title: '请假申请',
       activePath: '/demo/leave',
       hideInMenu: true,
+      requireHomeRedirect: true,
     },
     name: 'WorkflowLeaveIndex',
     path: '/workflow/leaveEdit/index',
diff --git a/packages/@core/base/typings/src/vue-router.d.ts b/packages/@core/base/typings/src/vue-router.d.ts
index 099e8171..f2a50def 100644
--- a/packages/@core/base/typings/src/vue-router.d.ts
+++ b/packages/@core/base/typings/src/vue-router.d.ts
@@ -113,6 +113,12 @@ interface RouteMeta {
    * 菜单所携带的参数
    */
   query?: Recordable;
+  /**
+   * 管理员切换租户 该页面是否需要重定向到首页
+   * 用于区分带路由参数的页面 比如/oss/:id 这种路由是需要回到首页的
+   * 默认false
+   */
+  requireHomeRedirect?: boolean;
   /**
    * 标题名称
    */