From a7c3ac2a36fe31e101e963b652fcccc7ed6e48a6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Sun, 29 Sep 2024 17:20:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E8=BF=9E=E8=A1=A8=E7=BC=BA=E5=B0=91=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue               | 2 +-
 .../views/visualized/data/dataset/form/UnionItemEdit.vue  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 b680693711..a987a6581b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -2139,7 +2139,7 @@ defineExpose({
               </div>
             </div>
           </div>
-          <div v-if="curComponent.displayType === '8'">
+          <div style="margin-bottom: 10.5px" v-if="curComponent.displayType === '8'">
             <el-checkbox v-model="curComponent.hideConditionSwitching" label="隐藏条件切换" />
           </div>
           <condition-default-configuration
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue b/core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue
index a758556c74..3949adb4d1 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue
@@ -15,10 +15,10 @@ import { iconFieldMap } from '@/components/icon-group/field-list'
 const unionTypeFromParent = ref('left')
 const { t } = useI18n()
 const iconName = {
-  left: 'icon_left-association',
-  right: 'icon_right-association',
-  inner: 'icon_intersect',
-  full: 'icon_full-association'
+  left: icon_leftAssociation,
+  right: icon_rightAssociation,
+  inner: icon_intersect,
+  full: icon_fullAssociation
 }
 const props = defineProps({
   tableName: {