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

Merge pull request #1562 from dataease/pr@dev@feat-mobile-reset

Browse Source 
refactor: 仪表板间隙设置优化
This commit is contained in:
王嘉豪 2021-12-30 11:48:57 +08:00 committed by GitHub
commit 6a56fe9b84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/DeDrag/index.vue
View File

@ -535,7 +535,7 @@ export default {
return this.$store.state.curComponent
},
curGap() {
return this.element.auxiliaryMatrix && this.element.type !== 'custom' ? this.componentGap : 0
return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix && this.element.type !== 'custom') ? this.componentGap : 0
},
...mapState([
'editor',

2
frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
View File

@ -85,7 +85,7 @@ export default {
return (this.curComponent && this.config === this.curComponent) && !this.previewVisible
},
curGap() {
return this.config.auxiliaryMatrix ? this.componentGap : 0
return (this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix) ? this.componentGap : 0
},
...mapState([
'mobileLayoutStatus',

4
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -261,6 +261,10 @@ export default {
if (!this.preCanvasPanel || this.preCanvasPanel.resultCount !== newVal.panel.resultCount || this.preCanvasPanel.resultMode !== newVal.panel.resultMode) {
this.getData(this.element.propValue.viewId, false)
}
// 如果gap有变化刷新
if (this.preCanvasPanel && this.preCanvasPanel.gap !== newVal.panel.gap) {
this.$refs[this.element.propValue.id].chartResize()
}
this.preCanvasPanel = deepCopy(newVal.panel)
},
deep: true