From 1f391d7f501f98a7cdd6a1317993a2387c385bea Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 18 Nov 2022 22:51:52 +0800 Subject: [PATCH] :iphone: fix https://github.com/siyuan-note/siyuan/issues/6646 --- app/src/asset/index.ts | 12 ++++++------ app/src/asset/pdf/overlay_manager.js | 6 ++++-- app/src/assets/scss/pdf/_pdf.scss | 25 +++++++++++++++++++++++-- app/src/layout/status.ts | 3 ++- app/src/util/assets.ts | 2 +- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/app/src/asset/index.ts b/app/src/asset/index.ts index 51675da43..bc9dfa12f 100644 --- a/app/src/asset/index.ts +++ b/app/src/asset/index.ts @@ -316,7 +316,7 @@ export class Asset extends Model {
- +

Enter the password to open this PDF file:

@@ -327,8 +327,8 @@ export class Asset extends Model {
-
- +
+
${window.siyuan.languages.fileName}

-

@@ -377,8 +377,8 @@ export class Asset extends Model {
- - +
+
Preparing document for printing…
@@ -389,7 +389,7 @@ export class Asset extends Model {
- +
diff --git a/app/src/asset/pdf/overlay_manager.js b/app/src/asset/pdf/overlay_manager.js index 82e1ddf66..de268ad37 100644 --- a/app/src/asset/pdf/overlay_manager.js +++ b/app/src/asset/pdf/overlay_manager.js @@ -93,7 +93,8 @@ class OverlayManager { } } this.#active = dialog; - dialog.showModal(); + // NOTE + dialog.classList.add("dialog--open") } /** @@ -109,7 +110,8 @@ class OverlayManager { } else if (this.#active !== dialog) { throw new Error("Another overlay is currently active."); } - dialog.close(); + // NOTE + dialog.classList.remove("dialog--open") this.#active = null; } } diff --git a/app/src/assets/scss/pdf/_pdf.scss b/app/src/assets/scss/pdf/_pdf.scss index f2bab3dfa..73dfbfcf7 100644 --- a/app/src/assets/scss/pdf/_pdf.scss +++ b/app/src/assets/scss/pdf/_pdf.scss @@ -599,24 +599,46 @@ a:focus > .thumbnail > .thumbnailSelectionRing, border: 0 none !important; } -#dialogContainer > dialog { +#dialogContainer > .dialog { padding: 8px; box-shadow: var(--b3-dialog-shadow); background-color: var(--b3-menu-background); border-radius: 4px; width: 520px; border: 0; + position: absolute; + inset-inline-start: 0px; + inset-inline-end: 0px; + height: fit-content; + margin: auto; + display: none; + + + &--open { + position: fixed; + inset-block-start: 0px; + inset-block-end: 0px; + max-width: calc((100% - 6px) - 2em); + max-height: calc((100% - 6px) - 2em); + user-select: text; + display: block; + z-index: 100; + overflow: auto; + } & > .row { display: table-row; & > span { white-space: nowrap; + color: var(--b3-theme-on-surface); + padding-right: 8px; } } & > .row > * { display: table-cell; + color: var(--b3-theme-on-background); } .toolbarField { @@ -641,7 +663,6 @@ a:focus > .thumbnail > .thumbnailSelectionRing, } } - #passwordOverlay > dialog { text-align: center; } diff --git a/app/src/layout/status.ts b/app/src/layout/status.ts index 9baedfebb..f9b248a69 100644 --- a/app/src/layout/status.ts +++ b/app/src/layout/status.ts @@ -9,6 +9,7 @@ import {mountHelp} from "../util/mount"; import {getCurrentWindow} from "@electron/remote"; /// #endif /// #endif +import {isBrowser} from "../util/functions"; export const initStatus = () => { /// #if !MOBILE @@ -33,7 +34,7 @@ export const initStatus = () => {
- +
`; const dockElement = document.getElementById("barDock"); diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index ced68abfe..c206b5dc7 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -265,7 +265,7 @@ const watchTheme = (data: { init: boolean, OSTheme: string }) => { } else if (window.siyuan.config.system.container === "android" && window.JSAndroid) { window.JSAndroid.changeStatusBarColor(backgroundColor, mode); } - }, Constants.TIMEOUT_BLOCKLOAD); // 移动端需要加载完才可以获取到颜色 + }, 500); // 移动端需要加载完才可以获取到颜色 } if (data.init) { if (window.siyuan.config.appearance.modeOS && (