发布v0.3.0版本

package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-app",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",

src/app/api/stats/route.ts

@@ -23,7 +23,7 @@ export async function GET(request: NextRequest) {
             case 'city_node_count':
                 return await getCityNodeCount()
             case 'allocation_status':
-                return await getAllocationStatus()
+                return await getAllocationStatus(request)
             case 'edge_nodes':
                 return await getEdgeNodes(request)
             default:
@@ -54,17 +54,76 @@ async function getGatewayInfo() {
 async function getGatewayConfig(request: NextRequest) {
     try {
         const { searchParams } = new URL(request.url)
-        const macAddress = searchParams.get('mac') || '000C29DF1647'
+        const macAddress = searchParams.get('mac') || ''
+        const offset = parseInt(searchParams.get('offset') || '0')
+        const limit = parseInt(searchParams.get('limit') || '100')
 
-        // 使用参数化查询防止SQL注入
+        // 定义类型接口
-        const result = await prisma.$queryRaw`
+        interface GatewayRecord {
-      SELECT edge, city, user, public, inner_ip, ischange, isonline
+            edge: string | null;
-      FROM gateway
+            city: string | null;
-      LEFT JOIN cityhash ON cityhash.hash = gateway.cityhash
+            user: string | null;
-      LEFT JOIN edge ON edge.macaddr = gateway.edge
+            public: string | null;
-      WHERE gateway.macaddr = ${macAddress};
+            inner_ip: string | null;
-    `
+            ischange: boolean | number | null;
-        return NextResponse.json(safeSerialize(result))
+            isonline: boolean | number | null;
+        }
+
+        // 获取总数
+        let totalCountQuery = ''
+        let totalCountParams: (string | number)[] = []
+
+        if (macAddress) {
+            totalCountQuery = `
+                SELECT COUNT(*) as total
+                FROM gateway
+                LEFT JOIN cityhash ON cityhash.hash = gateway.cityhash
+                LEFT JOIN edge ON edge.macaddr = gateway.edge
+                WHERE gateway.macaddr = ?
+            `
+            totalCountParams = [macAddress]
+        } else {
+            totalCountQuery = `
+                SELECT COUNT(*) as total
+                FROM gateway
+            `
+        }
+
+        const totalCountResult = await prisma.$queryRawUnsafe<[{ total: bigint }]>(
+            totalCountQuery,
+            ...totalCountParams
+        )
+        const totalCount = Number(totalCountResult[0]?.total || 0)
+
+        // 获取分页数据
+        let query = `
+            select edge, city, user, public, inner_ip, ischange, isonline
+            from
+                gateway
+                left join cityhash
+                    on cityhash.hash = gateway.cityhash
+                left join edge
+                    on edge.macaddr = gateway.edge
+        `
+        let params: (string | number)[] = []
+
+        if (macAddress) {
+            query += ' WHERE gateway.macaddr = ?'
+            params = [macAddress]
+        } else {
+            query += ' LIMIT ? OFFSET ?'
+            params.push(limit, offset)
+        }
+
+        // 指定返回类型
+        const result = await prisma.$queryRawUnsafe<GatewayRecord[]>(query, ...params)
+
+        return NextResponse.json({
+            data: safeSerialize(result),
+            totalCount: totalCount,
+            currentPage: Math.floor(offset / limit) + 1,
+            totalPages: Math.ceil(totalCount / limit)
+        })
     } catch (error) {
         console.error('Gateway config query error:', error)
         return NextResponse.json({ error: '查询网关配置失败' }, { status: 500 })
@@ -91,11 +150,23 @@ async function getCityConfigCount() {
 async function getCityNodeCount() {
     try {
         const result = await prisma.$queryRaw`
-            SELECT c.city, c.hash, c.label, COUNT(e.id) as count, c.offset
+                select c.city, c.hash, c.label, e.count, c.\`offset\`
-            FROM cityhash c
+                from
-            LEFT JOIN edge e ON c.id = e.city_id
+                    cityhash c
-            GROUP BY c.hash, c.city, c.label, c.offset
+                    left join (
-            ORDER BY count DESC
+                        select  city_id, count(*) as count
+                        from
+                            edge
+                        where
+                            edge.active is true
+                        group by 
+                            city_id
+                    ) e
+                    on c.id = e.city_id
+                group by
+                    c.hash
+                order by
+                    count desc
         `
         return NextResponse.json(safeSerialize(result))
     } catch (error) {
@@ -105,42 +176,47 @@ async function getCityNodeCount() {
 }
 
 // 城市分配状态
-async function getAllocationStatus() {
+async function getAllocationStatus(request: NextRequest) {
     try {
+        const { searchParams } = new URL(request.url)
+        const hours = searchParams.get('hours') || '24'
+        const hoursNum = parseInt(hours) || 24
+
         // 使用参数化查询防止SQL注入
         const result = await prisma.$queryRaw`
-           SELECT 
+            SELECT 
                 city, 
                 c1.count AS count, 
                 c2.assigned AS assigned
             FROM
                 cityhash
                 LEFT JOIN (
-                    SELECT 
+                SELECT 
-                        city_id, 
+                    city_id, 
-                        COUNT(*) AS count
+                    COUNT(*) AS count
-                    FROM
+                FROM
-                        edge
+                    edge
-                    WHERE
+                WHERE
-                        active = 1
+                    active = 1
-                    GROUP BY
+                GROUP BY
-                        city_id
+                    city_id
                 ) c1 ON c1.city_id = cityhash.id
                 LEFT JOIN (
-                    SELECT 
+                SELECT 
-                        city AS city_id, 
+                    city AS city_id, 
-                        COUNT(*) AS assigned
+                    COUNT(*) AS assigned
-                    FROM
+                FROM
-                        \`change\`
+                    \`change\`
-                    WHERE
+                WHERE
-                        time > NOW() - INTERVAL 1 DAY
+                    time > NOW() - INTERVAL ${hoursNum} HOUR
-                    GROUP BY
+                GROUP BY
-                        city
+                    city
                 ) c2 ON c2.city_id = cityhash.id
             WHERE
                 cityhash.macaddr IS NOT NULL;
-    `
+            `
         return NextResponse.json(safeSerialize(result))
+
     } catch (error) {
         console.error('Allocation status query error:', error)
         const errorMessage = error instanceof Error ? error.message : 'Unknown error'
@@ -155,18 +231,32 @@ async function getAllocationStatus() {
 async function getEdgeNodes(request: NextRequest) {
     try {
         const { searchParams } = new URL(request.url)
-        const threshold = searchParams.get('threshold') || '20'
+        const offset = parseInt(searchParams.get('offset') || '0')
-        const limit = searchParams.get('limit') || '100'
+        const limit = parseInt(searchParams.get('limit') || '100')
+        // 获取总数 - 使用类型断言
+        const totalCountResult = await prisma.$queryRaw<[{ total: bigint }]>`
+            SELECT COUNT(*) as total
+            FROM edge
+            WHERE active = true
+    `
+        const totalCount = Number(totalCountResult[0]?.total || 0)
 
-        // 使用参数化查询防止SQL注入
+        // 获取分页数据
         const result = await prisma.$queryRaw`
             SELECT edge.id, edge.macaddr, city, public, isp, single, sole, arch, online
             FROM edge
             LEFT JOIN cityhash ON cityhash.id = edge.city_id
-            WHERE edge.id > ${threshold} AND active = true
+            WHERE edge.active = true
-            LIMIT ${limit}
+            ORDER BY edge.id
-        `
+            LIMIT ${limit} OFFSET ${offset}
-        return NextResponse.json(safeSerialize(result))
+    `
+        return NextResponse.json({
+            data: safeSerialize(result),
+            totalCount: totalCount,
+            currentPage: Math.floor(offset / limit) + 1,
+            totalPages: Math.ceil(totalCount / limit)
+        })
+
     } catch (error) {
         console.error('Edge nodes query error:', error)
         return NextResponse.json({ error: '查询边缘节点失败' }, { status: 500 })

src/app/dashboard/components/allocationStatus.tsx

@@ -4,6 +4,7 @@ import { useEffect, useState, useCallback  } from 'react'
 import { formatNumber, validateNumber } from '@/lib/formatters'
 import LoadingCard from '@/components/ui/loadingCard'
 import ErrorCard from '@/components/ui/errorCard'
+import { Table, TableHeader, TableBody, TableHead, TableRow, TableCell } from '@/components/ui/table'
 
 interface AllocationStatus {
   city: string
@@ -22,58 +23,34 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
   const [data, setData] = useState<AllocationStatus[]>([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
-  const [timeFilter, setTimeFilter] = useState('24h') // 默认24小时
+  const [timeFilter, setTimeFilter] = useState('24') // 默认24小时
-  const [customTime, setCustomTime] = useState('')
+  const [customHours, setCustomHours] = useState('')
 
-  // 生成时间筛选条件
+  // 获取时间参数（小时数）
-  const getTimeCondition = useCallback(() => {
+  const getTimeHours = useCallback(() => {
-    if (timeFilter === 'custom' && customTime) {
-        // 将datetime-local格式转换为SQL datetime格式
-        return customTime.replace('T', ' ') + ':00'
-    }
-    const now = new Date()
-    let filterDate
     
-    switch(timeFilter) {
+    if (timeFilter === 'custom' && customHours) {
-      case '1h':
+      const hours = parseInt(customHours)
-        filterDate = new Date(now.getTime() - 60 * 60 * 1000)
+      return isNaN(hours) ? 24 : Math.max(1, hours) // 默认24小时，最少1小时
-        break
-      case '6h':
-        filterDate = new Date(now.getTime() - 6 * 60 * 60 * 1000)
-        break
-      case '12h':
-        filterDate = new Date(now.getTime() - 12 * 60 * 60 * 1000)
-        break
-      case '24h':
-        filterDate = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-        break
-      case '7d':
-        filterDate = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)
-        break
-      case 'fixed':
-        return '2025-08-24 11:27:00'
-      case 'custom':
-        if (customTime) {
-          return customTime
-        }
-        // 如果自定义时间为空，默认使用24小时
-        filterDate = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-        break
-      default:
-        filterDate = new Date(now.getTime() - 24 * 60 * 60 * 1000)
     }
     
-    return filterDate.toISOString().slice(0, 19).replace('T', ' ')
+    return parseInt(timeFilter) || 24 // 默认24小时
-  }, [timeFilter, customTime])
+  }, [timeFilter, customHours])
 
+  // 计算超额量
+  const calculateOverage = (assigned: number, count: number) => {
+    const overage = assigned - count;
+    return Math.max(0, overage); 
+  }
 
-    const fetchData = useCallback(async () => {
+  const fetchData = useCallback(async () => {
     try {
       setError(null)
       setLoading(true)
       
-      const timeCondition = getTimeCondition()
+      const hours = getTimeHours()
-      const response = await fetch(`/api/stats?type=allocation_status&time=${encodeURIComponent(timeCondition)}`)
+      
+      const response = await fetch(`/api/stats?type=allocation_status&hours=${hours}`)
       
       if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
       
@@ -86,14 +63,16 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
         assigned: validateNumber(item.assigned),
       }))
       
-      setData(validatedData)
+      const sortedData = validatedData.sort((a, b) => b.count - a.count)
+      
+      setData(sortedData)
     } catch (error) {
       console.error('Failed to fetch allocation status:', error)
       setError(error instanceof Error ? error.message : 'Unknown error')
     } finally {
       setLoading(false)
     }
-  }, [getTimeCondition])
+  }, [getTimeHours])
 
   useEffect(() => {
     fetchData()
@@ -102,10 +81,10 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
   if (loading) return <LoadingCard title="节点分配状态" />
   if (error) return <ErrorCard title="节点分配状态" error={error} onRetry={fetchData} />
 
-  const problematicCities = data.filter(item => item.count < item.count)
+  const problematicCities = data.filter(item => item.assigned > item.count)
 
   return (
-    <div className="bg-white shadow rounded-lg p-6">
+    <div className="flex flex-col bg-white shadow rounded-lg p-6 overflow-hidden ">
       <h2 className="text-lg font-semibold mb-4">节点分配状态</h2>
       
       {/* 时间筛选器 */}
@@ -116,23 +95,26 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
           onChange={(e) => setTimeFilter(e.target.value)}
           className="border rounded p-2"
         >
-          <option value="1h">最近1小时</option>
+          <option value="1">最近1小时</option>
-          <option value="6h">最近6小时</option>
+          <option value="6">最近6小时</option>
-          <option value="12h">最近12小时</option>
+          <option value="12">最近12小时</option>
-          <option value="24h">最近24小时</option>
+          <option value="24">最近24小时</option>
-          <option value="7d">最近7天</option>
+          <option value="168">最近7天</option>
-          <option value="custom">自定义时间</option>
+          <option value="custom">自定义小时</option>
         </select>
         
         {timeFilter === 'custom' && (
           <div className="flex items-center gap-2">
             <input
-              type="datetime-local"
+              type="number"
-              value={customTime}
+              min="1"
-              onChange={(e) => setCustomTime(e.target.value)}
+              max="720"
-              className="border rounded p-2"
+              value={customHours}
+              onChange={(e) => setCustomHours(e.target.value)}
+              placeholder="输入小时数"
+              className="border rounded p-2 w-24"
             />
-            <small>格式: YYYY-MM-DDTHH:MM</small>
+            <small>小时 (1-720)</small>
           </div>
         )}
         
@@ -140,45 +122,44 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
           onClick={fetchData}
           className="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600"
         >
-          刷新
+          查询
         </button>
       </div>
       
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
+      <div className='flex gap-6 overflow-hidden'>
-        <div className="bg-blue-50 p-4 rounded-lg">
+        <div className="flex  w-full">
-          <div className="text-2xl font-bold text-blue-600">{formatNumber(data.length)}</div>
+          <Table>
-          <div className="text-sm text-blue-800">监控城市数量</div>
+            <TableHeader>
-        </div>
+              <TableRow className="bg-gray-50">
-        <div className="bg-orange-50 p-4 rounded-lg">
+                <TableHead className="px-4 py-2 text-left">城市</TableHead>
-          <div className="text-2xl font-bold text-orange-600">{formatNumber(problematicCities.length)}</div>
+                <TableHead className="px-4 py-2 text-left">可用IP量</TableHead>
-          <div className="text-sm text-orange-800">需关注城市</div>
+                <TableHead className="px-4 py-2 text-left">分配IP量</TableHead>
-        </div>
+                <TableHead className="px-4 py-2 text-left">超额量</TableHead>
-      </div>
+              </TableRow>
-
+            </TableHeader>
-      {detailed && (
+            <TableBody>
-        <div className="overflow-x-auto">
-          <table className="min-w-full table-auto">
-            <thead>
-              <tr className="bg-gray-50">
-                <th className="px-4 py-2 text-left">城市</th>
-                <th className="px-4 py-2 text-left">可用IP量</th>
-                <th className="px-4 py-2 text-left">分配IP量</th>
-              </tr>
-            </thead>
-            <tbody>
               {data.map((item, index) => {
+                const overage = calculateOverage(item.assigned, item.count)
                 return (
-                  <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
+                  <TableRow 
-                    <td className="px-4 py-2">{item.city}</td>
+                    key={index} 
-                    <td className="px-4 py-2">{formatNumber(item.count)}</td>
+                    className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}
-                    <td className="px-4 py-2">{formatNumber(item.assigned)}</td>
+                  >
-                  </tr>
+                    <TableCell className="px-4 py-2">{item.city}</TableCell>
+                    <TableCell className="px-4 py-2">{formatNumber(item.count)}</TableCell>
+                    <TableCell className="px-4 py-2">{formatNumber(item.assigned)}</TableCell>
+                    <TableCell className="px-4 py-2">
+                      <span className={overage > 0 ? 'text-red-600 font-medium' : ''}>
+                        {formatNumber(overage)}
+                      </span>
+                    </TableCell>
+                  </TableRow>
                 )
               })}
-            </tbody>
+            </TableBody>
-          </table>
+          </Table>
         </div>
-      )}
+      </div>
     </div>
   )
 }

src/app/dashboard/components/cityNodeStats.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { useEffect, useState } from 'react'
+import { Table, TableHeader, TableBody, TableHead, TableRow, TableCell } from '@/components/ui/table'
 
 interface CityNode {
   city: string
@@ -32,7 +33,7 @@ export default function CityNodeStats() {
 
   if (loading) {
     return (
-      <div className="bg-white rounded-lg p-6">
+      <div className="bg-white rounded-lg p-6 overflow-hidden">
         <h2 className="text-lg font-semibold mb-4">城市节点数量分布</h2>
         <div className="text-gray-600">加载中...</div>
       </div>
@@ -40,7 +41,7 @@ export default function CityNodeStats() {
   }
 
   return (
-    <div className="bg-white rounded-lg p-6">
+    <div className="flex flex-col bg-white rounded-lg p-6 overflow-hidden">
       <div className="flex justify-between items-center mb-4">
         <h2 className="text-lg font-semibold">城市节点数量分布</h2>
         <span className="text-sm text-gray-500">
@@ -48,35 +49,37 @@ export default function CityNodeStats() {
         </span>
       </div>
 
-      <div className="overflow-x-auto">
+      <div className="flex overflow-hidden ">
-        <table className="w-full">
+        <div className='flex w-full'>
-          <thead>
+          <Table>
-            <tr className="border-b border-gray-200">
+            <TableHeader>
-              <th className="px-4 py-2 text-left text-sm font-medium text-gray-600">城市</th>
+              <TableRow className="bg-gray-50">
-              <th className="px-4 py-2 text-left text-sm font-medium text-gray-600">节点数量</th>
+                <TableHead className="px-4 py-2 text-left font-medium text-gray-600">城市</TableHead>
-              <th className="px-4 py-2 text-left text-sm font-medium text-gray-600">Hash</th>
+                <TableHead className="px-4 py-2 text-left font-medium text-gray-600">节点数量</TableHead>
-              <th className="px-4 py-2 text-left text-sm font-medium text-gray-600">标签</th>
+                <TableHead className="px-4 py-2 text-left font-medium text-gray-600">Hash</TableHead>
-              <th className="px-4 py-2 text-left text-sm font-medium text-gray-600">轮换顺位</th>
+                <TableHead className="px-4 py-2 text-left font-medium text-gray-600">标签</TableHead>
-            </tr>
+                <TableHead className="px-4 py-2 text-left font-medium text-gray-600">轮换顺位</TableHead>
-          </thead>
+              </TableRow>
-          <tbody>
+            </TableHeader>
-            {data.map((item, index) => (
+            <TableBody>
-              <tr key={index} className="border-b border-gray-100 hover:bg-gray-50">
+              {data.map((item, index) => (
-                <td className="px-4 py-3 text-sm font-medium">{item.city}</td>
+                <TableRow 
-                <td className="px-4 py-3 text-sm">
+                  key={index} 
-                  <span className="font-semibold text-gray-700">{item.count}</span>
+                  className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}
-                </td>
+                >
-                <td className="px-4 py-3 text-sm text-gray-500 font-mono">{item.hash}</td>
+                  <TableCell className="px-4 py-2">{item.city}</TableCell>
-                <td className="px-4 py-3 text-sm">
+                  <TableCell className="px-4 py-2">{item.count}</TableCell>
-                  <span className="bg-gray-100 px-2 py-1 rounded text-gray-700">
+                  <TableCell className="px-4 py-2">{item.hash}</TableCell>
-                    {item.label}
+                  <TableCell className="px-4 py-2">
-                  </span>
+                    <span className="bg-gray-100 px-2 py-1 rounded text-gray-700">
-                </td>
+                    {item.label}</span>
-                <td className="px-4 py-3 text-sm font-semibold">{item.offset}</td>
+                    </TableCell>
-              </tr>
+                  <TableCell className="px-4 py-2">{item.offset}</TableCell>
-            ))}
+                </TableRow>
-          </tbody>
+              ))}
-        </table>
+            </TableBody>
+        </Table>
+        </div>
       </div>
     </div>
   )

src/app/dashboard/components/edge.tsx

@@ -2,14 +2,8 @@
 
 import { useEffect, useState } from 'react'
 import { validateNumber } from '@/lib/formatters'
-import {
+import { Pagination } from '@/components/ui/pagination'
-  Pagination,
+import { Table, TableHeader, TableBody, TableHead, TableRow, TableCell } from '@/components/ui/table'
-  PaginationContent,
-  PaginationItem,
-  PaginationLink,
-  PaginationNext,
-  PaginationPrevious,
-} from "@/components/ui/pagination"
 
 interface Edge {
   id: number
@@ -27,28 +21,28 @@ export default function Edge() {
   const [data, setData] = useState<Edge[]>([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
-  const [idThreshold, setIdThreshold] = useState(20)
-  const [limit, setLimit] = useState(100)
   
   // 分页状态
   const [currentPage, setCurrentPage] = useState(1)
-  const [itemsPerPage, setItemsPerPage] = useState(10)
+  const [itemsPerPage, setItemsPerPage] = useState(100) // 默认100条
   const [totalItems, setTotalItems] = useState(0)
 
   useEffect(() => {
     fetchData()
-  }, [])
+  }, [currentPage, itemsPerPage]) // 监听页码和每页数量的变化
 
-  const fetchData = async (threshold: number = idThreshold, resultLimit: number = limit) => {
+  const fetchData = async () => {
     try {
       setError(null)
       setLoading(true)
       
-      const response = await fetch(`/api/stats?type=edge_nodes&threshold=${threshold}&limit=${resultLimit}`)
+      // 计算偏移量
+      const offset = (currentPage - 1) * itemsPerPage
+      
+      const response = await fetch(`/api/stats?type=edge_nodes&offset=${offset}&limit=${itemsPerPage}`)
       if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
       
       const result = await response.json()
-
       type ResultEdge = {
         id: number
         macaddr: string
@@ -61,21 +55,20 @@ export default function Edge() {
         online: number
       }
 
-      const validatedData = (result as ResultEdge[]).map((item) => ({
+      const validatedData = (result.data as ResultEdge[]).map((item) => ({
         id: validateNumber(item.id),
         macaddr: item.macaddr || '',
         city: item.city || '',
         public: item.public || '',
         isp: item.isp || '',
-        single: item.single === 1 || item.single === true,
+        single: item.single,
-        sole: item.sole === 1 || item.sole === true,
+        sole: item.sole,
         arch: validateNumber(item.arch),
         online: validateNumber(item.online)
       }))
       
       setData(validatedData)
-      setTotalItems(validatedData.length)
+      setTotalItems(result.totalCount || 0)
-      setCurrentPage(1) // 重置到第一页
     } catch (error) {
       console.error('Failed to fetch edge nodes:', error)
       setError(error instanceof Error ? error.message : '获取边缘节点数据失败')
@@ -84,13 +77,66 @@ export default function Edge() {
     }
   }
 
-  const handleSubmit = (e: React.FormEvent) => {
+// 多IP节点格式化
-    e.preventDefault()
+const formatMultiIP = (value: number | boolean): string => {
-    fetchData(idThreshold, limit)
+  if (typeof value === 'number') {
+    switch (value) {
+      case 1: return '是'
+      case 0: return '否'
+      case -1: return '未知'
+      default: return `未知 (${value})`
+    }
+  }
+  return value ? '是' : '否'
+}
+
+// 独享IP节点格式化
+const formatExclusiveIP = (value: number | boolean): string => {
+  if (typeof value === 'number') {
+    return value === 1 ? '是' : '否'
+  }
+  return value ? '是' : '否'
+}
+
+// 多IP节点颜色
+const getMultiIPColor = (value: number | boolean): string => {
+  if (typeof value === 'number') {
+    switch (value) {
+      case 1: return 'bg-red-100 text-red-800'
+      case 0: return 'bg-green-100 text-green-800'
+      case -1: return 'bg-gray-100 text-gray-800'
+      default: return 'bg-gray-100 text-gray-800'
+    }
+  }
+  return value ? 'bg-red-100 text-red-800' : 'bg-green-100 text-green-800'
+}
+
+// 独享IP节点颜色
+const getExclusiveIPColor = (value: number | boolean): string => {
+  if (typeof value === 'number') {
+    return value === 1 ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800'
+  }
+  return value ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800'
+}
+
+  const formatArchType = (arch: number): string => {
+    switch (arch) {
+      case 0: return '一代'
+      case 1: return '二代'
+      case 2: return 'AMD64'
+      case 3: return 'x86'
+      default: return `未知 (${arch})`
+    }
   }
 
-  const formatBoolean = (value: boolean | number): string => {
+  const getArchColor = (arch: number): string => {
-    return value ? '是' : '否'
+    switch (arch) {
+      case 0: return 'bg-blue-100 text-blue-800'
+      case 1: return 'bg-green-100 text-green-800'
+      case 2: return 'bg-purple-100 text-purple-800'
+      case 3: return 'bg-orange-100 text-orange-800'
+      default: return 'bg-gray-100 text-gray-800'
+    }
   }
 
   const formatOnlineTime = (seconds: number): string => {
@@ -100,42 +146,15 @@ export default function Edge() {
     return `${Math.floor(seconds / 86400)}天`
   }
 
-  // 计算分页数据
+  // 处理页码变化
-  const indexOfLastItem = currentPage * itemsPerPage
+  const handlePageChange = (page: number) => {
-  const indexOfFirstItem = indexOfLastItem - itemsPerPage
+    setCurrentPage(page)
-  const currentItems = data.slice(indexOfFirstItem, indexOfLastItem)
+  }
-  const totalPages = Math.ceil(totalItems / itemsPerPage)
 
-  // 生成页码按钮
+  // 处理每页显示数量变化
-  const renderPageNumbers = () => {
+  const handleSizeChange = (size: number) => {
-    const pageNumbers = []
+    setItemsPerPage(size)
-    const maxVisiblePages = 5
+    setCurrentPage(1) // 重置到第一页
-    
-    let startPage = Math.max(1, currentPage - Math.floor(maxVisiblePages / 2))
-    const endPage = Math.min(totalPages, startPage + maxVisiblePages - 1)
-    
-    if (endPage - startPage + 1 < maxVisiblePages) {
-      startPage = Math.max(1, endPage - maxVisiblePages + 1)
-    }
-    
-    for (let i = startPage; i <= endPage; i++) {
-      pageNumbers.push(
-        <PaginationItem key={i}>
-          <PaginationLink
-            href="#"
-            isActive={currentPage === i}
-            onClick={(e) => {
-              e.preventDefault()
-              setCurrentPage(i)
-            }}
-          >
-            {i}
-          </PaginationLink>
-        </PaginationItem>
-      )
-    }
-    
-    return pageNumbers
   }
 
   if (loading) return (
@@ -159,58 +178,7 @@ export default function Edge() {
   )
 
   return (
-    <div className="bg-white shadow rounded-lg p-6">
+    <div className="flex bg-white flex-col shadow overflow-hidden rounded-lg p-6">
-      <div className="flex justify-between items-center mb-6">
-        <h2 className="text-xl font-semibold text-gray-800">节点列表</h2>
-        <button
-          onClick={() => fetchData()}
-          className="px-4 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600 transition-colors"
-        >
-          刷新数据
-        </button>
-      </div>
-
-      {/* 查询表单 */}
-      <form onSubmit={handleSubmit} className="bg-gray-50 p-4 rounded-lg mb-6">
-        <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-          <div>
-            <label htmlFor="threshold" className="block text-sm font-medium text-gray-700 mb-1">
-              ID阈值 (ID大于此值)
-            </label>
-            <input
-              id="threshold"
-              type="number"
-              value={idThreshold}
-              onChange={(e) => setIdThreshold(Number(e.target.value))}
-              min="0"
-              className="w-full px-3 py-2 border border-gray-300 rounded-md focus:ring-blue-500 focus:border-blue-500"
-            />
-          </div>
-          <div>
-            <label htmlFor="limit" className="block text-sm font-medium text-gray-700 mb-1">
-              返回结果数量
-            </label>
-            <input
-              id="limit"
-              type="number"
-              value={limit}
-              onChange={(e) => setLimit(Number(e.target.value))}
-              min="1"
-              max="1000"
-              className="w-full px-3 py-2 border border-gray-300 rounded-md focus:ring-blue-500 focus:border-blue-500"
-            />
-          </div>
-          <div className="flex items-end">
-            <button
-              type="submit"
-              className="px-6 py-2 bg-green-600 text-white font-medium rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2"
-            >
-              查询
-            </button>
-          </div>
-        </div>
-      </form>
-
       {data.length === 0 ? (
         <div className="text-center py-12">
           <div className="text-gray-400 text-4xl mb-4">📋</div>
@@ -218,135 +186,69 @@ export default function Edge() {
         </div>
       ) : (
         <>
-          <div className="bg-blue-50 p-4 rounded-lg mb-6">
+          <div className='flex gap-6 overflow-hidden'>
-            <p className="text-blue-800">
+            <div className="flex-3 w-full overflow-y-auto">
-              共找到 <span className="font-bold">{totalItems}</span> 个节点
+              <Table>
-              {idThreshold > 0 && ` (ID大于${idThreshold})`}
+                <TableHeader>
-            </p>
+                  <TableRow className="bg-gray-50">
-          </div>
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">MAC地址</TableHead>
-          
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">城市</TableHead>
-          {/* 每页显示数量选择器 */}
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">公网IP</TableHead>
-          <div className="flex justify-between items-center mb-4">
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">运营商</TableHead>
-            <div className="flex items-center space-x-2">
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">多IP节点</TableHead>
-              <span className="text-sm text-gray-700">每页显示</span>
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">独享IP</TableHead>
-              <select
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">设备类型</TableHead>
-                value={itemsPerPage}
+                    <TableHead className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">在线时长</TableHead>
-                onChange={(e) => {
+                  </TableRow>
-                  setItemsPerPage(Number(e.target.value))
+                </TableHeader>
-                  setCurrentPage(1)
+                <TableBody>
-                }}
+                  {data.map((item, index) => (
-                className="border border-gray-300 rounded-md px-2 py-1 text-sm"
+                    <TableRow key={item.id} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
-              >
+                      <TableCell className="px-4 py-3 text-sm font-mono text-blue-600">{item.macaddr}</TableCell>
-                <option value="10">10</option>
+                      <TableCell className="px-4 py-3 text-sm text-gray-700">{item.city}</TableCell>
-                <option value="20">20</option>
+                      <TableCell className="px-4 py-3 text-sm font-mono text-green-600">{item.public}</TableCell>
-                <option value="50">50</option>
+                      <TableCell className="px-4 py-3 text-sm text-gray-700">
-                <option value="100">100</option>
+                        <span className={`px-2 py-1 rounded-full text-xs ${
-              </select>
+                          item.isp === '移动' ? 'bg-blue-100 text-blue-800' :
-              <span className="text-sm text-gray-700">条</span>
+                          item.isp === '电信' ? 'bg-purple-100 text-purple-800' :
+                          item.isp === '联通' ? 'bg-red-100 text-red-800' :
+                          'bg-gray-100 text-gray-800'
+                        }`}>
+                          {item.isp}
+                        </span>
+                      </TableCell>
+                      <TableCell className="px-4 py-3 text-sm text-center">
+                        <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${getMultiIPColor(item.single)}`}>
+                          {formatMultiIP(item.single)}
+                        </span>
+                      </TableCell>
+                      <TableCell className="px-4 py-3 text-sm text-center">
+                        <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${getExclusiveIPColor(item.sole)}`}>
+                          {formatExclusiveIP(item.sole)}
+                        </span>
+                      </TableCell>
+                      <TableCell className="px-4 py-3 text-sm text-center">
+                        <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${getArchColor(item.arch)}`}>
+                          {formatArchType(item.arch)}
+                        </span>
+                      </TableCell>
+                      <TableCell className="px-4 py-3 text-sm text-gray-700">{formatOnlineTime(item.online)}</TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
             </div>
           </div>
           
-          <div className="overflow-x-auto rounded-lg shadow mb-4">
+          {/* 分页 */}
-            <table className="min-w-full table-auto border-collapse">
+          <Pagination
-              <thead>
+            page={currentPage}
-                <tr className="bg-gray-100">
+            size={itemsPerPage}
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">ID</th>
+            total={totalItems}
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">MAC地址</th>
+            onPageChange={handlePageChange}
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">城市</th>
+            onSizeChange={handleSizeChange}
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">公网IP</th>
+            className="mt-4"
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">运营商</th>
+          />
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">多IP节点</th>
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">独享IP</th>
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">设备类型</th>
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-700 uppercase tracking-wider">在线时长</th>
-                </tr>
-              </thead>
-              <tbody className="bg-white divide-y divide-gray-200">
-                {currentItems.map((item, index) => (
-                  <tr 
-                    key={item.id} 
-                    className={`hover:bg-gray-50 transition-colors ${index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}`}
-                  >
-                    <td className="px-4 py-3 text-sm text-gray-900">{item.id}</td>
-                    <td className="px-4 py-3 text-sm font-mono text-blue-600">{item.macaddr}</td>
-                    <td className="px-4 py-3 text-sm text-gray-700">{item.city}</td>
-                    <td className="px-4 py-3 text-sm font-mono text-green-600">{item.public}</td>
-                    <td className="px-4 py-3 text-sm text-gray-700">
-                      <span className={`px-2 py-1 rounded-full text-xs ${
-                        item.isp === '移动' ? 'bg-blue-100 text-blue-800' :
-                        item.isp === '电信' ? 'bg-purple-100 text-purple-800' :
-                        item.isp === '联通' ? 'bg-red-100 text-red-800' :
-                        'bg-gray-100 text-gray-800'
-                      }`}>
-                        {item.isp}
-                      </span>
-                    </td>
-                    <td className="px-4 py-3 text-sm text-center">
-                      <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${
-                        item.single ? 'bg-red-100 text-red-800' : 'bg-green-100 text-green-800'
-                      }`}>
-                        {formatBoolean(item.single)}
-                      </span>
-                    </td>
-                    <td className="px-4 py-3 text-sm text-center">
-                      <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${
-                        item.sole ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800'
-                      }`}>
-                        {formatBoolean(item.sole)}
-                      </span>
-                    </td>
-                    <td className="px-4 py-3 text-sm text-center">
-                      <span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800">
-                        {item.arch}
-                      </span>
-                    </td>
-                    <td className="px-4 py-3 text-sm text-gray-700">
-                      {formatOnlineTime(item.online)}
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-
-          {/* 分页控件 */}
-          <div className="flex justify-between items-center mt-4">
-            <div className="text-sm text-gray-600">
-              显示 {indexOfFirstItem + 1} 到 {Math.min(indexOfLastItem, totalItems)} 条，共 {totalItems} 条记录
-            </div>
-            
-            <Pagination>
-              <PaginationContent>
-                <PaginationItem>
-                  <PaginationPrevious
-                    href="#"
-                    onClick={(e) => {
-                      e.preventDefault()
-                      if (currentPage > 1) setCurrentPage(currentPage - 1)
-                    }}
-                    className={currentPage === 1 ? "pointer-events-none opacity-50" : ""}
-                  />
-                </PaginationItem>
-                
-                {renderPageNumbers()}
-                
-                <PaginationItem>
-                  <PaginationNext
-                    href="#"
-                    onClick={(e) => {
-                      e.preventDefault()
-                      if (currentPage < totalPages) setCurrentPage(currentPage + 1)
-                    }}
-                    className={currentPage === totalPages ? "pointer-events-none opacity-50" : ""}
-                  />
-                </PaginationItem>
-              </PaginationContent>
-            </Pagination>
-            
-            <div className="text-sm text-gray-600">
-              更新时间: {new Date().toLocaleTimeString()}
-            </div>
-          </div>
         </>
       )}
     </div>

src/app/dashboard/components/gatewayConfig.tsx

@@ -1,9 +1,10 @@
 'use client'
 import { useEffect, useState, Suspense } from 'react'
 import { useSearchParams } from 'next/navigation'
+import { Table, TableHeader, TableBody, TableHead, TableRow, TableCell } from '@/components/ui/table'
+import { Pagination } from '@/components/ui/pagination'
 
 interface GatewayConfig {
-  id: number
   city: string
   edge: string
   user: string  
@@ -13,77 +14,83 @@ interface GatewayConfig {
   isonline: number   
 }
 
+interface ApiResponse {
+  data: GatewayConfig[]
+  totalCount: number
+  currentPage: number
+  totalPages: number
+}
+
 function GatewayConfigContent() {
   const [data, setData] = useState<GatewayConfig[]>([]) 
   const [loading, setLoading] = useState(false) 
   const [macAddress, setMacAddress] = useState('')
   const [error, setError] = useState('')
-  const [success, setSuccess] = useState('')
   const searchParams = useSearchParams()
+  
+  // 分页状态
+  const [currentPage, setCurrentPage] = useState(1)
+  const [itemsPerPage, setItemsPerPage] = useState(100)
+  const [totalItems, setTotalItems] = useState(0)
 
-  // 监听URL的mac参数变化：同步到输入框并触发查询
+  // 判断是否为MAC地址查询（用于控制分页显示）
+  const isMacQuery = !!macAddress
+
+  // 监听URL的mac参数变化
   useEffect(() => {
     const urlMac = searchParams.get('mac')
     if (urlMac) {
-      setMacAddress(urlMac) 
+      setMacAddress(urlMac)
-      fetchData(urlMac)
+      setCurrentPage(1) // 重置到第一页
+      fetchData(urlMac, 1, itemsPerPage)
     } else {
-      // 如果没有mac参数，显示空状态或默认查询
+      setMacAddress('')
-      setData([])
+      setCurrentPage(1) // 重置到第一页
-      setSuccess('请输入MAC地址查询网关配置信息')
+      fetchData('', 1, itemsPerPage)
     }
   }, [searchParams])
 
-  const fetchData = async (mac: string) => {
+  const fetchData = async (mac: string, page: number = 1, limit: number = itemsPerPage) => {
-    if (!mac.trim()) {
-      setError('请输入MAC地址')
-      setSuccess('')
-      setData([])
-      return
-    }
-    
     setLoading(true)
     setError('')
-    setSuccess('')
+    
     try {
-      const response = await fetch(`/api/stats?type=gateway_config&mac=${encodeURIComponent(mac)}`)
+      // 计算偏移量
-      const result = await response.json()
+      const offset = (page - 1) * limit
       
-      if (!response.ok) {
+      // 构建API URL
-        throw new Error(result.error || '查询失败')
+      let apiUrl = `/api/stats?type=gateway_config&offset=${offset}&limit=${limit}`
+      if (mac.trim()) {
+        apiUrl += `&mac=${encodeURIComponent(mac)}`
       }
       
+      const response = await fetch(apiUrl)
+      if (!response.ok) {
+        throw new Error(`HTTP错误! 状态: ${response.status}`)
+      }
+      
+      const result: ApiResponse = await response.json()
+      
       // 检查返回的数据是否有效
-      if (!result || result.length === 0) {
+      if (!result.data || result.data.length === 0) {
-        setError(`未找到MAC地址为 ${mac} 的网关配置信息`)
+        if (mac.trim()) {
+          setError(`未找到MAC地址为 ${mac} 的网关配置信息`)
+        } else {
+          setError('未找到任何网关配置信息')
+        }
         setData([])
+        setTotalItems(0)
         return
       }
       
-      const validatedData = result.map((item: { 
+      setData(result.data)
-        city: string 
-        edge: string
-        user: string 
-        public: string
-        inner_ip: string 
-        ischange: number 
-        isonline: number  
-      }) => ({
-        city: item.city,
-        edge: item.edge,
-        user: item.user,
-        public: item.public,
-        inner_ip: item.inner_ip,
-        ischange: item.ischange,
-        isonline: item.isonline,
-      }))
       
-      setData(validatedData)
+      setTotalItems(result.totalCount || 0)
-      setSuccess(`成功查询到 ${validatedData.length} 条网关配置信息`)
     } catch (error) {
-      console.error('Failed to fetch gateway config:', error)
+      console.error('获取网关配置失败:', error)
       setError(error instanceof Error ? error.message : '获取网关配置失败')
       setData([])
+      setTotalItems(0)
     } finally {
       setLoading(false)
     }
@@ -91,54 +98,60 @@ function GatewayConfigContent() {
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault()
-    if (macAddress.trim()) {
+    setCurrentPage(1) // 重置到第一页
-      fetchData(macAddress)
+    fetchData(macAddress, 1, itemsPerPage)
-    }
+  }
+
+  // 处理页码变化
+  const handlePageChange = (page: number) => {
+    setCurrentPage(page)
+    fetchData(macAddress, page, itemsPerPage)
+  }
+
+  // 处理每页显示数量变化
+  const handleSizeChange = (size: number) => {
+    setItemsPerPage(size)
+    setCurrentPage(1)
+    fetchData(macAddress, 1, size)
   }
 
   const getStatusBadge = (value: number, trueText: string = '是', falseText: string = '否') => {
+    // 0是正常1是更新，正常（绿）+ 更新（红）
     return (
       <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${
-        value === 1 
+        value === 0 ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800'}`}>
-          ? 'bg-green-100 text-green-800' 
+        {value === 0 ? trueText : falseText}
-          : 'bg-red-100 text-red-800'
-      }`}>
-        {value === 1 ? trueText : falseText}
       </span>
     )
   }
 
   const getOnlineStatus = (isonline: number) => {
+    // 0是空闲1是在用，在用（红）+ 空闲（绿）
     return (
       <div className="flex items-center">
-        <div className={`w-2 h-2 rounded-full mr-2 ${
+        <div className={`${isonline === 0 ? 'bg-green-500' : 'bg-red-500'}`} />
-          isonline === 1 ? 'bg-green-500' : 'bg-red-500'
+        {getStatusBadge(isonline, '空闲', '在用')}
-        }`} />
-        {getStatusBadge(isonline, '在线', '离线')}
       </div>
     )
   }
 
   return (
-    <div className="bg-white shadow rounded-lg p-6">
+    <div className="flex flex-col bg-white shadow rounded-lg p-6 overflow-hidden">
       <div className="flex justify-between items-start mb-6">
         <div>
           <h2 className="text-xl font-semibold text-gray-800">网关配置状态</h2>
           <p className="text-sm text-gray-600 mt-1">查询和管理网关设备的配置信息</p>
         </div>
-        <div className="text-sm text-gray-500">
-          更新时间: {new Date().toLocaleTimeString()}
-        </div>
       </div>
       
       {/* 查询表单 */}
       <form onSubmit={handleSubmit} className="mb-6">
-        <div className="flex items-center">
+        <div className="flex items-center gap-2">
           <input
             type="text"
             value={macAddress}
             onChange={(e) => setMacAddress(e.target.value)}
-            placeholder="请输入MAC地址"
+            placeholder="输入MAC地址查询"
             className="px-4 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
           />
           <button
@@ -159,17 +172,6 @@ function GatewayConfigContent() {
             </div>
           </div>
         )}
-        
-        {success && !error && (
-          <div className="mt-4 p-3 bg-green-50 border border-green-200 rounded-md">
-            <div className="flex items-center text-green-800">
-              <svg className="w-5 h-5 mr-2" fill="currentColor" viewBox="0 0 20 20">
-                <path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clipRule="evenodd" />
-              </svg>
-              {success}
-            </div>
-          </div>
-        )}
       </form>
       
       {loading ? (
@@ -178,103 +180,86 @@ function GatewayConfigContent() {
           <p className="text-gray-600">正在查询网关配置信息...</p>
         </div>
       ) : data.length > 0 ? (
-        <>
+        <>  
-          {/* 统计卡片 */}
+          <div className='flex gap-6 overflow-hidden'>
-          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+            <div className="flex-3 w-full flex">
-            <div className="bg-blue-50 p-4 rounded-lg border border-blue-100">
+              <Table>
-              <div className="text-2xl font-bold text-blue-600">{data.length}</div>
+                <TableHeader>
-              <div className="text-sm text-blue-800">网关数量</div>
+                  <TableRow className="bg-gray-50">
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">城市</TableHead>
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">MAC地址</TableHead>
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">IP地址</TableHead>
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">线路</TableHead>
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">端口</TableHead>
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">配置更新</TableHead>
+                    <TableHead className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">在用状态</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {data.map((item, index) => (
+                    <TableRow key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
+                      <TableCell>
+                        <span className="px-2 py-1 bg-gray-100 text-gray-700 rounded-full text-xs">
+                          {item.city}
+                        </span>
+                      </TableCell>
+                      <TableCell>
+                        <div className="font-mono text-sm text-blue-600 font-medium">{item.edge}</div>
+                      </TableCell>
+                      <TableCell>
+                        <div className="font-mono text-sm text-green-600">{item.public}</div>
+                      </TableCell>
+                      <TableCell className="text-sm text-gray-900">{item.user}</TableCell>
+                      <TableCell>
+                        <div className="font-mono text-sm text-purple-600">{item.inner_ip}</div>
+                      </TableCell>
+                      <TableCell>
+                        {getStatusBadge(item.ischange, '正常', '更新')}
+                      </TableCell>
+                      <TableCell>
+                        {getOnlineStatus(item.isonline)}
+                      </TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
             </div>
-            <div className="bg-green-50 p-4 rounded-lg border border-green-100">
+            <div className="flex flex-1 flex-col gap-4 mb-6">
-              <div className="text-2xl font-bold text-green-600">
+              <div className="bg-blue-50 p-4 rounded-lg border border-blue-100">
-                {data.filter(item => item.isonline === 1).length}
+                <div className="text-2xl font-bold text-blue-600">{totalItems}</div>
+                <div className="text-sm text-blue-800">配置条数</div>
               </div>
-              <div className="text-sm text-green-800">在线网关</div>
+              <div className="bg-green-50 p-4 rounded-lg border border-green-100">
-            </div>
+                <div className="text-2xl font-bold text-green-600">
-            <div className="bg-orange-50 p-4 rounded-lg border border-orange-100">
+                  {data.filter(item => item.isonline === 1).length}
-              <div className="text-2xl font-bold text-orange-600">
+                </div>
-                {data.filter(item => item.ischange === 1).length}
+                <div className="text-sm text-green-800">在用节点</div>
               </div>
-              <div className="text-sm text-orange-800">已更新配置</div>
+              <div className="bg-orange-50 p-4 rounded-lg border border-orange-100">
-            </div>
+                <div className="text-2xl font-bold text-orange-600">
-            <div className="bg-purple-50 p-4 rounded-lg border border-purple-100">
+                  {data.filter(item => item.ischange === 1).length}
-              <div className="text-2xl font-bold text-purple-600">
+                </div>
-                {new Set(data.map(item => item.city)).size}
+                <div className="text-sm text-orange-800">需要更新</div>
               </div>
-              <div className="text-sm text-purple-800">覆盖城市</div>
             </div>
           </div>
-
+          
-          {/* 详细表格 */}
+          {/* 分页组件 - 仅在非MAC查询时显示 */}
-          <div className="overflow-hidden rounded-lg shadow-sm border border-gray-200">
+          {!isMacQuery && (
-            <table className="min-w-full divide-y divide-gray-200">
+            <Pagination
-              <thead className="bg-gray-50"> 
+              page={currentPage}
-                <tr>
+              size={itemsPerPage}
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">MAC地址</th>
+              total={totalItems}
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">城市</th>
+              onPageChange={handlePageChange}
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">内部账号</th>
+              onSizeChange={handleSizeChange}
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">IP地址</th>
+              className="mt-4"
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">内网入口</th>
+            />
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">配置更新</th>
+          )}
-                  <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">在线状态</th>
-                </tr>
-              </thead>
-              <tbody className="bg-white divide-y divide-gray-200">
-                {data.map((item, index) => (
-                  <tr key={index} className="hover:bg-gray-50 transition-colors">
-                    <td className="px-6 py-4 whitespace-nowrap">
-                      <div className="font-mono text-sm text-blue-600 font-medium">
-                        {item.edge}
-                      </div>
-                    </td>
-                    <td className="px-6 py-4 whitespace-nowrap">
-                      <span className="px-2 py-1 bg-gray-100 text-gray-700 rounded-full text-xs">
-                        {item.city}
-                      </span>
-                    </td>
-                    <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
-                      {item.user}
-                    </td>
-                    <td className="px-6 py-4 whitespace-nowrap">
-                      <div className="font-mono text-sm text-green-600">
-                        {item.public}
-                      </div>
-                    </td>
-                    <td className="px-6 py-4 whitespace-nowrap">
-                      <div className="font-mono text-sm text-purple-600">
-                        {item.inner_ip}
-                      </div>
-                    </td>
-                    <td className="px-6 py-4 whitespace-nowrap">
-                      {getStatusBadge(item.ischange, '已更新', '未更新')}
-                    </td>
-                    <td className="px-6 py-4 whitespace-nowrap">
-                      {getOnlineStatus(item.isonline)}
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-
-          {/* 分页信息 */}
-          <div className="mt-4 flex justify-between items-center text-sm text-gray-600">
-            <span>显示 1 到 {data.length} 条，共 {data.length} 条记录</span>
-            <button
-              onClick={() => fetchData(macAddress)}
-              className="px-3 py-1 bg-gray-100 hover:bg-gray-200 rounded-md transition-colors"
-            >
-              刷新数据
-            </button>
-          </div>
         </>
       ) : (
         <div className="text-center py-12">
-          <div className="text-gray-400 text-4xl mb-4">🔍</div>
+          <div className="text-gray-400 text-4xl mb-4">📋</div>
-          <p className="text-gray-600">暂无数据，请输入MAC地址查询网关配置信息</p>
+          <p className="text-gray-600">暂无网关配置数据</p>
-          <p className="text-sm text-gray-500 mt-2">
-            您可以通过上方的搜索框查询特定MAC地址的网关配置
-          </p>
         </div>
       )}
     </div>

src/app/dashboard/components/gatewayinfo.tsx

@@ -2,6 +2,12 @@
 
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
+import { Table, TableHeader, TableBody, TableHead, TableRow, TableCell } from '@/components/ui/table'
+import { Form, FormField } from '@/components/ui/form'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { z } from 'zod'
+import { useForm } from 'react-hook-form'
+import { zodResolver } from '@hookform/resolvers/zod'
 
 interface GatewayInfo {
   macaddr: string
@@ -10,29 +16,74 @@ interface GatewayInfo {
   enable: number
 }
 
+const filterSchema = z.object({
+  status: z.string(),
+})
+
+type FilterSchema = z.infer<typeof filterSchema>
+
+// IP地址排序函数
+const sortByIpAddress = (a: string, b: string): number => {
+  const ipToNumber = (ip: string): number => {
+    const parts = ip.split('.').map(part => parseInt(part, 10));
+    return (parts[0] << 24) + (parts[1] << 16) + (parts[2] << 8) + parts[3];
+  };
+  
+  return ipToNumber(a) - ipToNumber(b);
+}
+
 export default function Gatewayinfo() {
   const [data, setData] = useState<GatewayInfo[]>([])
+  const [filteredData, setFilteredData] = useState<GatewayInfo[]>([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState('')
-  const router = useRouter() 
+  const router = useRouter()
   
+  const form = useForm<FilterSchema>({
+    resolver: zodResolver(filterSchema),
+    defaultValues: {
+      status: '1',
+    },
+  })
+  
+  const { watch } = form
+  const statusFilter = watch('status')
+
   useEffect(() => {
     fetchData()
   }, [])
 
+useEffect(() => {
+  if (!data.length) return
+  
+  if (statusFilter === 'all') {
+    setFilteredData(data)
+  } else {
+    const enableValue = parseInt(statusFilter)
+    // 添加 NaN 检查
+    if (isNaN(enableValue)) {
+      setFilteredData(data)
+    } else {
+      setFilteredData(data.filter(item => item.enable === enableValue))
+    }
+  }
+}, [data, statusFilter])
+
   const fetchData = async () => {
     try {
       setLoading(true)
       setError('')
       const response = await fetch('/api/stats?type=gateway_info')
-      
       if (!response.ok) {
         throw new Error('获取网关信息失败')
       }
-      
       const result = await response.json()
-      
+      // const sortedData =  result.sort(( a,  b) => Number(a.inner_ip) - Number(b.inner_ip))
-      setData(result)
+      const sortedData = result.sort((a: GatewayInfo, b: GatewayInfo) => 
+        sortByIpAddress(a.inner_ip, b.inner_ip)
+      )
+      setData(sortedData)
+      setFilteredData(sortedData) // 初始化时设置filteredData
     } catch (error) {
       console.error('Failed to fetch gateway info:', error)
       setError(error instanceof Error ? error.message : '获取网关信息失败')
@@ -53,7 +104,7 @@ export default function Gatewayinfo() {
 
   if (loading) {
     return (
-      <div className="bg-white shadow rounded-lg p-6">
+      <div className="bg-white shadow rounded-lg p-6 overflow-hidden">
         <h2 className="text-lg font-semibold mb-4">网关基本信息</h2>
         <div className="text-center py-8">加载网关信息中...</div>
       </div>
@@ -67,71 +118,102 @@ export default function Gatewayinfo() {
         <div className="text-center py-8 text-red-600">{error}</div>
       </div>
     )
-  }
+  } 
 
   return (
-    <div className="bg-white shadow rounded-lg p-6">
+    <div className="flex flex-col bg-white shadow rounded-lg p-6 overflow-hidden">
-      <h2 className="text-lg font-semibold mb-4">网关基本信息</h2>
+      <div className='flex gap-6'>
-      
+        <div className='flex flex-3  justify-between '>
-      <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+          <span className="text-lg pt-2 font-semibold mb-4">网关基本信息</span>
-        <div className="bg-blue-50 p-4 rounded-lg">
+          <Form {...form}>
-          <div className="text-2xl font-bold text-blue-600">{data.length}</div>
+            <form className="flex items-center gap-4">
-          <div className="text-sm text-blue-800">网关总数</div>
+              <FormField
-        </div>
+                control={form.control}
-        <div className="bg-green-50 p-4 rounded-lg">
+                name="status"
-          <div className="text-2xl font-bold text-green-600">
+                render={({ field }) => (
-            {data.filter(item => item.enable === 1).length}
+                  <div className="flex items-center">
-          </div>
+                    <span className="text-sm mr-2">状态筛选:</span>
-          <div className="text-sm text-green-800">启用网关</div>
+                    <Select 
-        </div>
+                      value={field.value} 
-        <div className="bg-red-50 p-4 rounded-lg">
+                      onValueChange={field.onChange}
-          <div className="text-2xl font-bold text-red-600">
+                      defaultValue="1"
-            {data.filter(item => item.enable === 0).length}
+                    >
-          </div>
+                      <SelectTrigger className="h-9 w-36">
-          <div className="text-sm text-red-800">禁用网关</div>
+                        <SelectValue placeholder="选择状态" />
-        </div>
+                      </SelectTrigger>
-        <div className="bg-purple-50 p-4 rounded-lg">
+                      <SelectContent>
-          <div className="text-2xl font-bold text-purple-600">
+                        <SelectItem value="all">全部</SelectItem>
-            {new Set(data.map(item => item.setid)).size}
+                        <SelectItem value="1">启用</SelectItem>
-          </div>
+                        <SelectItem value="0">禁用</SelectItem>
-          <div className="text-sm text-purple-800">配置版本数</div>
+                      </SelectContent>
+                    </Select>
+                  </div>
+                )}
+              />
+            </form>
+          </Form>
         </div>
+        <div className='flex flex-1'></div>
       </div>
+      
+      <div className='flex gap-6 overflow-hidden'>
+        <div className="flex-3 w-full flex">
+          <Table>
+            <TableHeader>
+              <TableRow className="bg-gray-50">
+                <TableHead className="px-4 py-2 text-left">MAC地址</TableHead>
+                <TableHead className="px-4 py-2 text-left">内网IP</TableHead>
+                <TableHead className="px-4 py-2 text-left">配置版本</TableHead>
+                <TableHead className="px-4 py-2 text-left">状态</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {filteredData.map((item, index) => (
+                <TableRow 
+                  key={index} 
+                  className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}
+                >
+                  <TableCell className="px-4 py-2">
+                    <button
+                      onClick={() => {
+                        router.push(`/dashboard?tab=gateway&mac=${item.macaddr}`);
+                      }}
+                      className="font-mono text-blue-600 hover:text-blue-800 hover:underline cursor-pointer"
+                    >
+                      {item.macaddr}
+                    </button>
+                  </TableCell>
+                  <TableCell className="px-4 py-2">{item.inner_ip}</TableCell>
+                  <TableCell className="px-4 py-2">{item.setid}</TableCell>
+                  <TableCell className="px-4 py-2">
+                    <span className={`px-2 py-1 rounded-full text-xs font-medium ${getStatusClass(item.enable)}`}>
+                      {getStatusText(item.enable)}
+                    </span>
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </div>
 
-      <div className="overflow-x-auto">
+        <div className="flex flex-1 flex-col gap-4 mb-6">
-        <table className="min-w-full table-auto">
+          <div className="bg-blue-50 p-4 rounded-lg">
-          <thead> 
+            <div className="text-2xl font-bold text-blue-600">{data.length}</div>
-            <tr className="bg-gray-50">
+            <div className="text-sm text-blue-800">网关总数</div>
-              <th className="px-4 py-2 text-left">MAC地址</th>
+          </div>
-              <th className="px-4 py-2 text-left">内网IP</th>
+          <div className="bg-green-50 p-4 rounded-lg">
-              <th className="px-4 py-2 text-left">配置版本</th>
+            <div className="text-2xl font-bold text-green-600">
-              <th className="px-4 py-2 text-left">状态</th>
+              {data.filter(item => item.enable === 1).length}
-            </tr>
+            </div>
-          </thead>
+            <div className="text-sm text-green-800">启用网关</div>
-          <tbody>
+          </div>
-            {data.map((item, index) => (
+          <div className="bg-red-50 p-4 rounded-lg">
-              <tr key={index} className={index % 2 === 0 ? 'bg-white' : 'bg-gray-50'}>
+            <div className="text-2xl font-bold text-red-600">
-                <td className="px-4 py-2">
+              {data.filter(item => item.enable === 0).length}
-                  <button
+            </div>
-                    onClick={() => {
+            <div className="text-sm text-red-800">禁用网关</div>
-                      router.push(`/dashboard?tab=gateway&mac=${item.macaddr}`);
+          </div>
-                    }}
+        </div>
-                    className="font-mono text-blue-600 hover:text-blue-800 hover:underline cursor-pointer"
-                  >
-                    {item.macaddr}
-                  </button>
-                </td>
-                <td className="px-4 py-2">{item.inner_ip}</td>
-                <td className="px-4 py-2">{item.setid}</td>
-                <td className="px-4 py-2">
-                  <span className={`px-2 py-1 rounded-full text-xs font-medium ${getStatusClass(item.enable)}`}>
-                    {getStatusText(item.enable)}
-                  </span>
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
       </div>
     </div>
   )

src/app/dashboard/components/settings.tsx

@@ -9,14 +9,7 @@ import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/com
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'
 import { User, Lock, Search, Trash2, Plus, X } from 'lucide-react'
 import { toast, Toaster } from 'sonner'
-import {
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow, } from "@/components/ui/table"
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table"
 
 // 用户类型定义
 interface UserData {
@@ -152,7 +145,7 @@ const handleDeleteUser = async (userId: number) => {
   )
 
   return (
-    <div className="min-h-screen bg-white p-4 md:p-8">
+    <div className="bg-white p-4 md:p-8">
       <div className="max-w-6xl mx-auto">
         <div className="flex justify-between items-center mb-6">
           <h1 className="text-3xl font-bold">用户管理</h1>
@@ -271,23 +264,24 @@ const handleDeleteUser = async (userId: number) => {
           </Card>
         )}
 
-        <Card>
+        {/* 用户列表直接显示在页面上 */}
-          <CardHeader>
+        <div className="space-y-4">
-            <CardTitle>用户列表</CardTitle>
+          <div>
-            <CardDescription>
+            <h2 className="text-2xl font-semibold">用户列表</h2>
-              管理系统中的所有用户账户
+            <p className="text-muted-foreground">管理系统中的所有用户账户</p>
-            </CardDescription>
+          </div>
-            <div className="relative mt-4 max-w-sm">
+          
-              <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
+          <div className="relative max-w-sm mt-4">
-              <Input 
+            <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-                placeholder="搜索用户..." 
+            <Input 
-                className="pl-8" 
+              placeholder="搜索用户..." 
-                value={searchTerm}
+              className="pl-8" 
-                onChange={(e) => setSearchTerm(e.target.value)}
+              value={searchTerm}
-              />
+              onChange={(e) => setSearchTerm(e.target.value)}
-            </div>
+            />
-          </CardHeader>
+          </div>
-          <CardContent>
+          
+          <div className="border rounded-lg">
             <Table>
               <TableHeader>
                 <TableRow>
@@ -299,7 +293,7 @@ const handleDeleteUser = async (userId: number) => {
               <TableBody>
                 {filteredUsers.length === 0 ? (
                   <TableRow>
-                    <TableCell colSpan={4} className="text-center py-4">
+                    <TableCell colSpan={3} className="text-center py-4">
                       暂无用户数据
                     </TableCell>
                   </TableRow>
@@ -309,14 +303,13 @@ const handleDeleteUser = async (userId: number) => {
                       <TableCell className="font-medium">{user.account}</TableCell>
                       <TableCell>{new Date(user.createdAt).toLocaleDateString()}</TableCell>
                       <TableCell className="text-right">
-                        <div className="flex justify-end gap-2">
+                        <div className="flex justify-end">
                           <Button
                             variant="outline"
                             size="sm"
+                            className="h-5 border-0 hover:bg-transparent"
                             onClick={() => handleDeleteUser(Number(user.id))}
-                          >
+                          ><Trash2 className="h-4 w-4" /></Button>
-                            <Trash2 className="h-4 w-4" />
-                          </Button>
                         </div>
                       </TableCell>
                     </TableRow>
@@ -324,8 +317,8 @@ const handleDeleteUser = async (userId: number) => {
                 )}
               </TableBody>
             </Table>
-          </CardContent>
+          </div>
-        </Card>
+        </div>
       </div>
       <Toaster richColors />
     </div>

src/app/dashboard/page.tsx

@@ -64,8 +64,8 @@ function DashboardContent() {
   }
 
   return (
-    <div className="min-h-screen bg-gray-100">
+    <div className=" bg-gray-100 w-screen h-screen flex flex-col">
-      <nav className="bg-white shadow-sm">
+      <nav className="bg-white flex-none h-16 shadow-sm">
         <div className="px-4 sm:px-6 lg:px-8">
           <div className="flex justify-between h-16 items-center">
             <div className="flex items-center">
@@ -85,14 +85,14 @@ function DashboardContent() {
         </div>
       </nav>
 
-      <div className="px-4 sm:px-6 lg:px-8 py-8">
+      <div className="flex flex-3 overflow-hidden px-4 sm:px-6 lg:px-8 py-8">
         <div className="border-b border-gray-200 mb-6">
-          <nav className="-mb-px flex space-x-8">
+          <nav className="flex  flex-col w-64 -mb-px  space-x-8">
             {tabs.map((tab) => (
               <button
                 key={tab.id}
                 onClick={() => handleTabClick(tab.id)}
-                className={`py-2 px-1 border-b-2 font-medium text-sm ${
+                className={`py-2 px-1 h-12 border-b-2 font-medium text-sm ${
                   activeTab === tab.id
                     ? 'border-blue-500 text-blue-600'
                     : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'
@@ -104,7 +104,7 @@ function DashboardContent() {
           </nav>
         </div>
 
-        <div className="grid grid-cols-1 gap-6">
+        <div className="grid grid-cols-1 gap-6 flex-auto">
           {activeTab === 'gatewayInfo' && <Gatewayinfo />}
           {activeTab === 'gateway' && <GatewayConfig />}
           {activeTab === 'city' && <CityNodeStats />}
@@ -120,7 +120,7 @@ function DashboardContent() {
 export default function Dashboard() {
   return (
     <Suspense fallback={
-      <div className="min-h-screen bg-gray-100 flex items-center justify-center">
+      <div className=" bg-gray-100 flex items-center justify-center">
         <div className="text-center">
           <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500 mx-auto"></div>
           <p className="mt-4 text-gray-600">加载中...</p>

src/components/ui/pagination.tsx

@@ -1,20 +1,188 @@
-import * as React from "react"
+'use client'
+import * as React from 'react'
+import {useState, useEffect} from 'react'
+
 import {
   ChevronLeftIcon,
   ChevronRightIcon,
   MoreHorizontalIcon,
-} from "lucide-react"
+} from 'lucide-react'
 
-import { cn } from "@/lib/utils"
+import {cn} from '@/lib/utils'
-import { Button, buttonVariants } from "@/components/ui/button"
 
-function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from './select'
+
+export interface PaginationProps {
+  page: number
+  size: number
+  total: number
+  sizeOptions?: number[]
+  onPageChange?: (page: number) => void
+  onSizeChange?: (size: number) => void
+  className?: string
+}
+
+function Pagination({
+  page,
+  size,
+  total,
+  sizeOptions = [10, 20, 50, 100],
+  onPageChange,
+  onSizeChange,
+  className,
+}: PaginationProps) {
+  const [currentPage, setCurrentPage] = useState(page)
+  const totalPages = Math.ceil(total / size)
+
+  // 同步外部 page 变化
+  useEffect(() => {
+    setCurrentPage(page)
+  }, [page])
+
+  // 分页器逻辑
+  const generatePaginationItems = () => {
+    // 最多显示7个页码，其余用省略号
+    const SIBLINGS = 1 // 当前页左右各显示的页码数
+    const DOTS = -1 // 省略号标记
+
+    if (totalPages <= 7) {
+      // 总页数少于7，全部显示
+      return Array.from({length: totalPages}, (_, i) => i + 1)
+    }
+
+    // 是否需要显示左边的省略号
+    const showLeftDots = currentPage > 2 + SIBLINGS
+
+    // 是否需要显示右边的省略号
+    const showRightDots = currentPage < totalPages - (2 + SIBLINGS)
+
+    if (showLeftDots && showRightDots) {
+      // 两边都有省略号
+      const leftSiblingIndex = Math.max(currentPage - SIBLINGS, 1)
+      const rightSiblingIndex = Math.min(currentPage + SIBLINGS, totalPages)
+
+      return [1, DOTS, ...Array.from(
+        {length: rightSiblingIndex - leftSiblingIndex + 1},
+        (_, i) => leftSiblingIndex + i,
+      ), DOTS, totalPages]
+    }
+
+    if (!showLeftDots && showRightDots) {
+      // 只有右边有省略号
+      return [...Array.from({length: 3 + SIBLINGS * 2}, (_, i) => i + 1), DOTS, totalPages]
+    }
+
+    if (showLeftDots && !showRightDots) {
+      // 只有左边有省略号
+      return [1, DOTS, ...Array.from(
+        {length: 3 + SIBLINGS * 2},
+        (_, i) => totalPages - (3 + SIBLINGS * 2) + i + 1,
+      )]
+    }
+
+    return []
+  }
+
+  const handlePageChange = (newPage: number) => {
+    if (newPage < 1 || newPage > totalPages || newPage === currentPage) {
+      return
+    }
+    setCurrentPage(newPage)
+    onPageChange?.(newPage)
+  }
+
+  const handlePageSizeChange = (newSize: string) => {
+    const parsedSize = parseInt(newSize, 10)
+    if (onSizeChange) {
+      onSizeChange(parsedSize)
+    }
+  }
+
+  const paginationItems = generatePaginationItems()
+
+  return (
+    <div className={`flex flex-wrap items-center justify-end gap-4 ${className || ''}`}>
+      <div className="flex-none flex items-center gap-2 text-sm text-muted-foreground">
+        共
+        {' '}
+        {total}
+        {' '}
+        条记录，每页
+        <Select
+          value={size.toString()}
+          onValueChange={handlePageSizeChange}
+        >
+          <SelectTrigger className="h-8 w-20">
+            <SelectValue/>
+          </SelectTrigger>
+          <SelectContent>
+            {sizeOptions.map(option => (
+              <SelectItem key={option} value={option.toString()}>
+                {option}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+        条
+      </div>
+
+      <PaginationLayout>
+        <PaginationContent>
+
+          <PaginationItem>
+            <PaginationPrevious
+              onClick={() => handlePageChange(currentPage - 1)}
+              className={currentPage === 1 ? 'opacity-50 pointer-events-none' : ''}
+            />
+          </PaginationItem>
+
+          {paginationItems.map((pageNum, index) => {
+            if (pageNum === -1) {
+              return (
+                <PaginationItem key={`dots-${index}`}>
+                  <PaginationEllipsis/>
+                </PaginationItem>
+              )
+            }
+
+            return (
+              <PaginationItem key={pageNum}>
+                <PaginationLink
+                  isActive={pageNum === currentPage}
+                  onClick={() => handlePageChange(pageNum)}
+                >
+                  {pageNum}
+                </PaginationLink>
+              </PaginationItem>
+            )
+          })}
+
+          <PaginationItem>
+            <PaginationNext
+              onClick={() => handlePageChange(currentPage + 1)}
+              className={currentPage === totalPages ? 'opacity-50 pointer-events-none' : ''}
+            />
+          </PaginationItem>
+
+        </PaginationContent>
+      </PaginationLayout>
+    </div>
+  )
+}
+
+function PaginationLayout({className, ...props}: React.ComponentProps<'nav'>) {
   return (
     <nav
       role="navigation"
       aria-label="pagination"
       data-slot="pagination"
-      className={cn("mx-auto flex w-full justify-center", className)}
+      className={cn('flex-none', className)}
       {...props}
     />
   )
@@ -23,42 +191,39 @@ function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
 function PaginationContent({
   className,
   ...props
-}: React.ComponentProps<"ul">) {
+}: React.ComponentProps<'ul'>) {
   return (
     <ul
       data-slot="pagination-content"
-      className={cn("flex flex-row items-center gap-1", className)}
+      className={cn('flex flex-row items-center gap-1', className)}
       {...props}
     />
   )
 }
 
-function PaginationItem({ ...props }: React.ComponentProps<"li">) {
+function PaginationItem({...props}: React.ComponentProps<'li'>) {
-  return <li data-slot="pagination-item" {...props} />
+  return <li data-slot="pagination-item" {...props}/>
 }
 
 type PaginationLinkProps = {
   isActive?: boolean
-} & Pick<React.ComponentProps<typeof Button>, "size"> &
+} & React.ComponentProps<'a'>
-  React.ComponentProps<"a">
 
 function PaginationLink({
   className,
   isActive,
-  size = "icon",
   ...props
 }: PaginationLinkProps) {
   return (
     <a
-      aria-current={isActive ? "page" : undefined}
+      aria-current={isActive ? 'page' : undefined}
       data-slot="pagination-link"
       data-active={isActive}
       className={cn(
-        buttonVariants({
+        'inline-flex items-center justify-center text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 h-9 w-9 rounded-md border border-input hover:bg-secondary hover:text-secondary-foreground',
-          variant: isActive ? "outline" : "ghost",
+        `bg-card`,
-          size,
+        isActive && 'bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground',
-        }),
+        className,
-        className
       )}
       {...props}
     />
@@ -72,12 +237,10 @@ function PaginationPrevious({
   return (
     <PaginationLink
       aria-label="Go to previous page"
-      size="default"
+      className={cn('gap-1 px-2.5 sm:pl-2.5', className)}
-      className={cn("gap-1 px-2.5 sm:pl-2.5", className)}
       {...props}
     >
-      <ChevronLeftIcon />
+      <ChevronLeftIcon/>
-      <span className="hidden sm:block">Previous</span>
     </PaginationLink>
   )
 }
@@ -89,12 +252,10 @@ function PaginationNext({
   return (
     <PaginationLink
       aria-label="Go to next page"
-      size="default"
+      className={cn('gap-1 px-2.5 sm:pr-2.5', className)}
-      className={cn("gap-1 px-2.5 sm:pr-2.5", className)}
       {...props}
     >
-      <span className="hidden sm:block">Next</span>
+      <ChevronRightIcon/>
-      <ChevronRightIcon />
     </PaginationLink>
   )
 }
@@ -102,15 +263,15 @@ function PaginationNext({
 function PaginationEllipsis({
   className,
   ...props
-}: React.ComponentProps<"span">) {
+}: React.ComponentProps<'span'>) {
   return (
     <span
       aria-hidden
       data-slot="pagination-ellipsis"
-      className={cn("flex size-9 items-center justify-center", className)}
+      className={cn('flex size-9 items-center justify-center', className)}
       {...props}
     >
-      <MoreHorizontalIcon className="size-4" />
+      <MoreHorizontalIcon className="size-4"/>
       <span className="sr-only">More pages</span>
     </span>
   )
@@ -118,6 +279,7 @@ function PaginationEllipsis({
 
 export {
   Pagination,
+  PaginationLayout,
   PaginationContent,
   PaginationLink,
   PaginationItem,

src/components/ui/table.tsx

@@ -12,7 +12,7 @@ function Table({ className, ...props }: React.ComponentProps<"table">) {
     >
       <table
         data-slot="table"
-        className={cn("w-full caption-bottom text-sm", className)}
+        className={cn("w-full caption-bottom text-sm ", className)}
         {...props}
       />
     </div>
@@ -23,7 +23,7 @@ function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {
   return (
     <thead
       data-slot="table-header"
-      className={cn("[&_tr]:border-b", className)}
+      className={cn("[&_tr]:border-b sticky top-0", className)}
       {...props}
     />
   )
@@ -57,7 +57,7 @@ function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
     <tr
       data-slot="table-row"
       className={cn(
-        "hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
+        "hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors h-10",
         className
       )}
       {...props}
@@ -83,7 +83,7 @@ function TableCell({ className, ...props }: React.ComponentProps<"td">) {
     <td
       data-slot="table-cell"
       className={cn(
-        "p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+        "p-2 h-10 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
         className
       )}
       {...props}