summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/[lng]/partners/(partners)/document-list-ship/dolce-upload-page-v2.tsx3
-rw-r--r--lib/dolce/table/drawing-list-table-v2.tsx11
2 files changed, 6 insertions, 8 deletions
diff --git a/app/[lng]/partners/(partners)/document-list-ship/dolce-upload-page-v2.tsx b/app/[lng]/partners/(partners)/document-list-ship/dolce-upload-page-v2.tsx
index e311f038..7611cbbd 100644
--- a/app/[lng]/partners/(partners)/document-list-ship/dolce-upload-page-v2.tsx
+++ b/app/[lng]/partners/(partners)/document-list-ship/dolce-upload-page-v2.tsx
@@ -569,7 +569,6 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
selectedRow={selectedDrawing || undefined}
getRowId={getDrawingId}
minHeight="0"
- defaultPageSize={"all"}
/>
)}
</CardContent>
@@ -634,7 +633,6 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
selectedRow={selectedDetail || undefined}
getRowId={getDetailDrawingId}
minHeight="0"
- defaultPageSize={"all"}
/>
)}
</CardContent>
@@ -689,7 +687,6 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
columns={fileColumns}
data={files}
minHeight="0"
- defaultPageSize={"all"}
/>
)}
</CardContent>
diff --git a/lib/dolce/table/drawing-list-table-v2.tsx b/lib/dolce/table/drawing-list-table-v2.tsx
index 929a1252..3af09689 100644
--- a/lib/dolce/table/drawing-list-table-v2.tsx
+++ b/lib/dolce/table/drawing-list-table-v2.tsx
@@ -44,7 +44,7 @@ interface DrawingListTableV2Props<TData extends DrawingData, TValue> {
getRowId?: (row: TData) => string;
maxHeight?: string; // e.g., "45vh"
minHeight?: string; // e.g., "400px"
- defaultPageSize?: number | "all"
+ defaultPageSize?: number;
}
export function DrawingListTableV2<TData extends DrawingData, TValue>({
@@ -55,11 +55,12 @@ export function DrawingListTableV2<TData extends DrawingData, TValue>({
getRowId,
maxHeight,
minHeight = "400px",
- defaultPageSize = 10,
+ defaultPageSize,
}: DrawingListTableV2Props<TData, TValue>) {
const [sorting, setSorting] = useState<SortingState>([]);
const [pageIndex, setPageIndex] = useState(0);
- const [pageSize, setPageSize] = useState(defaultPageSize);
+ // defaultPageSize가 없으면 전체 데이터 길이를 사용
+ const [pageSize, setPageSize] = useState(defaultPageSize ?? data.length);
// 기본 getRowId 함수: RegisterGroupId + DrawingNo + Discipline + CreateDt 조합
const defaultGetRowId = (row: TData): string => {
@@ -105,7 +106,7 @@ export function DrawingListTableV2<TData extends DrawingData, TValue>({
};
const handlePageSizeChange = (value: string) => {
- const newSize = value === "all" ? data.length : parseInt(value);
+ const newSize = value === "all" ? data.length : parseInt(value, 10);
setPageSize(newSize);
setPageIndex(0);
};
@@ -202,7 +203,7 @@ export function DrawingListTableV2<TData extends DrawingData, TValue>({
style={{ height: "300px" }}
>
<div className="flex items-center justify-center h-full">
- 데이터가 없습니다.
+ No Data.
</div>
</TableCell>
</TableRow>