center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor(仪表板、数据大屏): 嵌入式参数传参允许传入清空标志清空预设参数

Browse Source
This commit is contained in:
wangjiahao 2024-11-06 13:21:04 +08:00
parent 564be73a60
commit 67f0e5ff86
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/core-frontend/src/store/modules/data-visualization/dvMain.ts
View File

@ -1107,7 +1107,12 @@ export const dvMainStore = defineStore('dataVisualization', {
targetInfoList.forEach(targetInfo => { targetInfoList.forEach(targetInfo => {
const targetInfoArray = targetInfo.split('#') const targetInfoArray = targetInfo.split('#')
const targetViewId = targetInfoArray[0] // 目标图表 const targetViewId = targetInfoArray[0] // 目标图表
if (element.component === 'UserView' && element.id === targetViewId) { // DE_EMPTY 为清空条件标志
if (
element.component === 'UserView' &&
element.id === targetViewId &&
'DE_EMPTY' !== paramValueStr
) {
// 如果目标图表 和 当前循环组件id相等 则进行条件增减 // 如果目标图表 和 当前循环组件id相等 则进行条件增减
const targetFieldId = targetInfoArray[1] // 目标图表列ID const targetFieldId = targetInfoArray[1] // 目标图表列ID
const condition = { const condition = {
@ -1152,6 +1157,8 @@ export const dvMainStore = defineStore('dataVisualization', {
filterItem['selectValue'] = queryParams[0] filterItem['selectValue'] = queryParams[0]
filterItem['defaultValue'] = queryParams[0] filterItem['defaultValue'] = queryParams[0]
} }
filterItem['defaultMapValue'] = queryParams
filterItem['mapValue'] = queryParams
} else if (filterItem.displayType === '1') { } else if (filterItem.displayType === '1') {
// 1 时间类型 // 1 时间类型
filterItem['selectValue'] = queryParams[0] filterItem['selectValue'] = queryParams[0]
@ -1162,8 +1169,14 @@ export const dvMainStore = defineStore('dataVisualization', {
filterItem['defaultValue'] = queryParams filterItem['defaultValue'] = queryParams
} else if (filterItem.displayType === '8') { } else if (filterItem.displayType === '8') {
// 8 文本搜索 // 8 文本搜索
filterItem.conditionValueF = parmaValueSource + '' filterItem['conditionValueF'] = parmaValueSource + ''
filterItem.defaultConditionValueF = parmaValueSource + '' filterItem['defaultConditionValueF'] = parmaValueSource + ''
}
if ('DE_EMPTY' === paramValueStr) {
filterItem['selectValue'] = null
filterItem['defaultValue'] = null
filterItem['conditionValueF'] = null
filterItem['defaultConditionValueF'] = null
} }
} }
}) })
@ -1268,8 +1281,8 @@ export const dvMainStore = defineStore('dataVisualization', {
} }
} else if (filterItem.displayType === '8') { } else if (filterItem.displayType === '8') {
// 8 文本搜索 // 8 文本搜索
filterItem.conditionValueF = queryParams[0] filterItem['conditionValueF'] = queryParams[0]
filterItem.defaultConditionValueF = queryParams[0] filterItem['defaultConditionValueF'] = queryParams[0]
} }
} }
}) })