260330_01_ENH: 26일자 수정사항 반영(라이프스테이지 중분류 제외)

This commit is contained in:
2026-03-30 13:18:08 +09:00
parent ee8bb13209
commit 7f9465e96f
19 changed files with 203 additions and 94 deletions

View File

@@ -1,6 +1,7 @@
"use client";
import { useAtomValue } from "jotai";
import { Loader2Icon } from "lucide-react";
import { loadingAtom } from "@/store/jotai/loading";
export function LoadingOverlay({ force = false }: { force?: boolean }) {
@@ -9,9 +10,11 @@ export function LoadingOverlay({ force = false }: { force?: boolean }) {
if (!force && !isLoading) return null;
return (
<div className="fixed inset-0 z-[9999] bg-black/70 flex items-center justify-center">
{/* 심플 로딩 인디케이터 */}
<div className="h-12 w-12 rounded-full border-4 border-gray-400 border-t-white animate-spin" />
<div className="fixed inset-0 z-[9999] flex items-center justify-center bg-black/65">
<div className="flex flex-col items-center gap-3">
<Loader2Icon className="size-20 animate-spin text-white" style={{ animationDuration: "0.7s" }} />
<div className="text-sm font-medium tracking-[0.18em] text-white/90">Loading</div>
</div>
</div>
);
}
}

View File

@@ -28,6 +28,11 @@ type Props = {
yAxis?: EChartsOption["yAxis"];
barMaxWidth?: number;
showFocusLabel?:ShowLabel;
labelOptions?: {
position?: "right" | "insideRight";
color?: string;
distance?: number;
};
};
const HorizontalBar = ({
@@ -43,6 +48,7 @@ const HorizontalBar = ({
yAxis,
barMaxWidth,
showFocusLabel = "all",
labelOptions,
}: Props) => {
const palette = useMemo(() => buildLgPalette(paletteVarNames), [paletteVarNames]);
@@ -68,14 +74,16 @@ const HorizontalBar = ({
label: showLabel
? {
show: true,
position: "right",
position: labelOptions?.position ?? "right",
color: labelOptions?.color,
distance: labelOptions?.distance,
formatter: (p: any) => (p?.value ?? "") as any,
}
: undefined,
};
}),
};
}, [data, palette, valueFormatter, tooltip, legend, grid, xAxis, yAxis, barMaxWidth, showFocusLabel]);
}, [data, palette, valueFormatter, tooltip, legend, grid, xAxis, yAxis, barMaxWidth, showFocusLabel, labelOptions]);
return <BaseEChart option={option} height={height} className={className} />;
}

View File

