From 41806f4e4020addc4984716ea1b1bb9b9347030b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 19 Dec 2024 16:30:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86div=E5=B5=8C=E5=85=A5=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=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/chart/manage/ChartDataManage.java   | 2 +-
 .../src/components/data-visualization/canvas/DePreview.vue    | 1 +
 core/core-frontend/src/locales/en.ts                          | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
index 22c0110ec1..7dfbd76485 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
@@ -234,7 +234,7 @@ public class ChartDataManage {
         }
 
         // web参数条件
-        if (ObjectUtils.isNotEmpty(chartExtRequest.getOuterParamsFilters())) {
+        if (ObjectUtils.isNotEmpty(chartExtRequest.getWebParamsFilters())) {
             filters.addAll(chartExtRequest.getWebParamsFilters());
         }
 
diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
index be29ad1baa..e1f9e19b94 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
@@ -318,6 +318,7 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
 // 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID
 const winMsgHandle = event => {
   const msgInfo = event.data
+  console.info('Received Message: ' + JSON.stringify(msgInfo))
   if (msgInfo?.targetSourceId === dvInfo.value.id + '' && isMainCanvas(canvasId.value))
     if (msgInfo.type === 'attachParams') {
       winMsgOuterParamsHandle(event)
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 4b5672c74e..fcb1880083 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -3239,8 +3239,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     export_to_img: 'Export to Image',
     export_to_app: 'Export to App',
     preview: 'Preview',
-    fullscreen_preview: 'Fullscreen Preview',
-    new_tab_preview: 'Preview in New Tab',
+    fullscreen_preview: 'Fullscreen',
+    new_tab_preview: 'New Tab',
     select_panel_from_left: 'Please select a dashboard from the left',
     template_name: 'Template Name',
     template: 'Template',