Merge pull request #13217 from dataease/pr@dev-v2_st

fix(仪表板): 同一个仪表板中使用两个数据集的参数查询会报错
This commit is contained in:
xuwei-fit2cloud 2024-11-08 11:36:24 +08:00 committed by GitHub
commit 1f139f43f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -684,13 +684,13 @@ const setParameters = field => {
Object.values(field?.fields || {})
.flat()
.filter(ele => fieldArr.includes(ele.id) && !!ele.variableName)
.concat(curComponent.value.parameters.filter(ele => fieldArr.includes(ele.id)))
)
nextTick(() => {
if (isTimeParameter.value) {
const timeParameter = curComponent.value.parameters.find(ele => ele.deType === 1)
curComponent.value.timeGranularity =
typeTimeMap[
curComponent.value.parameters[0].type[1] || curComponent.value.parameters[0].type[0]
]
typeTimeMap[timeParameter.type[1] || timeParameter.type[0]]
curComponent.value.displayType = '1'
}