From 2d35f27ee3216ac1e4cef9db63b12c713ab88d1b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 16 Jun 2021 18:05:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E7=9B=98=E6=8C=87=E5=90=91=E6=BA=90=E4=BB=AA=E8=A1=A8=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/panel/PanelGroupService.java | 6 +++++- frontend/src/views/panel/list/PanelList.vue | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 845ec708b1..6fd619b435 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -141,7 +141,11 @@ public class PanelGroupService { public PanelGroupWithBLOBs findOne(String panelId) { - return panelGroupMapper.selectByPrimaryKey(panelId); + PanelGroupWithBLOBs panelGroupWithBLOBs = panelGroupMapper.selectByPrimaryKey(panelId); + if(panelGroupWithBLOBs!=null&& StringUtils.isNotEmpty(panelGroupWithBLOBs.getSource())){ + return panelGroupMapper.selectByPrimaryKey(panelGroupWithBLOBs.getSource()); + } + return panelGroupWithBLOBs; } diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index cc2a2ac2f4..fa8e991f71 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -575,9 +575,7 @@ export default { this.activeTree = data.panelType if (data.nodeType === 'panel') { // 加载视图数据 - // 如果是默认仪表盘 需要查询原仪表板的详细数据 - const queryPanelId = data.panelType === 'system' ? data.source : data.id - findOne(queryPanelId).then(response => { + findOne(data.id).then(response => { const componentDatas = JSON.parse(response.data.panelData) componentDatas.forEach(item => { item.filters = (item.filters || [])