fix(仪表板): 修复当开启辅助网格画布有滚动条时,画布滚动部分没有网格的问题

ziyujiahao · ziyujiahao · commit ed849eb29008 · 2022-11-14T16:53:24.000+08:00
diff --git a/frontend/src/components/canvas/DeCanvas.vue b/frontend/src/components/canvas/DeCanvas.vue
@@ -306,6 +306,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
@@ -121,7 +121,7 @@
       :canvas-id="canvasId"
     />
     <!-- 右击菜单 -->
-    <ContextMenu />
+    <ContextMenu/>
 
     <!-- 对齐标线 -->
     <span
@@ -932,7 +932,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

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,7 @@ export default {`
`306`	`306`	`}`
`307`	`307`	`},`
`308`	`308`	`canvasScroll(e) {`
	`309`	`+ this.scrollTop = e.target.scrollTop`
`309`	`310`	`this.$emit('canvasScroll', { scrollLeft: e.target.scrollLeft, scrollTop: e.target.scrollTop })`
`310`	`311`	`bus.$emit('onScroll')`
`311`	`312`	`},`