diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupExtendDataService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupExtendDataService.java index efdf6fe633..9b6309795e 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupExtendDataService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupExtendDataService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * Author: wangjiahao @@ -20,19 +21,26 @@ import java.util.List; @Service public class PanelGroupExtendDataService { + private final static String transDataKey = "data" + "s"; + @Resource private PanelGroupExtendDataMapper panelGroupExtendDataMapper; - public ChartViewDTO getChartDataInfo(String viewId,ChartViewDTO view){ + public ChartViewDTO getChartDataInfo(String viewId, ChartViewDTO view) { Gson gson = new Gson(); PanelGroupExtendDataExample extendDataExample = new PanelGroupExtendDataExample(); extendDataExample.createCriteria().andViewIdEqualTo(viewId); - List extendDataList = panelGroupExtendDataMapper.selectByExampleWithBLOBs(extendDataExample); - if(CollectionUtils.isNotEmpty(extendDataList)){ - ChartViewDTO chartViewTemplate = gson.fromJson(extendDataList.get(0).getViewDetails(),ChartViewDTO.class); + List extendDataList = panelGroupExtendDataMapper.selectByExampleWithBLOBs(extendDataExample); + if (CollectionUtils.isNotEmpty(extendDataList)) { + ChartViewDTO chartViewTemplate = gson.fromJson(extendDataList.get(0).getViewDetails(), ChartViewDTO.class); + Map dataInfo = chartViewTemplate.getData(); + if (dataInfo.get(transDataKey) != null) { + dataInfo.put("data", dataInfo.get(transDataKey)); + dataInfo.remove(transDataKey); + } view.setData(chartViewTemplate.getData()); - }else{ - DataEaseException.throwException("模板缓存数据中未获取指定视图数据:"+viewId); + } else { + DataEaseException.throwException("模板缓存数据中未获取指定视图数据:" + viewId); } return view; } diff --git a/frontend/src/views/panel/templateMarket/index.vue b/frontend/src/views/panel/templateMarket/index.vue index a7bace1a49..e90946f5af 100644 --- a/frontend/src/views/panel/templateMarket/index.vue +++ b/frontend/src/views/panel/templateMarket/index.vue @@ -13,7 +13,7 @@ class="market-main" > - + {{ $t('panel.template_market') }} @@ -23,7 +23,7 @@ size="small" class="title-right" :placeholder="$t('panel.enter_template_name_tips')" - clearable="true" + :clearable="true" /> @@ -88,7 +88,7 @@ :visible.sync="folderSelectShow" width="600px" class="market-dialog-css" - append-to-body="true" + :append-to-body="true" :destroy-on-close="true" >