From 3a006ae64da8fba604141383760e50be24ef58d3 Mon Sep 17 00:00:00 2001 From: sw3205933776 <3205933776@qq.com> Date: Wed, 6 Aug 2025 18:43:36 +0800 Subject: [PATCH] fix(ui): fix alignment and spacing issues --- .env.development | 4 +- src/components/Toast/creditsToast.tsx | 8 +- src/components/Toast/storageToast.tsx | 8 +- src/components/Toast/trafficToast.tsx | 8 +- src/components/TopBar/index.tsx | 20 +- src/pages/Setting/Models.tsx | 291 +++++++++++++++----------- src/pages/SignUp.tsx | 2 +- src/store/chatStore.ts | 5 +- 8 files changed, 185 insertions(+), 161 deletions(-) diff --git a/.env.development b/.env.development index a063a032b..13a36dcc7 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,5 @@ VITE_BASE_URL=/api -VITE_PROXY_URL=https://dev.eigent.ai \ No newline at end of file +VITE_PROXY_URL=https://dev.eigent.ai + +VITE_USE_LOCAL_PROXY=false \ No newline at end of file diff --git a/src/components/Toast/creditsToast.tsx b/src/components/Toast/creditsToast.tsx index 42069dcb6..3c70ae24c 100644 --- a/src/components/Toast/creditsToast.tsx +++ b/src/components/Toast/creditsToast.tsx @@ -23,13 +23,7 @@ export function showCreditsToast() { , { duration: Infinity, - action: { - label: "Undo", - onClick: () => { - console.log("Undo clicked"); - toast.dismiss(); - }, - }, + closeButton: true, } ); } diff --git a/src/components/Toast/storageToast.tsx b/src/components/Toast/storageToast.tsx index 1200996f3..cde8f5242 100644 --- a/src/components/Toast/storageToast.tsx +++ b/src/components/Toast/storageToast.tsx @@ -19,13 +19,7 @@ export function showStorageToast() { , { duration: Infinity, - action: { - label: "Undo", - onClick: () => { - console.log("Undo clicked"); - toast.dismiss(); - }, - }, + closeButton: true, } ); } diff --git a/src/components/Toast/trafficToast.tsx b/src/components/Toast/trafficToast.tsx index 39875d7e7..a8c1f1e6f 100644 --- a/src/components/Toast/trafficToast.tsx +++ b/src/components/Toast/trafficToast.tsx @@ -9,13 +9,7 @@ export function showTrafficToast() { , { duration: 5000, - action: { - label: "Undo", - onClick: () => { - console.log("Undo clicked"); - toast.dismiss(); - }, - }, + closeButton: true, } ); } diff --git a/src/components/TopBar/index.tsx b/src/components/TopBar/index.tsx index 907c56b09..122794e36 100644 --- a/src/components/TopBar/index.tsx +++ b/src/components/TopBar/index.tsx @@ -59,7 +59,7 @@ function HeaderWin() { } if (response.savedPath) { window.location.href = - "https://eigent-ai.notion.site/23c511c70ba28030ab28e49e5010eca0?pvs=105"; + "https://github.com/eigent-ai/eigent/issues/new/choose"; alert("log saved:" + response.savedPath); } } catch (e: any) { @@ -141,14 +141,7 @@ function HeaderWin() { )} - +
{/* right */} @@ -157,6 +150,15 @@ function HeaderWin() { platform === "darwin" && "pr-2" } flex h-full items-center space-x-1 z-50 relative no-drag`} > + + + + ), + closeButton: true, }); return; @@ -362,20 +378,34 @@ export default function SettingModels() { toast("validate success", { description: "Verify model supports function calling to use Eigent.", - action: { - label: "Undo", - onClick: () => console.log("Undo"), - }, + closeButton: true, }); } else { console.log("failed", res.message); toast("validate failed", { - description: - "This model doesn't support Eigent's required capabilities (e.g., tool calls). Please switch models and try again.", - action: { - label: "Undo", - onClick: () => console.log("Undo"), - }, + description: ( +
+
{res.message}
+
+ +
+
+ ), + closeButton: true, }); return; @@ -526,117 +556,122 @@ export default function SettingModels() { return (
-
-
-
-
- Eigent Cloud Version + {import.meta.env.VITE_USE_LOCAL_PROXY !== "true" && ( +
+
+
+
+ Eigent Cloud Version +
+ { + if (checked) { + setLocalPrefer(false); + setActiveModelIdx(null); + setForm((f) => f.map((fi) => ({ ...fi, prefer: false }))); + setCloudPrefer(true); + setModelType("cloud"); + } else { + setCloudPrefer(false); + setModelType("custom"); + } + }} + />
- { - if (checked) { - setLocalPrefer(false); - setActiveModelIdx(null); - setForm((f) => f.map((fi) => ({ ...fi, prefer: false }))); - setCloudPrefer(true); - setModelType("cloud"); - } else { - setCloudPrefer(false); - setModelType("custom"); - } - }} - /> -
-
- - You are currently subscribed to the{" "} - {subscription?.plan_key?.charAt(0).toUpperCase() + - subscription?.plan_key?.slice(1)} - . Discover more about our{" "} - - { - window.location.href = `https://www.eigent.ai/pricing`; - }} - className="cursor-pointer text-text-body text-xs font-normal font-['Inter'] underline leading-tight" - > - pricing options - - - . - -
-
-
- -
- Credits:{" "} - {loadingCredits ? ( - - ) : ( - credits - )} -
-
-
-
- - Select Model Type - - - - - - - - + + You are currently subscribed to the{" "} + {subscription?.plan_key?.charAt(0).toUpperCase() + + subscription?.plan_key?.slice(1)} + . Discover more about our{" "} + + { + window.location.href = `https://www.eigent.ai/pricing`; + }} + className="cursor-pointer text-text-body text-xs font-normal font-['Inter'] underline leading-tight" > - - {cloud_model_type === "gpt-4.1-mini" - ? "GPT-4.1 Mini: Lower cost, faster responses, but reduced output quality." - : cloud_model_type === "gpt-4.1" - ? "GPT-4.1: Higher cost, slower responses, but superior quality and reasoning." - : "Gemini 2.5 Pro: Higher cost, slower responses, but superior quality and reasoning."} - - - + pricing options + + + . + +
-
- +
+ +
+ Credits:{" "} + {loadingCredits ? ( + + ) : ( + credits + )} +
+
+
+
+ + Select Model Type + + + + + + + + + + {cloud_model_type === "gpt-4.1-mini" + ? "GPT-4.1 Mini: Lower cost, faster responses, but reduced output quality." + : cloud_model_type === "gpt-4.1" + ? "GPT-4.1: Higher cost, slower responses, but superior quality and reasoning." + : "Gemini 2.5 Pro: Higher cost, slower responses, but superior quality and reasoning."} + + + +
+
+ +
-
+ )} {/* customer models */}
diff --git a/src/pages/SignUp.tsx b/src/pages/SignUp.tsx index 192f6713a..e52e28b46 100644 --- a/src/pages/SignUp.tsx +++ b/src/pages/SignUp.tsx @@ -336,7 +336,7 @@ export default function SignUp() { diff --git a/src/store/chatStore.ts b/src/store/chatStore.ts index 2dc4d0a83..46eb8ab1e 100644 --- a/src/store/chatStore.ts +++ b/src/store/chatStore.ts @@ -783,7 +783,7 @@ const chatStore = create()( addFileList(taskId, agentMessages.data.process_task_id as string, fileInfo); // Async file upload - if (!type && file_path && !import.meta.env.DEV) { + if (!type && file_path && import.meta.env.VITE_USE_LOCAL_PROXY!=='true') { (async () => { try { // Read file content using Electron API @@ -1612,6 +1612,9 @@ const chatStore = create()( // return '' // } const filterMessage = (message: AgentMessage) => { + if (message.data.toolkit_name?.includes('Search ')) { + message.data.toolkit_name='Search ' + } if (message.data.toolkit_name === 'Note Taking Toolkit') { message.data.message = message.data.message!.replace(/content='/g, '').replace(/', update=False/g, '').replace(/', update=True/g, '') }