From 4b67acf258606ba58ed630213464f7764c8d1a3e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 14 Nov 2022 16:53:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=BD=93=E5=BC=80=E5=90=AF=E8=BE=85=E5=8A=A9=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E7=94=BB=E5=B8=83=E6=9C=89=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E6=97=B6,=E7=94=BB=E5=B8=83=E6=BB=9A=E5=8A=A8=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=B2=A1=E6=9C=89=E7=BD=91=E6=A0=BC=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/DeCanvas.vue                   | 1 +
 frontend/src/components/canvas/components/Editor/DeEditor.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/DeCanvas.vue b/frontend/src/components/canvas/DeCanvas.vue
index 5ecd17d185..07861ac853 100644
--- a/frontend/src/components/canvas/DeCanvas.vue
+++ b/frontend/src/components/canvas/DeCanvas.vue
@@ -287,6 +287,7 @@ export default {
       }
     },
     canvasScroll(e) {
+      this.scrollTop = e.target.scrollTop
       this.$emit('canvasScroll', { scrollLeft: e.target.scrollLeft, scrollTop: e.target.scrollTop })
       bus.$emit('onScroll')
     },
diff --git a/frontend/src/components/canvas/components/Editor/DeEditor.vue b/frontend/src/components/canvas/components/Editor/DeEditor.vue
index bd7bc2c023..2b4f731ffd 100644
--- a/frontend/src/components/canvas/components/Editor/DeEditor.vue
+++ b/frontend/src/components/canvas/components/Editor/DeEditor.vue
@@ -120,7 +120,7 @@
       :canvas-id="canvasId"
     />
     <!-- 右击菜单 -->
-    <ContextMenu />
+    <ContextMenu/>
 
     <!-- 对齐标线 -->
     <span
@@ -931,7 +931,7 @@ export default {
       return !this.linkageSettingStatus && !this.batchOptStatus
     },
     showGrid() {
-      if (this.canvasStyleData && this.canvasStyleData.aidedDesign) {
+      if (this.canvasStyleData && this.canvasStyleData.aidedDesign && this.canvasId === 'canvas-main') {
         return this.canvasStyleData.aidedDesign.showGrid
       } else {
         return false