diff --git a/src/app/(pages)/(main)/progress/page.tsx b/src/app/(pages)/(main)/progress/page.tsx index 841b930..a4f306c 100644 --- a/src/app/(pages)/(main)/progress/page.tsx +++ b/src/app/(pages)/(main)/progress/page.tsx @@ -6,6 +6,8 @@ import { MultiSelect } from "@/components/common/multi-select"; import { ExcelDownloadButton } from "@/components/report/ExcelDownloadButton"; import { exportReportToExcel } from "@/components/report/exportReportToExcel"; import { ReportTable, type ReportLeadingColumn } from "@/components/report/ReportTable"; +import { formatCenterName } from "@/components/report/formatCenterName"; +import { useAutoFitCenterNameWidth } from "@/components/report/useAutoFitCenterNameWidth"; import { useAuth } from "@/hooks/useAuth"; import { useCentersQuery } from "@/query/center"; import { useProgressReportQuery } from "@/query/report"; @@ -13,7 +15,7 @@ import { isAdminRole } from "@/types/auth"; const LEADING_COLUMNS: ReportLeadingColumn[] = [ { key: "centerCd", label: "id", width: 64, sticky: true, render: (row) => row.centerCd }, - { key: "centerName", label: "학당명", width: 200, sticky: true, render: (row) => row.centerName }, + { key: "centerName", label: "학당명", width: 200, sticky: true, render: (row) => formatCenterName(row.centerName) }, { key: "targetCount", label: "목표 표본", width: 100, render: (row) => row.targetCount }, { key: "completeCount", label: "완료 수", width: 100, render: (row) => row.completeCount ?? "-" }, ]; @@ -39,6 +41,12 @@ export default function ProgressPage() { return rows.filter((row) => row.centerCd === 0 || selected.has(row.centerCd)); }, [reportQuery.data, admin, selectedCenterCds]); + const centerNameWidth = useAutoFitCenterNameWidth(content); + const leadingColumns = useMemo( + () => LEADING_COLUMNS.map((column) => column.key === "centerName" ? { ...column, width: centerNameWidth } : column), + [centerNameWidth], + ); + const handleDownload = () => { if (!reportQuery.data) return; exportReportToExcel({ @@ -47,7 +55,7 @@ export default function ProgressPage() { headers: reportQuery.data.headers, content, scale: "current", - leadingColumns: LEADING_COLUMNS, + leadingColumns, }); }; @@ -71,7 +79,7 @@ export default function ProgressPage() { headers={reportQuery.data?.headers ?? []} content={content} scale="current" - leadingColumns={LEADING_COLUMNS} + leadingColumns={leadingColumns} mergeLeadingColumnsWhen={(row) => row.centerCd === 0} /> )} diff --git a/src/app/(pages)/(main)/report/page.tsx b/src/app/(pages)/(main)/report/page.tsx index 650bc52..2adaa8d 100644 --- a/src/app/(pages)/(main)/report/page.tsx +++ b/src/app/(pages)/(main)/report/page.tsx @@ -6,13 +6,15 @@ import { MultiSelect } from "@/components/common/multi-select"; import { ExcelDownloadButton } from "@/components/report/ExcelDownloadButton"; import { exportReportToExcel } from "@/components/report/exportReportToExcel"; import { ReportTable, type ReportLeadingColumn } from "@/components/report/ReportTable"; +import { formatCenterName } from "@/components/report/formatCenterName"; +import { useAutoFitCenterNameWidth } from "@/components/report/useAutoFitCenterNameWidth"; import { useAuth } from "@/hooks/useAuth"; import { useCentersQuery } from "@/query/center"; import { useFinalReportQuery } from "@/query/report"; import { isAdminRole } from "@/types/auth"; const LEADING_COLUMNS: ReportLeadingColumn[] = [ - { key: "centerName", label: "학당명", width: 200, sticky: true, render: (row) => row.centerName }, + { key: "centerName", label: "학당명", width: 200, sticky: true, render: (row) => formatCenterName(row.centerName) }, { key: "completeCount", label: "완료 수", width: 100, render: (row) => row.completeCount ?? 0 }, ]; @@ -37,6 +39,12 @@ export default function ReportPage() { return rows.filter((row) => row.centerCd === 0 || selected.has(row.centerCd)); }, [reportQuery.data, admin, selectedCenterCds]); + const centerNameWidth = useAutoFitCenterNameWidth(content); + const leadingColumns = useMemo( + () => LEADING_COLUMNS.map((column) => column.key === "centerName" ? { ...column, width: centerNameWidth } : column), + [centerNameWidth], + ); + const handleDownload = () => { if (!reportQuery.data) return; exportReportToExcel({ @@ -45,7 +53,7 @@ export default function ReportPage() { headers: reportQuery.data.headers, content, scale: "final", - leadingColumns: LEADING_COLUMNS, + leadingColumns, }); }; @@ -65,7 +73,7 @@ export default function ReportPage() { {reportQuery.isLoading ? (
불러오는 중...
) : ( -