From 72df272fd2f6de397b4c3dc16ec3ea7a00a9d6d4 Mon Sep 17 00:00:00 2001
From: YangJinSoo94 <jschrome782@gmail.com>
Date: Mon, 19 May 2025 14:40:19 +0900
Subject: [PATCH] =?UTF-8?q?-=EC=B0=A8=ED=8A=B8=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EA=B0=9C=EC=88=98=EB=A7=8C=ED=81=BC=20=EC=B0=A8?=
 =?UTF-8?q?=ED=8A=B8=EA=B0=80=20=EA=B7=B8=EB=A0=A4=EC=A7=80=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/ui/chart/LineBarChart.tsx             | 85 ++++++++++++++-----
 .../src/ui/chart/LineChart.tsx                | 25 +++++-
 2 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/packages/common/business_components/src/ui/chart/LineBarChart.tsx b/packages/common/business_components/src/ui/chart/LineBarChart.tsx
index 6db4c3b0a..17deacd73 100644
--- a/packages/common/business_components/src/ui/chart/LineBarChart.tsx
+++ b/packages/common/business_components/src/ui/chart/LineBarChart.tsx
@@ -7,7 +7,7 @@ import {
 } from "./lib/chart";
 import type { ContentType } from "recharts/types/component/DefaultLegendContent";
 
