From 0fa4a62007044ab75568e7e49486be723ee67c45 Mon Sep 17 00:00:00 2001
From: besscroft <besscroft@foxmail.com>
Date: Mon, 6 May 2024 23:19:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/layout/DynamicDropMenu.tsx |  47 +++---
 components/layout/DynamicNavbar.tsx   |   9 +-
 components/layout/Header.tsx          |   6 +-
 components/layout/HeaderLink.tsx      |  13 +-
 components/ui/DropdownMenu.tsx        | 200 ++++++++++++++++++++++++++
 package.json                          |   1 +
 pnpm-lock.yaml                        |  58 ++++++--
 types/index.ts                        |   4 +
 8 files changed, 280 insertions(+), 58 deletions(-)
 create mode 100644 components/ui/DropdownMenu.tsx

diff --git a/components/layout/DynamicDropMenu.tsx b/components/layout/DynamicDropMenu.tsx
index 43321ac..494b087 100644
--- a/components/layout/DynamicDropMenu.tsx
+++ b/components/layout/DynamicDropMenu.tsx
@@ -1,42 +1,35 @@
 'use client'
 
-import { Dropdown, DropdownItem, DropdownMenu, DropdownTrigger } from '@nextui-org/react'
 import { useRouter } from 'next-nprogress-bar'
 import { usePathname } from 'next/navigation'
 import { Aperture } from 'lucide-react'
-import { HandleProps, TagType } from '~/types'
-import { useSWRHydrated } from '~/hooks/useSWRHydrated'
+import { DataProps, TagType } from '~/types'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger
+} from '~/components/ui/DropdownMenu'
 
