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,