Commit fc4666ef41b51aae44cc865b43826eb9c06d86ce

Authored by vben
1 parent cb1ae34f

chore: route structure adjustment

src/layouts/default/multitabs/index.tsx
@@ -43,7 +43,6 @@ export default defineComponent({ @@ -43,7 +43,6 @@ export default defineComponent({
43 } 43 }
44 44
45 const lastChangeRoute = unref(tabStore.getLastChangeRouteState); 45 const lastChangeRoute = unref(tabStore.getLastChangeRouteState);
46 -  
47 if (!lastChangeRoute || !userStore.getTokenState) return; 46 if (!lastChangeRoute || !userStore.getTokenState) return;
48 47
49 const { path, fullPath } = lastChangeRoute; 48 const { path, fullPath } = lastChangeRoute;
src/router/routes/modules/dashboard.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const dashboard: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/dashboard', 7 path: '/dashboard',
8 name: 'Dashboard', 8 name: 'Dashboard',
@@ -41,4 +41,6 @@ export default { @@ -41,4 +41,6 @@ export default {
41 }, 41 },
42 }, 42 },
43 ], 43 ],
44 -} as AppRouteModule; 44 +};
  45 +
  46 +export default dashboard;
src/router/routes/modules/demo/charts.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const charts: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/charts', 7 path: '/charts',
8 name: 'Charts', 8 name: 'Charts',
@@ -57,4 +57,6 @@ export default { @@ -57,4 +57,6 @@ export default {
57 component: () => import('/@/views/demo/echarts/apex/index.vue'), 57 component: () => import('/@/views/demo/echarts/apex/index.vue'),
58 }, 58 },
59 ], 59 ],
60 -} as AppRouteModule; 60 +};
  61 +
  62 +export default charts;
src/router/routes/modules/demo/comp.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const comp: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/comp', 7 path: '/comp',
8 name: 'Comp', 8 name: 'Comp',
@@ -179,4 +179,6 @@ export default { @@ -179,4 +179,6 @@ export default {
179 }, 179 },
180 }, 180 },
181 ], 181 ],
182 -} as AppRouteModule; 182 +};
  183 +
  184 +export default comp;
src/router/routes/modules/demo/editor.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const editor: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/editor', 7 path: '/editor',
8 name: 'Editor', 8 name: 'Editor',
@@ -51,4 +51,6 @@ export default { @@ -51,4 +51,6 @@ export default {
51 ], 51 ],
52 }, 52 },
53 ], 53 ],
54 -} as AppRouteModule; 54 +};
  55 +
  56 +export default editor;
src/router/routes/modules/demo/excel.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const excel: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/excel', 7 path: '/excel',
8 name: 'Excel', 8 name: 'Excel',
@@ -48,4 +48,6 @@ export default { @@ -48,4 +48,6 @@ export default {
48 }, 48 },
49 }, 49 },
50 ], 50 ],
51 -} as AppRouteModule; 51 +};
  52 +
  53 +export default excel;
src/router/routes/modules/demo/feat.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const feat: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/feat', 7 path: '/feat',
8 name: 'FeatDemo', 8 name: 'FeatDemo',
@@ -114,4 +114,6 @@ export default { @@ -114,4 +114,6 @@ export default {
114 }, 114 },
115 }, 115 },
116 ], 116 ],
117 -} as AppRouteModule; 117 +};
  118 +
  119 +export default feat;
src/router/routes/modules/demo/form.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const form: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/form', 7 path: '/form',
8 name: 'FormDemo', 8 name: 'FormDemo',
@@ -72,4 +72,5 @@ export default { @@ -72,4 +72,5 @@ export default {
72 }, 72 },
73 }, 73 },
74 ], 74 ],
75 -} as AppRouteModule; 75 +};
  76 +export default form;
src/router/routes/modules/demo/iframe.ts
@@ -3,7 +3,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -3,7 +3,7 @@ import type { AppRouteModule } from '/@/router/types';
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 const IFrame = () => import('/@/views/sys/iframe/FrameBlank.vue'); 4 const IFrame = () => import('/@/views/sys/iframe/FrameBlank.vue');
5 5
6 -export default { 6 +const iframe: AppRouteModule = {
7 layout: { 7 layout: {
8 path: '/frame', 8 path: '/frame',
9 name: 'Frame', 9 name: 'Frame',
@@ -46,4 +46,6 @@ export default { @@ -46,4 +46,6 @@ export default {
46 }, 46 },
47 }, 47 },
48 ], 48 ],
49 -} as AppRouteModule; 49 +};
  50 +
  51 +export default iframe;
src/router/routes/modules/demo/page.ts
@@ -5,7 +5,7 @@ import { ExceptionEnum } from '/@/enums/exceptionEnum'; @@ -5,7 +5,7 @@ import { ExceptionEnum } from '/@/enums/exceptionEnum';
5 5
6 const ExceptionPage = () => import('/@/views/sys/exception/Exception'); 6 const ExceptionPage = () => import('/@/views/sys/exception/Exception');
7 7
8 -export default { 8 +const page: AppRouteModule = {
9 path: '/page-demo', 9 path: '/page-demo',
10 name: 'PageDemo', 10 name: 'PageDemo',
11 component: PAGE_LAYOUT_COMPONENT, 11 component: PAGE_LAYOUT_COMPONENT,
@@ -117,4 +117,6 @@ export default { @@ -117,4 +117,6 @@ export default {
117 }, 117 },
118 // =============================exception end============================= 118 // =============================exception end=============================
119 ], 119 ],
120 -} as AppRouteModule; 120 +};
  121 +
  122 +export default page;
