正在显示
6 个修改的文件
包含
24 行增加
和
2 行删除
| @@ -54,6 +54,9 @@ public class UserConstants | @@ -54,6 +54,9 @@ public class UserConstants | ||
| 54 | /** Layout组件标识 */ | 54 | /** Layout组件标识 */ |
| 55 | public final static String LAYOUT = "Layout"; | 55 | public final static String LAYOUT = "Layout"; |
| 56 | 56 | ||
| 57 | + /** ParentView组件标识 */ | ||
| 58 | + public final static String PARENT_VIEW = "ParentView"; | ||
| 59 | + | ||
| 57 | /** 校验返回结果码 */ | 60 | /** 校验返回结果码 */ |
| 58 | public final static String UNIQUE = "0"; | 61 | public final static String UNIQUE = "0"; |
| 59 | public final static String NOT_UNIQUE = "1"; | 62 | public final static String NOT_UNIQUE = "1"; |
| @@ -364,6 +364,10 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -364,6 +364,10 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 364 | { | 364 | { |
| 365 | component = menu.getComponent(); | 365 | component = menu.getComponent(); |
| 366 | } | 366 | } |
| 367 | + else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) | ||
| 368 | + { | ||
| 369 | + component = UserConstants.PARENT_VIEW; | ||
| 370 | + } | ||
| 367 | return component; | 371 | return component; |
| 368 | } | 372 | } |
| 369 | 373 | ||
| @@ -380,6 +384,17 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -380,6 +384,17 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 380 | } | 384 | } |
| 381 | 385 | ||
| 382 | /** | 386 | /** |
| 387 | + * 是否为parent_view组件 | ||
| 388 | + * | ||
| 389 | + * @param menu 菜单信息 | ||
| 390 | + * @return 结果 | ||
| 391 | + */ | ||
| 392 | + public boolean isParentView(SysMenu menu) | ||
| 393 | + { | ||
| 394 | + return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); | ||
| 395 | + } | ||
| 396 | + | ||
| 397 | + /** | ||
| 383 | * 根据父节点的ID获取所有子节点 | 398 | * 根据父节点的ID获取所有子节点 |
| 384 | * | 399 | * |
| 385 | * @param list 分类表 | 400 | * @param list 分类表 |
| 1 | import { constantRoutes } from '@/router' | 1 | import { constantRoutes } from '@/router' |
| 2 | import { getRouters } from '@/api/menu' | 2 | import { getRouters } from '@/api/menu' |
| 3 | import Layout from '@/layout/index' | 3 | import Layout from '@/layout/index' |
| 4 | +import ParentView from '@/components/ParentView'; | ||
| 4 | 5 | ||
| 5 | const permission = { | 6 | const permission = { |
| 6 | state: { | 7 | state: { |
| @@ -33,9 +34,11 @@ const permission = { | @@ -33,9 +34,11 @@ const permission = { | ||
| 33 | function filterAsyncRouter(asyncRouterMap) { | 34 | function filterAsyncRouter(asyncRouterMap) { |
| 34 | return asyncRouterMap.filter(route => { | 35 | return asyncRouterMap.filter(route => { |
| 35 | if (route.component) { | 36 | if (route.component) { |
| 36 | - // Layout组件特殊处理 | 37 | + // Layout ParentView 组件特殊处理 |
| 37 | if (route.component === 'Layout') { | 38 | if (route.component === 'Layout') { |
| 38 | route.component = Layout | 39 | route.component = Layout |
| 40 | + } else if (route.component === 'ParentView') { | ||
| 41 | + route.component = ParentView | ||
| 39 | } else { | 42 | } else { |
| 40 | route.component = loadView(route.component) | 43 | route.component = loadView(route.component) |
| 41 | } | 44 | } |
| @@ -169,7 +169,7 @@ insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 's | @@ -169,7 +169,7 @@ insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 's | ||
| 169 | insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '字典管理菜单'); | 169 | insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '字典管理菜单'); |
| 170 | insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '参数设置菜单'); | 170 | insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '参数设置菜单'); |
| 171 | insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '通知公告菜单'); | 171 | insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '通知公告菜单'); |
| 172 | -insert into sys_menu values('108', '日志管理', '1', '9', 'log', 'system/log/index', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '日志管理菜单'); | 172 | +insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '日志管理菜单'); |
| 173 | insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '在线用户菜单'); | 173 | insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '在线用户菜单'); |
| 174 | insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '定时任务菜单'); | 174 | insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '定时任务菜单'); |
| 175 | insert into sys_menu values('111', '数据监控', '2', '3', 'druid', 'monitor/druid/index', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate(), '', null, '数据监控菜单'); | 175 | insert into sys_menu values('111', '数据监控', '2', '3', 'druid', 'monitor/druid/index', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate(), '', null, '数据监控菜单'); |
-
请 注册 或 登录 后发表评论