diff --git a/core/core-frontend/src/assets/svg/exit-fullscreen.svg b/core/core-frontend/src/assets/svg/exit-fullscreen.svg index 485c128b61..532662dffc 100644 --- a/core/core-frontend/src/assets/svg/exit-fullscreen.svg +++ b/core/core-frontend/src/assets/svg/exit-fullscreen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue index f43de15c96..5ad7fc8e6d 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -22,6 +22,7 @@ import EmptyBackground from '../../empty-background/src/EmptyBackground.vue' import LinkOptBar from '@/components/data-visualization/canvas/LinkOptBar.vue' import { isDesktop } from '@/utils/ModelUtil' import { isMobile } from '@/utils/utils' +import CanvasExtFullscreenBar from '@/components/visualization/CanvasExtFullscreenBar.vue' const dvMainStore = dvMainStoreWithOut() const { pcMatrixCount, curComponent, mobileInPc, canvasState, inMobile } = storeToRefs(dvMainStore) const openHandler = ref(null) @@ -504,6 +505,8 @@ defineExpose({ :canvas-style-data="canvasStyleData" :component-data="baseComponentData" > + + + + + + + + {{ $t('visualization.ext_fullscreen') }} + + + + + + diff --git a/core/core-frontend/src/components/visualization/common/DeFullscreen.vue b/core/core-frontend/src/components/visualization/common/DeFullscreen.vue index 3860b309c1..01073edf0b 100644 --- a/core/core-frontend/src/components/visualization/common/DeFullscreen.vue +++ b/core/core-frontend/src/components/visualization/common/DeFullscreen.vue @@ -46,12 +46,21 @@ const toggleFullscreen = () => { } } +const handleKeydown = event => { + console.log('FullScreen key: ' + event.key) + if (event.key === 'Escape') { + document.exitFullscreen() + } +} + onMounted(() => { document.addEventListener('fullscreenchange', fullscreenChange) + document.addEventListener('keydown', handleKeydown) }) onBeforeUnmount(() => { document.removeEventListener('fullscreenchange', fullscreenChange) + document.removeEventListener('keydown', handleKeydown) }) defineExpose({ diff --git a/core/core-frontend/src/views/data-visualization/PreviewShow.vue b/core/core-frontend/src/views/data-visualization/PreviewShow.vue index a520f040b4..2a6c4cad5a 100644 --- a/core/core-frontend/src/views/data-visualization/PreviewShow.vue +++ b/core/core-frontend/src/views/data-visualization/PreviewShow.vue @@ -9,7 +9,6 @@ import EmptyBackground from '@/components/empty-background/src/EmptyBackground.v import { storeToRefs } from 'pinia' import { useAppStoreWithOut } from '@/store/modules/app' import { initCanvasData, initCanvasDataPrepare, onInitReady } from '@/utils/canvasUtils' -import { useRequestStoreWithOut } from '@/store/modules/request' import { usePermissionStoreWithOut } from '@/store/modules/permission' import { useMoveLine } from '@/hooks/web/useMoveLine' import { Icon } from '@/components/icon-custom'