From 9f8bae2a9bec675f7d83fdb0bc24d1666f7171b8 Mon Sep 17 00:00:00 2001
From: Wangjiahao <1522128093@qq.com>
Date: Thu, 15 Jun 2023 15:36:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=E7=AB=AF=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=20#5450?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/panel/PanelGroupController.java  | 17 +++++++++++++----
 frontend/src/api/panel/panel.js                 |  9 +++++++++
 frontend/src/views/panel/list/PanelList.vue     |  4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)

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()
       })