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

🎨 https://github.com/siyuan-note/siyuan/issues/13343

Browse source
This commit is contained in:
Vanessa 2024-12-08 16:42:22 +08:00
parent 6a7fb4ad61
commit 372b2f642a
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/search/util.ts
View file

@ -1200,6 +1200,8 @@ const renderNextSearchMark = (options: {
}
};
let reqId: number
export const getArticle = (options: {
id: string,
config?: Config.IUILayoutTabSearchConfig,
@ -1213,6 +1215,7 @@ export const getArticle = (options: {
id: options.id,
}, (response) => {
options.edit.protyle.wysiwyg.renderCustom(response.data.ial);
reqId = new Date().getTime()
fetchPost("/api/filetree/getDoc", {
id: options.id,
query: options.value || null,
@ -1222,7 +1225,11 @@ export const getArticle = (options: {
size: zoomIn ? Constants.SIZE_GET_MAX : window.siyuan.config.editor.dynamicLoadBlocks,
zoom: zoomIn,
highlight: !isSupportCSSHL(),
reqId
}, getResponse => {
if (reqId > response.data.reqId) {
return;
}
options.edit.protyle.query = {
key: options.value || null,
method: options.config?.method || null,
@ -1239,7 +1246,9 @@ export const getArticle = (options: {
if (isSupportCSSHL()) {
options.edit.protyle.highlight.rangeIndex = 0;
searchMarkRender(options.edit.protyle, getResponse.data.keywords, true, () => {
options.edit.protyle.contentElement.scrollTop = options.edit.protyle.contentElement.scrollTop + options.edit.protyle.highlight.ranges[0].getBoundingClientRect().top - contentRect.top - contentRect.height / 2;
if (options.edit.protyle.highlight.ranges.length > 0) {
options.edit.protyle.contentElement.scrollTop = options.edit.protyle.contentElement.scrollTop + options.edit.protyle.highlight.ranges[0].getBoundingClientRect().top - contentRect.top - contentRect.height / 2;
}
});
} else {
const matchElements = options.edit.protyle.wysiwyg.element.querySelectorAll('span[data-type~="search-mark"]');