From da82c6fcf6464cbbf3fbf466b18389feac46bc0e Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Mon, 20 May 2024 16:37:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE=20?= =?UTF-8?q?=E2=80=9C=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E9=9B=86=E2=80=9D?= =?UTF-8?q?=20=E4=B8=94=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=80=BC=E4=BC=9A=E8=A2=AB=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=8D=95=E5=BC=95=E5=8F=B7=E5=8C=85=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/hooks/web/useFilter.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index f89d5294bc..35eeee697a 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -150,8 +150,7 @@ const getOperator = ( conditionValueF, conditionValueOperatorS, conditionValueS, - firstLoad, - optionValueSource + firstLoad ) => { const valueF = firstLoad ? defaultConditionValueF : conditionValueF const valueS = firstLoad ? defaultConditionValueS : conditionValueS @@ -170,11 +169,7 @@ const getOperator = ( return valueF === '' ? operatorS : operatorF } - return [1, 7].includes(+displayType) - ? 'between' - : multiple || optionValueSource === 1 - ? 'in' - : 'eq' + return [1, 7].includes(+displayType) ? 'between' : multiple ? 'in' : 'eq' } export const searchQuery = (queryComponentList, filter, curComponentId, firstLoad) => { @@ -304,8 +299,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa conditionValueF, conditionValueOperatorS, conditionValueS, - firstLoad, - optionValueSource + firstLoad ) if (result?.length) { filter.push({