Merge pull request #10701 from dataease/pr@dev_st

fix(仪表板): 全屏状态下数据导出没有展示提示
This commit is contained in:
dataeaseShu 2024-07-02 14:31:24 +08:00 committed by GitHub
commit 4fc92598b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 14 deletions

View File

@ -124,7 +124,6 @@
</el-dropdown> </el-dropdown>
</div> </div>
<ExportExcel ref="ExportExcelRef" />
<ai-tips <ai-tips
v-if="showOverlay" v-if="showOverlay"
class="ai-icon-tips" class="ai-icon-tips"
@ -160,7 +159,6 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ExportExcel from '@/views/dataset/exportExcel/index.vue'
import AppLink from './Sidebar/Link' import AppLink from './Sidebar/Link'
import variables from '@/styles/variables.scss' import variables from '@/styles/variables.scss'
import { isExternal } from '@/utils/validate' import { isExternal } from '@/utils/validate'
@ -184,7 +182,6 @@ export default {
AppLink, AppLink,
Notification, Notification,
LangSelect, LangSelect,
ExportExcel
}, },
props: { props: {
showTips: { showTips: {
@ -290,7 +287,6 @@ export default {
bus.$on('set-top-text-info', this.setTopTextInfo) bus.$on('set-top-text-info', this.setTopTextInfo)
bus.$on('set-top-text-active-info', this.setTopTextActiveInfo) bus.$on('set-top-text-active-info', this.setTopTextActiveInfo)
bus.$on('sys-logout', this.logout) bus.$on('sys-logout', this.logout)
bus.$on('data-export-center', this.dataExportCenter)
this.showTips && this.$nextTick(() => { this.showTips && this.$nextTick(() => {
const drop = this.$refs['my-drop'] const drop = this.$refs['my-drop']
drop && drop.show && drop.show() drop && drop.show && drop.show()
@ -300,8 +296,6 @@ export default {
beforeDestroy() { beforeDestroy() {
window.removeEventListener('beforeunload', (e) => this.beforeunloadHandler(e)) window.removeEventListener('beforeunload', (e) => this.beforeunloadHandler(e))
window.removeEventListener('unload', (e) => this.unloadHandler(e)) window.removeEventListener('unload', (e) => this.unloadHandler(e))
bus.$off('data-export-center', this.dataExportCenter)
bus.$off('set-top-menu-info', this.setTopMenuInfo) bus.$off('set-top-menu-info', this.setTopMenuInfo)
bus.$off('set-top-menu-active-info', this.setTopMenuActiveInfo) bus.$off('set-top-menu-active-info', this.setTopMenuActiveInfo)
bus.$off('set-top-text-info', this.setTopTextInfo) bus.$off('set-top-text-info', this.setTopTextInfo)
@ -324,8 +318,8 @@ export default {
localStorage.setItem('DE1.0-AI-TIPS-CHECK', 'CHECKED') localStorage.setItem('DE1.0-AI-TIPS-CHECK', 'CHECKED')
this.showOverlay = false this.showOverlay = false
}, },
dataExportCenter() { downloadClick() {
this.downloadClick() bus.$emit('data-export-center')
}, },
async initAiBase() { async initAiBase() {
const aiTipsCheck = localStorage.getItem('DE1.0-AI-TIPS-CHECK') const aiTipsCheck = localStorage.getItem('DE1.0-AI-TIPS-CHECK')
@ -342,9 +336,6 @@ export default {
beforeunloadHandler() { beforeunloadHandler() {
this.beforeUnload_time = new Date().getTime() this.beforeUnload_time = new Date().getTime()
}, },
downloadClick() {
this.$refs.ExportExcelRef.init()
},
unloadHandler(e) { unloadHandler(e) {
this.gap_time = new Date().getTime() - this.beforeUnload_time this.gap_time = new Date().getTime() - this.beforeUnload_time
if (this.gap_time <= 5) { if (this.gap_time <= 5) {

View File

@ -231,6 +231,9 @@ export default {
mounted() { mounted() {
bus.$on('task-export-topic-call', this.taskExportTopicCall) bus.$on('task-export-topic-call', this.taskExportTopicCall)
}, },
beforeDestroy() {
bus.$off('task-export-topic-call', this.taskExportTopicCall)
},
methods: { methods: {
init() { init() {
this.drawer = true this.drawer = true
@ -268,9 +271,6 @@ export default {
} }
}, 5000) }, 5000)
}, },
format(percentage) {
return ''
},
taskExportTopicCall(task) { taskExportTopicCall(task) {
if (JSON.parse(task).exportStatus === 'SUCCESS') { if (JSON.parse(task).exportStatus === 'SUCCESS') {
this.openMessageLoading(JSON.parse(task).exportFromName + ' ' + this.$t('excel.export') + this.$t('dataset.completed') + this.$t('dataset.goto'), 'success', this.callbackExport) this.openMessageLoading(JSON.parse(task).exportFromName + ' ' + this.$t('excel.export') + this.$t('dataset.completed') + this.$t('dataset.goto'), 'success', this.callbackExport)