From 372b2f642aa14a38b0f1d8d18fe7235fd9390e08 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sun, 8 Dec 2024 16:42:22 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/13343

---
 app/src/search/util.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/search/util.ts b/app/src/search/util.ts
index 5e843de21..391c639fb 100644
--- a/app/src/search/util.ts
+++ b/app/src/search/util.ts
@@ -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"]');