支持三级菜单自动配置组件&缓存数据

yangzongzhuan · yangzongzhuan · commit 43d1a63577f9 · 2020-12-16T21:48:40.000+08:00
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
@@ -269,6 +269,8 @@ public List<MenuVo> buildMenus(List<MenuDto> menuDtos) {
                         if(!menuDTO.getIFrame()){
                             if(menuDTO.getPid() == null){
                                 menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent())?"Layout":menuDTO.getComponent());
+                            }else if(menuDTO.getPid() != null && menuDTO.getType() == 0){
+                                menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent())?"ParentView":menuDTO.getComponent());
                             }else if(!StrUtil.isEmpty(menuDTO.getComponent())){
                                 menuVo.setComponent(menuDTO.getComponent());
                             }
diff --git a/sql/eladmin.sql b/sql/eladmin.sql
@@ -369,7 +369,7 @@ INSERT INTO `sys_menu` VALUES (15, 10, 0, 1, '富文本', 'Editor', 'components/
 INSERT INTO `sys_menu` VALUES (18, 36, 3, 1, '存储管理', 'Storage', 'tools/storage/index', 34, 'qiniu', 'storage', b'0', b'0', b'0', 'storage:list', NULL, NULL, '2018-12-31 11:12:15', NULL);
 INSERT INTO `sys_menu` VALUES (19, 36, 0, 1, '支付宝工具', 'AliPay', 'tools/aliPay/index', 37, 'alipay', 'aliPay', b'0', b'0', b'0', NULL, NULL, NULL, '2018-12-31 14:52:38', NULL);
 INSERT INTO `sys_menu` VALUES (21, NULL, 2, 0, '多级菜单', NULL, '', 900, 'menu', 'nested', b'0', b'0', b'0', NULL, NULL, 'admin', '2019-01-04 16:22:03', '2020-06-21 17:27:35');
-INSERT INTO `sys_menu` VALUES (22, 21, 2, 1, '二级菜单1', NULL, 'nested/menu1/index', 999, 'menu', 'menu1', b'0', b'0', b'0', NULL, NULL, 'admin', '2019-01-04 16:23:29', '2020-06-21 17:27:20');
+INSERT INTO `sys_menu` VALUES (22, 21, 2, 0, '二级菜单1', NULL, '', 999, 'menu', 'menu1', b'0', b'0', b'0', NULL, NULL, 'admin', '2019-01-04 16:23:29', '2020-06-21 17:27:20');
 INSERT INTO `sys_menu` VALUES (23, 21, 0, 1, '二级菜单2', NULL, 'nested/menu2/index', 999, 'menu', 'menu2', b'0', b'0', b'0', NULL, NULL, NULL, '2019-01-04 16:23:57', NULL);
 INSERT INTO `sys_menu` VALUES (24, 22, 0, 1, '三级菜单1', NULL, 'nested/menu1/menu1-1', 999, 'menu', 'menu1-1', b'0', b'0', b'0', NULL, NULL, NULL, '2019-01-04 16:24:48', NULL);
 INSERT INTO `sys_menu` VALUES (27, 22, 0, 1, '三级菜单2', NULL, 'nested/menu1/menu1-2', 999, 'menu', 'menu1-2', b'0', b'0', b'0', NULL, NULL, NULL, '2019-01-07 17:27:32', NULL);

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,8 @@ public List<MenuVo> buildMenus(List<MenuDto> menuDtos) {`
`269`	`269`	`if(!menuDTO.getIFrame()){`
`270`	`270`	`if(menuDTO.getPid() == null){`
`271`	`271`	`menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent())?"Layout":menuDTO.getComponent());`
	`272`	`+ }else if(menuDTO.getPid() != null && menuDTO.getType() == 0){`
	`273`	`+ menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent())?"ParentView":menuDTO.getComponent());`
`272`	`274`	`}else if(!StrUtil.isEmpty(menuDTO.getComponent())){`
`273`	`275`	`menuVo.setComponent(menuDTO.getComponent());`
`274`	`276`	`}`