diff --git a/src/common/fullscreen-toolbar/fullscreen-toolbar.scss b/src/common/fullscreen-toolbar/fullscreen-toolbar.scss index 6db5bf8b535d9e3c1cae4fdcd9677d50ad21860f..0211558a3139e414fc775e8b546501c0b3a4ec40 100644 --- a/src/common/fullscreen-toolbar/fullscreen-toolbar.scss +++ b/src/common/fullscreen-toolbar/fullscreen-toolbar.scss @@ -3,6 +3,7 @@ position: fixed; bottom: 28px; left: 0; + z-index: 100; display: flex; flex-flow: row nowrap; place-content: center center; diff --git a/src/common/fullscreen-toolbar/fullscreen-toolbar.tsx b/src/common/fullscreen-toolbar/fullscreen-toolbar.tsx index c947c33677de7d5418eb9ea211f272a920de9df9..72187eed1bf237aa0d73ff21a407611537b56da7 100644 --- a/src/common/fullscreen-toolbar/fullscreen-toolbar.tsx +++ b/src/common/fullscreen-toolbar/fullscreen-toolbar.tsx @@ -148,10 +148,22 @@ export const IBizFullscreenToolbar = defineComponent({ } }; + const clearFullscreenClass = () => { + if (ibiz.fullscreenUtil.FullscreenClass) { + const divFull = document.querySelector( + `.${ibiz.fullscreenUtil.FullscreenClass}`, + ); + if (divFull) { + divFull.classList.toggle(ibiz.fullscreenUtil.FullscreenClass); + } + } + }; + const compressArrowsClick = () => { const div = document.getElementById('fullscreen'); if (div) { document.exitFullscreen(); + clearFullscreenClass(); if (div.parentElement) { div.parentElement.removeChild(div); } @@ -166,6 +178,7 @@ export const IBizFullscreenToolbar = defineComponent({ } else { const div = document.getElementById('fullscreen'); if (div) { + clearFullscreenClass(); if (div.parentElement) { div.parentElement.removeChild(div); } diff --git a/src/util/fullscreen/fullscreen-util.ts b/src/util/fullscreen/fullscreen-util.ts index da6d418728ef03a3fc02bc2a2f450ff5a13a53ff..cfeab1c77427aaa925b1265212edb65c2bc5ef27 100644 --- a/src/util/fullscreen/fullscreen-util.ts +++ b/src/util/fullscreen/fullscreen-util.ts @@ -18,14 +18,27 @@ export class FullscreenUtil { */ constructor() {} + /** + * 全屏样式 + * @author fzh + * @date 2024-07-15 19:39:40 + */ + public FullscreenClass: string = ''; + /** * 指定元素全屏 * @author fzh * @date 2024-07-09 19:39:40 */ - public openElementFullscreen(div: HTMLDivElement): void { + public openElementFullscreen(div: HTMLDivElement, str?: string): void { + if (!this.FullscreenClass && str) { + this.FullscreenClass = str; + } if (!document.fullscreenElement && div) { div.requestFullscreen(); + if (this.FullscreenClass) { + div.classList.toggle(this.FullscreenClass); + } div.style.background = 'white'; const content = document.createElement('div'); content.id = 'fullscreen'; @@ -44,7 +57,7 @@ export class FullscreenUtil { * @author fzh * @date 2024-07-09 19:39:40 */ - public closeFullscreen(): void { + public closeElementFullscreen(): void { document.exitFullscreen(); } }