diff --git a/src/app/(pages)/(main)/total/lg-penetration/page.tsx b/src/app/(pages)/(main)/total/lg-penetration/page.tsx index f9ef80f..acfc70c 100644 --- a/src/app/(pages)/(main)/total/lg-penetration/page.tsx +++ b/src/app/(pages)/(main)/total/lg-penetration/page.tsx @@ -1,6 +1,7 @@ "use client"; import { + BottomDescription, GroupedOverlayBar, type GroupedOverlayBarData, signStyleGapRow, @@ -39,6 +40,7 @@ const LGPenetrationPage = () => { const productTableRows = useMemo(() => { return apiOwnShareOfTotalPenetration.map((row) => ({ label: formatRowLabel(row.rowLabel), + total: row.total, values: PRODUCT_KEYS.map((k) => (row as any)[k] ?? null), })); }, []); @@ -103,6 +105,12 @@ const LGPenetrationPage = () => { }); }, []); + const description = useMemo(() => { + return "Q. 다음 중 귀댁에서 보유하고 계신 가전/전자 제품은 무엇입니까? 모두 선택해주세요.
" + + "* 구독/렌탈/선물/경품/아파트 내 빌트인 제품을 모두 포함하여 선택해주세요.
" + + "Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?"; + }, []); + useEffect(() => { registerExcelExporter(async () => { const excelHeader = buildHeader_ProductKeyMap(PRODUCT_KEY_MAP); @@ -152,6 +160,8 @@ const LGPenetrationPage = () => { signStyle={signStyleGapRow} /> + + ); diff --git a/src/app/(pages)/(main)/total/lg-purchase/page.tsx b/src/app/(pages)/(main)/total/lg-purchase/page.tsx index d63f525..21ccee0 100644 --- a/src/app/(pages)/(main)/total/lg-purchase/page.tsx +++ b/src/app/(pages)/(main)/total/lg-purchase/page.tsx @@ -23,6 +23,7 @@ const LGPurchasePage = () => { const purchaseTableRows = useMemo(() => { return apiOwnShareOfTotalPurchase.map((row) => ({ label: formatRowLabel(row.rowLabel), + total: row.total, values: PRODUCT_KEYS.map((k) => (row as any)[k] ?? null), })); }, []); @@ -65,6 +66,16 @@ const LGPurchasePage = () => { }; }, []); + const description = useMemo(() => { + return "Q. 다음 중 귀댁에서 보유하고 계신 가전/전자 제품은 무엇입니까? 모두 선택해주세요.
" + + "* 구독/렌탈/선물/경품/아파트 내 빌트인 제품을 모두 포함하여 선택해주세요.
" + + "Q. 보유하고 계신 (제품)을 언제 구입하셨습니까?
" + + "* 새 상품을 선물 받은 경우, 선물 받은 연도로 입력해주세요.
" + + "** 중고 제품인 경우, 중고 제품을 구입한 연도로 입력해주세요.
" + + "*** 신규 입주 시 빌트인되어 있던 제품은 입주한 연도를 입력해주세요.
" + + "Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?"; + }, []); + useEffect(() => { registerExcelExporter(async () => { const excelHeader = buildHeader_ProductKeyMap(PRODUCT_KEY_MAP); diff --git a/src/app/(pages)/(main)/total/penetration/page.tsx b/src/app/(pages)/(main)/total/penetration/page.tsx index c7feb77..0966d83 100644 --- a/src/app/(pages)/(main)/total/penetration/page.tsx +++ b/src/app/(pages)/(main)/total/penetration/page.tsx @@ -8,7 +8,7 @@ import { GroupedStackBar, signStyleGapRow, type TopChartTableRow, - type GroupedStackBarData, + type GroupedStackBarData, BottomDescription, } from "@/components/lge-dashboard"; import { useLayoutFilter } from "@/components/layout/LayoutFilterContext"; import {apiBrandByYearCategories, apiTrendCategories} from "@/config/sample.data"; @@ -33,6 +33,7 @@ const PenetrationPage = () => { const productTableRows = useMemo(() => { return apiTrendCategories.map((row) => ({ label: formatRowLabel(row.rowLabel), + total: row.total, values: PRODUCT_KEYS.map((k) => (row as any)[k] ?? null), })); }, []); @@ -71,6 +72,15 @@ const PenetrationPage = () => { return { categories: PRODUCTS, years: YEARS, brands: BRAND_LIST, values }; }, []); + const description = useMemo(() => { + if(isBrandShare){ + return "Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?"; + } + + return "Q. 다음 중 귀댁에서 보유하고 계신 가전/전자 제품은 무엇입니까? 모두 선택해주세요.
" + + "* 구독/렌탈/선물/경품/아파트 내 빌트인 제품을 모두 포함하여 선택해주세요."; + }, [isBrandShare]); + useEffect(() => { registerExcelExporter(async () => { const excelHeader = buildHeader_ProductKeyMap(PRODUCT_KEY_MAP); @@ -140,7 +150,9 @@ const PenetrationPage = () => { ) } signStyle={signStyleGapRow} + fillCAGR={true} /> + ); }; diff --git a/src/app/(pages)/(main)/total/purchase/page.tsx b/src/app/(pages)/(main)/total/purchase/page.tsx index e33bd0b..ce5b6b0 100644 --- a/src/app/(pages)/(main)/total/purchase/page.tsx +++ b/src/app/(pages)/(main)/total/purchase/page.tsx @@ -10,6 +10,7 @@ import { SITE_TITLE } from "@/const/lgConst"; import { + BottomDescription, type ChartData, signStyleGapRow, TopChartTable, @@ -28,6 +29,7 @@ const PurchasePage = () => { const purchaseTableRows = useMemo(() => { return apiTrendBuy.map((row) => ({ label: formatRowLabel(row.rowLabel), + total: row.total, values: PRODUCT_KEYS.map((k) => (row as any)[k] ?? null), })); }, []); @@ -44,6 +46,15 @@ const PurchasePage = () => { }; }, []); + const description = useMemo(() => { + return "Q. 다음 중 귀댁에서 보유하고 계신 가전/전자 제품은 무엇입니까? 모두 선택해주세요.
" + + "* 구독/렌탈/선물/경품/아파트 내 빌트인 제품을 모두 포함하여 선택해주세요.
" + + "Q. 보유하고 계신 (제품)을 언제 구입하셨습니까?
" + + "* 새 상품을 선물 받은 경우, 선물 받은 연도로 입력해주세요.
" + + "** 중고 제품인 경우, 중고 제품을 구입한 연도로 입력해주세요.
" + + "*** 신규 입주 시 빌트인되어 있던 제품은 입주한 연도를 입력해주세요."; + }, []); + useEffect(() => { registerExcelExporter(async () => { const excelHeader = buildHeader_ProductKeyMap(PRODUCT_KEY_MAP); @@ -78,6 +89,8 @@ const PurchasePage = () => { } signStyle={signStyleGapRow} /> + + ); }; diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index b33a79a..ae9eee8 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -31,7 +31,7 @@ const buildDefaultTotalValue = (): SelectedMap => { return init; }; -export const buildDefaultCategoryValue = (categoryFilterItems: ProductsFilterItem): CategoryFilterValue => { +const buildDefaultCategoryValue = (categoryFilterItems: ProductsFilterItem): CategoryFilterValue => { const initProduct = categoryFilterItems.items[0]; const initType = {label:"보유", value:CategoryTargetType.PENETRATION} const firstTarget = categoryTarget.find((x) => x.type.includes(initType.value))?.children?.[0]?.target; @@ -45,6 +45,12 @@ export const buildDefaultCategoryValue = (categoryFilterItems: ProductsFilterIte }; }; +const buildTotalPartDescription = (pathname:string) => { + return pathname.match("penetration") + ? "■ 보급률: 전체 소비자 중, 조사 년도에 해당 제품을 보유하고 있는 비율" + : "■ 구매율: 전체 소비자 중, 조사 년도에 해당 제품을 구매한 비율"; +} + const MainLayout = ({ children }: MainLayoutProps) => { const router = useRouter(); const pathname = usePathname(); @@ -62,6 +68,7 @@ const MainLayout = ({ children }: MainLayoutProps) => { const isFilterOpen = isTotal ? isTotalFilterOpen : isCategoryFilterOpen; const categoryFilterItems = PRODUCTS_FILTER_ITEM.find((m) => pathname.match?.(m.path)) ?? PRODUCTS_FILTER_ITEM[0]; + const totalPartDescription = buildTotalPartDescription(pathname); const [totalValue, setTotalValue] = useState(() => buildDefaultTotalValue()); const [categoryValue, setCategoryValue] = useState(() => buildDefaultCategoryValue(categoryFilterItems)); @@ -137,16 +144,15 @@ const MainLayout = ({ children }: MainLayoutProps) => { type="button" onClick={toggleFilter} className={cn( - "inline-flex items-center gap-2 font-semibold text-gray-900 content-text-sm", + "inline-flex items-center gap-2 font-semibold text-gray-900 content-text-sm cursor-pointer", "select-none" )} > - 필터 {isFilterOpen ? "▲" : "▼"} + 필터 {isFilterOpen ? "▲" : "▼"} {isTotal && ( -
- 페이지에 대한 설명 +
)}
diff --git a/src/components/lge-dashboard/BottomDescription.tsx b/src/components/lge-dashboard/BottomDescription.tsx new file mode 100644 index 0000000..d898f63 --- /dev/null +++ b/src/components/lge-dashboard/BottomDescription.tsx @@ -0,0 +1,8 @@ +const BottomDescription = ({description}:{description:string}) => { + return ( +
+
+ ); +} + +export default BottomDescription; diff --git a/src/components/lge-dashboard/SectionTitle.tsx b/src/components/lge-dashboard/SectionTitle.tsx index 4edcc90..e45632a 100644 --- a/src/components/lge-dashboard/SectionTitle.tsx +++ b/src/components/lge-dashboard/SectionTitle.tsx @@ -1,6 +1,6 @@ const SectionTitle = ({title}:{title:string}) => { return ( -
+
{title}
diff --git a/src/components/lge-dashboard/combo/BannerSummary.tsx b/src/components/lge-dashboard/combo/BannerSummary.tsx index 5e4a411..9a677d2 100644 --- a/src/components/lge-dashboard/combo/BannerSummary.tsx +++ b/src/components/lge-dashboard/combo/BannerSummary.tsx @@ -1,12 +1,12 @@ import {ChartData, DataColumn, DataTable, HorizontalBar, LeftChartTable, SignStyle} from "@/components/lge-dashboard"; import {BannerKey, ServerBannerRow} from "@/types/lg"; -import {formatRowLabel, wrapSampleRow} from "@/lib/lg-dashboard"; +import {formatRowLabel, isGapRow, wrapSampleRow} from "@/lib/lg-dashboard"; import {useEffect, useMemo} from "react"; import { BANNER_GROUP, BANNER_KEY_MAP, GRID_Y_NOT_PADDING, - SAMPLE_SIZE_NOTICE, SITE_TITLE, + SITE_TITLE, } from "@/const/lgConst"; import {parseNumber} from "@/lib/utils"; import { @@ -27,7 +27,7 @@ type SectionSpec = { /** 3개 섹션(테이블)도 여기서만 선언 */ const SECTIONS: SectionSpec[] = [ { title: "가구 형태", groupKeys: ["lifeStage", "household", "age"] }, - { title: "거주 형태", groupKeys: ["tenure", "housing", "pyeong"] }, + { title: "거주 형태", groupKeys: ["occupancy", "housing", "houseSize"] }, { title: "거주 지역 및 소득 수준", groupKeys: ["region", "income"] }, ]; @@ -105,7 +105,7 @@ const BannerSummary = ({ data, useChart, useYear }: BannerSummaryProps) => { }; const signStyleGap: SignStyle = { - rowSelector: (row) => row.rowLabel === "gap", + rowSelector: (row) => isGapRow(row.rowLabel), display: "arrow", arrowWithNumber: true, paint: "text", @@ -121,7 +121,12 @@ const BannerSummary = ({ data, useChart, useYear }: BannerSummaryProps) => { const columns = buildColumns(spec, useYear? filterValue.year : ""); // rows가 spec마다 다르면 여기서 가져오도록 구성 - const rows = wrapSampleRow(useYear? data.filter((d) => d.year === filterValue.year) : data); + const rows = + wrapSampleRow(useYear? data.filter((d) => d.year === filterValue.year) : data) + .map((row) => { + row.rowLabel = formatRowLabel(row.rowLabel); + return row + }) const chartData = buildChartData(rows, bannerKeys); return { @@ -197,7 +202,6 @@ const BannerSummary = ({ data, useChart, useYear }: BannerSummaryProps) => { starUnder30Sample={true} /> } -
{SAMPLE_SIZE_NOTICE}
); })} diff --git a/src/components/lge-dashboard/combo/CategoryByData.tsx b/src/components/lge-dashboard/combo/CategoryByData.tsx index 1d8d864..c1c3fa2 100644 --- a/src/components/lge-dashboard/combo/CategoryByData.tsx +++ b/src/components/lge-dashboard/combo/CategoryByData.tsx @@ -7,15 +7,15 @@ import { } from "@/components/lge-dashboard"; import BannerButtons from "@/components/lge-dashboard/BannerButtons"; import {totalFilters} from "@/config/filter.data"; -import {useEffect, useMemo, useState} from "react"; +import React, {useMemo, useState} from "react"; import {BannerGroupKey, CategoryChartMode, ServerBannerRow} from "@/types/lg"; import { buildRowLabelSeriesChartData, - buildYearSeriesChartData, - isBannerGroupKey, + buildYearSeriesChartData, formatRowLabel, + isBannerGroupKey, isGapRow, wrapSampleRow } from "@/lib/lg-dashboard"; -import {BANNER_GROUP, BANNER_KEY_MAP, LAST_YEAR, SAMPLE_SIZE_NOTICE} from "@/const/lgConst"; +import {BANNER_GROUP, BANNER_KEY_MAP, GAP_WORDING, SAMPLE_SIZE_NOTICE, UNIT_TEXT} from "@/const/lgConst"; import {createDefaultGrid, createDefaultLegend, reverseCategories} from "@/lib/chart-options"; type CategoryByDataProps = { @@ -26,6 +26,7 @@ type CategoryByDataProps = { fillGreaterThan5?: boolean; chartHeight?: number; chartWidth?: number; + unitText?: string; } const banners: bannerType[] = totalFilters.map((filter) => { @@ -33,7 +34,7 @@ const banners: bannerType[] = totalFilters.map((filter) => { }) const signStyleGap: SignStyle = { - rowSelector: (row) => row.rowLabel === "gap", + rowSelector: (row) => isGapRow(row.rowLabel), display: "arrow", arrowWithNumber: true, paint: "text", @@ -48,6 +49,7 @@ const CategoryByData = ({ fillGreaterThan5, chartHeight, chartWidth, + unitText = UNIT_TEXT, }: CategoryByDataProps) => { const [selectedBanner, setSelectedBanner] = useState(banners[0]); @@ -93,11 +95,20 @@ const CategoryByData = ({ return isBannerGroupKey(v) ? buildColumns(v, selectedYear) : []; }, [selectedBanner.variable, selectedYear]); - const tableData = useMemo(() => wrapSampleRow(allTableData).filter((row) => row.year === selectedYear), [allTableData, selectedYear]); + const tableData = useMemo(() => + wrapSampleRow(allTableData) + .filter((row) => row.year === selectedYear) + .map((row) => { + row.rowLabel = formatRowLabel(row.rowLabel); + return row + }) + , [allTableData, selectedYear]); return (
- {title && } +
+ {title ? :
} +
{ @@ -132,13 +143,11 @@ const CategoryByData = ({ columns={tableColumns} rows={tableData} signStyle={signStyleGap} - wrapperClassName="border rounded-lg" fillGreaterThan5={fillGreaterThan5} starUnder30Sample={true} />
-
{SAMPLE_SIZE_NOTICE}
); }; diff --git a/src/components/lge-dashboard/combo/LeftChartTable.tsx b/src/components/lge-dashboard/combo/LeftChartTable.tsx index c84a958..ef6285d 100644 --- a/src/components/lge-dashboard/combo/LeftChartTable.tsx +++ b/src/components/lge-dashboard/combo/LeftChartTable.tsx @@ -6,6 +6,7 @@ import type { DataColumn, SignStyle } from "../types"; import SectionTitle from "../SectionTitle"; import { TABLE_DIMENSIONS } from "@/const/chartConst"; import {isSampleRow} from "@/lib/lg-dashboard"; +import {SAMPLE_SIZE_NOTICE, UNIT_TEXT} from "@/const/lgConst"; type MergedChartCell = { /** 차트를 삽입할 컬럼 key(해당 컬럼 td는 startRow에서만 렌더되고 rowSpan 적용) */ @@ -34,6 +35,7 @@ type Props> = { tableClassName?: string; minWidthPx?: number; starUnder30Sample?: boolean; + unitText?: string; }; // toNumber는 utils.ts의 parseNumber로 통합됨 @@ -67,7 +69,8 @@ export default function LeftChartTable>({ wrapperClassName, tableClassName, minWidthPx = TABLE_DIMENSIONS.MIN_WIDTH.COMPACT, - starUnder30Sample = true + starUnder30Sample = true, + unitText = UNIT_TEXT, }: Props) { const hasGroupHeader = useMemo( () => columns.some((c) => c.group) || columns.some((c) => c.headRowSpan === 2), @@ -137,9 +140,16 @@ export default function LeftChartTable>({ return (
- {title && ( - - )} +
+ { title && } + { + (unitText || starUnder30Sample) && +
+ {unitText} + {starUnder30Sample && <>
{SAMPLE_SIZE_NOTICE}} +
+ } +
diff --git a/src/components/lge-dashboard/combo/LifeStageDiv.tsx b/src/components/lge-dashboard/combo/LifeStageDiv.tsx index 72c9809..259a067 100644 --- a/src/components/lge-dashboard/combo/LifeStageDiv.tsx +++ b/src/components/lge-dashboard/combo/LifeStageDiv.tsx @@ -1,6 +1,8 @@ import GaugeCardTable from "./GaugeCardTable"; -import {LIFE_STAGE_COLUMNS} from "@/const/lgConst"; +import {LIFE_STAGE_COLUMNS, UNIT_TEXT} from "@/const/lgConst"; import {LifeStageGroup} from "@/types/lg"; +import SectionTitle from "../SectionTitle"; +import React from "react"; type lifeStageDivProps = { lifeStageRowsByGroup:LifeStageGroup[]; @@ -10,11 +12,10 @@ type lifeStageDivProps = { const LifeStageDiv = ({lifeStageRowsByGroup}:lifeStageDivProps) => { return (
-
-
- * 하위 테이블들에 대한 설명 -
-
+ + +
+
제품 보유율 @@ -27,6 +28,9 @@ const LifeStageDiv = ({lifeStageRowsByGroup}:lifeStageDivProps) => { /> 시장 기회공간
+
+ {UNIT_TEXT} +
diff --git a/src/components/lge-dashboard/combo/TopChartTable.tsx b/src/components/lge-dashboard/combo/TopChartTable.tsx index b784018..a7a8f75 100644 --- a/src/components/lge-dashboard/combo/TopChartTable.tsx +++ b/src/components/lge-dashboard/combo/TopChartTable.tsx @@ -5,18 +5,20 @@ import { cn, parseNumber } from "@/lib/utils"; import type { ChartData, SignStyle, TopChartTableRow } from "../types"; import SectionTitle from "../SectionTitle"; import { CHART_HEIGHTS, TABLE_DIMENSIONS } from "@/const/chartConst"; +import {UNIT_TEXT} from "@/const/lgConst"; +import {isCagrRow} from "@/lib/lg-dashboard"; -type BaseProps = { +export type TopChartTableProps = { title?: string; + categories: string[]; + rows: TopChartTableRow[]; /** 테이블 상단(헤더 1행) 콜스팬 셀 내부에 렌더될 차트 */ chart?: - | React.ReactNode - | ((ctx: { - /** 테이블 컬럼(=x축) 기준으로 구성된 ChartData */ - chartData: ChartData; - tableCategories: string[]; - tableRows: TopChartTableRow[]; - }) => React.ReactNode); + | React.ReactNode + | ((ctx: { + /** 테이블 컬럼(=x축) 기준으로 구성된 ChartData */ + chartData: ChartData; + }) => React.ReactNode); /** chart 셀 높이(px) */ chartHeight?: number; /** 가로 스크롤 min-width */ @@ -25,31 +27,9 @@ type BaseProps = { wrapperClassName?: string; /** +/-/0 색상/표기 옵션(선택) */ signStyle?: SignStyle; + fillCAGR?: boolean; + unitText?: string; }; - -/** - * 1) (신규) HTML 형태: columns=categories, rows=TopChartTableRow - */ -type HtmlModeProps = BaseProps & { - categories: string[]; - rows: TopChartTableRow[]; -}; - -/** - * 2) (호환) 기존 형태: ChartData 기반으로 rows/columns 자동 생성 - * - rows = data.categories - * - cols = data.series.name - */ -type ChartDataModeProps = BaseProps & { - data: ChartData; - /** 좌측 rowhead 컬럼 헤더 */ - categoryHeader?: string; - /** 값 표기 포맷터 */ - valueFormatter?: (v: number) => string; -}; - -export type TopChartTableProps = HtmlModeProps | ChartDataModeProps; - // toNumber는 utils.ts의 parseNumber로 통합됨 function formatSignedNumber(n: number, zeroText: string, showPlus: boolean) { @@ -68,12 +48,16 @@ function toCellValue(v: unknown): CellValue { export default function TopChartTable(props: TopChartTableProps) { const { title, + rows, + categories, chart, chartHeight = CHART_HEIGHTS.DEFAULT, minWidthPx = TABLE_DIMENSIONS.MIN_WIDTH.STANDARD, tableClassName, wrapperClassName, signStyle, + fillCAGR = false, + unitText = UNIT_TEXT } = props; const display = signStyle?.display ?? "number"; @@ -83,63 +67,40 @@ export default function TopChartTable(props: TopChartTableProps) { const negCls = signStyle?.negativeTextClassName ?? "lg-num-neg"; const zeroText = signStyle?.zeroText ?? "-"; - const { categories, rows, rowHeadHeader, valueFormatter } = useMemo(() => { - if ("data" in props) { - const d = props.data; - const tableRows: TopChartTableRow[] = d.categories.map((cat, i) => ({ - label: String(cat ?? ""), - values: d.series.map((s) => toCellValue(s.data[i] ?? null)), - })); - - return { - categories: d.series.map((s) => s.name), - rows: tableRows, - rowHeadHeader: props.categoryHeader ?? "", - valueFormatter: props.valueFormatter, - }; - } - - return { - categories: props.categories, - rows: props.rows, - rowHeadHeader: "", - valueFormatter: undefined, - }; - }, [props]); - // 테이블 컬럼(=categories)을 x축으로 사용하는 chartData를 항상 제공 const chartData: ChartData = useMemo( - () => ({ - categories, - series: rows.map((r) => ({ - name: r.label, - data: r.values.map((v) => parseNumber(v) ?? null), - })), - }), - [categories, rows] + () => ({ + categories, + series: rows.map((r) => ({ + name: r.label, + data: r.values.map((v) => parseNumber(v) ?? null), + })), + }), + [categories, rows] ); const chartNode = useMemo(() => { if (!chart) return null; - return typeof chart === "function" ? chart({ chartData, tableCategories: categories, tableRows: rows }) : chart; + return typeof chart === "function" ? chart({ chartData }) : chart; }, [chart, chartData, categories, rows]); return ( -
- {title && ( - - )} +
+
+ {title ? :
} + {unitText ?
{unitText}
: null} +
-
-
- +
+
+ {/* 좌상단: rowhead 헤더(필요 시 표시). HTML과 동일하게 2행 rowspan */} {categories.map((c) => ( - + ))} - + - + {rows.map((r, ri) => { const isSignRow = !!(signStyle?.rowSelector && signStyle.rowSelector(r, ri)); + const cagrRow = isCagrRow(r.label as string ?? ""); + const total = parseNumber(r.total); return ( - - + + - {categories.map((_, ci) => { - const raw = r.values?.[ci]; - const n = parseNumber(raw); + {categories.map((_, ci) => { + const raw = r.values?.[ci]; + const n = parseNumber(raw); - // 일반 행 - if (!isSignRow) { + // 일반 행 + if (!isSignRow) { + if (n === null) return ; + + const isFill = fillCAGR && cagrRow && total && n > total + 5; + const txt = n.toLocaleString(); + return ; + } + + // sign row if (n === null) return ; - const txt = valueFormatter ? valueFormatter(n) : n.toLocaleString(); - return ; - } + if (n === 0) return ; - // sign row - if (n === null) return ; - if (n === 0) return ; + const cls = n > 0 ? posCls : negCls; - const cls = n > 0 ? posCls : negCls; + if (display === "arrow") { + const arrow = n > 0 ? "▲" : "▼"; + const num = Math.abs(n); + return ( + + ); + } - if (display === "arrow") { - const arrow = n > 0 ? "▲" : "▼"; - const num = Math.abs(n); return ( - + ); - } - - return ( - - ); - })} - + })} + ); })} - -
- {rowHeadHeader} + {chartNode ?
{chartNode}
: null} @@ -148,61 +109,65 @@ export default function TopChartTable(props: TopChartTableProps) {
{c}{c}
- {r.label} -
+ {r.label} + -{txt}-{txt}{zeroText}-{zeroText} + {arrow} + {arrowWithNumber ? ` ${num}` : ""} + - {arrow} - {arrowWithNumber ? ` ${num}` : ""} - + {formatSignedNumber(n, zeroText, showPlus)} + - {formatSignedNumber(n, zeroText, showPlus)} -
+ + +
-
); -} +} \ No newline at end of file diff --git a/src/components/lge-dashboard/index.ts b/src/components/lge-dashboard/index.ts index 7bfd2a3..b7c11fc 100644 --- a/src/components/lge-dashboard/index.ts +++ b/src/components/lge-dashboard/index.ts @@ -19,3 +19,4 @@ export { default as CategoryByData } from "./combo/CategoryByData" export { default as CardDefault } from "./card/Card"; export { default as SectionTitle } from "./SectionTitle"; +export { default as BottomDescription } from "./BottomDescription"; \ No newline at end of file diff --git a/src/components/lge-dashboard/sub-page/category-page/Brand.tsx b/src/components/lge-dashboard/sub-page/category-page/Brand.tsx index ea5eede..d10ca6b 100644 --- a/src/components/lge-dashboard/sub-page/category-page/Brand.tsx +++ b/src/components/lge-dashboard/sub-page/category-page/Brand.tsx @@ -14,7 +14,7 @@ const Brand = () => { const {filterValue, registerExcelExporter} = useLayoutFilter(); const tableDataArray = useMemo[]>(() => [ - {title: "브랜드", chartMode:"reverseStack", data: apiBrandShareByYear}, + {title: "브랜드", chartMode:"reverseStack", data: apiBrandShareByYear, chartHeight:400}, ], []); useEffect(() => { diff --git a/src/components/lge-dashboard/table/DataTable.tsx b/src/components/lge-dashboard/table/DataTable.tsx index 16007fb..cae8f93 100644 --- a/src/components/lge-dashboard/table/DataTable.tsx +++ b/src/components/lge-dashboard/table/DataTable.tsx @@ -5,7 +5,8 @@ import type React from "react"; import { cn, parseNumber } from "@/lib/utils"; import type { DataColumn, SignDisplayMode, SignStyle } from "../types"; import SectionTitle from "../SectionTitle"; -import {isSampleRow} from "@/lib/lg-dashboard"; +import {isCagrRow, isSampleRow} from "@/lib/lg-dashboard"; +import {SAMPLE_SIZE_NOTICE, UNIT_TEXT} from "@/const/lgConst"; type Props> = { columns: DataColumn[]; @@ -15,7 +16,9 @@ type Props> = { wrapperClassName?: string; signStyle?: SignStyle; fillGreaterThan5?: boolean; + fillCAGR?: boolean; starUnder30Sample?: boolean; + unitText?: string; }; // parseSignedNumber는 utils.ts의 parseNumber로 통합됨 @@ -57,7 +60,9 @@ const DataTable = >({ wrapperClassName, signStyle, fillGreaterThan5 = false, + fillCAGR = false, starUnder30Sample = false, + unitText = UNIT_TEXT, }: Props) => { const hasGroup = columns.some((c) => !!c.group) || columns.some((c) => c.headRowSpan === 2); @@ -148,9 +153,16 @@ const DataTable = >({ return (
- {title && ( - - )} +
+ { title && } + { + (unitText || starUnder30Sample) && +
+ {unitText} + {starUnder30Sample && <>
{SAMPLE_SIZE_NOTICE}} +
+ } +
{hasGroup && ( diff --git a/src/components/lge-dashboard/types.ts b/src/components/lge-dashboard/types.ts index 9b803c2..04fc7b7 100644 --- a/src/components/lge-dashboard/types.ts +++ b/src/components/lge-dashboard/types.ts @@ -1,4 +1,5 @@ import type React from "react"; +import {GAP_WORDING} from "@/const/lgConst"; export type NewNumber = number | null | undefined; @@ -45,6 +46,7 @@ export type GroupedOverlayBarData = { export type TopChartTableRow = { /** 좌측 rowhead 라벨 */ label: string; + total: number | string | null | undefined; /** categories 순서대로 값 */ values: Array; }; @@ -122,7 +124,7 @@ export type SignStyle = { }; export const signStyleGapRow: SignStyle = { - rowSelector: (row) => row.label === "전년 대비 GAP(%)", + rowSelector: (row) => row.label === GAP_WORDING, display: "arrow", arrowWithNumber: true, paint: "text", diff --git a/src/config/filter.data.ts b/src/config/filter.data.ts index fbeebb2..faeed87 100644 --- a/src/config/filter.data.ts +++ b/src/config/filter.data.ts @@ -32,7 +32,7 @@ export const totalFilters:TotalFilterItem[] = [ ] }, { - variable:"tenure", + variable:"occupancy", variableName:"입주 형태", children:[ { value: "0", label: "전체"}, @@ -44,7 +44,7 @@ export const totalFilters:TotalFilterItem[] = [ ] }, { - variable:"pyeong", + variable:"houseSize", variableName:"거주 평형", children:[ { value: "0", label: "전체"}, diff --git a/src/config/sample.data.ts b/src/config/sample.data.ts index 15daf20..49934cb 100644 --- a/src/config/sample.data.ts +++ b/src/config/sample.data.ts @@ -158,9 +158,9 @@ const BANNER_GROUPS: Record = { lifeStage: ["single", "noKids", "preschoolKids", "schoolKids", "adultKids", "independentSenior"], household: ["hh1", "hh2", "hh3", "hh4Plus"], age: ["age20s", "age30s", "age40s", "age50s", "age60s"], - tenure: ["ownerOccupied", "jeonse", "depositAndMonthly", "monthlyNoDeposit", "otherTenure"], + occupancy: ["ownerOccupied", "jeonse", "depositAndMonthly", "monthlyNoDeposit", "otherOccupancyType"], housing: ["apartment", "house", "officetel", "villa", "studio", "otherHousingType"], - pyeong: ["under19Pyeong", "pyeong20s", "pyeong30s", "pyeong40s", "pyeong50Plus"], + houseSize: ["under19Pyeong", "pyeong20s", "pyeong30s", "pyeong40s", "pyeong50Plus"], region: [ "regionCapital", "regionGyeongnamBusanUlsan", diff --git a/src/const/chartConst.ts b/src/const/chartConst.ts index 86648cb..a5bac10 100644 --- a/src/const/chartConst.ts +++ b/src/const/chartConst.ts @@ -3,6 +3,8 @@ * - 차트 높이, Bar 너비, Grid 설정 등 */ +import {GAP_WORDING} from "@/const/lgConst"; + /** * 차트 기본 높이 설정 */ @@ -122,8 +124,8 @@ export const TABLE_DIMENSIONS = { export const CHART_LABELS = { TOTAL: "전체", LG: "LG", - GAP: "전년 대비 GAP(%)", - CAGR: "CAGR(%)", + GAP: GAP_WORDING, + CAGR: "CAGR(%p)", SAMPLE_COUNT: "(사례수)", } as const; diff --git a/src/const/lgConst.ts b/src/const/lgConst.ts index aac67ab..40f7bbf 100644 --- a/src/const/lgConst.ts +++ b/src/const/lgConst.ts @@ -3,6 +3,11 @@ import {GaugeColumn} from "@/components/lge-dashboard"; export const SITE_TITLE = 'LGE CX Dashboard'; +export const GAP_WORDING = "전년 대비 GAP(%p)"; + +export const UNIT_TEXT = "(단위 %)" +export const SAMPLE_SIZE_NOTICE = "* 30표본 미만 해석에 주의"; + export const PRODUCT_KEY_MAP = { refrigerator: "냉장고", kimchiRefrigerator: "김치 냉장고", @@ -52,7 +57,7 @@ export const BANNER_KEY_MAP = { jeonse: "전세", depositAndMonthly: "전+월세 (보증금有)", monthlyNoDeposit: "월세 (보증금無)", - otherTenure: "기타", + otherOccupancyType: "기타", // 주거형태 apartment: "아파트", @@ -181,15 +186,15 @@ export const BANNER_GROUP = { label: "연령", keys: [BANNER_KEY.age20s, BANNER_KEY.age30s, BANNER_KEY.age40s, BANNER_KEY.age50s, BANNER_KEY.age60s], }, - tenure: { + occupancy: { label: "입주 형태", - keys: [BANNER_KEY.ownerOccupied, BANNER_KEY.jeonse, BANNER_KEY.depositAndMonthly, BANNER_KEY.monthlyNoDeposit, BANNER_KEY.otherTenure], + keys: [BANNER_KEY.ownerOccupied, BANNER_KEY.jeonse, BANNER_KEY.depositAndMonthly, BANNER_KEY.monthlyNoDeposit, BANNER_KEY.otherOccupancyType], }, housing: { label: "주거 형태", keys: [BANNER_KEY.apartment, BANNER_KEY.house, BANNER_KEY.officetel, BANNER_KEY.villa, BANNER_KEY.studio, BANNER_KEY.otherHousingType], }, - pyeong: { + houseSize: { label: "거주 평형", keys: [BANNER_KEY.under19Pyeong, BANNER_KEY.pyeong20s, BANNER_KEY.pyeong30s, BANNER_KEY.pyeong40s, BANNER_KEY.pyeong50Plus], }, @@ -208,6 +213,4 @@ export const BANNER_GROUP = { label: "소득수준", keys: [BANNER_KEY.incomeUnder299, BANNER_KEY.income300to599, BANNER_KEY.income600to899, BANNER_KEY.income900Plus], }, -} as const; - -export const SAMPLE_SIZE_NOTICE = "* 30 미만 샘플에 대한 설명"; \ No newline at end of file +} as const; \ No newline at end of file diff --git a/src/lib/lg-dashboard.ts b/src/lib/lg-dashboard.ts index 9d6ea99..56a72c5 100644 --- a/src/lib/lg-dashboard.ts +++ b/src/lib/lg-dashboard.ts @@ -1,14 +1,18 @@ import {BannerGroupKey, ServerBannerRow} from "@/types/lg"; import {ChartData} from "@/components/lge-dashboard"; -import {BANNER_GROUP} from "@/const/lgConst"; +import {BANNER_GROUP, GAP_WORDING} from "@/const/lgConst"; import {formatNumber} from "@/lib/utils"; export const isSampleRow = (raw: string) => raw.replace(/\s+/g, "").includes("사례수"); +export const isCagrRow = (raw: string) => raw.replace(/\s+/g, "").toUpperCase().includes("CAGR"); + +export const isGapRow = (raw: string) => raw.replace(/\s+/g, "").toUpperCase().includes("GAP"); + /** * Row Label을 표시용 텍스트로 포맷팅합니다. * - "사례수" -> "(사례수)" - * - "gap" -> "전년 대비 GAP(%)" + * - "gap" -> "전년 대비 GAP(%p)" * - "CAGR" -> "CAGR(%)" * - "24" -> "24년" * - "보급율" -> "보급율(%)" @@ -18,7 +22,7 @@ export function formatRowLabel( label: string, options?: { convertSample?: boolean; // "사례수" -> "(사례수)" (기본값: true) - convertGap?: boolean; // "gap" -> "전년 대비 GAP(%)" (기본값: true) + convertGap?: boolean; // "gap" -> "전년 대비 GAP(%p)" (기본값: true) convertCagr?: boolean; // "CAGR" -> "CAGR(%)" (기본값: true) convertYear?: boolean; // "24" -> "24년" (기본값: true) convertRate?: boolean; // "~율" -> "~율(%)" (기본값: true) @@ -37,11 +41,11 @@ export function formatRowLabel( const t = label.trim(); if (convertSample && t === "사례수") return "(사례수)"; - if (convertGap && t.toLowerCase() === "gap") return "전년 대비 GAP(%)"; - if (convertCagr && t.toUpperCase() === "CAGR") return "CAGR(%)"; + if (convertGap && t.toLowerCase() === "gap") return GAP_WORDING; + if (convertCagr && t.toUpperCase() === "CAGR") return "CAGR(%p)"; if (convertYear && /^\d{2}$/.test(t)) return `${t}년`; - if (convertRate && t.endsWith("율")) return `${t}(%)`; - if (convertCount && t.includes("대수")) return `${t}(대)`; + if (convertRate && t.endsWith("율")) return `${t.replaceAll('(%)','')}(%)`; + if (convertCount && t.includes("대수")) return `${t.replaceAll('(대)','')}(대)`; return t; }