From 2a78e0810fea537e607da573d11af82302f5eda1 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 3 Nov 2021 11:12:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E9=98=BB=E6=AD=A2=E5=9B=9E=E8=BD=A6=E4=BA=8B=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index d91abbe70c..6a8645ba27 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -267,7 +267,7 @@
       class="dialog-css"
     >
       <el-row style="width: 800px;">
-        <el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item">
+        <el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item" @submit.native.prevent>
           <el-col :span="12">
             <el-form-item :label="$t('chart.view_name')">
               <el-input v-model="chartName" style="height: 34px" size="mini" />

From 0dac6cead2fef9266da749f261b418721cc25cbc Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 3 Nov 2021 11:12:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=BC=B9=E6=A1=86=E6=B8=85=E7=A9=BA=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/UnionView.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index fcc08d37e2..b2a09cc388 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -270,6 +270,7 @@ export default {
         targetUnionRelation: ''
       }
       this.targetTable = {}
+      this.targetFieldOption = []
     },
 
     edit(item) {

From 34e187792b2cbeaee7fa5bbf124d2b4776ca8e56 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 3 Nov 2021 11:14:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=9B=B4=E8=BF=9Esql=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/ViewTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 0769e19aa5..c60d7c8d53 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -53,7 +53,7 @@
       <el-tab-pane :label="$t('dataset.field_manage')" name="fieldEdit">
         <field-edit :param="param" />
       </el-tab-pane>
-      <el-tab-pane v-if="table.type !== 'custom'" :label="$t('dataset.join_view')" name="joinView">
+      <el-tab-pane v-if="table.type !== 'custom' && !(table.type === 'sql' && table.mode === 0)" :label="$t('dataset.join_view')" name="joinView">
         <union-view :param="param" :table="table" />
       </el-tab-pane>
       <el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">

From d7aa576a0219805c8c8f840f45ae5541d6b194dd Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 3 Nov 2021 10:36:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index aafbd3f839..2a0c1f4f6c 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -285,7 +285,7 @@ export default {
               } else {
                 this.$error(this.$t(res.message))
               }
-              this.refreshTree()
+              this.refreshType(data)
             }).catch(res => {
               this.$error(res.message)
             })