merge: 合并 main 至 dev

同步节点网络/磁盘趋势图 ECharts 样式对齐。

Wavelet/frontend/app/(main)/nodes/components/disk-io-trend-chart.tsx

@@ -1,31 +1,16 @@
 'use client';
 
-import {Area, AreaChart, CartesianGrid, Line, XAxis, YAxis} from 'recharts';
-
-import {Card, CardContent, CardDescription, CardHeader, CardTitle} from '@/components/ui/card';
+import {TrendChart} from '@/components/data/trend-chart';
 import {
-  ChartConfig,
-  ChartContainer,
-  ChartLegend,
-  ChartLegendContent,
-  ChartTooltip,
-  ChartTooltipContent,
-} from '@/components/ui/chart';
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card';
 import type {DiskIOTrendPoint} from '@/lib/services/openflare';
 
-import {formatTrendHour} from '../../components/dashboard/dashboard-utils';
-import {formatBytes} from './node-utils';
-
-const chartConfig = {
-  diskRead: {
-    label: '磁盘读',
-    color: 'hsl(var(--chart-3))',
-  },
-  diskWrite: {
-    label: '磁盘写',
-    color: 'hsl(var(--chart-5))',
-  },
-} satisfies ChartConfig;
+import {formatBytes, formatTrendHour} from '../../components/dashboard/dashboard-utils';
 
 export function DiskIOTrendChart({
   points,
@@ -36,91 +21,33 @@ export function DiskIOTrendChart({
   title?: string;
   description?: string;
 }) {
-  const data = points.map((point) => ({
-    hour: formatTrendHour(point.bucket_started_at),
-    diskRead: point.disk_read_bytes,
-    diskWrite: point.disk_write_bytes,
-  }));
-
-  if (data.length === 0) {
-    return (
-      <Card className="border-dashed shadow-none">
-        <CardHeader>
-          <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-          <CardDescription className="text-xs">{description}</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="flex h-[280px] items-center justify-center text-xs text-muted-foreground">
-            暂无趋势数据
-          </div>
-        </CardContent>
-      </Card>
-    );
-  }
-
   return (
     <Card className="border-dashed shadow-none">
       <CardHeader>
         <CardTitle className="text-sm font-semibold">{title}</CardTitle>
         <CardDescription className="text-xs">{description}</CardDescription>
       </CardHeader>
-      <CardContent className="pl-2 pr-4">
-        <div className="h-[280px] w-full">
-          <ChartContainer config={chartConfig} className="h-full w-full">
-            <AreaChart data={data} margin={{ top: 10, right: 10, left: 0, bottom: 0 }}>
-              <defs>
-                <linearGradient id="nodeDiskReadFill" x1="0" y1="0" x2="0" y2="1">
-                  <stop offset="5%" stopColor="var(--color-diskRead)" stopOpacity={0.2} />
-                  <stop offset="95%" stopColor="var(--color-diskRead)" stopOpacity={0.02} />
-                </linearGradient>
-              </defs>
-              <CartesianGrid strokeDasharray="3 3" vertical={false} />
-              <XAxis
-                dataKey="hour"
-                tickLine={false}
-                axisLine={false}
-                tickMargin={8}
-                minTickGap={24}
-              />
-              <YAxis
-                tickLine={false}
-                axisLine={false}
-                tickMargin={8}
-                tickFormatter={(value) => formatBytes(Number(value))}
-              />
-              <ChartTooltip
-                cursor={false}
-                content={
-                  <ChartTooltipContent
-                    formatter={(value, name) => (
-                      <span className="font-mono tabular-nums">
-                        {formatBytes(Number(value))}
-                        <span className="ml-1 text-muted-foreground">
-                          {name === 'diskRead' ? '读' : '写'}
-                        </span>
-                      </span>
-                    )}
-                  />
-                }
-              />
-              <Area
-                type="monotone"
-                dataKey="diskRead"
-                stroke="var(--color-diskRead)"
-                fill="url(#nodeDiskReadFill)"
-                strokeWidth={2}
-              />
-              <Line
-                type="monotone"
-                dataKey="diskWrite"
-                stroke="var(--color-diskWrite)"
-                strokeWidth={2}
-                dot={false}
-              />
-              <ChartLegend content={<ChartLegendContent />} />
-            </AreaChart>
-          </ChartContainer>
-        </div>
+      <CardContent>
+        <TrendChart
+          labels={points.map((point) => formatTrendHour(point.bucket_started_at))}
+          yAxisValueFormatter={formatBytes}
+          series={[
+            {
+              label: '磁盘读',
+              color: '#a78bfa',
+              fillColor: 'rgba(167, 139, 250, 0.14)',
+              variant: 'area',
+              values: points.map((point) => point.disk_read_bytes),
+              valueFormatter: formatBytes,
+            },
+            {
+              label: '磁盘写',
+              color: '#fb7185',
+              values: points.map((point) => point.disk_write_bytes),
+              valueFormatter: formatBytes,
+            },
+          ]}
+        />
       </CardContent>
     </Card>
   );

Wavelet/frontend/app/(main)/nodes/components/network-trend-chart.tsx

@@ -1,31 +1,19 @@
 'use client';
 
-import {Area, AreaChart, CartesianGrid, Line, XAxis, YAxis} from 'recharts';
-
-import {Card, CardContent, CardDescription, CardHeader, CardTitle} from '@/components/ui/card';
+import {TrendChart} from '@/components/data/trend-chart';
 import {
-  ChartConfig,
-  ChartContainer,
-  ChartLegend,
-  ChartLegendContent,
-  ChartTooltip,
-  ChartTooltipContent,
-} from '@/components/ui/chart';
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card';
 import type {NetworkTrendPoint} from '@/lib/services/openflare';
 
-import {formatTrendHour} from '../../components/dashboard/dashboard-utils';
-import {formatBytesPerSecond} from './node-utils';
-
-const chartConfig = {
-  openrestyRx: {
-    label: 'OpenResty 入站',
-    color: 'hsl(var(--chart-2))',
-  },
-  openrestyTx: {
-    label: 'OpenResty 出站',
-    color: 'hsl(var(--chart-4))',
-  },
-} satisfies ChartConfig;
+import {
+  formatBytesPerSecond,
+  formatTrendHour,
+} from '../../components/dashboard/dashboard-utils';
 
 export function NetworkTrendChart({
   points,
@@ -36,91 +24,33 @@ export function NetworkTrendChart({
   title?: string;
   description?: string;
 }) {
-  const data = points.map((point) => ({
-    hour: formatTrendHour(point.bucket_started_at),
-    openrestyRx: point.openresty_rx_bytes,
-    openrestyTx: point.openresty_tx_bytes,
-  }));
-
-  if (data.length === 0) {
-    return (
-      <Card className="border-dashed shadow-none">
-        <CardHeader>
-          <CardTitle className="text-sm font-semibold">{title}</CardTitle>
-          <CardDescription className="text-xs">{description}</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="flex h-[280px] items-center justify-center text-xs text-muted-foreground">
-            暂无趋势数据
-          </div>
-        </CardContent>
-      </Card>
-    );
-  }
-
   return (
     <Card className="border-dashed shadow-none">
       <CardHeader>
         <CardTitle className="text-sm font-semibold">{title}</CardTitle>
         <CardDescription className="text-xs">{description}</CardDescription>
       </CardHeader>
-      <CardContent className="pl-2 pr-4">
-        <div className="h-[280px] w-full">
-          <ChartContainer config={chartConfig} className="h-full w-full">
-            <AreaChart data={data} margin={{ top: 10, right: 10, left: 0, bottom: 0 }}>
-              <defs>
-                <linearGradient id="nodeOpenrestyRxFill" x1="0" y1="0" x2="0" y2="1">
-                  <stop offset="5%" stopColor="var(--color-openrestyRx)" stopOpacity={0.2} />
-                  <stop offset="95%" stopColor="var(--color-openrestyRx)" stopOpacity={0.02} />
-                </linearGradient>
-              </defs>
-              <CartesianGrid strokeDasharray="3 3" vertical={false} />
-              <XAxis
-                dataKey="hour"
-                tickLine={false}
-                axisLine={false}
-                tickMargin={8}
-                minTickGap={24}
-              />
-              <YAxis
-                tickLine={false}
-                axisLine={false}
-                tickMargin={8}
-                tickFormatter={(value) => formatBytesPerSecond(Number(value), 3600)}
-              />
-              <ChartTooltip
-                cursor={false}
-                content={
-                  <ChartTooltipContent
-                    formatter={(value, name) => (
-                      <span className="font-mono tabular-nums">
-                        {formatBytesPerSecond(Number(value), 3600)}
-                        <span className="ml-1 text-muted-foreground">
-                          {name === 'openrestyRx' ? '入站' : '出站'}
-                        </span>
-                      </span>
-                    )}
-                  />
-                }
-              />
-              <Area
-                type="monotone"
-                dataKey="openrestyRx"
-                stroke="var(--color-openrestyRx)"
-                fill="url(#nodeOpenrestyRxFill)"
-                strokeWidth={2}
-              />
-              <Line
-                type="monotone"
-                dataKey="openrestyTx"
-                stroke="var(--color-openrestyTx)"
-                strokeWidth={2}
-                dot={false}
-              />
-              <ChartLegend content={<ChartLegendContent />} />
-            </AreaChart>
-          </ChartContainer>
-        </div>
+      <CardContent>
+        <TrendChart
+          labels={points.map((point) => formatTrendHour(point.bucket_started_at))}
+          yAxisValueFormatter={(value) => formatBytesPerSecond(value, 3600)}
+          series={[
+            {
+              label: 'OpenResty 入站',
+              color: '#22c55e',
+              fillColor: 'rgba(34, 197, 94, 0.14)',
+              variant: 'area',
+              values: points.map((point) => point.openresty_rx_bytes),
+              valueFormatter: (value) => formatBytesPerSecond(value, 3600),
+            },
+            {
+              label: 'OpenResty 出站',
+              color: '#38bdf8',
+              values: points.map((point) => point.openresty_tx_bytes),
+              valueFormatter: (value) => formatBytesPerSecond(value, 3600),
+            },
+          ]}
+        />
       </CardContent>
     </Card>
   );