fix(frontend): fix #245

Author: gary-Shen

apps/frontend/src/pages/tasks.[id].samples.[id]/components/annotationRightCorner/index.tsx

@@ -29,6 +29,8 @@ interface AnnotationRightCornerProps {
   fetchNext?: () => void;
 
   totalSize: number;
+
+  isLastPage: boolean;
 }
 
 export const SAMPLE_CHANGED = 'sampleChanged';
@@ -63,7 +65,7 @@ export interface AnnotationLoaderData {
   samples: SampleListResponse;
 }
 
-const AnnotationRightCorner = ({ noSave, fetchNext, totalSize }: AnnotationRightCornerProps) => {
+const AnnotationRightCorner = ({ noSave, fetchNext, totalSize, isLastPage }: AnnotationRightCornerProps) => {
   const isFetching = useIsFetching();
   const isMutating = useIsMutating();
   const isGlobalLoading = isFetching > 0 || isMutating > 0;
@@ -86,11 +88,11 @@ const AnnotationRightCorner = ({ noSave, fetchNext, totalSize }: AnnotationRight
 
   // 第一次进入就是40的倍数时，获取下一页数据
   useEffect(() => {
-    if (isLastSample && samples.length < totalSize) {
+    if (isLastSample && samples.length < totalSize && !isLastPage) {
       // TODO: fetchNext 调用两次
       fetchNext?.();
     }
-  }, [fetchNext, isLastSample, samples.length, totalSize]);
+  }, [fetchNext, isLastSample, samples.length, totalSize, isLastPage]);
 
   const navigateWithSearch = useCallback(
     (to: string) => {

apps/frontend/src/pages/tasks.[id].samples.[id]/index.tsx

@@ -152,6 +152,7 @@ const AnnotationPage = () => {
   const PAGE_SIZE = 40;
   // 滚动加载
   const [totalCount, setTotalCount] = useState<number>(0);
+  const [serverPage, setServerPage] = useState<number>(1);
   const currentPage = useRef<number>(1);
   if (currentPage.current === 1) {
     currentPage.current = sample?.data.inner_id ? Math.floor(sample.data.inner_id / PAGE_SIZE) + 1 : 1;
@@ -170,7 +171,7 @@ const AnnotationPage = () => {
 
     currentPage.current += 1;
     setTotalCount(meta_data?.total ?? 0);
-
+    setServerPage(meta_data?.page ?? 1);
     return data;
   }, [routeParams.taskId]);
   const [samples = [] as SampleResponse[], loading, setSamples, svc] = useScrollFetch(
@@ -180,14 +181,19 @@ const AnnotationPage = () => {
       document.querySelector('.labelu-audio__sidebar div') ||
       document.querySelector('.labelu-video__sidebar div'),
     {
-      isEnd: () => totalCount === samples.length,
+      isEnd: () => totalCount === samples.length || serverPage === Math.ceil(totalCount / PAGE_SIZE),
     },
   );
 
   const leftSiderContent = useMemo(() => <SlideLoader />, []);
 
   const topActionContent = (
-    <AnnotationRightCorner totalSize={totalCount} fetchNext={svc} noSave={!!searchParams.get('noSave')} />
+    <AnnotationRightCorner
+      totalSize={totalCount}
+      fetchNext={svc}
+      isLastPage={serverPage >= Math.ceil(totalCount / PAGE_SIZE)}
+      noSave={!!searchParams.get('noSave')}
+    />
   );
 
   const annotationContextValue = useMemo(() => {