From de5c0119d8be03e21c5fafc39b95975dabd094e0 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 16 Jun 2021 18:26:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 592ef71ff5..668004676e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.cn-qingdao.aliyuncs.com/fit2cloud3/fabric8-java-alpine-openjdk8-jre
+FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre
 
 ARG IMAGE_TAG
 

From 8852fba90f9389d8e14168d7a21cf62ca6f82607 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 16 Jun 2021 18:29:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(fix):=E5=85=B3=E8=81=94=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E9=99=90=E5=88=B6=EF=BC=8C=E9=9D=9E=E7=9B=B4=E8=BF=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BB=9F=E4=B8=80=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=90=8C=E6=AD=A5=E5=90=8E=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=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/UnionView.vue | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index 8d63b7a93e..bf0d804456 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -92,7 +92,7 @@
             width="500"
             trigger="click"
           >
-            <dataset-group-selector :mode="1" @getTable="getTable" />
+            <dataset-group-selector :custom-type="customType" :mode="1" @getTable="getTable" />
             <el-button slot="reference" size="mini" style="width: 100%;">
               <p class="table-name-css" :title="targetTable.name || $t('dataset.pls_slc_union_table')">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</p>
             </el-button>
@@ -161,7 +161,8 @@ export default {
       editUnion: false,
       sourceFieldOption: [],
       targetFieldOption: [],
-      targetTable: {}
+      targetTable: {},
+      customType: ['db', 'sql', 'excel']
     }
   },
   watch: {
@@ -191,11 +192,22 @@ export default {
     },
 
     showUnionEdit() {
-      this.union.sourceTableId = this.table.id
-      fieldList(this.table.id).then(response => {
-        this.sourceFieldOption = response.data
+      // 校验同步状态
+      post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => {
+        if (response.data) {
+          this.union.sourceTableId = this.table.id
+          fieldList(this.table.id).then(response => {
+            this.sourceFieldOption = response.data
+          })
+          this.editUnion = true
+        } else {
+          this.$message({
+            type: 'error',
+            message: this.$t('dataset.invalid_table_check'),
+            showClose: true
+          })
+        }
       })
-      this.editUnion = true
     },
     saveUnion() {
       // console.log(this.union)

From f3cbed1f0c79583a7e1f8ae03ab07f6f06ae4fed Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 16 Jun 2021 18:51:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
index 6f17c63e55..e880756b87 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
@@ -22,11 +22,12 @@
         left join panel_group g on g.id = s.panel_group_id
         where
         ( s.target_id = #{userId} and s.type = 0 ) or
-        ( s.target_id = #{deptId} and s.type = 1 ) or
-        s.target_id in
+        ( s.target_id = #{deptId} and s.type = 2 ) or
+        ( s.target_id in
         <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
             #{roleId}
         </foreach>
+        and s.type = 1 )
         <if test="orderByClause == null">
             order by s.create_time desc
         </if>