public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 04:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(仪表板): 使用参数化对图表进行过滤失败

Browse Source
This commit is contained in:
dataeaseShu
2026-05-08 18:25:25 +08:00
committed by dataeaseShu
parent df0f940dbc
commit 1889352e16
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/core-frontend/src/hooks/web/useFilter.ts
View File

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