diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index 3ec23a850..87f31b963 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -1116,6 +1116,7 @@ const SearchModal: React.FC = ({ onPageChange={setCurPage} resetPageNo={isResetPage} resetSelection={isResetSelection} + curPage={curPage} headButton={
@@ -1147,6 +1148,7 @@ const SearchModal: React.FC = ({ onPageChange={setCurPage} resetPageNo={isResetPage} resetSelection={isResetSelection} + curPage={curPage} headButton={ } @@ -1173,6 +1175,7 @@ const SearchModal: React.FC = ({ onPageChange={setDetailCurPage} resetPageNo={isResetDetailPage} resetSelection={isResetDetailSelection} + curPage={detailCurPage} headButton={
diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 9ffea89bf..6d5b24c70 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -30,6 +30,7 @@ type UiTableProps = { boldArray?: number[]; resetSelection?: boolean; index?: number; + curPage?: number; headButton?: React.ReactNode | undefined; }; @@ -54,9 +55,10 @@ export function UiTable({ boldArray = [], resetSelection = false, index = -1, + curPage = 1, headButton = undefined, }: UiTableProps) { - const [cur, setCur] = useState(1); + const [cur, setCur] = useState(curPage); const [idx, setIdx] = useState(index); const [headerHeight, setHeaderHeight] = useState(0); const headerRef = useRef(null); @@ -84,6 +86,10 @@ export function UiTable({ setIdx(index); }, [index]) + useEffect(() => { + setCur(curPage); + }, [curPage]) + const handlePageChange = (page: number) => { setCur(page); onPageChange(page);