-// 툴팁 커스텀 css
+// 툴크 커스텀 css
 /** 차트 기본 스타일 */
 const customStyles = {
   legendContainer: {
@@ -52,7 +52,7 @@ const CustomTooltip = ({ active, payload, label }: { active?: boolean; payload?:
           <div key={index} style={{ marginTop: "10px", display: "flex", alignItems: "center", gap: "8px" }}>
             {/* 색상 박스 추가 (범례 색상과 동일) */}
             <div style={{ width: "10px", height: "10px", backgroundColor: item.color, borderRadius: "50%" }}></div>
-            <span className="text-[11px] font-bold">{` ${item.name} : ${item.value}`}</span>
+            <span className="text-[11px] font-bold">{` ${item.name} : ${item.value.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`}</span>
           </div>
         ))}
       </div>
@@ -95,6 +95,18 @@ export default function LineBarchart({
   const barConfig = chartConfig?.barVal;
   const lineConfig = chartConfig?.lineVal;
 
+  // 데이터의 최대값 계산
+  const getMaxValue = (data: any[], keyPrefix: string) => {
+    return Math.max(...data.map(item => 
+      Object.keys(item)
+        .filter(key => key.includes(keyPrefix))
+        .map(key => item[key])
+    ).flat());
+  };
+
+  const lineMaxValue = getMaxValue(chartData, 'lineVal');
+  const barMaxValue = getMaxValue(chartData, 'barVal');
+
   return (
     <div className={chartClassName}>
       {chartTitle && chartTitle !== "" && chartTitle !== "undefined" ? (
@@ -113,29 +125,62 @@ export default function LineBarchart({
             <CartesianGrid strokeDasharray="3 3" />
             <XAxis dataKey="label" fontSize="8px" fontWeight="bold"/>
             {/* 왼쪽 Y축: lineVal */}
-            {yFieldText && <YAxis yAxisId="left" className="text-[12px] font-bold" orientation="left" label={{ value: yFieldText, angle: -90, position: 'insideLeft' }} />}
+            {yFieldText && <YAxis 
+              yAxisId="left" 
+              className="text-[12px] font-bold" 
+              tickCount={6}
+              orientation="left" 
+              domain={[0, Math.ceil(lineMaxValue * 1.1)]}
+              label={{ value: yFieldText, angle: -90, position: 'insideLeft' }} 
+            />}
             {/* 오른쪽 Y축: barVal */}
-            {yFieldText2 && <YAxis yAxisId="right" className="text-[12px] font-bold" fontWeight="bold" orientation="right" label={{ value: yFieldText2, angle: -90, position: 'insideRight' }} />}
+            {yFieldText2 && <YAxis 
+              yAxisId="right" 
+              className="text-[12px] font-bold" 
+              tickCount={6} 
+              orientation="right" 
+              domain={[0, Math.ceil(barMaxValue * 1.1)]}
+              label={{ value: yFieldText2, angle: -90, position: 'insideRight' }} 
+              reversed={true} 
+            />}
             <Tooltip content={<CustomTooltip active={undefined} payload={undefined} label={undefined} />} />
             {showLegend && <Legend content={CustomLegend as ContentType}/>}
             {/* 바 차트 (오른쪽 Y축 사용) */}
-            <Bar 
-              yAxisId="right" 
-              dataKey="barVal"
-              fill={barConfig?.color || "black"}
-              name={String(barConfig?.label || "Y축")}
-              maxBarSize={80}
-            />
+            {Object.keys(chartData[0]).map((key, index) => {
+              const config = chartConfig?.[key];
+              if(key.includes("barVal")) {
+                return (
+                  <Bar 
+                    key={`bar-${key}-${index}`}
+                    yAxisId="right" 
+                    dataKey={key}
+                    fill={config?.color || "black"}
+                    name={String(config?.label || "Y축")}
+                    maxBarSize={80}
+                  />
+                );
+              }
+              return null;
+            })}
             {/* 라인 차트 (왼쪽 Y축 사용) */}
-            <Line
-              yAxisId="left"
-              type="monotone" 
-              dataKey="lineVal" 
-              stroke={lineConfig?.color || "black"} 
-              strokeWidth={2} 
-              dot={{r: 0}} 
-              name={String(lineConfig?.label || "X축")}
-            />
+            {Object.keys(chartData[0]).map((key, index) => {
+              const config = chartConfig?.[key];
+              if(key.includes("lineVal")) {
+                return (
+                  <Line
+                    key={`line-${key}-${index}`}
+                    yAxisId="left"
+                    type="linear" 
+                    dataKey={key} 
+                    stroke={config?.color || "black"} 
+                    strokeWidth={2} 
+                    dot={{r: 0}} 
+                    name={String(config?.label || "X축")}
+                  />
+                );
+              }
+              return null;
+            })}
           </ComposedChart>
         </ChartContainer>
       </div>
diff --git a/packages/common/business_components/src/ui/chart/LineChart.tsx b/packages/common/business_components/src/ui/chart/LineChart.tsx
index b2a147ee0..a689af8ca 100644
--- a/packages/common/business_components/src/ui/chart/LineChart.tsx
+++ b/packages/common/business_components/src/ui/chart/LineChart.tsx
@@ -91,10 +91,16 @@ export default function Linechart({
   yFieldText,
   showLegend = true
 }: LineChartProps) {
-  if(!chartData || Object.keys(chartData).length === 0){
-    return <div>데이터가 없습니다.</div>
+  if (!chartData || Object.keys(chartData).length === 0) {
+    return <div>데이터가 없습니다.</div>;
   }
 
+  // 모든 데이터셋이 비어있는지 확인
+  const hasNoData = Object.values(chartData).every(dataset => !dataset || dataset.length === 0);
+  if (hasNoData) {
+    return <div>데이터가 없습니다.</div>;
+  }
+  
   // 데이터 병합 및 변환
   const mergedData = Object.entries(chartData).reduce<Array<{[key: string]: string | number}>>((acc, [key, dataset]) => {
     dataset.forEach((entry, index) => {
@@ -106,6 +112,17 @@ export default function Linechart({
     return acc;
   }, []);
 
+  // 데이터의 최대값 계산
+  const getMaxValue = (data: ChartDataType, keyPrefix: string) => {
+    return Math.max(...Object.values(data).map(item => 
+      Object.keys(item)
+        .filter(key => key.includes(keyPrefix))
+        .map(key => item[key] as unknown as number)
+    ).flat());
+  };
+
+  const lineMaxValue = getMaxValue(chartData, 'lineVal');
+
   return (
     <div className={chartClassName}>
       {chartTitle && chartTitle !== "" && chartTitle !== "undefined" ? (
@@ -122,8 +139,8 @@ export default function Linechart({
             margin={{ top: 5, right: 30, left: 20, bottom: 5 }}
           >
             <CartesianGrid vertical={false} />
-            <XAxis dataKey="label" fontSize="8px" fontWeight="bold"/>
-            <YAxis yAxisId="left" className="text-[12px] font-bold" orientation="left" label={{ value: yFieldText, className:"text-[12px] foont-bold", angle: -90, position: 'insideLeft' }} />
+            <XAxis dataKey="label" fontSize="8px" fontWeight="bold" />
+            <YAxis yAxisId="left" className="text-[12px] font-bold" domain={[0, Math.ceil(lineMaxValue * 1.1)]} tickCount={6} orientation="left" label={{ value: yFieldText, className:"text-[12px] font-bold", angle: -90, position: 'insideLeft' }} />
             <Tooltip content={<CustomTooltip />} />
             {showLegend && <Legend content={CustomLegend as ContentType}/>}
             {Object.keys(chartData).map((key) => {