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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
junjie 2021-06-16 16:58:32 +08:00
commit 7feb74d249
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,15 +55,17 @@ export default {
scaleWidth: '100',
scaleHeight: '100',
timer: null,
componentDataShow: []
componentDataShow: [],
mainWidth: '100%',
mainHeight: '100%'
}
},
computed: {
customStyle() {
let style = {
margin: 'auto',
width: '100%',
height: '100%'
width: this.mainWidth,
height: this.mainHeight
}
if (this.canvasStyleData.openCommonStyle) {
if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
@ -122,6 +124,7 @@ export default {
this.scaleHeight = canvasHeight * 100 / parseInt(this.canvasStyleData.height)// 获取高度比
if (this.showType === 'width') {
this.scaleHeight = this.scaleWidth
this.mainHeight = this.canvasStyleData.height * this.scaleHeight / 100 + 'px'
}
this.handleScaleChange()
},

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

@ -1,6 +1,6 @@
<template>
<div style="width: 100%;height: 100vh;">
<fullscreen style="background: #ffffff" :fullscreen.sync="fullscreen" @change="fullscreenChange">
<fullscreen style="height:100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen" @change="fullscreenChange">
<Preview v-if="fullscreen" />
</fullscreen>
</div>

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

@ -135,7 +135,7 @@
</div>
</el-dialog>
<fullscreen style="height: 100%;background: #f7f8fa" :fullscreen.sync="previewVisible">
<fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="previewVisible">
<Preview v-if="previewVisible" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
</fullscreen>

2
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -50,7 +50,7 @@
<!-- 仪表板预览区域-->
<el-row class="panel-design-preview">
<div ref="imageWrapper" style="width: 100%;height: 100%">
<fullscreen style="height: 100%;background: #f7f8fa" :fullscreen.sync="fullscreen">
<fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen">
<Preview v-if="showMain" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
</fullscreen>
</div>