From 40fc7a4a37671957d4c93a2eb096e1cb3dde35fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=9E=97=E9=93=96?= Date: Sat, 1 Aug 2026 13:43:58 +0800 Subject: [PATCH] feat: add inline work review annotations --- .../WorkReviewAnnotationMarker.tsx | 61 +++ components/work-review/WorkReviewBoard.tsx | 84 ++-- components/work-review/WorkReviewHeader.tsx | 24 +- .../work-review/WorkReviewImageGallery.tsx | 22 +- .../work-review/WorkReviewProjectCard.tsx | 29 +- .../WorkReviewReviewerWorkspace.tsx | 431 ++++++++++++++++-- lib/__tests__/work-review-policy.test.ts | 29 +- .../work-review-reviewer-workspace.test.tsx | 105 +++++ lib/work-review-policy.ts | 54 +++ lib/work-review-service.ts | 14 +- types/work-review.ts | 9 + 11 files changed, 777 insertions(+), 85 deletions(-) create mode 100644 components/work-review/WorkReviewAnnotationMarker.tsx create mode 100644 lib/__tests__/work-review-reviewer-workspace.test.tsx diff --git a/components/work-review/WorkReviewAnnotationMarker.tsx b/components/work-review/WorkReviewAnnotationMarker.tsx new file mode 100644 index 00000000..ca1792d7 --- /dev/null +++ b/components/work-review/WorkReviewAnnotationMarker.tsx @@ -0,0 +1,61 @@ +'use client' + +import type { WorkReviewImageAnnotation, WorkReviewRole } from '@/types/work-review' + +export type WorkReviewDisplayAnnotation = { + annotation: WorkReviewImageAnnotation + markerNumber: number + reviewerName?: string + reviewerRole?: WorkReviewRole + draft?: boolean +} + +function markerTone(item: WorkReviewDisplayAnnotation) { + if (item.draft) return 'bg-[#8a5200] text-white ring-[#fff3d6]' + if (item.reviewerRole === 'final_reviewer') return 'bg-[#087a3c] text-white ring-[#d9f6e5]' + return 'bg-[#0050cb] text-white ring-[#dcecff]' +} + +export function WorkReviewAnnotationMarker({ + item, + onClick, +}: { + item: WorkReviewDisplayAnnotation + onClick?: () => void +}) { + const { annotation } = item + const alignRight = annotation.x > 0.62 + const roleLabel = item.draft + ? '当前批注' + : item.reviewerRole === 'final_reviewer' + ? '元泽' + : '评审人' + const summary = annotation.comment.trim() || '待填写修改意见' + const label = `${roleLabel}标注 ${item.markerNumber}${item.reviewerName ? `,${item.reviewerName}` : ''}:${summary}` + + return ( + + ) +} diff --git a/components/work-review/WorkReviewBoard.tsx b/components/work-review/WorkReviewBoard.tsx index 3a96b972..541779ff 100644 --- a/components/work-review/WorkReviewBoard.tsx +++ b/components/work-review/WorkReviewBoard.tsx @@ -16,12 +16,10 @@ import type { WorkReviewBoardData, WorkReviewProject, WorkReviewReviewInput, - WorkReviewRole, WorkReviewStatus, WorkReviewSubmissionInput, - WorkReviewVersion, } from '@/types/work-review' -import { WorkReviewSubmissionDialog, WorkReviewReviewDialog } from './WorkReviewDialogs' +import { WorkReviewSubmissionDialog } from './WorkReviewDialogs' import { WorkReviewHeader } from './WorkReviewHeader' import { WorkReviewProjectCard } from './WorkReviewProjectCard' import { WorkReviewReviewerWorkspace } from './WorkReviewReviewerWorkspace' @@ -85,11 +83,6 @@ export default function WorkReviewBoard() { mode: 'create' | 'resubmit' project?: WorkReviewProject } | null>(null) - const [reviewDialog, setReviewDialog] = useState<{ - project: WorkReviewProject - version: WorkReviewVersion - role: WorkReviewRole - } | null>(null) const { toast, showToast } = useToast() useEffect(() => { @@ -126,7 +119,7 @@ export default function WorkReviewBoard() { updateUrl() }, [sessionStatus, updateUrl]) - const load = useCallback(async () => { + const load = useCallback(async (options?: { board?: boolean }) => { if (sessionStatus !== 'authenticated') return const sequence = requestSequenceRef.current + 1 requestSequenceRef.current = sequence @@ -136,12 +129,12 @@ export default function WorkReviewBoard() { setLoading(true) setError(null) try { - const deepLinkProject = deepLinkProjectRef.current + const deepLinkProject = options?.board ? '' : deepLinkProjectRef.current const nextData = await getWorkReviewBoard({ - query: debouncedQuery, - status: statusFilter, + query: options?.board ? '' : debouncedQuery, + status: options?.board ? '' : statusFilter, project: deepLinkProject, - page, + page: options?.board ? 1 : page, pageSize: 20, }, controller.signal) if (sequence !== requestSequenceRef.current) return @@ -218,9 +211,14 @@ export default function WorkReviewBoard() { const submitReview = async (versionId: string, input: WorkReviewReviewInput) => { const project = await submitWorkReview(versionId, input) replaceProject(project) - setReviewDialog(null) setExpandedProjectId(project.id) - showToast(input.reviewerRole === 'manager' ? '指定评审人意见已提交' : '元泽评审已提交') + if (project.status === 'approved') { + showToast('评审已完成,作品通过结果已通知发起人') + } else if (project.status === 'revision_required') { + showToast('评审已完成,修改意见已通知发起人') + } else { + showToast('评审意见已提交,等待另一位评审完成') + } } const pageStats = useMemo(() => { @@ -240,11 +238,10 @@ export default function WorkReviewBoard() { const me = data?.me const canSubmit = Boolean(me?.permissions.canSubmit) - const requestedProject = initialProjectRef.current - ? data?.items.find((item) => item.id === initialProjectRef.current) + const requestedProject = expandedProjectId + ? data?.items.find((item) => item.id === expandedProjectId) : null - const singleProject = data?.items.length === 1 ? data.items[0] : null - const reviewerCandidate = requestedProject || singleProject + const reviewerCandidate = requestedProject const reviewerEmployeeId = me?.employee?.id const reviewerFocusProject = reviewerCandidate && ( reviewerCandidate.permissions.pendingReviewRoles.length > 0 @@ -260,13 +257,26 @@ export default function WorkReviewBoard() { setSubmissionDialog({ mode: 'create' })} + wide + primaryAction={{ + label: '返回看板', + icon: 'back', + onClick: () => { + deepLinkProjectRef.current = '' + setExpandedProjectId('') + setQuery('') + setDebouncedQuery('') + setStatusFilter('') + setPage(1) + router.replace('/work-review', { scroll: false }) + void load({ board: true }) + }, + }} />
setReviewDialog({ project: reviewerFocusProject, version, role })} + onSubmitReview={(version, input) => submitReview(version.id, input)} />
@@ -280,15 +290,6 @@ export default function WorkReviewBoard() { : submitVersion(submissionDialog.project!.id, input)} /> )} - {reviewDialog && ( - setReviewDialog(null)} - onSubmit={(input) => submitReview(reviewDialog.version.id, input)} - /> - )} {toast?.show && } ) @@ -299,8 +300,11 @@ export default function WorkReviewBoard() { setSubmissionDialog({ mode: 'create' })} + primaryAction={canSubmit ? { + label: '提交作品', + icon: 'add', + onClick: () => setSubmissionDialog({ mode: 'create' }), + } : undefined} />
@@ -418,7 +422,10 @@ export default function WorkReviewBoard() { updateUrl({ project: nextId, replaceProject: true }) }} onResubmit={() => setSubmissionDialog({ mode: 'resubmit', project })} - onReview={(version, role) => setReviewDialog({ project, version, role })} + onReview={() => { + setExpandedProjectId(project.id) + updateUrl({ project: project.id, replaceProject: true }) + }} /> ))} @@ -501,15 +508,6 @@ export default function WorkReviewBoard() { : submitVersion(submissionDialog.project!.id, input)} /> )} - {reviewDialog && ( - setReviewDialog(null)} - onSubmit={(input) => submitReview(reviewDialog.version.id, input)} - /> - )} {toast?.show && } ) diff --git a/components/work-review/WorkReviewHeader.tsx b/components/work-review/WorkReviewHeader.tsx index 40b2fc42..1135e91c 100644 --- a/components/work-review/WorkReviewHeader.tsx +++ b/components/work-review/WorkReviewHeader.tsx @@ -6,19 +6,23 @@ import Link from 'next/link' export function WorkReviewHeader({ name, avatar, - onCreate, - canCreate, + primaryAction, + wide = false, }: { name: string avatar?: string | null - canCreate: boolean - onCreate: () => void + primaryAction?: { + label: string + onClick: () => void + icon: 'add' | 'back' + } + wide?: boolean }) { const initials = name.trim().slice(0, 2) || '我' return (
-
+
{avatar ? ( @@ -39,14 +43,16 @@ export function WorkReviewHeader({
- {canCreate && ( + {primaryAction && ( )} (null) const displayGroups = useMemo(() => normalizeGroups(groups || [], imageUrls || []), [groups, imageUrls]) @@ -91,6 +97,11 @@ export function WorkReviewImageGallery({ 长图 · {group.slices.length} 段 )} + {(annotationsByImageIndex[index]?.length || 0) > 0 && ( + + {annotationsByImageIndex[index].length} 个批注 + + )}
))} @@ -99,6 +110,7 @@ export function WorkReviewImageGallery({ group={activeIndex == null ? null : displayGroups[activeIndex]} index={activeIndex} total={displayGroups.length} + annotations={activeIndex == null ? [] : annotationsByImageIndex[activeIndex] || []} onClose={() => setActiveIndex(null)} onPrevious={() => setActiveIndex((current) => ( current == null ? null : (current - 1 + displayGroups.length) % displayGroups.length @@ -115,6 +127,7 @@ function WorkReviewImageViewer({ group, index, total, + annotations, onClose, onPrevious, onNext, @@ -122,6 +135,7 @@ function WorkReviewImageViewer({ group: WorkReviewImageGroup | null index: number | null total: number + annotations: WorkReviewDisplayAnnotation[] onClose: () => void onPrevious: () => void onNext: () => void @@ -223,7 +237,7 @@ function WorkReviewImageViewer({ )} -
+
{(group.slices.length > 0 ? group.slices : [{ url: group.previewUrl, width: group.previewWidth, @@ -240,6 +254,12 @@ function WorkReviewImageViewer({ className="block h-auto w-full" /> ))} + {annotations.map((item) => ( + + ))}
, diff --git a/components/work-review/WorkReviewProjectCard.tsx b/components/work-review/WorkReviewProjectCard.tsx index a00a83b2..e23d1952 100644 --- a/components/work-review/WorkReviewProjectCard.tsx +++ b/components/work-review/WorkReviewProjectCard.tsx @@ -9,6 +9,7 @@ import type { WorkReviewVersion, } from '@/types/work-review' import { WorkReviewImageGallery } from './WorkReviewImageGallery' +import type { WorkReviewDisplayAnnotation } from './WorkReviewAnnotationMarker' import { WorkReviewDecisionBadge, WorkReviewStatusBadge } from './WorkReviewStatusBadge' function formatDateOnly(value: string) { @@ -48,6 +49,23 @@ function getVersionReview(version: WorkReviewVersion, role: WorkReviewRole) { return version.reviews.find((review) => review.reviewerRole === role) || null } +function getVersionAnnotations(version: WorkReviewVersion): WorkReviewDisplayAnnotation[][] { + const imageCount = version.imageGroups?.length || version.imageUrls?.length || 0 + const result = Array.from({ length: imageCount }, () => [] as WorkReviewDisplayAnnotation[]) + for (const review of version.reviews || []) { + for (const imageComment of review.imageComments || []) { + if (!result[imageComment.imageIndex]) continue + result[imageComment.imageIndex].push(...(imageComment.annotations || []).map((annotation, index) => ({ + annotation, + markerNumber: index + 1, + reviewerName: review.reviewerName, + reviewerRole: review.reviewerRole, + }))) + } + } + return result +} + function ReviewProgress({ project, version, @@ -86,7 +104,7 @@ export function WorkReviewProjectCard({ expanded: boolean onToggle: () => void onResubmit: () => void - onReview: (version: WorkReviewVersion, role: WorkReviewRole) => void + onReview: () => void }) { const latestVersion = project.versions[0] const [selectedVersionId, setSelectedVersionId] = useState(latestVersion?.id || '') @@ -103,6 +121,10 @@ export function WorkReviewProjectCard({ ) const cover = latestVersion?.imageGroups?.[0]?.previewUrl || latestVersion?.imageUrls?.[0] || '' const isLatestSelected = selectedVersion?.id === latestVersion?.id + const annotationsByImageIndex = useMemo( + () => selectedVersion ? getVersionAnnotations(selectedVersion) : [], + [selectedVersion], + ) if (!latestVersion || !selectedVersion) return null @@ -228,6 +250,7 @@ export function WorkReviewProjectCard({ {(selectedVersion.referenceImageGroups || []).length > 0 && ( @@ -259,7 +282,7 @@ export function WorkReviewProjectCard({ isLatestSelected && project.permissions.pendingReviewRoles.includes('manager') )} - onReview={() => onReview(selectedVersion, 'manager')} + onReview={onReview} /> onReview(selectedVersion, 'final_reviewer')} + onReview={onReview} />
diff --git a/components/work-review/WorkReviewReviewerWorkspace.tsx b/components/work-review/WorkReviewReviewerWorkspace.tsx index 505f0902..078a806a 100644 --- a/components/work-review/WorkReviewReviewerWorkspace.tsx +++ b/components/work-review/WorkReviewReviewerWorkspace.tsx @@ -3,15 +3,22 @@ import Image from 'next/image' import { useEffect, useMemo, useRef, useState } from 'react' import type { + WorkReviewImageAnnotation, WorkReviewImageGroup, WorkReviewProject, - WorkReviewRole, + WorkReviewReviewInput, WorkReviewVersion, } from '@/types/work-review' +import { + WorkReviewAnnotationMarker, + type WorkReviewDisplayAnnotation, +} from './WorkReviewAnnotationMarker' const PROXY_HOSTS = new Set(['s3.jiansun.vip', 's3.yydd.ai', 's3.1080p.hk']) const MIN_PANE_PERCENT = 14 const MAX_PANE_PERCENT = 86 +const MAX_ANNOTATIONS_PER_IMAGE = 50 +const MAX_ANNOTATION_COMMENT_LENGTH = 1000 function proxyImageUrl(value: string) { const url = String(value || '').trim() @@ -54,37 +61,96 @@ function normalizeGroups( })) } +function createAnnotationId() { + if (typeof window !== 'undefined' && typeof window.crypto?.randomUUID === 'function') { + return window.crypto.randomUUID() + } + return `point-${Date.now()}-${Math.random().toString(36).slice(2, 9)}` +} + function LongImagePane({ label, groups, imageUrls, emptyMessage, + activeIndex: controlledActiveIndex, + onActiveIndexChange, + annotations = [], + annotationEnabled = false, + annotationMode = false, + onToggleAnnotationMode, + onAddAnnotation, + onSelectDraftAnnotation, }: { label: string groups: WorkReviewImageGroup[] imageUrls: string[] emptyMessage: string + activeIndex?: number + onActiveIndexChange?: (index: number) => void + annotations?: WorkReviewDisplayAnnotation[] + annotationEnabled?: boolean + annotationMode?: boolean + onToggleAnnotationMode?: () => void + onAddAnnotation?: (x: number, y: number) => void + onSelectDraftAnnotation?: (annotationId: string) => void }) { const displayGroups = useMemo( () => normalizeGroups(groups || [], imageUrls || [], label), [groups, imageUrls, label], ) - const [activeIndex, setActiveIndex] = useState(0) - const activeGroup = displayGroups[Math.min(activeIndex, Math.max(0, displayGroups.length - 1))] + const [internalActiveIndex, setInternalActiveIndex] = useState(0) + const pointerStartRef = useRef<{ x: number; y: number } | null>(null) + const activeIndex = Math.min( + controlledActiveIndex ?? internalActiveIndex, + Math.max(0, displayGroups.length - 1), + ) + const activeGroup = displayGroups[activeIndex] - useEffect(() => setActiveIndex(0), [displayGroups.length]) + useEffect(() => { + if (controlledActiveIndex == null) setInternalActiveIndex(0) + }, [controlledActiveIndex, displayGroups.length]) + + const selectImage = (index: number) => { + if (controlledActiveIndex == null) setInternalActiveIndex(index) + onActiveIndexChange?.(index) + } + + const placeAnnotation = (element: HTMLDivElement, clientX: number, clientY: number) => { + const bounds = element.getBoundingClientRect() + if (bounds.width <= 0 || bounds.height <= 0) return + const x = Math.min(1, Math.max(0, (clientX - bounds.left) / bounds.width)) + const y = Math.min(1, Math.max(0, (clientY - bounds.top) / bounds.height)) + onAddAnnotation?.(x, y) + } return (
-
-

{label}

+
+
+

{label}

+ {annotationEnabled && ( + + )} +
{displayGroups.length > 1 ? ( -
+
{displayGroups.map((group, index) => (
+ {annotationMode && ( +
+ 点击作品中的修改位置添加批注;滚动不会产生标记 +
+ )} +
{activeGroup ? ( -
+
{ + if (!annotationMode || (event.button ?? 0) !== 0) return + pointerStartRef.current = { x: event.clientX, y: event.clientY } + }} + onPointerUp={(event) => { + if (!annotationMode || !pointerStartRef.current) return + const distance = Math.hypot( + event.clientX - pointerStartRef.current.x, + event.clientY - pointerStartRef.current.y, + ) + pointerStartRef.current = null + if (distance <= 8) placeAnnotation(event.currentTarget, event.clientX, event.clientY) + }} + onPointerCancel={() => { + pointerStartRef.current = null + }} + onKeyDown={(event) => { + if (annotationMode && (event.key === 'Enter' || event.key === ' ')) { + event.preventDefault() + const bounds = event.currentTarget.getBoundingClientRect() + placeAnnotation(event.currentTarget, bounds.left + bounds.width / 2, bounds.top + bounds.height / 2) + } + }} + > {(activeGroup.slices.length > 0 ? activeGroup.slices : [{ url: activeGroup.previewUrl, width: activeGroup.previewWidth, @@ -119,7 +219,15 @@ function LongImagePane({ height={slice.height} unoptimized loading={sliceIndex === 0 ? 'eager' : 'lazy'} - className="block h-auto w-full" + className="pointer-events-none block h-auto w-full select-none" + draggable={false} + /> + ))} + {annotations.map((item) => ( + onSelectDraftAnnotation?.(item.annotation.id) : undefined} /> ))}
@@ -133,23 +241,47 @@ function LongImagePane({ ) } +function getImageCount(version?: WorkReviewVersion) { + if (!version) return 0 + return version.imageGroups?.length || version.imageUrls?.length || 0 +} + +function summarizeAnnotations(annotations: WorkReviewImageAnnotation[]) { + if (annotations.length === 0) return '通过' + return annotations + .map((annotation, index) => `标注 ${index + 1}:${annotation.comment.trim()}`) + .join('\n') + .slice(0, 2000) +} + export function WorkReviewReviewerWorkspace({ project, - onReview, + onSubmitReview, }: { project: WorkReviewProject - onReview: (version: WorkReviewVersion, role: WorkReviewRole) => void + onSubmitReview: (version: WorkReviewVersion, input: WorkReviewReviewInput) => Promise }) { const latestVersion = project.versions[0] const [selectedVersionId, setSelectedVersionId] = useState(latestVersion?.id || '') const [workPanePercent, setWorkPanePercent] = useState(50) + const [activeWorkImageIndex, setActiveWorkImageIndex] = useState(0) + const [draftAnnotations, setDraftAnnotations] = useState(() => ( + Array.from({ length: getImageCount(latestVersion) }, () => []) + )) + const [selectedAnnotation, setSelectedAnnotation] = useState<{ imageIndex: number; id: string } | null>(null) + const [annotationMode, setAnnotationMode] = useState(false) + const [busyAction, setBusyAction] = useState<'approved' | 'revision_required' | null>(null) + const [error, setError] = useState(null) + const [liveMessage, setLiveMessage] = useState('') const comparisonRef = useRef(null) const draggingRef = useRef(false) const mobileScrollerRef = useRef(null) + const annotationInputRef = useRef(null) const selectedVersion = useMemo( () => project.versions.find((version) => version.id === selectedVersionId) || latestVersion, [latestVersion, project.versions, selectedVersionId], ) + const workImageCount = getImageCount(selectedVersion) useEffect(() => { if (!project.versions.some((version) => version.id === selectedVersionId)) { @@ -157,12 +289,44 @@ export function WorkReviewReviewerWorkspace({ } }, [project.versions, selectedVersionId]) + useEffect(() => { + setActiveWorkImageIndex(0) + setDraftAnnotations(Array.from({ length: workImageCount }, () => [])) + setSelectedAnnotation(null) + setAnnotationMode(false) + setError(null) + }, [selectedVersion?.id, workImageCount]) + + useEffect(() => { + if (!selectedAnnotation) return + const frame = window.requestAnimationFrame(() => annotationInputRef.current?.focus()) + return () => window.cancelAnimationFrame(frame) + }, [selectedAnnotation]) + if (!selectedVersion || !latestVersion) return null const isLatestSelected = selectedVersion.id === latestVersion.id const pendingRole = isLatestSelected ? project.permissions.pendingReviewRoles[0] : undefined const hasReferenceImages = (selectedVersion.referenceImageGroups?.length || 0) > 0 || (selectedVersion.referenceImageUrls?.length || 0) > 0 + const currentDrafts = draftAnnotations[activeWorkImageIndex] || [] + const selectedDraft = selectedAnnotation + ? draftAnnotations[selectedAnnotation.imageIndex]?.find((item) => item.id === selectedAnnotation.id) + : undefined + const totalDraftCount = draftAnnotations.reduce((sum, annotations) => sum + annotations.length, 0) + const submittedAnnotations: WorkReviewDisplayAnnotation[] = selectedVersion.reviews.flatMap((review) => { + const imageComment = (review.imageComments || []).find((item) => item.imageIndex === activeWorkImageIndex) + return (imageComment?.annotations || []).map((annotation, index) => ({ + annotation, + markerNumber: index + 1, + reviewerName: review.reviewerName, + reviewerRole: review.reviewerRole, + })) + }) + const visibleAnnotations: WorkReviewDisplayAnnotation[] = [ + ...submittedAnnotations, + ...currentDrafts.map((annotation, index) => ({ annotation, markerNumber: index + 1, draft: true })), + ] const updateSplitFromPointer = (clientX: number) => { const bounds = comparisonRef.current?.getBoundingClientRect() @@ -177,6 +341,106 @@ export function WorkReviewReviewerWorkspace({ scroller.scrollTo({ left: scroller.clientWidth * index, behavior: 'smooth' }) } + const addAnnotation = (x: number, y: number) => { + if (!pendingRole) return + if (currentDrafts.length >= MAX_ANNOTATIONS_PER_IMAGE) { + setError(`单张图片最多添加 ${MAX_ANNOTATIONS_PER_IMAGE} 个批注`) + return + } + const annotation: WorkReviewImageAnnotation = { id: createAnnotationId(), x, y, comment: '' } + setDraftAnnotations((current) => current.map((items, index) => ( + index === activeWorkImageIndex ? [...items, annotation] : items + ))) + setSelectedAnnotation({ imageIndex: activeWorkImageIndex, id: annotation.id }) + setAnnotationMode(false) + setError(null) + setLiveMessage(`已在图 ${activeWorkImageIndex + 1} 添加标注点`) + } + + const updateSelectedAnnotation = (comment: string) => { + if (!selectedAnnotation) return + setDraftAnnotations((current) => current.map((items, imageIndex) => ( + imageIndex === selectedAnnotation.imageIndex + ? items.map((item) => item.id === selectedAnnotation.id ? { ...item, comment } : item) + : items + ))) + setError(null) + } + + const deleteSelectedAnnotation = () => { + if (!selectedAnnotation) return + setDraftAnnotations((current) => current.map((items, imageIndex) => ( + imageIndex === selectedAnnotation.imageIndex + ? items.filter((item) => item.id !== selectedAnnotation.id) + : items + ))) + setSelectedAnnotation(null) + setError(null) + setLiveMessage('批注已删除') + } + + const finishEditingAnnotation = () => { + if (!selectedDraft?.comment.trim()) { + setError('请填写这个标注点的修改意见') + return + } + setSelectedAnnotation(null) + setError(null) + setLiveMessage('批注已保存到本次评审草稿') + } + + const findIncompleteAnnotation = () => { + for (let imageIndex = 0; imageIndex < draftAnnotations.length; imageIndex += 1) { + const annotation = draftAnnotations[imageIndex].find((item) => !item.comment.trim()) + if (annotation) return { imageIndex, id: annotation.id } + } + return null + } + + const submitDecision = async (decision: 'approved' | 'revision_required') => { + if (!pendingRole || workImageCount === 0) return + const incomplete = findIncompleteAnnotation() + if (incomplete) { + setActiveWorkImageIndex(incomplete.imageIndex) + setSelectedAnnotation(incomplete) + setAnnotationMode(false) + setError('请先填写未完成标注点的修改意见') + return + } + if (decision === 'revision_required' && totalDraftCount === 0) { + setError('请先在作品图片上标注至少一个需要修改的位置') + setAnnotationMode(true) + return + } + + setBusyAction(decision) + setError(null) + try { + await onSubmitReview(selectedVersion, { + reviewerRole: pendingRole, + imageComments: Array.from({ length: workImageCount }, (_, imageIndex) => { + const annotations = draftAnnotations[imageIndex] || [] + return { + imageIndex, + decision: decision === 'revision_required' && annotations.length > 0 + ? 'revision_required' + : 'approved', + comment: summarizeAnnotations(annotations), + annotations, + } + }), + generalComment: '', + }) + setDraftAnnotations(Array.from({ length: workImageCount }, () => [])) + setSelectedAnnotation(null) + setAnnotationMode(false) + } catch (submitError) { + setError(submitError instanceof Error ? submitError.message : '评审提交失败') + } finally { + setBusyAction(null) + } + } + return (
- )} +
+ {pendingRole ? ( + <> + {selectedDraft ? ( +
+