Merge branch 'main' into cloudflare

This commit is contained in:
hamster1963 2024-10-09 23:17:04 +08:00
commit a68c5be971
3 changed files with 8 additions and 3 deletions

View File

@ -32,6 +32,6 @@
| 日语 | ja | 是 | | 日语 | ja | 是 |
![screen-shot-one](/.github/shot-1.png) ![screen-shot-one](/.github/shot-1.png)
![screen-shot-three](/.github/shot-3.png)
![screen-shot-two](/.github/shot-2.png) ![screen-shot-two](/.github/shot-2.png)
![screen-shot-three](/.github/shot-3.png)
![screen-shot-four](/.github/shot-4.png) ![screen-shot-four](/.github/shot-4.png)

View File

@ -13,6 +13,8 @@ import {
import { import {
ChartConfig, ChartConfig,
ChartContainer, ChartContainer,
ChartLegend,
ChartLegendContent,
ChartTooltip, ChartTooltip,
ChartTooltipContent, ChartTooltipContent,
} from "@/components/ui/chart"; } from "@/components/ui/chart";
@ -228,6 +230,9 @@ export function NetworkChart({
/> />
} }
/> />
{activeChart === defaultChart && (
<ChartLegend content={<ChartLegendContent />} />
)}
{activeChart !== defaultChart && ( {activeChart !== defaultChart && (
<Line <Line
isAnimationActive={false} isAnimationActive={false}

View File

@ -280,7 +280,7 @@ const ChartLegendContent = React.forwardRef<
<div <div
ref={ref} ref={ref}
className={cn( className={cn(
"flex items-center justify-center gap-4", "flex flex-wrap items-center justify-center gap-4",
verticalAlign === "top" ? "pb-3" : "pt-3", verticalAlign === "top" ? "pb-3" : "pt-3",
className, className,
)} )}
@ -306,7 +306,7 @@ const ChartLegendContent = React.forwardRef<
}} }}
/> />
)} )}
{itemConfig?.label} {key}
</div> </div>
); );
})} })}