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

refactor(仪表板): 优化限制矩阵模式下的组最小的长宽为4*4最小单位

Browse Source
This commit is contained in:
wangjiahao 2022-07-22 16:27:45 +08:00
parent 2e55ebe6d7
commit 466f53c994
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,14 +595,14 @@ export default {
return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0
},
miniWidth() {
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * (this.element.miniSizex || 1) : 0
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * 4 : 0
},
miniHeight() {
if (this.element.auxiliaryMatrix) {
if (this.element.component === 'de-number-range') {
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.element.miniSizey || 2) : 0
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0
} else {
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.element.miniSizey || 1) : 0
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0
}
} else {
return 0

6
frontend/src/components/canvas/components/Editor/EditBar.vue
View File

@ -138,14 +138,14 @@ export default {
return this.targetLinkageInfo[this.element.propValue.viewId]
},
miniHeight() {
let miniHeight = this.curComponent.miniSizey || 1
let miniHeight = 4
if (this.element.component === 'de-number-range') {
miniHeight = this.curComponent.miniSizey || 2
miniHeight = 4
}
return miniHeight
},
miniWidth() {
return this.curComponent.miniSizex || 1
return 4
},
...mapState([
'menuTop',