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',