From b8a33d3836cc1cf28240741becfd781d16c7f23e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 2 Nov 2022 14:02:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E6=A8=A1=E6=9D=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=94=E7=94=A8=E5=90=8E=E8=A7=86=E5=9B=BE=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/PanelGroupExtendDataService.java    | 20 +++++++++++++------
 .../src/views/panel/templateMarket/index.vue  |  6 +++---
 2 files changed, 17 insertions(+), 9 deletions(-)

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<PanelGroupExtendData>  extendDataList = panelGroupExtendDataMapper.selectByExampleWithBLOBs(extendDataExample);
-        if(CollectionUtils.isNotEmpty(extendDataList)){
-            ChartViewDTO chartViewTemplate = gson.fromJson(extendDataList.get(0).getViewDetails(),ChartViewDTO.class);
+        List<PanelGroupExtendData> extendDataList = panelGroupExtendDataMapper.selectByExampleWithBLOBs(extendDataExample);
+        if (CollectionUtils.isNotEmpty(extendDataList)) {
+            ChartViewDTO chartViewTemplate = gson.fromJson(extendDataList.get(0).getViewDetails(), ChartViewDTO.class);
+            Map<String, Object> 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"
     >
       <el-row>
-        <el-col span="12">
+        <el-col :span="12">
           <span class="title-left">{{ $t('panel.template_market') }}</span>
         </el-col>
         <el-col span="12">
@@ -23,7 +23,7 @@
             size="small"
             class="title-right"
             :placeholder="$t('panel.enter_template_name_tips')"
-            clearable="true"
+            :clearable="true"
           />
         </el-col>
       </el-row>
@@ -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"
     >
       <el-form