From 4848185ba5d6ebcf4b5ac26c966be7d49cd2d78b Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 25 Nov 2021 16:33:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataset/add/union/UnionEdit.vue | 51 +++++++++++++++++--
 frontend/src/views/dataset/group/Group.vue    |  1 +
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/dataset/add/union/UnionEdit.vue b/frontend/src/views/dataset/add/union/UnionEdit.vue
index 7f4393a53e..e0e9a10f90 100644
--- a/frontend/src/views/dataset/add/union/UnionEdit.vue
+++ b/frontend/src/views/dataset/add/union/UnionEdit.vue
@@ -1,11 +1,24 @@
 <template>
   <div v-if="unionParam.type" style="height:400px;">
-    <p>{{ unionParam.node.currentDs.name }}</p>
-    <p>{{ unionParam.parent.currentDs.name }}</p>
+    <div class="field-style">
+      <div class="fields">
+        <p>{{ unionParam.parent.currentDs.name }}</p>
+        <div style="height: 150px;width: 100%;overflow-y: auto">
+          <p v-for="item in parentField" :key="item.id">
+            {{ item.name }}
+          </p>
+        </div>
+      </div>
+      <div class="fields">
+        <p>{{ unionParam.node.currentDs.name }}</p>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import { post } from '@/api/dataset/dataset'
+
 export default {
   name: 'UnionEdit',
   props: {
@@ -16,17 +29,47 @@ export default {
   },
   data() {
     return {
+      parentField: [],
+      nodeField: []
+    }
+  },
+  watch: {
+    'unionParam': function() {
 
     }
   },
   mounted() {
+    this.getParentFieldList()
+    this.getNodeFieldList()
   },
   methods: {
-
+    getParentFieldList() {
+      post('/dataset/field/list/' + this.unionParam.parent.currentDs.id, null, true).then(response => {
+        this.parentField = JSON.parse(JSON.stringify(response.data)).filter(ele => ele.extField === 0)
+      })
+    },
+    getNodeFieldList() {
+      post('/dataset/field/list/' + this.unionParam.node.currentDs.id, null, true).then(response => {
+        this.nodeField = JSON.parse(JSON.stringify(response.data)).filter(ele => ele.extField === 0)
+      })
+    }
   }
 }
 </script>
 
 <style scoped>
-
+.field-style{
+  height: 180px;
+}
+.fields{
+  box-sizing: border-box;
+  -moz-box-sizing: border-box; /* Firefox */
+  -webkit-box-sizing: border-box; /* Safari */
+  width: 50%;
+  float: left;
+  padding: 0 4px;
+}
+p{
+  font-size: 12px;
+}
 </style>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 9ccd74438b..4527d5141c 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -126,6 +126,7 @@
                   <svg-icon v-if="data.type === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
                   <svg-icon v-if="data.type === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
                   <svg-icon v-if="data.type === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
+                  <svg-icon v-if="data.type === 'union'" icon-class="ds-union" class="ds-icon-union" />
                 </span>
                 <span v-if="data.type === 'db' || data.type === 'sql'">
                   <span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>