From b6dbe7b5a5727d048724d9e86b2519cf599ded41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 31 十月 2022 10:33:29 +0800
Subject: [PATCH] update 优化 新增返回警告消息提示
---
ruoyi-ui/src/router/index.js | 69 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 96f557b..dd4d5f1 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -17,6 +17,8 @@
* redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
* name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂
* query: '{"id": 1, "name": "ry"}' // 璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁�
+ * roles: ['admin', 'common'] // 璁块棶璺敱鐨勮鑹叉潈闄�
+ * permissions: ['a:a:a', 'b:b:b'] // 璁块棶璺敱鐨勮彍鍗曟潈闄�
* meta : {
noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false)
title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
@@ -35,28 +37,28 @@
children: [
{
path: '/redirect/:path(.*)',
- component: (resolve) => require(['@/views/redirect'], resolve)
+ component: () => import('@/views/redirect')
}
]
},
{
path: '/login',
- component: (resolve) => require(['@/views/login'], resolve),
+ component: () => import('@/views/login'),
hidden: true
},
{
path: '/register',
- component: (resolve) => require(['@/views/register'], resolve),
+ component: () => import('@/views/register'),
hidden: true
},
{
path: '/404',
- component: (resolve) => require(['@/views/error/404'], resolve),
+ component: () => import('@/views/error/404'),
hidden: true
},
{
path: '/401',
- component: (resolve) => require(['@/views/error/401'], resolve),
+ component: () => import('@/views/error/401'),
hidden: true
},
{
@@ -66,7 +68,7 @@
children: [
{
path: 'index',
- component: (resolve) => require(['@/views/index'], resolve),
+ component: () => import('@/views/index'),
name: 'Index',
meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
}
@@ -80,22 +82,27 @@
children: [
{
path: 'profile',
- component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+ component: () => import('@/views/system/user/profile/index'),
name: 'Profile',
meta: { title: '涓汉涓績', icon: 'user' }
}
]
- },
+ }
+]
+
+// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
+export const dynamicRoutes = [
{
path: '/system/user-auth',
component: Layout,
hidden: true,
+ permissions: ['system:user:edit'],
children: [
{
path: 'role/:userId(\\d+)',
- component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+ component: () => import('@/views/system/user/authRole'),
name: 'AuthRole',
- meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user'}
+ meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user' }
}
]
},
@@ -103,12 +110,13 @@
path: '/system/role-auth',
component: Layout,
hidden: true,
+ permissions: ['system:role:edit'],
children: [
{
path: 'user/:roleId(\\d+)',
- component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+ component: () => import('@/views/system/role/authUser'),
name: 'AuthUser',
- meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role'}
+ meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' }
}
]
},
@@ -116,12 +124,13 @@
path: '/system/dict-data',
component: Layout,
hidden: true,
+ permissions: ['system:dict:list'],
children: [
{
path: 'index/:dictId(\\d+)',
- component: (resolve) => require(['@/views/system/dict/data'], resolve),
+ component: () => import('@/views/system/dict/data'),
name: 'Data',
- meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict'}
+ meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' }
}
]
},
@@ -129,25 +138,13 @@
path: '/system/oss-config',
component: Layout,
hidden: true,
+ permissions: ['system:oss:list'],
children: [
{
path: 'index',
- component: (resolve) => require(['@/views/system/oss/config'], resolve),
+ component: () => import('@/views/system/oss/config'),
name: 'OssConfig',
- meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss'}
- }
- ]
- },
- {
- path: '/monitor/job-log',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- component: (resolve) => require(['@/views/monitor/job/log'], resolve),
- name: 'JobLog',
- meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job'}
+ meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss' }
}
]
},
@@ -155,18 +152,26 @@
path: '/tool/gen-edit',
component: Layout,
hidden: true,
+ permissions: ['tool:gen:edit'],
children: [
{
- path: 'index',
- component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+ path: 'index/:tableId(\\d+)',
+ component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit',
- meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen'}
+ meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' }
}
]
}
]
+// 闃叉杩炵画鐐瑰嚮澶氭璺敱鎶ラ敊
+let routerPush = Router.prototype.push;
+Router.prototype.push = function push(location) {
+ return routerPush.call(this, location).catch(err => err)
+}
+
export default new Router({
+ base: process.env.VUE_APP_CONTEXT_PATH,
mode: 'history', // 鍘绘帀url涓殑#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
--
Gitblit v1.9.3