From 575d3b5c34cadba2ce10309adc6e06266867da8c Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 1 Nov 2021 18:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.5=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java | 6 +++--- .../roses/kernel/system/modular/menu/entity/SysMenu.java | 4 ++-- .../system/modular/menu/factory/AntdMenusFactory.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java index 94153c70d..9a87a3a64 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/antd/AntdSysMenuDTO.java @@ -69,10 +69,10 @@ public class AntdSysMenuDTO { private Boolean hide; /** - * 比如修改页面不在侧边栏，打开后侧边栏就没有选中了，这个可以配置选中地址 + * 配置选中的path地址，比如修改页面不在侧栏，打开后侧栏就没有选中，这个配置选中地址，非必须 */ - @ChineseDescription("比如修改页面不在侧边栏，打开后侧边栏就没有选中了，这个可以配置选中地址") - private String uid; + @ChineseDescription("配置选中的path地址") + private String active; /** * 子级 diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java index 3bff91ad8..248e6938f 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java @@ -170,9 +170,9 @@ public class SysMenu extends BaseEntity implements AbstractTreeNode { /** * 用于非菜单显示页面的重定向url设置 */ - @TableField("antdv_uid_url") + @TableField("antdv_active_url") @ChineseDescription("用于非菜单显示页面的重定向url设置") - private String antdvUidUrl; + private String antdvActiveUrl; /** * 是否可见(分离版用)：Y-是，N-否 diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java index bed17f131..693afe2cb 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java @@ -268,7 +268,7 @@ public class AntdMenusFactory { antdvMenuItem.setPath(sysMenu.getAntdvRouter()); antdvMenuItem.setComponent(sysMenu.getAntdvComponent()); antdvMenuItem.setHide(YesOrNotEnum.N.getCode().equals(sysMenu.getAntdvVisible())); - antdvMenuItem.setUid(sysMenu.getAntdvUidUrl()); + antdvMenuItem.setActive(sysMenu.getAntdvActiveUrl()); if (ObjectUtil.isNotEmpty(sysMenu.getChildren())) { antdvMenuItem.setChildren(doModelTransfer(sysMenu.getChildren())); } @@ -297,7 +297,7 @@ public class AntdMenusFactory { antdSysMenuDTO.setPath("/" + appCode); antdSysMenuDTO.setComponent(null); antdSysMenuDTO.setHide(false); - antdSysMenuDTO.setUid(null); + antdSysMenuDTO.setActive(null); return antdSysMenuDTO; }