From 57552b31593ddb895183008c2275c1452fca5bbd Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 18 Oct 2025 16:52:02 +0800 Subject: [PATCH] fix: unify dialog layout and fix content padding issues - Fix negative margin overflow in all dialog content areas - Standardize dialog structure with flex-col layout - Add consistent py-4 spacing to all content areas - Ensure proper spacing between header, content, and footer Affected components: - AddProviderDialog, EditProviderDialog - McpFormModal, McpPanel - UsageScriptModal - SettingsDialog All dialogs now follow unified layout pattern: - DialogContent: flex flex-col max-h-[90vh] - Content area: flex-1 overflow-y-auto px-6 py-4 - No negative margins that cause content overflow --- src/App.tsx | 7 +- src/components/UsageFooter.tsx | 10 +- src/components/UsageScriptModal.tsx | 2 +- src/components/mcp/McpFormModal.tsx | 13 +- src/components/mcp/McpPanel.tsx | 8 +- .../providers/AddProviderDialog.tsx | 14 +- .../providers/EditProviderDialog.tsx | 2 +- .../providers/forms/ClaudeConfigEditor.tsx | 10 +- .../providers/forms/ClaudeFormFields.tsx | 4 +- .../forms/CodexCommonConfigModal.tsx | 5 +- .../providers/forms/CodexConfigEditor.tsx | 11 +- .../providers/forms/CodexQuickWizardModal.tsx | 29 ++-- .../providers/forms/CommonConfigEditor.tsx | 8 +- .../providers/forms/EndpointSpeedTest.tsx | 25 ++- .../providers/forms/ProviderForm.tsx | 32 ++-- .../providers/forms/hooks/useApiKeyLink.ts | 9 +- .../providers/forms/hooks/useBaseUrlState.ts | 10 +- .../forms/hooks/useCodexCommonConfig.ts | 22 ++- .../forms/hooks/useCodexConfigState.ts | 144 ++++++++++-------- .../forms/hooks/useCodexTomlValidation.ts | 40 ++--- .../forms/hooks/useCommonConfigSnippet.ts | 13 +- .../forms/hooks/useKimiModelSelector.ts | 35 +++-- .../providers/forms/hooks/useModelState.ts | 5 +- .../forms/hooks/useSpeedTestEndpoints.ts | 2 +- .../forms/hooks/useTemplateValues.ts | 5 +- src/components/settings/SettingsDialog.tsx | 19 ++- src/components/settings/ThemeSettings.tsx | 7 +- src/hooks/useMcpActions.ts | 7 +- src/hooks/useSettings.ts | 5 +- src/hooks/useSettingsMetadata.ts | 5 +- src/lib/query/queries.ts | 6 +- 31 files changed, 306 insertions(+), 208 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index cae24ff..25835f1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,7 +4,12 @@ import { toast } from "sonner"; import { Plus, Settings } from "lucide-react"; import type { Provider } from "@/types"; import { useProvidersQuery } from "@/lib/query"; -import { providersApi, settingsApi, type AppType, type ProviderSwitchEvent } from "@/lib/api"; +import { + providersApi, + settingsApi, + type AppType, + type ProviderSwitchEvent, +} from "@/lib/api"; import { useProviderActions } from "@/hooks/useProviderActions"; import { extractErrorMessage } from "@/utils/errorUtils"; import { AppSwitcher } from "@/components/AppSwitcher"; diff --git a/src/components/UsageFooter.tsx b/src/components/UsageFooter.tsx index 2422100..1241335 100644 --- a/src/components/UsageFooter.tsx +++ b/src/components/UsageFooter.tsx @@ -15,11 +15,11 @@ const UsageFooter: React.FC = ({ appType, usageEnabled, }) => { - const { data: usage, isLoading: loading, refetch } = useUsageQuery( - providerId, - appType, - usageEnabled, - ); + const { + data: usage, + isLoading: loading, + refetch, + } = useUsageQuery(providerId, appType, usageEnabled); // 只在启用用量查询且有数据时显示 if (!usageEnabled || !usage) return null; diff --git a/src/components/UsageScriptModal.tsx b/src/components/UsageScriptModal.tsx index e7ab09e..ee79a06 100644 --- a/src/components/UsageScriptModal.tsx +++ b/src/components/UsageScriptModal.tsx @@ -179,7 +179,7 @@ const UsageScriptModal: React.FC = ({ {/* Content - Scrollable */} -
+
{/* 启用开关 */}