diff --git a/app/src/protyle/header/Title.ts b/app/src/protyle/header/Title.ts index 9f4ea66e7..285b118e3 100644 --- a/app/src/protyle/header/Title.ts +++ b/app/src/protyle/header/Title.ts @@ -360,6 +360,10 @@ ${window.siyuan.languages.createdAt} ${dayjs(response.data.ial.id.substr(0, 14)) range.selectNodeContents(this.editElement); focusByRange(range); } + const loadingElement = protyle.element.querySelector(".fn__loading"); + if (loadingElement) { + loadingElement.remove(); + } if (scrollAttr) { restoreScroll(protyle, scrollAttr === Constants.CB_GET_SCROLL ? undefined : scrollAttr); } diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts index a039b44f9..416b2d362 100644 --- a/app/src/protyle/util/onGet.ts +++ b/app/src/protyle/util/onGet.ts @@ -17,10 +17,6 @@ import {preventScroll} from "../scroll/preventScroll"; import {restoreScroll} from "../scroll/saveScroll"; export const onGet = (data: IWebSocketData, protyle: IProtyle, action: string[] = [], scrollAttr?: string) => { - const loadingElement = protyle.element.querySelector(".fn__loading"); - if (loadingElement) { - loadingElement.remove(); - } protyle.wysiwyg.element.removeAttribute("data-top"); if (data.code === 1) { // 其他报错 @@ -97,8 +93,14 @@ export const onGet = (data: IWebSocketData, protyle: IProtyle, action: string[] action, }, protyle); - if (scrollAttr && ((protyle.options.render.title && protyle.title.editElement.getAttribute("data-render") === "true") || !protyle.options.render.title)) { - restoreScroll(protyle, scrollAttr); + if ((protyle.options.render.title && protyle.title.editElement.getAttribute("data-render") === "true") || !protyle.options.render.title) { + const loadingElement = protyle.element.querySelector(".fn__loading"); + if (loadingElement) { + loadingElement.remove(); + } + if (scrollAttr) { + restoreScroll(protyle, scrollAttr); + } } };