From 56a943bf48e204f24d0e1bbbf2cb7e82f3eb2662 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 24 五月 2021 11:24:54 +0800
Subject: [PATCH] 升级druid到最新版本v1.2.6
---
ruoyi-ui/src/router/index.js | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index ec7bc7c..3f14fd3 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -5,6 +5,7 @@
/* Layout */
import Layout from '@/layout'
+import ParentView from '@/components/ParentView';
/**
* Note: 路由配置项
@@ -17,9 +18,9 @@
* redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
* name:'router-name' // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
* meta : {
- roles: ['admin','editor'] // 设置该路由进入的权限，支持多个权限叠加
+ noCache: true // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
- icon: 'svg-name' // 设置该路由的图标，对应路径src/icons/svg
+ icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
}
*/
@@ -33,23 +34,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 +60,7 @@
children: [
{
path: 'index',
- component: () => import('@/views/index'),
+ component: (resolve) => require(['@/views/index'], resolve),
name: '首页',
meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
}
@@ -73,7 +74,7 @@
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' }
}
@@ -86,7 +87,7 @@
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: '' }
}
@@ -99,7 +100,7 @@
children: [
{
path: 'log',
- component: () => import('@/views/monitor/job/log'),
+ component: (resolve) => require(['@/views/monitor/job/log'], resolve),
name: 'JobLog',
meta: { title: '调度日志' }
}
@@ -111,8 +112,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.2