Merge branch 'main' of github.com:dataease/dataease into main

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/components/DeDrag/index.vue

@@ -1197,7 +1197,6 @@ export default {
 
       // 如果辅助设计 需要最后调整矩阵
       if (this.canvasStyleData.auxiliaryMatrix) {
-        debugger
         this.recordMatrixCurStyle()
       }
       this.hasMove && this.$store.commit('recordSnapshot')

frontend/src/components/canvas/components/Editor/index.vue

@@ -40,6 +40,8 @@
         :prop-value="item.propValue"
         :element="item"
         :out-style="getShapeStyleInt(item.style)"
+        :edit-mode="'edit'"
+        :active="item === curComponent"
         @input="handleInput"
       />
       <component

frontend/src/components/canvas/components/Toolbar.vue

@@ -271,6 +271,7 @@ export default {
     float: right;
     height: 35px;
     line-height: 35px;
+    min-width: 900px;
     /*background: #fff;*/
     /*border-bottom: 1px solid #ddd;*/
 

frontend/src/components/canvas/custom-component/VText.vue

 <template>
   <div v-if="editMode == 'edit'" class="v-text" @keydown="handleKeydown" @keyup="handleKeyup">
     <!-- tabindex >= 0 使得双击时聚集该元素 -->
-        <div :contenteditable="canEdit" :class="{ canEdit }" @dblclick="setEdit" :tabindex="element.id" @paste="clearStyle"
-            @mousedown="handleMousedown" @blur="handleBlur" ref="text" v-html="element.propValue" @input="handleInput"
+    <div
+      ref="text"
+      :contenteditable="canEdit"
+      :class="{ canEdit }"
+      :tabindex="element.id"
       :style="{ verticalAlign: element.style.verticalAlign }"
-        ></div>
+      @dblclick="setEdit"
+      @paste="clearStyle"
+      @mousedown="handleMousedown"
+      @blur="handleBlur"
+      @input="handleInput"
+      v-html="element.propValue"
+    />
   </div>
   <div v-else class="v-text">
-        <div v-html="element.propValue" :style="{ verticalAlign: element.style.verticalAlign }"></div>
+    <div :style="{ verticalAlign: element.style.verticalAlign }" v-html="element.propValue" />
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
 import { keycodes } from '@/components/canvas/utils/shortcutKey.js'
 
 export default {
   props: {
     propValue: {
       type: String,
-            require: true,
+      require: true
     },
     element: {
-            type: Object,
+      type: Object
     },
+    editMode: {
+      type: String,
+      require: false,
+      default: 'preview'
+    },
+    active: {
+      type: Boolean,
+      require: false,
+      default: false
+    }
+
   },
   data() {
     return {
       canEdit: false,
       ctrlKey: 17,
-            isCtrlDown: false,
+      isCtrlDown: false
     }
   },
   computed: {
-        ...mapState([
-            'editMode',
-        ]),
+  },
+
+  watch: {
+    active: {
+      handler(newVal, oldVla) {
+        debugger
+        this.removeSelectText()
+      },
+      deep: true
+    }
   },
   methods: {
     handleInput(e) {
@@ -93,7 +119,12 @@ export default {
       selection.removeAllRanges()
       selection.addRange(range)
     },
-    },
+
+    removeSelectText() {
+      const selection = window.getSelection()
+      selection.removeAllRanges()
+    }
+  }
 }
 </script>
 

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() {
+      // 校验同步状态
+      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
+          })
+        }
+      })
     },
     saveUnion() {
       // console.log(this.union)