From 17b0c27d9649553cfb9f9b0e88b2a954d5b6538d Mon Sep 17 00:00:00 2001
From: ray_wuhao <443547225@qq.com>
Date: Fri, 7 Jul 2023 15:28:50 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fixed:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9B=E5=B0=8F=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                      | 1 +
 MANUAL.md                                         | 2 +-
 src/directives/README.md                          | 4 ++--
 src/router/helper/expandRoutes.ts                 | 6 +++---
 src/router/modules/{demo/error.ts => error404.ts} | 7 ++++---
 src/router/routes.ts                              | 6 ------
 src/store/modules/menu/index.ts                   | 2 +-
 tsconfig.json                                     | 3 ++-
 8 files changed, 14 insertions(+), 17 deletions(-)
 rename src/router/modules/{demo/error.ts => error404.ts} (73%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1d46459..b04ffdb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - 修复 axios 模块的一些类型错误
 - 剔除了一些无用方法，重写了一些方法
+- 修复强制跳转父级菜单地址导致错误页问题
 
 ## 4.0.2
 
diff --git a/MANUAL.md b/MANUAL.md
index 2a1da888..76c3cd49 100644
--- a/MANUAL.md
+++ b/MANUAL.md
@@ -2,7 +2,7 @@
 
 ## 前言
 
-> `Ray Template` 默认使用 `yarn` 作为包管理器，并且默认启用严格模式的 `eslint`。在导入模块的时候除 `.ts` `.tsx` `.d.ts` 文件等不需要手动补全后缀名，其余的模块导入应该手动补全所有后缀名。
+> `Ray Template` 默认使用 `pnpm` 作为包管理器，并且默认启用严格模式的 `eslint`。在导入模块的时候除 `.ts` `.tsx` `.d.ts` 文件等不需要手动补全后缀名，其余的模块导入应该手动补全所有后缀名。
 
 ### 使用
 
diff --git a/src/directives/README.md b/src/directives/README.md
index ac6962fd..524e5a6b 100644
--- a/src/directives/README.md
+++ b/src/directives/README.md
@@ -7,10 +7,10 @@
 - 指令应该为全局的通用性指令
 - 如果指令需要与系统的数据进行关联，应该注意数据的管理与指令注册使用时机
 
-## 添加指令说明
+## 新增指令说明
 
 - 模板视 modules 中每一个文件包为一个模板的指令（全局），并且每个文件包的名称，也被视为该指令名称
-- 添加文件包后，强制要求 index.ts 为指令的输出文件名
+- 添加文件包后，`强制要求 index.ts 为指令的输出文件名`
 - modules 包中所有指令都会被自动合并到模板中
 
 ```ts
diff --git a/src/router/helper/expandRoutes.ts b/src/router/helper/expandRoutes.ts
index 95f0de6f..af48e8ab 100644
--- a/src/router/helper/expandRoutes.ts
+++ b/src/router/helper/expandRoutes.ts
@@ -17,6 +17,8 @@
  * 把所有路由提升为顶层路由
  */
 
+import { cloneDeep } from 'lodash-es'
+
 import type { AppRouteRecordRaw } from '@/router/type'
 
 const isRootPath = (path: string) => path.startsWith('/')
@@ -69,7 +71,5 @@ export const expandRoutes = (arr: AppRouteRecordRaw[]) => {
     return []
   }
 
-  const cloneArr = arr.slice()
-
-  return routePromotion(cloneArr)
+  return routePromotion(cloneDeep(arr))
 }
diff --git a/src/router/modules/demo/error.ts b/src/router/modules/error404.ts
similarity index 73%
rename from src/router/modules/demo/error.ts
rename to src/router/modules/error404.ts
index 62e0c690..023d1df6 100644
--- a/src/router/modules/demo/error.ts
+++ b/src/router/modules/error404.ts
@@ -3,15 +3,16 @@ import { LAYOUT } from '@/router/constant/index'
 
 import type { AppRouteRecordRaw } from '@/router/type'
 
-const error: AppRouteRecordRaw = {
-  path: '/error',
+const error404: AppRouteRecordRaw = {
+  path: '/:catchAll(.*)',
   name: 'ErrorPage',
   component: () => import('@/error/views/Error404/index'),
   meta: {
     i18nKey: t('menu.Error'),
     icon: 'error',
     hidden: true,
+    sameLevel: true,
   },
 }
 
-export default error
+export default error404
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 37bc076d..85a4d68b 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -18,10 +18,4 @@ export default () => [
     component: Layout,
     children: expandRoutes(getAppRawRoutes()),
   },
-  {
-    path: '/:catchAll(.*)',
-    name: 'errorPage',
-    component: Layout,
-    redirect: '/error',
-  },
 ]
diff --git a/src/store/modules/menu/index.ts b/src/store/modules/menu/index.ts
index 30b642d9..323f5b59 100644
--- a/src/store/modules/menu/index.ts
+++ b/src/store/modules/menu/index.ts
@@ -220,7 +220,7 @@ export const useMenu = defineStore(
             findMenuOption(pathKey, curr.children)
           }
 
-          if (pathKey === curr.key) {
+          if (pathKey === curr.key && !curr?.children?.length) {
             changeMenuModelValue(pathKey, curr)
 
             break
diff --git a/tsconfig.json b/tsconfig.json
index a7406f34..eceb4ab8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,6 +43,7 @@
     "vite-env.d.ts",
     "components.d.ts",
     "auto-imports.d.ts",
-    "src/**/*"
+    "src/**/*",
+    "./src/types/global.d.ts"
   ]
 }