From e152442adff3c9224f9267247bffaaeaa8006df2 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Wed, 6 Nov 2024 15:00:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E6=95=B0=E5=80=BC=E5=8C=BA=E9=97=B4=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/v-query/NumberInput.vue | 6 +++++- core/core-frontend/src/hooks/web/useFilter.ts | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/custom-component/v-query/NumberInput.vue b/core/core-frontend/src/custom-component/v-query/NumberInput.vue index ec155c9490..164dd0cdf3 100644 --- a/core/core-frontend/src/custom-component/v-query/NumberInput.vue +++ b/core/core-frontend/src/custom-component/v-query/NumberInput.vue @@ -40,7 +40,11 @@ const props = defineProps({ const { config } = toRefs(props) 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 config.value.numValueEnd = defaultNumValueEnd config.value.numValueStart = defaultNumValueStart diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index aeaf781ffd..6f36602a5a 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -181,8 +181,12 @@ const getResultNum = ( numValueEnd, numValueStart, defaultNumValueStart, + defaultValueCheck, firstLoad ) => { + if (firstLoad && !defaultValueCheck) { + return [] + } const valueS = firstLoad ? defaultNumValueStart : numValueStart const valueE = firstLoad ? defaultNumValueEnd : numValueEnd return [valueS ?? '', valueE ?? ''].filter(ele => ele !== '') @@ -347,6 +351,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa numValueEnd, numValueStart, defaultNumValueStart, + defaultValueCheck, firstLoad ) } else {