Merge pull request #8255 from dataease/pr@dev@style_preview

style(仪表板): 仪表板预览样式优化
This commit is contained in:
王嘉豪 2024-02-29 18:51:07 +08:00 committed by GitHub
commit 3d17d90eb0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions

View File

@ -865,7 +865,6 @@ export default {
canvasScroll() {
// 100px
this.backToTopBtnShow = this.$refs[this.previewOutRefId].scrollTop > 200
console.log('top=' + this.$refs[this.previewOutRefId].scrollTop + ';this.backToTopBtnShow=' + this.backToTopBtnShow)
bus.$emit('onScroll')
},
initListen() {

View File

@ -4,7 +4,7 @@
:class="isAbsoluteContainer ? 'abs-container' : ''"
>
<de-main-container
v-show="showChartCanvas"
v-if="showChartCanvas"
v-loading="exportLoading"
style="overflow: hidden"
:element-loading-text="$t('panel.data_loading')"
@ -70,8 +70,9 @@
</div>
</div>
</de-main-container>
<de-main-container v-show="!showChartCanvas">
<de-main-container v-else>
<table-normal
id="chartCanvas"
:enable-scroll="false"
:chart="chartTable"
:show-summary="false"

View File

@ -47,7 +47,6 @@ export function watermark(settings, domId, watermarkDomId = 'de-watermark-server
defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space))
defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) - defaultSettings.watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1))
defaultSettings.watermark_rows = defaultSettings.watermark_rows < 2 ? 2 : defaultSettings.watermark_rows
console.log('watermark_rows=' + defaultSettings.watermark_rows)
defaultSettings.watermark_cols = defaultSettings.watermark_cols < 2 ? 2 : defaultSettings.watermark_cols
let x
let y