From d1574b0d28b70fd3a5f1c3fd2881001c5db92410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Tue, 11 Oct 2022 17:38:59 +0800
Subject: [PATCH 1/9] =?UTF-8?q?:recycle:=20=E8=B7=AF=E7=94=B1=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/plugin/styleImport.ts            |  1 +
 src/api/user.ts                         |  3 +-
 src/mock/index.ts                       |  2 +-
 src/mock/user.ts                        | 39 +++++++++++++++++++++----
 src/router/guard/permission.ts          |  5 +++-
 src/router/routes/modules/dashboard.ts  |  1 +
 src/router/routes/modules/system.ts     | 22 ++++++++++++++
 src/router/typings.d.ts                 |  6 ++--
 src/store/modules/app/index.ts          |  8 ++---
 src/store/modules/app/types.ts          |  4 +--
 src/store/modules/tab-bar/index.ts      |  1 +
 src/types/modules/system.ts             | 18 ++++++++++++
 src/utils/menu.ts                       | 29 ++++++++++++++++++
 src/views/dashboard/workplace/index.vue |  1 +
 src/views/system/roles/index.vue        | 13 +++++++++
 src/views/system/user/index.vue         | 15 ++++++++++
 16 files changed, 150 insertions(+), 18 deletions(-)
 create mode 100644 src/router/routes/modules/system.ts
 create mode 100644 src/types/modules/system.ts
 create mode 100644 src/utils/menu.ts
 create mode 100644 src/views/system/roles/index.vue
 create mode 100644 src/views/system/user/index.vue

