diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http index 689197b9..204356d2 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http @@ -13,7 +13,8 @@ Authorization: {{token}} "cache": "", "icon": "", "path": "", - "component": "" + "component": "", + "newWindow": "" } @@ -33,7 +34,8 @@ Authorization: {{token}} "cache": "", "icon": "", "path": "", - "component": "" + "component": "", + "newWindow": "" } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java index 662d4b0b..c84c182b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java @@ -62,6 +62,10 @@ public class SystemMenuDO extends BaseDO { @TableField("cache") private Integer cache; + @Schema(description = "新窗口打开 0关闭 1开启") + @TableField("new_window") + private Integer newWindow; + @Schema(description = "菜单图标") @TableField("icon") private String icon; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java index f60f9de0..72e2e2e2 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java @@ -41,6 +41,9 @@ public class SystemMenuCacheDTO { @Schema(description = "菜单缓存 0不缓存 1缓存") private Integer cache; + @Schema(description = "新窗口打开 0关闭 1开启") + private Integer newWindow; + @Schema(description = "菜单图标") private String icon; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java index b420eb6b..02215935 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java @@ -46,6 +46,9 @@ public class SystemMenuCreateRequest implements Serializable { @Schema(description = "菜单缓存 0不缓存 1缓存") private Integer cache; + @Schema(description = "新窗口打开 0关闭 1开启") + private Integer newWindow; + @Schema(description = "菜单图标") private String icon; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java index 5e182318..da470936 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java @@ -46,6 +46,9 @@ public class SystemMenuUpdateRequest implements Serializable { @Schema(description = "菜单缓存 0不缓存 1缓存") private Integer cache; + @Schema(description = "新窗口打开 0关闭 1开启") + private Integer newWindow; + @Schema(description = "菜单图标") private String icon; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java index c05017d2..1ece4048 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java @@ -52,6 +52,9 @@ public class SystemMenuVO implements Serializable { @Schema(description = "菜单缓存 0不缓存 1缓存") private Integer cache; + @Schema(description = "新窗口打开 0关闭 1开启") + private Integer newWindow; + @Schema(description = "菜单图标") private String icon; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml index 9c0d774f..f26e7018 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml @@ -18,6 +18,7 @@ + @@ -25,7 +26,7 @@ - id, parent_id, name, permission, type, sort, visible, status, cache, icon, path, component, create_time, update_time, creator, updater, deleted + id, parent_id, name, permission, type, sort, visible, status, cache, new_window, icon, path, component, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-ui/src/api/system/menu.ts b/orion-ops-ui/src/api/system/menu.ts index 65527fca..2c841391 100644 --- a/orion-ops-ui/src/api/system/menu.ts +++ b/orion-ops-ui/src/api/system/menu.ts @@ -12,6 +12,7 @@ export interface MenuCreateRequest { sort?: number; visible?: number; cache?: number; + newWindow?: number; icon?: string; path?: string; component?: string; @@ -46,6 +47,7 @@ export interface MenuQueryResponse extends TableData { visible: number; status: number; cache: number; + newWindow: number, icon: string; path: string; component: string; diff --git a/orion-ops-ui/src/components/system/menu/tree/index.vue b/orion-ops-ui/src/components/system/menu/tree/index.vue index 54e7e91b..fa5ee5ac 100644 --- a/orion-ops-ui/src/components/system/menu/tree/index.vue +++ b/orion-ops-ui/src/components/system/menu/tree/index.vue @@ -1,7 +1,7 @@ @@ -29,7 +29,7 @@