From c12fd7133ebb05b94852d038985ec5875f996a24 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 2 Sep 2026 09:09:19 +0900 Subject: [PATCH] =?UTF-8?q?260902=5F01=5FENH:=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=EC=97=90=EC=84=9C=20=ED=95=99=EB=8B=B9=EB=AA=85?= =?UTF-8?q?=EC=9E=98=EB=A6=AC=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20(=EC=98=81=EB=AC=B8=EB=AA=85=20=EC=A4=84=EB=B0=94?= =?UTF-8?q?=EA=BF=88,=20=EA=B0=80=EC=9E=A5=20=EA=B8=B4=20=ED=95=99?= =?UTF-8?q?=EB=8B=B9=20=EB=AA=85=20=EA=B8=B0=EC=A4=80=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/progress/page.tsx | 14 ++++-- src/app/(pages)/(main)/report/page.tsx | 14 ++++-- src/components/report/ReportTable.tsx | 7 +-- src/components/report/formatCenterName.ts | 3 ++ .../report/useAutoFitCenterNameWidth.ts | 49 +++++++++++++++++++ 5 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 src/components/report/formatCenterName.ts create mode 100644 src/components/report/useAutoFitCenterNameWidth.ts 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 ? (

불러오는 중...

) : ( - + )} ); diff --git a/src/components/report/ReportTable.tsx b/src/components/report/ReportTable.tsx index 8d5247e..45293b5 100644 --- a/src/components/report/ReportTable.tsx +++ b/src/components/report/ReportTable.tsx @@ -28,6 +28,7 @@ export interface ReportTableProps { } const BODY_CELL_TEXT_CLASS = "truncate"; +const CENTER_NAME_CELL_CLASS = "whitespace-pre-line break-keep"; // value7은 소수점 2자리(예: "7.00"), value100은 소수점 1자리(예: "100.0")로 반올림 표기한다. // null은 항상 "-"로 표시하고, 0은 zeroAsDash 옵션에 따라 "-" 또는 반올림된 값("0.00"/"0.0")으로 표시한다. @@ -166,18 +167,18 @@ export function ReportTable({ return ( {merged ? ( - + {leadingColumns[stickyCount - 1].render(row)} ) : ( leadingColumns.slice(0, stickyCount).map((column, columnIndex) => ( - + {column.render(row)} )) )} {leadingColumns.slice(stickyCount).map((column) => ( - + {column.render(row)} ))} diff --git a/src/components/report/formatCenterName.ts b/src/components/report/formatCenterName.ts new file mode 100644 index 0000000..e0ddcb4 --- /dev/null +++ b/src/components/report/formatCenterName.ts @@ -0,0 +1,3 @@ +export function formatCenterName(centerName: string): string { + return centerName.replace(/^(.+?[가-힣][가-힣0-9]*)\s+(?=[A-Za-z])/, "$1\n"); +} diff --git a/src/components/report/useAutoFitCenterNameWidth.ts b/src/components/report/useAutoFitCenterNameWidth.ts new file mode 100644 index 0000000..2c5913a --- /dev/null +++ b/src/components/report/useAutoFitCenterNameWidth.ts @@ -0,0 +1,49 @@ +import { useLayoutEffect, useState } from "react"; +import type { ReportContent } from "@/types/report"; +import { formatCenterName } from "./formatCenterName"; + +const DEFAULT_WIDTH = 200; +const MIN_WIDTH = 200; +const MAX_WIDTH = 400; +const CELL_HORIZONTAL_PADDING = 10; + +const measureCenterNameWidth = (names: string[]): number => { + if (typeof document === "undefined") return DEFAULT_WIDTH; + + const canvas = document.createElement("canvas"); + const context = canvas.getContext("2d"); + if (!context) return DEFAULT_WIDTH; + + const style = window.getComputedStyle(document.body); + context.font = [style.fontStyle, style.fontVariant, style.fontWeight, style.fontSize, style.fontFamily] + .filter(Boolean) + .join(" "); + + const maxTextWidth = Math.max( + context.measureText("학당명").width, + ...names.flatMap((name) => formatCenterName(name).split("\n")).map((line) => context.measureText(line).width), + ); + + return Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, Math.ceil(maxTextWidth + CELL_HORIZONTAL_PADDING))); +}; + +export function useAutoFitCenterNameWidth(content: ReportContent[]): number { + const [width, setWidth] = useState(DEFAULT_WIDTH); + + useLayoutEffect(() => { + let cancelled = false; + const measure = () => { + if (cancelled) return; + setWidth(measureCenterNameWidth(content.map((row) => row.centerName))); + }; + + measure(); + document.fonts?.ready.then(measure); + + return () => { + cancelled = true; + }; + }, [content]); + + return width; +}