fix: share view lack search relative params

teableio · Nov 20, 2024 · 2029574 · 2029574
1 parent 3d24e8a
commit 2029574
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/apps/nextjs-app/src/features/app/blocks/share/view/component/grid/GridViewBase.tsx b/apps/nextjs-app/src/features/app/blocks/share/view/component/grid/GridViewBase.tsx
@@ -83,7 +83,7 @@ export const GridViewBase = (props: IGridViewProps) => {
   const hiddenFields = useHiddenFields();
   const customIcons = useGridIcons();
   const { openTooltip, closeTooltip } = useGridTooltipStore();
-  const { setGridRef } = useGridSearchStore();
+  const { setGridRef, searchCursor } = useGridSearchStore();
 
   const prepare = isHydrated && view && columns.length;
   const { filter, sort } = view ?? {};
@@ -126,7 +126,7 @@ export const GridViewBase = (props: IGridViewProps) => {
     };
   }, [filter, sort?.sortObjs, viewQueryWithGroup]);
 
-  const { recordMap, groupPoints, onVisibleRegionChanged } = useGridAsyncRecords(
+  const { recordMap, groupPoints, onVisibleRegionChanged, searchHitIndex } = useGridAsyncRecords(
     ssrRecords,
     undefined,
     viewQuery,
@@ -254,6 +254,8 @@ export const GridViewBase = (props: IGridViewProps) => {
             columnStatistics={columnStatistics}
             freezeColumnCount={isTouchDevice ? 0 : 1}
             columns={columns}
+            searchCursor={searchCursor}
+            searchHitIndex={searchHitIndex}
             customIcons={customIcons}
             rowControls={rowControls}
             style={{

diff --git a/apps/nextjs-app/src/features/app/blocks/view/search/SearchCountPagination.tsx b/apps/nextjs-app/src/features/app/blocks/view/search/SearchCountPagination.tsx
@@ -165,7 +165,7 @@ export const SearchCountPagination = forwardRef<
       return finalResult;
     } else {
       const result = await previousFn(baseQueryRo);
-      result &&
+      result?.data &&
         result.data?.forEach((result, index) => {
           const indexNumber = skip + index + 1;
           finalResult[indexNumber] = result;
@@ -191,7 +191,7 @@ export const SearchCountPagination = forwardRef<
     if (nextCursor <= totalCount) {
       const skip = currentPage - 1;
       const result = await nextFn({ ...baseQueryRo, skip });
-      result &&
+      result?.data &&
         result.data?.forEach((result, index) => {
           const indexNumber = skip + index + 1;
           finalResult[indexNumber] = result;