fix: fix data inconsistency issue on secondary pages (#784)

ayangweb · web-flow · commit db5c09f80c93 · 2025-07-20T10:54:51.000+08:00
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
@@ -29,6 +29,7 @@ Information about release notes of Coco Server is provided here.
 - fix: correct incorrect assistant display when quick ai access #779
 - fix: resolved minor issues with voice playback #780
 - fix: fixed incorrect taskbar icon display on linux #783
+- fix: fix data inconsistency issue on secondary pages #784
 
 ### ✈️ Improvements
 
diff --git a/src/components/Search/DocumentList.tsx b/src/components/Search/DocumentList.tsx
@@ -11,6 +11,8 @@ import { Get } from "@/api/axiosRequest";
 import { useAppStore } from "@/stores/appStore";
 import { useConnectStore } from "@/stores/connectStore";
 import SearchEmpty from "../Common/SearchEmpty";
+import { Data } from "ahooks/lib/useInfiniteScroll/types";
+import { nanoid } from "nanoid";
 
 interface DocumentListProps {
   onSelectDocument: (id: string) => void;
@@ -45,72 +47,88 @@ export const DocumentList: React.FC<DocumentListProps> = ({
   const containerRef = useRef<HTMLDivElement>(null);
   const itemRefs = useRef<(HTMLDivElement | null)[]>([]);
   const [isKeyboardMode, setIsKeyboardMode] = useState(false);
+  const taskIdRef = useRef(nanoid());
+  const [data, setData] = useState<Data>();
 
   const querySourceTimeoutRef = useRef(querySourceTimeout);
   useEffect(() => {
     querySourceTimeoutRef.current = querySourceTimeout;
   }, [querySourceTimeout]);
 
-  const { data, loading } = useInfiniteScroll(
-    async (d) => {
-      const from = d?.list?.length || 0;
-      let queryStrings: any = {
+  const getData = async (taskId: string, data?: Data) => {
+    const from = data?.list?.length || 0;
+
+    let queryStrings: any = {
+      query: input,
+      datasource: sourceData?.source?.id,
+      querysource: sourceData?.querySource?.id,
+    };
+
+    if (sourceData?.rich_categories) {
+      queryStrings = {
         query: input,
-        datasource: sourceData?.source?.id,
-        querysource: sourceData?.querySource?.id,
+        rich_category: sourceData?.rich_categories[0]?.key,
       };
+    }
 
-      if (sourceData?.rich_categories) {
-        queryStrings = {
-          query: input,
-          rich_category: sourceData?.rich_categories[0]?.key,
-        };
+    let response: any;
+    if (isTauri) {
+      response = await platformAdapter.commands("query_coco_fusion", {
+        from: from,
+        size: PAGE_SIZE,
+        queryStrings: queryStrings,
+        queryTimeout: querySourceTimeoutRef.current,
+      });
+    } else {
+      let url = `/query/_search?query=${queryStrings.query}&datasource=${queryStrings.datasource}&from=${from}&size=${PAGE_SIZE}`;
+      if (queryStrings?.rich_categories) {
+        url = `/query/_search?query=${queryStrings.query}&rich_category=${queryStrings.rich_category}&from=${from}&size=${PAGE_SIZE}`;
       }
+      const [error, res]: any = await Get(url);
 
-      let response: any;
-      if (isTauri) {
-        response = await platformAdapter.commands("query_coco_fusion", {
-          from: from,
-          size: PAGE_SIZE,
-          queryStrings: queryStrings,
-          queryTimeout: querySourceTimeoutRef.current,
-        });
+      if (error) {
+        console.error("_search", error);
+        response = { hits: [], total: 0 };
       } else {
-        let url = `/query/_search?query=${queryStrings.query}&datasource=${queryStrings.datasource}&from=${from}&size=${PAGE_SIZE}`;
-        if (queryStrings?.rich_categories) {
-          url = `/query/_search?query=${queryStrings.query}&rich_category=${queryStrings.rich_category}&from=${from}&size=${PAGE_SIZE}`;
-        }
-        const [error, res]: any = await Get(url);
-
-        if (error) {
-          console.error("_search", error);
-          response = { hits: [], total: 0 };
-        } else {
-          const hits =
-            res?.hits?.hits?.map((hit: any) => ({
-              document: {
-                ...hit._source,
-              },
-              score: hit._score || 0,
-              source: hit._source.source || null,
-            })) || [];
-          const total = res?.hits?.total?.value || 0;
-
-          response = {
-            hits: hits,
-            total_hits: total,
-          };
-        }
+        const hits =
+          res?.hits?.hits?.map((hit: any) => ({
+            document: {
+              ...hit._source,
+            },
+            score: hit._score || 0,
+            source: hit._source.source || null,
+          })) || [];
+        const total = res?.hits?.total?.value || 0;
+
+        response = {
+          hits: hits,
+          total_hits: total,
+        };
       }
-      console.log("_docs", from, queryStrings, response);
-      const list = response?.hits || [];
-      const total = response?.total_hits || 0;
-      setTotal(total);
-
-      return {
-        list: list,
-        hasMore: list.length === PAGE_SIZE && from + list.length < total,
-      };
+    }
+
+    console.log("_docs", from, queryStrings, response);
+    const list = response?.hits || [];
+    const total = response?.total_hits || 0;
+    setTotal(total);
+
+    if (taskId === taskIdRef.current) {
+      setData({ list });
+    }
+
+    return {
+      list: list,
+      hasMore: list.length === PAGE_SIZE && from + list.length < total,
+    };
+  };
+
+  const { loading } = useInfiniteScroll(
+    (data) => {
+      const taskId = nanoid();
+
+      taskIdRef.current = taskId;
+
+      return getData(taskId, data);
     },
     {
       target: containerRef,