src/router/routes/modules/demo/permission.ts
@@ -3,7 +3,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -3,7 +3,7 @@ import type { AppRouteModule } from '/@/router/types';
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 import { RoleEnum } from '/@/enums/roleEnum'; 4 import { RoleEnum } from '/@/enums/roleEnum';
5 5
6 -export default { 6 +const permission: AppRouteModule = {
7 layout: { 7 layout: {
8 path: '/permission', 8 path: '/permission',
9 name: 'Permission', 9 name: 'Permission',
@@ -25,6 +25,7 @@ export default { @@ -25,6 +25,7 @@ export default {
25 children: [ 25 children: [
26 { 26 {
27 path: 'page', 27 path: 'page',
  28 + name: 'FrontPageAuth',
28 component: () => import('/@/views/demo/permission/front/index.vue'), 29 component: () => import('/@/views/demo/permission/front/index.vue'),
29 meta: { 30 meta: {
30 title: '页面权限', 31 title: '页面权限',
@@ -32,6 +33,7 @@ export default { @@ -32,6 +33,7 @@ export default {
32 }, 33 },
33 { 34 {
34 path: 'btn', 35 path: 'btn',
  36 + name: 'FrontBtnAuth',
35 component: () => import('/@/views/demo/permission/front/Btn.vue'), 37 component: () => import('/@/views/demo/permission/front/Btn.vue'),
36 meta: { 38 meta: {
37 title: '按钮权限', 39 title: '按钮权限',
@@ -39,6 +41,7 @@ export default { @@ -39,6 +41,7 @@ export default {
39 }, 41 },
40 { 42 {
41 path: 'auth-pageA', 43 path: 'auth-pageA',
  44 + name: 'FrontAuthPageA',
42 component: () => import('/@/views/demo/permission/front/AuthPageA.vue'), 45 component: () => import('/@/views/demo/permission/front/AuthPageA.vue'),
43 meta: { 46 meta: {
44 title: '权限测试页A', 47 title: '权限测试页A',
@@ -47,6 +50,7 @@ export default { @@ -47,6 +50,7 @@ export default {
47 }, 50 },
48 { 51 {
49 path: 'auth-pageB', 52 path: 'auth-pageB',
  53 + name: 'FrontAuthPageB',
50 component: () => import('/@/views/demo/permission/front/AuthPageB.vue'), 54 component: () => import('/@/views/demo/permission/front/AuthPageB.vue'),
51 meta: { 55 meta: {
52 title: '权限测试页B', 56 title: '权限测试页B',
@@ -64,6 +68,7 @@ export default { @@ -64,6 +68,7 @@ export default {
64 children: [ 68 children: [
65 { 69 {
66 path: 'page', 70 path: 'page',
  71 + name: 'BackAuthPage',
67 component: () => import('/@/views/demo/permission/back/index.vue'), 72 component: () => import('/@/views/demo/permission/back/index.vue'),
68 meta: { 73 meta: {
69 title: '页面权限', 74 title: '页面权限',
@@ -71,6 +76,7 @@ export default { @@ -71,6 +76,7 @@ export default {
71 }, 76 },
72 { 77 {
73 path: 'btn', 78 path: 'btn',
  79 + name: 'BackAuthBtn',
74 component: () => import('/@/views/demo/permission/back/Btn.vue'), 80 component: () => import('/@/views/demo/permission/back/Btn.vue'),
75 meta: { 81 meta: {
76 title: '按钮权限', 82 title: '按钮权限',
@@ -79,4 +85,6 @@ export default { @@ -79,4 +85,6 @@ export default {
79 ], 85 ],
80 }, 86 },
81 ], 87 ],
82 -} as AppRouteModule; 88 +};
  89 +
  90 +export default permission;
src/router/routes/modules/demo/table.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const table: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/table', 7 path: '/table',
8 name: 'TableDemo', 8 name: 'TableDemo',
@@ -128,4 +128,6 @@ export default { @@ -128,4 +128,6 @@ export default {
128 }, 128 },
129 }, 129 },
130 ], 130 ],
131 -} as AppRouteModule; 131 +};
  132 +
  133 +export default table;
src/router/routes/modules/demo/tree.ts
@@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types'; @@ -2,7 +2,7 @@ import type { AppRouteModule } from '/@/router/types';
2 2
3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant'; 3 import { PAGE_LAYOUT_COMPONENT } from '/@/router/constant';
4 4
5 -export default { 5 +const tree: AppRouteModule = {
6 layout: { 6 layout: {
7 path: '/tree', 7 path: '/tree',
8 name: 'TreeDemo', 8 name: 'TreeDemo',
@@ -39,4 +39,6 @@ export default { @@ -39,4 +39,6 @@ export default {
39 }, 39 },
40 }, 40 },
41 ], 41 ],
42 -} as AppRouteModule; 42 +};
  43 +
  44 +export default tree;
src/router/types.d.ts
@@ -36,6 +36,7 @@ export interface RouteMeta { @@ -36,6 +36,7 @@ export interface RouteMeta {
36 } 36 }
37 37
38 export interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> { 38 export interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
  39 + name: string;
39 meta: RouteMeta; 40 meta: RouteMeta;
40 component?: any; 41 component?: any;
41 components?: any; 42 components?: any;