From 85e4e17ae70ee5adb943f4f39e916bb466ad9eca Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 11 Mar 2024 13:52:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA=E8=BE=83?=
 =?UTF-8?q?=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/editor/Preview.vue     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index 8c44268e78..a47e9c757f 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -842,11 +842,7 @@ export default {
                 if ((key === 'fontSize' || key === 'activeFontSize') && (this.terminal === 'mobile' || ['custom'].includes(component.type))) {
                   // do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件)
                 } else {
-                  if (key === 'fontSize' && component.component !== 'de-tabs') {
-                    component.style[key] = this.formatPoint(component.style[key], this.previewCanvasScale.scalePointWidth * 1.4)
-                  } else {
-                    component.style[key] = this.formatPoint(component.style[key], this.previewCanvasScale.scalePointWidth)
-                  }
+                  component.style[key] = this.formatPoint(component.style[key], this.previewCanvasScale.scalePointWidth)
                 }
               }
             })

From 7e584c440031f59c18fb99bd4663a2640f486904 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 11 Mar 2024 14:08:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E5=B8=A6?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E9=99=84=E4=BB=B6=E7=9A=84=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/chart/ChartViewService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index e4cb0255b9..7607a98a65 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -1329,7 +1329,7 @@ public class ChartViewService {
         }
         // 如果是表格导出查询 则在此处直接就可以返回
         if(chartExtRequest.getExcelExportFlag()){
-            Map<String,Object> sourceInfo = new HashMap<>();
+            Map<String, Object> sourceInfo = ChartDataBuild.transTableNormal(xAxis, yAxis, view, data, extStack, desensitizationList);
             sourceInfo.put("sourceData",data);
             chartViewDTO.setData(sourceInfo);
             return chartViewDTO;