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

fix(数据大屏): 修复定时报告默认选择国际化，默认条件特定情况未生效问题
Some checks are pending
Typos Check / Spell Check with Typos (push) Waiting to run
Details

Browse Source
This commit is contained in:
wangjiahao 2025-01-07 00:00:45 +08:00 committed by 王嘉豪
parent 3a975ec19f
commit 6ca0101e6d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-frontend/src/utils/canvasUtils.ts
View File

@ -231,7 +231,9 @@ export function historyAdaptor(
canvasVersion
) {
const curVersion = wsCache.get('x-de-execute-version')
if (canvasInfo?.checkVersion === curVersion) {
// 含有定时报告过滤项每次都需要匹配
const reportFilterInfo = canvasInfo?.reportFilterInfo
if (canvasInfo?.checkVersion === curVersion && !reportFilterInfo) {
return
}
//历史字段适配
@ -262,7 +264,6 @@ export function historyAdaptor(
canvasStyleResult['popupButtonAvailable'] === undefined
? true
: canvasStyleResult['popupButtonAvailable'] //兼容弹框区域按钮开关
const reportFilterInfo = canvasInfo?.reportFilterInfo
canvasDataResult.forEach(componentItem => {
historyItemAdaptor(componentItem, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
})