260205_05_ENH: 1차 lg 수정 요청사항 반영
This commit is contained in:
@@ -6,7 +6,7 @@ import {
|
||||
BANNER_GROUP,
|
||||
BANNER_KEY_MAP,
|
||||
GRID_Y_NOT_PADDING,
|
||||
LAST_YEAR,
|
||||
SAMPLE_SIZE_NOTICE, SITE_TITLE,
|
||||
} from "@/const/lgConst";
|
||||
import {parseNumber} from "@/lib/utils";
|
||||
import {
|
||||
@@ -36,11 +36,11 @@ const SEP_R = "lg-table__sep-r";
|
||||
const getSectionBannerKeys = (spec: SectionSpec): BannerKey[] =>
|
||||
spec.groupKeys.flatMap((gk) => BANNER_GROUP[gk].keys);
|
||||
|
||||
const buildColumns = (spec: SectionSpec): DataColumn<ServerBannerRow>[] => {
|
||||
const buildColumns = (spec: SectionSpec, selectedYear:string): DataColumn<ServerBannerRow>[] => {
|
||||
const columns: DataColumn<ServerBannerRow>[] = [
|
||||
{
|
||||
key: "rowLabel",
|
||||
header: "",
|
||||
header: `20${selectedYear}년`,
|
||||
headRowSpan: 2,
|
||||
rowHead: true,
|
||||
cellClassName: "lg-table__rowhead",
|
||||
@@ -79,9 +79,10 @@ const buildColumns = (spec: SectionSpec): DataColumn<ServerBannerRow>[] => {
|
||||
type BannerSummaryProps = {
|
||||
data: ServerBannerRow[];
|
||||
useChart: boolean;
|
||||
useYear: boolean;
|
||||
};
|
||||
|
||||
const BannerSummary = ({ data, useChart }: BannerSummaryProps) => {
|
||||
const BannerSummary = ({ data, useChart, useYear }: BannerSummaryProps) => {
|
||||
const {filterValue, registerExcelExporter } = useLayoutFilter();
|
||||
|
||||
const buildChartData = (rows: ServerBannerRow[], bannerKeys: BannerKey[]): ChartData => {
|
||||
@@ -117,10 +118,10 @@ const BannerSummary = ({ data, useChart }: BannerSummaryProps) => {
|
||||
const specTitle = spec.title;
|
||||
|
||||
const bannerKeys = getSectionBannerKeys(spec);
|
||||
const columns = buildColumns(spec);
|
||||
const columns = buildColumns(spec, useYear? filterValue.year : "");
|
||||
|
||||
// rows가 spec마다 다르면 여기서 가져오도록 구성
|
||||
const rows = wrapSampleRow(data);
|
||||
const rows = wrapSampleRow(useYear? data.filter((d) => d.year === filterValue.year) : data);
|
||||
const chartData = buildChartData(rows, bannerKeys);
|
||||
|
||||
return {
|
||||
@@ -132,7 +133,7 @@ const BannerSummary = ({ data, useChart }: BannerSummaryProps) => {
|
||||
chartData,
|
||||
};
|
||||
});
|
||||
}, [data]);
|
||||
}, [data, useYear, filterValue.year]);
|
||||
|
||||
useEffect(() => {
|
||||
registerExcelExporter(async (payload) => {
|
||||
@@ -150,7 +151,7 @@ const BannerSummary = ({ data, useChart }: BannerSummaryProps) => {
|
||||
;
|
||||
|
||||
await exportDashboardExcel({
|
||||
fileName: `20${LAST_YEAR}년도 가전 보급률 Dashboard(${sheetName}).xlsx`,
|
||||
fileName: `${SITE_TITLE}(${sheetName}).xlsx`,
|
||||
sheetName: sheetName,
|
||||
sections: sections,
|
||||
});
|
||||
@@ -162,35 +163,42 @@ const BannerSummary = ({ data, useChart }: BannerSummaryProps) => {
|
||||
<div className="flex flex-col gap-6">
|
||||
{sectionRows.map((sectionRow) => {
|
||||
return (
|
||||
useChart ?
|
||||
<LeftChartTable<ServerBannerRow>
|
||||
key={sectionRow.specTitle}
|
||||
title={sectionRow.specTitle}
|
||||
columns={sectionRow.columns}
|
||||
rows={sectionRow.rows}
|
||||
signStyle={signStyleGap}
|
||||
chart={
|
||||
<HorizontalBar
|
||||
data={sectionRow.chartData}
|
||||
height="100%"
|
||||
showFocusLabel="none"
|
||||
legend={{ show: false }}
|
||||
grid={GRID_Y_NOT_PADDING}
|
||||
xAxis={{ type: "value", show: false }}
|
||||
yAxis={{ type: "category", data: sectionRow.chartData.categories, show: false }}
|
||||
/>
|
||||
}
|
||||
chartCell={{ key: "total", startRowIndex: 1 }}
|
||||
minWidthPx={1200}
|
||||
/>
|
||||
:
|
||||
<DataTable<ServerBannerRow>
|
||||
key={sectionRow.specTitle}
|
||||
title={sectionRow.specTitle}
|
||||
columns={sectionRow.columns}
|
||||
rows={sectionRow.rows}
|
||||
signStyle={signStyleGap}
|
||||
/>
|
||||
<div key={`div_${sectionRow.specTitle}`}>
|
||||
{
|
||||
useChart ?
|
||||
<LeftChartTable<ServerBannerRow>
|
||||
key={sectionRow.specTitle}
|
||||
title={sectionRow.specTitle}
|
||||
columns={sectionRow.columns}
|
||||
rows={sectionRow.rows}
|
||||
signStyle={signStyleGap}
|
||||
chart={
|
||||
<HorizontalBar
|
||||
data={sectionRow.chartData}
|
||||
height="100%"
|
||||
showFocusLabel="none"
|
||||
legend={{ show: false }}
|
||||
grid={GRID_Y_NOT_PADDING}
|
||||
xAxis={{ type: "value", show: false }}
|
||||
yAxis={{ type: "category", data: sectionRow.chartData.categories, show: false }}
|
||||
/>
|
||||
}
|
||||
chartCell={{ key: "total", startRowIndex: 1 }}
|
||||
minWidthPx={1200}
|
||||
starUnder30Sample={true}
|
||||
/>
|
||||
:
|
||||
<DataTable<ServerBannerRow>
|
||||
key={sectionRow.specTitle}
|
||||
title={sectionRow.specTitle}
|
||||
columns={sectionRow.columns}
|
||||
rows={sectionRow.rows}
|
||||
signStyle={signStyleGap}
|
||||
starUnder30Sample={true}
|
||||
/>
|
||||
}
|
||||
<div className="float-right content-text-sm">{SAMPLE_SIZE_NOTICE}</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
@@ -15,12 +15,11 @@ import {
|
||||
isBannerGroupKey,
|
||||
wrapSampleRow
|
||||
} from "@/lib/lg-dashboard";
|
||||
import {BANNER_GROUP, BANNER_KEY_MAP, LAST_YEAR} from "@/const/lgConst";
|
||||
import {BANNER_GROUP, BANNER_KEY_MAP, LAST_YEAR, SAMPLE_SIZE_NOTICE} from "@/const/lgConst";
|
||||
import {createDefaultGrid, createDefaultLegend, reverseCategories} from "@/lib/chart-options";
|
||||
import {useLayoutFilter} from "@/components/layout/LayoutFilterContext";
|
||||
import {CategoryTypeValue} from "@/components/layout/CategoryFilter";
|
||||
|
||||
type CategoryByDataProps = {
|
||||
selectedYear: string;
|
||||
title?: string;
|
||||
chartMode: CategoryChartMode;
|
||||
allTableData: ServerBannerRow[];
|
||||
@@ -42,6 +41,7 @@ const signStyleGap: SignStyle<ServerBannerRow> = {
|
||||
};
|
||||
|
||||
const CategoryByData = ({
|
||||
selectedYear,
|
||||
title,
|
||||
chartMode,
|
||||
allTableData,
|
||||
@@ -51,11 +51,11 @@ const CategoryByData = ({
|
||||
}: CategoryByDataProps) => {
|
||||
const [selectedBanner, setSelectedBanner] = useState<bannerType>(banners[0]);
|
||||
|
||||
const buildColumns = (groupKey: BannerGroupKey): DataColumn<ServerBannerRow>[] => {
|
||||
const buildColumns = (groupKey: BannerGroupKey, selectedYear:string): DataColumn<ServerBannerRow>[] => {
|
||||
const columns: DataColumn<ServerBannerRow>[] = [
|
||||
{
|
||||
key: "rowLabel",
|
||||
header: "",
|
||||
header: `20${selectedYear}년`,
|
||||
headRowSpan: 2,
|
||||
rowHead: true,
|
||||
cellClassName: "lg-table__rowhead",
|
||||
@@ -79,20 +79,21 @@ const CategoryByData = ({
|
||||
|
||||
const chartData = useMemo(() => {
|
||||
const excludeRowLabels =["사례수", "gap"];
|
||||
const chartTargetData = allTableData.filter((row) => row.year === selectedYear || Number(row.year) === Number(selectedYear) - 1);
|
||||
if(chartMode == "horizontal"){
|
||||
return reverseCategories(buildYearSeriesChartData(allTableData, {excludeRowLabels}));
|
||||
return reverseCategories(buildYearSeriesChartData(chartTargetData, {excludeRowLabels}));
|
||||
}
|
||||
|
||||
return buildRowLabelSeriesChartData(allTableData, {excludeRowLabels});
|
||||
return buildRowLabelSeriesChartData(chartTargetData, {excludeRowLabels});
|
||||
|
||||
}, [allTableData, chartMode]);
|
||||
}, [allTableData, selectedYear, chartMode]);
|
||||
|
||||
const tableColumns = useMemo(() => {
|
||||
const v = selectedBanner.variable;
|
||||
return isBannerGroupKey(v) ? buildColumns(v) : [];
|
||||
}, [selectedBanner.variable]);
|
||||
return isBannerGroupKey(v) ? buildColumns(v, selectedYear) : [];
|
||||
}, [selectedBanner.variable, selectedYear]);
|
||||
|
||||
const tableData = useMemo(() => wrapSampleRow(allTableData).filter((row) => row.year === LAST_YEAR), [allTableData, LAST_YEAR]);
|
||||
const tableData = useMemo(() => wrapSampleRow(allTableData).filter((row) => row.year === selectedYear), [allTableData, selectedYear]);
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -113,6 +114,7 @@ const CategoryByData = ({
|
||||
data={chartData}
|
||||
height={`${chartHeight ?? 340}px`}
|
||||
showFocusLabel="none"
|
||||
paletteVarNames={chartData.series.length === 1? ["--chart-1"]: ["--chart-2","--chart-1"]}
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
@@ -132,9 +134,11 @@ const CategoryByData = ({
|
||||
signStyle={signStyleGap}
|
||||
wrapperClassName="border rounded-lg"
|
||||
fillGreaterThan5={fillGreaterThan5}
|
||||
starUnder30Sample={true}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="float-right content-text-sm">{SAMPLE_SIZE_NOTICE}</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -5,6 +5,7 @@ import { cn, parseNumber } from "@/lib/utils";
|
||||
import type { DataColumn, SignStyle } from "../types";
|
||||
import SectionTitle from "../SectionTitle";
|
||||
import { TABLE_DIMENSIONS } from "@/const/chartConst";
|
||||
import {isSampleRow} from "@/lib/lg-dashboard";
|
||||
|
||||
type MergedChartCell<T> = {
|
||||
/** 차트를 삽입할 컬럼 key(해당 컬럼 td는 startRow에서만 렌더되고 rowSpan 적용) */
|
||||
@@ -32,6 +33,7 @@ type Props<T extends Record<string, unknown>> = {
|
||||
wrapperClassName?: string;
|
||||
tableClassName?: string;
|
||||
minWidthPx?: number;
|
||||
starUnder30Sample?: boolean;
|
||||
};
|
||||
|
||||
// toNumber는 utils.ts의 parseNumber로 통합됨
|
||||
@@ -65,6 +67,7 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
|
||||
wrapperClassName,
|
||||
tableClassName,
|
||||
minWidthPx = TABLE_DIMENSIONS.MIN_WIDTH.COMPACT,
|
||||
starUnder30Sample = true
|
||||
}: Props<T>) {
|
||||
const hasGroupHeader = useMemo(
|
||||
() => columns.some((c) => c.group) || columns.some((c) => c.headRowSpan === 2),
|
||||
@@ -169,6 +172,7 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
|
||||
|
||||
<tbody>
|
||||
{rows.map((row, ri) => {
|
||||
const sampleRow = isSampleRow(row.rowLabel as string ?? "");
|
||||
const isSignRow = signStyle?.rowSelector ? signStyle.rowSelector(row, ri) : false;
|
||||
|
||||
return (
|
||||
@@ -199,7 +203,7 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
|
||||
? raw
|
||||
: String(raw);
|
||||
|
||||
const n = isSignRow ? parseNumber(raw) : null;
|
||||
const n = c.numeric ? parseNumber(raw) : null;
|
||||
const shouldSign = isSignRow && (signStyle?.keys ? signStyle.keys.includes(c.key) : !!c.numeric);
|
||||
|
||||
if (c.rowHead) {
|
||||
@@ -216,13 +220,16 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
|
||||
}
|
||||
|
||||
if (!shouldSign) {
|
||||
const numContent = c.numeric ? parseNumber(content) ?? 0 : 0;
|
||||
const isStar = starUnder30Sample && sampleRow && numContent < 30;
|
||||
|
||||
return (
|
||||
<td
|
||||
key={String(c.key)}
|
||||
className={cn(c.cellClassName)}
|
||||
style={c.width ? { width: c.width } : undefined}
|
||||
>
|
||||
{content}
|
||||
{isStar?`${content}*`:content}
|
||||
</td>
|
||||
);
|
||||
}
|
||||
@@ -236,8 +243,10 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
const cls = n > 0 ? posCls : n < 0 ? negCls : zeroCls;
|
||||
const txt = renderSigned(n, { display, showPlus, arrowWithNumber, zeroText });
|
||||
|
||||
return (
|
||||
<td key={String(c.key)} className={cn(c.cellClassName, cls)}>
|
||||
{txt}
|
||||
|
||||
Reference in New Issue
Block a user