重构消息通知弹窗
This commit is contained in:
dengqichen
parent
5b8e12b82f
commit
df369d0d0c
@ -29,7 +29,17 @@ export const convertValidationRules = (validationRules?: ValidationRule[]): Rule
|
||||
break;
|
||||
case 'pattern':
|
||||
if (rule.value) {
|
||||
antdRule.pattern = new RegExp(rule.value);
|
||||
// 只支持标准正则字面量格式：/pattern/flags
|
||||
const regexMatch = rule.value.match(/^\/(.+)\/([gimsuy]*)$/);
|
||||
if (regexMatch) {
|
||||
try {
|
||||
antdRule.pattern = new RegExp(regexMatch[1], regexMatch[2]);
|
||||
} catch (error) {
|
||||
console.error('正则表达式语法错误:', rule.value, error);
|
||||
}
|
||||
} else {
|
||||
console.warn('正则表达式格式错误，请使用标准格式：/pattern/flags，例如 /^\\d+$/i');
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'min':
|
||||
|
||||
@ -9,11 +9,13 @@ import {
|
||||
Pencil,
|
||||
Trash2,
|
||||
Loader2,
|
||||
ChevronDown,
|
||||
} from 'lucide-react';
|
||||
import { Card, CardContent } from '@/components/ui/card';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
|
||||
import { Skeleton } from '@/components/ui/skeleton';
|
||||
import type { ServerResponse } from '../types';
|
||||
import { ServerStatusLabels, OsTypeLabels } from '../types';
|
||||
import dayjs from 'dayjs';
|
||||
@ -32,152 +34,134 @@ interface ServerCardProps {
|
||||
getOsIcon: (osType?: string) => React.ReactNode;
|
||||
}
|
||||
|
||||
export const ServerCard: React.FC<ServerCardProps> = ({
|
||||
server,
|
||||
onTest,
|
||||
onEdit,
|
||||
onDelete,
|
||||
isTesting,
|
||||
getOsIcon,
|
||||
}) => {
|
||||
export const ServerCard: React.FC<ServerCardProps> = ({ server, onTest, onEdit, onDelete, isTesting, getOsIcon }) => {
|
||||
const [expanded, setExpanded] = React.useState(false);
|
||||
|
||||
const formatTime = (time?: string) => {
|
||||
if (!time) return '-';
|
||||
return dayjs(time).fromNow();
|
||||
};
|
||||
|
||||
const renderValue = (
|
||||
content: React.ReactNode,
|
||||
skeletonWidth: string,
|
||||
options?: { skeleton?: boolean; skeletonHeight?: string; fallback?: React.ReactNode }
|
||||
) => {
|
||||
if (content === undefined || content === null || content === '' || content === false) {
|
||||
if (options?.skeleton) {
|
||||
return (
|
||||
<Card className="group relative overflow-hidden hover:shadow-md transition-all duration-300 border hover:border-primary/50 flex flex-col h-full">
|
||||
<CardContent className="p-4 relative flex-1 flex flex-col">
|
||||
{/* 顶部：状态和分类 */}
|
||||
<div className="flex items-center justify-between gap-2 mb-3">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<div className={`h-2.5 w-2.5 rounded-full ${
|
||||
server.status === 'ONLINE' ? 'bg-green-500 animate-pulse' :
|
||||
server.status === 'OFFLINE' ? 'bg-red-500' :
|
||||
'bg-gray-400'
|
||||
}`} />
|
||||
<Badge className={`text-xs ${
|
||||
server.status === 'ONLINE' ? 'bg-green-500/10 text-green-700 border-green-500/30 dark:text-green-400' :
|
||||
server.status === 'OFFLINE' ? 'bg-red-500/10 text-red-700 border-red-500/30 dark:text-red-400' :
|
||||
'bg-gray-500/10 text-gray-700 border-gray-500/30 dark:text-gray-400'
|
||||
}`}>
|
||||
{(server.status && ServerStatusLabels[server.status]?.label) || server.status || '-'}
|
||||
</Badge>
|
||||
<Skeleton
|
||||
className={`${options.skeletonHeight ?? 'h-3'} rounded ${skeletonWidth}`}
|
||||
/>
|
||||
);
|
||||
}
|
||||
return options?.fallback ?? null;
|
||||
}
|
||||
return content;
|
||||
};
|
||||
|
||||
return (
|
||||
<Card className="group relative flex h-full flex-col justify-between overflow-visible border transition-all duration-200 hover:border-primary/40 hover:shadow-lg">
|
||||
<CardContent className="relative flex flex-1 flex-col gap-3 p-3">
|
||||
{/* 基础信息 */}
|
||||
<div className="flex items-start gap-3">
|
||||
<div className="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-lg bg-muted/50">
|
||||
{server.osType ? (
|
||||
<div className="h-5 w-5 text-primary">{getOsIcon(server.osType)}</div>
|
||||
) : (
|
||||
<Skeleton className="h-5 w-5 rounded" />
|
||||
)}
|
||||
</div>
|
||||
<div className="flex min-w-0 flex-1 flex-col gap-1">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<div
|
||||
className={`h-2 w-2 rounded-full ${
|
||||
server.status === 'ONLINE'
|
||||
? 'bg-emerald-500 animate-pulse'
|
||||
: server.status === 'OFFLINE'
|
||||
? 'bg-red-500'
|
||||
: 'bg-slate-400'
|
||||
}`}
|
||||
/>
|
||||
{renderValue(
|
||||
<Badge
|
||||
variant="outline"
|
||||
className={`border-transparent text-[11px] font-medium ${
|
||||
server.status === 'ONLINE'
|
||||
? 'bg-emerald-100 text-emerald-700 dark:bg-emerald-500/10 dark:text-emerald-300'
|
||||
: server.status === 'OFFLINE'
|
||||
? 'bg-red-100 text-red-700 dark:bg-red-500/10 dark:text-red-300'
|
||||
: 'bg-slate-100 text-slate-700 dark:bg-slate-700/30 dark:text-slate-200'
|
||||
}`}
|
||||
>
|
||||
{(server.status && ServerStatusLabels[server.status]?.label) || server.status}
|
||||
</Badge>,
|
||||
'w-16'
|
||||
)}
|
||||
{server.categoryName && (
|
||||
<Badge variant="outline" className="text-xs ml-auto">
|
||||
<Badge variant="outline" className="text-[11px]">
|
||||
{server.categoryName}
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 中间：服务器名称和基本信息 */}
|
||||
<div className="flex items-start gap-3 mb-2.5 flex-1">
|
||||
<div className="p-2 rounded-lg bg-muted/50">
|
||||
<div className="h-5 w-5">
|
||||
{getOsIcon(server.osType)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<h3 className="text-sm font-semibold truncate group-hover:text-primary transition-colors">
|
||||
{renderValue(
|
||||
<h3 className="truncate text-sm font-semibold text-foreground">
|
||||
{server.serverName}
|
||||
</h3>
|
||||
<div className="flex items-center gap-1 text-xs text-muted-foreground mt-0.5">
|
||||
</h3>,
|
||||
'w-32',
|
||||
{ skeleton: true }
|
||||
)}
|
||||
<div className="flex items-center gap-1 text-xs text-muted-foreground">
|
||||
<Network className="h-3 w-3 flex-shrink-0" />
|
||||
<span className="font-mono truncate">{server.hostIp}</span>
|
||||
{renderValue(
|
||||
<span className="font-mono text-xs text-foreground">{server.hostIp}</span>,
|
||||
'w-24',
|
||||
{ skeleton: true }
|
||||
)}
|
||||
</div>
|
||||
{server.hostname && (
|
||||
<div className="text-xs text-muted-foreground truncate">
|
||||
{server.hostname}
|
||||
</div>
|
||||
<span className="truncate text-[11px] text-muted-foreground">{server.hostname}</span>
|
||||
)}
|
||||
{server.osType && (
|
||||
<div className="text-xs text-muted-foreground mt-0.5">
|
||||
{(server.osType && OsTypeLabels[server.osType]?.label) || server.osType || '-'}
|
||||
<span className="text-[11px] text-muted-foreground">
|
||||
{(server.osType && OsTypeLabels[server.osType]?.label) || server.osType}
|
||||
{server.osVersion && ` ${server.osVersion}`}
|
||||
</div>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className={`h-7 w-7 flex-shrink-0 rounded-full border border-border/50 transition-transform ${
|
||||
expanded ? 'rotate-180' : ''
|
||||
}`}
|
||||
onClick={() => setExpanded((prev) => !prev)}
|
||||
>
|
||||
<ChevronDown className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{/* SSH 和认证方式 - 在一行显示 */}
|
||||
<div className="flex items-center gap-2 text-xs text-muted-foreground mb-2.5 flex-wrap">
|
||||
<span>SSH: <span className="font-medium text-foreground">{server.sshUser || 'root'}:{server.sshPort || 22}</span></span>
|
||||
{server.authType && (
|
||||
<Badge variant="outline" className="text-xs">
|
||||
{server.authType === 'PASSWORD' ? '密码' : '密钥'}
|
||||
</Badge>
|
||||
{/* 快速信息 */}
|
||||
<div className="flex items-center justify-between text-[11px] text-muted-foreground">
|
||||
<div className="flex items-center gap-2">
|
||||
<Clock className="h-3 w-3" />
|
||||
{server.lastConnectTime ? (
|
||||
<span>最后连接 {formatTime(server.lastConnectTime)}</span>
|
||||
) : (
|
||||
<span className="text-muted-foreground/50">暂无连接记录</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 硬件配置 - 紧凑显示 */}
|
||||
{(server.cpuCores || server.memorySize || server.diskSize) && (
|
||||
<div className="grid grid-cols-3 gap-2 mb-2.5 p-2 bg-muted/20 rounded border border-border/40">
|
||||
{server.cpuCores && (
|
||||
<div className="flex flex-col items-center gap-0.5">
|
||||
<Cpu className="h-3 w-3 text-blue-600 dark:text-blue-400" />
|
||||
<span className="text-xs font-medium">{server.cpuCores}核</span>
|
||||
</div>
|
||||
)}
|
||||
{server.memorySize && (
|
||||
<div className="flex flex-col items-center gap-0.5">
|
||||
<MemoryStick className="h-3 w-3 text-purple-600 dark:text-purple-400" />
|
||||
<span className="text-xs font-medium">{server.memorySize}GB</span>
|
||||
</div>
|
||||
)}
|
||||
{server.diskSize && (
|
||||
<div className="flex flex-col items-center gap-0.5">
|
||||
<HardDrive className="h-3 w-3 text-orange-600 dark:text-orange-400" />
|
||||
<span className="text-xs font-medium">{server.diskSize}GB</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 标签 - 可选显示 */}
|
||||
{server.tags && (() => {
|
||||
try {
|
||||
const tags = JSON.parse(server.tags);
|
||||
return Array.isArray(tags) && tags.length > 0 && (
|
||||
<div className="flex flex-wrap gap-1 mb-2.5">
|
||||
{tags.slice(0, 2).map((tag, index) => (
|
||||
<Badge key={index} variant="outline" className="text-xs">
|
||||
{tag}
|
||||
</Badge>
|
||||
))}
|
||||
{tags.length > 2 && <Badge variant="outline" className="text-xs">+{tags.length - 2}</Badge>}
|
||||
</div>
|
||||
);
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
})()}
|
||||
|
||||
{/* 描述 - 始终显示 */}
|
||||
{server.description && (
|
||||
<p className="text-xs text-muted-foreground line-clamp-2 mb-2.5 px-1">
|
||||
{server.description}
|
||||
</p>
|
||||
)}
|
||||
|
||||
{/* 最后连接时间 */}
|
||||
{server.lastConnectTime && (
|
||||
<div className="flex items-center gap-1.5 text-xs text-muted-foreground mb-2.5">
|
||||
<Clock className="h-3 w-3 flex-shrink-0" />
|
||||
<span className="truncate">最后连接 {formatTime(server.lastConnectTime)}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 操作按钮 - Hover 时才显示 */}
|
||||
<div className="flex items-center justify-center gap-2 pt-2 mt-auto border-t border-border/30 opacity-0 group-hover:opacity-100 transition-opacity duration-200">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
size="icon"
|
||||
className="h-7 w-7"
|
||||
onClick={() => onTest(server)}
|
||||
disabled={isTesting}
|
||||
className="h-7 px-2"
|
||||
>
|
||||
{isTesting ? (
|
||||
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
||||
@ -191,10 +175,11 @@ export const ServerCard: React.FC<ServerCardProps> = ({
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
size="icon"
|
||||
className="h-7 w-7"
|
||||
onClick={() => onEdit(server)}
|
||||
className="h-7 px-2"
|
||||
>
|
||||
<Pencil className="h-3.5 w-3.5" />
|
||||
</Button>
|
||||
@ -204,10 +189,11 @@ export const ServerCard: React.FC<ServerCardProps> = ({
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
size="icon"
|
||||
className="h-7 w-7 text-destructive"
|
||||
onClick={() => onDelete(server)}
|
||||
className="h-7 px-2 text-destructive hover:text-destructive"
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
</Button>
|
||||
@ -215,6 +201,94 @@ export const ServerCard: React.FC<ServerCardProps> = ({
|
||||
<TooltipContent>删除</TooltipContent>
|
||||
</Tooltip>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 展开内容 */}
|
||||
{expanded && (
|
||||
<div className="absolute left-0 right-0 top-full z-20 -mt-px space-y-3 rounded-b-xl border border-border border-t bg-card p-3 text-xs shadow-lg">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
{renderValue(
|
||||
<span className="text-muted-foreground">
|
||||
SSH：
|
||||
<span className="ml-1 font-medium text-foreground">
|
||||
{(server.sshUser || 'root') + ':' + (server.sshPort || 22)}
|
||||
</span>
|
||||
</span>,
|
||||
'w-32'
|
||||
)}
|
||||
{server.authType && (
|
||||
<Badge variant="secondary" className="text-[11px]">
|
||||
{server.authType === 'PASSWORD' ? '密码认证' : '密钥认证'}
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
<div className="grid grid-cols-3 gap-2 text-center">
|
||||
<div className="flex flex-col items-center gap-1">
|
||||
<div className="flex h-8 w-8 items-center justify-center rounded-full bg-primary/10 text-primary">
|
||||
<Cpu className="h-4 w-4" />
|
||||
</div>
|
||||
{renderValue(
|
||||
server.cpuCores ? (
|
||||
<span className="text-xs font-medium text-foreground">{server.cpuCores}核</span>
|
||||
) : null,
|
||||
'w-10',
|
||||
{ skeleton: true, skeletonHeight: 'h-4' }
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col items-center gap-1">
|
||||
<div className="flex h-8 w-8 items-center justify-center rounded-full bg-primary/10 text-primary">
|
||||
<MemoryStick className="h-4 w-4" />
|
||||
</div>
|
||||
{renderValue(
|
||||
server.memorySize ? (
|
||||
<span className="text-xs font-medium text-foreground">{server.memorySize}GB</span>
|
||||
) : null,
|
||||
'w-10',
|
||||
{ skeleton: true, skeletonHeight: 'h-4' }
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col items-center gap-1">
|
||||
<div className="flex h-8 w-8 items-center justify-center rounded-full bg-primary/10 text-primary">
|
||||
<HardDrive className="h-4 w-4" />
|
||||
</div>
|
||||
{renderValue(
|
||||
server.diskSize ? (
|
||||
<span className="text-xs font-medium text-foreground">{server.diskSize}GB</span>
|
||||
) : null,
|
||||
'w-10',
|
||||
{ skeleton: true, skeletonHeight: 'h-4' }
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{server.tags && (() => {
|
||||
try {
|
||||
const tags = JSON.parse(server.tags);
|
||||
if (Array.isArray(tags) && tags.length > 0) {
|
||||
return (
|
||||
<div className="flex flex-wrap gap-1">
|
||||
{tags.slice(0, 3).map((tag: string, index: number) => (
|
||||
<Badge key={index} variant="outline" className="text-[11px]">
|
||||
{tag}
|
||||
</Badge>
|
||||
))}
|
||||
{tags.length > 3 && (
|
||||
<Badge variant="outline" className="text-[11px]">+{tags.length - 3}</Badge>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
})()}
|
||||
|
||||
{server.description ? (
|
||||
<p className="text-xs text-muted-foreground line-clamp-3">{server.description}</p>
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user