diff --git a/config/plugin/styleImport.ts b/config/plugin/styleImport.ts
index acd74dd..80e81c3 100644
--- a/config/plugin/styleImport.ts
+++ b/config/plugin/styleImport.ts
@@ -74,6 +74,7 @@ export default function configStyleImportPlugin() {
           if (ignoreList.includes(name)) return '';
           // eslint-disable-next-line no-prototype-builtins
           return replaceList.hasOwnProperty(name)
+            // @ts-ignore
             ? `@arco-design/web-vue/es/${replaceList[name]}/style/css.js`
             : `@arco-design/web-vue/es/${name}/style/css.js`;
           // less
diff --git a/src/api/user.ts b/src/api/user.ts
index 35b8812..a179021 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,6 +1,7 @@
 import axios from 'axios';
 import type { RouteRecordNormalized } from 'vue-router';
 import { UserState } from '@/store/modules/user/types';
+import { Menu } from "@/types/modules/system";
 
 export interface LoginData {
   username: string;
@@ -23,5 +24,5 @@ export function getUserInfo() {
 }
 
 export function getMenuList() {
-  return axios.post<RouteRecordNormalized[]>('/api/user/menu');
+  return axios.post<Menu[]>('/api/user/menu');
 }
diff --git a/src/mock/index.ts b/src/mock/index.ts
index cf1af17..9ea3734 100644
--- a/src/mock/index.ts
+++ b/src/mock/index.ts
@@ -6,5 +6,5 @@ import './message-box';
 import '@/views/dashboard/workplace/mock';
 
 Mock.setup({
-  timeout: '600-1000',
+  timeout: '100-500',
 });
diff --git a/src/mock/user.ts b/src/mock/user.ts
index dedd60f..8bcd81e 100644
--- a/src/mock/user.ts
+++ b/src/mock/user.ts
@@ -73,26 +73,53 @@ setupMock({
         {
           path: '/dashboard',
           name: 'dashboard',
+          component: '@/layout/default-layout.vue',
           meta: {
             title: '仪表盘',
-            requiresAuth: true,
             icon: 'icon-dashboard',
-            order: 1,
           },
           children: [
             {
               path: 'workplace',
               name: 'Workplace',
+              component: '@/views/dashboard/workplace/index.vue',
               meta: {
                 title: '工作台',
-                requiresAuth: true,
+                cache: true,
+                affix: true
+              }
+            }
+          ]
+        },
+        {
+          path: '/system',
+          name: 'system',
+          component: '@/layout/default-layout.vue',
+          meta: {
+            title: '系统管理',
+            icon: 'icon-dashboard',
+            order: 1,
+            cache: true
+          },
+          children: [
+            {
+              path: 'user',
+              name: 'user',
+              component: '@/views/system/user/index.vue',
+              meta: {
+                title: '用户管理',
+                cache: true,
+                affix: true,
               },
             },
             {
-              path: 'https://arco.design',
-              name: 'arcoWebsite',
+              path: 'role',
+              name: 'role',
+              component: '@/views/system/roles/index.vue',
               meta: {
-                title: 'arcoWebsite'
+                title: '角色管理',
+                cache: true,
+                affix: true,
               },
             },
           ],
diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts
index ad3724e..ab270c9 100644
--- a/src/router/guard/permission.ts
+++ b/src/router/guard/permission.ts
@@ -3,6 +3,7 @@ import NProgress from 'nprogress'; // progress bar
 
 import usePermission from '@/hooks/permission';
 import { useUserStore, useAppStore } from '@/store';
+import { buildVueRouter } from "@/utils/menu";
 import { appRoutes } from '../routes';
 import { WHITE_LIST, NOT_FOUND } from '../constants';
 
@@ -24,6 +25,8 @@ export default function setupPermissionGuard(router: Router) {
       ) {
         await appStore.fetchServerMenuConfig();
       }
+      // @ts-ignore
+      appStore.appAsyncMenus.map(buildVueRouter).forEach(router.addRoute)
       const serverMenuConfig = [...appStore.appAsyncMenus, ...WHITE_LIST];
 
       let exist = false;
@@ -33,7 +36,7 @@ export default function setupPermissionGuard(router: Router) {
 
         if (element?.children) {
           serverMenuConfig.push(
-            ...(element.children as unknown as RouteRecordNormalized[])
+            ...element.children
           );
         }
       }
diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts
index fa6c425..4afe6ca 100644
--- a/src/router/routes/modules/dashboard.ts
+++ b/src/router/routes/modules/dashboard.ts
@@ -5,6 +5,7 @@ const DASHBOARD: AppRouteRecordRaw = {
   path: '/dashboard',
   name: 'dashboard',
   component: DEFAULT_LAYOUT,
+  redirect: '/dashboard/workplace',
   meta: {
     title: '仪表盘',
     requiresAuth: true,
diff --git a/src/router/routes/modules/system.ts b/src/router/routes/modules/system.ts
new file mode 100644
index 0000000..92babd4
--- /dev/null
+++ b/src/router/routes/modules/system.ts
@@ -0,0 +1,22 @@
+import { AppRouteRecordRaw } from "@/router/routes/types";
+import { DEFAULT_LAYOUT } from "@/router/constants";
+
+const SYSTEM: AppRouteRecordRaw = {
+  path: '/system',
+  name: 'system',
+  component: DEFAULT_LAYOUT,
+  children: [
+    {
+      path: 'user',
+      name: 'user',
+      component: '@/views/system/user/index.vue',
+    },
+    {
+      path: 'role',
+      name: 'role',
+      component: '@/views/system/roles/index.vue',
+    },
+  ],
+};
+
+export default SYSTEM
diff --git a/src/router/typings.d.ts b/src/router/typings.d.ts
index e3e7c2e..7094bb7 100644
--- a/src/router/typings.d.ts
+++ b/src/router/typings.d.ts
@@ -3,14 +3,14 @@ import 'vue-router';
 declare module 'vue-router' {
   interface RouteMeta {
     roles?: string[]; // Controls roles that have access to the page
-    requiresAuth: boolean; // Whether login is required to access the current page (every route must declare)
+    requiresAuth?: boolean; // Whether login is required to access the current page (every route must declare)
     icon?: string; // The icon show in the side menu
     title?: string; // The title name show in side menu and breadcrumb
     hidden?: boolean; // If true, it is not displayed in the side menu
     hideChildrenInMenu?: boolean; // if set true, the children are not displayed in the side menu
     activeMenu?: string; // if set name, the menu will be highlighted according to the name you set
     order?: number; // Sort routing menu items. If set key, the higher the value, the more forward it is
-    affix?: boolean; // if set true, the tag will not affix in the tab-bar
-    cache?: boolean; // if set true, the page will not be cached
+    affix?: boolean; // if set true, the tag will affix in the tab-bar
+    cache?: boolean; // if set true, the page will be cached
   }
 }
diff --git a/src/store/modules/app/index.ts b/src/store/modules/app/index.ts
index 77c6c35..89b7cba 100644
--- a/src/store/modules/app/index.ts
+++ b/src/store/modules/app/index.ts
@@ -1,10 +1,10 @@
 import { defineStore } from 'pinia';
 import { Notification } from '@arco-design/web-vue';
 import type { NotificationReturn } from '@arco-design/web-vue/es/notification/interface';
-import type { RouteRecordNormalized } from 'vue-router';
 import defaultSettings from '@/config/settings.json';
 import { getMenuList } from '@/api/user';
-import { AppState } from './types';
+import type { Menu } from "@/types/modules/system";
+import type { AppState } from './types';
 
 const useAppStore = defineStore('app', {
   state: (): AppState => ({ ...defaultSettings }),
@@ -16,8 +16,8 @@ const useAppStore = defineStore('app', {
     appDevice(state: AppState) {
       return state.device;
     },
-    appAsyncMenus(state: AppState): RouteRecordNormalized[] {
-      return state.serverMenu as unknown as RouteRecordNormalized[];
+    appAsyncMenus(state: AppState): Menu[] {
+      return state.serverMenu;
     },
   },
 
diff --git a/src/store/modules/app/types.ts b/src/store/modules/app/types.ts
index 0ee2329..fc11d64 100644
--- a/src/store/modules/app/types.ts
+++ b/src/store/modules/app/types.ts
@@ -1,4 +1,4 @@
-import type { RouteRecordNormalized } from 'vue-router';
+import type { Menu } from "@/types/modules/system";
 
 export interface AppState {
   theme: string;
@@ -13,6 +13,6 @@ export interface AppState {
   device: string;
   tabBar: boolean;
   menuFromServer: boolean;
-  serverMenu: RouteRecordNormalized[];
+  serverMenu: Menu[];
   [key: string]: unknown;
 }
diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index d17bdb5..f6fce9b 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -5,6 +5,7 @@ import { TabBarState, TagProps } from './types';
 
 const formatTag = (route: RouteLocationNormalized): TagProps => {
   const { name, meta, fullPath, query } = route;
+  console.log('cache', meta.cache);
   return {
     title: meta.title || '',
     name: String(name),
diff --git a/src/types/modules/system.ts b/src/types/modules/system.ts
new file mode 100644
index 0000000..fe3383b
--- /dev/null
+++ b/src/types/modules/system.ts
@@ -0,0 +1,18 @@
+export interface Meta {
+  title: string  // 标题
+  cache?: boolean // 缓存
+  icon?: string // 图标
+  hidden?: boolean // 是否在菜单栏中隐藏
+  open?: boolean // 是否展开菜单
+  order?: number // 排序路由菜单项。如果设置该值，值越高，越靠前
+  affix?: boolean // 如果设置为false，标签将不会添加到tab-bar中
+}
+
+export interface Menu {
+  path: string
+  name: string
+  component?: string
+  meta?: Meta
+  redirect?: string
+  children?: Menu[]
+}
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
new file mode 100644
index 0000000..ed3542a
--- /dev/null
+++ b/src/utils/menu.ts
@@ -0,0 +1,29 @@
+import type { Menu } from "@/types/modules/system";
+import { AppRouteRecordRaw } from "@/router/routes/types";
+
+// eslint-disable-next-line import/prefer-default-export
+export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
+  const { name, path, component, children, redirect, meta } = menu
+  const route: AppRouteRecordRaw = {
+    redirect,
+    name,
+    path,
+    component: component? () => import(component.replace("@/", "/src/")): undefined,
+    children: children && children.length? children.map(buildVueRouter): undefined
+  }
+  if (meta) {
+    const { title, cache, hidden, order, icon, affix } = meta
+    route.meta = {
+      title,
+      icon,
+      cache,
+      hidden,
+      order,
+      affix
+    }
+  }
+  return route
+}
+
+
+
diff --git a/src/views/dashboard/workplace/index.vue b/src/views/dashboard/workplace/index.vue
index 379e5ce..abd3184 100644
--- a/src/views/dashboard/workplace/index.vue
+++ b/src/views/dashboard/workplace/index.vue
@@ -2,6 +2,7 @@
   <div class="container">
     <div class="left-side">
       <div class="panel">
+      <input type="text">
         <Banner />
         <DataPanel />
         <ContentChart />
diff --git a/src/views/system/roles/index.vue b/src/views/system/roles/index.vue
new file mode 100644
index 0000000..7c8ddea
--- /dev/null
+++ b/src/views/system/roles/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <input type="text">
+</template>
+
+<script lang="ts">
+export default {
+  name: 'Role',
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
new file mode 100644
index 0000000..11f6fae
--- /dev/null
+++ b/src/views/system/user/index.vue
@@ -0,0 +1,15 @@
+<template>
+<div>
+  <input type="text">
+</div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'User',
+};
+</script>
+
+<style scoped>
+
+</style>
-- 
Gitee


From b4d30d88556efe4e3ca7cc3fabf5a23fb46088d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 12 Oct 2022 12:25:23 +0800
Subject: [PATCH 2/9] =?UTF-8?q?:bug:=20=E8=B7=AF=E7=94=B1=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=BC=93=E5=AD=98=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                            |  5 ++---
 src/components/menu/index.vue              |  4 ++--
 src/layout/page-layout.vue                 |  7 +------
 src/mock/user.ts                           | 17 +++++++--------
 src/router/app-menus/index.ts              |  4 ++--
 src/router/guard/permission.ts             |  6 +++---
 src/router/index.ts                        |  4 ++--
 src/router/routes/external-modules/arco.ts | 10 ---------
 src/router/routes/external-modules/faq.ts  | 10 ---------
 src/router/routes/index.ts                 |  6 ------
 src/router/routes/modules/system.ts        | 22 --------------------
 src/store/modules/tab-bar/index.ts         |  1 -
 src/types/modules/system.ts                | 12 ++---------
 src/utils/menu.ts                          | 24 ++++++++++++++--------
 src/views/login/components/login-form.vue  |  5 +++--
 15 files changed, 41 insertions(+), 96 deletions(-)
 delete mode 100644 src/router/routes/external-modules/arco.ts
 delete mode 100644 src/router/routes/external-modules/faq.ts
 delete mode 100644 src/router/routes/modules/system.ts

diff --git a/src/api/user.ts b/src/api/user.ts
index a179021..04ca91e 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,7 +1,6 @@
 import axios from 'axios';
-import type { RouteRecordNormalized } from 'vue-router';
-import { UserState } from '@/store/modules/user/types';
-import { Menu } from "@/types/modules/system";
+import type { UserState } from '@/store/modules/user/types';
+import type { Menu } from "@/types/modules/system";
 
 export interface LoginData {
   username: string;
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index f7b3ef8..2361dc9 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -71,8 +71,8 @@
         return result;
       };
       listenerRouteChange((newRoute) => {
-        const { requiresAuth, activeMenu, hidden } = newRoute.meta;
-        if (requiresAuth && (!hidden || activeMenu)) {
+        const { activeMenu, hidden } = newRoute.meta;
+        if (!hidden || activeMenu) {
           const menuOpenKeys = findMenuOpenKeys(
             (activeMenu || newRoute.name) as string
           );
diff --git a/src/layout/page-layout.vue b/src/layout/page-layout.vue
index 69d5a54..cbf7326 100644
--- a/src/layout/page-layout.vue
+++ b/src/layout/page-layout.vue
@@ -1,12 +1,7 @@
 <template>
   <router-view v-slot="{ Component, route }">
     <transition name="fade" mode="out-in" appear>
-      <component
-        :is="Component"
-        v-if="!route.meta.cache"
-        :key="route.fullPath"
-      />
-      <keep-alive v-else :include="cacheList">
+      <keep-alive :include="cacheList">
         <component :is="Component" :key="route.fullPath" />
       </keep-alive>
     </transition>
diff --git a/src/mock/user.ts b/src/mock/user.ts
index 8bcd81e..ddc8041 100644
--- a/src/mock/user.ts
+++ b/src/mock/user.ts
@@ -73,16 +73,17 @@ setupMock({
         {
           path: '/dashboard',
           name: 'dashboard',
-          component: '@/layout/default-layout.vue',
+          component: '/layout/default-layout.vue',
           meta: {
             title: '仪表盘',
             icon: 'icon-dashboard',
+            cache: true
           },
           children: [
             {
               path: 'workplace',
               name: 'Workplace',
-              component: '@/views/dashboard/workplace/index.vue',
+              component: '/views/dashboard/workplace/index.vue',
               meta: {
                 title: '工作台',
                 cache: true,
@@ -94,7 +95,7 @@ setupMock({
         {
           path: '/system',
           name: 'system',
-          component: '@/layout/default-layout.vue',
+          component: '/layout/default-layout.vue',
           meta: {
             title: '系统管理',
             icon: 'icon-dashboard',
@@ -104,8 +105,8 @@ setupMock({
           children: [
             {
               path: 'user',
-              name: 'user',
-              component: '@/views/system/user/index.vue',
+              name: 'User',
+              component: '/views/system/user/index.vue',
               meta: {
                 title: '用户管理',
                 cache: true,
@@ -114,11 +115,11 @@ setupMock({
             },
             {
               path: 'role',
-              name: 'role',
-              component: '@/views/system/roles/index.vue',
+              name: 'Role',
+              component: '/views/system/roles/index.vue',
               meta: {
                 title: '角色管理',
-                cache: true,
+                cache: false,
                 affix: true,
               },
             },
diff --git a/src/router/app-menus/index.ts b/src/router/app-menus/index.ts
index 2136c96..7ec037f 100644
--- a/src/router/app-menus/index.ts
+++ b/src/router/app-menus/index.ts
@@ -1,6 +1,6 @@
-import { appRoutes, appExternalRoutes } from '../routes';
+import { appRoutes } from '../routes';
 
-const mixinRoutes = [...appRoutes, ...appExternalRoutes];
+const mixinRoutes = [...appRoutes ];
 
 const appClientMenus = mixinRoutes.map((el) => {
   const { name, path, meta, redirect, children } = el;
diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts
index ab270c9..e67bd86 100644
--- a/src/router/guard/permission.ts
+++ b/src/router/guard/permission.ts
@@ -1,4 +1,4 @@
-import type { Router, RouteRecordNormalized } from 'vue-router';
+import type { Router } from 'vue-router';
 import NProgress from 'nprogress'; // progress bar
 
 import usePermission from '@/hooks/permission';
@@ -24,9 +24,9 @@ export default function setupPermissionGuard(router: Router) {
         !WHITE_LIST.find((el) => el.name === to.name)
       ) {
         await appStore.fetchServerMenuConfig();
+        // @ts-ignore
+        appStore.appAsyncMenus.map(buildVueRouter).forEach(router.addRoute)
       }
-      // @ts-ignore
-      appStore.appAsyncMenus.map(buildVueRouter).forEach(router.addRoute)
       const serverMenuConfig = [...appStore.appAsyncMenus, ...WHITE_LIST];
 
       let exist = false;
diff --git a/src/router/index.ts b/src/router/index.ts
index f0da459..0522764 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,7 +2,7 @@ import { createRouter, createWebHistory } from 'vue-router';
 import NProgress from 'nprogress'; // progress bar
 import 'nprogress/nprogress.css';
 
-import { appRoutes } from './routes';
+import { appRoutes, DEFAULT_ROUTE } from "./routes";
 import createRouteGuard from './guard';
 
 NProgress.configure({ showSpinner: false }); // NProgress Configuration
@@ -12,7 +12,7 @@ const router = createRouter({
   routes: [
     {
       path: '/',
-      redirect: 'login',
+      redirect: DEFAULT_ROUTE.fullPath,
     },
     {
       path: '/login',
diff --git a/src/router/routes/external-modules/arco.ts b/src/router/routes/external-modules/arco.ts
deleted file mode 100644
index 612e236..0000000
--- a/src/router/routes/external-modules/arco.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  path: 'https://arco.design',
-  name: 'arcoWebsite',
-  meta: {
-    title: 'arcoWebsite',
-    icon: 'icon-link',
-    requiresAuth: true,
-    order: 8,
-  },
-};
diff --git a/src/router/routes/external-modules/faq.ts b/src/router/routes/external-modules/faq.ts
deleted file mode 100644
index 5d8bf1a..0000000
--- a/src/router/routes/external-modules/faq.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  path: 'https://arco.design/vue/docs/pro/faq',
-  name: 'faq',
-  meta: {
-    title: 'menu.faq',
-    icon: 'icon-question-circle',
-    requiresAuth: true,
-    order: 9,
-  },
-};
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 55fc630..8284627 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -1,7 +1,6 @@
 import type { RouteRecordNormalized } from 'vue-router';
 
 const modules = import.meta.globEager('./modules/*.ts');
-const externalModules = import.meta.globEager('./externalModules/*.ts');
 
 function formatModules(_modules: any, result: RouteRecordNormalized[]) {
   Object.keys(_modules).forEach((key) => {
@@ -17,11 +16,6 @@ function formatModules(_modules: any, result: RouteRecordNormalized[]) {
 
 export const appRoutes: RouteRecordNormalized[] = formatModules(modules, []);
 
-export const appExternalRoutes: RouteRecordNormalized[] = formatModules(
-  externalModules,
-  []
-);
-
 // Avoid circular references, put here
 
 export const DEFAULT_ROUTE_NAME = 'Workplace';
diff --git a/src/router/routes/modules/system.ts b/src/router/routes/modules/system.ts
deleted file mode 100644
index 92babd4..0000000
--- a/src/router/routes/modules/system.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { AppRouteRecordRaw } from "@/router/routes/types";
-import { DEFAULT_LAYOUT } from "@/router/constants";
-
-const SYSTEM: AppRouteRecordRaw = {
-  path: '/system',
-  name: 'system',
-  component: DEFAULT_LAYOUT,
-  children: [
-    {
-      path: 'user',
-      name: 'user',
-      component: '@/views/system/user/index.vue',
-    },
-    {
-      path: 'role',
-      name: 'role',
-      component: '@/views/system/roles/index.vue',
-    },
-  ],
-};
-
-export default SYSTEM
diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index f6fce9b..d17bdb5 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -5,7 +5,6 @@ import { TabBarState, TagProps } from './types';
 
 const formatTag = (route: RouteLocationNormalized): TagProps => {
   const { name, meta, fullPath, query } = route;
-  console.log('cache', meta.cache);
   return {
     title: meta.title || '',
     name: String(name),
diff --git a/src/types/modules/system.ts b/src/types/modules/system.ts
index fe3383b..6f68615 100644
--- a/src/types/modules/system.ts
+++ b/src/types/modules/system.ts
@@ -1,18 +1,10 @@
-export interface Meta {
-  title: string  // 标题
-  cache?: boolean // 缓存
-  icon?: string // 图标
-  hidden?: boolean // 是否在菜单栏中隐藏
-  open?: boolean // 是否展开菜单
-  order?: number // 排序路由菜单项。如果设置该值，值越高，越靠前
-  affix?: boolean // 如果设置为false，标签将不会添加到tab-bar中
-}
+import type { RouteMeta } from "vue-router";
 
 export interface Menu {
   path: string
   name: string
   component?: string
-  meta?: Meta
+  meta?: RouteMeta
   redirect?: string
   children?: Menu[]
 }
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index ed3542a..c09ecff 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,19 +1,26 @@
 import type { Menu } from "@/types/modules/system";
-import { AppRouteRecordRaw } from "@/router/routes/types";
+import type { AppRouteRecordRaw } from "@/router/routes/types";
+import { regexUrl } from "@/utils/index";
+
+const layouts = import.meta.glob('/src/layout/*.vue')
+const views = import.meta.glob('/src/views/**/index.vue')
+const modules = {
+  ...layouts,
+  ...views
+}
 
 // eslint-disable-next-line import/prefer-default-export
 export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
   const { name, path, component, children, redirect, meta } = menu
-  const route: AppRouteRecordRaw = {
+  // @ts-ignore
+  const { title, cache, hidden, order, icon, affix } = meta
+  return {
     redirect,
     name,
     path,
-    component: component? () => import(component.replace("@/", "/src/")): undefined,
-    children: children && children.length? children.map(buildVueRouter): undefined
-  }
-  if (meta) {
-    const { title, cache, hidden, order, icon, affix } = meta
-    route.meta = {
+    component: modules[`/src${component}`],
+    children: children?.map(buildVueRouter)?.filter(Boolean),
+    meta: {
       title,
       icon,
       cache,
@@ -22,7 +29,6 @@ export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
       affix
     }
   }
-  return route
 }
 
 
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index a430b00..1a8865b 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -69,9 +69,10 @@
   import { Message } from '@arco-design/web-vue';
   import { ValidatedError } from '@arco-design/web-vue/es/form/interface';
   import { useStorage } from '@vueuse/core';
-  import { useUserStore } from '@/store';
+  import { useUserStore } from "@/store";
   import useLoading from '@/hooks/loading';
   import type { LoginData } from '@/api/user';
+  import { DEFAULT_ROUTE_NAME } from "@/router/routes";
 
   const router = useRouter();
   const errorMessage = ref('');
@@ -101,7 +102,7 @@
         await userStore.login(values as LoginData);
         const { redirect, ...othersQuery } = router.currentRoute.value.query;
         router.push({
-          name: (redirect as string) || 'Workplace',
+          name: (redirect as string) || DEFAULT_ROUTE_NAME,
           query: {
             ...othersQuery,
           },
-- 
Gitee


From c67648ccfa208bddf99983747fad7868a6849266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 12 Oct 2022 17:46:00 +0800
Subject: [PATCH 3/9] :art: code format

---
 src/mock/user.ts                        | 2 +-
 src/router/routes/modules/dashboard.ts  | 5 ++---
 src/utils/menu.ts                       | 1 -
 src/views/dashboard/workplace/index.vue | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mock/user.ts b/src/mock/user.ts
index ddc8041..b1d2bd1 100644
--- a/src/mock/user.ts
+++ b/src/mock/user.ts
@@ -72,7 +72,7 @@ setupMock({
       const menuList = [
         {
           path: '/dashboard',
-          name: 'dashboard',
+          name: 'Dashboard',
           component: '/layout/default-layout.vue',
           meta: {
             title: '仪表盘',
diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts
index 4afe6ca..0bfefe3 100644
--- a/src/router/routes/modules/dashboard.ts
+++ b/src/router/routes/modules/dashboard.ts
@@ -3,12 +3,11 @@ import { AppRouteRecordRaw } from '../types';
 
 const DASHBOARD: AppRouteRecordRaw = {
   path: '/dashboard',
-  name: 'dashboard',
+  name: 'Dashboard',
   component: DEFAULT_LAYOUT,
   redirect: '/dashboard/workplace',
   meta: {
     title: '仪表盘',
-    requiresAuth: true,
     icon: 'icon-dashboard',
     order: 0,
   },
@@ -19,7 +18,7 @@ const DASHBOARD: AppRouteRecordRaw = {
       component: () => import('@/views/dashboard/workplace/index.vue'),
       meta: {
         title: '工作台',
-        requiresAuth: true,
+        cache: true
       },
     },
   ],
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index c09ecff..ee425fd 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,6 +1,5 @@
 import type { Menu } from "@/types/modules/system";
 import type { AppRouteRecordRaw } from "@/router/routes/types";
-import { regexUrl } from "@/utils/index";
 
 const layouts = import.meta.glob('/src/layout/*.vue')
 const views = import.meta.glob('/src/views/**/index.vue')
diff --git a/src/views/dashboard/workplace/index.vue b/src/views/dashboard/workplace/index.vue
index abd3184..23b819c 100644
--- a/src/views/dashboard/workplace/index.vue
+++ b/src/views/dashboard/workplace/index.vue
@@ -57,7 +57,7 @@
 
 <script lang="ts">
   export default {
-    name: 'Dashboard', // If you want the include property of keep-alive to take effect, you must name the component
+    name: 'Workplace', // If you want the include property of keep-alive to take effect, you must name the component
   };
 </script>
 
-- 
Gitee


From 575525621aab1d7e1873d4e679352bfd2a2b4aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 12 Oct 2022 18:02:43 +0800
Subject: [PATCH 4/9] =?UTF-8?q?:bug:=20=E5=A4=96=E9=93=BE=E9=9D=9E?=
 =?UTF-8?q?=E6=B3=95=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mock/user.ts               | 9 +++++++++
 src/router/guard/permission.ts | 3 ++-
 src/utils/menu.ts              | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/mock/user.ts b/src/mock/user.ts
index b1d2bd1..f58e3dd 100644
--- a/src/mock/user.ts
+++ b/src/mock/user.ts
@@ -125,6 +125,15 @@ setupMock({
             },
           ],
         },
+        {
+          name: 'Arco Design',
+          path: 'https://arco.design/vue/docs/start',
+          meta: {
+            title: '组件文档',
+            icon: 'icon-link',
+            order: 100
+          }
+        }
       ];
       return successResponseWrap(menuList);
     });
diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts
index e67bd86..96afa24 100644
--- a/src/router/guard/permission.ts
+++ b/src/router/guard/permission.ts
@@ -4,6 +4,7 @@ import NProgress from 'nprogress'; // progress bar
 import usePermission from '@/hooks/permission';
 import { useUserStore, useAppStore } from '@/store';
 import { buildVueRouter } from "@/utils/menu";
+import { regexUrl } from "@/utils";
 import { appRoutes } from '../routes';
 import { WHITE_LIST, NOT_FOUND } from '../constants';
 
@@ -25,7 +26,7 @@ export default function setupPermissionGuard(router: Router) {
       ) {
         await appStore.fetchServerMenuConfig();
         // @ts-ignore
-        appStore.appAsyncMenus.map(buildVueRouter).forEach(router.addRoute)
+        appStore.appAsyncMenus.filter(route => !regexUrl.test(route.path)).map(buildVueRouter).forEach(router.addRoute)
       }
       const serverMenuConfig = [...appStore.appAsyncMenus, ...WHITE_LIST];
 
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index ee425fd..3177a17 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,5 +1,6 @@
 import type { Menu } from "@/types/modules/system";
 import type { AppRouteRecordRaw } from "@/router/routes/types";
+import { regexUrl } from "@/utils/index";
 
 const layouts = import.meta.glob('/src/layout/*.vue')
 const views = import.meta.glob('/src/views/**/index.vue')
@@ -18,7 +19,7 @@ export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
     name,
     path,
     component: modules[`/src${component}`],
-    children: children?.map(buildVueRouter)?.filter(Boolean),
+    children: children?.filter(route => !regexUrl.test(route.path))?.map(buildVueRouter),
     meta: {
       title,
       icon,
-- 
Gitee


From 2318bf58277950bed7fa4540b4dd1b02731c7bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 12 Oct 2022 21:54:28 +0800
Subject: [PATCH 5/9] =?UTF-8?q?:memo:=20=E5=BC=95=E5=85=A5pinia=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8C=81=E4=B9=85=E5=8C=96=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         | 2 ++
 package.json                       | 1 +
 src/store/index.ts                 | 9 +++++++++
 src/store/modules/tab-bar/index.ts | 1 +
 4 files changed, 13 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6a86981..d5ccaa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ dist-ssr
 .idea
 package-lock.json
 yarn.lock
+pnpm-lock.yaml
+*.log
diff --git a/package.json b/package.json
index 98c1f00..42f2cb2 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
     "pinia": "^2.0.9",
+    "pinia-plugin-persistedstate": "^2.3.0",
     "query-string": "^7.0.1",
     "vue": "^3.2.31",
     "vue-echarts": "^6.0.0",
diff --git a/src/store/index.ts b/src/store/index.ts
index 3d3035f..7a6dd48 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,9 +1,18 @@
 import { createPinia } from 'pinia';
+import { createPersistedState } from 'pinia-plugin-persistedstate'
 import useAppStore from './modules/app';
 import useUserStore from './modules/user';
 import useTabBarStore from './modules/tab-bar';
 
 const pinia = createPinia();
 
+pinia.use(createPersistedState({
+  storage: window.localStorage,
+  serializer: {
+    serialize: JSON.stringify,
+    deserialize: JSON.parse
+  }
+}))
+
 export { useAppStore, useUserStore, useTabBarStore };
 export default pinia;
diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index d17bdb5..425aeef 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -15,6 +15,7 @@ const formatTag = (route: RouteLocationNormalized): TagProps => {
 };
 
 const useAppStore = defineStore('tabBar', {
+  persist: true,
   state: (): TabBarState => ({
     cacheTabList: new Set([DEFAULT_ROUTE_NAME]),
     tagList: [DEFAULT_ROUTE],
-- 
Gitee


From 086aa24ccf781919f0ad8cf6780a19c55611f9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 12 Oct 2022 23:25:58 +0800
Subject: [PATCH 6/9] :bug:
 https://gitee.com/example-cloud/example-ui/issues/I5VETA

---
 src/store/modules/tab-bar/index.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index 425aeef..ca0f686 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -15,18 +15,21 @@ const formatTag = (route: RouteLocationNormalized): TagProps => {
 };
 
 const useAppStore = defineStore('tabBar', {
-  persist: true,
+  persist: {
+    key: 'tagList',
+    paths: ['tagList']
+  },
   state: (): TabBarState => ({
     cacheTabList: new Set([DEFAULT_ROUTE_NAME]),
     tagList: [DEFAULT_ROUTE],
   }),
 
   getters: {
-    getTabList(): TagProps[] {
-      return this.tagList;
+    getTabList(state: TabBarState): TagProps[] {
+      return state.tagList;
     },
-    getCacheList(): string[] {
-      return Array.from(this.cacheTabList);
+    getCacheList(state: TabBarState): string[] {
+      return Array.from(state.cacheTabList);
     },
   },
 
-- 
Gitee


From 0459ffa96ef9c66babf6d731a44b2effce3c8f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Thu, 13 Oct 2022 09:35:01 +0800
Subject: [PATCH 7/9] :coffin: remove dead code

---
 src/components/global-setting/block.vue |  2 +-
 src/components/global-setting/index.vue |  5 --
 src/components/menu/useMenuTree.ts      |  8 +---
 src/config/settings.json                |  1 -
 src/layout/default-layout.vue           |  8 +++-
 src/router/app-menus/index.ts           | 16 -------
 src/router/guard/permission.ts          | 63 ++++++++++---------------
 src/store/modules/app/types.ts          |  1 -
 src/views/dashboard/workplace/index.vue |  8 +---
 src/views/system/roles/index.vue        |  4 +-
 10 files changed, 38 insertions(+), 78 deletions(-)
 delete mode 100644 src/router/app-menus/index.ts

diff --git a/src/components/global-setting/block.vue b/src/components/global-setting/block.vue
index 340c6b8..b8a2bb4 100644
--- a/src/components/global-setting/block.vue
+++ b/src/components/global-setting/block.vue
@@ -44,7 +44,7 @@
     key: string;
     value: unknown;
   }) => {
-    if (key === 'menuFromServer' && value) {
+    if (value) {
       await appStore.fetchServerMenuConfig();
     }
     appStore.updateSettings({ [key]: value });
diff --git a/src/components/global-setting/index.vue b/src/components/global-setting/index.vue
index 7712bad..a887b8c 100644
--- a/src/components/global-setting/index.vue
+++ b/src/components/global-setting/index.vue
@@ -43,11 +43,6 @@
     },
     { name: '底部', key: 'footer', defaultVal: appStore.footer },
     { name: '多页签', key: 'tabBar', defaultVal: appStore.tabBar },
-    {
-      name: '菜单来源于后台',
-      key: 'menuFromServer',
-      defaultVal: appStore.menuFromServer,
-    },
     {
       name: '菜单宽度 (px)',
       key: 'menuWidth',
diff --git a/src/components/menu/useMenuTree.ts b/src/components/menu/useMenuTree.ts
index 5b95ded..7787da9 100644
--- a/src/components/menu/useMenuTree.ts
+++ b/src/components/menu/useMenuTree.ts
@@ -2,17 +2,11 @@ import { computed } from 'vue';
 import { RouteRecordRaw, RouteRecordNormalized } from 'vue-router';
 import usePermission from '@/hooks/permission';
 import { useAppStore } from '@/store';
-import appClientMenus from '@/router/app-menus';
 
 export default function useMenuTree() {
   const permission = usePermission();
   const appStore = useAppStore();
-  const appRoute = computed(() => {
-    if (appStore.menuFromServer) {
-      return appStore.appAsyncMenus;
-    }
-    return appClientMenus;
-  });
+  const appRoute = computed(() => appStore.appAsyncMenus);
   const menuTree = computed(() => {
     const copyRouter = JSON.parse(JSON.stringify(appRoute.value));
     copyRouter.sort((a: RouteRecordNormalized, b: RouteRecordNormalized) => {
diff --git a/src/config/settings.json b/src/config/settings.json
index 8ee24c3..4e16fd8 100644
--- a/src/config/settings.json
+++ b/src/config/settings.json
@@ -10,6 +10,5 @@
   "globalSettings": false,
   "device": "desktop",
   "tabBar": true,
-  "menuFromServer": true,
   "serverMenu": []
 }
diff --git a/src/layout/default-layout.vue b/src/layout/default-layout.vue
index 7f5888f..eafdb6c 100644
--- a/src/layout/default-layout.vue
+++ b/src/layout/default-layout.vue
@@ -34,7 +34,7 @@
         </a-drawer>
         <a-layout class="layout-content" :style="paddingStyle">
           <TabBar v-if="appStore.tabBar" />
-          <a-layout-content>
+          <a-layout-content class="container">
             <PageLayout />
           </a-layout-content>
           <Footer v-if="footer" />
@@ -104,6 +104,12 @@
   @nav-size-height: 60px;
   @layout-max-width: 1100px;
 
+  .container {
+    background-color: var(--color-fill-2);
+    padding: 16px 20px 0;
+    display: flex;
+  }
+
   .layout {
     width: 100%;
     height: 100%;
diff --git a/src/router/app-menus/index.ts b/src/router/app-menus/index.ts
deleted file mode 100644
index 7ec037f..0000000
--- a/src/router/app-menus/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { appRoutes } from '../routes';
-
-const mixinRoutes = [...appRoutes ];
-
-const appClientMenus = mixinRoutes.map((el) => {
-  const { name, path, meta, redirect, children } = el;
-  return {
-    name,
-    path,
-    meta,
-    redirect,
-    children,
-  };
-});
-
-export default appClientMenus;
diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts
index 96afa24..422b519 100644
--- a/src/router/guard/permission.ts
+++ b/src/router/guard/permission.ts
@@ -2,58 +2,45 @@ import type { Router } from 'vue-router';
 import NProgress from 'nprogress'; // progress bar
 
 import usePermission from '@/hooks/permission';
-import { useUserStore, useAppStore } from '@/store';
+import { useAppStore } from '@/store';
 import { buildVueRouter } from "@/utils/menu";
 import { regexUrl } from "@/utils";
-import { appRoutes } from '../routes';
 import { WHITE_LIST, NOT_FOUND } from '../constants';
 
 export default function setupPermissionGuard(router: Router) {
   router.beforeEach(async (to, from, next) => {
     const appStore = useAppStore();
-    const userStore = useUserStore();
     const Permission = usePermission();
     const permissionsAllow = Permission.accessRouter(to);
-    if (appStore.menuFromServer) {
-      // 针对来自服务端的菜单配置进行处理
-      // Handle routing configuration from the server
+    // 针对来自服务端的菜单配置进行处理
+    // Handle routing configuration from the server
 
-      // 根据需要自行完善来源于服务端的菜单配置的permission逻辑
-      // Refine the permission logic from the server's menu configuration as needed
-      if (
-        !appStore.appAsyncMenus.length &&
-        !WHITE_LIST.find((el) => el.name === to.name)
-      ) {
-        await appStore.fetchServerMenuConfig();
-        // @ts-ignore
-        appStore.appAsyncMenus.filter(route => !regexUrl.test(route.path)).map(buildVueRouter).forEach(router.addRoute)
-      }
-      const serverMenuConfig = [...appStore.appAsyncMenus, ...WHITE_LIST];
+    // 根据需要自行完善来源于服务端的菜单配置的permission逻辑
+    // Refine the permission logic from the server's menu configuration as needed
+    if (
+      !appStore.appAsyncMenus.length &&
+      !WHITE_LIST.find((el) => el.name === to.name)
+    ) {
+      await appStore.fetchServerMenuConfig();
+      // @ts-ignore
+      appStore.appAsyncMenus.filter(route => !regexUrl.test(route.path)).map(buildVueRouter).forEach(router.addRoute)
+    }
+    const serverMenuConfig = [...appStore.appAsyncMenus, ...WHITE_LIST];
 
-      let exist = false;
-      while (serverMenuConfig.length && !exist) {
-        const element = serverMenuConfig.shift();
-        if (element?.name === to.name) exist = true;
+    let exist = false;
+    while (serverMenuConfig.length && !exist) {
+      const element = serverMenuConfig.shift();
+      if (element?.name === to.name) exist = true;
 
-        if (element?.children) {
-          serverMenuConfig.push(
-            ...element.children
-          );
-        }
-      }
-      if (exist && permissionsAllow) {
-        next();
-      } else next(NOT_FOUND);
-    } else {
-      // eslint-disable-next-line no-lonely-if
-      if (permissionsAllow) next();
-      else {
-        const destination =
-          Permission.findFirstPermissionRoute(appRoutes, userStore.role) ||
-          NOT_FOUND;
-        next(destination);
+      if (element?.children) {
+        serverMenuConfig.push(
+          ...element.children
+        );
       }
     }
+    if (exist && permissionsAllow) {
+      next();
+    } else next(NOT_FOUND);
     NProgress.done();
   });
 }
diff --git a/src/store/modules/app/types.ts b/src/store/modules/app/types.ts
index fc11d64..3924039 100644
--- a/src/store/modules/app/types.ts
+++ b/src/store/modules/app/types.ts
@@ -12,7 +12,6 @@ export interface AppState {
   globalSettings: boolean;
   device: string;
   tabBar: boolean;
-  menuFromServer: boolean;
   serverMenu: Menu[];
   [key: string]: unknown;
 }
diff --git a/src/views/dashboard/workplace/index.vue b/src/views/dashboard/workplace/index.vue
index 23b819c..5d2246f 100644
--- a/src/views/dashboard/workplace/index.vue
+++ b/src/views/dashboard/workplace/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div>
     <div class="left-side">
       <div class="panel">
       <input type="text">
@@ -62,12 +62,6 @@
 </script>
 
 <style lang="less" scoped>
-  .container {
-    background-color: var(--color-fill-2);
-    padding: 16px 20px;
-    padding-bottom: 0;
-    display: flex;
-  }
 
   .left-side {
     flex: 1;
diff --git a/src/views/system/roles/index.vue b/src/views/system/roles/index.vue
index 7c8ddea..026ecd2 100644
--- a/src/views/system/roles/index.vue
+++ b/src/views/system/roles/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <input type="text">
+  <div>
+    <input type="text">
+  </div>
 </template>
 
 <script lang="ts">
-- 
Gitee


From 045a87317b031c0731183c00525769267f50f6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Thu, 13 Oct 2022 16:20:28 +0800
Subject: [PATCH 8/9] =?UTF-8?q?:bug:=20=E5=88=B7=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A4=9A=E7=AD=BE=E9=A1=B5=E7=BC=93=E5=AD=98=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/tab-bar/index.ts | 20 ++++++++++----------
 src/store/modules/tab-bar/types.ts |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index ca0f686..027a962 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -16,11 +16,11 @@ const formatTag = (route: RouteLocationNormalized): TagProps => {
 
 const useAppStore = defineStore('tabBar', {
   persist: {
-    key: 'tagList',
-    paths: ['tagList']
+    key: 'tabBar',
+    paths: ['cacheTabList', 'tagList'],
   },
   state: (): TabBarState => ({
-    cacheTabList: new Set([DEFAULT_ROUTE_NAME]),
+    cacheTabList: [DEFAULT_ROUTE_NAME],
     tagList: [DEFAULT_ROUTE],
   }),
 
@@ -36,27 +36,27 @@ const useAppStore = defineStore('tabBar', {
   actions: {
     updateTabList(route: RouteLocationNormalized) {
       this.tagList.push(formatTag(route));
-      if (route.meta.cache) {
-        this.cacheTabList.add(route.name as string);
+      if (route.meta.cache && !this.cacheTabList.includes(route.name as string)) {
+        this.cacheTabList.push(route.name as string);
       }
     },
     deleteTag(idx: number, tag: TagProps) {
       this.tagList.splice(idx, 1);
-      this.cacheTabList.delete(tag.name);
+      this.cacheTabList = this.cacheTabList.filter(name => name !== tag.name)
     },
     freshTabList(tags: TagProps[]) {
       this.tagList = tags;
-      this.cacheTabList.clear();
+      this.cacheTabList = [];
       // 要先判断cache
       this.tagList
         .filter((el) => el.cache)
         .map((el) => el.name)
-        .forEach((x) => this.cacheTabList.add(x));
+        .forEach((x) => this.cacheTabList.push(x));
     },
     resetTabList() {
       this.tagList = [DEFAULT_ROUTE];
-      this.cacheTabList.clear();
-      this.cacheTabList.add(DEFAULT_ROUTE_NAME);
+      this.cacheTabList = [];
+      this.cacheTabList.push(DEFAULT_ROUTE_NAME);
     },
   },
 });
diff --git a/src/store/modules/tab-bar/types.ts b/src/store/modules/tab-bar/types.ts
index eeb8c90..5f4284c 100644
--- a/src/store/modules/tab-bar/types.ts
+++ b/src/store/modules/tab-bar/types.ts
@@ -8,5 +8,5 @@ export interface TagProps {
 
 export interface TabBarState {
   tagList: TagProps[];
-  cacheTabList: Set<string>;
+  cacheTabList: string[];
 }
-- 
Gitee


From ee925d89685ed9c6fe934633ecdb3303c40ab746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Thu, 13 Oct 2022 17:49:48 +0800
Subject: [PATCH 9/9] =?UTF-8?q?:bug:=20=E5=88=B7=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=20:beers:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                              |  2 ++
 src/components/tab-bar/tab-item.vue       |  2 +-
 src/mock/user.ts                          |  6 ++---
 src/router/constants.ts                   | 10 +++++++--
 src/router/guard/permission.ts            |  3 +--
 src/router/index.ts                       | 18 +++++++++++++--
 src/router/routes/index.ts                | 27 -----------------------
 src/router/routes/modules/dashboard.ts    | 27 -----------------------
 src/router/{routes => }/types.ts          |  0
 src/store/modules/tab-bar/index.ts        |  2 +-
 src/utils/menu.ts                         | 10 +++++----
 src/views/login/components/login-form.vue |  2 +-
 12 files changed, 39 insertions(+), 70 deletions(-)
 delete mode 100644 src/router/routes/index.ts
 delete mode 100644 src/router/routes/modules/dashboard.ts
 rename src/router/{routes => }/types.ts (100%)

diff --git a/.eslintrc.js b/.eslintrc.js
index 839eaf0..e1aa19e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -66,5 +66,7 @@ module.exports = {
     'no-param-reassign': 0,
     'prefer-regex-literals': 0,
     'import/no-extraneous-dependencies': 0,
+    'no-underscore-dangle': 0,
+    'import/no-cycle': 1,
   },
 };
diff --git a/src/components/tab-bar/tab-item.vue b/src/components/tab-bar/tab-item.vue
index bc4e492..fc67b75 100644
--- a/src/components/tab-bar/tab-item.vue
+++ b/src/components/tab-bar/tab-item.vue
@@ -45,7 +45,7 @@
   import { useRouter, useRoute } from 'vue-router';
   import { useTabBarStore } from '@/store';
   import type { TagProps } from '@/store/modules/tab-bar/types';
-  import { DEFAULT_ROUTE_NAME } from '@/router/routes';
+  import { DEFAULT_ROUTE_NAME } from '@/router/constants';
 
   // eslint-disable-next-line no-shadow
   enum Eaction {
diff --git a/src/mock/user.ts b/src/mock/user.ts
index f58e3dd..73a9553 100644
--- a/src/mock/user.ts
+++ b/src/mock/user.ts
@@ -18,7 +18,7 @@ setupMock({
         return successResponseWrap({
           name: '王令',
           avatar:
-            '//lf1-xgcdn-tos.pstatp.com/obj/vcloud/vadmin/start.8e0e4855ee346a46ccff8ff3e24db27b.png',
+            'https://portrait.gitee.com/uploads/avatars/user/2548/7645447_wl2603820757_1615284108.png',
           email: 'wangliqun@email.com',
           job: 'frontend',
           jobName: '前端艺术家',
@@ -109,7 +109,7 @@ setupMock({
               component: '/views/system/user/index.vue',
               meta: {
                 title: '用户管理',
-                cache: true,
+                cache: false,
                 affix: true,
               },
             },
@@ -119,7 +119,7 @@ setupMock({
               component: '/views/system/roles/index.vue',
               meta: {
                 title: '角色管理',
-                cache: false,
+                cache: true,
                 affix: true,
               },
             },
diff --git a/src/router/constants.ts b/src/router/constants.ts
index 7c33ca4..1292fc9 100644
--- a/src/router/constants.ts
+++ b/src/router/constants.ts
@@ -1,5 +1,3 @@
-export const DEFAULT_LAYOUT = () => import('@/layout/default-layout.vue');
-
 export const WHITE_LIST = [
   { name: 'notFound', children: [] },
   { name: 'login', children: [] },
@@ -8,3 +6,11 @@ export const WHITE_LIST = [
 export const NOT_FOUND = {
   name: 'notFound',
 };
+
+export const DEFAULT_ROUTE_NAME = 'Workplace';
+
+export const DEFAULT_ROUTE = {
+  title: '工作台',
+  name: DEFAULT_ROUTE_NAME,
+  fullPath: '/dashboard/workplace',
+};
diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts
index 422b519..015e547 100644
--- a/src/router/guard/permission.ts
+++ b/src/router/guard/permission.ts
@@ -4,7 +4,6 @@ import NProgress from 'nprogress'; // progress bar
 import usePermission from '@/hooks/permission';
 import { useAppStore } from '@/store';
 import { buildVueRouter } from "@/utils/menu";
-import { regexUrl } from "@/utils";
 import { WHITE_LIST, NOT_FOUND } from '../constants';
 
 export default function setupPermissionGuard(router: Router) {
@@ -23,7 +22,7 @@ export default function setupPermissionGuard(router: Router) {
     ) {
       await appStore.fetchServerMenuConfig();
       // @ts-ignore
-      appStore.appAsyncMenus.filter(route => !regexUrl.test(route.path)).map(buildVueRouter).forEach(router.addRoute)
+      buildVueRouter(appStore.appAsyncMenus).forEach(router.addRoute)
     }
     const serverMenuConfig = [...appStore.appAsyncMenus, ...WHITE_LIST];
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 0522764..f37cdeb 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,8 +2,10 @@ import { createRouter, createWebHistory } from 'vue-router';
 import NProgress from 'nprogress'; // progress bar
 import 'nprogress/nprogress.css';
 
-import { appRoutes, DEFAULT_ROUTE } from "./routes";
+import { useAppStore } from "@/store";
+import { buildVueRouter } from "@/utils/menu";
 import createRouteGuard from './guard';
+import { DEFAULT_ROUTE } from "./constants";
 
 NProgress.configure({ showSpinner: false }); // NProgress Configuration
 
@@ -22,10 +24,22 @@ const router = createRouter({
         requiresAuth: false,
       },
     },
-    ...appRoutes,
     {
       path: '/:pathMatch(.*)*',
       name: 'notFound',
+      beforeEnter: async (to) => {
+        const appStore = useAppStore();
+        if (
+          !appStore.appAsyncMenus.length
+        ) {
+          await appStore.fetchServerMenuConfig();
+          // @ts-ignore
+          buildVueRouter(appStore.appAsyncMenus).forEach(router.addRoute)
+          await router.push({
+            path: to.fullPath
+          })
+        }
+      },
       component: () => import('@/views/not-found/index.vue'),
     },
   ],
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
deleted file mode 100644
index 8284627..0000000
--- a/src/router/routes/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { RouteRecordNormalized } from 'vue-router';
-
-const modules = import.meta.globEager('./modules/*.ts');
-
-function formatModules(_modules: any, result: RouteRecordNormalized[]) {
-  Object.keys(_modules).forEach((key) => {
-    const defaultModule = _modules[key].default;
-    if (!defaultModule) return;
-    const moduleList = Array.isArray(defaultModule)
-      ? [...defaultModule]
-      : [defaultModule];
-    result.push(...moduleList);
-  });
-  return result;
-}
-
-export const appRoutes: RouteRecordNormalized[] = formatModules(modules, []);
-
-// Avoid circular references, put here
-
-export const DEFAULT_ROUTE_NAME = 'Workplace';
-
-export const DEFAULT_ROUTE = {
-  title: '工作台',
-  name: DEFAULT_ROUTE_NAME,
-  fullPath: '/dashboard/workplace',
-};
diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts
deleted file mode 100644
index 0bfefe3..0000000
--- a/src/router/routes/modules/dashboard.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { DEFAULT_LAYOUT } from '@/router/constants';
-import { AppRouteRecordRaw } from '../types';
-
-const DASHBOARD: AppRouteRecordRaw = {
-  path: '/dashboard',
-  name: 'Dashboard',
-  component: DEFAULT_LAYOUT,
-  redirect: '/dashboard/workplace',
-  meta: {
-    title: '仪表盘',
-    icon: 'icon-dashboard',
-    order: 0,
-  },
-  children: [
-    {
-      path: 'workplace',
-      name: 'Workplace',
-      component: () => import('@/views/dashboard/workplace/index.vue'),
-      meta: {
-        title: '工作台',
-        cache: true
-      },
-    },
-  ],
-};
-
-export default DASHBOARD;
diff --git a/src/router/routes/types.ts b/src/router/types.ts
similarity index 100%
rename from src/router/routes/types.ts
rename to src/router/types.ts
diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index 027a962..8b4775a 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -1,6 +1,6 @@
 import type { RouteLocationNormalized } from 'vue-router';
 import { defineStore } from 'pinia';
-import { DEFAULT_ROUTE, DEFAULT_ROUTE_NAME } from '@/router/routes/index';
+import { DEFAULT_ROUTE, DEFAULT_ROUTE_NAME } from '@/router/constants';
 import { TabBarState, TagProps } from './types';
 
 const formatTag = (route: RouteLocationNormalized): TagProps => {
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 3177a17..82ddc41 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,5 +1,5 @@
 import type { Menu } from "@/types/modules/system";
-import type { AppRouteRecordRaw } from "@/router/routes/types";
+import type { AppRouteRecordRaw } from "@/router/types";
 import { regexUrl } from "@/utils/index";
 
 const layouts = import.meta.glob('/src/layout/*.vue')
@@ -9,8 +9,7 @@ const modules = {
   ...views
 }
 
-// eslint-disable-next-line import/prefer-default-export
-export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
+const _buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
   const { name, path, component, children, redirect, meta } = menu
   // @ts-ignore
   const { title, cache, hidden, order, icon, affix } = meta
@@ -19,7 +18,7 @@ export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
     name,
     path,
     component: modules[`/src${component}`],
-    children: children?.filter(route => !regexUrl.test(route.path))?.map(buildVueRouter),
+    children: children?.filter(route => !regexUrl.test(route.path))?.map(_buildVueRouter),
     meta: {
       title,
       icon,
@@ -30,6 +29,9 @@ export const buildVueRouter = (menu: Menu): AppRouteRecordRaw => {
     }
   }
 }
+// eslint-disable-next-line import/prefer-default-export
+export const buildVueRouter  = (menus: Menu[]): AppRouteRecordRaw[] => menus.filter(menu => !regexUrl.test(menu.path)).map(_buildVueRouter)
+
 
 
 
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index 1a8865b..5ce26c5 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -72,7 +72,7 @@
   import { useUserStore } from "@/store";
   import useLoading from '@/hooks/loading';
   import type { LoginData } from '@/api/user';
-  import { DEFAULT_ROUTE_NAME } from "@/router/routes";
+  import { DEFAULT_ROUTE_NAME } from "@/router/constants";
 
   const router = useRouter();
   const errorMessage = ref('');
-- 
Gitee