0.3.0.4

components/members/member-form.tsx

@@ -3,7 +3,7 @@
 import type React from "react"
 
 import { useState } from "react"
-import type { FamilyMember } from "@/types/family"
+import type { FamilyMember, FamilyPhoto } from "@/types/family"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
@@ -64,10 +64,19 @@ export function MemberForm({ initialData, existingMembers = [], onSubmit, onCanc
       spouseIds: [],
       childrenIds: [],
       tags: [],
+      photos: [] as FamilyPhoto[],
+      photoIds: [] as string[],
     }
     
     if (!initialData) return defaults
     
+    const normalizedPhotos: FamilyPhoto[] = initialData.photos && initialData.photos.length > 0
+      ? initialData.photos
+      : (initialData.photoIds || []).map((url) => ({
+          url,
+          uploadedAt: initialData.updatedAt || new Date().toISOString(),
+        }))
+
     return {
       ...defaults,
       ...initialData,
@@ -77,6 +86,8 @@ export function MemberForm({ initialData, existingMembers = [], onSubmit, onCanc
       tags: initialData.tags || [],
       fatherId: initialData.fatherId || undefined,
       motherId: initialData.motherId || undefined,
+      photos: normalizedPhotos,
+      photoIds: initialData.photoIds || normalizedPhotos.map((photo) => photo.url),
     }
   })
 
@@ -117,6 +128,11 @@ export function MemberForm({ initialData, existingMembers = [], onSubmit, onCanc
     if (errors.length > 0) setErrors([])
   }
 
+  const handlePhotosChange = (photos: FamilyPhoto[]) => {
+    handleChange("photos", photos)
+    handleChange("photoIds", photos.map((photo) => photo.url))
+  }
+
   const handleSpouseAdd = (spouseId: string) => {
     if (!spouseId || spouseId === "none") return
     
@@ -852,8 +868,9 @@ export function MemberForm({ initialData, existingMembers = [], onSubmit, onCanc
           </CardHeader>
           <CardContent>
             <PhotoGallery
-              photoIds={formData.photoIds || []}
-              onChange={(photoIds) => handleChange("photoIds", photoIds)}
+              photos={formData.photos}
+              photoIds={formData.photoIds}
+              onChange={handlePhotosChange}
             />
           </CardContent>
         </Card>

components/members/photo-gallery.tsx

@@ -4,28 +4,47 @@ import { useState, useEffect } from "react"
 import { Button } from "@/components/ui/button"
 import { Card } from "@/components/ui/card"
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog"
-import { X, Upload, Image as ImageIcon, Plus, ZoomIn } from "lucide-react"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { X, Upload, Image as ImageIcon, Plus, ZoomIn, Edit2 } from "lucide-react"
 import { useDialog } from "@/components/ui/alert-dialog-custom"
 import imageCompression from "browser-image-compression"
+import type { FamilyPhoto } from "@/types/family"
+import { format } from "date-fns"
+import { zhCN } from "date-fns/locale"
 
 interface PhotoGalleryProps {
-  photoIds?: string[]
-  onChange: (photoIds: string[]) => void
+  photos?: FamilyPhoto[]
+  photoIds?: string[] // 兼容旧格式
+  onChange: (photos: FamilyPhoto[]) => Promise<void> | void
   readonly?: boolean
 }
 
-export function PhotoGallery({ photoIds = [], onChange, readonly = false }: PhotoGalleryProps) {
-  const { showAlert, showConfirm } = useDialog()
-  const [photos, setPhotos] = useState<{ id: string; url: string }[]>([])
-  const [selectedPhoto, setSelectedPhoto] = useState<string | null>(null)
+export function PhotoGallery({ photos: propPhotos = [], photoIds = [], onChange, readonly = false }: PhotoGalleryProps) {
+  const { showAlert, showConfirm, showPrompt } = useDialog()
+  const [photos, setPhotos] = useState<FamilyPhoto[]>([])
+  const [selectedPhoto, setSelectedPhoto] = useState<FamilyPhoto | null>(null)
   const [isUploading, setIsUploading] = useState(false)
+  const [editingPhoto, setEditingPhoto] = useState<FamilyPhoto | null>(null)
+  const [editCaption, setEditCaption] = useState("")
 
-  // 加载照片
+  // 加载照片 - 兼容新旧格式
   useEffect(() => {
-    // photoIds 现在直接是 URL 数组
-    const loadedPhotos = photoIds.map((url) => ({ id: url, url }))
-    setPhotos(loadedPhotos)
-  }, [photoIds])
+    // 优先使用新格式 photos
+    if (propPhotos && propPhotos.length > 0) {
+      setPhotos(propPhotos)
+    } else if (photoIds && photoIds.length > 0) {
+      // 兼容旧格式：将 string[] 转换为 FamilyPhoto[]
+      const convertedPhotos: FamilyPhoto[] = photoIds.map(url => ({
+        url,
+        uploadedAt: new Date().toISOString() // 旧数据没有时间，用当前时间
+      }))
+      setPhotos(convertedPhotos)
+    } else {
+      setPhotos([])
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [JSON.stringify(propPhotos), JSON.stringify(photoIds)])
 
   const handleUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const files = e.target.files
@@ -33,7 +52,7 @@ export function PhotoGallery({ photoIds = [], onChange, readonly = false }: Phot
 
     setIsUploading(true)
     try {
-      const newPhotoIds: string[] = []
+      const newPhotos: FamilyPhoto[] = []
 
       for (const file of Array.from(files)) {
         if (!file.type.startsWith('image/')) continue
@@ -61,11 +80,14 @@ export function PhotoGallery({ photoIds = [], onChange, readonly = false }: Phot
         }
 
         const { url } = await response.json()
-        newPhotoIds.push(url)
+        newPhotos.push({
+          url,
+          uploadedAt: new Date().toISOString()
+        })
       }
 
       // 更新照片列表
-      onChange([...photoIds, ...newPhotoIds])
+      onChange([...photos, ...newPhotos])
     } catch (error) {
       console.error('上传照片失败:', error)
       await showAlert('上传照片失败', '错误')
@@ -75,10 +97,33 @@ export function PhotoGallery({ photoIds = [], onChange, readonly = false }: Phot
     }
   }
 
-  const handleDelete = async (photoId: string) => {
+  const handleDelete = async (photo: FamilyPhoto) => {
     const confirmed = await showConfirm('确定要删除这张照片吗？', '删除照片')
     if (confirmed) {
-      onChange(photoIds.filter(id => id !== photoId))
+      onChange(photos.filter(p => p.url !== photo.url))
+    }
+  }
+
+  const handleEditCaption = (photo: FamilyPhoto) => {
+    setEditingPhoto(photo)
+    setEditCaption(photo.caption || "")
+  }
+
+  const handleSaveCaption = async () => {
+    if (!editingPhoto) return
+    const updatedPhotos = photos.map(p => 
+      p.url === editingPhoto.url 
+        ? { ...p, caption: editCaption.trim() || undefined }
+        : p
+    )
+    
+    try {
+      await onChange(updatedPhotos)
+      setEditingPhoto(null)
+      setEditCaption("")
+    } catch (error) {
+      console.error("保存说明失败:", error)
+      await showAlert("保存说明失败，请重试", "错误")
     }
   }
 
@@ -114,31 +159,55 @@ export function PhotoGallery({ photoIds = [], onChange, readonly = false }: Phot
 
       {photos.length > 0 ? (
         <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
-          {photos.map((photo) => (
-            <div key={photo.id} className="relative group aspect-square">
-              <img
-                src={photo.url}
-                alt="家族照片"
-                className="w-full h-full object-cover rounded-lg border border-border cursor-pointer hover:opacity-90 transition-opacity"
-                onClick={() => setSelectedPhoto(photo.url)}
-              />
+          {photos.map((photo, index) => (
+            <div key={photo.url + index} className="relative group">
+              <div className="aspect-square">
+                <img
+                  src={photo.url}
+                  alt={photo.caption || "家族照片"}
+                  className="w-full h-full object-cover rounded-t-lg border border-border cursor-pointer hover:opacity-90 transition-opacity"
+                  onClick={() => setSelectedPhoto(photo)}
+                />
+              </div>
+              {/* 照片信息区域 */}
+              <div className="p-2 bg-muted/50 rounded-b-lg border border-t-0 border-border text-xs">
+                <div className="text-muted-foreground">
+                  {format(new Date(photo.uploadedAt), 'yyyy-MM-dd', { locale: zhCN })}
+                </div>
+                {photo.caption && (
+                  <div className="text-foreground mt-1 line-clamp-2">{photo.caption}</div>
+                )}
+              </div>
+              {/* 操作按钮 */}
               {!readonly && (
-                <Button
-                  type="button"
-                  variant="destructive"
-                  size="icon"
-                  className="absolute top-2 right-2 h-6 w-6 opacity-0 group-hover:opacity-100 transition-opacity"
-                  onClick={() => handleDelete(photo.id)}
-                >
-                  <X className="h-3 w-3" />
-                </Button>
+                <>
+                  <Button
+                    type="button"
+                    variant="destructive"
+                    size="icon"
+                    className="absolute top-2 right-2 h-6 w-6 opacity-0 group-hover:opacity-100 transition-opacity"
+                    onClick={() => handleDelete(photo)}
+                  >
+                    <X className="h-3 w-3" />
+                  </Button>
+                  <Button
+                    type="button"
+                    variant="secondary"
+                    size="icon"
+                    className="absolute top-2 right-10 h-6 w-6 opacity-0 group-hover:opacity-100 transition-opacity"
+                    onClick={() => handleEditCaption(photo)}
+                    title="编辑说明"
+                  >
+                    <Edit2 className="h-3 w-3" />
+                  </Button>
+                </>
               )}
               <Button
                 type="button"
                 variant="secondary"
                 size="icon"
-                className="absolute bottom-2 right-2 h-6 w-6 opacity-0 group-hover:opacity-100 transition-opacity"
-                onClick={() => setSelectedPhoto(photo.url)}
+                className="absolute bottom-12 right-2 h-6 w-6 opacity-0 group-hover:opacity-100 transition-opacity"
+                onClick={() => setSelectedPhoto(photo)}
               >
                 <ZoomIn className="h-3 w-3" />
               </Button>
@@ -153,19 +222,56 @@ export function PhotoGallery({ photoIds = [], onChange, readonly = false }: Phot
 
       {/* 照片预览对话框 */}
       <Dialog open={!!selectedPhoto} onOpenChange={() => setSelectedPhoto(null)}>
-        <DialogContent className="max-w-4xl">
+        <DialogContent className="max-w-4xl" aria-describedby={undefined}>
           <DialogHeader>
-            <DialogTitle>照片预览</DialogTitle>
+            <DialogTitle>
+              {selectedPhoto?.caption || "照片预览"}
+            </DialogTitle>
           </DialogHeader>
           {selectedPhoto && (
-            <img
-              src={selectedPhoto}
-              alt="照片预览"
-              className="w-full h-auto max-h-[70vh] object-contain"
-            />
+            <div className="space-y-2">
+              <img
+                src={selectedPhoto.url}
+                alt={selectedPhoto.caption || "照片预览"}
+                className="w-full h-auto max-h-[70vh] object-contain"
+              />
+              <div className="text-sm text-muted-foreground">
+                上传于 {format(new Date(selectedPhoto.uploadedAt), 'yyyy年MM月dd日', { locale: zhCN })}
+              </div>
+            </div>
           )}
         </DialogContent>
       </Dialog>
+
+      {/* 编辑说明对话框 */}
+      <Dialog open={!!editingPhoto} onOpenChange={() => setEditingPhoto(null)}>
+        <DialogContent aria-describedby={undefined}>
+          <DialogHeader>
+            <DialogTitle>编辑照片说明</DialogTitle>
+          </DialogHeader>
+          <div className="space-y-4">
+            <div className="space-y-2">
+              <Label htmlFor="caption">照片说明（选填）</Label>
+              <Input
+                id="caption"
+                value={editCaption}
+                onChange={(e) => setEditCaption(e.target.value)}
+                placeholder="输入照片说明..."
+                maxLength={200}
+              />
+              <p className="text-xs text-muted-foreground">{editCaption.length}/200</p>
+            </div>
+            <div className="flex justify-end gap-2">
+              <Button variant="outline" onClick={() => setEditingPhoto(null)}>
+                取消
+              </Button>
+              <Button onClick={handleSaveCaption}>
+                保存
+              </Button>
+            </div>
+          </div>
+        </DialogContent>
+      </Dialog>
     </div>
   )
 }