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

Merge pull request #1411 from dataease/pr@dev@feat_panel-mobile-layout

Browse Source 
Pr@dev@feat panel mobile layout
This commit is contained in:
王嘉豪 2021-12-08 15:30:55 +08:00 committed by GitHub
commit ef357c600b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -213,8 +213,8 @@ export default {
restore() {
const canvasHeight = document.getElementById('canvasInfoMain').offsetHeight
const canvasWidth = document.getElementById('canvasInfoMain').offsetWidth
this.scaleWidth = canvasWidth * 100 / parseInt(this.canvasStyleData.width)// 获取宽度比
this.scaleHeight = canvasHeight * 100 / parseInt(this.canvasStyleData.height)// 获取高度比
this.scaleWidth = (canvasWidth) * 100 / this.canvasStyleData.width // 获取宽度比
this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比
this.handleScaleChange()
},
resetID(data) {
@ -226,7 +226,7 @@ export default {
return data
},
format(value, scale) {
return value * parseInt(scale) / 100
return value * scale / 100
},
handleScaleChange() {
if (this.componentData) {
@ -296,10 +296,6 @@ export default {
color: #9ea6b2;
}
.gap_class {
padding: 5px;
}
.dialog-css > > > .el-dialog__title {
font-size: 14px;
}

4
frontend/src/views/panel/edit/index.vue
View File

@ -321,7 +321,9 @@ export default {
return !this.linkageSettingStatus && !this.mobileLayoutStatus
},
showAttr() {
if (this.curComponent && this.showAttrComponent.includes(this.curComponent.type)) {
if (this.mobileLayoutStatus) {
return false
} else if (this.curComponent && this.showAttrComponent.includes(this.curComponent.type)) {
// 过滤组件有标题才显示
if (this.curComponent.type === 'custom' && !this.curComponent.options.attrs.title) {
return false