From 55546dfc80bd2ec1be8786b19f53df4e1c1e44e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:49:47 +0800
Subject: [PATCH] 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复
---
ruoyi-ui/src/router/index.js | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 633235a..c7b9371 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -5,6 +5,8 @@
/* Layout */
import Layout from '@/layout'
+import ParentView from '@/components/ParentView';
+import InnerLink from '@/layout/components/InnerLink'
/**
* Note: 璺敱閰嶇疆椤�
@@ -17,9 +19,9 @@
* redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
* name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂
* meta : {
- roles: ['admin','editor'] // 璁剧疆璇ヨ矾鐢辫繘鍏ョ殑鏉冮檺锛屾敮鎸佸涓潈闄愬彔鍔�
+ noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false)
title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
- icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/icons/svg
+ icon: 'svg-name' // 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg
breadcrumb: false // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
}
*/
@@ -33,23 +35,23 @@
children: [
{
path: '/redirect/:path(.*)',
- component: () => import('@/views/redirect')
+ component: (resolve) => require(['@/views/redirect'], resolve)
}
]
},
{
path: '/login',
- component: () => import('@/views/login'),
+ component: (resolve) => require(['@/views/login'], resolve),
hidden: true
},
{
path: '/404',
- component: () => import('@/views/error/404'),
+ component: (resolve) => require(['@/views/error/404'], resolve),
hidden: true
},
{
path: '/401',
- component: () => import('@/views/error/401'),
+ component: (resolve) => require(['@/views/error/401'], resolve),
hidden: true
},
{
@@ -59,7 +61,7 @@
children: [
{
path: 'index',
- component: () => import('@/views/index'),
+ component: (resolve) => require(['@/views/index'], resolve),
name: '棣栭〉',
meta: { title: '棣栭〉', icon: 'dashboard', noCache: true, affix: true }
}
@@ -73,9 +75,35 @@
children: [
{
path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
+ component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
name: 'Profile',
meta: { title: '涓汉涓績', icon: 'user' }
+ }
+ ]
+ },
+ {
+ path: '/auth',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'role/:userId(\\d+)',
+ component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+ name: 'AuthRole',
+ meta: { title: '鍒嗛厤瑙掕壊'}
+ }
+ ]
+ },
+ {
+ path: '/auth',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'user/:roleId(\\d+)',
+ component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+ name: 'AuthUser',
+ meta: { title: '鍒嗛厤鐢ㄦ埛'}
}
]
},
@@ -86,9 +114,22 @@
children: [
{
path: 'type/data/:dictId(\\d+)',
- component: () => import('@/views/system/dict/data'),
+ component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data',
meta: { title: '瀛楀吀鏁版嵁', icon: '' }
+ }
+ ]
+ },
+ {
+ path: '/job',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'log',
+ component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+ name: 'JobLog',
+ meta: { title: '璋冨害鏃ュ織' }
}
]
},
@@ -98,8 +139,8 @@
hidden: true,
children: [
{
- path: 'edit',
- component: () => import('@/views/tool/gen/editTable'),
+ path: 'edit/:tableId(\\d+)',
+ component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
meta: { title: '淇敼鐢熸垚閰嶇疆' }
}
--
Gitblit v1.9.3