github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(仪表板、数据大屏): 修复部分div嵌入参数未生效问题

Browse Source
This commit is contained in:
wangjiahao 2024-12-19 16:30:01 +08:00 committed by 王嘉豪
parent eec20750a1
commit 41806f4e40
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -234,7 +234,7 @@ public class ChartDataManage {
} }
// web参数条件 // web参数条件
if (ObjectUtils.isNotEmpty(chartExtRequest.getOuterParamsFilters())) { if (ObjectUtils.isNotEmpty(chartExtRequest.getWebParamsFilters())) {
filters.addAll(chartExtRequest.getWebParamsFilters()); filters.addAll(chartExtRequest.getWebParamsFilters());
} }

1
core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
View File

@ -318,6 +318,7 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
// 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID // 目标校验： 需要校验targetSourceId 是否是当前可视化资源ID
const winMsgHandle = event => { const winMsgHandle = event => {
const msgInfo = event.data const msgInfo = event.data
console.info('Received Message: ' + JSON.stringify(msgInfo))
if (msgInfo?.targetSourceId === dvInfo.value.id + '' && isMainCanvas(canvasId.value)) if (msgInfo?.targetSourceId === dvInfo.value.id + '' && isMainCanvas(canvasId.value))
if (msgInfo.type === 'attachParams') { if (msgInfo.type === 'attachParams') {
winMsgOuterParamsHandle(event) winMsgOuterParamsHandle(event)

4
core/core-frontend/src/locales/en.ts
View File

@ -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_img: 'Export to Image',
export_to_app: 'Export to App', export_to_app: 'Export to App',
preview: 'Preview', preview: 'Preview',
fullscreen_preview: 'Fullscreen Preview', fullscreen_preview: 'Fullscreen',
new_tab_preview: 'Preview in New Tab', new_tab_preview: 'New Tab',
select_panel_from_left: 'Please select a dashboard from the left', select_panel_from_left: 'Please select a dashboard from the left',
template_name: 'Template Name', template_name: 'Template Name',
template: 'Template', template: 'Template',