|
@@ -140,7 +140,7 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
@@ -140,7 +140,7 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
140
|
{
|
140
|
{
|
|
141
|
RouterVo router = new RouterVo();
|
141
|
RouterVo router = new RouterVo();
|
|
142
|
router.setHidden("1".equals(menu.getVisible()));
|
142
|
router.setHidden("1".equals(menu.getVisible()));
|
|
143
|
- router.setName(StringUtils.capitalize(menu.getPath()));
|
143
|
+ router.setName(getRouteName(menu));
|
|
144
|
router.setPath(getRouterPath(menu));
|
144
|
router.setPath(getRouterPath(menu));
|
|
145
|
router.setComponent(getComponent(menu));
|
145
|
router.setComponent(getComponent(menu));
|
|
146
|
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
|
146
|
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
|
|
@@ -300,6 +300,23 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
@@ -300,6 +300,23 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
300
|
}
|
300
|
}
|
|
301
|
|
301
|
|
|
302
|
/**
|
302
|
/**
|
|
|
|
303
|
+ * 获取路由名称
|
|
|
|
304
|
+ *
|
|
|
|
305
|
+ * @param menu 菜单信息
|
|
|
|
306
|
+ * @return 路由名称
|
|
|
|
307
|
+ */
|
|
|
|
308
|
+ public String getRouteName(SysMenu menu)
|
|
|
|
309
|
+ {
|
|
|
|
310
|
+ String routerName = StringUtils.capitalize(menu.getPath());
|
|
|
|
311
|
+ // 非外链并且是一级目录(类型为目录)
|
|
|
|
312
|
+ if (isMeunFrame(menu))
|
|
|
|
313
|
+ {
|
|
|
|
314
|
+ routerName = StringUtils.EMPTY;
|
|
|
|
315
|
+ }
|
|
|
|
316
|
+ return routerName;
|
|
|
|
317
|
+ }
|
|
|
|
318
|
+
|
|
|
|
319
|
+ /**
|
|
303
|
* 获取路由地址
|
320
|
* 获取路由地址
|
|
304
|
*
|
321
|
*
|
|
305
|
* @param menu 菜单信息
|
322
|
* @param menu 菜单信息
|