diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue index 24e88d9b64..498e9fbb07 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -233,10 +233,10 @@ const queryDataForId = id => { if (conditionType === 0) { requiredName = conditionValueF === '' ? next.name : '' } else { - requiredName = [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '') - .length - ? next.name - : '' + requiredName = + [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '').length < 2 + ? next.name + : '' } } else if ( (Array.isArray(next.selectValue) && !next.selectValue.length) || @@ -458,10 +458,10 @@ const queryData = () => { if (conditionType === 0) { requiredName = conditionValueF === '' ? next.name : '' } else { - requiredName = [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '') - .length - ? next.name - : '' + requiredName = + [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '').length < 2 + ? next.name + : '' } } else if ( (Array.isArray(next.selectValue) && !next.selectValue.length) || diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index 6bf40f5c09..0515a3e4bd 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -237,7 +237,12 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa const isTree = +displayType === 9 - if (timeType === 'dynamic' && [1, 7].includes(+displayType) && firstLoad) { + if ( + timeType === 'dynamic' && + [1, 7].includes(+displayType) && + firstLoad && + defaultValueCheck + ) { if (+displayType === 1) { selectValue = getDynamicRange(item) item.defaultValue = new Date(selectValue[0])