diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index 120549b029..45fa4f32ac 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -384,6 +384,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa } filter.push({ filterId: id, + filterFrom: 'optionFilter', componentId: ele.id, fieldId: fieldIdOption, operator: 'in', diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 569f24057b..6237962677 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -500,24 +500,26 @@ const jumpClick = param => { ) { // do filter curFilter.filter.forEach(filterItem => { - targetViewInfoList.forEach(targetViewInfo => { - if (targetViewInfo.sourceFieldActiveId === filterItem.filterId) { - const outerFilterItem = filterOuterParams[targetViewInfo.outerParamsName] - if (outerFilterItem) { - // 当前已经存在 根据arrayType 放置位置 - if (filterItem['arrayType'] === 'END') { - outerFilterItem.value[outerFilterItem.value.length - 1] = filterItem.value[0] + if (filterItem.filterFrom !== 'optionFilter') { + targetViewInfoList.forEach(targetViewInfo => { + if (targetViewInfo.sourceFieldActiveId === filterItem.filterId) { + const outerFilterItem = filterOuterParams[targetViewInfo.outerParamsName] + if (outerFilterItem) { + // 当前已经存在 根据arrayType 放置位置 + if (filterItem['arrayType'] === 'END') { + outerFilterItem.value[outerFilterItem.value.length - 1] = filterItem.value[0] + } else { + outerFilterItem.value[0] = filterItem.value[0] + } } else { - outerFilterItem.value[0] = filterItem.value[0] - } - } else { - filterOuterParams[targetViewInfo.outerParamsName] = { - operator: filterItem.operator, - value: filterItem.value + filterOuterParams[targetViewInfo.outerParamsName] = { + operator: filterItem.operator, + value: filterItem.value + } } } - } - }) + }) + } }) } let attachParamsInfo