Merge pull request #229 from dataease/pr@dev@feat_数据关联关系修改

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 ";
         }

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',

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: '數據源',

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: '数据源',

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>