From b295fea52f40af63af708283d42edc26bcd77bd8 Mon Sep 17 00:00:00 2001
From: luorijun <luorijun@outlook.com>
Date: Fri, 20 Jun 2025 15:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=AB=AF=E5=B8=83=E5=B1=80=E9=81=AE=E7=BD=A9=E5=B1=82=E7=9A=84?=
 =?UTF-8?q?=E9=81=AE=E6=8C=A1=E7=8A=B6=E6=80=81=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5=E7=BB=84=E4=BB=B6=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/admin/(dashboard)/_client/chart.tsx  | 33 ------------------
 src/app/admin/(dashboard)/_client/charts.tsx | 36 ++++++++++++++++++--
 src/app/admin/_client/layout.tsx             |  3 +-
 3 files changed, 35 insertions(+), 37 deletions(-)
 delete mode 100644 src/app/admin/(dashboard)/_client/chart.tsx

diff --git a/src/app/admin/(dashboard)/_client/chart.tsx b/src/app/admin/(dashboard)/_client/chart.tsx
deleted file mode 100644
index 5e0b441..0000000
--- a/src/app/admin/(dashboard)/_client/chart.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import {ChartConfig, ChartContainer} from '@/components/ui/chart'
-import {Area, AreaChart, Bar, BarChart, CartesianGrid, Tooltip, XAxis, YAxis} from 'recharts'
-import {addDays, format} from 'date-fns'
-import {listAccount} from '@/actions/dashboard'
-import {ExtraReq, ExtraResp} from '@/lib/api'
-
-const config = {
-  count: {
-    label: `套餐使用量`,
-    color: `var(--color-primary)`,
-  },
-} satisfies ChartConfig
-
-type DashboardChartProps = {
-  data: ExtraResp<typeof listAccount>
-}
-
-async function DashboardChart(props: DashboardChartProps) {
-  return (
-    <ChartContainer config={config} className="w-full h-full">
-      <AreaChart data={props.data} margin={{top: 0, right: 20, left: 0, bottom: 0}}>
-        <CartesianGrid vertical={false}/>
-        <XAxis dataKey="time" tickLine={false}/>
-        <XAxis dataKey="time" tickLine={false}/>
-        <YAxis tickLine={false}/>
-        <Tooltip animationDuration={100}/>
-        <Area dataKey="count" radius={20} className="fill-[var(--color-primary)]"/>
-        <Area dataKey="count" radius={20} className="fill-[var(--color-primary)]"/>
-      </AreaChart>
-    </ChartContainer>
-  )
-}
-export default DashboardChart
diff --git a/src/app/admin/(dashboard)/_client/charts.tsx b/src/app/admin/(dashboard)/_client/charts.tsx
index dea0b89..e9bed99 100644
--- a/src/app/admin/(dashboard)/_client/charts.tsx
+++ b/src/app/admin/(dashboard)/_client/charts.tsx
@@ -1,6 +1,5 @@
 'use client'
 import {Tabs, TabsList, TabsTrigger, TabsContent} from '@/components/ui/tabs'
-import DashboardChart from './chart'
 import Image from 'next/image'
 import soon from '../_assets/coming-soon.svg'
 import DatePicker from '@/components/date-picker'
@@ -18,6 +17,8 @@ import {ExtraResp} from '@/lib/api'
 import {toast} from 'sonner'
 import {addDays, format} from 'date-fns'
 import {Label} from '@/components/ui/label'
+import {ChartConfig, ChartContainer} from '@/components/ui/chart'
+import {CartesianGrid, XAxis, YAxis, Tooltip, Area, AreaChart} from 'recharts'
 
 export default function Charts() {
   const dateStr = '2025-03-05'
@@ -84,9 +85,11 @@ export default function Charts() {
         <Tabs defaultValue="dynamic" className="h-full gap-4">
           <TabsList className="h-9">
             <TabsTrigger value="dynamic" className="data-[state=active]:text-primary">
-              动态 IP 套餐
+              短效动态
+            </TabsTrigger>
+            <TabsTrigger value="static" className="data-[state=active]:text-primary">
+              长效动态
             </TabsTrigger>
-            <TabsTrigger value="static" className="data-[state=active]:text-primary">静态 IP 套餐</TabsTrigger>
           </TabsList>
           <Form<FormValues> className={merge(`flex items-end gap-4 flex-wrap`)} handler={handler} form={form} >
             <FormField name="resource_no" label={<span className="text-sm">套餐编号</span>}>
@@ -138,3 +141,30 @@ export default function Charts() {
     </Card>
   )
 }
+
+const config = {
+  count: {
+    label: `套餐使用量`,
+    color: `var(--color-primary)`,
+  },
+} satisfies ChartConfig
+
+type DashboardChartProps = {
+  data: ExtraResp<typeof listAccount>
+}
+
+function DashboardChart(props: DashboardChartProps) {
+  return (
+    <ChartContainer config={config} className="w-full h-full">
+      <AreaChart data={props.data} margin={{top: 0, right: 20, left: 0, bottom: 0}}>
+        <CartesianGrid vertical={false}/>
+        <XAxis dataKey="time" tickLine={false}/>
+        <XAxis dataKey="time" tickLine={false}/>
+        <YAxis tickLine={false}/>
+        <Tooltip animationDuration={100}/>
+        <Area dataKey="count" radius={20} className="fill-[var(--color-primary)]"/>
+        <Area dataKey="count" radius={20} className="fill-[var(--color-primary)]"/>
+      </AreaChart>
+    </ChartContainer>
+  )
+}
diff --git a/src/app/admin/_client/layout.tsx b/src/app/admin/_client/layout.tsx
index 2eeaa75..bb4421b 100644
--- a/src/app/admin/_client/layout.tsx
+++ b/src/app/admin/_client/layout.tsx
@@ -49,10 +49,11 @@ export default function Layout(props: AdminLayoutProps) {
           <rect width="100%" height="100%" className="fill-card" mask="url(#top-left-rounded-mask)"/>
         </svg>
 
+        {/* 遮罩层 */}
         <div
           data-expand={navbar}
           className={merge(
-            `md:hidden`,
+            `lg:hidden`,
             `transition-opacity duration-300 ease-in-out`,
             `col-start-1 row-start-1 col-span-2 row-span-2 bg-black/50 z-10`,
             `data-[expand=true]:opacity-100 data-[expand=false]:opacity-0`,