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 cdce465881..00be249e12 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -293,12 +293,11 @@ const delQueryConfig = index => { const resetData = () => { ;(list.value || []).reduce((pre, next) => { - if (next.defaultConditionValueF?.length) { - next.conditionValueF = next.defaultConditionValueF - } - if (next.defaultConditionValueS?.length) { - next.conditionValueS = next.defaultConditionValueS - } + next.conditionValueF = next.defaultConditionValueF + next.conditionValueOperatorF = next.defaultConditionValueOperatorF + next.conditionValueS = next.defaultConditionValueS + next.conditionValueOperatorS = next.defaultConditionValueOperatorS + if (!next.defaultValueCheck) { next.defaultValue = next.multiple || +next.displayType === 7 ? [] : undefined } diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index 3be2a49fe6..4116247b81 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -154,7 +154,7 @@ const getOperator = ( const operatorS = firstLoad ? defaultConditionValueOperatorS : conditionValueOperatorS if (displayType === '8') { if (conditionType === 0) { - return defaultConditionValueOperatorF + return operatorF } const operatorArr = [valueF === '' ? '' : operatorF, valueS === '' ? '' : operatorS].filter( ele => ele !== ''