From e9f33724b054f408edf77e3f775a50ee5e5a5beb Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 2 Jan 2025 00:03:07 +0800 Subject: [PATCH] :art: Improve backward for HarmonyOS https://github.com/siyuan-note/siyuan/issues/13676 --- app/src/mobile/util/MobileBackFoward.ts | 8 ++++++-- app/src/types/index.d.ts | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts index 07f481632..3d23e5357 100644 --- a/app/src/mobile/util/MobileBackFoward.ts +++ b/app/src/mobile/util/MobileBackFoward.ts @@ -153,9 +153,13 @@ export const goBack = () => { closePanel(); return; } - if (window.JSAndroid && window.siyuan.backStack.length < 1) { + if ((window.JSAndroid || window.JSHarmony) && window.siyuan.backStack.length < 1) { if (document.querySelector('#message [data-id="exitTip"]')) { - window.JSAndroid.returnDesktop(); + if (window.JSAndroid) { + window.JSAndroid.returnDesktop(); + } else if (window.JSHarmony) { + window.JSHarmony.returnDesktop(); + } } else { showMessage(window.siyuan.languages.returnDesktop, 3000, "info", "exitTip"); } diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 8aef8e29d..8eb177773 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -199,6 +199,7 @@ interface Window { writeClipboard(text: string): void writeHTMLClipboard(text: string, html: string): void readClipboard(): string + returnDesktop(): void } Protyle: import("../protyle/method").default