From 0d6939fcdf0beb944f2ff8c53f8e8fbc64c238dd Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 24 Jan 2023 11:18:02 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/7041 --- app/appearance/icons/ant/icon.js | 13 ++++++++++++- app/appearance/icons/ant/icon.json | 2 +- app/appearance/icons/index.html | 20 +++++++++++++++++++- app/appearance/icons/material/icon.js | 11 +++++++++++ app/appearance/icons/material/icon.json | 2 +- app/src/dialog/processSystem.ts | 16 ++++++++++++++++ app/src/index.ts | 21 ++++++++------------- app/src/util/onGetConfig.ts | 2 +- 8 files changed, 69 insertions(+), 18 deletions(-) diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js index e4294f67d..0d33e0b0a 100644 --- a/app/appearance/icons/ant/icon.js +++ b/app/appearance/icons/ant/icon.js @@ -1,5 +1,16 @@ document.body.insertAdjacentHTML('afterBegin', ` + + + + + + + + + + + @@ -338,7 +349,7 @@ document.body.insertAdjacentHTML('afterBegin', ` - + diff --git a/app/appearance/icons/ant/icon.json b/app/appearance/icons/ant/icon.json index 472748853..1e66afc07 100644 --- a/app/appearance/icons/ant/icon.json +++ b/app/appearance/icons/ant/icon.json @@ -2,5 +2,5 @@ "name": "ant", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.11.0" + "version": "1.12.0" } diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html index 0917e5351..14cb19c9a 100644 --- a/app/appearance/icons/index.html +++ b/app/appearance/icons/index.html @@ -34,6 +34,24 @@ iconWorkspace +
+ + + + iconCloudOff +
+
+ + + + iconCloudSync +
+
+ + + + iconCloudError +
@@ -971,6 +989,6 @@ iconSub
- + diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js index 37c6f5ff6..ba1dc39e8 100644 --- a/app/appearance/icons/material/icon.js +++ b/app/appearance/icons/material/icon.js @@ -1,5 +1,16 @@ document.body.insertAdjacentHTML('afterbegin', ` + + + + + + + + + + + diff --git a/app/appearance/icons/material/icon.json b/app/appearance/icons/material/icon.json index aef05ac68..a07cc6d9f 100644 --- a/app/appearance/icons/material/icon.json +++ b/app/appearance/icons/material/icon.json @@ -2,5 +2,5 @@ "name": "material", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.11.0" + "version": "1.12.0" } diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts index ad4773386..e55a94b74 100644 --- a/app/src/dialog/processSystem.ts +++ b/app/src/dialog/processSystem.ts @@ -311,3 +311,19 @@ export const downloadProgress = (data: { id: string, percent: number }) => { } } }; + +export const processSync = (data: IWebSocketData) => { + const iconElement = document.querySelector("#barSync") + const useElement = iconElement.querySelector("use") + if (data.code === 0) { // syncing + iconElement.classList.add("toolbar__item--active"); + useElement.setAttribute("xlink:href", "#iconCloudSync") + } else if (data.code === 2) { // error + iconElement.classList.add("toolbar__item--active"); + useElement.setAttribute("xlink:href", "#iconCloudError") + } else if (data.code === 1) { // success + iconElement.classList.remove("toolbar__item--active"); + useElement.setAttribute("xlink:href", "#iconCloud") + } + iconElement.setAttribute("aria-label", data.msg); +} diff --git a/app/src/index.ts b/app/src/index.ts index 60b33cbcb..4c4f3d03b 100644 --- a/app/src/index.ts +++ b/app/src/index.ts @@ -12,7 +12,7 @@ import {addBaseURL, setNoteBook} from "./util/pathName"; import {openFileById} from "./editor/util"; import { bootSync, - downloadProgress, + downloadProgress, processSync, progressLoading, progressStatus, setTitle, @@ -44,10 +44,10 @@ class App { msgCallback: (data) => { if (data) { switch (data.cmd) { - case"progress": + case "progress": progressLoading(data); break; - case"setLocalStorageVal": + case "setLocalStorageVal": window.siyuan.storage[data.data.key] = data.data.val; break; case "rename": @@ -89,22 +89,17 @@ class App { } }); break; - case"statusbar": + case "statusbar": progressStatus(data); break; - case"downloadProgress": + case "downloadProgress": downloadProgress(data.data); break; - case"txerr": + case "txerr": transactionError(data); break; - case"syncing": - if (data.code === 0) { - document.querySelector("#barSync").classList.add("toolbar__item--active"); - } else { - document.querySelector("#barSync").classList.remove("toolbar__item--active"); - } - document.querySelector("#barSync").setAttribute("aria-label", data.msg); + case "syncing": + processSync(data) break; case "refreshtheme": if (!window.siyuan.config.appearance.customCSS && data.data.theme.indexOf("custom.css") > -1) { diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index 1b96048d3..fa3baf14b 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -187,7 +187,7 @@ const initBar = () => {
- +