Merge pull request '260720_01_ENH: 보유 대수 소수점 2자리까지 풀음, profile(전체) 추가' (#10) from develop into master

Reviewed-on: #10
This commit is contained in:
2026-07-20 14:52:26 +09:00
15 changed files with 189 additions and 63 deletions

2
.gitignore vendored
View File

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

View File

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

View File

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

View File

@@ -466,6 +466,16 @@
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 {
background: hsl(var(--lg-gray-400));
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 { buildBannerGroupColumns, formatRowLabel, isGapRow, wrapSampleRow } from "@/lib/lg-dashboard";
import { useEffect, useMemo } from "react";
@@ -30,13 +30,24 @@ const SEP_R = "lg-table__sep-r";
const getSectionBannerKeys = (spec: SectionSpec): BannerKey[] =>
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>[] = [
...(isProfileAll
? [
{
key: "year" as const,
header: "",
rowHead: true,
headerClassName: "lg-table__no-border-r",
width: 60,
},
]
: []),
{
key: "rowLabel",
header: `${selectedYear}년`,
header: selectedYear ? `${selectedYear}년` : "",
headerClassName: "lg-table__no-border-l",
rowHead: true,
cellClassName: "lg-table__rowhead",
width: 120,
},
{
@@ -71,14 +82,47 @@ const buildColumns = (spec: SectionSpec, selectedYear: string): DataColumn<Banne
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 = {
data: BannerRow[];
useChart: boolean;
useYear: boolean;
isProfileAll?: boolean;
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 debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
@@ -113,7 +157,7 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
return SECTIONS.map((spec) => {
const specTitle = spec.title;
const bannerKeys = getSectionBannerKeys(spec);
const columns = buildColumns(spec, useYear ? debouncedFilterValue.year : "");
const columns = buildColumns(spec, useYear ? debouncedFilterValue.year : "", isProfileAll);
// rows가 spec마다 다르면 여기서 가져오도록 구성
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;
});
const chartData = buildChartData(rows);
const mergedCells = isProfileAll ? buildYearMergedCells(rows) : undefined;
return {
spec,
@@ -129,15 +174,28 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
columns,
rows,
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(() => {
registerExcelExporter(async () => {
const product = debouncedFilterValue.product;
const type = debouncedFilterValue.type.label;
const target = debouncedFilterValue.target.value === CategoryTargetData.PROFILE ? "Profile" : "보급률 변화";
const target = getTargetString(debouncedFilterValue.target.value);
const sheetName = `${product}_${type}_${target}`;
type AnyRow = Record<string, any>;
@@ -195,6 +253,7 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
signStyle={signStyleGap}
unitText={""}
starUnder30Sample={true}
mergedCells={sectionRow.mergedCells}
/>
)}
</div>

View File

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

View File

@@ -9,6 +9,8 @@ export { default as GroupedStackBar} from "./chart/GroupedStackBar";
export { default as GroupedOverlayBar} from "./chart/GroupedOverlayBar";
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 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 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 { 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 BaseTableRenderer from "./core/BaseTableRenderer";
import {
@@ -18,6 +18,7 @@ import {
toTableCellContent,
type ResolvedSignStyle,
} from "./core/table-core.helpers";
import {VIEW_DECIMAL_POINT} from "@/const/lg-common.const";
export type MergedTableCell<T> = {
key: keyof T;
@@ -41,7 +42,7 @@ type Props<T extends Record<string, unknown>> = {
fillGapRow?: boolean;
starUnder30Sample?: boolean;
unitText?: string;
mergedCell?: MergedTableCell<T>;
mergedCells?: MergedTableCell<T>[];
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,
starUnder30Sample = false,
unitText,
mergedCell,
mergedCells,
getCellClassName,
}: Readonly<Props<T>>) {
const resolvedSignStyle = resolveSignStyle(signStyle, signStyleFallback);
const mergedCellStart = mergedCell?.startRowIndex ?? 0;
const mergedCellSpan = mergedCell?.rowSpan ?? Math.max(0, rows.length - mergedCellStart);
const leafColumns = getLeafColumns(columns);
return (
@@ -79,18 +78,29 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
minWidth={minWidth}
>
{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 rowTotal = parseNumber(row.total);
const isFillGapRow = fillGapRow && isGapRow((row.rowLabel as string) ?? "")
const isFillGapRow = fillGapRow && isGapRow(rowLabel)
const fillGapClass = isFillGapRow ? "bg-gray-100" : "";
return (
<tr key={rowIndex}>
{leafColumns.map((column) => {
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) {
return null;
}
@@ -109,7 +119,8 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
const rawValue = row[column.key];
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 applySign = signRow && shouldApplySignToColumn(column, signStyle);

View File

@@ -2,9 +2,9 @@
import type { DataColumn, SignStyle } from "../types";
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>[];
rows: T[];
title?: string;
@@ -17,6 +17,7 @@ type Props<T extends Record<string, unknown>> = {
fillGapRow?: boolean;
starUnder30Sample?: boolean;
unitText?: string;
mergedCells?: MergedTableCell<T>[];
};
const DataTable = <T extends Record<string, unknown>>({
@@ -32,7 +33,8 @@ const DataTable = <T extends Record<string, unknown>>({
fillGapRow = false,
starUnder30Sample = false,
unitText = UNIT_TEXT,
}: Props<T>) => {
mergedCells,
}: DataTableProps<T>) => {
return (
<BaseDataTable
columns={columns}
@@ -46,6 +48,7 @@ const DataTable = <T extends Record<string, unknown>>({
fillGapRow={fillGapRow}
starUnder30Sample={starUnder30Sample}
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);
}
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>[]) {
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 nextPath = [...path, nodeId];
const isLeaf = isColumnLeaf(node);
const colSpan = getColSpan(isLeaf, node);
rows[level].push({
id: nextPath.join("/"),
label: node.header,
colSpan: isLeaf ? 1 : getLeafCount(node),
colSpan,
rowSpan: isLeaf ? depth - level : 1,
className: node.headerClassName,
isLeaf,
@@ -153,7 +162,7 @@ export function getColumnAlign<T>(column: TableColumnLeaf<T>, fallback: "left" |
return fallback;
}
export function toTableCellContent(raw: unknown): React.ReactNode {
export function toTableCellContent(raw: unknown, decimalPoint?: number): React.ReactNode {
if (raw == null) {
return "";
}
@@ -165,7 +174,7 @@ export function toTableCellContent(raw: unknown): React.ReactNode {
}
const parsed = Number(trimmed);
return Number.isNaN(parsed) ? raw : roundNumber(parsed);
return Number.isNaN(parsed) ? raw : roundNumber(parsed, decimalPoint);
}
if (typeof raw === "number") {

View File

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

View File

@@ -1,31 +1,34 @@
import {CategoryFieldSpec} from "@/types/lg.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[]> = {
[CategoryTargetData.PROFILE]: [
{
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.PROFILE_ALL]: profileFieldSpec,
[CategoryTargetData.PROFILE]: profileFieldSpec,
[CategoryTargetData.PENETRATION_CHANGE]: [
{

View File

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

View File

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