From a9a2704ae1fa07b58a283009ebf46f2ec7d24017 Mon Sep 17 00:00:00 2001
From: Hooray Hu <304327508@qq.com>
Date: Thu, 14 Dec 2023 21:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20`home.fullPath`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NotAllowed/index.vue             | 6 +++++-
 src/layouts/components/Logo/index.vue           | 6 +-----
 src/layouts/components/Tools/index.vue          | 2 +-
 src/layouts/components/Topbar/Toolbar/index.vue | 2 +-
 src/router/index.ts                             | 6 +++---
 src/router/routes.ts                            | 1 -
 src/settings.default.ts                         | 1 +
 src/store/modules/menu.ts                       | 2 +-
 src/store/modules/user.ts                       | 4 +++-
 src/types/global.d.ts                           | 5 +++++
 src/views/[...all].vue                          | 6 +++++-
 src/views/login.vue                             | 4 +++-
 12 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/components/NotAllowed/index.vue b/src/components/NotAllowed/index.vue
index b82a2fac..6ec39a13 100755
--- a/src/components/NotAllowed/index.vue
+++ b/src/components/NotAllowed/index.vue
@@ -1,10 +1,14 @@
 <script setup lang="ts">
+import useSettingsStore from '@/store/modules/settings'
+
 defineOptions({
   name: 'NotAllowed',
 })
 
 const router = useRouter()
 
