forked from github/dataease
fix(查询组件): 数值区间默认值
This commit is contained in:
parent
57166982d3
commit
e152442adf
@ -40,7 +40,11 @@ const props = defineProps({
|
|||||||
|
|
||||||
const { config } = toRefs(props)
|
const { config } = toRefs(props)
|
||||||
const setParams = () => {
|
const setParams = () => {
|
||||||
if (!config.value.defaultValueCheck) return
|
if (!config.value.defaultValueCheck) {
|
||||||
|
config.value.numValueEnd = undefined
|
||||||
|
config.value.numValueStart = undefined
|
||||||
|
return
|
||||||
|
}
|
||||||
const { defaultNumValueEnd, defaultNumValueStart } = config.value
|
const { defaultNumValueEnd, defaultNumValueStart } = config.value
|
||||||
config.value.numValueEnd = defaultNumValueEnd
|
config.value.numValueEnd = defaultNumValueEnd
|
||||||
config.value.numValueStart = defaultNumValueStart
|
config.value.numValueStart = defaultNumValueStart
|
||||||
|
@ -181,8 +181,12 @@ const getResultNum = (
|
|||||||
numValueEnd,
|
numValueEnd,
|
||||||
numValueStart,
|
numValueStart,
|
||||||
defaultNumValueStart,
|
defaultNumValueStart,
|
||||||
|
defaultValueCheck,
|
||||||
firstLoad
|
firstLoad
|
||||||
) => {
|
) => {
|
||||||
|
if (firstLoad && !defaultValueCheck) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
const valueS = firstLoad ? defaultNumValueStart : numValueStart
|
const valueS = firstLoad ? defaultNumValueStart : numValueStart
|
||||||
const valueE = firstLoad ? defaultNumValueEnd : numValueEnd
|
const valueE = firstLoad ? defaultNumValueEnd : numValueEnd
|
||||||
return [valueS ?? '', valueE ?? ''].filter(ele => ele !== '')
|
return [valueS ?? '', valueE ?? ''].filter(ele => ele !== '')
|
||||||
@ -347,6 +351,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
|
|||||||
numValueEnd,
|
numValueEnd,
|
||||||
numValueStart,
|
numValueStart,
|
||||||
defaultNumValueStart,
|
defaultNumValueStart,
|
||||||
|
defaultValueCheck,
|
||||||
firstLoad
|
firstLoad
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user