Merge pull request #17 from osoulmate/main

fix： 修复多个问题

Author: osoulmate

src/actions/dictionary.ts

@@ -12,6 +12,7 @@ import {
     deleteDictionaryByIdDB, 
     findOrCreateDictionaryDB,
     findDictionariesGivenVisibilityDB,
+    findDictionaryByProjectIdDB
 } from "@/db/dictionary"
 import {createDictionaryEntryDB, 
     updateDictionaryEntryByIdDB, 
@@ -108,16 +109,25 @@ export async function fetchDictionaryByIdAction(id: string) {
 }
 
 // 仅获取词典元信息（更快，避免一次性返回大量 entries）
-export async function fetchDictionaryMetaByIdAction(id: string) {
+export async function fetchDictionaryMetaByIdAction(dictionaryId: string) {
     try {
-        const dictionary = await findDictionaryByIdDB(id)
+        const dictionary = await findDictionaryByIdDB(dictionaryId)
+        return { success: true, data: dictionary };
+    } catch (error) {
+        console.error("获取词典元信息失败:", error);
+        return { success: false, error: "获取词典元信息失败" };
+    }
+}
+// 仅获取词典元信息（更快，避免一次性返回大量 entries）
+export async function fetchDictionaryMetaByProjectIdAction(projectId: string) {
+    try {
+        const dictionary = await findDictionaryByProjectIdDB(projectId)
         return { success: true, data: dictionary };
     } catch (error) {
         console.error("获取词典元信息失败:", error);
         return { success: false, error: "获取词典元信息失败" };
     }
 }
-
 // 更新词典
 export async function updateDictionaryAction(id: string, data: {
     name?: string

src/agents/pre-translate/DictLookupAgent.ts

@@ -2,12 +2,12 @@ import { BaseAgent, type AgentRunContext } from '../base'
 import { dictionaryTool } from '../tools/dictionary'
 import { DictEntry, TermCandidate } from '@/types/terms'
 
-export class DictLookupAgent extends BaseAgent<{ terms: TermCandidate[]; tenantId?: string; userId?: string; locale?: string }, DictEntry[]> {
-  constructor(locale?: string) {
+export class DictLookupAgent extends BaseAgent<{ terms: TermCandidate[]; tenantId?: string; userId?: string; locale?: string ; domain?: string }, DictEntry[]> {
+  constructor(locale?: string, domain?: string) {
     super({
       name: 'dict-lookup',
       role: 'terminology_assistant',
-      domain: 'general',
+      domain: domain || 'general',
       specialty: '术语库查询', // This will be replaced by i18n
       locale: locale || 'zh'
     });

src/agents/pre-translate/MonoTermExtractAgent.ts

@@ -2,13 +2,13 @@ import { BaseAgent, type AgentRunContext } from '../base'
 import { TermCandidate } from '@/types/terms'
 import { createAgentI18n } from '../i18n'
 
-export class MonoTermExtractAgent extends BaseAgent<{ text: string; prompt?: string; locale?: string }, TermCandidate[]> {
+export class MonoTermExtractAgent extends BaseAgent<{ text: string; prompt?: string; locale?: string; domain?: string }, TermCandidate[]> {
 
-  constructor(locale?: string) {
+  constructor(locale?: string, domain?: string) {
     super({
       name: 'mono-term-extract',
       role: 'term_extractor',
-      domain: 'general',
+      domain: domain || 'general',
       quality: 'review',
       locale: locale || 'zh'
     });

src/app/(app)/auth/login/components/email-login-form.tsx

@@ -4,38 +4,72 @@ import { Button } from "@/components/ui/button";
 import { toast } from "sonner";
 import { emailLoginAction } from "@/actions/email-login";
 import { useTranslations } from "next-intl";
+import { Icons } from "@/components/icons"; // 导入图标组件
 
 export function EmailLoginForm({ buttonText }: { buttonText?: string }) {
   const [email, setEmail] = useState("");
   const [code, setCode] = useState("");
   const [cooldown, setCooldown] = useState(0);
   const [isPending, startTransition] = useTransition();
+  const [isSendingCode, setIsSendingCode] = useState(false); // 新增：发送验证码加载状态
   const t = useTranslations("Auth");
 
   const sendCode = async () => {
     if (!email) {
       toast.error(t("pleaseEnterEmail"));
       return;
     }
+    
+    // 验证邮箱格式
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(email)) {
+      toast.error(t("invalidEmailFormat"));
+      return;
+    }
+    
+    setIsSendingCode(true); // 开始发送，显示加载状态
+    
     try {
       const form = new FormData();
       form.set('mode', 'email');
       form.set('email', email);
-      const res = await fetch("/api/auth/send-code", { method: "POST", body: form });
+      
+      // 添加超时处理
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), 10000); // 10秒超时
+      
+      const res = await fetch("/api/auth/send-email", { 
+        method: "POST", 
+        body: form,
+        signal: controller.signal 
+      });
+      
+      clearTimeout(timeoutId);
+      
       if (res.ok) {
         toast.info(process.env.NODE_ENV === "development" ? t("codeSentDev") : t("codeSent"));
         setCooldown(60);
         const timer = setInterval(() => {
           setCooldown((s) => {
-            if (s <= 1) { clearInterval(timer); return 0; }
+            if (s <= 1) { 
+              clearInterval(timer); 
+              return 0; 
+            }
             return s - 1;
           });
         }, 1000);
       } else {
-        toast.error(t("sendFailed"));
+        const errorData = await res.json().catch(() => ({}));
+        toast.error(errorData.message || t("sendFailed"));
       }
     } catch (e: any) {
-      toast.error(`${t("sendFailed")}：${e.message}`);
+      if (e.name === 'AbortError') {
+        toast.error(t("requestTimeout"));
+      } else {
+        toast.error(`${t("sendFailed")}：${e.message}`);
+      }
+    } finally {
+      setIsSendingCode(false); // 结束发送，隐藏加载状态
     }
   };
 
@@ -50,7 +84,7 @@ export function EmailLoginForm({ buttonText }: { buttonText?: string }) {
 
   return (
     <form onSubmit={onSubmit} className="space-y-4">
-      <div className="flex flex-col justify-center gap-2  space-y-4">
+      <div className="flex flex-col justify-center gap-2 space-y-4">
         {/* 邮箱 */}
         <div>
           <div className="mb-1 text-sm">{t("email")}</div>
@@ -62,7 +96,8 @@ export function EmailLoginForm({ buttonText }: { buttonText?: string }) {
               value={email}
               onChange={(e) => setEmail(e.target.value)}
               required
-              className="mx-6 w-full p-1 bg-transparent outline-none border-none focus-visible:border-none focus-visible:ring-0 hover:border-none hover:ring-0"
+              disabled={isSendingCode} // 发送时禁用邮箱输入
+              className="mx-6 w-full p-1 bg-transparent outline-none border-none focus-visible:border-none focus-visible:ring-0 hover:border-none hover:ring-0 disabled:opacity-50 disabled:cursor-not-allowed"
             />
           </div>
         </div>
@@ -77,32 +112,54 @@ export function EmailLoginForm({ buttonText }: { buttonText?: string }) {
               type="text"
               value={code}
               onChange={(e) => setCode(e.target.value)}
-              className="mx-6 w-full p-1 bg-transparent outline-none border-none shadow-none focus-visible:border-none focus-visible:ring-0 hover:border-none hover:ring-0"
+              disabled={isSendingCode} // 发送时禁用验证码输入
+              className="mx-6 w-full p-1 bg-transparent outline-none border-none shadow-none focus-visible:border-none focus-visible:ring-0 hover:border-none hover:ring-0 disabled:opacity-50 disabled:cursor-not-allowed"
             />
             <Button
               type="button"
               variant="link"
               size="sm"
               onClick={sendCode}
-              disabled={cooldown > 0}
-              className="mr-2 text-primary"
+              disabled={cooldown > 0 || isSendingCode || !email}
+              className="mr-2 text-primary min-w-[100px] transition-all duration-300"
             >
-              {cooldown > 0 ? t("retryAfter", { seconds: cooldown }) : t("getCode")}
+              {isSendingCode ? (
+                <div className="flex items-center gap-2">
+                  <Icons.spinner className="h-4 w-4 animate-spin" />
+                  <span>{t("sending")}</span>
+                </div>
+              ) : cooldown > 0 ? (
+                <div className="flex items-center gap-2">
+                  <span>{t("retryAfter", { seconds: cooldown })}</span>
+                </div>
+              ) : (
+                <div className="flex items-center gap-2">
+                  <span>{t("getCode")}</span>
+                </div>
+              )}
             </Button>
           </div>
         </div>
 
-        {/* 条款提示已移除 */}
-
         {/* 提交按钮 */}
         <div className="space-y-4 pb-2">
-          <Button type="submit" variant="default" className="w-full transition delay-150 duration-300" disabled={isPending}>
-            {buttonText || t("login")}
+          <Button 
+            type="submit" 
+            variant="default" 
+            className="w-full transition delay-150 duration-300" 
+            disabled={isPending || isSendingCode}
+          >
+            {isPending ? (
+              <div className="flex items-center gap-2">
+                <Icons.spinner className="h-4 w-4 animate-spin" />
+                <span>{t("loggingIn")}</span>
+              </div>
+            ) : (
+              buttonText || t("login")
+            )}
           </Button>
         </div>
       </div>
     </form>
   );
-}
-
-
+}

src/app/(app)/auth/register/components/register-card.tsx

@@ -19,7 +19,7 @@ export const RegisterCard = () => {
       const form = new FormData();
       form.set('mode', 'email');
       form.set('email', email.trim());
-      const r = await fetch('/api/auth/send-code', { method: 'POST', body: form });
+      const r = await fetch('/api/auth/send-email', { method: 'POST', body: form });
       if (!r.ok) throw new Error(t("sendFailed"));
       toast.info(process.env.NODE_ENV === 'development' ? t("codeSentDev") : t("codeSent"));
       setCooldown(60);