+const settingsStore = useSettingsStore()
+
 const data = ref({
   inter: Number.NaN,
   countdown: 5,
@@ -25,7 +29,7 @@ onMounted(() => {
 })
 
 function goBack() {
-  router.push('/')
+  router.push(settingsStore.settings.home.fullPath)
 }
 </script>
 
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index c077c346..23cdc559 100755
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -22,11 +22,7 @@ const settingsStore = useSettingsStore()
 const title = ref(import.meta.env.VITE_APP_TITLE)
 const logo = ref(imgLogo)
 
-const to = computed(() => {
-  return {
-    ...(settingsStore.settings.home.enable && { name: 'home' }),
-  }
-})
+const to = computed(() => settingsStore.settings.home.enable ? settingsStore.settings.home.fullPath : '')
 </script>
 
 <template>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index c0bbc098..71d5df84 100755
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -76,7 +76,7 @@ watch(() => userStore.avatar, () => {
     <HDropdownMenu
       :items="[
         [
-          { label: settingsStore.settings.home.title, handle: () => router.push({ name: 'home' }), hide: !settingsStore.settings.home.enable },
+          { label: settingsStore.settings.home.title, handle: () => router.push({ path: settingsStore.settings.home.fullPath }), hide: !settingsStore.settings.home.enable },
           { label: '个人设置', handle: () => router.push({ name: 'personalSetting' }) },
         ],
         [
diff --git a/src/layouts/components/Topbar/Toolbar/index.vue b/src/layouts/components/Topbar/Toolbar/index.vue
index 2d6ab27b..0b25bf59 100755
--- a/src/layouts/components/Topbar/Toolbar/index.vue
+++ b/src/layouts/components/Topbar/Toolbar/index.vue
@@ -21,7 +21,7 @@ const breadcrumbList = computed(() => {
   const breadcrumbList = []
   if (settingsStore.settings.home.enable) {
     breadcrumbList.push({
-      path: '/',
+      path: settingsStore.settings.home.fullPath,
       title: settingsStore.settings.home.title,
     })
   }
diff --git a/src/router/index.ts b/src/router/index.ts
index d13fed97..52faa3c3 100755
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -34,12 +34,12 @@ router.beforeEach(async (to, from, next) => {
       // 如果已登录状态下，进入登录页会强制跳转到主页
       if (to.name === 'login') {
         next({
-          name: 'home',
+          path: settingsStore.settings.home.fullPath,
           replace: true,
         })
       }
       // 如果未开启主页，但进入的是主页，则会进入侧边栏导航第一个模块
-      else if (!settingsStore.settings.home.enable && to.name === 'home') {
+      else if (!settingsStore.settings.home.enable && to.fullPath === settingsStore.settings.home.fullPath) {
         if (menuStore.sidebarMenus.length > 0) {
           next({
             path: menuStore.sidebarMenusFirstDeepestPath,
@@ -105,7 +105,7 @@ router.beforeEach(async (to, from, next) => {
       next({
         name: 'login',
         query: {
-          redirect: to.fullPath !== '/' ? to.fullPath : undefined,
+          redirect: to.fullPath !== settingsStore.settings.home.fullPath ? to.fullPath : undefined,
         },
       })
     }
diff --git a/src/router/routes.ts b/src/router/routes.ts
index bd6d9cf7..b9b6e879 100755
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -48,7 +48,6 @@ const systemRoutes: RouteRecordRaw[] = [
     children: [
       {
         path: '',
-        name: 'home',
         component: () => import('@/views/index.vue'),
         meta: {
           title: () => useSettingsStore().settings.home.title,
diff --git a/src/settings.default.ts b/src/settings.default.ts
index 90602a08..0edcb12f 100755
--- a/src/settings.default.ts
+++ b/src/settings.default.ts
@@ -14,6 +14,7 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
   home: {
     enable: true,
     title: '主页',
+    fullPath: '/',
   },
   layout: {
     enableMobileAdaptation: false,
diff --git a/src/store/modules/menu.ts b/src/store/modules/menu.ts
index d10de956..726339db 100755
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -64,7 +64,7 @@ const useMenuStore = defineStore(
     const sidebarMenusFirstDeepestPath = computed(() => {
       return sidebarMenus.value.length > 0
         ? getDeepestPath(sidebarMenus.value[0])
-        : '/'
+        : settingsStore.settings.home.fullPath
     })
     function getDeepestPath(menu: Menu.recordRaw, rootPath = '') {
       let retnPath = ''
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 5423ec9b..a4f2cb43 100755
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,3 +1,4 @@
+import useSettingsStore from './settings'
 import useRouteStore from './route'
 import useMenuStore from './menu'
 import router from '@/router'
@@ -7,6 +8,7 @@ const useUserStore = defineStore(
   // 唯一ID
   'user',
   () => {
+    const settingsStore = useSettingsStore()
     const routeStore = useRouteStore()
     const menuStore = useMenuStore()
 
@@ -56,7 +58,7 @@ const useUserStore = defineStore(
       router.push({
         name: 'login',
         query: {
-          ...(router.currentRoute.value.path !== '/' && router.currentRoute.value.name !== 'login' && { redirect }),
+          ...(router.currentRoute.value.path !== settingsStore.settings.home.fullPath && router.currentRoute.value.name !== 'login' && { redirect }),
         },
       })
     }
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 4365f0f6..b75c1d16 100755
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -55,6 +55,11 @@ declare namespace Settings {
      * @默认值 `'主页'`
      */
     title?: string
+    /**
+     * 主页完整路径
+     * @默认值 `'/'`
+     */
+    fullPath?: string
   }
   interface layout {
     /**
diff --git a/src/views/[...all].vue b/src/views/[...all].vue
index 06d14e29..257cbd24 100755
--- a/src/views/[...all].vue
+++ b/src/views/[...all].vue
@@ -7,8 +7,12 @@ meta:
 </route>
 
 <script setup lang="ts">
+import useSettingsStore from '@/store/modules/settings'
+
 const router = useRouter()
 
+const settingsStore = useSettingsStore()
+
 const data = ref({
   inter: Number.NaN,
   countdown: 5,
@@ -29,7 +33,7 @@ onMounted(() => {
 })
 
 function goBack() {
-  router.push('/')
+  router.push(settingsStore.settings.home.fullPath)
 }
 </script>
 
diff --git a/src/views/login.vue b/src/views/login.vue
index a82976ea..7ba2eccd 100755
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,6 +9,7 @@ meta:
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import Copyright from '@/layouts/components/Copyright/index.vue'
+import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
 
 defineOptions({
@@ -18,6 +19,7 @@ defineOptions({
 const route = useRoute()
 const router = useRouter()
 
+const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
 const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
@@ -27,7 +29,7 @@ const title = import.meta.env.VITE_APP_TITLE
 // 表单类型，login 登录，register 注册，reset 重置密码
 const formType = ref('login')
 const loading = ref(false)
-const redirect = ref(route.query.redirect?.toString() ?? '/')
+const redirect = ref(route.query.redirect?.toString() ?? settingsStore.settings.home.fullPath)
 
 // 登录
 const loginFormRef = ref<FormInstance>()