Skip to content

Profile 卡片样式与交互优化 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsrcode merged 3 commits into from
Jan 13, 2026
Merged

Profile 卡片样式与交互优化 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b9867c
fix(ProfileCard): 优化激活按钮反馈与徽章布局
duanyongcheng Jan 13, 2026
84c8e37
style(ActiveProfileCard): 优化工具实例选择器的样式显示
duanyongcheng Jan 13, 2026
1a92282
style(ProfileCard): 优化 ProfileCard 组件中 Badge 的代码格式
duanyongcheng Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/ProfileManagementPage/components/ActiveProfileCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export function ActiveProfileCard({ group, proxyRunning }: ActiveProfileCardProp
onValueChange={handleInstanceChange}
disabled={toolInstances.length === 0}
>
<SelectTrigger className="w-56 h-8 bg-white/80 dark:bg-slate-900/80">
<SelectTrigger className="min-w-[13rem] h-8 bg-white/80 dark:bg-slate-900/80 [&>span]:flex [&>span]:items-center [&>span]:gap-2 [&>span]:line-clamp-none [&>span]:overflow-visible">
<SelectValue placeholder="选择工具实例" />
</SelectTrigger>
<SelectContent>
Expand Down
20 changes: 15 additions & 5 deletions src/pages/ProfileManagementPage/components/ProfileCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import { useState } from 'react';
import { Check, MoreVertical, Pencil, Power, Trash2, Tag } from 'lucide-react';
import { Check, MoreVertical, Pencil, Power, Trash2, Tag, AlertCircle } from 'lucide-react';
import { Button } from '@/components/ui/button';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
import {
Expand Down Expand Up @@ -99,12 +99,16 @@ export function ProfileCard({
<div className="flex items-center gap-2">
<CardTitle className="text-base font-semibold">{profile.name}</CardTitle>
{profile.is_active && !proxyRunning && (
<Badge variant="default" className="h-5">
<Badge variant="default" className="h-5 whitespace-nowrap">
<Check className="mr-1 h-3 w-3" />
激活中
</Badge>
)}
<Badge variant={sourceInfo.variant} className="h-5" title={sourceInfo.tooltip}>
<Badge
variant={sourceInfo.variant}
className="h-5 whitespace-nowrap"
title={sourceInfo.tooltip}
>
<Tag className="mr-1 h-3 w-3" />
{sourceInfo.text}
</Badge>
Expand All @@ -124,13 +128,19 @@ export function ProfileCard({
{(!profile.is_active || proxyRunning) && (
<>
<DropdownMenuItem
onClick={onActivate}
onClick={proxyRunning ? undefined : onActivate}
disabled={proxyRunning}
title={proxyRunning ? '透明代理运行中，无法激活配置' : ''}
className={proxyRunning ? 'cursor-not-allowed opacity-50' : ''}
>
<Power className="mr-2 h-4 w-4" />
激活
</DropdownMenuItem>
{proxyRunning && (
<div className="px-2 py-1.5 text-xs text-muted-foreground flex items-center gap-1">
<AlertCircle className="h-3 w-3" />
透明代理运行中，请先停止代理
</div>
)}
<DropdownMenuSeparator />
</>
)}
Expand Down