diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java index a980e44f5e..95e97387e6 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java @@ -89,15 +89,24 @@ public class PanelGroupController { @ApiOperation("更新") @PostMapping("/update") - @DePermissions(value = { - @DePermission(type = DePermissionType.PANEL, value = "id"), - @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANEL_LEVEL_MANAGE) - }, logical = Logical.AND) + @DePermission(type = DePermissionType.PANEL, value = "id", level = ResourceAuthLevel.PANEL_LEVEL_MANAGE) @I18n public PanelGroupDTO update(@RequestBody PanelGroupRequest request) { return panelGroupService.update(request); } + @ApiOperation("移动") + @PostMapping("/move") + @DePermissions(value = { + @DePermission(type = DePermissionType.PANEL, value = "id", level = ResourceAuthLevel.PANEL_LEVEL_MANAGE), + @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANEL_LEVEL_MANAGE) + }, logical = Logical.AND) + @I18n + public PanelGroupDTO move(@RequestBody PanelGroupRequest request) { + return panelGroupService.update(request); + } + + @ApiOperation("删除") @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANEL_LEVEL_MANAGE) @PostMapping("/deleteCircle/{id}") diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js index 375c39fd17..b51a672da5 100644 --- a/frontend/src/api/panel/panel.js +++ b/frontend/src/api/panel/panel.js @@ -85,6 +85,15 @@ export function panelUpdate(data) { }) } +export function panelMove(data) { + return request({ + url: 'panel/group/move', + method: 'post', + loading: true, + data + }) +} + export function findOne(id) { return request({ url: 'panel/group/findOne/' + id, diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index 65dd3d0a05..0984353329 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -449,7 +449,7 @@ import { defaultTree, delGroup, groupTree, - initPanelData, + initPanelData, panelMove, panelToTop, panelUpdate, viewPanelLog @@ -1116,7 +1116,7 @@ export default { saveMoveGroup() { this.moveInfo.pid = this.tGroup.id this.moveInfo['optType'] = 'move' - panelUpdate(this.moveInfo).then((response) => { + panelMove(this.moveInfo).then((response) => { updateCacheTree('move', 'panel-main-tree', response.data, this.tData) this.closeMoveGroup() })