0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 windows 下 # 1 后刷新 loading 不消失

Browse source
This commit is contained in:
Vanessa 2022-08-29 10:32:54 +08:00
parent 5b85d0e91b
commit 17928ee936
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import {saveScroll} from "../scroll/saveScroll";
import {hideElements} from "../ui/hideElements";
export const netImg2LocalAssets = (protyle: IProtyle) => {
if (protyle.element.querySelector(".fn__loading")) {
if (protyle.element.querySelector(".wysiwygLoading")) {
return;
}
addLoading(protyle);

9
app/src/protyle/ui/initUI.ts
View file

@ -48,7 +48,14 @@ export const initUI = (protyle: IProtyle) => {
};
export const addLoading = (protyle: IProtyle) => {
protyle.element.insertAdjacentHTML("beforeend", "<div style=\"background-color: var(--b3-theme-background)\" class=\"fn__loading\"><img width=\"48px\" src=\"/stage/loading-pure.svg\"></div>");
protyle.element.insertAdjacentHTML("beforeend", '<div style="background-color: var(--b3-theme-background)" class="fn__loading wysiwygLoading"><img width="48px" src="/stage/loading-pure.svg"></div>');
};
export const removeLoading = (protyle: IProtyle) => {
const loadingElement = protyle.element.querySelector(".wysiwygLoading");
if (loadingElement) {
loadingElement.remove();
}
};
export const setPadding = (protyle: IProtyle) => {

11
app/src/protyle/util/onGet.ts
View file

@ -15,6 +15,7 @@ import {focusBlock} from "./selection";
import {hasClosestByAttribute, hasClosestByClassName} from "./hasClosest";
import {preventScroll} from "../scroll/preventScroll";
import {restoreScroll} from "../scroll/saveScroll";
import {removeLoading} from "../ui/initUI";
export const onGet = (data: IWebSocketData, protyle: IProtyle, action: string[] = [], scrollAttr?: IScrollAttr, renderTitle = false) => {
protyle.wysiwyg.element.removeAttribute("data-top");
@ -84,10 +85,7 @@ export const onGet = (data: IWebSocketData, protyle: IProtyle, action: string[]
action,
unScroll: false,
}, protyle);
const loadingElement = protyle.element.querySelector(".fn__loading");
if (loadingElement) {
loadingElement.remove();
}
removeLoading(protyle);
return;
}
@ -122,10 +120,7 @@ export const onGet = (data: IWebSocketData, protyle: IProtyle, action: string[]
if (scrollObj && protyle.options.mode !== "preview") {
restoreScroll(protyle, scrollObj);
}
const loadingElement = protyle.element.querySelector(".fn__loading");
if (loadingElement) {
loadingElement.remove();
}
removeLoading(protyle)
});
};