0.6.0.1

app/members/[id]/page.tsx

@@ -10,7 +10,7 @@ import { permissions } from "@/lib/permissions"
 import { MemberNameWithStatus } from "@/components/member-name-with-status"
 import { MemberVersionHistory } from "@/components/members/member-version-history"
 import { useSession } from "next-auth/react"
-import { useEffect, useState } from "react"
+import { useEffect, useState, useCallback } from "react"
 import { useParams, useRouter } from "next/navigation"
 import Link from "next/link"
 import { useFamily } from "@/context/family-context"
@@ -19,6 +19,7 @@ import { SiteHeader } from "@/components/site-header"
 import { MemberForm } from "@/components/members/member-form"
 import { Button } from "@/components/ui/button"
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs"
+import { AddRelationDialog, type RelationType } from "@/components/tree/add-relation-dialog"
 
 export default function MemberProfilePage() {
   const { id } = useParams()
@@ -32,6 +33,11 @@ export default function MemberProfilePage() {
   const [isUploadingAvatar, setIsUploadingAvatar] = useState(false)
   const [lastSaveTime, setLastSaveTime] = useState(Date.now())
   
+  // 添加成员对话框状态
+  const [relationDialog, setRelationDialog] = useState<{
+    type: RelationType
+  } | null>(null)
+  
   // 未登录时重定向到登录页
   useEffect(() => {
     if (status === 'unauthenticated') {
@@ -124,56 +130,100 @@ export default function MemberProfilePage() {
     }
   }
 
-  const handleQuickAddChild = () => {
-    // 跳转到新增成员页面，并预填父母信息
-    const params = new URLSearchParams(window.location.search)
-    if (member.gender === 'MALE') {
-      params.set('fatherId', member.id)
-      // 如果父亲有配偶，设置配偶为母亲
-      if (member.spouseIds && member.spouseIds.length > 0) {
-        params.set('motherId', member.spouseIds[0])
-      }
-    } else {
-      params.set('motherId', member.id)
-      // 如果母亲有配偶，设置配偶为父亲
-      if (member.spouseIds && member.spouseIds.length > 0) {
-        params.set('fatherId', member.spouseIds[0])
+  // 姓名分解函数
+  const parseName = (fullName: string): { surname: string; givenName: string } => {
+    const name = fullName.trim()
+    if (!name) return { surname: '', givenName: '' }
+    
+    const compoundSurnames = [
+      '欧阳', '太史', '端木', '上官', '司马', '东方', '独孤', '南宫', '万俟', '闻人',
+      '夏侯', '诸葛', '尉迟', '公羊', '赫连', '澹台', '皇甫', '宗政', '濮阳', '公冶',
+      '太叔', '申屠', '公孙', '慕容', '仲孙', '钟离', '长孙', '宇文', '司徒', '鲜于',
+      '司空', '闾丘', '子车', '亓官', '司寇', '巫马', '公西', '颛孙', '壤驷', '公良',
+      '漆雕', '乐正', '宰父', '谷梁', '拓跋', '夹谷', '轩辕', '令狐', '段干', '百里',
+      '呼延', '东郭', '南门', '羊舌', '微生', '公户', '公玉', '公仪', '梁丘', '公仲',
+      '公上', '公门', '公山', '公坚', '左丘', '公伯', '西门', '公祖', '第五', '公乘',
+      '贯丘', '公皙', '南荣', '东里', '东宫', '仲长', '子书', '子桑', '即墨', '达奚', '褚师'
+    ]
+    
+    for (const compound of compoundSurnames) {
+      if (name.startsWith(compound) && name.length > compound.length) {
+        return { surname: compound, givenName: name.slice(compound.length) }
       }
     }
-    params.set('generation', (member.generation + 1).toString())
+    
+    if (name.length >= 2) {
+      return { surname: name.charAt(0), givenName: name.slice(1) }
+    }
+    
+    return { surname: name, givenName: '' }
+  }
+
+  // 创建新成员的处理函数
+  const handleCreateNewRelation = useCallback((prefillName: string, relationType: RelationType) => {
+    if (!member) return
+    const params = new URLSearchParams()
+    
+    const { surname, givenName } = parseName(prefillName)
+    if (surname) params.set("surname", surname)
+    if (givenName) params.set("givenName", givenName)
+    
+    if (relationType === "child") {
+      params.set("generation", String(member.generation + 1))
+      if (member.gender === "MALE") {
+        params.set("fatherId", member.id)
+        if (member.spouseIds?.length) {
+          params.set("motherId", member.spouseIds[0])
+        }
+      } else if (member.gender === "FEMALE") {
+        params.set("motherId", member.id)
+        if (member.spouseIds?.length) {
+          params.set("fatherId", member.spouseIds[0])
+        }
+      }
+    } else if (relationType === "spouse") {
+      params.set("generation", String(member.generation))
+      params.set("spouseId", member.id)
+      params.set("gender", member.gender === "MALE" ? "FEMALE" : "MALE")
+      if (member.childrenIds && member.childrenIds.length > 0) {
+        member.childrenIds.forEach(id => {
+          params.append('childrenIds', id)
+        })
+      }
+    } else if (relationType === "father") {
+      params.set("generation", String(member.generation - 1))
+      params.set("childId", member.id)
+      params.set("gender", "MALE")
+      if (member.motherId) {
+        params.set("spouseId", member.motherId)
+      }
+    } else if (relationType === "mother") {
+      params.set("generation", String(member.generation - 1))
+      params.set("childId", member.id)
+      params.set("gender", "FEMALE")
+      if (member.fatherId) {
+        params.set("spouseId", member.fatherId)
+      }
+    }
+    
+    if (currentTree?.id) {
+      params.set("treeId", currentTree.id)
+    }
+    
+    setRelationDialog(null)
     router.push(`/members/new?${params.toString()}`)
+  }, [member, currentTree?.id, router])
+
+  const handleQuickAddChild = () => {
+    setRelationDialog({ type: 'child' })
   }
 
   const handleQuickAddSpouse = () => {
-    // 跳转到新增成员页面，并预填配偶信息
-    const params = new URLSearchParams(window.location.search)
-    params.set('spouseId', member.id)
-    params.set('generation', member.generation.toString())
-    // 配偶性别与当前成员相反
-    params.set('gender', member.gender === 'MALE' ? 'FEMALE' : 'MALE')
-    
-    // 如果当前成员有子女，将他们也作为新配偶的子女
-    if (member.childrenIds && member.childrenIds.length > 0) {
-      // 传递所有子女ID
-      member.childrenIds.forEach(id => {
-        params.append('childrenIds', id)
-      })
-    }
-    
-    router.push(`/members/new?${params.toString()}`)
+    setRelationDialog({ type: 'spouse' })
   }
 
   const handleQuickAddFather = () => {
-    // 跳转到新增成员页面，并预填父亲信息
-    const params = new URLSearchParams(window.location.search)
-    params.set('childId', member.id)
-    params.set('generation', (member.generation - 1).toString())
-    params.set('gender', 'MALE')
-    // 如果已有母亲，将母亲设置为配偶
-    if (member.motherId) {
-      params.set('spouseId', member.motherId)
-    }
-    router.push(`/members/new?${params.toString()}`)
+    setRelationDialog({ type: 'father' })
   }
 
   const handleAvatarUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -216,16 +266,7 @@ export default function MemberProfilePage() {
   }
 
   const handleQuickAddMother = () => {
-    // 跳转到新增成员页面，并预填母亲信息
-    const params = new URLSearchParams(window.location.search)
-    params.set('childId', member.id)
-    params.set('generation', (member.generation - 1).toString())
-    params.set('gender', 'FEMALE')
-    // 如果已有父亲，将父亲设置为配偶
-    if (member.fatherId) {
-      params.set('spouseId', member.fatherId)
-    }
-    router.push(`/members/new?${params.toString()}`)
+    setRelationDialog({ type: 'mother' })
   }
 
   if (isEditing) {
@@ -865,6 +906,19 @@ export default function MemberProfilePage() {
           </div>
         </Tabs>
       </main>
+      
+      {/* 添加成员对话框 */}
+      {relationDialog && member && (
+        <AddRelationDialog
+          open={!!relationDialog}
+          onOpenChange={(open) => {
+            if (!open) setRelationDialog(null)
+          }}
+          member={member}
+          relationType={relationDialog.type}
+          onCreateNew={handleCreateNewRelation}
+        />
+      )}
     </div>
   )
 }