From 3ca7a5e02989688453d399f89ef77dbb70b357f0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 Sep 2021 18:34:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=EF=BC=8C=E6=A0=B7=E5=BC=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E5=AE=9A=E4=BD=8D=E4=B8=8D=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/index.vue | 4 ++++
 frontend/src/views/panel/edit/index.vue                    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 7ca32d959e..1b307388dd 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -11,6 +11,7 @@
     :style="customStyle"
     @dragover="handleDragOver"
     @mousedown="handleMouseDown"
+    @scroll="canvasScroll"
   >
     <!-- 网格线 -->
     <!--    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
@@ -666,6 +667,9 @@ export default {
       } else {
         return y
       }
+    },
+    canvasScroll(event) {
+      this.$emit('canvasScroll', event)
     }
   }
 }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index b88cbec477..5315426aa3 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -100,9 +100,8 @@
           @drop="handleDrop"
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
-          @scroll="canvasScroll"
         >
-          <Editor v-if="!previewVisible" :out-style="outStyle" />
+          <Editor 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">-->
@@ -696,6 +695,7 @@ export default {
       }
     },
     canvasScroll(event) {
+      console.log('testTop' + event.target.scrollTop)
       this.scrollLeft = event.target.scrollLeft
       this.scrollTop = event.target.scrollTop
     },