Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 23:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 fix https://github.com/siyuan-note/siyuan/issues/7381

Browse source
This commit is contained in:
Vanessa 2023-02-16 15:32:01 +08:00
parent af12e702ad
commit e241d067be
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/assets/scss/base.scss
View file

@ -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);

4
app/src/layout/dock/index.ts
View file

@ -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") {

12
app/src/protyle/breadcrumb/action.ts
View file

@ -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")) {