Merge remote-tracking branch 'origin/main' into main

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
 

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>

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)