From 46e5e78176747f05ec6b39a7d00698c6ee50fc57 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 10 May 2023 22:58:07 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/8224 --- app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/protyle/scroll/saveScroll.ts | 5 +++++ 6 files changed, 10 insertions(+) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 8b6bda151..c30eb4745 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "scrollGetMore": "Don't panic... scroll up and down to load more", "flashcardNewCard": "New", "flashcardReviewCard": "Review", "flashcardCard": "Total", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index acfacd332..ad7eb9fb4 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "scrollGetMore": "No se asuste... desplácese hacia arriba y hacia abajo para cargar más", "flashcardNewCard": "Nueva Tarjeta", "flashcardReviewCard": "Revisar Tarjeta", "flashcardCard": "Todos", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index cc990d005..7658d3dc1 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "scrollGetMore": "Ne paniquez pas... faites défiler de haut en bas pour en charger plus", "flashcardNewCard": "Nouvelle carte", "flashcardReviewCard": "Revoir la carte", "flashcardCard": "Tous", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 88b2fe985..b8407a634 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "scrollGetMore": "不要驚慌...,上下滾動即可加載更多內容", "flashcardNewCard": "新卡", "flashcardReviewCard": "複習卡", "flashcardCard": "所有", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 7529c2ee8..40f0153d8 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "scrollGetMore": "不要惊慌...,上下滚动即可加载更多内容", "flashcardNewCard": "新卡", "flashcardReviewCard": "复习卡", "flashcardCard": "所有", diff --git a/app/src/protyle/scroll/saveScroll.ts b/app/src/protyle/scroll/saveScroll.ts index 2cf956d50..6ecb81015 100644 --- a/app/src/protyle/scroll/saveScroll.ts +++ b/app/src/protyle/scroll/saveScroll.ts @@ -8,6 +8,7 @@ import {processRender} from "../util/processCode"; import {highlightRender} from "../markdown/highlightRender"; import {blockRender} from "../markdown/blockRender"; import {disabledForeverProtyle, disabledProtyle, enableProtyle} from "../util/onGet"; +import {showMessage} from "../../dialog/message"; export const saveScroll = (protyle: IProtyle, getObject = false) => { if (!protyle.wysiwyg.element.firstElementChild || window.siyuan.config.readonly) { @@ -102,6 +103,10 @@ export const restoreScroll = (protyle: IProtyle, scrollAttr: IScrollAttr) => { } // 使用动态滚动条定位到最后一个块,重启后无法触发滚动事件,需要再次更新 index protyle.scroll.updateIndex(protyle, scrollAttr.startId); + // https://github.com/siyuan-note/siyuan/issues/8224 + if (protyle.wysiwyg.element.clientHeight - parseInt(protyle.wysiwyg.element.style.paddingBottom) < protyle.contentElement.clientHeight) { + showMessage(window.siyuan.languages.scrollGetMore); + } }); } else if (scrollAttr.scrollTop) { protyle.contentElement.scrollTop = scrollAttr.scrollTop;