From 4b7e0d60e48c0465beb6c15e2e5f37b55f91e881 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 6 Jan 2021 22:36:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90menu=E3=80=91=E6=95=B4=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/system/pojo/menu/SysMenuRequest.java | 10 ++++++++++ .../roses/kernel/system/pojo/ztree/ZTreeNode.java | 6 ++++-- .../menu/modular/service/impl/SysMenuServiceImpl.java | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java index 8973c7267..8fe6f5386 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java @@ -109,6 +109,16 @@ public class SysMenuRequest extends BaseRequest { */ private String remark; + /** + * 菜单的路径，适用于layui-beetl版本 + */ + private String layuiPath; + + /** + * 菜单的图标，适用于layui-beetl版本 + */ + private String layuiIcon; + /** * 获取主页左侧菜单列表（适配Antd Vue的版本） */ diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java index f4a1457f9..b566d3383 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java @@ -1,5 +1,7 @@ package cn.stylefeng.roses.kernel.system.pojo.ztree; +import cn.stylefeng.roses.kernel.system.constants.SystemConstants; + /** * jquery ztree 插件的节点封装 * @@ -47,10 +49,10 @@ public class ZTreeNode { public static ZTreeNode createParent() { ZTreeNode zTreeNode = new ZTreeNode(); zTreeNode.setChecked(true); - zTreeNode.setId(0L); + zTreeNode.setId(SystemConstants.DEFAULT_PARENT_ID); zTreeNode.setName("顶级"); zTreeNode.setOpen(true); - zTreeNode.setpId(0L); + zTreeNode.setpId(SystemConstants.VIRTUAL_ROOT_PARENT_ID); return zTreeNode; } diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java index 0425571e2..3fcea7678 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java @@ -185,6 +185,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl zTreeNodes.add(zTreeNode); } + // 创建顶级节点 + zTreeNodes.add(ZTreeNode.createParent()); + return zTreeNodes; }