diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 848382029..e80b95756 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -295,7 +295,7 @@ html { .status { background-color: var(--b3-theme-surface); box-sizing: border-box; - z-index: 3; + z-index: 2; height: 32px; line-height: 32px; border-top: .5px solid var(--b3-border-color); diff --git a/app/src/layout/dock/index.ts b/app/src/layout/dock/index.ts index 32f0d4191..f3fd96144 100644 --- a/app/src/layout/dock/index.ts +++ b/app/src/layout/dock/index.ts @@ -164,7 +164,9 @@ ${this.position === "Top" ? "top" : "bottom"}:0`); } public hideDock(reset = false) { - if (!reset && (this.layout.element.style.opacity === "0" || this.pin)) { + if (!reset && (this.layout.element.style.opacity === "0" || this.pin) || + this.layout.element.querySelector(".fullscreen") // 关系图全屏不应该退出 + ) { return; } if (this.position === "Left") { diff --git a/app/src/protyle/breadcrumb/action.ts b/app/src/protyle/breadcrumb/action.ts index be86aa472..f2feb4610 100644 --- a/app/src/protyle/breadcrumb/action.ts +++ b/app/src/protyle/breadcrumb/action.ts @@ -7,6 +7,7 @@ import {Constants} from "../../constants"; import {onGet} from "../util/onGet"; import {saveScroll} from "../scroll/saveScroll"; import {hideElements} from "../ui/hideElements"; +import {hasClosestByClassName} from "../util/hasClosest"; export const netImg2LocalAssets = (protyle: IProtyle) => { if (protyle.element.querySelector(".wysiwygLoading")) { @@ -61,6 +62,17 @@ export const fullscreen = (element: Element, btnElement?: Element) => { } else { btnElement.querySelector("use").setAttribute("xlink:href", "#iconContract"); } + const dockLayoutElement = hasClosestByClassName(element, "layout--float") + if (dockLayoutElement) { + if (isFullscreen) { + dockLayoutElement.setAttribute("data-temp", dockLayoutElement.style.transform) + dockLayoutElement.style.transform = "none" + } else { + dockLayoutElement.style.transform = dockLayoutElement.getAttribute("data-temp") + dockLayoutElement.removeAttribute("data-temp") + } + } + return; } /// #if !MOBILE if (element.classList.contains("protyle")) {