From dadb1f4f4d65dc0c6243452c4c5a9699189bd37d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 12 Oct 2021 11:05:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=85=88=E7=BA=A7=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA'=E8=A7=86=E5=9B=BE'=EF=BC=8C=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E4=BC=98=E5=8C=96=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/shadow.vue      |  8 --------
 .../canvas/components/Editor/Preview.vue       |  2 +-
 .../canvas/components/Editor/index.vue         | 18 +++---------------
 frontend/src/views/chart/chart/chart.js        |  2 +-
 frontend/src/views/chart/group/Group.vue       |  1 +
 frontend/src/views/panel/ViewSelect/index.vue  |  2 +-
 frontend/src/views/panel/edit/index.vue        | 12 +++++++++---
 7 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/DeDrag/shadow.vue b/frontend/src/components/DeDrag/shadow.vue
index 0c86adef46..927096197e 100644
--- a/frontend/src/components/DeDrag/shadow.vue
+++ b/frontend/src/components/DeDrag/shadow.vue
@@ -47,13 +47,6 @@ export default {
         height = this.curComponent.style.height * this.curCanvasScale.scalePointHeight
         // console.log('curComponent left:' + left + 'top:' + top + 'width:' + width + 'height:' + height)
       }
-      // 当前默认为自适应
-      // if (this.canvasStyleData.auxiliaryMatrix) {
-      //   left = Math.round(left / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
-      //   width = Math.round(width / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
-      //   top = Math.round(top / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight
-      //   height = Math.round(height / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight
-      // }
 
       // 防止阴影区超出边界
       const xGap = left + width - this.canvasWidth
@@ -107,7 +100,6 @@ export default {
 </script>
 <style scoped>
   .main-shadow{
-    transition: 0.2s;
     opacity: 0.4;
     background: #409eff;
     position: absolute;
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 949e6855a2..c256d970ff 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -189,7 +189,7 @@ export default {
       this.scaleWidth = canvasWidth * 100 / parseInt(this.canvasStyleData.width)// 获取宽度比
       this.scaleHeight = canvasHeight * 100 / parseInt(this.canvasStyleData.height)// 获取高度比
 
-      console.log('scaleHeight:' + this.scaleHeight + ';ch:' + this.canvasStyleData.height)
+      // console.log('scaleHeight:' + this.scaleHeight + ';ch:' + this.canvasStyleData.height)
 
       // this.scaleHeight = this.scaleWidth
       // this.mainHeight = this.canvasStyleData.height * this.scaleHeight / 100 + 'px'
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 20ee1fe0f3..15a9183f51 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -8,7 +8,6 @@
         ['parent_transform']:!chartDetailsVisible
       }
     ]"
-    @dragover="handleDragOver"
     @mousedown="handleMouseDown"
     @scroll="canvasScroll"
   >
@@ -1348,22 +1347,11 @@ export default {
       }
     },
     handleDragOver(e) {
+      // console.log('handleDragOver-Editor')
       this.dragComponentInfo.shadowStyle.x = e.pageX - 220
       this.dragComponentInfo.shadowStyle.y = e.pageY - 90
       this.dragComponentInfo.style.left = this.dragComponentInfo.shadowStyle.x / this.scalePointWidth
       this.dragComponentInfo.style.top = this.dragComponentInfo.shadowStyle.y / this.scalePointHeight
-
-      // console.log('handleDragOver=>layer:' + e.layerX + ':' + e.layerY + ';offSet=>' + e.offsetX + ':' + e.offsetY + ';page=' + e.pageX + ':' + e.pageY)
-      // console.log('e=>x=>' + JSON.stringify(e))
-      // 使用e.pageX 避免抖动的情况
-      // this.dragComponentInfo.x = this.dragComponentInfo.shadowStyle.x
-      // this.dragComponentInfo.y = this.dragComponentInfo.shadowStyle.y
-      // this.dragComponentInfo.x = Math.round(this.dragComponentInfo.shadowStyle.x / this.matrixStyle.width)
-      // this.dragComponentInfo.y = Math.round(this.dragComponentInfo.shadowStyle.y / this.matrixStyle.height)
-      // console.log('dragComponentInfo=>' + JSON.stringify(this.dragComponentInfo))
-      e.preventDefault()
-      e.dataTransfer.dropEffect = 'copy'
-
       if (this.canvasStyleData.auxiliaryMatrix) {
         this.onDragging(e, this.dragComponentInfo)
       }
@@ -1679,14 +1667,14 @@ export default {
       })
     },
     removeLastItem() {
-      console.log('rlI:' + JSON.stringify(this.yourList))
+      // console.log('rlI:' + JSON.stringify(this.yourList))
       this.removeItem(this.yourList.length - 1)
     },
     startMoveIn() {
       if (this.canvasStyleData.auxiliaryMatrix) {
         const moveInItemInfo = this.$store.state.dragComponentInfo
         this.addItemBox(moveInItemInfo)
-        console.log('startMoveIn:')
+        // console.log('startMoveIn:')
         const vm = this
         // e.preventDefault();
         if (!this.infoBox) {
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index e0bceaf5ed..909d34af5d 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -606,7 +606,7 @@ export const BASE_GAUGE = {
 }
 
 export const BASE_CHART_STRING = {
-  stylePriority: 'panel',
+  stylePriority: 'view',
   xaxis: '[]',
   yaxis: '[]',
   show: true,
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 98176c3c51..d8c7cf620a 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -745,6 +745,7 @@ export default {
         background: DEFAULT_BACKGROUND_COLOR,
         split: DEFAULT_SPLIT
       })
+      view.stylePriority = 'view' // 默认样式优先级视图
       view.xaxis = JSON.stringify([])
       view.yaxis = JSON.stringify([])
       view.yaxisExt = JSON.stringify([])
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index 9b58d88cbd..20e9ccbe39 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -141,7 +141,7 @@ export default {
       eventBus.$emit('startMoveIn')
     },
     dragEnd() {
-      console.log('dragEnd')
+      // console.log('dragEnd')
       this.$store.commit('clearDragComponentInfo')
     },
     // 判断节点能否被拖拽
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 8efbe12b8d..43dcbc6469 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -96,13 +96,14 @@
 
         <div
           id="canvasInfo"
-          class="this_canvas"
-          :style="customCanvasStyle"
+          :class="{'style-hidden':canvasStyleData.selfAdaption}"
+          class="content this_canvas"
           @drop="handleDrop"
+          @dragover="handleDragOver"
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
         >
-          <Editor v-if="!previewVisible" :out-style="outStyle" @canvasScroll="canvasScroll" />
+          <Editor ref="canvasEditor" v-if="!previewVisible" :out-style="outStyle" @canvasScroll="canvasScroll" />
         </div>
       </de-main-container>
       <!--      <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->
@@ -790,6 +791,11 @@ export default {
         }
         this.destroyTimeMachine()
       }, 1000)
+    },
+    handleDragOver(e) {
+      e.preventDefault()
+      e.dataTransfer.dropEffect = 'copy'
+      this.$refs.canvasEditor.handleDragOver(e)
     }
   }
 }