From 6f449e79b1537d651fba063c2617a25328e5facf Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 11 Jun 2024 11:09:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=94=AF=E6=8C=81=E5=85=A8=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/assets/svg/icon_full-association.svg | 7 +++++++
 .../views/visualized/data/dataset/form/DatasetUnion.vue    | 3 ++-
 .../views/visualized/data/dataset/form/UnionItemEdit.vue   | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 core/core-frontend/src/assets/svg/icon_full-association.svg

diff --git a/core/core-frontend/src/assets/svg/icon_full-association.svg b/core/core-frontend/src/assets/svg/icon_full-association.svg
new file mode 100644
index 0000000000..f880448ec3
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/icon_full-association.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_left-association">
+<circle id="Ellipse 122" cx="7.60005" cy="10.0002" r="4.8" fill="#5C8DFF"/>
+<circle id="Ellipse 122" cx="12.4" cy="10.0012" r="4.8" fill="#5C8DFF"/>
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M10.0001 15.9354C9.25893 16.2354 8.44879 16.4006 7.60007 16.4006C4.06545 16.4006 1.20007 13.5352 1.20007 10.0006C1.20007 6.46596 4.06545 3.60059 7.60007 3.60059C8.44879 3.60059 9.25893 3.76579 10.0001 4.0658C10.7412 3.76579 11.5514 3.60059 12.4001 3.60059C15.9347 3.60059 18.8001 6.46596 18.8001 10.0006C18.8001 13.5352 15.9347 16.4006 12.4001 16.4006C11.5514 16.4006 10.7412 16.2354 10.0001 15.9354ZM11.8664 14.7713C12.0416 14.7906 12.2197 14.8006 12.4001 14.8006C15.051 14.8006 17.2001 12.6516 17.2001 10.0006C17.2001 7.34962 15.051 5.20059 12.4001 5.20059C12.2197 5.20059 12.0416 5.21054 11.8664 5.22992C13.1759 6.40181 14.0001 8.10496 14.0001 10.0006C14.0001 11.8962 13.1759 13.5994 11.8664 14.7713ZM8.13375 5.22992C7.95853 5.21054 7.78046 5.20059 7.60007 5.20059C4.94911 5.20059 2.80007 7.34962 2.80007 10.0006C2.80007 12.6516 4.94911 14.8006 7.60007 14.8006C7.78046 14.8006 7.95853 14.7906 8.13375 14.7713C6.82422 13.5994 6.00007 11.8962 6.00007 10.0006C6.00007 8.10496 6.82422 6.40181 8.13375 5.22992ZM10.0001 5.84274C8.56535 6.67268 7.60007 8.22391 7.60007 10.0006C7.60007 11.7773 8.56535 13.3285 10.0001 14.1584C11.4348 13.3285 12.4001 11.7773 12.4001 10.0006C12.4001 8.22391 11.4348 6.67268 10.0001 5.84274Z" fill="#3370FF"/>
+</g>
+</svg>
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index 67f99ef35f..2236950e67 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -36,7 +36,8 @@ const primaryColor = computed(() => {
 const iconName = {
   left: 'icon_left-association',
   right: 'icon_right-association',
-  inner: 'icon_intersect'
+  inner: 'icon_intersect',
+  full: 'icon_full-association'
 }
 const { t } = useI18n()
 const editSqlField = ref(false)
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 01ff97a8c9..aa75ddc210 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
@@ -8,7 +8,8 @@ const { t } = useI18n()
 const iconName = {
   left: 'icon_left-association',
   right: 'icon_right-association',
-  inner: 'icon_intersect'
+  inner: 'icon_intersect',
+  full: 'icon_full-association'
 }
 const props = defineProps({
   tableName: {
@@ -32,7 +33,8 @@ const props = defineProps({
 const unionOptions = [
   { label: t('dataset.left_join'), value: 'left' },
   { label: t('dataset.right_join'), value: 'right' },
-  { label: t('dataset.inner_join'), value: 'inner' }
+  { label: t('dataset.inner_join'), value: 'inner' },
+  { label: t('dataset.full_join'), value: 'full' }
 ]
 
 const init = () => {