From 33b664816e319b04f0e3324bf7f101f207c4dfa4 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Wed, 1 Nov 2023 09:39:22 +0800
Subject: [PATCH] Optimize route

---
 src/components/common/sidebar/SidebarItem.tsx |  3 +-
 src/global.d.ts                               |  2 +-
 src/pages/ToolsFramework.tsx                  |  6 ++--
 src/pages/UserFramework.tsx                   |  2 +-
 src/router/home.tsx                           |  2 ++
 src/router/index.tsx                          |  2 ++
 src/router/tools.tsx                          | 29 +++++++++++++++++++
 7 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/components/common/sidebar/SidebarItem.tsx b/src/components/common/sidebar/SidebarItem.tsx
index 4fff29d..20edf64 100644
--- a/src/components/common/sidebar/SidebarItem.tsx
+++ b/src/components/common/sidebar/SidebarItem.tsx
@@ -7,6 +7,7 @@ type ItemProps = {
     text?: string
     path: string
     children?: React.ReactNode
+    end?: boolean
 }
 
 const SidebarItem: React.FC<ItemProps> = (props) => {
@@ -34,8 +35,8 @@ const SidebarItem: React.FC<ItemProps> = (props) => {
         <li className={'item'}>
             <div className={'menu-bt'} onMouseEnter={showSubmenu}>
                 <NavLink
+                    end={props.end}
                     to={props.path}
-                    end
                     className={({ isActive, isPending }) =>
                         isPending ? 'pending' : isActive ? 'active' : ''
                     }
diff --git a/src/global.d.ts b/src/global.d.ts
index 5d0e7df..644b9f4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -12,7 +12,7 @@ interface ImportMeta {
 
 type RouteJsonObject = {
     path: string
-    absolutePath?: string
+    absolutePath: string
     id?: string
     element?: React.JSX.Element
     component?: React.ComponentType
diff --git a/src/pages/ToolsFramework.tsx b/src/pages/ToolsFramework.tsx
index 9f05bec..d246630 100644
--- a/src/pages/ToolsFramework.tsx
+++ b/src/pages/ToolsFramework.tsx
@@ -24,11 +24,13 @@ const ToolsFramework: React.FC = () => {
                     <Sidebar title={'氮工具'} onSidebarSwitch={handleOnSidebarSwitch}>
                         <SidebarItemList>
                             <SidebarItem
+                                end
                                 path={''}
                                 icon={tools[0].icon}
                                 text={tools[0].name}
                             ></SidebarItem>
                             <SidebarItem
+                                end
                                 path={'all'}
                                 icon={tools[1].icon}
                                 text={tools[1].name}
@@ -42,7 +44,7 @@ const ToolsFramework: React.FC = () => {
                                         tool.id !== 'tools' &&
                                         tool.id !== 'tools-all' ? (
                                         <SidebarItem
-                                            path={tool.path}
+                                            path={tool.absolutePath}
                                             icon={tool.icon}
                                             text={tool.name}
                                             key={tool.id}
@@ -51,7 +53,7 @@ const ToolsFramework: React.FC = () => {
                                                 ? tool.children.map((subTool) => {
                                                       return (
                                                           <SidebarItem
-                                                              path={`${tool.path}/${subTool.path}`}
+                                                              path={subTool.absolutePath}
                                                               text={subTool.name}
                                                               key={subTool.id}
                                                           />
diff --git a/src/pages/UserFramework.tsx b/src/pages/UserFramework.tsx
index 3b66b40..69ae406 100644
--- a/src/pages/UserFramework.tsx
+++ b/src/pages/UserFramework.tsx
@@ -16,7 +16,7 @@ const ToolsFramework: React.FC = () => {
                             {user.map((value) => {
                                 return value.menu ? (
                                     <SidebarItem
-                                        path={value.path}
+                                        path={value.absolutePath}
                                         icon={value.icon}
                                         text={value.name}
                                         key={value.id}
diff --git a/src/router/home.tsx b/src/router/home.tsx
index b0b7067..0a93802 100644
--- a/src/router/home.tsx
+++ b/src/router/home.tsx
@@ -12,6 +12,7 @@ const home: RouteJsonObject[] = [
     },
     {
         path: 'https://blog.fatweb.top',
+        absolutePath: 'https://blog.fatweb.top',
         id: 'url-blog',
         name: '博客',
         menu: true
@@ -23,6 +24,7 @@ const home: RouteJsonObject[] = [
         children: [
             {
                 path: 'translation',
+                absolutePath: '/tools/translation',
                 id: 'url-tools-translation',
                 name: '翻译',
                 menu: true
diff --git a/src/router/index.tsx b/src/router/index.tsx
index 9e683e1..eac7490 100644
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -36,6 +36,7 @@ const setTitle = (jsonObject: RouteJsonObject[], title: string): RouteJsonObject
 const root: RouteJsonObject[] = [
     {
         path: '/',
+        absolutePath: '/',
         component: React.lazy(() => import('@/AuthRoute')),
         children: [
             {
@@ -77,6 +78,7 @@ const root: RouteJsonObject[] = [
             },
             {
                 path: '*',
+                absolutePath: '*',
                 element: <Navigate to="/" replace />
             }
         ]
diff --git a/src/router/tools.tsx b/src/router/tools.tsx
index d771fa7..62846a7 100644
--- a/src/router/tools.tsx
+++ b/src/router/tools.tsx
@@ -34,6 +34,7 @@ export const tools: RouteJsonObject[] = [
         children: [
             {
                 path: '1',
+                absolutePath: '/tools/translation/1',
                 id: '1',
                 name: '翻译1',
                 icon: React.lazy(() => import('~icons/fatweb/logo.jsx')),
@@ -42,6 +43,7 @@ export const tools: RouteJsonObject[] = [
             },
             {
                 path: '2',
+                absolutePath: '/tools/translation/2',
                 id: '2',
                 name: '翻译2',
                 menu: true,
@@ -51,6 +53,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation-',
+        absolutePath: '/tools/translation-',
         id: 'tools-translation-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译-',
@@ -60,6 +63,7 @@ export const tools: RouteJsonObject[] = [
         children: [
             {
                 path: '1-',
+                absolutePath: '/tools/translation-/1-',
                 id: '1-',
                 name: '翻译1-',
                 menu: true,
@@ -67,6 +71,7 @@ export const tools: RouteJsonObject[] = [
             },
             {
                 path: '2-',
+                absolutePath: '/tools/translation-/2-',
                 id: '2-',
                 name: '翻译2-',
                 menu: true,
@@ -76,6 +81,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--',
+        absolutePath: '/tools/translation--',
         id: 'tools-translation--',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--',
@@ -85,6 +91,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--1',
+        absolutePath: '/tools/translation--1',
         id: 'tools-translation--1',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--1',
@@ -94,6 +101,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--2',
+        absolutePath: '/tools/translation--2',
         id: 'tools-translation--2',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--2',
@@ -103,6 +111,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--3',
+        absolutePath: '/tools/translation--3',
         id: 'tools-translation--3',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--3',
@@ -112,6 +121,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--4',
+        absolutePath: '/tools/translation--4',
         id: 'tools-translation--4',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--4',
@@ -121,6 +131,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--5',
+        absolutePath: '/tools/translation--5',
         id: 'tools-translation--5',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--5',
@@ -130,6 +141,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--6',
+        absolutePath: '/tools/translation--6',
         id: 'tools-translation--6',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--6',
@@ -139,6 +151,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--7',
+        absolutePath: '/tools/translation--7',
         id: 'tools-translation--7',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--7',
@@ -148,6 +161,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--8',
+        absolutePath: '/tools/translation--8',
         id: 'tools-translation--8',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--8',
@@ -157,6 +171,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--9',
+        absolutePath: '/tools/translation--9',
         id: 'tools-translation--9',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--9',
@@ -166,6 +181,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--10',
+        absolutePath: '/tools/translation--10',
         id: 'tools-translation--10',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--10',
@@ -175,6 +191,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--1-',
+        absolutePath: '/tools/translation--1-',
         id: 'tools-translation--1-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--1-',
@@ -184,6 +201,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--2-',
+        absolutePath: '/tools/translation--2-',
         id: 'tools-translation--2-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--2-',
@@ -193,6 +211,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--3-',
+        absolutePath: '/tools/translation--3-',
         id: 'tools-translation--3-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--3-',
@@ -202,6 +221,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--4-',
+        absolutePath: '/tools/translation--4-',
         id: 'tools-translation--4-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--4-',
@@ -211,6 +231,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--5-',
+        absolutePath: '/tools/translation--5-',
         id: 'tools-translation--5-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--5-',
@@ -220,6 +241,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--6-',
+        absolutePath: '/tools/translation--6-',
         id: 'tools-translation--6-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--6-',
@@ -229,6 +251,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--7-',
+        absolutePath: '/tools/translation--7-',
         id: 'tools-translation--7-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--7-',
@@ -238,6 +261,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--8-',
+        absolutePath: '/tools/translation--8-',
         id: 'tools-translation--8-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--8-',
@@ -247,6 +271,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--9-',
+        absolutePath: '/tools/translation--9-',
         id: 'tools-translation--9-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--9-',
@@ -256,6 +281,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: 'translation--10-',
+        absolutePath: '/tools/translation--10-',
         id: 'tools-translation--10-',
         component: React.lazy(() => import('@/pages/tools/Translation')),
         name: '翻译--10-',
@@ -265,6 +291,7 @@ export const tools: RouteJsonObject[] = [
         children: [
             {
                 path: '1-1',
+                absolutePath: '/tools/translation--10-/1-1',
                 id: '1-1',
                 name: '翻译1-',
                 menu: true,
@@ -272,6 +299,7 @@ export const tools: RouteJsonObject[] = [
             },
             {
                 path: '2-1',
+                absolutePath: '/tools/translation--10-/2-1',
                 id: '2-1',
                 name: '翻译2-',
                 menu: true,
@@ -281,6 +309,7 @@ export const tools: RouteJsonObject[] = [
     },
     {
         path: '*',
+        absolutePath: '*',
         element: <Navigate to="/tools" replace />
     }
 ]