From 965bdc9986ba66b10c2783b514b1cbdd19b29077 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 19 二月 2022 17:08:50 +0800
Subject: [PATCH] !431 修改登录超时刷新页面跳转登录页面还提示重新登录问题 Merge pull request !431 from 也曾为你、像超人/master
---
ruoyi-ui/src/router/index.js | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index a826980..447f5b0 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 // 如果设置为true，则不会被 <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,12 +138,13 @@
path: '/monitor/job-log',
component: Layout,
hidden: true,
+ permissions: ['monitor:job:list'],
children: [
{
path: 'index',
- component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+ component: () => import('@/views/monitor/job/log'),
name: 'JobLog',
- meta: { title: '调度日志', activeMenu: '/monitor/job'}
+ meta: { title: '调度日志', activeMenu: '/monitor/job' }
}
]
},
@@ -142,12 +152,13 @@
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' }
}
]
}
--
Gitblit v1.9.2