From 4cb1b7e78c27fdb1976b84fd253538ad79d54159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Wed, 4 Mar 2026 18:43:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E4=BD=BF=E7=94=A8=E5=A4=96=E9=83=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=BD=B1=E5=93=8D=E5=90=8E=E7=BB=AD=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BD=BF=E7=94=A8=E9=97=AE=E9=A2=98=20(#1801?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/hooks/web/useFilter.ts | 1 + .../views/chart/components/views/index.vue | 32 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) 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