From 1889352e16ccbaf11be893792ea0485761494a8a Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 8 May 2026 18:25:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8F=82=E6=95=B0=E5=8C=96=E5=AF=B9=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/hooks/web/useFilter.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index 1a243a8e0f..4dcbc68a7f 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -490,7 +490,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa timeGranularity, timeGranularityMultiple ) - const operator = getOperator( + let operator = getOperator( displayType, multiple, conditionType, @@ -504,6 +504,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa conditionValueS, firstLoad ) + if (result?.length) { let fieldId = item.checkedFieldsMap[curComponentId] if (isTree) { @@ -541,6 +542,9 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa const parametersFilterEnd = duplicateRemoval( item.parametersArr[curComponentId].filter(e => e.id === endTimeFieldId) ) + if (endTimeFieldId.includes('|DE|')) { + operator = multiple ? 'in' : 'eq' + } filter.push({ filterId: id, componentId: ele.id, @@ -574,6 +578,9 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa const parametersFilterEnd = duplicateRemoval( item.parametersArr[curComponentId].filter(e => e.id === endTimeFieldId) ) + if (endTimeFieldId.includes('|DE|')) { + operator = multiple ? 'in' : 'eq' + } filter.push({ filterId: id, componentId: ele.id, @@ -586,6 +593,9 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa }) } + if (fieldId.includes('|DE|')) { + operator = multiple ? 'in' : 'eq' + } filter.push({ filterId: id, componentId: ele.id,