GuanM/certimate
1
0
Fork 0
mirror of https://github.com/usual2970/certimate.git synced 2025-06-13 16:09:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from gexin1/main

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ui/src/components/certimate/AccessEdit.tsx
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,44 +137,46 @@ export function AccessEdit({
<DialogHeader> <DialogHeader>
<DialogTitle>{op == "add" ? "添加" : "编辑"}授权</DialogTitle> <DialogTitle>{op == "add" ? "添加" : "编辑"}授权</DialogTitle>
</DialogHeader> </DialogHeader>
<div className="container"> <ScrollArea className="max-h-[80vh]">
<Label>服务商</Label> <div className="container">
<Label>服务商</Label>
<Select <Select
onValueChange={(val) => { onValueChange={(val) => {
console.log(val); console.log(val);
setConfigType(val); setConfigType(val);
}} }}
defaultValue={configType} defaultValue={configType}
> >
<SelectTrigger className="mt-3"> <SelectTrigger className="mt-3">
<SelectValue placeholder="请选择服务商" /> <SelectValue placeholder="请选择服务商" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectGroup> <SelectGroup>
<SelectLabel>服务商</SelectLabel> <SelectLabel>服务商</SelectLabel>
{typeKeys.map((key) => ( {typeKeys.map((key) => (
<SelectItem value={key} key={key}> <SelectItem value={key} key={key}>
<div <div
className={cn( className={cn(
"flex items-center space-x-2 rounded cursor-pointer", "flex items-center space-x-2 rounded cursor-pointer",
getOptionCls(key) getOptionCls(key)
)} )}
> >
<img <img
src={accessTypeMap.get(key)?.[1]} src={accessTypeMap.get(key)?.[1]}
className="h-6 w-6" className="h-6 w-6"
/> />
<div>{accessTypeMap.get(key)?.[0]}</div> <div>{accessTypeMap.get(key)?.[0]}</div>
</div> </div>
</SelectItem> </SelectItem>
))} ))}
</SelectGroup> </SelectGroup>
</SelectContent> </SelectContent>
</Select> </Select>
{form} {form}
</div> </div>
</ScrollArea>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
); );

10
ui/src/pages/dashboard/Dashboard.tsx
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>

1
ui/tailwind.config.js
View File

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