Merge branch 'v1.8' of github.com:dataease/dataease into v1.8

backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java

@@ -71,7 +71,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);
     }
 

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()));
-        }
-        return panelGroupWithBLOBs;
+    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 panelGroup;
     }
 
 

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 => {