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

.gitmodules

-[submodule "dataease-plugins"]
-	path = dataease-plugins
-	url = git@github.com:dataease/dataease-plugins.git
-[submodule "dataease-plugin-xpack"]
-	path = dataease-plugin-xpack
-	url = git@github.com:dataease/dataease-plugin-xpack.git

dataease-plugin-xpack @ 9879b705

-Subproject commit 9879b705aa4a5105056109ecf5b9da70b783969d

dataease-plugins @ 2541de3d

-Subproject commit 2541de3d2c82f37dcf9916fda70ada0ca3fc6132

frontend/src/components/DeDrag/index.vue

@@ -1083,7 +1083,6 @@ export default {
       this.element.propValue && this.element.propValue.viewId && eventBus.$emit('resizing', this.element.propValue.viewId)
     },
     changeWidth(val) {
-      debugger
       // console.log('parentWidth', this.parentWidth)
       // console.log('parentHeight', this.parentHeight)
       const [newWidth, _] = snapToGrid(this.grid, val, 0, this.scale)

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

@@ -126,7 +126,6 @@ export default {
     changeStyleWithScale,
     getStyle,
     restore() {
-      debugger
       const canvasHeight = document.getElementById('canvasInfoTemp').offsetHeight
       const canvasWidth = document.getElementById('canvasInfoTemp').offsetWidth
       this.scaleWidth = canvasWidth * 100 / parseInt(this.canvasStyleData.width)// 获取宽度比

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

@@ -57,7 +57,6 @@ export default {
   watch: {
     active: {
       handler(newVal, oldVla) {
-        debugger
         this.removeSelectText()
       },
       deep: true

frontend/src/views/chart/group/Group.vue

@@ -807,7 +807,7 @@ export default {
           }
         }
       } else {
-        resolve(node.data.children)
+        node.data.children && resolve(node.data.children)
       }
     },
 

frontend/src/views/dataset/group/Group.vue

@@ -828,7 +828,7 @@ export default {
           }
         }
       } else {
-        resolve(node.data.children)
+        node.data.children && resolve(node.data.children)
       }
     },
 

frontend/src/views/panel/edit/index.vue

@@ -447,7 +447,6 @@ export default {
       this.$store.commit('recordSnapshot')
       this.clearCurrentInfo()
 
-      debugger
       // 文字组件
       if (component.type === 'v-text' || component.type === 'rect-shape') {
         this.$store.commit('setCurComponent', { component: component, index: this.componentData.length })