From a69cc94f354bcc0b787b0de4fe83b7d0c8e3b742 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 28 十一月 2020 20:39:03 +0800
Subject: [PATCH] 三级菜单自动配置组件
---
ruoyi-ui/src/store/modules/permission.js | 5 ++++-
ruoyi-ui/src/components/ParentView/index.vue | 6 +++---
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java | 3 +++
sql/ry_20201128.sql | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 15 +++++++++++++++
ruoyi-ui/src/router/index.js | 1 +
6 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 69c2b96..94b23a9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -54,6 +54,9 @@
/** Layout缁勪欢鏍囪瘑 */
public final static String LAYOUT = "Layout";
+ /** ParentView缁勪欢鏍囪瘑 */
+ public final static String PARENT_VIEW = "ParentView";
+
/** 鏍￠獙杩斿洖缁撴灉鐮� */
public final static String UNIQUE = "0";
public final static String NOT_UNIQUE = "1";
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 8b38ead..fd9084e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -364,6 +364,10 @@
{
component = menu.getComponent();
}
+ else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
+ {
+ component = UserConstants.PARENT_VIEW;
+ }
return component;
}
@@ -380,6 +384,17 @@
}
/**
+ * 鏄惁涓簆arent_view缁勪欢
+ *
+ * @param menu 鑿滃崟淇℃伅
+ * @return 缁撴灉
+ */
+ public boolean isParentView(SysMenu menu)
+ {
+ return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
+ }
+
+ /**
* 鏍规嵁鐖惰妭鐐圭殑ID鑾峰彇鎵�鏈夊瓙鑺傜偣
*
* @param list 鍒嗙被琛�
diff --git a/ruoyi-ui/src/views/system/log/index.vue b/ruoyi-ui/src/components/ParentView/index.vue
similarity index 99%
rename from ruoyi-ui/src/views/system/log/index.vue
rename to ruoyi-ui/src/components/ParentView/index.vue
index ad6360c..7bf6148 100644
--- a/ruoyi-ui/src/views/system/log/index.vue
+++ b/ruoyi-ui/src/components/ParentView/index.vue
@@ -1,3 +1,3 @@
-<template >
- <router-view />
-</template>
+<template >
+ <router-view />
+</template>
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index f2b3203..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: 璺敱閰嶇疆椤�
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index deed451..260d8af 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -1,6 +1,7 @@
import { constantRoutes } from '@/router'
import { getRouters } from '@/api/menu'
import Layout from '@/layout/index'
+import ParentView from '@/components/ParentView';
const permission = {
state: {
@@ -33,9 +34,11 @@
function filterAsyncRouter(asyncRouterMap) {
return asyncRouterMap.filter(route => {
if (route.component) {
- // Layout缁勪欢鐗规畩澶勭悊
+ // Layout ParentView 缁勪欢鐗规畩澶勭悊
if (route.component === 'Layout') {
route.component = Layout
+ } else if (route.component === 'ParentView') {
+ route.component = ParentView
} else {
route.component = loadView(route.component)
}
diff --git a/sql/ry_20201123.sql b/sql/ry_20201128.sql
similarity index 99%
rename from sql/ry_20201123.sql
rename to sql/ry_20201128.sql
index 9b8ec9c..1db0d5a 100644
--- a/sql/ry_20201123.sql
+++ b/sql/ry_20201128.sql
@@ -169,7 +169,7 @@
insert into sys_menu values('105', '瀛楀吀绠＄悊', '1', '6', 'dict', 'system/dict/index', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '瀛楀吀绠＄悊鑿滃崟');
insert into sys_menu values('106', '鍙傛暟璁剧疆', '1', '7', 'config', 'system/config/index', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '鍙傛暟璁剧疆鑿滃崟');
insert into sys_menu values('107', '閫氱煡鍏憡', '1', '8', 'notice', 'system/notice/index', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '閫氱煡鍏憡鑿滃崟');
-insert into sys_menu values('108', '鏃ュ織绠＄悊', '1', '9', 'log', 'system/log/index', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '鏃ュ織绠＄悊鑿滃崟');
+insert into sys_menu values('108', '鏃ュ織绠＄悊', '1', '9', 'log', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '鏃ュ織绠＄悊鑿滃崟');
insert into sys_menu values('109', '鍦ㄧ嚎鐢ㄦ埛', '2', '1', 'online', 'monitor/online/index', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟');
insert into sys_menu values('110', '瀹氭椂浠诲姟', '2', '2', 'job', 'monitor/job/index', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '瀹氭椂浠诲姟鑿滃崟');
insert into sys_menu values('111', '鏁版嵁鐩戞帶', '2', '3', 'druid', 'monitor/druid/index', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate(), '', null, '鏁版嵁鐩戞帶鑿滃崟');
--
Gitblit v1.9.3