From fd01b5a61f1a92db90c00e7bb1b4162a2b61bfa3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 04 十二月 2024 11:42:07 +0800
Subject: [PATCH] update 优化 白名单支持对通配符路径匹配
---
src/router/index.ts | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 33e3e5e..c5b472f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createWebHistory, createRouter, RouteOption } from 'vue-router';
+import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
/* Layout */
import Layout from '@/layout/index.vue';
@@ -25,7 +25,7 @@
*/
// 鍏叡璺敱
-export const constantRoutes: RouteOption[] = [
+export const constantRoutes: RouteRecordRaw[] = [
{
path: '/redirect',
component: Layout,
@@ -38,9 +38,9 @@
]
},
{
- path: '/social-login',
+ path: '/social-callback',
hidden: true,
- component: () => import('@/layout/components/socialLogin/index.vue')
+ component: () => import('@/layout/components/SocialCallback/index.vue')
},
{
path: '/login',
@@ -92,7 +92,7 @@
];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
-export const dynamicRoutes: RouteOption[] = [
+export const dynamicRoutes: RouteRecordRaw[] = [
{
path: '/system/user-auth',
component: Layout,
@@ -103,7 +103,7 @@
path: 'role/:userId(\\d+)',
component: () => import('@/views/system/user/authRole.vue'),
name: 'AuthRole',
- meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user', icon: '' }
+ meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user', icon: '', noCache: true }
}
]
},
@@ -117,7 +117,7 @@
path: 'user/:roleId(\\d+)',
component: () => import('@/views/system/role/authUser.vue'),
name: 'AuthUser',
- meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role', icon: '' }
+ meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role', icon: '', noCache: true }
}
]
},
@@ -131,7 +131,7 @@
path: 'index/:dictId(\\d+)',
component: () => import('@/views/system/dict/data.vue'),
name: 'Data',
- meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict', icon: '' }
+ meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict', icon: '', noCache: true }
}
]
},
@@ -139,13 +139,13 @@
path: '/system/oss-config',
component: Layout,
hidden: true,
- permissions: ['system:oss:list'],
+ permissions: ['system:ossConfig:list'],
children: [
{
path: 'index',
component: () => import('@/views/system/oss/config.vue'),
name: 'OssConfig',
- meta: { title: '閰嶇疆绠$悊', activeMenu: '/system/oss', icon: '' }
+ meta: { title: '閰嶇疆绠$悊', activeMenu: '/system/oss', icon: '', noCache: true }
}
]
},
@@ -159,7 +159,21 @@
path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable.vue'),
name: 'GenEdit',
- meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen', icon: '' }
+ meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen', icon: '', noCache: true }
+ }
+ ]
+ },
+ {
+ path: '/workflow/leaveEdit',
+ component: Layout,
+ hidden: true,
+ permissions: ['workflow:leave:edit'],
+ children: [
+ {
+ path: 'index',
+ component: () => import('@/views/workflow/leave/leaveEdit.vue'),
+ name: 'leaveEdit',
+ meta: { title: '璇峰亣鐢宠', activeMenu: '/workflow/leave', noCache: true }
}
]
}
@@ -175,9 +189,8 @@
scrollBehavior(to, from, savedPosition) {
if (savedPosition) {
return savedPosition;
- } else {
- return { top: 0 };
}
+ return { top: 0 };
}
});
--
Gitblit v1.9.3