From 54820d6746ef0b0b5a4642b5cc6831a5db6bb712 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 13 Jul 2021 15:55:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B7=A6=E8=BF=9E=E6=8E=A5=E7=AD=89=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java   |  2 ++
 frontend/src/lang/en.js                        |  6 +++++-
 frontend/src/lang/tw.js                        |  6 +++++-
 frontend/src/lang/zh.js                        |  6 +++++-
 frontend/src/views/dataset/data/UnionView.vue  | 18 ++++++++++++++----
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index b76cb15f64..461fca6b33 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -641,6 +641,8 @@ public class DataSetTableService {
                 return " LEFT JOIN ";
             case "N:1":
                 return " RIGHT JOIN ";
+            case "N:N":
+                return " FULL JOIN ";
             default:
                 return " INNER JOIN ";
         }
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 113a180165..4fd51ed5fd 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -950,7 +950,11 @@ export default {
       change_success: 'State switch successful'
     },
     field_group_type: 'Type',
-    location: 'Location'
+    location: 'Location',
+    left_join: 'LEFT JOIN',
+    right_join: 'RIGHT JOIN',
+    inner_join: 'INNER JOIN',
+    full_join: 'FULL JOIN'
   },
   datasource: {
     datasource: 'Data Source',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 5019d84b28..3cfaf32aa3 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -950,7 +950,11 @@ export default {
       change_success: '狀態切換成功'
     },
     field_group_type: '分類',
-    location: '地理位置'
+    location: '地理位置',
+    left_join: '左連接',
+    right_join: '右連接',
+    inner_join: '內連接',
+    full_join: '全連接'
   },
   datasource: {
     datasource: '數據源',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index a9671fdb32..d8a625ac72 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -950,7 +950,11 @@ export default {
       change_success: '状态切换成功'
     },
     field_group_type: '分类',
-    location: '地理位置'
+    location: '地理位置',
+    left_join: '左连接',
+    right_join: '右连接',
+    inner_join: '内连接',
+    full_join: '全连接'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index f238094cc8..4ce530889e 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -20,7 +20,16 @@
         <el-table-column
           prop="sourceUnionRelation"
           :label="$t('dataset.union_relation')"
-        />
+        >
+          <template slot-scope="scope">
+            <span style="font-size: 12px;">
+              <span v-if="scope.row.sourceUnionRelation === '1:N'">{{ $t('dataset.left_join') }}</span>
+              <span v-if="scope.row.sourceUnionRelation === 'N:1'">{{ $t('dataset.right_join') }}</span>
+              <span v-if="scope.row.sourceUnionRelation === '1:1'">{{ $t('dataset.inner_join') }}</span>
+              <span v-if="scope.row.sourceUnionRelation === 'N:N'">{{ $t('dataset.full_join') }}</span>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="targetTableName"
           :label="$t('dataset.target_table')"
@@ -82,9 +91,10 @@
 
         <el-col :span="6">
           <el-radio-group v-model="union.sourceUnionRelation" size="mini" style="display: block;width: 100%;text-align: center;">
-            <el-radio class="union-relation-css" label="1:1">1 : 1</el-radio>
-            <el-radio class="union-relation-css" label="N:1">N : 1</el-radio>
-            <el-radio class="union-relation-css" label="1:N">1 : N</el-radio>
+            <el-radio class="union-relation-css" label="1:N">{{ $t('dataset.left_join') }}</el-radio>
+            <el-radio class="union-relation-css" label="N:1">{{ $t('dataset.right_join') }}</el-radio>
+            <el-radio class="union-relation-css" label="1:1">{{ $t('dataset.inner_join') }}</el-radio>
+            <el-radio class="union-relation-css" label="N:N">{{ $t('dataset.full_join') }}</el-radio>
           </el-radio-group>
         </el-col>