center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #3739 from dataease/pr@dev@fix_grid-lost

Browse Source 
fix(仪表板): 修复当开启辅助网格画布有滚动条时,画布滚动部分没有网格的问题
This commit is contained in:
Junjun 2022-11-14 16:54:50 +08:00 committed by GitHub
commit 7cf2f9da02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/canvas/DeCanvas.vue
View File

@ -306,6 +306,7 @@ export default {
} }
}, },
canvasScroll(e) { canvasScroll(e) {
this.scrollTop = e.target.scrollTop
this.$emit('canvasScroll', { scrollLeft: e.target.scrollLeft, scrollTop: e.target.scrollTop }) this.$emit('canvasScroll', { scrollLeft: e.target.scrollLeft, scrollTop: e.target.scrollTop })
bus.$emit('onScroll') bus.$emit('onScroll')
}, },

4
frontend/src/components/canvas/components/editor/DeEditor.vue
View File

@ -121,7 +121,7 @@
:canvas-id="canvasId" :canvas-id="canvasId"
/> />
<!-- 右击菜单 --> <!-- 右击菜单 -->
<ContextMenu /> <ContextMenu/>
<!-- 对齐标线 --> <!-- 对齐标线 -->
<span <span
@ -932,7 +932,7 @@ export default {
return !this.linkageSettingStatus && !this.batchOptStatus return !this.linkageSettingStatus && !this.batchOptStatus
}, },
showGrid() { showGrid() {
if (this.canvasStyleData && this.canvasStyleData.aidedDesign) { if (this.canvasStyleData && this.canvasStyleData.aidedDesign && this.canvasId === 'canvas-main') {
return this.canvasStyleData.aidedDesign.showGrid return this.canvasStyleData.aidedDesign.showGrid
} else { } else {
return false return false