From e7a326a65111a02d3559c369b218647995bc24c0 Mon Sep 17 00:00:00 2001 From: NieiR Date: Thu, 8 Jan 2026 17:27:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=86=E9=92=A5?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=86=E7=BB=84?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=20default=20=E4=B8=8D=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=A7=BB=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 add-key-form.tsx 和 edit-key-form.tsx 中添加 handleProviderGroupChange - 当选择多个分组时自动移除 default 分组 - 修复 DialogFormLayout 中输入框 focus ring 左边被裁剪的样式问题 此问题由 PR #539 重构引入，原有逻辑在 key-edit-section.tsx 中存在但未迁移到新表单组件 --- .../_components/user/forms/add-key-form.tsx | 21 +++++++++++++++++-- .../_components/user/forms/edit-key-form.tsx | 21 +++++++++++++++++-- src/components/form/form-layout.tsx | 2 +- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/app/[locale]/dashboard/_components/user/forms/add-key-form.tsx b/src/app/[locale]/dashboard/_components/user/forms/add-key-form.tsx index c63eea78c..218493c9e 100644 --- a/src/app/[locale]/dashboard/_components/user/forms/add-key-form.tsx +++ b/src/app/[locale]/dashboard/_components/user/forms/add-key-form.tsx @@ -1,7 +1,7 @@ "use client"; import { useRouter } from "next/navigation"; import { useTranslations } from "next-intl"; -import { useEffect, useState, useTransition } from "react"; +import { useCallback, useEffect, useState, useTransition } from "react"; import { toast } from "sonner"; import { addKey } from "@/actions/keys"; import { getAvailableProviderGroups } from "@/actions/providers"; @@ -119,6 +119,23 @@ export function AddKeyForm({ userId, user, isAdmin = false, onSuccess }: AddKeyF }, }); + // 选择分组时，自动移除 default（当有多个分组时） + const handleProviderGroupChange = useCallback( + (newValue: string) => { + const groups = newValue + .split(",") + .map((g) => g.trim()) + .filter(Boolean); + if (groups.length > 1 && groups.includes(PROVIDER_GROUP.DEFAULT)) { + const withoutDefault = groups.filter((g) => g !== PROVIDER_GROUP.DEFAULT); + form.setValue("providerGroup", withoutDefault.join(",")); + } else { + form.setValue("providerGroup", newValue); + } + }, + [form] + ); + return ( diff --git a/src/app/[locale]/dashboard/_components/user/forms/edit-key-form.tsx b/src/app/[locale]/dashboard/_components/user/forms/edit-key-form.tsx index cabddee3e..a3a569601 100644 --- a/src/app/[locale]/dashboard/_components/user/forms/edit-key-form.tsx +++ b/src/app/[locale]/dashboard/_components/user/forms/edit-key-form.tsx @@ -1,7 +1,7 @@ "use client"; import { useRouter } from "next/navigation"; import { useTranslations } from "next-intl"; -import { useEffect, useState, useTransition } from "react"; +import { useCallback, useEffect, useState, useTransition } from "react"; import { toast } from "sonner"; import { editKey } from "@/actions/keys"; import { getAvailableProviderGroups } from "@/actions/providers"; @@ -138,6 +138,23 @@ export function EditKeyForm({ keyData, user, isAdmin = false, onSuccess }: EditK }, }); + // 选择分组时，自动移除 default（当有多个分组时） + const handleProviderGroupChange = useCallback( + (newValue: string) => { + const groups = newValue + .split(",") + .map((g) => g.trim()) + .filter(Boolean); + if (groups.length > 1 && groups.includes(PROVIDER_GROUP.DEFAULT)) { + const withoutDefault = groups.filter((g) => g !== PROVIDER_GROUP.DEFAULT); + form.setValue("providerGroup", withoutDefault.join(",")); + } else { + form.setValue("providerGroup", newValue); + } + }, + [form] + ); + return ( {config.description}} -
+
{children} From 302b158f70ec02cd1d947c1e84119cbf109a74dd Mon Sep 17 00:00:00 2001 From: NieiR Date: Thu, 8 Jan 2026 17:45:42 +0800 Subject: [PATCH 2/2] chore: fix CI lint errors - Update biome.json schema version from 2.3.10 to 2.3.11 - Remove unused Tooltip import from session-stats.tsx --- biome.json | 2 +- .../sessions/[sessionId]/messages/_components/session-stats.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/biome.json b/biome.json index 87362d2ac..107110c0f 100644 --- a/biome.json +++ b/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/2.3.10/schema.json", + "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json", "vcs": { "enabled": true, "clientKind": "git", diff --git a/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-stats.tsx b/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-stats.tsx index ec599a957..5d94a720f 100644 --- a/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-stats.tsx +++ b/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-stats.tsx @@ -14,7 +14,6 @@ import { import { useTranslations } from "next-intl"; import { Badge } from "@/components/ui/badge"; import { Separator } from "@/components/ui/separator"; -import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import { cn } from "@/lib/utils"; import { type CurrencyCode, formatCurrency } from "@/lib/utils/currency";