Compare commits

...

14 Commits

Author SHA1 Message Date
1da20a1fb6 260720_01_ENH: 보유 대수 소수점 2자리까지 풀음, profile(전체) 추가 2026-07-20 14:38:25 +09:00
50e1ea19cc 260511_01_ENH: year가 고정으로 들어가 있던 버그 수정 2026-05-11 16:58:04 +09:00
fc43eab6fc 260402_03_ENH: 워딩 수정 2026-04-02 16:03:32 +09:00
7474d4d3d4 260402_03_ENH: 워딩 수정 2026-04-02 15:56:36 +09:00
01208b5b24 Merge branch 'develop' 2026-04-02 14:49:01 +09:00
563f98c6f2 Merge branch 'develop' 2026-04-02 14:35:07 +09:00
b740cc27fa Merge pull request '260401_05_ENH: 전기레인지 화구 수 문항 추가' (#8) from develop into master
Reviewed-on: #8
2026-04-01 17:24:25 +09:00
f4f487ca10 Merge pull request '260401_04_ENH: Total Filter multi-select 가능하게 수정 및 DEBOUNCE_TIME 상수화' (#7) from develop into master
Reviewed-on: #7
2026-04-01 15:24:22 +09:00
849245818c Merge pull request 'develop' (#6) from develop into master
Reviewed-on: #6
2026-04-01 11:26:45 +09:00
5b2811fd86 Merge pull request '260331_01_ENH: CAGR 셀 색칠 기준 5초과에서 5이상으로 변경' (#5) from develop into master
Reviewed-on: #5
2026-03-31 08:46:50 +09:00
3dc735722d Merge pull request '260330_02_ENH: 연도별 사례수 row에서 Column으로 이동' (#4) from develop into master
Reviewed-on: #4
2026-03-30 17:01:29 +09:00
8fff3ec908 Merge pull request 'develop' (#3) from develop into master
Reviewed-on: #3
2026-03-30 14:07:20 +09:00
11321c483b Merge pull request '260226_03_ENH: 통계 정보 호출 캐시 미사용 api들 캐시 사용으로 변경' (#2) from develop into master
Reviewed-on: #2
2026-02-26 11:10:15 +09:00
40b6ddb553 Merge pull request '260226_02_ENH: KART API 생성 제거' (#1) from develop into master
Reviewed-on: #1
2026-02-26 11:06:52 +09:00
19 changed files with 198 additions and 70 deletions

2
.gitignore vendored
View File

@@ -1,5 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
.idea
# dependencies # dependencies
/node_modules /node_modules
/.pnp /.pnp

View File

@@ -19,10 +19,12 @@ export type CategoryPageProps = {
variableIdMap: Record<string, string>; variableIdMap: Record<string, string>;
dataMap:Record<string, BannerRow[]> | undefined; dataMap:Record<string, BannerRow[]> | undefined;
fillGreaterThan5?: boolean; fillGreaterThan5?: boolean;
isProfileAll?: boolean;
} }
const PAGE_COMPONENTS: Partial<Record<CategoryTargetData, React.ComponentType<CategoryPageProps>>> = { const PAGE_COMPONENTS: Partial<Record<CategoryTargetData, React.ComponentType<CategoryPageProps>>> = {
[CategoryTargetData.PROFILE]: Profile, [CategoryTargetData.PROFILE]: Profile,
[CategoryTargetData.PROFILE_ALL]: Profile,
[CategoryTargetData.PENETRATION_CHANGE]: PenetrationChange, [CategoryTargetData.PENETRATION_CHANGE]: PenetrationChange,
[CategoryTargetData.BRAND]: CategoryDetail, [CategoryTargetData.BRAND]: CategoryDetail,
[CategoryTargetData.TYPE_SPEC]: CategoryDetail, [CategoryTargetData.TYPE_SPEC]: CategoryDetail,
@@ -44,14 +46,14 @@ const CategoryPage = () => {
variableIdMap, variableIdMap,
bannerIdList: BANNER_GROUP_KEY, bannerIdList: BANNER_GROUP_KEY,
filterCondition: buildCategoryFilter(debouncedFilterValue), filterCondition: buildCategoryFilter(debouncedFilterValue),
option: { useCache: USE_CACHE, lastYear: false, decimalPoint: API_DECIMAL_POINT }, option: { useCache: USE_CACHE, lastYear: false, decimalPoint: 2 },
}; };
}, [variableIdMap, debouncedFilterValue]); }, [variableIdMap, debouncedFilterValue]);
const { data } = useBannerStatisticsQuery(req); const { data } = useBannerStatisticsQuery(req);
const dataMap = data?.statisticsDataMap; const dataMap = data?.statisticsDataMap;
const target = debouncedFilterValue.target; const target = debouncedFilterValue.target;
const Comp = PAGE_COMPONENTS[target.value]; const Comp = PAGE_COMPONENTS[target.value];
const isProfileAll = target.value === CategoryTargetData.PROFILE_ALL;
const fillGreaterThan5 = Comp === CategoryDetail && !!dataMap; const fillGreaterThan5 = Comp === CategoryDetail && !!dataMap;
const processedDataMap = useMemo(() => { const processedDataMap = useMemo(() => {
@@ -104,7 +106,15 @@ const CategoryPage = () => {
}, [dataMap, fields, target.value]); }, [dataMap, fields, target.value]);
if(isTotal) return null; if(isTotal) return null;
return Comp ? <Comp fields={fields} variableIdMap={variableIdMap} dataMap={processedDataMap} fillGreaterThan5={fillGreaterThan5} /> : null; return Comp ?
<Comp
fields={fields}
variableIdMap={variableIdMap}
dataMap={processedDataMap}
fillGreaterThan5={fillGreaterThan5}
isProfileAll={isProfileAll}
/>
: null;
} }
export default CategoryPage; export default CategoryPage;

View File

@@ -52,11 +52,13 @@ const CategoryDetail = ({
const sheetName = `${product}_${type}_${target}` const sheetName = `${product}_${type}_${target}`
const h3 = buildHeader_Banner(BANNER_GROUP, BANNER_KEY_MAP); const h3 = buildHeader_Banner(BANNER_GROUP, BANNER_KEY_MAP);
const years = [
debouncedFilterValue.year,
String(Number(debouncedFilterValue.year) - 1),
].filter((year) => YEARS.includes(year));
type AnyRow = Record<string, any>; type AnyRow = Record<string, any>;
const sections: Section<AnyRow>[] = tableDataArray.flatMap((tableData) => { const sections: Section<AnyRow>[] = tableDataArray.flatMap((tableData) => {
const years = [YEARS.at(-1), YEARS.at(-2)];
return years.map((year) => ({ return years.map((year) => ({
title: `${tableData.title}_${year}년`, title: `${tableData.title}_${year}년`,
header: h3, header: h3,

View File

@@ -12,7 +12,8 @@ import {CategoryTargetType} from "@/types/filter.types";
import {CategoryPageProps} from "../../sub-page/CategoryPage"; import {CategoryPageProps} from "../../sub-page/CategoryPage";
const Profile = ({ const Profile = ({
dataMap dataMap,
isProfileAll,
}:CategoryPageProps) => { }:CategoryPageProps) => {
const { filterValue } = useLayoutFilter(); const { filterValue } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue); const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
@@ -51,7 +52,7 @@ const Profile = ({
.map((row) => { .map((row) => {
return { return {
...row, ...row,
rowLabel: row.year, rowLabel: isProfileAll ? `${row.rowLabel}율` : row.year,
} }
}) })
@@ -68,11 +69,19 @@ const Profile = ({
} }
}); });
return tempProfileData.sort((a, b) => Number(a.rowLabel === "보유대수") - Number(b.rowLabel === "보유대수")); tempProfileData.sort((a, b) => Number(a.rowLabel === "보유대수") - Number(b.rowLabel === "보유대수"));
}, [debouncedFilterValue, dataMap]); tempProfileData.sort((a, b) => Number(a.year) - Number(b.year));
return tempProfileData;
}, [debouncedFilterValue, dataMap, isProfileAll]);
return ( return (
<BannerSummary data={profileData} useChart={false} useYear={true} /> <BannerSummary
data={profileData}
useChart={false}
useYear={!isProfileAll}
isProfileAll={isProfileAll}
/>
); );
} }

View File

@@ -207,7 +207,7 @@ const LGPenetrationPage = () => {
return "Q. 다음 중 귀댁에서 보유하고 계신 가전/전자 제품은 무엇입니까? 모두 선택해주세요.<br/>" + return "Q. 다음 중 귀댁에서 보유하고 계신 가전/전자 제품은 무엇입니까? 모두 선택해주세요.<br/>" +
"* 구독/렌탈/선물/경품/아파트 내 빌트인 제품을 모두 포함하여 선택해주세요.<br/>" + "* 구독/렌탈/선물/경품/아파트 내 빌트인 제품을 모두 포함하여 선택해주세요.<br/>" +
"Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?<br/>" + "Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?<br/>" +
"* 조사 년도 보급률 중 자사제품 비율 = (LG 보급률 ÷ 전체 보급률) × 100"; "** 조사 년도 보급률 중 자사제품 비율 = (LG 보급률 ÷ 전체 보급률) × 100";
}, []); }, []);
useEffect(() => { useEffect(() => {

View File

@@ -149,7 +149,7 @@ const LGPurchasePage = () => {
//"** 중고 제품인 경우, 중고 제품을 구입한 연도로 입력해주세요.<br/>" + //"** 중고 제품인 경우, 중고 제품을 구입한 연도로 입력해주세요.<br/>" +
//"*** 신규 입주 시 빌트인되어 있던 제품은 입주한 연도를 입력해주세요.<br/>" + //"*** 신규 입주 시 빌트인되어 있던 제품은 입주한 연도를 입력해주세요.<br/>" +
"Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?<br/>" + "Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?<br/>" +
"* 조사 년도 구매율 중 자사제품 비율 = (LG 구매율 ÷ 전체 구매율) × 100"; "** 조사 년도 구매율 중 자사제품 비율 = (LG 구매율 ÷ 전체 구매율) × 100";
}, []); }, []);
useEffect(() => { useEffect(() => {

View File

@@ -466,6 +466,16 @@
word-break: auto-phrase; word-break: auto-phrase;
} }
.lg-table th.lg-table__no-border-r,
.lg-table td.lg-table__no-border-r {
border-right: 0 !important;
}
.lg-table th.lg-table__no-border-l,
.lg-table td.lg-table__no-border-l {
border-left: 0 !important;
}
.lg-table thead tr.lg-table__group th { .lg-table thead tr.lg-table__group th {
background: hsl(var(--lg-gray-400)); background: hsl(var(--lg-gray-400));
white-space: pre-wrap; white-space: pre-wrap;

View File

@@ -1,4 +1,4 @@
import { ChartData, DataColumn, DataTable, HorizontalBar, LeftChartTable, SignStyle } from "@/components/lge-dashboard"; import { ChartData, DataColumn, DataTable, HorizontalBar, LeftChartTable, MergedTableCell, SignStyle } from "@/components/lge-dashboard";
import { BannerKey, BannerRow } from "@/types/lg.types"; import { BannerKey, BannerRow } from "@/types/lg.types";
import { buildBannerGroupColumns, formatRowLabel, isGapRow, wrapSampleRow } from "@/lib/lg-dashboard"; import { buildBannerGroupColumns, formatRowLabel, isGapRow, wrapSampleRow } from "@/lib/lg-dashboard";
import { useEffect, useMemo } from "react"; import { useEffect, useMemo } from "react";
@@ -30,13 +30,24 @@ const SEP_R = "lg-table__sep-r";
const getSectionBannerKeys = (spec: SectionSpec): BannerKey[] => const getSectionBannerKeys = (spec: SectionSpec): BannerKey[] =>
spec.groupKeys.flatMap((gk) => flattenBannerGroupKeys(BANNER_GROUP[gk].children)); spec.groupKeys.flatMap((gk) => flattenBannerGroupKeys(BANNER_GROUP[gk].children));
const buildColumns = (spec: SectionSpec, selectedYear: string): DataColumn<BannerRow>[] => { const buildColumns = (spec: SectionSpec, selectedYear: string, isProfileAll:boolean): DataColumn<BannerRow>[] => {
const columns: DataColumn<BannerRow>[] = [ const columns: DataColumn<BannerRow>[] = [
...(isProfileAll
? [
{
key: "year" as const,
header: "",
rowHead: true,
headerClassName: "lg-table__no-border-r",
width: 60,
},
]
: []),
{ {
key: "rowLabel", key: "rowLabel",
header: `${selectedYear}년`, header: selectedYear ? `${selectedYear}년` : "",
headerClassName: "lg-table__no-border-l",
rowHead: true, rowHead: true,
cellClassName: "lg-table__rowhead",
width: 120, width: 120,
}, },
{ {
@@ -71,14 +82,47 @@ const buildColumns = (spec: SectionSpec, selectedYear: string): DataColumn<Banne
return columns; return columns;
}; };
const buildYearMergedCells = (rows: BannerRow[]): MergedTableCell<BannerRow>[] => {
const mergedCells: MergedTableCell<BannerRow>[] = [];
let startRowIndex = 0;
while (startRowIndex < rows.length) {
const year = rows[startRowIndex].year;
let endRowIndex = startRowIndex + 1;
while (endRowIndex < rows.length && rows[endRowIndex].year === year) {
endRowIndex += 1;
}
mergedCells.push({
key: "year",
content: formatRowLabel(year),
startRowIndex,
rowSpan: endRowIndex - startRowIndex,
className: "font-bold text-center",
});
startRowIndex = endRowIndex;
}
return mergedCells;
};
type BannerSummaryProps = { type BannerSummaryProps = {
data: BannerRow[]; data: BannerRow[];
useChart: boolean; useChart: boolean;
useYear: boolean; useYear: boolean;
isProfileAll?: boolean;
getCellClassName?: (row: BannerRow, column: DataColumn<BannerRow>, rowIndex: number) => string | undefined; getCellClassName?: (row: BannerRow, column: DataColumn<BannerRow>, rowIndex: number) => string | undefined;
}; };
const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSummaryProps) => { const BannerSummary = ({
data,
useChart,
useYear,
isProfileAll = false,
getCellClassName
}: BannerSummaryProps) => {
const { filterValue, registerExcelExporter } = useLayoutFilter(); const { filterValue, registerExcelExporter } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue); const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
@@ -113,7 +157,7 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
return SECTIONS.map((spec) => { return SECTIONS.map((spec) => {
const specTitle = spec.title; const specTitle = spec.title;
const bannerKeys = getSectionBannerKeys(spec); const bannerKeys = getSectionBannerKeys(spec);
const columns = buildColumns(spec, useYear ? debouncedFilterValue.year : ""); const columns = buildColumns(spec, useYear ? debouncedFilterValue.year : "", isProfileAll);
// rows가 spec마다 다르면 여기서 가져오도록 구성 // rows가 spec마다 다르면 여기서 가져오도록 구성
const rows = wrapSampleRow(useYear ? data.filter((d) => d.year === debouncedFilterValue.year) : data).map((row) => { const rows = wrapSampleRow(useYear ? data.filter((d) => d.year === debouncedFilterValue.year) : data).map((row) => {
@@ -121,6 +165,7 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
return row; return row;
}); });
const chartData = buildChartData(rows); const chartData = buildChartData(rows);
const mergedCells = isProfileAll ? buildYearMergedCells(rows) : undefined;
return { return {
spec, spec,
@@ -129,15 +174,28 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
columns, columns,
rows, rows,
chartData, chartData,
mergedCells,
}; };
}); });
}, [data, useYear, debouncedFilterValue.year]); }, [data, useYear, debouncedFilterValue.year, isProfileAll]);
const getTargetString = (target: CategoryTargetData): string => {
switch (target) {
case CategoryTargetData.PROFILE_ALL:
return "Profile (전체)";
case CategoryTargetData.PROFILE:
return "Profile";
default:
return "보급률 변화"
}
}
useEffect(() => { useEffect(() => {
registerExcelExporter(async () => { registerExcelExporter(async () => {
const product = debouncedFilterValue.product; const product = debouncedFilterValue.product;
const type = debouncedFilterValue.type.label; const type = debouncedFilterValue.type.label;
const target = debouncedFilterValue.target.value === CategoryTargetData.PROFILE ? "Profile" : "보급률 변화";
const target = getTargetString(debouncedFilterValue.target.value);
const sheetName = `${product}_${type}_${target}`; const sheetName = `${product}_${type}_${target}`;
type AnyRow = Record<string, any>; type AnyRow = Record<string, any>;
@@ -195,6 +253,7 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
signStyle={signStyleGap} signStyle={signStyleGap}
unitText={""} unitText={""}
starUnder30Sample={true} starUnder30Sample={true}
mergedCells={sectionRow.mergedCells}
/> />
)} )}
</div> </div>

View File

@@ -62,13 +62,15 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
starUnder30Sample={starUnder30Sample} starUnder30Sample={starUnder30Sample}
unitText={unitText} unitText={unitText}
getCellClassName={getCellClassName} getCellClassName={getCellClassName}
mergedCell={{ mergedCells={[
key: chartCell.key, {
content: chart, key: chartCell.key,
startRowIndex: chartCell.startRowIndex, content: chart,
rowSpan: chartCell.rowSpan, startRowIndex: chartCell.startRowIndex,
className: chartCell.className, rowSpan: chartCell.rowSpan,
}} className: chartCell.className,
},
]}
/> />
); );
} }

View File

@@ -75,7 +75,7 @@ export default function TopChartTable({
<table className={cn("lg-table", tableClassName)} style={{ minWidth: `${minWidth ?? minWidthPx}px` }}> <table className={cn("lg-table", tableClassName)} style={{ minWidth: `${minWidth ?? minWidthPx}px` }}>
<thead> <thead>
<tr> <tr>
<th colSpan={2} className="w-40" style={{ whiteSpace: "nowrap" }} /> <th colSpan={2} className="w-44" style={{ whiteSpace: "nowrap" }} />
<td colSpan={categories.length} style={{ padding: 0, height: chartNode ? chartHeight : 0 }}> <td colSpan={categories.length} style={{ padding: 0, height: chartNode ? chartHeight : 0 }}>
{chartNode ? <div style={{ width: "100%", height: "100%" }}>{chartNode}</div> : null} {chartNode ? <div style={{ width: "100%", height: "100%" }}>{chartNode}</div> : null}
</td> </td>

View File

@@ -9,6 +9,8 @@ export { default as GroupedStackBar} from "./chart/GroupedStackBar";
export { default as GroupedOverlayBar} from "./chart/GroupedOverlayBar"; export { default as GroupedOverlayBar} from "./chart/GroupedOverlayBar";
export { default as DataTable } from "./table/DataTable"; export { default as DataTable } from "./table/DataTable";
export type { DataTableProps } from "./table/DataTable";
export type { MergedTableCell } from "./table/BaseDataTable";
export { default as GaugeTable } from "./table/GaugeTable"; export { default as GaugeTable } from "./table/GaugeTable";
export { default as TopChartTable } from "./combo/TopChartTable"; export { default as TopChartTable } from "./combo/TopChartTable";
@@ -19,4 +21,4 @@ export { default as CategoryByData } from "./combo/CategoryByData"
export { default as CardDefault } from "./card/Card"; export { default as CardDefault } from "./card/Card";
export { default as SectionTitle } from "./SectionTitle"; export { default as SectionTitle } from "./SectionTitle";
export { default as BottomDescription } from "./BottomDescription"; export { default as BottomDescription } from "./BottomDescription";

View File

@@ -2,7 +2,7 @@
import type React from "react"; import type React from "react";
import { cn, parseNumber } from "@/lib/utils"; import { cn, parseNumber } from "@/lib/utils";
import {isGapRow, isSampleRow} from "@/lib/lg-dashboard"; import {isGapRow, isHasCountRow, isSampleRow} from "@/lib/lg-dashboard";
import type { DataColumn, SignStyle } from "../types"; import type { DataColumn, SignStyle } from "../types";
import BaseTableRenderer from "./core/BaseTableRenderer"; import BaseTableRenderer from "./core/BaseTableRenderer";
import { import {
@@ -18,6 +18,7 @@ import {
toTableCellContent, toTableCellContent,
type ResolvedSignStyle, type ResolvedSignStyle,
} from "./core/table-core.helpers"; } from "./core/table-core.helpers";
import {VIEW_DECIMAL_POINT} from "@/const/lg-common.const";
export type MergedTableCell<T> = { export type MergedTableCell<T> = {
key: keyof T; key: keyof T;
@@ -41,7 +42,7 @@ type Props<T extends Record<string, unknown>> = {
fillGapRow?: boolean; fillGapRow?: boolean;
starUnder30Sample?: boolean; starUnder30Sample?: boolean;
unitText?: string; unitText?: string;
mergedCell?: MergedTableCell<T>; mergedCells?: MergedTableCell<T>[];
getCellClassName?: (row: T, column: DataColumn<T>, rowIndex: number) => string | undefined; getCellClassName?: (row: T, column: DataColumn<T>, rowIndex: number) => string | undefined;
}; };
@@ -59,12 +60,10 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
fillGapRow = false, fillGapRow = false,
starUnder30Sample = false, starUnder30Sample = false,
unitText, unitText,
mergedCell, mergedCells,
getCellClassName, getCellClassName,
}: Readonly<Props<T>>) { }: Readonly<Props<T>>) {
const resolvedSignStyle = resolveSignStyle(signStyle, signStyleFallback); const resolvedSignStyle = resolveSignStyle(signStyle, signStyleFallback);
const mergedCellStart = mergedCell?.startRowIndex ?? 0;
const mergedCellSpan = mergedCell?.rowSpan ?? Math.max(0, rows.length - mergedCellStart);
const leafColumns = getLeafColumns(columns); const leafColumns = getLeafColumns(columns);
return ( return (
@@ -79,18 +78,29 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
minWidth={minWidth} minWidth={minWidth}
> >
{rows.map((row, rowIndex) => { {rows.map((row, rowIndex) => {
const sampleRow = isSampleRow((row.rowLabel as string) ?? ""); const rowLabel = (row.rowLabel as string) ?? "";
const sampleRow = isSampleRow(rowLabel);
const hasCountRow = isHasCountRow(rowLabel);
const signRow = !!signStyle?.rowSelector?.(row, rowIndex); const signRow = !!signStyle?.rowSelector?.(row, rowIndex);
const rowTotal = parseNumber(row.total); const rowTotal = parseNumber(row.total);
const isFillGapRow = fillGapRow && isGapRow((row.rowLabel as string) ?? "") const isFillGapRow = fillGapRow && isGapRow(rowLabel)
const fillGapClass = isFillGapRow ? "bg-gray-100" : ""; const fillGapClass = isFillGapRow ? "bg-gray-100" : "";
return ( return (
<tr key={rowIndex}> <tr key={rowIndex}>
{leafColumns.map((column) => { {leafColumns.map((column) => {
const dynamicCellClassName = getCellClassName?.(row, column, rowIndex); const dynamicCellClassName = getCellClassName?.(row, column, rowIndex);
const mergedCell = mergedCells?.find((cell) => {
const startRowIndex = cell.startRowIndex ?? 0;
const rowSpan = cell.rowSpan ?? Math.max(0, rows.length - startRowIndex);
return column.key === cell.key && rowIndex >= startRowIndex && rowIndex < startRowIndex + rowSpan;
});
if (mergedCell) {
const mergedCellStart = mergedCell.startRowIndex ?? 0;
const mergedCellSpan = mergedCell.rowSpan ?? Math.max(0, rows.length - mergedCellStart);
if (mergedCell && column.key === mergedCell.key && rowIndex >= mergedCellStart) {
if (rowIndex > mergedCellStart) { if (rowIndex > mergedCellStart) {
return null; return null;
} }
@@ -109,7 +119,8 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
const rawValue = row[column.key]; const rawValue = row[column.key];
const align = getColumnAlign(column); const align = getColumnAlign(column);
const defaultContent = column.render ? column.render(row) : toTableCellContent(rawValue); const viewDecimalPoint = hasCountRow ? 2 : VIEW_DECIMAL_POINT;
const defaultContent = column.render ? column.render(row) : toTableCellContent(rawValue, viewDecimalPoint);
const numericValue = "numeric" in column && column.numeric ? parseNumber(rawValue ?? defaultContent) ?? 0 : 0; const numericValue = "numeric" in column && column.numeric ? parseNumber(rawValue ?? defaultContent) ?? 0 : 0;
const applySign = signRow && shouldApplySignToColumn(column, signStyle); const applySign = signRow && shouldApplySignToColumn(column, signStyle);

View File

@@ -2,9 +2,9 @@
import type { DataColumn, SignStyle } from "../types"; import type { DataColumn, SignStyle } from "../types";
import { UNIT_TEXT } from "@/const/lg-common.const"; import { UNIT_TEXT } from "@/const/lg-common.const";
import BaseDataTable from "./BaseDataTable"; import BaseDataTable, { type MergedTableCell } from "./BaseDataTable";
type Props<T extends Record<string, unknown>> = { export type DataTableProps<T extends Record<string, unknown>> = {
columns: DataColumn<T>[]; columns: DataColumn<T>[];
rows: T[]; rows: T[];
title?: string; title?: string;
@@ -17,6 +17,7 @@ type Props<T extends Record<string, unknown>> = {
fillGapRow?: boolean; fillGapRow?: boolean;
starUnder30Sample?: boolean; starUnder30Sample?: boolean;
unitText?: string; unitText?: string;
mergedCells?: MergedTableCell<T>[];
}; };
const DataTable = <T extends Record<string, unknown>>({ const DataTable = <T extends Record<string, unknown>>({
@@ -32,7 +33,8 @@ const DataTable = <T extends Record<string, unknown>>({
fillGapRow = false, fillGapRow = false,
starUnder30Sample = false, starUnder30Sample = false,
unitText = UNIT_TEXT, unitText = UNIT_TEXT,
}: Props<T>) => { mergedCells,
}: DataTableProps<T>) => {
return ( return (
<BaseDataTable <BaseDataTable
columns={columns} columns={columns}
@@ -46,6 +48,7 @@ const DataTable = <T extends Record<string, unknown>>({
fillGapRow={fillGapRow} fillGapRow={fillGapRow}
starUnder30Sample={starUnder30Sample} starUnder30Sample={starUnder30Sample}
unitText={unitText} unitText={unitText}
mergedCells={mergedCells}
/> />
); );
}; };

View File

@@ -99,6 +99,14 @@ function getLeafCount<T>(column: TableColumnNode<T>): number {
return column.children.reduce((sum, child) => sum + getLeafCount(child), 0); return column.children.reduce((sum, child) => sum + getLeafCount(child), 0);
} }
function getColSpan<T>(isLeaf: boolean, node: TableColumnNode<T>) {
if(node.colSpan){
return node.colSpan;
}
return isLeaf ? 1 : getLeafCount(node);
}
export function buildHeaderRows<T>(columns: TableColumnNode<T>[]) { export function buildHeaderRows<T>(columns: TableColumnNode<T>[]) {
const depth = getHeaderDepth(columns); const depth = getHeaderDepth(columns);
@@ -113,11 +121,12 @@ export function buildHeaderRows<T>(columns: TableColumnNode<T>[]) {
const nodeId = node.id ?? (isColumnLeaf(node) ? String(node.key) : `${path.join(".") || "root"}:${index}:${node.header}`); const nodeId = node.id ?? (isColumnLeaf(node) ? String(node.key) : `${path.join(".") || "root"}:${index}:${node.header}`);
const nextPath = [...path, nodeId]; const nextPath = [...path, nodeId];
const isLeaf = isColumnLeaf(node); const isLeaf = isColumnLeaf(node);
const colSpan = getColSpan(isLeaf, node);
rows[level].push({ rows[level].push({
id: nextPath.join("/"), id: nextPath.join("/"),
label: node.header, label: node.header,
colSpan: isLeaf ? 1 : getLeafCount(node), colSpan,
rowSpan: isLeaf ? depth - level : 1, rowSpan: isLeaf ? depth - level : 1,
className: node.headerClassName, className: node.headerClassName,
isLeaf, isLeaf,
@@ -153,7 +162,7 @@ export function getColumnAlign<T>(column: TableColumnLeaf<T>, fallback: "left" |
return fallback; return fallback;
} }
export function toTableCellContent(raw: unknown): React.ReactNode { export function toTableCellContent(raw: unknown, decimalPoint?: number): React.ReactNode {
if (raw == null) { if (raw == null) {
return ""; return "";
} }
@@ -165,7 +174,7 @@ export function toTableCellContent(raw: unknown): React.ReactNode {
} }
const parsed = Number(trimmed); const parsed = Number(trimmed);
return Number.isNaN(parsed) ? raw : roundNumber(parsed); return Number.isNaN(parsed) ? raw : roundNumber(parsed, decimalPoint);
} }
if (typeof raw === "number") { if (typeof raw === "number") {

View File

@@ -64,6 +64,7 @@ type TableColumnShared<T> = {
headerClassName?: string; headerClassName?: string;
cellClassName?: string; cellClassName?: string;
render?: (row: T) => React.ReactNode; render?: (row: T) => React.ReactNode;
colSpan?: number;
}; };
export type DataColumnLeaf<T> = TableColumnShared<T> & { export type DataColumnLeaf<T> = TableColumnShared<T> & {

View File

@@ -1,31 +1,34 @@
import {CategoryFieldSpec} from "@/types/lg.types"; import {CategoryFieldSpec} from "@/types/lg.types";
import {CategoryTargetData, CategoryTargetType} from "@/types/filter.types"; import {CategoryTargetData, CategoryTargetType} from "@/types/filter.types";
const profileFieldSpec: CategoryFieldSpec[] = [
{
title: {
[CategoryTargetType.PENETRATION]: "보유율"
, [CategoryTargetType.PURCHASE]: "구매율"
, [CategoryTargetType.INTENDED]: "향후 구매율"
},
requestKey: "category_${keyBase}",
chartMode:"none",
qidByMode: {
[CategoryTargetType.PENETRATION]: "KQA1"
, [CategoryTargetType.PURCHASE]: "KQB0"
, [CategoryTargetType.INTENDED]: "KQC1"
},
},
{
title: "보유대수",
requestKey: "category_penetration_count",
chartMode:"none",
qidByMode: {
[CategoryTargetType.PENETRATION]: "KQA2"
},
},
];
export const CATEGORY_PAGE_FIELDS: Record<CategoryTargetData, CategoryFieldSpec[]> = { export const CATEGORY_PAGE_FIELDS: Record<CategoryTargetData, CategoryFieldSpec[]> = {
[CategoryTargetData.PROFILE]: [ [CategoryTargetData.PROFILE_ALL]: profileFieldSpec,
{ [CategoryTargetData.PROFILE]: profileFieldSpec,
title: {
[CategoryTargetType.PENETRATION]: "보유율"
, [CategoryTargetType.PURCHASE]: "구매율"
, [CategoryTargetType.INTENDED]: "향후 구매율"
},
requestKey: "category_${keyBase}",
chartMode:"none",
qidByMode: {
[CategoryTargetType.PENETRATION]: "KQA1"
, [CategoryTargetType.PURCHASE]: "KQB0"
, [CategoryTargetType.INTENDED]: "KQC1"
},
},
{
title: "보유대수",
requestKey: "category_penetration_count",
chartMode:"none",
qidByMode: {
[CategoryTargetType.PENETRATION]: "KQA2"
},
},
],
[CategoryTargetData.PENETRATION_CHANGE]: [ [CategoryTargetData.PENETRATION_CHANGE]: [
{ {

View File

@@ -128,6 +128,7 @@ export const categoryTarget: CategoryTargetItem[] = [
type: [CategoryTargetType.PENETRATION], type: [CategoryTargetType.PENETRATION],
children:[ children:[
{ value: CategoryTargetData.PROFILE, label: "Profile"}, { value: CategoryTargetData.PROFILE, label: "Profile"},
{ value: CategoryTargetData.PROFILE_ALL, label: "Profile (전체)"},
{ value: CategoryTargetData.PENETRATION_CHANGE, label: "보급률 변화"}, { value: CategoryTargetData.PENETRATION_CHANGE, label: "보급률 변화"},
{ value: CategoryTargetData.BRAND, label: "브랜드"}, { value: CategoryTargetData.BRAND, label: "브랜드"},
{ value: CategoryTargetData.TYPE_SPEC, label: "타입/스펙"}, { value: CategoryTargetData.TYPE_SPEC, label: "타입/스펙"},
@@ -139,6 +140,7 @@ export const categoryTarget: CategoryTargetItem[] = [
type: [CategoryTargetType.PURCHASE, CategoryTargetType.INTENDED], type: [CategoryTargetType.PURCHASE, CategoryTargetType.INTENDED],
children:[ children:[
{ value: CategoryTargetData.PROFILE, label: "Profile"}, { value: CategoryTargetData.PROFILE, label: "Profile"},
{ value: CategoryTargetData.PROFILE_ALL, label: "Profile (전체)"},
{ value: CategoryTargetData.BRAND, label: "브랜드"}, { value: CategoryTargetData.BRAND, label: "브랜드"},
{ value: CategoryTargetData.TYPE_SPEC, label: "타입/스펙"}, { value: CategoryTargetData.TYPE_SPEC, label: "타입/스펙"},
{ value: CategoryTargetData.BEHAVIOR, label: "구입 행태"}, { value: CategoryTargetData.BEHAVIOR, label: "구입 행태"},

View File

@@ -17,6 +17,8 @@ import {CategoryFilterValue} from "@/components/layout/CategoryFilter";
export const isSampleRow = (raw: string) => raw.replace(/\s+/g, "").includes("사례수"); export const isSampleRow = (raw: string) => raw.replace(/\s+/g, "").includes("사례수");
export const isHasCountRow = (raw: string) => raw.replace(/\s+/g, "").includes("보유대수");
export const isCagrRow = (raw: string) => raw.replace(/\s+/g, "").toUpperCase().includes("CAGR"); export const isCagrRow = (raw: string) => raw.replace(/\s+/g, "").toUpperCase().includes("CAGR");
export const isGapRow = (raw: string) => raw.replace(/\s+/g, "").toUpperCase().includes("GAP"); export const isGapRow = (raw: string) => raw.replace(/\s+/g, "").toUpperCase().includes("GAP");
@@ -514,8 +516,8 @@ export const makeTotalBasePct = (t:number|string, f:number|string):number => {
export const calcTotalBaseRow = (label:string, totalRow: ProductRow, targetRow: ProductRow): ProductRow => { export const calcTotalBaseRow = (label:string, totalRow: ProductRow, targetRow: ProductRow): ProductRow => {
const out: ProductRow = { const out: ProductRow = {
year: targetRow?.year ?? "", year: targetRow?.year ?? "",
//rowLabel: `조사 년도 ${label} 중 자사제품 비율`, //rowLabel: `**조사 년도 ${label} 중 자사제품 비율`,
rowLabel: `자사제품 비율`, rowLabel: `**자사제품 비율`,
total: fixedDecimalPoint(makeTotalBasePct(totalRow.total, targetRow.total)) total: fixedDecimalPoint(makeTotalBasePct(totalRow.total, targetRow.total))
}; };

View File

@@ -20,6 +20,7 @@ export enum CategoryTargetType {
export enum CategoryTargetData { export enum CategoryTargetData {
PROFILE = 11, PROFILE = 11,
PROFILE_ALL = 10,
PENETRATION_CHANGE = 21, PENETRATION_CHANGE = 21,
BRAND = 12, BRAND = 12,
TYPE_SPEC = 13, TYPE_SPEC = 13,