From 3c3b612e1d27fb5c72d5a303f99f3d20ee8834a9 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 28 Aug 2022 12:41:49 +0800 Subject: [PATCH] :sparkles: fix https://github.com/siyuan-note/siyuan/issues/5736 --- app/src/assets/scss/mobile.scss | 18 ++++++++++++++++++ app/src/assets/template/mobile/index.tpl | 1 + app/src/dialog/processSystem.ts | 11 +++++++++++ app/src/mobile/util/onMessage.ts | 5 ++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index a4a9484eb..e425f035e 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -294,6 +294,24 @@ } } +.status { + position: fixed; + bottom: 0; + transition: var(--b3-transition); + font-size: 12px; + color: var(--b3-theme-on-surface); + padding: 4px; + white-space: nowrap; + width: 100%; + box-sizing: border-box; + background-color: var(--b3-theme-surface); + @extend .fn__ellipsis; + + &--hide { + bottom: -30px; + } +} + @media (max-width: 620px) { .protyle-wysiwyg [data-node-id].sb[data-sb-layout="col"] { flex-direction: column; diff --git a/app/src/assets/template/mobile/index.tpl b/app/src/assets/template/mobile/index.tpl index 2e4533555..aa98a860a 100644 --- a/app/src/assets/template/mobile/index.tpl +++ b/app/src/assets/template/mobile/index.tpl @@ -54,5 +54,6 @@
+
diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts index 5597ccd2b..bdfbc8092 100644 --- a/app/src/dialog/processSystem.ts +++ b/app/src/dialog/processSystem.ts @@ -147,7 +147,18 @@ export const transactionError = (data: { code: number, data: string }) => { }); }; +let progressStatusTimeoutId: number export const progressStatus = (data: IWebSocketData) => { + if (isMobile()) { + clearTimeout(progressStatusTimeoutId); + const statusElement = document.querySelector("#status") + statusElement.innerHTML = data.msg; + statusElement.classList.remove("status--hide") + progressStatusTimeoutId = window.setTimeout(() => { + statusElement.classList.add("status--hide"); + }, 6000); + return; + } document.querySelector("#status .status__msg").innerHTML = data.msg; }; diff --git a/app/src/mobile/util/onMessage.ts b/app/src/mobile/util/onMessage.ts index c6e7e5701..69ac3d941 100644 --- a/app/src/mobile/util/onMessage.ts +++ b/app/src/mobile/util/onMessage.ts @@ -1,5 +1,5 @@ import {openMobileFileById} from "../editor"; -import {progressLoading, transactionError} from "../../dialog/processSystem"; +import {progressLoading, progressStatus, transactionError} from "../../dialog/processSystem"; export const onMessage = (data: IWebSocketData) => { if (data) { @@ -23,6 +23,9 @@ export const onMessage = (data: IWebSocketData) => { case"txerr": transactionError(data); break; + case"statusbar": + progressStatus(data); + break; } } };