diff --git a/klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java index c72ad5b4a..c214dc446 100644 --- a/klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java @@ -96,6 +96,11 @@ public class SysMenu extends TreeEntity { */ private String icon; + /** + * 样式 + */ + private String style; + /** * 备注 */ diff --git a/klp-system/src/main/java/com/klp/system/domain/vo/MetaVo.java b/klp-system/src/main/java/com/klp/system/domain/vo/MetaVo.java index 6309c3517..4b9056d9b 100644 --- a/klp-system/src/main/java/com/klp/system/domain/vo/MetaVo.java +++ b/klp-system/src/main/java/com/klp/system/domain/vo/MetaVo.java @@ -32,6 +32,11 @@ public class MetaVo { */ private String link; + /** + * 菜单样式 + */ + private String style; + public MetaVo(String title, String icon) { this.title = title; this.icon = icon; diff --git a/klp-system/src/main/java/com/klp/system/service/impl/SysMenuServiceImpl.java b/klp-system/src/main/java/com/klp/system/service/impl/SysMenuServiceImpl.java index 889849b2b..acc1e8480 100644 --- a/klp-system/src/main/java/com/klp/system/service/impl/SysMenuServiceImpl.java +++ b/klp-system/src/main/java/com/klp/system/service/impl/SysMenuServiceImpl.java @@ -161,7 +161,9 @@ public class SysMenuServiceImpl implements ISysMenuService { router.setPath(getRouterPath(menu)); router.setComponent(getComponent(menu)); router.setQuery(menu.getQueryParam()); - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + MetaVo metaVo = new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()); + metaVo.setStyle(menu.getStyle()); + router.setMeta(metaVo); List cMenus = menu.getChildren(); if (CollUtil.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { router.setAlwaysShow(true); @@ -174,12 +176,16 @@ public class SysMenuServiceImpl implements ISysMenuService { children.setPath(menu.getPath()); children.setComponent(menu.getComponent()); children.setName(StringUtils.capitalize(menu.getPath())); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + MetaVo childrenMetaVo = new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()); + childrenMetaVo.setStyle(menu.getStyle()); + children.setMeta(childrenMetaVo); children.setQuery(menu.getQueryParam()); childrenList.add(children); router.setChildren(childrenList); } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) { - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); + MetaVo innerMetaVo = new MetaVo(menu.getMenuName(), menu.getIcon()); + innerMetaVo.setStyle(menu.getStyle()); + router.setMeta(innerMetaVo); router.setPath("/"); List childrenList = new ArrayList<>(); RouterVo children = new RouterVo(); @@ -187,7 +193,9 @@ public class SysMenuServiceImpl implements ISysMenuService { children.setPath(routerPath); children.setComponent(UserConstants.INNER_LINK); children.setName(StringUtils.capitalize(routerPath)); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); + MetaVo innerChildrenMetaVo = new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()); + innerChildrenMetaVo.setStyle(menu.getStyle()); + children.setMeta(innerChildrenMetaVo); childrenList.add(children); router.setChildren(childrenList); } diff --git a/klp-system/src/main/resources/mapper/system/SysMenuMapper.xml b/klp-system/src/main/resources/mapper/system/SysMenuMapper.xml index 33ec17b8a..9bebaee34 100644 --- a/klp-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/klp-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -20,6 +20,7 @@ + @@ -29,7 +30,7 @@