0.0.5.2

app/members/[id]/page.tsx

@@ -7,7 +7,7 @@ import { useFamily } from "@/context/family-context"
 import { SiteHeader } from "@/components/site-header"
 import { MemberForm } from "@/components/members/member-form"
 import { Button } from "@/components/ui/button"
-import { ArrowLeft, Edit, Trash, Share2, Printer, CircleUser, CircleUserRound, Images, BookOpen } from "lucide-react"
+import { ArrowLeft, Edit, Trash, Share2, Printer, CircleUser, CircleUserRound, Images, BookOpen, UserPlus } from "lucide-react"
 import { useState, useEffect } from "react"
 import type { FamilyMember } from "@/types/family"
 import { db } from "@/lib/db"
@@ -66,6 +66,28 @@ export default function MemberProfilePage() {
     }
   }
 
+  const handleQuickAddChild = () => {
+    // 跳转到新增成员页面，并预填父母信息
+    const params = new URLSearchParams()
+    if (member.gender === 'MALE') {
+      params.set('fatherId', member.id)
+    } else {
+      params.set('motherId', member.id)
+    }
+    params.set('generation', (member.generation + 1).toString())
+    router.push(`/members/new?${params.toString()}`)
+  }
+
+  const handleQuickAddSpouse = () => {
+    // 跳转到新增成员页面，并预填配偶信息
+    const params = new URLSearchParams()
+    params.set('spouseId', member.id)
+    params.set('generation', member.generation.toString())
+    // 配偶性别与当前成员相反
+    params.set('gender', member.gender === 'MALE' ? 'FEMALE' : 'MALE')
+    router.push(`/members/new?${params.toString()}`)
+  }
+
   if (isEditing) {
     return (
       <div className="min-h-screen flex flex-col bg-background">
@@ -145,7 +167,13 @@ export default function MemberProfilePage() {
             </div>
           </div>
 
-          <div className="flex gap-2">
+          <div className="flex gap-2 flex-wrap">
+            <Button variant="default" onClick={handleQuickAddChild} className="gap-2">
+              <UserPlus className="h-4 w-4" /> 添加子女
+            </Button>
+            <Button variant="secondary" onClick={handleQuickAddSpouse} className="gap-2">
+              <UserPlus className="h-4 w-4" /> 添加配偶
+            </Button>
             <Button variant="outline" size="icon" onClick={() => window.print()}>
               <Printer className="h-4 w-4" />
             </Button>

app/members/new/page.tsx

@@ -1,18 +1,69 @@
 "use client"
 
-import { useRouter } from "next/navigation"
+import { useRouter, useSearchParams } from "next/navigation"
 import { useFamily } from "@/context/family-context"
 import { SiteHeader } from "@/components/site-header"
 import { MemberForm } from "@/components/members/member-form"
 import { Button } from "@/components/ui/button"
 import { ArrowLeft } from "lucide-react"
 import type { FamilyMember } from "@/types/family"
+import { useMemo } from "react"
 
 export default function NewMemberPage() {
-  const { addMember, treeData } = useFamily()
   const router = useRouter()
+  const searchParams = useSearchParams()
+  const { addMember, treeData, getMember } = useFamily()
 
   const existingMembers = Object.values(treeData.members)
+  
+  // 从URL参数获取预填信息
+  const initialData = useMemo(() => {
+    const fatherId = searchParams.get('fatherId')
+    const motherId = searchParams.get('motherId')
+    const spouseId = searchParams.get('spouseId')
+    const generation = searchParams.get('generation')
+    const gender = searchParams.get('gender')
+    
+    if (!fatherId && !motherId && !spouseId && !generation && !gender) return undefined
+    
+    const data: Partial<FamilyMember> = {}
+    
+    // 处理父母信息
+    if (fatherId) {
+      data.fatherId = fatherId
+      // 如果有父亲，尝试获取母亲（父亲的配偶）
+      const father = getMember(fatherId)
+      if (father?.spouseIds && father.spouseIds.length > 0) {
+        data.motherId = father.spouseIds[0]
+      }
+    }
+    
+    if (motherId) {
+      data.motherId = motherId
+      // 如果有母亲，尝试获取父亲（母亲的配偶）
+      const mother = getMember(motherId)
+      if (mother?.spouseIds && mother.spouseIds.length > 0) {
+        data.fatherId = mother.spouseIds[0]
+      }
+    }
+    
+    // 处理配偶信息
+    if (spouseId) {
+      data.spouseIds = [spouseId]
+    }
+    
+    // 处理世代
+    if (generation) {
+      data.generation = parseInt(generation)
+    }
+    
+    // 处理性别
+    if (gender) {
+      data.gender = gender.toUpperCase() as 'MALE' | 'FEMALE'
+    }
+    
+    return data
+  }, [searchParams, getMember])
 
   const handleSave = async (newMember: FamilyMember) => {
     try {
@@ -39,7 +90,7 @@ export default function NewMemberPage() {
           </Button>
           <h1 className="text-2xl font-bold font-serif">新增家族成员</h1>
         </div>
-        <MemberForm existingMembers={existingMembers} onSubmit={handleSave} onCancel={() => router.back()} />
+        <MemberForm initialData={initialData} existingMembers={existingMembers} onSubmit={handleSave} onCancel={() => router.back()} />
       </div>
     </div>
   )