Merge pull request #16 from gexin1/main

fix: 首页展示问题和授权管理弹窗无法滚动
This commit is contained in:
usual2970 2024-09-11 06:37:38 +08:00 committed by GitHub
commit eeae9b4405
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 45 additions and 41 deletions

View File

@ -5,6 +5,7 @@ import {
DialogTitle, DialogTitle,
DialogTrigger, DialogTrigger,
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { ScrollArea } from "@/components/ui/scroll-area";
import { useState } from "react"; import { useState } from "react";
@ -136,6 +137,7 @@ export function AccessEdit({
<DialogHeader> <DialogHeader>
<DialogTitle>{op == "add" ? "添加" : "编辑"}</DialogTitle> <DialogTitle>{op == "add" ? "添加" : "编辑"}</DialogTitle>
</DialogHeader> </DialogHeader>
<ScrollArea className="max-h-[80vh]">
<div className="container"> <div className="container">
<Label></Label> <Label></Label>
@ -174,6 +176,7 @@ export function AccessEdit({
{form} {form}
</div> </div>
</ScrollArea>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
); );

View File

@ -58,8 +58,8 @@ const Dashboard = () => {
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<div className="text-muted-foreground"></div> <div className="text-muted-foreground"></div>
</div> </div>
<div className="flex mt-10 gap-5 flex-col md:flex-row"> <div className="flex mt-10 gap-5 flex-col flex-wrap md:flex-row">
<div className="w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg border"> <div className="w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg border">
<div className="p-3"> <div className="p-3">
<SquareSigma size={48} strokeWidth={1} className="text-blue-400" /> <SquareSigma size={48} strokeWidth={1} className="text-blue-400" />
</div> </div>
@ -80,7 +80,7 @@ const Dashboard = () => {
</div> </div>
</div> </div>
<div className="w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg border"> <div className="w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg border">
<div className="p-3"> <div className="p-3">
<CalendarX2 size={48} strokeWidth={1} className="text-red-400" /> <CalendarX2 size={48} strokeWidth={1} className="text-red-400" />
</div> </div>
@ -101,7 +101,7 @@ const Dashboard = () => {
</div> </div>
</div> </div>
<div className="border w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg"> <div className="border w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg">
<div className="p-3"> <div className="p-3">
<LoaderPinwheel <LoaderPinwheel
size={48} size={48}
@ -126,7 +126,7 @@ const Dashboard = () => {
</div> </div>
</div> </div>
<div className="border w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg"> <div className="border w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg">
<div className="p-3"> <div className="p-3">
<Ban size={48} strokeWidth={1} className="text-gray-400" /> <Ban size={48} strokeWidth={1} className="text-gray-400" />
</div> </div>

View File

@ -14,6 +14,7 @@ module.exports = {
padding: "2rem", padding: "2rem",
screens: { screens: {
"2xl": "1400px", "2xl": "1400px",
'3xl': '1920px',
}, },
}, },
extend: { extend: {