From 6ca0101e6d73b89ae57b40a0e7026cf6e0cd2b0c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 7 Jan 2025 00:00:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E6=8B=A9=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9D=A1=E4=BB=B6=E7=89=B9=E5=AE=9A=E6=83=85?= =?UTF-8?q?=E5=86=B5=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 --- core/core-frontend/src/utils/canvasUtils.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 3c66bbc9c4..3f4ab8635c 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -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) })