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 @@ + > + + - 1 : 1 - N : 1 - 1 : N + {{ $t('dataset.left_join') }} + {{ $t('dataset.right_join') }} + {{ $t('dataset.inner_join') }} + {{ $t('dataset.full_join') }}