mirror of
https://github.com/dataease/dataease.git
synced 2026-05-15 13:32:18 +08:00
fix(查询组件): 已有时间范围条件中,新增对其他组件的时间字段的设置时,时间范围类型会变成时间类型
This commit is contained in:
committed by
xuwei-fit2cloud
parent
9a00a63a9d
commit
8dfb9904b6
@@ -253,8 +253,6 @@ const showTypeError = computed(() => {
|
||||
return false
|
||||
}
|
||||
if (displayTypeField.type?.length !== field.type?.length) {
|
||||
console.log('displayTypeField')
|
||||
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -704,8 +702,15 @@ const setParameters = field => {
|
||||
curComponent.value.checkedFieldsMap[field.componentId]
|
||||
}
|
||||
})
|
||||
|
||||
const notChangeType =
|
||||
curComponent.value.checkedFields.some(ele => {
|
||||
return (
|
||||
curComponent.value.checkedFieldsMapStart[ele] || curComponent.value.checkedFieldsMapEnd[ele]
|
||||
)
|
||||
}) && +curComponent.value.displayType === 7
|
||||
nextTick(() => {
|
||||
if (isTimeParameter.value) {
|
||||
if (isTimeParameter.value && !notChangeType) {
|
||||
const timeParameter = curComponent.value.parameters.find(ele => ele.deType === 1)
|
||||
curComponent.value.timeGranularity =
|
||||
typeTimeMap[timeParameter.type[1] || timeParameter.type[0]]
|
||||
@@ -735,6 +740,8 @@ const setParameters = field => {
|
||||
}
|
||||
setTypeChange()
|
||||
})
|
||||
|
||||
if (notChangeType) return
|
||||
setType()
|
||||
if (curComponent.value.displayType === '9') {
|
||||
setTreeDefault()
|
||||
@@ -773,6 +780,17 @@ const setType = () => {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
curComponent.value.checkedFields.some(ele => {
|
||||
return (
|
||||
curComponent.value.checkedFieldsMapStart[ele] || curComponent.value.checkedFieldsMapEnd[ele]
|
||||
)
|
||||
}) &&
|
||||
+curComponent.value.displayType === 1
|
||||
) {
|
||||
curComponent.value.displayType = '7'
|
||||
}
|
||||
}
|
||||
|
||||
const setTypeChange = () => {
|
||||
|
||||
Reference in New Issue
Block a user