From 494771fac6a24579562ff6ecc1d4d1b49883c872 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 3 Jul 2024 10:01:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/hooks/web/useFilter.ts | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index e78a9771a2..6bf40f5c09 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -123,16 +123,9 @@ const getValueByDefaultValueCheckOrFirstLoad = (
   }
 
   if (firstLoad && !selectValue?.length) {
-    return defaultValueCheck
-      ? Array.isArray(defaultValue)
-        ? defaultValue
-        : [defaultValue]
-      : multiple
-      ? []
-      : ''
+    return defaultValueCheck ? defaultValue : multiple ? [] : ''
   }
-
-  return selectValue ? (Array.isArray(selectValue) ? selectValue : [selectValue]) : ''
+  return selectValue ? selectValue : ''
 }
 
 export const useFilter = (curComponentId: string, firstLoad = false) => {
@@ -310,8 +303,10 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
             }
             if (
               !!selectValue?.length ||
-              displayType === '8' ||
-              Object.prototype.toString.call(selectValue) === '[object Date]'
+              ['[object Number]', '[object Date]'].includes(
+                Object.prototype.toString.call(selectValue)
+              ) ||
+              displayType === '8'
             ) {
               const result = forMatterValue(
                 +displayType,