0.0.5.1

app/members/[id]/page.tsx

@@ -17,13 +17,14 @@ import { useDialog } from "@/components/ui/alert-dialog-custom"
 
 export default function MemberProfilePage() {
   const { id } = useParams()
-  const { getMember, updateMember, deleteMember } = useFamily()
+  const { getMember, updateMember, deleteMember, treeData } = useFamily()
   const { showConfirm } = useDialog()
   const router = useRouter()
   const [isEditing, setIsEditing] = useState(false)
   const [avatarBlobUrl, setAvatarBlobUrl] = useState<string | undefined>(undefined)
 
   const member = getMember(id as string)
+  const allMembers = Object.values(treeData.members)
 
   // Load avatar blob if exists
   useEffect(() => {
@@ -76,7 +77,12 @@ export default function MemberProfilePage() {
             </Button>
             <h1 className="text-2xl font-bold font-serif">编辑成员: {member.fullName}</h1>
           </div>
-          <MemberForm initialData={member} onSubmit={handleSave} onCancel={() => setIsEditing(false)} />
+          <MemberForm 
+            initialData={member} 
+            existingMembers={allMembers}
+            onSubmit={handleSave} 
+            onCancel={() => setIsEditing(false)} 
+          />
         </div>
       </div>
     )

app/members/new/page.tsx

@@ -21,7 +21,8 @@ export default function NewMemberPage() {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
       })
-      router.push(`/members/${newMember.id}`)
+      // 跳转到成员列表页
+      router.push('/members')
     } catch (error) {
       console.error('添加成员失败:', error)
       alert('添加成员失败: ' + (error as Error).message)

app/members/page.tsx

@@ -112,7 +112,7 @@ export default function MembersPage() {
     return result.sort((a, b) => a.generation - b.generation || (a.birthDate || "").localeCompare(b.birthDate || ""))
   }, [allMembers, query, selectedSurname, selectedHome, statusFilter, generationRange])
   
-  // 按世代分组
+  // 按世代分组并排序
   const membersByGeneration = useMemo(() => {
     const groups = new Map<number, typeof filteredMembers>()
     
@@ -127,10 +127,46 @@ export default function MembersPage() {
     // 转换为数组并排序
     return Array.from(groups.entries())
       .sort((a, b) => a[0] - b[0])
-      .map(([generation, members]) => ({
-        generation,
-        members
-      }))
+      .map(([generation, members]) => {
+        // 对每个世代的成员进行排序
+        const sortedMembers = [...members].sort((a, b) => {
+          // 1. 始祖永远排第一
+          const aIsFounder = a.tags?.includes('始祖') || a.generation === 1
+          const bIsFounder = b.tags?.includes('始祖') || b.generation === 1
+          if (aIsFounder && !bIsFounder) return -1
+          if (!aIsFounder && bIsFounder) return 1
+          
+          // 2. 按出生日期排序
+          return (a.birthDate || "").localeCompare(b.birthDate || "")
+        })
+        
+        // 3. 将配偶插入到主成员后面
+        const result: typeof members = []
+        const processedSpouses = new Set<string>()
+        
+        sortedMembers.forEach(member => {
+          // 跳过已经作为配偶处理过的成员
+          if (processedSpouses.has(member.id)) return
+          
+          result.push(member)
+          
+          // 如果有配偶，将配偶紧跟在后面
+          if (member.spouseIds && member.spouseIds.length > 0) {
+            member.spouseIds.forEach(spouseId => {
+              const spouse = members.find(m => m.id === spouseId)
+              if (spouse && !processedSpouses.has(spouseId)) {
+                result.push(spouse)
+                processedSpouses.add(spouseId)
+              }
+            })
+          }
+        })
+        
+        return {
+          generation,
+          members: result
+        }
+      })
   }, [filteredMembers])
 
   const clearFilters = () => {