diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 988674d5cc..1287b31817 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1160,7 +1160,8 @@ export default { union: 'Union', edit_union_relation: 'Edit Union Relation', add_union_relation: 'Add Union Relation', - field_select: 'Select Field' + field_select: 'Select Field', + add_union_field: 'Add Union Field' }, datasource: { datasource: 'Data Source', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 7cb081534b..88c26ca89b 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1161,7 +1161,8 @@ export default { union: '關聯', edit_union_relation: '編輯關聯關系', add_union_relation: '新建關聯關系', - field_select: '字段選擇' + field_select: '字段選擇', + add_union_field: '添加關聯字段' }, datasource: { datasource: '數據源', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index c8cb2ec8f6..9d7eabbb81 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1163,7 +1163,8 @@ export default { union: '关联', edit_union_relation: '编辑关联关系', add_union_relation: '新建关联关系', - field_select: '字段选择' + field_select: '字段选择', + add_union_field: '添加关联字段' }, datasource: { datasource: '数据源', diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 329bbeb7ab..07c09f10df 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -95,7 +95,7 @@ export default { currentDsField: [], childrenDs: [], unionToParent: { - unionType: '', // left join,right join,inner join + unionType: 'left', // left join,right join,inner join unionFields: [ { parentField: {}, @@ -117,7 +117,7 @@ export default { currentDsField: [], childrenDs: [], unionToParent: { - unionType: '', + unionType: 'left', unionFields: [] }, allChildCount: 0 diff --git a/frontend/src/views/dataset/add/union/NodeItem.vue b/frontend/src/views/dataset/add/union/NodeItem.vue index dddd175d24..2528462454 100644 --- a/frontend/src/views/dataset/add/union/NodeItem.vue +++ b/frontend/src/views/dataset/add/union/NodeItem.vue @@ -60,7 +60,7 @@ export default { currentDsField: [], childrenDs: [], unionToParent: { - unionType: '', + unionType: 'left', unionFields: [] }, allChildCount: 0 diff --git a/frontend/src/views/dataset/add/union/UnionEdit.vue b/frontend/src/views/dataset/add/union/UnionEdit.vue index c020b1f4e8..486a70d80c 100644 --- a/frontend/src/views/dataset/add/union/UnionEdit.vue +++ b/frontend/src/views/dataset/add/union/UnionEdit.vue @@ -3,24 +3,26 @@
{{ unionParam.parent.currentDs.name }}
-{{ unionParam.node.currentDs.name }}
-