forked from github/dataease
refactor(数据大屏): 优化全屏退出逻辑,解决部分图表因销毁异常导致无法退出全屏问题
This commit is contained in:
parent
91508f7091
commit
c1171f3efc
@ -530,8 +530,12 @@ onMounted(() => {
|
|||||||
resizeObserver.observe(containerDom)
|
resizeObserver.observe(containerDom)
|
||||||
})
|
})
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
myChart?.destroy()
|
try {
|
||||||
resizeObserver?.disconnect()
|
myChart?.destroy()
|
||||||
|
resizeObserver?.disconnect()
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -561,10 +561,14 @@ onMounted(() => {
|
|||||||
resizeObserver.observe(document.getElementById(containerId))
|
resizeObserver.observe(document.getElementById(containerId))
|
||||||
})
|
})
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
myChart?.facet.timer?.stop()
|
try {
|
||||||
myChart?.destroy()
|
myChart?.facet.timer?.stop()
|
||||||
myChart = null
|
myChart?.destroy()
|
||||||
resizeObserver?.disconnect()
|
myChart = null
|
||||||
|
resizeObserver?.disconnect()
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const autoStyle = computed(() => {
|
const autoStyle = computed(() => {
|
||||||
|
@ -3,6 +3,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
|
|||||||
import { computed, ref } from 'vue'
|
import { computed, ref } from 'vue'
|
||||||
import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
|
import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
|
||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
|
import { ElScrollbar } from 'element-plus-secondary'
|
||||||
|
|
||||||
const dvMainStore = dvMainStoreWithOut()
|
const dvMainStore = dvMainStoreWithOut()
|
||||||
const { fullscreenFlag } = storeToRefs(dvMainStore)
|
const { fullscreenFlag } = storeToRefs(dvMainStore)
|
||||||
@ -57,13 +58,24 @@ const contentInnerClass = computed(() => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const outerStyle = computed(() => {
|
||||||
|
return {
|
||||||
|
flexDirection: props.canvasStylePreview.screenAdaptor === 'heightFirst' ? 'row' : 'column'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
restore
|
restore
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div id="de-preview-content" :class="{ 'de-screen-full': fullscreenFlag }" class="content-outer">
|
<div
|
||||||
|
id="de-preview-content"
|
||||||
|
:class="{ 'de-screen-full': fullscreenFlag }"
|
||||||
|
:style="outerStyle"
|
||||||
|
class="content-outer"
|
||||||
|
>
|
||||||
<div class="content-inner" :class="contentInnerClass">
|
<div class="content-inner" :class="contentInnerClass">
|
||||||
<de-preview
|
<de-preview
|
||||||
ref="dePreviewRef"
|
ref="dePreviewRef"
|
||||||
|
Loading…
Reference in New Issue
Block a user