From 4d8c6467595cf93b252ecb2bc59e0cf429561c6c Mon Sep 17 00:00:00 2001 From: hyeonsu Date: Wed, 27 Aug 2025 11:20:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EC=85=98=201=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A0=8C?= =?UTF-8?q?=EB=8D=94=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/admin/UserHistoryModal.tsx | 20 +++++++++---------- frontend/components/common/Pagination.tsx | 4 +--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/frontend/components/admin/UserHistoryModal.tsx b/frontend/components/admin/UserHistoryModal.tsx index dd6614b0..89df7452 100644 --- a/frontend/components/admin/UserHistoryModal.tsx +++ b/frontend/components/admin/UserHistoryModal.tsx @@ -230,17 +230,15 @@ export function UserHistoryModal({ isOpen, onClose, userId, userName }: UserHist - {/* 페이지네이션 (원본 JSP와 유사한 구조) */} - {totalItems > 0 && ( -
- {}} // 페이지 크기는 고정 (원본과 동일) - /> -
총 {totalItems}건
-
- )} + {/* 페이지네이션 (항상 표시) */} +
+ {}} // 페이지 크기는 고정 (원본과 동일) + /> +
총 {totalItems}건
+
)} diff --git a/frontend/components/common/Pagination.tsx b/frontend/components/common/Pagination.tsx index 2c9625e3..2046e894 100644 --- a/frontend/components/common/Pagination.tsx +++ b/frontend/components/common/Pagination.tsx @@ -115,9 +115,7 @@ export function Pagination({ } }; - if (totalPages <= 1) { - return null; // 페이지가 1개 이하면 렌더링하지 않음 - } + // 항상 페이지네이션을 표시 (1페이지일 때도 표시) return (
From 7ce94574a7b5cba252472e1ec9d2cb14c1b38642 Mon Sep 17 00:00:00 2001 From: hyeonsu Date: Wed, 27 Aug 2025 11:33:27 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/common/Pagination.tsx | 42 ++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/frontend/components/common/Pagination.tsx b/frontend/components/common/Pagination.tsx index 2046e894..4709baaf 100644 --- a/frontend/components/common/Pagination.tsx +++ b/frontend/components/common/Pagination.tsx @@ -118,9 +118,9 @@ export function Pagination({ // 항상 페이지네이션을 표시 (1페이지일 때도 표시) return ( -
+
{/* 페이지 정보 */} -
+
{startItem.toLocaleString()} {" - "} {endItem.toLocaleString()} @@ -129,10 +129,10 @@ export function Pagination({
{/* 페이지네이션 컨트롤 */} -
+
{/* 페이지 크기 선택 */} {showPageSizeSelector && onPageSizeChange && ( -
+
페이지당