From 8184fcd9be2252fe6b4a2ce1753525b2eaba56ed Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 19 Sep 2024 14:30:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=20=E2=80=9C=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=9B=BE=E8=A1=A8=E5=8F=8A=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E2=80=9D=20=E7=9A=84=E2=80=9C=E7=BB=B4=E5=BA=A6=E2=80=9D?=
 =?UTF-8?q?=E5=92=8C=E2=80=9C=E5=8F=82=E6=95=B0=E2=80=9D=E6=B7=B7=E6=B7=86?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E2=80=9C=E7=BB=B4=E5=BA=A6=E2=80=9D?=
 =?UTF-8?q?=E5=90=8E=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BB=8D=E7=84=B6=E6=98=AF?=
 =?UTF-8?q?=E2=80=9C=E5=8F=82=E6=95=B0=E2=80=9D=E7=9A=84=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20#12236?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-password/src/CustomPassword.vue       |  6 ++++--
 .../src/components/icon-custom/index.ts          |  2 +-
 .../src/components/visualization/LinkJumpSet.vue |  2 +-
 .../v-query/QueryConditionConfiguration.vue      | 16 ++++++++--------
 core/core-frontend/src/hooks/web/useFilter.ts    | 15 +++++++++++----
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/components/custom-password/src/CustomPassword.vue b/core/core-frontend/src/components/custom-password/src/CustomPassword.vue
index c12e47a0e1..0feec96f3c 100644
--- a/core/core-frontend/src/components/custom-password/src/CustomPassword.vue
+++ b/core/core-frontend/src/components/custom-password/src/CustomPassword.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import { useAttrs, computed } from 'vue'
+import icon_visible_outlined from '@/assets/svg/icon_visible_outlined.svg'
+import icon_invisible_outlined from '@/assets/svg/icon_invisible_outlined.svg'
 import { hIcon } from '@/components/icon-custom'
 const attrs = useAttrs()
 const props = defineProps(['modelValue'])
@@ -13,8 +15,8 @@ const value = computed({
   }
 })
 
-const iconView = hIcon('icon_visible_outlined')
-const iconHide = hIcon('icon_invisible_outlined')
+const iconView = hIcon(icon_visible_outlined)
+const iconHide = hIcon(icon_invisible_outlined)
 </script>
 
 <template>
diff --git a/core/core-frontend/src/components/icon-custom/index.ts b/core/core-frontend/src/components/icon-custom/index.ts
index 0e2f37d0a6..fb5a732cb3 100644
--- a/core/core-frontend/src/components/icon-custom/index.ts
+++ b/core/core-frontend/src/components/icon-custom/index.ts
@@ -3,7 +3,7 @@ import { ElIcon } from 'element-plus-secondary'
 import Icon from './src/Icon.vue'
 const hIcon = (name: string) => {
   return h(ElIcon, null, {
-    default: () => h(Icon, { name })
+    default: () => h(name)
   })
 }
 export { Icon, hIcon }
diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
index a5c4b33117..344c68cc33 100644
--- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
@@ -379,7 +379,7 @@
                                 <Icon
                                   ><component
                                     class="svg-icon"
-                                    :className="`field-icon-${fieldType[item.sourceDeType]}`"
+                                    :class="`field-icon-${fieldType[item.sourceDeType]}`"
                                     :is="iconFieldMap[fieldType[item.sourceDeType]]"
                                   ></component
                                 ></Icon>
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index f6a33c15ae..594adfa216 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1574,15 +1574,15 @@ defineExpose({
                 <template v-if="curComponent.checkedFieldsMap[field.componentId]" #prefix>
                   <el-icon>
                     <Icon
-                      :className="`field-icon-${
-                        fieldType[
-                          getDetype(
-                            curComponent.checkedFieldsMap[field.componentId],
-                            Object.values(field.fields)
-                          )
-                        ]
-                      }`"
                       ><component
+                        :class="`field-icon-${
+                          fieldType[
+                            getDetype(
+                              curComponent.checkedFieldsMap[field.componentId],
+                              Object.values(field.fields)
+                            )
+                          ]
+                        }`"
                         :is="
                           iconFieldMap[
                             fieldType[
diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index c6eaf8ef4f..d828f14074 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -354,14 +354,21 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                 firstLoad
               )
               if (result?.length) {
+                const fieldId = isTree
+                  ? getFieldId(treeFieldList, result)
+                  : item.checkedFieldsMap[curComponentId]
+                const parametersFilter = parameters.reduce((pre, next) => {
+                  if (next.id === fieldId && !pre.length) {
+                    pre.push(next)
+                  }
+                  return pre
+                }, [])
                 filter.push({
                   componentId: ele.id,
-                  fieldId: isTree
-                    ? getFieldId(treeFieldList, result)
-                    : item.checkedFieldsMap[curComponentId],
+                  fieldId,
                   operator,
                   value: result,
-                  parameters,
+                  parameters: parametersFilter,
                   isTree
                 })
               }