Ver código fonte

支持一级菜单(和主页同级)在main区域显示

RuoYi 5 anos atrás
pai
commit
a25ab90b5a

+ 12 - 0
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java

@@ -42,6 +42,18 @@ public class UserConstants
42
     /** 是否菜单外链(否) */
42
     /** 是否菜单外链(否) */
43
     public static final String NO_FRAME = "1";
43
     public static final String NO_FRAME = "1";
44
 
44
 
45
+    /** 菜单类型(目录) */
46
+    public static final String TYPE_DIR = "M";
47
+
48
+    /** 菜单类型(菜单) */
49
+    public static final String TYPE_MENU = "C";
50
+
51
+    /** 菜单类型(按钮) */
52
+    public static final String TYPE_BUTTON = "F";
53
+
54
+    /** Layout组件标识 */
55
+    public final static String LAYOUT = "Layout";
56
+
45
     /** 校验返回结果码 */
57
     /** 校验返回结果码 */
46
     public final static String UNIQUE = "0";
58
     public final static String UNIQUE = "0";
47
     public final static String NOT_UNIQUE = "1";
59
     public final static String NOT_UNIQUE = "1";

+ 69 - 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -8,12 +8,11 @@ import java.util.LinkedList;
8
 import java.util.List;
8
 import java.util.List;
9
 import java.util.Set;
9
 import java.util.Set;
10
 import java.util.stream.Collectors;
10
 import java.util.stream.Collectors;
11
-
12
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.stereotype.Service;
12
 import org.springframework.stereotype.Service;
14
-
15
 import com.ruoyi.common.core.constant.UserConstants;
13
 import com.ruoyi.common.core.constant.UserConstants;
16
 import com.ruoyi.common.core.utils.StringUtils;
14
 import com.ruoyi.common.core.utils.StringUtils;
15
+import com.ruoyi.common.security.utils.SecurityUtils;
17
 import com.ruoyi.system.api.domain.SysUser;
16
 import com.ruoyi.system.api.domain.SysUser;
18
 import com.ruoyi.system.domain.SysMenu;
17
 import com.ruoyi.system.domain.SysMenu;
19
 import com.ruoyi.system.domain.vo.MetaVo;
18
 import com.ruoyi.system.domain.vo.MetaVo;
@@ -105,7 +104,7 @@ public class SysMenuServiceImpl implements ISysMenuService
105
     public List<SysMenu> selectMenuTreeByUserId(Long userId)
104
     public List<SysMenu> selectMenuTreeByUserId(Long userId)
106
     {
105
     {
107
         List<SysMenu> menus = null;
106
         List<SysMenu> menus = null;
108
-        if (SysUser.isAdmin(userId))
107
+        if (SecurityUtils.isAdmin(userId))
109
         {
108
         {
110
             menus = menuMapper.selectMenuTreeAll();
109
             menus = menuMapper.selectMenuTreeAll();
111
         }
110
         }
@@ -141,17 +140,28 @@ public class SysMenuServiceImpl implements ISysMenuService
141
         {
140
         {
142
             RouterVo router = new RouterVo();
141
             RouterVo router = new RouterVo();
143
             router.setHidden("1".equals(menu.getVisible()));
142
             router.setHidden("1".equals(menu.getVisible()));
144
-            router.setName(StringUtils.capitalize(menu.getPath()));
143
+            router.setName(getRouteName(menu));
145
             router.setPath(getRouterPath(menu));
144
             router.setPath(getRouterPath(menu));
146
-            router.setComponent(StringUtils.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent());
145
+            router.setComponent(getComponent(menu));
147
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
146
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
148
             List<SysMenu> cMenus = menu.getChildren();
147
             List<SysMenu> cMenus = menu.getChildren();
149
-            if (!cMenus.isEmpty() && cMenus.size() > 0 && "M".equals(menu.getMenuType()))
148
+            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
150
             {
149
             {
151
                 router.setAlwaysShow(true);
150
                 router.setAlwaysShow(true);
152
                 router.setRedirect("noRedirect");
151
                 router.setRedirect("noRedirect");
153
                 router.setChildren(buildMenus(cMenus));
152
                 router.setChildren(buildMenus(cMenus));
154
             }
153
             }
154
+            else if (isMeunFrame(menu))
155
+            {
156
+                List<RouterVo> childrenList = new ArrayList<RouterVo>();
157
+                RouterVo children = new RouterVo();
158
+                children.setPath(menu.getPath());
159
+                children.setComponent(menu.getComponent());
160
+                children.setName(StringUtils.capitalize(menu.getPath()));
161
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
162
+                childrenList.add(children);
163
+                router.setChildren(childrenList);
164
+            }
155
             routers.add(router);
165
             routers.add(router);
156
         }
166
         }
157
         return routers;
167
         return routers;
@@ -290,6 +300,23 @@ public class SysMenuServiceImpl implements ISysMenuService
290
     }
300
     }
291
 
301
 
292
     /**
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
+    /**
293
      * 获取路由地址
320
      * 获取路由地址
294
      * 
321
      * 
295
      * @param menu 菜单信息
322
      * @param menu 菜单信息
@@ -298,15 +325,49 @@ public class SysMenuServiceImpl implements ISysMenuService
298
     public String getRouterPath(SysMenu menu)
325
     public String getRouterPath(SysMenu menu)
299
     {
326
     {
300
         String routerPath = menu.getPath();
327
         String routerPath = menu.getPath();
301
-        // 非外链并且是一级目录
302
-        if (0 == menu.getParentId() && "1".equals(menu.getIsFrame()))
328
+        // 非外链并且是一级目录(类型为目录)
329
+        if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
330
+                && UserConstants.NO_FRAME.equals(menu.getIsFrame()))
303
         {
331
         {
304
             routerPath = "/" + menu.getPath();
332
             routerPath = "/" + menu.getPath();
305
         }
333
         }
334
+        // 非外链并且是一级目录(类型为菜单)
335
+        else if (isMeunFrame(menu))
336
+        {
337
+            routerPath = "/";
338
+        }
306
         return routerPath;
339
         return routerPath;
307
     }
340
     }
308
 
341
 
309
     /**
342
     /**
343
+     * 获取组件信息
344
+     * 
345
+     * @param menu 菜单信息
346
+     * @return 组件信息
347
+     */
348
+    public String getComponent(SysMenu menu)
349
+    {
350
+        String component = UserConstants.LAYOUT;
351
+        if (StringUtils.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu))
352
+        {
353
+            component = menu.getComponent();
354
+        }
355
+        return component;
356
+    }
357
+
358
+    /**
359
+     * 是否为菜单内部跳转
360
+     * 
361
+     * @param menu 菜单信息
362
+     * @return 结果
363
+     */
364
+    public boolean isMeunFrame(SysMenu menu)
365
+    {
366
+        return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
367
+                && menu.getIsFrame().equals(UserConstants.NO_FRAME);
368
+    }
369
+
370
+    /**
310
      * 根据父节点的ID获取所有子节点
371
      * 根据父节点的ID获取所有子节点
311
      * 
372
      * 
312
      * @param list 分类表
373
      * @param list 分类表