@@ -79,9 +79,10 @@ type BannerSummaryProps = {
data: BannerRow[];
useChart: boolean;
useYear: boolean;
getCellClassName?: (row: BannerRow, column: DataColumn<BannerRow>, rowIndex: number) => string | undefined;
};
const BannerSummary = ({ data, useChart, useYear }: BannerSummaryProps) => {
const BannerSummary = ({ data, useChart, useYear, getCellClassName }: BannerSummaryProps) => {
const {filterValue, registerExcelExporter } = useLayoutFilter();
const debouncedFilterValue = useDebouncedValue<CategoryFilterValue>(filterValue as CategoryFilterValue, 500);
@@ -179,12 +180,14 @@ const BannerSummary = ({ data, useChart, useYear }: BannerSummaryProps) => {
title={sectionRow.specTitle}
columns={sectionRow.columns}
rows={sectionRow.rows}
getCellClassName={getCellClassName}
signStyle={signStyleGap}
chart={
<HorizontalBar
data={sectionRow.chartData}
height="100%"
showFocusLabel="none"
showFocusLabel="all"
labelOptions={{ position: "insideRight", color: "#fff", distance: 4 }}
legend={{ show: false }}
grid={GRID_Y_NOT_PADDING}
xAxis={{ type: "value", show: false }}

View File

@@ -68,6 +68,14 @@ const CategoryByData = ({
cellClassName: "lg-table__rowhead",
width: 120,
},
{
key: "total",
header: `전체`,
headRowSpan: 2,
numeric: true,
cellClassName: "lg-table__rowhead",
width: 120,
},
];
const g = BANNER_GROUP[groupKey];

View File

@@ -26,6 +26,7 @@ type Props<T extends Record<string, unknown>> = {
minWidth?: number;
starUnder30Sample?: boolean;
unitText?: string;
getCellClassName?: (row: T, column: DataColumn<T>, rowIndex: number) => string | undefined;
};
export default function LeftChartTable<T extends Record<string, unknown>>({
@@ -41,7 +42,8 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
minWidth,
starUnder30Sample = true,
unitText = UNIT_TEXT,
}: Props<T>) {
getCellClassName,
}: Readonly<Props<T>>) {
return (
<BaseDataTable
columns={columns}
@@ -59,6 +61,7 @@ export default function LeftChartTable<T extends Record<string, unknown>>({
}}
starUnder30Sample={starUnder30Sample}
unitText={unitText}
getCellClassName={getCellClassName}
mergedCell={{
key: chartCell.key,
content: chart,

View File

@@ -5,7 +5,7 @@ import { cn, parseNumber } from "@/lib/utils";
import type { ChartData, SignStyle, TopChartTableRow } from "../types";
import { CHART_HEIGHTS, TABLE_DIMENSIONS } from "@/components/lge-dashboard/chart/chart.config";
import { UNIT_TEXT } from "@/const/lg-common.const";
import { isCagrRow } from "@/lib/lg-dashboard";
import {isCagrRow, isSampleRow} from "@/lib/lg-dashboard";
import BaseTableHeader from "../table/core/BaseTableHeader";
import { formatSignedValue, getSignTextClass, resolveSignStyle, toRoundedNumber } from "../table/core/table-core.helpers";
@@ -41,7 +41,7 @@ export default function TopChartTable({
signStyle,
fillCAGR = false,
unitText = UNIT_TEXT,
}: TopChartTableProps) {
}: Readonly<TopChartTableProps>) {
const resolvedSignStyle = resolveSignStyle(signStyle, {
positiveTextClassName: "lg-num-pos",
negativeTextClassName: "lg-num-neg",
@@ -93,6 +93,7 @@ export default function TopChartTable({
<tbody>
{rows.map((row, rowIndex) => {
const signRow = !!signStyle?.rowSelector?.(row, rowIndex);
const sampleRow = isSampleRow(row.label ?? "");
const cagrRow = isCagrRow(row.label ?? "");
const rowTotal = parseNumber(row.total);
@@ -104,7 +105,12 @@ export default function TopChartTable({
{categories.map((_, categoryIndex) => {
const rawValue = row.values?.[categoryIndex];
const roundedValue = toRoundedNumber(rawValue);
if(sampleRow){
return <td key={categoryIndex}>{rawValue}</td>;
}
const roundedValue = toRoundedNumber(rawValue, cagrRow? 1 : 0);
if (!signRow) {
if (roundedValue === null) {

View File

@@ -32,6 +32,7 @@ type Props<T extends Record<string, unknown>> = {
title?: string;
wrapperClassName?: string;
tableClassName?: string;
subheadRowClassName?: string;
minWidth?: number;
signStyle?: SignStyle<T>;
signStyleFallback?: Partial<ResolvedSignStyle>;
@@ -39,6 +40,7 @@ type Props<T extends Record<string, unknown>> = {
starUnder30Sample?: boolean;
unitText?: string;
mergedCell?: MergedTableCell<T>;
getCellClassName?: (row: T, column: DataColumn<T>, rowIndex: number) => string | undefined;
};
export default function BaseDataTable<T extends Record<string, unknown>>({
@@ -47,6 +49,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
title,
wrapperClassName,
tableClassName,
subheadRowClassName,
minWidth,
signStyle,
signStyleFallback,
@@ -54,7 +57,8 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
starUnder30Sample = false,
unitText,
mergedCell,
}: Props<T>) {
getCellClassName,
}: Readonly<Props<T>>) {
const resolvedSignStyle = resolveSignStyle(signStyle, signStyleFallback);
const mergedCellStart = mergedCell?.startRowIndex ?? 0;
const mergedCellSpan = mergedCell?.rowSpan ?? Math.max(0, rows.length - mergedCellStart);
@@ -67,6 +71,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
showSampleNotice={starUnder30Sample}
wrapperClassName={wrapperClassName}
tableClassName={tableClassName}
subheadRowClassName={subheadRowClassName}
minWidth={minWidth}
>
{rows.map((row, rowIndex) => {
@@ -77,6 +82,8 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
return (
<tr key={rowIndex}>
{columns.map((column) => {
const dynamicCellClassName = getCellClassName?.(row, column, rowIndex);
if (mergedCell && column.key === mergedCell.key && rowIndex >= mergedCellStart) {
if (rowIndex > mergedCellStart) {
return null;
@@ -105,7 +112,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
<th
key={String(column.key)}
scope="row"
className={cn("lg-table__rowhead", column.cellClassName)}
className={cn("lg-table__rowhead", column.cellClassName, dynamicCellClassName)}
style={{ textAlign: align }}
>
{defaultContent}
@@ -122,7 +129,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
: { textAlign: align };
return (
<td key={String(column.key)} className={column.cellClassName} style={cellStyle}>
<td key={String(column.key)} className={cn(column.cellClassName, dynamicCellClassName)} style={cellStyle}>
<span className={cn(roundedValue === null ? "text-gray-500" : getSignTextClass(roundedValue, resolvedSignStyle))}>
{displayText}
</span>
@@ -137,7 +144,7 @@ export default function BaseDataTable<T extends Record<string, unknown>>({
return (
<td
key={String(column.key)}
className={cn(column.cellClassName, shouldFillCell ? "bg-red-200" : "")}
className={cn(column.cellClassName, dynamicCellClassName, shouldFillCell ? "bg-red-200" : "")}
style={{ textAlign: align }}
>
{displayContent}

View File

@@ -11,6 +11,7 @@ type Props<T extends Record<string, unknown>> = {
className?: string;
tableClassName?: string;
wrapperClassName?: string;
subheadRowClassName?: string;
signStyle?: SignStyle<T>;
fillGreaterThan5?: boolean;
starUnder30Sample?: boolean;
@@ -24,6 +25,7 @@ const DataTable = <T extends Record<string, unknown>>({
className,
tableClassName,
wrapperClassName,
subheadRowClassName,
signStyle,
fillGreaterThan5 = false,
starUnder30Sample = false,
@@ -36,6 +38,7 @@ const DataTable = <T extends Record<string, unknown>>({
title={title}
tableClassName={tableClassName ?? className}
wrapperClassName={wrapperClassName}
subheadRowClassName={subheadRowClassName}
signStyle={signStyle}
fillGreaterThan5={fillGreaterThan5}
starUnder30Sample={starUnder30Sample}

View File

@@ -21,6 +21,7 @@ type Props<T> = {
showSampleNotice?: boolean;
wrapperClassName?: string;
tableClassName?: string;
subheadRowClassName?: string;
minWidth?: number | string;
colgroup?: React.ReactNode;
renderHeaderPrefix?: React.ReactNode;
@@ -34,11 +35,12 @@ export default function BaseTableRenderer<T>({
showSampleNotice = false,
wrapperClassName,
tableClassName,
subheadRowClassName,
minWidth,
colgroup,
renderHeaderPrefix,
children,
}: Props<T>) {
}: Readonly<Props<T>>) {
const groupedHeader = hasGroupedHeader(columns);
const groupHeaderCells = buildGroupHeaderCells(columns);
@@ -68,7 +70,7 @@ export default function BaseTableRenderer<T>({
))}
</tr>
) : null}
<tr className={groupedHeader ? "lg-table__subhead" : undefined}>
<tr className={cn(groupedHeader ? "lg-table__subhead" : undefined, subheadRowClassName)}>
{columns
.filter((column) => column.headRowSpan !== 2)
.map((column) => (

View File

@@ -154,9 +154,9 @@ export function toTableCellContent(raw: unknown): React.ReactNode {
return String(raw);
}
export function toRoundedNumber(raw: unknown) {
export function toRoundedNumber(raw: unknown, decimalPoint?: number) {
const parsed = parseNumber(raw);
return parsed === null ? null : roundNumber(parsed);
return parsed === null ? null : roundNumber(parsed, decimalPoint);
}
export function appendCellMarker(content: React.ReactNode, marker: string) {