From 16ea97339e8e016d8b0db72ad6d35778efc28770 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 2 Mar 2022 10:46:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E6=9C=AA=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/panel/PanelGroupController.java     |  2 +-
 .../dataease/service/panel/PanelGroupService.java  | 14 +++++++++-----
 frontend/src/api/panel/panel.js                    |  3 ++-
 3 files changed, 12 insertions(+), 7 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 1a5df80425..ffda6378d7 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -68,7 +68,7 @@ public class PanelGroupController {
     @ApiOperation("详细信息")
     @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANNEL_LEVEL_VIEW)
     @GetMapping("/findOne/{id}")
-    public PanelGroupWithBLOBs findOne(@PathVariable String id) throws Exception {
+    public PanelGroupDTO findOne(@PathVariable String id) throws Exception {
         return panelGroupService.findOne(id);
     }
 
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 8272aeff23..0c81afea35 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -200,12 +200,16 @@ public class PanelGroupService {
     }
 
 
-    public PanelGroupWithBLOBs findOne(String panelId) {
-        PanelGroupWithBLOBs panelGroupWithBLOBs = extPanelGroupMapper.findOneWithPrivileges(panelId, String.valueOf(AuthUtils.getUser().getUserId()));
-        if (panelGroupWithBLOBs != null && StringUtils.isNotEmpty(panelGroupWithBLOBs.getSource())) {
-            return extPanelGroupMapper.findOneWithPrivileges(panelGroupWithBLOBs.getSource(), String.valueOf(AuthUtils.getUser().getUserId()));
+    public PanelGroupDTO findOne(String panelId) {
+        PanelGroupDTO panelGroup = extPanelGroupMapper.findOneWithPrivileges(panelId, String.valueOf(AuthUtils.getUser().getUserId()));
+        // 默认仪表板取源仪表板样式
+        if (panelGroup != null && StringUtils.isNotEmpty(panelGroup.getSource())) {
+            PanelGroupDTO sourcePanel = extPanelGroupMapper.findOneWithPrivileges(panelGroup.getSource(), String.valueOf(AuthUtils.getUser().getUserId()));
+            panelGroup.setPanelData(sourcePanel.getPanelData());
+            panelGroup.setPanelStyle(sourcePanel.getPanelStyle());
+            panelGroup.setSourcePanelName(sourcePanel.getName());
         }
-        return panelGroupWithBLOBs;
+        return panelGroup;
     }
 
 
diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index ecc52841f2..0cb50e64af 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -142,7 +142,8 @@ export function initPanelData(panelId, callback) {
     store.dispatch('panel/setPanelInfo', {
       id: response.data.id,
       name: response.data.name,
-      privileges: response.data.privileges
+      privileges: response.data.privileges,
+      sourcePanelName: response.data.sourcePanelName
     })
     // 刷新联动信息
     getPanelAllLinkageInfo(panelId).then(rsp => {