From b97e2ee7019eab5d678fc107f193d237e8c29cce Mon Sep 17 00:00:00 2001
From: XiaoDaiGua-Ray <443547225@qq.com>
Date: Thu, 18 Jan 2024 15:02:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20`closeAll`=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=9C=A8=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E7=9A=84=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=B9=B6=E4=B8=94=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=87=B3=20`root=20path`=20=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  1 +
 src/hooks/template/useSiderBar.ts | 41 +++++++++++++++++++++++++++----
 src/store/hooks/useMenuStore.ts   |  2 ++
 src/store/modules/menu/index.ts   |  1 +
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3685fad1..e1f37839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 - 修复读取默认缓存语言的时候没有正确使用 `APP_CATCH_KEY.localeLanguage` 的问题
 - 修复 `RTable` 全屏没有正确弹出提示信息问题
 - 修复面包屑 `fullPath` 在平级模式下追加时为绑定问题
+- 修复 `closeAll` 方法在特殊情况下不能正确的关闭标签页并且跳转至 `root path` 的问题
 
 ## 4.5.0
 
diff --git a/src/hooks/template/useSiderBar.ts b/src/hooks/template/useSiderBar.ts
index abbe6971..6a16eb94 100644
--- a/src/hooks/template/useSiderBar.ts
+++ b/src/hooks/template/useSiderBar.ts
@@ -10,9 +10,10 @@
  */
 
 import { useMenuGetters, useMenuActions } from '@/store'
-import { redirectRouterToDashboard } from '@/router/helper/routerCopilot'
+import { useVueRouter, useAppRoot } from '@/hooks'
+import { pick } from '@/utils'
 
-import type { MenuTagOptions, Key } from '@/types'
+import type { MenuTagOptions, Key, AppMenuOption } from '@/types'
 
 export type CloseMenuTag = Key | MenuTagOptions
 
@@ -84,8 +85,12 @@ const normalMenuTagOption = (target: CloseMenuTag, fc: string) => {
 
 export function useSiderBar() {
   const { getMenuTagOptions, getMenuKey } = useMenuGetters()
-  const { changeMenuModelValue, spliceMenTagOptions, setMenuTagOptions } =
-    useMenuActions()
+  const {
+    changeMenuModelValue,
+    spliceMenTagOptions,
+    setMenuTagOptions,
+    resolveOption,
+  } = useMenuActions()
 
   /**
    *
@@ -186,7 +191,33 @@ export function useSiderBar() {
    */
   const closeAll = () => {
     spliceMenTagOptions(0, getMenuTagOptions.value.length)
-    nextTick(redirectRouterToDashboard)
+
+    const { getRootPath } = useAppRoot()
+    const {
+      router: { getRoutes },
+    } = useVueRouter()
+
+    const findMenuOption = getRoutes().find(
+      (curr) => curr.path === getRootPath.value,
+    )
+
+    if (findMenuOption) {
+      const pickOption = pick(findMenuOption, [
+        'children',
+        'meta',
+        'path',
+        'name',
+        'redirect',
+      ]) as unknown as AppMenuOption
+
+      changeMenuModelValue(
+        pickOption.path,
+        resolveOption({
+          ...pickOption,
+          fullPath: pickOption.path,
+        }),
+      )
+    }
   }
 
   /**
diff --git a/src/store/hooks/useMenuStore.ts b/src/store/hooks/useMenuStore.ts
index 883d8e9a..743a1dda 100644
--- a/src/store/hooks/useMenuStore.ts
+++ b/src/store/hooks/useMenuStore.ts
@@ -82,6 +82,7 @@ export const useMenuActions = () => {
     collapsedMenu,
     spliceMenTagOptions,
     setMenuTagOptions,
+    resolveOption,
   } = piniaMenuStore()
 
   return {
@@ -89,5 +90,6 @@ export const useMenuActions = () => {
     collapsedMenu,
     spliceMenTagOptions,
     setMenuTagOptions,
+    resolveOption,
   }
 }
diff --git a/src/store/modules/menu/index.ts b/src/store/modules/menu/index.ts
index 3ee5bdb7..97ea3284 100644
--- a/src/store/modules/menu/index.ts
+++ b/src/store/modules/menu/index.ts
@@ -363,6 +363,7 @@ export const piniaMenuStore = defineStore(
       collapsedMenu,
       spliceMenTagOptions,
       setMenuTagOptions,
+      resolveOption,
     }
   },
   {