From 5234b1d4078225c84c7155a657c73d881ead70a6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 17 Apr 2024 18:13:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=87=E6=9C=AC=E6=90=9C=E7=B4=A2=E6=8A=8A=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=B8=85=E7=A9=BA=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/Component.vue    |  4 ++
 .../custom-component/v-query/TextSearch.vue   |  5 ++-
 core/core-frontend/src/hooks/web/useFilter.ts | 44 ++++++++-----------
 3 files changed, 26 insertions(+), 27 deletions(-)

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 03add8e9f6..31e899a47f 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -302,6 +302,8 @@ const resetData = () => {
         ? [...next.defaultMapValue]
         : next.defaultMapValue
     }
+    next.conditionValueF = next.defaultConditionValueF
+    next.conditionValueS = next.defaultConditionValueS
     const keyList = Object.entries(next.checkedFieldsMap)
       .filter(ele => next.checkedFields.includes(ele[0]))
       .filter(ele => !!ele[1])
@@ -317,6 +319,8 @@ const clearData = () => {
     if (next.optionValueSource === 1 && next.defaultMapValue?.length) {
       next.mapValue = next.multiple ? [] : undefined
     }
+    next.conditionValueF = ''
+    next.conditionValueS = ''
     const keyList = Object.entries(next.checkedFieldsMap)
       .filter(ele => next.checkedFields.includes(ele[0]))
       .filter(ele => !!ele[1])
diff --git a/core/core-frontend/src/custom-component/v-query/TextSearch.vue b/core/core-frontend/src/custom-component/v-query/TextSearch.vue
index ed2f13fac7..ac3b69fd8d 100644
--- a/core/core-frontend/src/custom-component/v-query/TextSearch.vue
+++ b/core/core-frontend/src/custom-component/v-query/TextSearch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { toRefs, onBeforeMount, type PropType } from 'vue'
+import { toRefs, onBeforeMount, type PropType, inject, type CSSProperties } from 'vue'
 interface SelectConfig {
   conditionValueOperatorF: string
   conditionValueF: string
@@ -57,10 +57,11 @@ const setParams = () => {
 onBeforeMount(() => {
   setParams()
 })
+const customStyle = inject<{ background: string }>('$custom-style-filter')
 </script>
 
 <template>
-  <div class="text-search-select">
+  <div class="text-search-select" :style="{ background: customStyle.background }">
     <div class="condition-type">
       <el-select
         class="condition-value-select"
diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index 3c678c1ea8..3be2a49fe6 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -211,14 +211,6 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
               multiple
             } = item
 
-            console.log(
-              'displayType',
-              timeType === 'dynamic',
-              [1, 7].includes(+displayType),
-              firstLoad,
-              curComponentId
-            )
-
             if (timeType === 'dynamic' && [1, 7].includes(+displayType) && firstLoad) {
               if (+displayType === 1) {
                 selectValue = getDynamicRange(item)
@@ -308,23 +300,25 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                 firstLoad,
                 optionValueSource
               )
-              filter.push({
-                componentId: ele.id,
-                fieldId: item.checkedFieldsMap[curComponentId],
-                operator,
-                value: result,
-                parameters: parametersCheck
-                  ? +displayType === 7
-                    ? [
-                        parametersStart,
-                        parametersEnd?.id
-                          ? { ...parametersEnd, id: `${parametersEnd.id}_START_END_SPLIT` }
-                          : parametersEnd
-                      ]
-                    : parameters
-                  : [],
-                isTree
-              })
+              if (result?.length) {
+                filter.push({
+                  componentId: ele.id,
+                  fieldId: item.checkedFieldsMap[curComponentId],
+                  operator,
+                  value: result,
+                  parameters: parametersCheck
+                    ? +displayType === 7
+                      ? [
+                          parametersStart,
+                          parametersEnd?.id
+                            ? { ...parametersEnd, id: `${parametersEnd.id}_START_END_SPLIT` }
+                            : parametersEnd
+                        ]
+                      : parameters
+                    : [],
+                  isTree
+                })
+              }
             }
           }
         })