Merge branch 'v1.6' of github.com:dataease/dataease into v1.6

frontend/src/lang/en.js

@@ -1211,7 +1211,8 @@ export default {
     add_union_field: 'Add Union Field',
     union_error: 'Union relation and field can not be empty',
     union_repeat: 'This dataset is already union，do not union repeat',
-    preview_result: 'Preview'
+    preview_result: 'Preview',
+    sql_ds_union_error: 'Direct connect SQL dataset can not be union'
   },
   datasource: {
     datasource: 'Data Source',

frontend/src/lang/tw.js

@@ -1211,7 +1211,8 @@ export default {
     add_union_field: '添加關聯字段',
     union_error: '關聯關繫與關聯字段不能為空',
     union_repeat: '當前數據集已被關聯，請勿重復關聯',
-    preview_result: '預覽結果'
+    preview_result: '預覽結果',
+    sql_ds_union_error: '直連模式下SQL數據集，不支持關聯'
   },
   datasource: {
     datasource: '數據源',

frontend/src/lang/zh.js

@@ -1214,7 +1214,8 @@ export default {
     add_union_field: '添加关联字段',
     union_error: '关联关系与关联字段不能为空',
     union_repeat: '当前数据集已被关联，请勿重复关联',
-    preview_result: '预览结果'
+    preview_result: '预览结果',
+    sql_ds_union_error: '直连模式下SQL数据集，不支持关联'
   },
   datasource: {
     datasource: '数据源',

frontend/src/views/dataset/add/AddUnion.vue

@@ -208,6 +208,14 @@ export default {
       this.tempDs = {}
     },
     confirmSelectDs() {
+      if (this.tempDs.mode === 0 && this.tempDs.modelInnerType === 'sql') {
+        this.$message({
+          showClose: true,
+          message: this.$t('dataset.sql_ds_union_error'),
+          type: 'error'
+        })
+        return
+      }
       const ds = JSON.parse(JSON.stringify(this.unionItem))
       ds.currentDs = this.tempDs
       this.dataset.push(ds)