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

fix: 修复外部链接使用外部参数影响后续外部参数使用问题 (#18018)

Browse Source
This commit is contained in:
王嘉豪
2026-03-04 18:43:55 +08:00
committed by GitHub
parent 69c76d74e0
commit 4cb1b7e78c
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,6 +384,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
}
filter.push({
filterId: id,
filterFrom: 'optionFilter',
componentId: ele.id,
fieldId: fieldIdOption,
operator: 'in',

32
core/core-frontend/src/views/chart/components/views/index.vue
View File

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