From b2e33ca05f0c8d715bac12986091f2af370166e3 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Sat, 19 Nov 2022 01:35:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor!:=20=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=BB=E9=A1=B5=EF=BC=8C=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B0=83=E6=95=B4=E4=B8=BA=E6=A0=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

从原有 /dashboard 路由调整为 / 根路由
---
 src/global.d.ts                             | 12 ++---
 src/layouts/components/AppSetting/index.vue | 10 ++--
 src/layouts/components/Logo/index.vue       |  6 +--
 src/layouts/components/Tools/index.vue      | 10 ++--
 src/layouts/components/Topbar/index.vue     |  6 +--
 src/router/index.ts                         | 12 ++---
 src/router/routes.ts                        | 54 +++++----------------
 src/settings.default.ts                     |  4 +-
 src/views/index.vue                         |  4 +-
 9 files changed, 45 insertions(+), 73 deletions(-)

diff --git a/src/global.d.ts b/src/global.d.ts
index e99fad98..ab0b37b5 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -52,15 +52,15 @@ declare namespace Settings {
      */
     routeBaseOn?: 'frontend' | 'backend' | 'filesystem'
   }
-  interface dashboard {
+  interface home {
     /**
-     * 是否开启控制台页面
+     * 是否开启主页页面
      * @默认值 `true`
      */
     enable?: boolean
     /**
-     * 控制台名称
-     * @默认值 `'控制台'`
+     * 主页名称
+     * @默认值 `'主页'`
      */
     title?: string
   }
@@ -189,8 +189,8 @@ declare namespace Settings {
   interface all {
     /** 应用设置 */
     app?: app
-    /** 控制台设置 */
-    dashboard?: dashboard
+    /** 主页设置 */
+    home?: home
     /** 布局设置 */
     layout?: layout
     /** 导航栏设置 */
diff --git a/src/layouts/components/AppSetting/index.vue b/src/layouts/components/AppSetting/index.vue
index 7e5ba0e9..33bd8553 100644
--- a/src/layouts/components/AppSetting/index.vue
+++ b/src/layouts/components/AppSetting/index.vue
@@ -226,23 +226,23 @@ function handleCopy() {
         </div>
         <el-input v-model="settingsStore.copyright.beian" size="small" :disabled="!settingsStore.copyright.enable" />
       </div>
-      <el-divider>控制台</el-divider>
+      <el-divider>主页</el-divider>
       <div class="setting-item">
         <div class="label">
           是否开启
-          <el-tooltip content="该功能开启时，登录成功默认进入控制台页面，反之则默认进入导航栏里第一个导航页面" placement="top">
+          <el-tooltip content="该功能开启时，登录成功默认进入主页，反之则默认进入导航栏里第一个导航页面" placement="top">
             <el-icon>
               <svg-icon name="ep:question-filled" />
             </el-icon>
           </el-tooltip>
         </div>
-        <el-switch v-model="settingsStore.dashboard.enable" />
+        <el-switch v-model="settingsStore.home.enable" />
       </div>
       <div class="setting-item">
         <div class="label">
-          控制台名称
+          主页名称
         </div>
-        <el-input v-model="settingsStore.dashboard.title" size="small" />
+        <el-input v-model="settingsStore.home.title" size="small" />
       </div>
       <el-divider>其它</el-divider>
       <div class="setting-item">
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd2283..4089f685 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -22,15 +22,15 @@ const to = computed(() => {
   const rtn: {
     name?: string
   } = {}
-  if (settingsStore.dashboard.enable) {
-    rtn.name = 'dashboard'
+  if (settingsStore.home.enable) {
+    rtn.name = 'home'
   }
   return rtn
 })
 </script>
 
 <template>
-  <router-link :to="to" class="title" :class="{ 'is-link': settingsStore.dashboard.enable }" :title="title">
+  <router-link :to="to" class="title" :class="{ 'is-link': settingsStore.home.enable }" :title="title">
     <img v-if="showLogo" :src="logo" class="logo">
     <span v-if="showTitle">{{ title }}</span>
   </router-link>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index ae803be3..a668862a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -12,11 +12,11 @@ const userStore = useUserStore()
 const mainPage = useMainPage()
 const { isFullscreen, toggle } = useFullscreen()
 
-function userCommand(command: 'dashboard' | 'setting' | 'hotkeys' | 'logout') {
+function userCommand(command: 'home' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
-    case 'dashboard':
+    case 'home':
       router.push({
-        name: 'dashboard',
+        name: 'home',
       })
       break
     case 'setting':
@@ -85,8 +85,8 @@ function pro() {
       </div>
       <template #dropdown>
         <el-dropdown-menu class="user-dropdown">
-          <el-dropdown-item v-if="settingsStore.dashboard.enable" command="dashboard">
-            控制台
+          <el-dropdown-item v-if="settingsStore.home.enable" command="home">
+            {{ settingsStore.home.title }}
           </el-dropdown-item>
           <el-dropdown-item command="setting">
             个人设置
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 828ab656..c8abb121 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -16,10 +16,10 @@ const enableSubMenuCollapseButton = computed(() => {
 
 const breadcrumbList = computed(() => {
   const breadcrumbList = []
-  if (settingsStore.dashboard.enable) {
+  if (settingsStore.home.enable) {
     breadcrumbList.push({
-      path: '/dashboard',
-      title: settingsStore.dashboard.title,
+      path: '/',
+      title: settingsStore.home.title,
     })
   }
   if (route.meta.breadcrumbNeste) {
diff --git a/src/router/index.ts b/src/router/index.ts
index 6015c871..44b946eb 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -30,22 +30,22 @@ router.beforeEach(async (to, from, next) => {
     if (routeStore.isGenerate) {
       // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
       settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-      // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+      // 如果已登录状态下，进入登录页会强制跳转到主页
       if (to.name === 'login') {
         next({
-          name: 'dashboard',
+          name: 'home',
           replace: true,
         })
       }
-      // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-      else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+      // 如果未开启主页，但进入的是主页，则会进入侧边栏导航第一个模块
+      else if (!settingsStore.home.enable && to.name === 'home') {
         if (menuStore.sidebarMenus.length > 0) {
           next({
             path: menuStore.sidebarMenusFirstDeepestPath,
             replace: true,
           })
         }
-        // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+        // 如果侧边栏导航第一个模块无法命中，则还是进入主页
         else {
           next()
         }
@@ -104,7 +104,7 @@ router.beforeEach(async (to, from, next) => {
       next({
         name: 'login',
         query: {
-          redirect: to.fullPath,
+          redirect: to.fullPath !== '/' ? to.fullPath : undefined,
         },
       })
     }
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 0a9cbd03..e613a666 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -7,13 +7,6 @@ import useSettingsStore from '@/store/modules/settings'
 
 // 固定路由（默认路由）
 const constantRoutes: Route.recordRaw[] = [
-  {
-    path: '/',
-    redirect: '/dashboard',
-    meta: {
-      title: '',
-    },
-  },
   {
     path: '/login',
     name: 'login',
@@ -35,33 +28,31 @@ const constantRoutes: Route.recordRaw[] = [
 // 系统路由
 const systemRoutes: Route.recordRaw[] = [
   {
-    path: '/dashboard',
+    path: '/',
     component: () => import('@/layouts/index.vue'),
     meta: {
-      title: () => useSettingsStore().dashboard.title,
+      title: () => useSettingsStore().home.title,
       breadcrumb: false,
     },
     children: [
       {
         path: '',
-        name: 'dashboard',
+        name: 'home',
         component: () => import('@/views/index.vue'),
         meta: {
-          title: () => useSettingsStore().dashboard.title,
+          title: () => useSettingsStore().home.title,
+          breadcrumb: false,
+        },
+      },
+      {
+        path: 'reload',
+        name: 'reload',
+        component: () => import('@/views/reload.vue'),
+        meta: {
+          title: '重新加载',
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/personal',
-    component: () => import('@/layouts/index.vue'),
-    redirect: '/personal/setting',
-    meta: {
-      title: '个人中心',
-      breadcrumb: false,
-    },
-    children: [
       {
         path: 'setting',
         name: 'personalSetting',
@@ -81,25 +72,6 @@ const systemRoutes: Route.recordRaw[] = [
       },
     ],
   },
-  {
-    path: '/reload',
-    component: () => import('@/layouts/index.vue'),
-    meta: {
-      title: '重新加载',
-      breadcrumb: false,
-    },
-    children: [
-      {
-        path: '',
-        name: 'reload',
-        component: () => import('@/views/reload.vue'),
-        meta: {
-          title: '重新加载',
-          breadcrumb: false,
-        },
-      },
-    ],
-  },
 ]
 
 // 动态路由（异步路由、导航栏路由）
diff --git a/src/settings.default.ts b/src/settings.default.ts
index 99c4ad49..cd1c4a6f 100644
--- a/src/settings.default.ts
+++ b/src/settings.default.ts
@@ -12,9 +12,9 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
     enableDynamicTitle: false,
     routeBaseOn: 'frontend',
   },
-  dashboard: {
+  home: {
     enable: true,
-    title: '控制台',
+    title: '主页',
   },
   layout: {
     enableMobileAdaptation: false,
diff --git a/src/views/index.vue b/src/views/index.vue
index 69d5b4ea..a52b363a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,7 +1,7 @@
 <route lang="yaml">
-name: dashboard
+name: home
 meta:
-  title: 控制台
+  title: 主页
 </route>
 
 <script lang="ts" setup>