From 5e1a37794e9a4c875ec58f12c32e6fe101c44fdd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 Sep 2021 17:34:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E8=BF=9B=E4=BB=AA=E8=A1=A8=E7=89=88=E7=9A=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=96=B9=E5=BC=8F=EF=BC=8C=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E5=9B=BA=E5=AE=9A=E9=AB=98=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/panel/AssistComponent/index.vue |  5 ++++-
 frontend/src/views/panel/edit/index.vue       | 22 +++++++++++--------
 frontend/src/views/panel/filter/index.vue     |  1 -
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/frontend/src/views/panel/AssistComponent/index.vue b/frontend/src/views/panel/AssistComponent/index.vue
index a7da254372..5aed0a3198 100644
--- a/frontend/src/views/panel/AssistComponent/index.vue
+++ b/frontend/src/views/panel/AssistComponent/index.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <div class="filter-container" @dragstart="handleDragStart">
+  <div class="filter-container" @dragstart="handleDragStart" @dragend="handleDragEnd()">
 
     <div class="widget-subject">
       <div class="filter-header">
@@ -134,6 +134,9 @@ export default {
         }
       })
       return component
+    },
+    handleDragEnd(ev) {
+      this.$store.commit('clearDragComponentInfo')
     }
   }
 }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 4114ed5afb..b88cbec477 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -275,7 +275,8 @@ export default {
       adviceGroupId: null,
       scrollLeft: 0,
       scrollTop: 0,
-      timeMachine: null
+      timeMachine: null,
+      dropComponentInfo: null
     }
   },
 
@@ -440,6 +441,8 @@ export default {
       return data
     },
     handleDrop(e) {
+      // 记录拖拽信息
+      this.dropComponentInfo = deepCopy(this.dragComponentInfo)
       this.currentDropElement = e
       e.preventDefault()
       e.stopPropagation()
@@ -491,10 +494,10 @@ export default {
       // position = absolution 或导致有偏移 这里中和一下偏移量
       // component.style.top = this.getPositionY(e.layerY)
       // component.style.left = this.getPositionX(e.layerX)
-      component.style.top = this.dragComponentInfo.shadowStyle.y
-      component.style.left = this.dragComponentInfo.shadowStyle.x
-      component.style.width = this.dragComponentInfo.shadowStyle.width
-      component.style.height = this.dragComponentInfo.shadowStyle.height
+      component.style.top = this.dropComponentInfo.shadowStyle.y
+      component.style.left = this.dropComponentInfo.shadowStyle.x
+      component.style.width = this.dropComponentInfo.shadowStyle.width
+      component.style.height = this.dropComponentInfo.shadowStyle.height
 
       component.id = newComponentId
       this.$store.commit('addComponent', { component })
@@ -594,6 +597,7 @@ export default {
       this.$refs.files.click()
     },
     handleFileChange(e) {
+      const _this = this
       const file = e.target.files[0]
       if (!file.type.includes('image')) {
         toast('只能插入图片')
@@ -618,10 +622,10 @@ export default {
               propValue: fileResult,
               style: {
                 ...commonStyle,
-                top: this.dragComponentInfo.shadowStyle.y,
-                left: this.dragComponentInfo.shadowStyle.x,
-                width: this.dragComponentInfo.shadowStyle.width,
-                height: this.dragComponentInfo.shadowStyle.height
+                top: _this.dropComponentInfo.shadowStyle.y,
+                left: _this.dropComponentInfo.shadowStyle.x,
+                width: _this.dropComponentInfo.shadowStyle.width,
+                height: _this.dropComponentInfo.shadowStyle.height
               }
             }
           })
diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue
index 75d95fae30..83e1389500 100644
--- a/frontend/src/views/panel/filter/index.vue
+++ b/frontend/src/views/panel/filter/index.vue
@@ -91,7 +91,6 @@ export default {
       ev.dataTransfer.setData('componentInfo', JSON.stringify(dataTrans))
     },
     handleDragEnd(ev) {
-      console.log('handleDragEnd==>')
       this.$store.commit('clearDragComponentInfo')
     }
   }