From 9c5b7054e1777a688d4d5e8065854ae1a1ec74fb Mon Sep 17 00:00:00 2001 From: hisoka0728 <1399952343@qq.com> Date: Mon, 15 Jul 2024 20:25:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=A8=E5=B1=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fullscreen-toolbar/fullscreen-toolbar.scss | 1 + .../fullscreen-toolbar/fullscreen-toolbar.tsx | 13 +++++++++++++ src/util/fullscreen/fullscreen-util.ts | 17 +++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/common/fullscreen-toolbar/fullscreen-toolbar.scss b/src/common/fullscreen-toolbar/fullscreen-toolbar.scss index 6db5bf8b..0211558a 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 c947c336..72187eed 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 da6d4187..cfeab1c7 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(); } } -- Gitee