From 670093e9ca010406490e2c11fda5580f17af6547 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Mon, 3 Nov 2025 22:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/ui/collapsible.tsx | 20 +++++++++++++++++-- .../Menu/List/components/PermissionDialog.tsx | 9 --------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/ui/collapsible.tsx b/frontend/src/components/ui/collapsible.tsx index c69ecb0d..d8689498 100644 --- a/frontend/src/components/ui/collapsible.tsx +++ b/frontend/src/components/ui/collapsible.tsx @@ -1,11 +1,27 @@ import * as React from "react" import * as CollapsiblePrimitive from "@radix-ui/react-collapsible" +import { cn } from "@/lib/utils" + const Collapsible = CollapsiblePrimitive.Root -const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger +const CollapsibleTrigger = CollapsiblePrimitive.Trigger +CollapsibleTrigger.displayName = CollapsiblePrimitive.Trigger.displayName -const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent +const CollapsibleContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +CollapsibleContent.displayName = CollapsiblePrimitive.Content.displayName export { Collapsible, CollapsibleTrigger, CollapsibleContent } diff --git a/frontend/src/pages/System/Menu/List/components/PermissionDialog.tsx b/frontend/src/pages/System/Menu/List/components/PermissionDialog.tsx index 99598e55..e0a26f65 100644 --- a/frontend/src/pages/System/Menu/List/components/PermissionDialog.tsx +++ b/frontend/src/pages/System/Menu/List/components/PermissionDialog.tsx @@ -8,15 +8,6 @@ import { DialogFooter, } from '@/components/ui/dialog'; import { Button } from '@/components/ui/button'; -import { Input } from '@/components/ui/input'; -import { Label } from '@/components/ui/label'; -import { - Select, - SelectContent, - SelectItem, - SelectTrigger, - SelectValue, -} from '@/components/ui/select'; import { Table, TableHeader,