Compare commits

..

12 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
d6f4bca06f 260402_02_ENH: LG 보급률, 구매율 워딩을 자사제품 비율(%)로 수정 2026-04-02 14:48:39 +09:00
563f98c6f2 Merge branch 'develop' 2026-04-02 14:35:07 +09:00
20b8547701 260402_01_ENH: LG 보급률, 구매율의 자사제품 비율 공식 워딩 하단으로 이동 및 카테고리 파트 갭에 배경색 추가 2026-04-02 14:34:45 +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
9b3a21ea39 260401_05_ENH: 전기레인지 화구 수 문항 추가 2026-04-01 17:19:56 +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
3c7865ef60 260401_04_ENH: Total Filter multi-select 가능하게 수정 및 DEBOUNCE_TIME 상수화 2026-04-01 14:39:21 +09:00
28 changed files with 319 additions and 134 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,
@@ -33,7 +35,7 @@ const PAGE_COMPONENTS: Partial<Record<CategoryTargetData, React.ComponentType<Ca
const CategoryPage = () => {
const { isTotal, filterValue } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue, 500);
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
const { fields, variableIdMap } = useMemo(() => {
return buildPageModeConfig(debouncedFilterValue);
@@ -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

@@ -6,7 +6,7 @@ import {useEffect, useMemo} from "react";
import {BannerRow, PageData} from "@/types/lg.types";
import {buildHeader_Banner, exportDashboardExcel, Section} from "@/lib/lg-export-excel";
import {BANNER_GROUP} from "@/const/lg-banner.const";
import {BANNER_KEY_MAP} from "@/const/lg-schema.const";
import {BANNER_KEY_MAP, PRODUCT_KEY_MAP} from "@/const/lg-schema.const";
import {QID_SURVEY_TITLE} from "@/const/lg-survey.const";
import {SITE_TITLE, YEARS} from "@/const/lg-common.const";
import {CategoryByData} from "@/components/lge-dashboard";
@@ -18,7 +18,7 @@ const CategoryDetail = ({
fillGreaterThan5
}:CategoryPageProps) => {
const {filterValue, registerExcelExporter} = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue, 500);
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
const tableDataArray = useMemo<PageData<BannerRow>[]>(() => {
const tempTableDataArray = fields.map((f) :PageData<BannerRow> => {
@@ -46,17 +46,19 @@ const CategoryDetail = ({
useEffect(() => {
registerExcelExporter(async () => {
const product = debouncedFilterValue.product;
const product = PRODUCT_KEY_MAP[debouncedFilterValue.product];
const type = debouncedFilterValue.type.label;
const target = debouncedFilterValue.target.label.replaceAll('/', '_');
const sheetName = `${product}_${type}_${target}`
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>;
const sections: Section<AnyRow>[] = tableDataArray.flatMap((tableData) => {
const years = [YEARS.at(-1), YEARS.at(-2)];
return years.map((year) => ({
title: `${tableData.title}_${year}년`,
header: h3,
@@ -79,7 +81,7 @@ const CategoryDetail = ({
{tableDataArray.map((tableData) => (
<CategoryByData
key={`cbd-${tableData.title.replaceAll(/\s+/g, "_")}`}
selectedYear={filterValue.year}
selectedYear={debouncedFilterValue.year}
title={tableData.title}
surveyTitle={tableData.surveyTitle}
chartMode={tableData.chartMode}

View File

@@ -12,10 +12,11 @@ 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, 500);
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
const profileData = useMemo<BannerRow[]>(() => {
if (dataMap === undefined) return [];
@@ -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

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

View File

@@ -36,7 +36,7 @@ import {toNumOr0} from "@/lib/utils";
const LGPurchasePage = () => {
const { filterValue, registerExcelExporter } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<SelectedMap>(filterValue as SelectedMap, 500);
const debouncedFilterValue = useDebouncedValue<SelectedMap>(filterValue as SelectedMap);
const req = useMemo<StatisticsRequest>(() => {
return {
@@ -148,7 +148,8 @@ const LGPurchasePage = () => {
//"* 새 상품을 선물 받은 경우, 선물 받은 연도로 입력해주세요.<br/>" +
//"** 중고 제품인 경우, 중고 제품을 구입한 연도로 입력해주세요.<br/>" +
//"*** 신규 입주 시 빌트인되어 있던 제품은 입주한 연도를 입력해주세요.<br/>" +
"Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?";
"Q. 보유하고 계신 (제품)의 브랜드는 어떻게 되십니까?<br/>" +
"** 조사 년도 구매율 중 자사제품 비율 = (LG 구매율 ÷ 전체 구매율) × 100";
}, []);
useEffect(() => {

View File

@@ -36,7 +36,7 @@ import {SelectedMap} from "@/types/common";
const PenetrationPage = () => {
const { filterValue, registerExcelExporter } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<SelectedMap>(filterValue as SelectedMap, 500);
const debouncedFilterValue = useDebouncedValue<SelectedMap>(filterValue as SelectedMap);
const [isBrandShare, setIsBrandShare] = useState(false);
const req = useMemo<StatisticsRequest>(() => {

View File

@@ -36,7 +36,7 @@ import {useProductStatisticsQuery} from "@/query/statistics";
const PurchasePage = () => {
const { filterValue, registerExcelExporter } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<SelectedMap>(filterValue as SelectedMap, 500);
const debouncedFilterValue = useDebouncedValue<SelectedMap>(filterValue as SelectedMap);
const req = useMemo<StatisticsRequest>(() => {
return {

View File

@@ -97,6 +97,8 @@
--lg-gray-400: 0 0% 50%; /* #7F7F7F */
--lg-gray-300: 0 0% 75%; /* #BFBFBF */
--lg-gray-200: 0 0% 85%; /* #D9D9D9 */
--lg-gray-100: 0 0% 92%; /* #EBEBEB */
--lg-gray-50: 0 0% 96%; /* #F5F5F5 */
--lg-red-600: 341.1 100% 32.4%; /* #A50034 */
--lg-red-500: 341.1 95% 44.0%; /* #DB0649 */
@@ -306,6 +308,8 @@
.bg-gray-400 { background-color: hsl(var(--lg-gray-400)) !important; }
.bg-gray-300 { background-color: hsl(var(--lg-gray-300)) !important; }
.bg-gray-200 { background-color: hsl(var(--lg-gray-200)) !important; }
.bg-gray-100 { background-color: hsl(var(--lg-gray-100)) !important; }
.bg-gray-50 { background-color: hsl(var(--lg-gray-50)) !important; }
.border-gray-900 { border-color: hsl(var(--lg-gray-900)) !important; }
.border-gray-800 { border-color: hsl(var(--lg-gray-800)) !important; }
@@ -315,6 +319,8 @@
.border-gray-400 { border-color: hsl(var(--lg-gray-400)) !important; }
.border-gray-300 { border-color: hsl(var(--lg-gray-300)) !important; }
.border-gray-200 { border-color: hsl(var(--lg-gray-200)) !important; }
.border-gray-100 { border-color: hsl(var(--lg-gray-100)) !important; }
.border-gray-50 { border-color: hsl(var(--lg-gray-50)) !important; }
/* LG Red/Pink/Purple/Orange scale overrides */
.bg-red-600 { background-color: hsl(var(--lg-red-600)) !important; }
@@ -460,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

@@ -28,7 +28,9 @@ const buildDefaultTotalValue = (): SelectedMap => {
totalFilters.forEach((f) => {
// "전체"가 있으면 그 value, 없으면 첫 번째 값
const all = f.children.find((c) => c.label === "전체");
init[f.variable] = all?.value ?? f.children[0]?.value ?? "";
const initValue = all?.value ?? f.children[0]?.value ?? "";
init[f.variable] = [initValue];
});
return init;
};
@@ -108,14 +110,14 @@ const MainLayout = ({ children }: MainLayoutProps) => {
const isDefaultTotalFilter = useMemo(() => {
if(!isTotal) return false;
return Object.values(totalValue).every(value => value === "0");
return Object.values(totalValue).every(value => value.length === 1 && value[0] === "0");
},[isTotal, totalValue])
const setDefaletTotalFilter = () => {
const setDefaultTotalFilter = () => {
if(isTotal && !isDefaultTotalFilter){
setTotalValue(prev =>
Object.fromEntries(
Object.keys(prev).map(key => [key, "0"])
Object.keys(prev).map(key => [key, ["0"]])
)
);
}
@@ -181,7 +183,7 @@ const MainLayout = ({ children }: MainLayoutProps) => {
<>
<Button
variant={isDefaultTotalFilter ? "secondary" : "default"}
onClick={setDefaletTotalFilter}
onClick={setDefaultTotalFilter}
className="h-6 rounded-sm px-3 ml-3 text-sm font-semibold content-text-sm"
>
초기화

View File

@@ -20,9 +20,32 @@ const TotalFilter = ({
className
}: TotalFilterProps) => {
const handlePick = (variable: string, v: string) => {
if (value[variable] === v) return;
onChange({ ...value, [variable]: v });
const getSelectableCount = (variable: string) =>
filters.find((filter) => filter.variable === variable)?.children
.filter((child) => child.value !== "0").length ?? 0;
const handlePick = (variable: string, selectedValue: string) => {
if (selectedValue === "0") {
onChange({ ...value, [variable]: ["0"] });
return;
}
const currentValues = value[variable] ?? ["0"];
const normalizedValues = currentValues.filter((item) => item !== "0");
const selectableCount = getSelectableCount(variable);
const isAlreadySelected = normalizedValues.includes(selectedValue);
const nextValues = isAlreadySelected
? normalizedValues.filter((item) => item !== selectedValue)
: [...normalizedValues, selectedValue].sort((a, b) => Number(a) - Number(b));
if (nextValues.length === 0 || nextValues.length === selectableCount) {
onChange({ ...value, [variable]: ["0"] });
return;
}
onChange({ ...value, [variable]: nextValues });
};
const arranged = useMemo(() => {
@@ -74,7 +97,7 @@ const TotalFilter = ({
{/* 우측 옵션 */}
<div className="flex min-w-0 flex-1 flex-wrap items-center gap-1 px-2 py-2">
{row.children.map((c) => {
const active = current === c.value;
const active = current.includes(c.value);
return (
<Button

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,16 +82,49 @@ 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, 500);
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue);
const buildChartData = (rows: BannerRow[]): ChartData => {
const categories = rows
@@ -113,14 +157,15 @@ const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSumm
return SECTIONS.map((spec) => {
const specTitle = spec.title;
const bannerKeys = getSectionBannerKeys(spec);
const columns = buildColumns(spec, useYear ? filterValue.year : "");
const columns = buildColumns(spec, useYear ? debouncedFilterValue.year : "", isProfileAll);
// rows가 spec마다 다르면 여기서 가져오도록 구성
const rows = wrapSampleRow(useYear ? data.filter((d) => d.year === filterValue.year) : data).map((row) => {
const rows = wrapSampleRow(useYear ? data.filter((d) => d.year === debouncedFilterValue.year) : data).map((row) => {
row.rowLabel = formatRowLabel(row.rowLabel);
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, filterValue.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

@@ -152,6 +152,7 @@ const CategoryByData = ({
rows={tableData}
signStyle={signStyleGap}
fillGreaterThan5={fillGreaterThan5}
fillGapRow={true}
starUnder30Sample={true}
/>
<BottomDescription description={"전체 대비 5%p 이상 품목에 대해 음영 표시"} />

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

@@ -75,7 +75,7 @@ export default function TopChartTable({
<table className={cn("lg-table", tableClassName)} style={{ minWidth: `${minWidth ?? minWidthPx}px` }}>
<thead>
<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 }}>
{chartNode ? <div style={{ width: "100%", height: "100%" }}>{chartNode}</div> : null}
</td>

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";

View File

@@ -2,7 +2,7 @@
import type React from "react";
import { cn, parseNumber } from "@/lib/utils";
import { 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;
@@ -38,9 +39,10 @@ type Props<T extends Record<string, unknown>> = {
signStyle?: SignStyle<T>;
signStyleFallback?: Partial<ResolvedSignStyle>;
fillGreaterThan5?: boolean;
fillGapRow?: boolean;
starUnder30Sample?: boolean;
unitText?: string;
mergedCell?: MergedTableCell<T>;
mergedCells?: MergedTableCell<T>[];
getCellClassName?: (row: T, column: DataColumn<T>, rowIndex: number) => string | undefined;
};
@@ -55,14 +57,13 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
signStyle,
signStyleFallback,
fillGreaterThan5 = false,
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 (
@@ -77,16 +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(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;
}
@@ -105,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);
@@ -114,7 +129,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
<th
key={String(column.key)}
scope="row"
className={cn("lg-table__rowhead", column.cellClassName, dynamicCellClassName)}
className={cn("lg-table__rowhead", column.cellClassName, dynamicCellClassName, fillGapClass)}
style={{ textAlign: align }}
>
{defaultContent}
@@ -131,7 +146,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
: { textAlign: align };
return (
<td key={String(column.key)} className={cn(column.cellClassName, dynamicCellClassName)} style={cellStyle}>
<td key={String(column.key)} className={cn(column.cellClassName, dynamicCellClassName, fillGapClass)} style={cellStyle}>
<span className={cn(roundedValue === null ? "text-gray-500" : getSignTextClass(roundedValue, resolvedSignStyle))}>
{displayText}
</span>
@@ -146,7 +161,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
return (
<td
key={String(column.key)}
className={cn(column.cellClassName, dynamicCellClassName, shouldFillCell ? "bg-red-200" : "")}
className={cn(column.cellClassName, dynamicCellClassName, fillGapClass, shouldFillCell ? "bg-red-200" : "")}
style={{ textAlign: align }}
>
{displayContent}

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;
@@ -14,36 +14,42 @@ type Props<T extends Record<string, unknown>> = {
subheadRowClassName?: string;
signStyle?: SignStyle<T>;
fillGreaterThan5?: boolean;
fillGapRow?: boolean;
starUnder30Sample?: boolean;
unitText?: string;
mergedCells?: MergedTableCell<T>[];
};
const DataTable = <T extends Record<string, unknown>>({
columns,
rows,
title,
className,
tableClassName,
wrapperClassName,
subheadRowClassName,
signStyle,
fillGreaterThan5 = false,
starUnder30Sample = false,
unitText = UNIT_TEXT,
}: Props<T>) => {
columns,
rows,
title,
className,
tableClassName,
wrapperClassName,
subheadRowClassName,
signStyle,
fillGreaterThan5 = false,
fillGapRow = false,
starUnder30Sample = false,
unitText = UNIT_TEXT,
mergedCells,
}: DataTableProps<T>) => {
return (
<BaseDataTable
columns={columns}
rows={rows}
title={title}
tableClassName={tableClassName ?? className}
wrapperClassName={wrapperClassName}
subheadRowClassName={subheadRowClassName}
signStyle={signStyle}
fillGreaterThan5={fillGreaterThan5}
starUnder30Sample={starUnder30Sample}
unitText={unitText}
/>
<BaseDataTable
columns={columns}
rows={rows}
title={title}
tableClassName={tableClassName ?? className}
wrapperClassName={wrapperClassName}
subheadRowClassName={subheadRowClassName}
signStyle={signStyle}
fillGreaterThan5={fillGreaterThan5}
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]: [
{
@@ -191,6 +194,15 @@ export const CATEGORY_PAGE_FIELDS: Record<CategoryTargetData, CategoryFieldSpec[
[CategoryTargetType.PURCHASE]: "KQX3_13"
}
},
{
title: "전기레인지 화구 수",
requestKey: "category_${keyBase}_burnerCount",
chartMode: "horizontal",
qidByMode: {
[CategoryTargetType.PENETRATION]: "KQA3_14",
[CategoryTargetType.PURCHASE]: "KQX3_14"
}
},
],
[CategoryTargetData.BEHAVIOR]: [

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

@@ -1,3 +1,4 @@
export const DEBOUNCE_TIME = 500;
export const USE_CACHE = true;
export const API_DECIMAL_POINT = 0;
export const VIEW_DECIMAL_POINT = 0;

View File

@@ -1,21 +1,4 @@
export const QID_SURVEY_TITLE: Record<string, string> = {
"KQX3_3": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 브랜드는 어떻게 되십니까?",
"KQB1": "Q. 귀하께서 [#YEAR#]년에 제품을 구매하실 때 구매를 고려하셨던 브랜드는 무엇입니까? 모두 선택하여 주시기 바랍니다",
"KQX3_4": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 타입은 어떻게 되십니까?",
"KQX3_5": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 깊이 타입은 어떻게 되십니까?",
"KQX3_6": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 용량은 어떻게 되십니까?",
"KQX3_7": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 설치 형태는 어떻게 되십니까?",
"KQX3_8": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품은 메인 가구와 어떻게 배치되어 있습니까?",
"KQX3_9": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품에 포함되어 있는 기능이 있으십니까? 모두 선택해 주세요.",
"KQX3_10": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 스크린 사이즈는 어떻게 되십니까?",
"KQX3_11": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 가장 주된 용도는 무엇입니까?",
"KQX3_12": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품은 스마트 모니터(자체적으로 OS를 가지고 있어, 기타 기기 연결 없이 작동이 가능한 모니터) 입니까?",
"KQX3_13": "Q. 보유하고 계신 제품의 구동 방식은 어떻게 되십니까?",
"KQB2": "Q. 귀하께서는 [#YEAR#]년에 제품을 신규로 구입하신 건가요? 교체/추가 구입하신 건가요? 한 가지만 선택해주세요",
"KQB3": "Q. 귀하께서 [#YEAR#]년에 제품을 구입하신 이유/계기(상황)는 무엇입니까? 가장 주요한 이유/계기를 한 가지만 선택해주세요",
"KQB4_NET": "Q. 최종적으로 제품을 구매하신 곳은 어디십니까? 한 가지만 선택해주세요",
"KQB4": "Q. 최종적으로 제품을 구매하신 곳은 어디십니까? 한 가지만 선택해주세요",
"KQX3_2_1": "Q. 귀하께서는 제품을 어떤 방식으로 구입하셨습니까? 한가지만 선택해주세요",
"KQA3_3": "Q. 보유하고 계신 제품의 브랜드는 어떻게 되십니까?",
"KQA3_4": "Q. 보유하고 계신 제품의 타입은 어떻게 되십니까?",
"KQA3_5": "Q. 보유하고 계신 제품의 깊이 타입은 어떻게 되십니까?",
@@ -27,8 +10,29 @@ export const QID_SURVEY_TITLE: Record<string, string> = {
"KQA3_11": "Q. 보유하고 계신 제품의 가장 주된 용도는 무엇입니까?",
"KQA3_12": "Q. 보유하고 계신 제품은 스마트 모니터(자체적으로 OS를 가지고 있어, 기타 기기 연결 없이 작동이 가능한 모니터) 입니까?",
"KQA3_13": "Q. 보유하고 계신 제품의 구동 방식은 어떻게 되십니까?",
"KQA3_14": "Q. 보유하고 계신 제품의 화구 수는 어떻게 되십니까?",
"KQA3_1": "Q. 보유하고 계신 제품을 구매 또는 보유하게 된 경로가 어떻게 되십니까? ",
"KQA3_2_1": "Q. 귀하께서는 제품을 어떤 방식으로 구입하셨습니까? ",
"KQX3_3": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 브랜드는 어떻게 되십니까?",
"KQB1": "Q. 귀하께서 [#YEAR#]년에 제품을 구매하실 때 구매를 고려하셨던 브랜드는 무엇입니까? 모두 선택하여 주시기 바랍니다",
"KQX3_4": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 타입은 어떻게 되십니까?",
"KQX3_5": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 깊이 타입은 어떻게 되십니까?",
"KQX3_6": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 용량은 어떻게 되십니까?",
"KQX3_7": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 설치 형태는 어떻게 되십니까?",
"KQX3_8": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품은 메인 가구와 어떻게 배치되어 있습니까?",
"KQX3_9": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품에 포함되어 있는 기능이 있으십니까? 모두 선택해 주세요.",
"KQX3_10": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 스크린 사이즈는 어떻게 되십니까?",
"KQX3_11": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 가장 주된 용도는 무엇입니까?",
"KQX3_12": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품은 스마트 모니터(자체적으로 OS를 가지고 있어, 기타 기기 연결 없이 작동이 가능한 모니터) 입니까?",
"KQX3_13": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 구동 방식은 어떻게 되십니까?",
"KQX3_14": "Q. 귀하께서 [#YEAR#]년에 구매하신 제품의 화구 수는 어떻게 되십니까?",
"KQB2": "Q. 귀하께서는 [#YEAR#]년에 제품을 신규로 구입하신 건가요? 교체/추가 구입하신 건가요? 한 가지만 선택해주세요",
"KQB3": "Q. 귀하께서 [#YEAR#]년에 제품을 구입하신 이유/계기(상황)는 무엇입니까? 가장 주요한 이유/계기를 한 가지만 선택해주세요",
"KQB4_NET": "Q. 최종적으로 제품을 구매하신 곳은 어디십니까? 한 가지만 선택해주세요",
"KQB4": "Q. 최종적으로 제품을 구매하신 곳은 어디십니까? 한 가지만 선택해주세요",
"KQX3_2_1": "Q. 귀하께서는 제품을 어떤 방식으로 구입하셨습니까? 한가지만 선택해주세요",
"KQC2": "Q. 귀하께서 [#NEXT_YEAR#]년 이내 구입을 고려하시는 제품의 브랜드로 고려하고 계신 것은 무엇입니까? 모두 선택해주세요",
"KQC3_1": "Q. 귀하께서 [#NEXT_YEAR#]년 이내 구입을 고려하시는 제품의 타입으로 고려하고 계신 것은 무엇입니까? 모두 선택해주세요",
"KQC3_2": "Q. 귀하께서 [#NEXT_YEAR#]년 이내 구입을 고려하시는 제품의 깊이 타입으로 고려하고 계신 것은 무엇입니까? 모두 선택해주세요",

View File

@@ -1,6 +1,7 @@
import { useEffect, useState } from "react";
import {DEBOUNCE_TIME} from "@/const/lg-common.const";
export function useDebouncedValue<T>(value: T, delayMs = 1200) {
export function useDebouncedValue<T>(value: T, delayMs = DEBOUNCE_TIME) {
const [debounced, setDebounced] = useState(value);
useEffect(() => {

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");
@@ -514,7 +516,8 @@ export const makeTotalBasePct = (t:number|string, f:number|string):number => {
export const calcTotalBaseRow = (label:string, totalRow: ProductRow, targetRow: ProductRow): ProductRow => {
const out: ProductRow = {
year: targetRow?.year ?? "",
rowLabel: `조사 년도 ${label} 중 자사제품 비율 (LG ${label} ÷ 전체 ${label}) × 100`,
//rowLabel: `**조사 년도 ${label} 중 자사제품 비율`,
rowLabel: `**자사제품 비율`,
total: fixedDecimalPoint(makeTotalBasePct(totalRow.total, targetRow.total))
};

View File

@@ -25,4 +25,4 @@ export type PageResponse<T> = {
empty: boolean;
}
export type SelectedMap = Record<string, string>;
export type SelectedMap = Record<string, string[]>;

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,