diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/menu/MenuTypeEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/menu/MenuTypeEnum.java index 205bc9019..c067a0cbf 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/menu/MenuTypeEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/menu/MenuTypeEnum.java @@ -30,7 +30,7 @@ import cn.stylefeng.roses.kernel.rule.base.ReadableEnum; import lombok.Getter; /** - * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接 + * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计 * * @author fengshuonan * @since 2023/6/15 9:45 @@ -56,7 +56,12 @@ public enum MenuTypeEnum implements ReadableEnum { /** * 外部链接 */ - OUT_URL(40, "外部链接"); + OUT_URL(40, "外部链接"), + + /** + * 应用设计菜单，基于应用设计生成的低代码界面 + */ + APP_DESIGN(50, "应用设计"); private final Integer code; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java index 7bdef45c4..36e5abef6 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserMenuInfo.java @@ -30,9 +30,9 @@ public class IndexUserMenuInfo implements AbstractTreeNode { private Long menuParentId; /** - * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接 + * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计 */ - @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接") + @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计") private Integer menuType; /** diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenu.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenu.java index a33d92290..cafc08705 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenu.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenu.java @@ -89,10 +89,10 @@ public class SysMenu extends BaseExpandFieldEntity implements BasePidBuildModel private String remark; /** - * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接 + * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计 */ @TableField("menu_type") - @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接") + @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计") private Integer menuType; /** @@ -137,6 +137,13 @@ public class SysMenu extends BaseExpandFieldEntity implements BasePidBuildModel @ChineseDescription("是否可见(分离版用)：Y-是，N-否") private String antdvVisible; + /** + * 应用设计的业务id + */ + @TableField("app_design_business_id") + @ChineseDescription("应用设计的业务id") + private Long appDesignBusinessId; + /** * 当前菜单的子菜单 *

diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/request/SysMenuRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/request/SysMenuRequest.java index 6529fbcd6..2d413e86b 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/request/SysMenuRequest.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/request/SysMenuRequest.java @@ -83,9 +83,9 @@ public class SysMenuRequest extends BaseRequest { private String remark; /** - * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接 + * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计 */ - @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接") + @ChineseDescription("菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计") @NotNull(message = "菜单类型不能为空", groups = {add.class, edit.class}) private Integer menuType; @@ -125,6 +125,12 @@ public class SysMenuRequest extends BaseRequest { @ChineseDescription("是否可见(分离版用)：Y-是，N-否") private String antdvVisible; + /** + * 应用设计的业务id + */ + @ChineseDescription("应用设计的业务id") + private Long appDesignBusinessId; + /** * 指定应用的所有菜单集合（树结构） */ diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/response/MenuItemDetail.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/response/MenuItemDetail.java index 2b673bcc7..d4abcf102 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/response/MenuItemDetail.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/pojo/response/MenuItemDetail.java @@ -30,7 +30,7 @@ public class MenuItemDetail implements AbstractTreeNode { private String menuName; /** - * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接 + * 菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计 */ private Integer menuType; diff --git a/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.5_20240110_1633__add_app_design_menu_type.sql b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.5_20240110_1633__add_app_design_menu_type.sql new file mode 100644 index 000000000..2ac3cb22b --- /dev/null +++ b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.5_20240110_1633__add_app_design_menu_type.sql @@ -0,0 +1,3 @@ +ALTER TABLE `sys_menu` +MODIFY COLUMN `menu_type` tinyint NULL DEFAULT NULL COMMENT '菜单类型：10-后台菜单，20-纯前台路由界面，30-内部链接，40-外部链接，50-应用设计' AFTER `remark`, +ADD COLUMN `app_design_business_id` bigint NULL COMMENT '应用设计的业务id' AFTER `antdv_visible`; \ No newline at end of file