-export default function DynamicDropMenu(props: Readonly<HandleProps>) {
+export default function DynamicDropMenu(props: Readonly<DataProps>) {
   const router = useRouter()
   const pathname = usePathname()
-  const { data } = useSWRHydrated(props)
 
   return (
-    <Dropdown shadow="sm" backdrop="blur">
-      <DropdownTrigger>
-        <Aperture size={20} />
-      </DropdownTrigger>
-      <DropdownMenu
-        aria-label="移动端动态路由下拉菜单"
-      >
-        <DropdownItem
-          key="/"
-          onClick={() => router.push('/')}
-          className={pathname === '/' ? 'text-blue-600' : ''}
-        >
-          首页
-        </DropdownItem>
-        {data && Array.isArray(data) && data?.map((tag: TagType, index: any, array: TagType[]) => (
-          <DropdownItem
+    <DropdownMenu>
+      <DropdownMenuTrigger><Aperture size={20} /></DropdownMenuTrigger>
+      <DropdownMenuContent>
+        <DropdownMenuItem key="/" onClick={() => router.push('/')}>首页</DropdownMenuItem>
+        <DropdownMenuSeparator />
+        {Array.isArray(props.data) && props.data?.map((tag: TagType, index: any, array: TagType[]) => (
+          <DropdownMenuItem
             key={tag.id}
             onClick={() => router.push(tag.tag_value)}
-            className={pathname === tag.tag_value ? 'text-blue-600' : ''}
-          >
-            {tag.name}
-          </DropdownItem>
+            className={pathname === tag.tag_value ? 'bg-gray-100' : ''}
+          >{tag.name}</DropdownMenuItem>
         ))}
-      </DropdownMenu>
-    </Dropdown>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
\ No newline at end of file
diff --git a/components/layout/DynamicNavbar.tsx b/components/layout/DynamicNavbar.tsx
index 21b81ab..1379f99 100644
--- a/components/layout/DynamicNavbar.tsx
+++ b/components/layout/DynamicNavbar.tsx
@@ -2,7 +2,7 @@ import VaulDrawer from '~/components/layout/VaulDrawer'
 import { DropMenu } from '~/components/layout/DropMenu'
 import DynamicDropMenu from '~/components/layout/DynamicDropMenu'
 import { fetchTagsShow } from '~/server/lib/query'
-import { HandleProps } from '~/types'
+import { DataProps } from '~/types'
 
 export default async function DynamicNavbar() {
   const getData = async () => {
@@ -10,9 +10,10 @@ export default async function DynamicNavbar() {
     return await fetchTagsShow()
   }
 
-  const props: HandleProps = {
-    handle: getData,
-    args: 'headerLink',
+  const data = await getData()
+
+  const props: DataProps = {
+    data: data
   }
 
   return (
diff --git a/components/layout/Header.tsx b/components/layout/Header.tsx
index e9f3a30..9fdd48f 100644
--- a/components/layout/Header.tsx
+++ b/components/layout/Header.tsx
@@ -3,7 +3,7 @@ import Logo from '~/components/layout/Logo'
 import DynamicNavbar from '~/components/layout/DynamicNavbar'
 import HeaderLink from '~/components/layout/HeaderLink'
 import { fetchTagsShow } from '~/server/lib/query'
-import {  LinkProps } from '~/types'
+import { DataProps } from '~/types'
 
 export default async function Header() {
   const getData = async () => {
@@ -13,9 +13,7 @@ export default async function Header() {
 
   const data = await getData()
 
-  const props: LinkProps = {
-    handle: getData,
-    args: 'headerLink',
+  const props: DataProps = {
     data: data
   }
 
diff --git a/components/layout/HeaderLink.tsx b/components/layout/HeaderLink.tsx
index 5a1dc4e..de762b6 100644
--- a/components/layout/HeaderLink.tsx
+++ b/components/layout/HeaderLink.tsx
@@ -1,19 +1,14 @@
 'use client'
 
 import { Button } from '@nextui-org/react'
-import { TagType, LinkProps } from '~/types'
+import { TagType } from '~/types'
 import { usePathname } from 'next/navigation'
 import { useRouter } from 'next-nprogress-bar'
-import useSWR from 'swr'
+import { DataProps } from '~/types'
 
-export default function HeaderLink(props: Readonly<LinkProps>) {
-  const { data } = useSWR(props.args,
-    () => {
-      return props.handle
-    }, { revalidateOnFocus: false, fallbackData: props.data })
+export default function HeaderLink(props: Readonly<DataProps>) {
   const pathname = usePathname()
   const router = useRouter()
-
   return (
     <>
       <Button
@@ -25,7 +20,7 @@ export default function HeaderLink(props: Readonly<LinkProps>) {
       >
         首页
       </Button>
-      {Array.isArray(data) && data?.map((tag: TagType) => (
+      {Array.isArray(props.data) && props.data?.map((tag: TagType) => (
         <Button
           key={tag.id}
           color="primary"
diff --git a/components/ui/DropdownMenu.tsx b/components/ui/DropdownMenu.tsx
new file mode 100644
index 0000000..780dc2b
--- /dev/null
+++ b/components/ui/DropdownMenu.tsx
@@ -0,0 +1,200 @@
+'use client'
+
+import * as React from 'react'
+import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu'
+import { Check, ChevronRight, Circle } from 'lucide-react'
+
+import { cn } from '~/utils'
+
+const DropdownMenu = DropdownMenuPrimitive.Root
+
+const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger
+
+const DropdownMenuGroup = DropdownMenuPrimitive.Group
+
+const DropdownMenuPortal = DropdownMenuPrimitive.Portal
+
+const DropdownMenuSub = DropdownMenuPrimitive.Sub
+
+const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup
+
+const DropdownMenuSubTrigger = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
+  inset?: boolean
+}
+>(({ className, inset, children, ...props }, ref) => (
+  <DropdownMenuPrimitive.SubTrigger
+    ref={ref}
+    className={cn(
+      "flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent",
+      inset && "pl-8",
+      className
+    )}
+    {...props}
+  >
+    {children}
+    <ChevronRight className="ml-auto h-4 w-4" />
+  </DropdownMenuPrimitive.SubTrigger>
+))
+DropdownMenuSubTrigger.displayName =
+  DropdownMenuPrimitive.SubTrigger.displayName
+
+const DropdownMenuSubContent = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.SubContent
+    ref={ref}
+    className={cn(
+      "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+      className
+    )}
+    {...props}
+  />
+))
+DropdownMenuSubContent.displayName =
+  DropdownMenuPrimitive.SubContent.displayName
+
+const DropdownMenuContent = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
+>(({ className, sideOffset = 4, ...props }, ref) => (
+  <DropdownMenuPrimitive.Portal>
+    <DropdownMenuPrimitive.Content
+      ref={ref}
+      sideOffset={sideOffset}
+      className={cn(
+        "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        className
+      )}
+      {...props}
+    />
+  </DropdownMenuPrimitive.Portal>
+))
+DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName
+
+const DropdownMenuItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
+  inset?: boolean
+}
+>(({ className, inset, ...props }, ref) => (
+  <DropdownMenuPrimitive.Item
+    ref={ref}
+    className={cn(
+      "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      inset && "pl-8",
+      className
+    )}
+    {...props}
+  />
+))
+DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName
+
+const DropdownMenuCheckboxItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
+>(({ className, children, checked, ...props }, ref) => (
+  <DropdownMenuPrimitive.CheckboxItem
+    ref={ref}
+    className={cn(
+      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      className
+    )}
+    checked={checked}
+    {...props}
+  >
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+      <DropdownMenuPrimitive.ItemIndicator>
+        <Check className="h-4 w-4" />
+      </DropdownMenuPrimitive.ItemIndicator>
+    </span>
+    {children}
+  </DropdownMenuPrimitive.CheckboxItem>
+))
+DropdownMenuCheckboxItem.displayName =
+  DropdownMenuPrimitive.CheckboxItem.displayName
+
+const DropdownMenuRadioItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
+>(({ className, children, ...props }, ref) => (
+  <DropdownMenuPrimitive.RadioItem
+    ref={ref}
+    className={cn(
+      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      className
+    )}
+    {...props}
+  >
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+      <DropdownMenuPrimitive.ItemIndicator>
+        <Circle className="h-2 w-2 fill-current" />
+      </DropdownMenuPrimitive.ItemIndicator>
+    </span>
+    {children}
+  </DropdownMenuPrimitive.RadioItem>
+))
+DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName
+
+const DropdownMenuLabel = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
+  inset?: boolean
+}
+>(({ className, inset, ...props }, ref) => (
+  <DropdownMenuPrimitive.Label
+    ref={ref}
+    className={cn(
+      "px-2 py-1.5 text-sm font-semibold",
+      inset && "pl-8",
+      className
+    )}
+    {...props}
+  />
+))
+DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName
+
+const DropdownMenuSeparator = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.Separator
+    ref={ref}
+    className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    {...props}
+  />
+))
+DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName
+
+const DropdownMenuShortcut = ({
+                                className,
+                                ...props
+                              }: React.HTMLAttributes<HTMLSpanElement>) => {
+  return (
+    <span
+      className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
+      {...props}
+    />
+  )
+}
+DropdownMenuShortcut.displayName = "DropdownMenuShortcut"
+
+export {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuGroup,
+  DropdownMenuPortal,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+  DropdownMenuRadioGroup,
+}
diff --git a/package.json b/package.json
index d63381b..6ae99eb 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "@prisma/client": "^5.13.0",
     "@radix-ui/react-context-menu": "^2.1.5",
     "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-scroll-area": "^1.0.5",
     "antd": "^5.17.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 94d33f9..1f1d6ac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,6 +26,9 @@ dependencies:
   '@radix-ui/react-dialog':
     specifier: ^1.0.5
     version: 1.0.5(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
+  '@radix-ui/react-dropdown-menu':
+    specifier: ^2.0.6
+    version: 2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
   '@radix-ui/react-icons':
     specifier: ^1.3.0
     version: 1.3.0(react@18.3.1)
@@ -2927,7 +2930,7 @@ packages:
   /@radix-ui/primitive@1.0.1:
     resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
     dev: false
 
   /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1):
@@ -2943,7 +2946,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
       '@types/react': 18.3.1
       '@types/react-dom': 18.3.0
@@ -2964,7 +2967,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
@@ -2984,7 +2987,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@types/react': 18.3.1
       react: 18.3.1
     dev: false
@@ -3024,7 +3027,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@types/react': 18.3.1
       react: 18.3.1
     dev: false
@@ -3102,6 +3105,33 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-dropdown-menu@2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-i6TuFOoWmLWq+M/eCLGd/bQ2HfAX1RJgvrBQ6AQLmzfvsLdefxbWu8G9zczcPFfcSPehz9GcpF6K9QYreFV8hA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.24.5
+      '@radix-ui/primitive': 1.0.1
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
+      '@radix-ui/react-id': 1.0.1(@types/react@18.3.1)(react@18.3.1)
+      '@radix-ui/react-menu': 2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
     peerDependencies:
@@ -3156,7 +3186,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@types/react': 18.3.1
       react: 18.3.1
@@ -3175,7 +3205,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
@@ -3213,7 +3243,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@floating-ui/react-dom': 2.0.8(react-dom@18.3.1)(react@18.3.1)
       '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
@@ -3286,7 +3316,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
       '@types/react': 18.3.1
       '@types/react-dom': 18.3.0
@@ -3307,7 +3337,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1)(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
@@ -3390,7 +3420,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@types/react': 18.3.1
       react: 18.3.1
@@ -3434,7 +3464,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/rect': 1.0.1
       '@types/react': 18.3.1
       react: 18.3.1
@@ -3449,7 +3479,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@types/react': 18.3.1
       react: 18.3.1
@@ -3458,7 +3488,7 @@ packages:
   /@radix-ui/rect@1.0.1:
     resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.5
     dev: false
 
   /@rc-component/async-validator@5.0.1:
diff --git a/types/index.ts b/types/index.ts
index b762a82..d779686 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -1,3 +1,7 @@
+export type DataProps = {
+  data: any
+}
+
 export type HandleProps = {
   handle: () => any
   args: string

From 4634e68450925933d4cc9f95b8ef8522f11d17de Mon Sep 17 00:00:00 2001
From: besscroft <besscroft@foxmail.com>
Date: Mon, 6 May 2024 23:25:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/layout/DynamicDropMenu.tsx | 6 +++++-
 components/layout/VaulDrawer.tsx      | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/layout/DynamicDropMenu.tsx b/components/layout/DynamicDropMenu.tsx
index 494b087..9549e15 100644
--- a/components/layout/DynamicDropMenu.tsx
+++ b/components/layout/DynamicDropMenu.tsx
@@ -20,7 +20,11 @@ export default function DynamicDropMenu(props: Readonly<DataProps>) {
     <DropdownMenu>
       <DropdownMenuTrigger><Aperture size={20} /></DropdownMenuTrigger>
       <DropdownMenuContent>
-        <DropdownMenuItem key="/" onClick={() => router.push('/')}>首页</DropdownMenuItem>
+        <DropdownMenuItem
+          key="/"
+          onClick={() => router.push('/')}
+          className={pathname === '/' ? 'bg-gray-100' : ''}
+        >首页</DropdownMenuItem>
         <DropdownMenuSeparator />
         {Array.isArray(props.data) && props.data?.map((tag: TagType, index: any, array: TagType[]) => (
           <DropdownMenuItem
diff --git a/components/layout/VaulDrawer.tsx b/components/layout/VaulDrawer.tsx
index 2c738b3..4724f85 100644
--- a/components/layout/VaulDrawer.tsx
+++ b/components/layout/VaulDrawer.tsx
@@ -50,6 +50,7 @@ export default function VaulDrawer() {
                         key="home"
                         startContent={<Home size={20} className={iconClasses} />}
                         onClick={() => router.push('/')}
+                        className={pathname === '/' ? 'bg-gray-100' : ''}
                       >
                         <Drawer.Close className="w-full text-left">
                           首页
@@ -59,6 +60,7 @@ export default function VaulDrawer() {
                         key="admin"
                         startContent={<MonitorDot size={20} className={iconClasses} />}
                         onClick={() => router.push('/admin')}
+                        className={pathname === '/admin' ? 'bg-gray-100' : ''}
                       >
                         <Drawer.Close className="w-full text-left">
                           控制台
@@ -68,6 +70,7 @@ export default function VaulDrawer() {
                         key="upload"
                         startContent={<ImageUp size={20} className={iconClasses} />}
                         onClick={() => router.push('/admin/upload')}
+                        className={pathname === '/admin/upload' ? 'bg-gray-100' : ''}
                       >
                         <Drawer.Close className="w-full text-left">
                           上传
@@ -77,6 +80,7 @@ export default function VaulDrawer() {
                         key="list"
                         startContent={<Image size={20} className={iconClasses} />}
                         onClick={() => router.push('/admin/list')}
+                        className={pathname === '/admin/list' ? 'bg-gray-100' : ''}
                       >
                         <Drawer.Close className="w-full text-left">
                           图片维护
@@ -86,6 +90,7 @@ export default function VaulDrawer() {
                         key="tag"
                         startContent={<Milestone size={20} className={iconClasses} />}
                         onClick={() => router.push('/admin/tag')}
+                        className={pathname === '/admin/tag' ? 'bg-gray-100' : ''}
                       >
                         <Drawer.Close className="w-full text-left">
                           标签管理
@@ -95,6 +100,7 @@ export default function VaulDrawer() {
                         key="settings"
                         startContent={<Settings size={20} className={iconClasses} />}
                         onClick={() => router.push('/admin/settings/preferences')}
+                        className={pathname.startsWith('/admin/settings') ? 'bg-gray-100' : ''}
                         showDivider
                       >
                         <Drawer.Close className="w-full text-left">
@@ -127,6 +133,7 @@ export default function VaulDrawer() {
                         key="home"
                         onClick={() => router.push('/')}
                         startContent={<Home size={20} className={iconClasses} />}
+                        className={pathname === '/' ? 'bg-gray-100' : ''}
                       >
                         <Drawer.Close className="w-full text-left">
                           首页

From c87877f5df80ed8e76c8ba11dc07180454b78e6c Mon Sep 17 00:00:00 2001
From: besscroft <besscroft@foxmail.com>
Date: Mon, 6 May 2024 23:30:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E7=80=91=E5=B8=83=E6=B5=81=E7=BB=84=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E6=95=B0=E5=8F=8A=E5=88=86=E9=A1=B5=E5=A4=A7=E5=B0=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BA=93=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Masonry.tsx | 1 -
 server/lib/query.ts    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/Masonry.tsx b/components/Masonry.tsx
index 9e78fce..030bca4 100644
--- a/components/Masonry.tsx
+++ b/components/Masonry.tsx
@@ -31,7 +31,6 @@ export default function Masonry(props : Readonly<ImageHandleProps>) {
     <div className="w-full sm:w-4/5 mx-auto p-2">
       <PhotoAlbum
         columns={(containerWidth) => {
-          if (containerWidth < 640) return 1;
           if (containerWidth < 768) return 2;
           if (containerWidth < 1024) return 3;
           return 4;
diff --git a/server/lib/query.ts b/server/lib/query.ts
index 40d6089..13444df 100644
--- a/server/lib/query.ts
+++ b/server/lib/query.ts
@@ -225,7 +225,7 @@ export async function fetchClientImagesListByTag(pageNum: number, tag: string) {
         tags.tag_value = ${tag}
     GROUP BY image.id
     ORDER BY image.sort DESC, image.create_time DESC, image.update_time DESC
-    LIMIT 8 OFFSET ${(pageNum - 1) * 12}
+    LIMIT 16 OFFSET ${(pageNum - 1) * 16}
   `
 
   return findAll;
@@ -256,7 +256,7 @@ export async function fetchClientImagesPageTotalByTag(tag: string) {
     ) AS unique_images;
   `
   // @ts-ignore
-  return Number(pageTotal[0].total) > 0 ? Math.ceil(Number(pageTotal[0].total) / 12) : 0
+  return Number(pageTotal[0].total) > 0 ? Math.ceil(Number(pageTotal[0].total) / 16) : 0
 }
 
 export async function fetchTagsShow() {