dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9433 from dataease/pr@dev_st

Browse Source 
fix(仪表板): 全屏状态下数据导出没有展示提示
This commit is contained in:
dataeaseShu 2024-04-29 11:02:00 +08:00 committed by GitHub
commit d84cc9cb99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/frontend/src/components/canvas/components/editor/EditBar.vue
View File

@ -489,22 +489,23 @@ export default {
this.$message({
message: h('p', null, [
this.$t('data_export.exporting'),
h(
Button,
{
props: {
type: 'text',
size: 'mini'
},
class: 'btn-text',
on: {
click: () => {
cb()
this.showEditPosition === 'bar-main-preview'
? h(
Button,
{
props: {
type: 'text',
size: 'mini'
},
class: 'btn-text',
on: {
click: () => {
cb()
}
}
}
},
this.$t('data_export.export_center')
),
},
this.$t('data_export.export_center')
) : this.$t('data_export.export_center'),
this.$t('data_export.export_info')
]),
iconClass,

2
core/frontend/src/components/canvas/components/editor/PreviewFullScreen.vue
View File

@ -1,6 +1,8 @@
<template>
<div style="width: 100%;height: 100vh;">
<fullscreen
teleport
fullscreen-class="de-fullscreen-preview-index"
style="height:100%;background: #f7f8fa;overflow-y: auto"
:fullscreen.sync="fullscreen"
@change="fullscreenChange"

4
core/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
View File

@ -11,7 +11,6 @@
>
<el-dropdown-menu
class="track-menu"
:append-to-body="false"
>
<el-dropdown-item
v-for="(item, key) in trackMenu"
@ -76,9 +75,6 @@ export default {
.track-menu {
border: #3a8ee6 1px solid;
position: absolute !important;
top: 0 !important;
left: 0 !important;
}
</style>

31
core/frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -778,22 +778,23 @@ export default {
this.$message({
message: h('p', null, [
this.$t('data_export.exporting'),
h(
Button,
{
props: {
type: 'text',
size: 'mini'
},
class: 'btn-text',
on: {
click: () => {
cb()
this.editMode === 'preview'
? h(
Button,
{
props: {
type: 'text',
size: 'mini'
},
class: 'btn-text',
on: {
click: () => {
cb()
}
}
}
},
this.$t('data_export.export_center')
),
},
this.$t('data_export.export_center')
) : this.$t('data_export.export_center'),
this.$t('data_export.export_info')
]),
iconClass,

4
core/frontend/src/styles/index.scss
View File

@ -1818,3 +1818,7 @@ div:focus {
.el-table__fixed-right::before {
display: none;
}
.de-fullscreen-preview-index {
z-index: 2000;
}

14
core/frontend/src/views/chart/view/TitleRemark.vue
View File

@ -6,7 +6,6 @@
placement="bottom"
trigger="hover"
width="300"
:append-to-body="!previewVisible"
:popper-class="previewVisible ? 'remark-pop' : ''"
:visible-arrow="false"
>
@ -79,16 +78,3 @@ export default {
text-align: -webkit-match-parent!important;
}
</style>
<style lang="scss">
.remark-pop {
position: absolute !important;
left: 10% !important;
}
.title-is-right {
.remark-pop {
left: auto !important;
right: 20px;
}
}
</style>

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

@ -359,6 +359,8 @@
</el-dialog>
<fullscreen
teleport
fullscreen-class="de-fullscreen-preview-index"
style="height: 100%;background: #f7f8fa;overflow-y: auto"
:fullscreen.sync="previewVisible"
>

3
core/frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -254,6 +254,8 @@
:style="imageWrapperStyle"
>
<fullscreen
teleport
fullscreen-class="de-fullscreen-preview-index"
style="height: 100%;background: #f7f8fa;overflow-y: auto"
:fullscreen.sync="fullscreen"
>
@ -978,4 +980,3 @@ export default {
}
}
</style>