ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iipbs/common/main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/common/main

Browse Source
This commit is contained in:
swcho
2025-09-01 13:07:49 +09:00
parent 2a0f5dce25 26f2c60f4c
commit 072a5337a3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/common/business_components/src/ui/chart/LineBarChart.tsx
+1 -1
View File
@@ -165,7 +165,7 @@ export default function LineBarchart({
{chartTitle} {chartTitle}
</div> </div>
) : null} ) : null}
<div className="h-[calc(100%-42px)] flex justify-center"> <div className="h-[calc(100%-42px)] w-[calc(100%-40px)] ">
<ChartContainer config={chartConfig ?? {}} className="h-full w-full"> <ChartContainer config={chartConfig ?? {}} className="h-full w-full">
<ComposedChart <ComposedChart
data={chartData} data={chartData}
packages/common/business_components/src/ui/chart/LineChart.tsx
+2 -1
View File
@@ -65,7 +65,7 @@ const CustomTooltip = ({ active, payload, label }: { active?: boolean; payload?:
return ( return (
<div className="w-[180px] rounded bg-white p-2.5 shadow-[0px_2px_10px_rgba(0,0,0,0.2)]"> <div className="w-[180px] rounded bg-white p-2.5 shadow-[0px_2px_10px_rgba(0,0,0,0.2)]">
<p className="text-[12px] font-bold m-3">{label}</p> <p className="text-[12px] font-bold m-3">{label}</p>
{payload.map((item, index) => ( {payload.filter(item => item.value != null && String(item.value) != 'NaN' && item.value != undefined).map((item, index) => (
<div key={index} style={{ marginTop: "10px", display: "flex", alignItems: "center", gap: "8px" }}> <div key={index} style={{ marginTop: "10px", display: "flex", alignItems: "center", gap: "8px" }}>
{/* 색상 박스 추가 (범례 색상과 동일) */} {/* 색상 박스 추가 (범례 색상과 동일) */}
<div style={{ width: "10px", height: "10px", backgroundColor: item.color, borderRadius: "50%" }}></div> <div style={{ width: "10px", height: "10px", backgroundColor: item.color, borderRadius: "50%" }}></div>
@@ -267,6 +267,7 @@ export default function Linechart({
type="linear" type="linear"
strokeWidth={2} strokeWidth={2}
dot={false} dot={false}
connectNulls={true}
name={String(config?.label || "X축")} name={String(config?.label || "X축")}
stroke={config?.color} stroke={config?.color}
/> />