{canLayout &&
}
diff --git a/furniture-3d-system/src/app/diy/components/DiyImageVersions.test.tsx b/furniture-3d-system/src/app/diy/components/DiyImageVersions.test.tsx
new file mode 100644
index 00000000..1a7ab197
--- /dev/null
+++ b/furniture-3d-system/src/app/diy/components/DiyImageVersions.test.tsx
@@ -0,0 +1,60 @@
+import { fireEvent, render, screen, within } from '@testing-library/react'
+import DiyImageVersions from './DiyImageVersions'
+import type { DiyAiRenderDTO } from '@/lib/diy/ai-render'
+import type { DiyProcessingImageDTO } from '@/lib/diy/render-processing'
+import type { DiyReprocessingController } from '../hooks/useDiyReprocessing'
+
+const output = (key: string) => ({ storageKey: key, originalUrl: `/${key}.png`, thumbnailUrl: `/${key}.png`, width: 1440, height: 1440 })
+const record = { id: 'record', status: 'SUCCEEDED', mode: 'sku', sku: { template: 'gujia', background: 'scene' } } as DiyAiRenderDTO
+const image: DiyProcessingImageDTO = { index: 7, status: 'succeeded', originalUrl: '/old-raw', resultStorageKey: 'old', versions: [
+ { id: 'original', kind: 'original', status: 'succeeded', source: { originalUrl: '/old-raw' }, result: output('old'), selected: true, createdAt: '2026-11-14T00:00:00Z' },
+ { id: 'trial', kind: 'generate', status: 'succeeded', source: { originalUrl: '/new-raw' }, result: output('new'), selected: false, createdAt: '2026-11-14T01:00:00Z' },
+] }
+const controller = () => ({ busy: '', error: '', operation: 'annotate', retry: jest.fn(), regenerate: jest.fn(), choose: jest.fn() }) as DiyReprocessingController
+test('current and this candidate appear together; selecting or keeping the current image is explicit', () => {
+ const c = controller(), preview = jest.fn()
+ const { container } = render(
)
+ expect(screen.getAllByRole('img')).toHaveLength(2)
+ expect(screen.getByText('当前选用')).toBeInTheDocument(); expect(screen.getByText('待选用')).toBeInTheDocument()
+ expect(c.choose).not.toHaveBeenCalled()
+ fireEvent.click(screen.getByRole('button', { name: '选用这张' }))
+ expect(c.choose).toHaveBeenCalledWith('record', 7, 'trial', 'old')
+ fireEvent.click(screen.getByRole('button', { name: '保留当前图' }))
+ expect(c.choose).toHaveBeenLastCalledWith('record', 7, 'original', 'old')
+ const failed = within(container.querySelector('[data-image-version="trial"]')! as HTMLElement)
+ fireEvent.click(failed.getByRole('button', { name: '重新标注' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新标注' }))
+ expect(c.retry).toHaveBeenCalledWith('record', 7, 'old', 'trial')
+ fireEvent.click(failed.getByRole('button', { name: '重新出图' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新出图' }))
+ expect(c.regenerate).toHaveBeenCalledWith('record', 7, 'old', 'trial')
+ fireEvent.click(screen.getByRole('button', { name: '放大查看本次候选' }))
+ expect(preview).toHaveBeenCalledWith('/new.png')
+})
+test('view permission allows comparison, while all writes are blocked during processing', () => {
+ const c = controller(), props = { record, image, controller: c, onPreview: jest.fn() }
+ const { rerender } = render(
)
+ expect(screen.getAllByRole('img')).toHaveLength(2)
+ expect(screen.queryByRole('button', { name: '选用这张' })).not.toBeInTheDocument()
+ rerender()
+ expect(screen.getByRole('button', { name: '选用这张' })).toBeDisabled()
+ for (const button of screen.getAllByRole('button', { name: '重新标注' })) expect(button).toBeDisabled()
+})
+test('a failed upstream generation shows no counterfeit new photo or reannotation action', () => {
+ const versions = [image.versions![0], { ...image.versions![1], id: 'failed', status: 'failed' as const, result: undefined, sourceReady: false }]
+ const { container } = render()
+ expect(screen.getAllByRole('img')).toHaveLength(1)
+ expect(screen.getByText('本次未生成新图')).toBeInTheDocument()
+ expect(container.querySelector('[data-image-version="failed"] button')).toBeNull()
+})
+test('an unchanged retry exposes the requested correction and unresolved findings beside the candidate', () => {
+ const versions = [image.versions![0], { ...image.versions![1], feedback: '38 没有贴合底侧板', review: {
+ status: 'needs-review' as const, change: 'unchanged' as const, changedAxes: [], summary: '复核后无明显变化,请对比确认', issues: ['深度线仍需核对'],
+ } }]
+ render()
+ expect(screen.getByText('复核未确认改善')).toBeInTheDocument()
+ expect(screen.getByText('复核后无明显变化,请对比确认')).toBeInTheDocument()
+ expect(screen.getByText('调整要求:38 没有贴合底侧板')).toBeInTheDocument()
+ expect(screen.getByText('深度线仍需核对')).toBeInTheDocument()
+ expect(screen.queryByText('自动复核通过')).not.toBeInTheDocument()
+})
diff --git a/furniture-3d-system/src/app/diy/components/DiyImageVersions.tsx b/furniture-3d-system/src/app/diy/components/DiyImageVersions.tsx
new file mode 100644
index 00000000..f0c98da6
--- /dev/null
+++ b/furniture-3d-system/src/app/diy/components/DiyImageVersions.tsx
@@ -0,0 +1,45 @@
+'use client'
+import Button from '@/components/ui/Button'
+import type { DiyAiRenderDTO } from '@/lib/diy/ai-render'
+import type { DiyProcessingImageDTO } from '@/lib/diy/render-processing'
+import { diyDisplayImageUrl } from '@/lib/diy/dimension-annotations'
+import type { DiyReprocessingController } from '../hooks/useDiyReprocessing'
+import DiySkuImageActions from './DiySkuImageActions'
+
+export default function DiyImageVersions({ record, image, controller, onPreview, canGenerate, disabled = false }: {
+ record: DiyAiRenderDTO; image: DiyProcessingImageDTO; controller: DiyReprocessingController
+ onPreview: (url: string) => void; canGenerate: boolean; disabled?: boolean
+}) {
+ if (!image.versions || image.versions.length < 2) return null
+ const busy = disabled || Boolean(controller.busy) || record.status === 'PENDING'
+ return
+ {image.versions.map(version => {
+ const label = version.selected ? '当前图' : '本次候选'
+ const url = version.result ? version.selected ? diyDisplayImageUrl(record, version.result) : version.result.originalUrl : version.source.originalUrl
+ return
+
{label}
+ {version.selected ? version.result ? '当前选用' : '原图未标注' : version.status === 'pending' ? record.needsReview ? '待核对' : '处理中' : version.result ? '待选用' : version.sourceReady === false ? '生图失败' : '标注未完成'}
+ {version.sourceReady === false ?
{version.status === 'pending' ? record.needsReview ? '任务已暂停,待核对' : '正在重新出图…' : '本次未生成新图'}
:
+
}
+ {version.completedAt &&
}
+ {version.errorMessage &&
{version.errorMessage}
}
+ {version.feedback &&
调整要求:{version.feedback}
}
+ {version.review &&
+
{version.review.status === 'passed' ? '自动复核通过' : version.review.status === 'needs-review' ? version.review.change === 'unchanged' ? '复核未确认改善' : '复核发现问题' : '自动复核未完成'}
+
{version.review.summary}
+ {version.review.change === 'changed' && version.review.changedAxes.length > 0 &&
位置有变化:{version.review.changedAxes.map(axis => ({ width: '长度线', height: '高度线', depth: '深度线', scene: '场景构图' })[axis]).join('、')}
}
+ {version.review.issues.map((issue, i) =>
{issue}
)}
+
}
+ {canGenerate && version.result &&
}
+ {canGenerate && version.sourceReady !== false &&
+
+
}
+
+ })}
+
+}
diff --git a/furniture-3d-system/src/app/diy/components/DiySkuImageActions.test.tsx b/furniture-3d-system/src/app/diy/components/DiySkuImageActions.test.tsx
new file mode 100644
index 00000000..b38a9a7b
--- /dev/null
+++ b/furniture-3d-system/src/app/diy/components/DiySkuImageActions.test.tsx
@@ -0,0 +1,49 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import DiySkuImageActions from './DiySkuImageActions'
+import type { DiyAiRenderDTO } from '@/lib/diy/ai-render'
+import type { DiyReprocessingController } from '../hooks/useDiyReprocessing'
+const image = { index: 7, originalUrl: '/raw', status: 'succeeded' as const, resultStorageKey: 'current-version' }
+const record = { id: 'record', mode: 'sku', status: 'SUCCEEDED', sku: { template: 'gujia', background: 'scene' } } as DiyAiRenderDTO
+test('successful scene outputs expose both replacement actions using the stable original index', () => {
+ const controller = { busy: '', operation: 'annotate', retry: jest.fn(), regenerate: jest.fn() } as unknown as DiyReprocessingController
+ render( )
+ fireEvent.click(screen.getByRole('button', { name: '重新标注' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新标注' }))
+ expect(controller.retry).toHaveBeenCalledWith('record', 7, 'current-version')
+ fireEvent.click(screen.getByRole('button', { name: '重新出图' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新出图' }))
+ expect(controller.regenerate).toHaveBeenCalledWith('record', 7, 'current-version')
+})
+test('pending work disables both actions and white SKU output exposes no scene regeneration', () => {
+ const controller = { busy: '', operation: 'annotate', retry: jest.fn(), regenerate: jest.fn() } as unknown as DiyReprocessingController
+ const { rerender } = render( )
+ expect(screen.getByRole('button', { name: '重新标注' })).toBeDisabled()
+ expect(screen.getByRole('button', { name: '重新出图' })).toBeDisabled()
+ rerender( )
+ expect(screen.queryByRole('button', { name: '重新出图' })).not.toBeInTheDocument()
+ fireEvent.click(screen.getByRole('button', { name: '重新标注' }))
+ expect(controller.retry).toHaveBeenCalledWith('record', 7, 'current-version')
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+})
+test('optional feedback is trimmed and sent only after submission; cancel and Esc do not submit', () => {
+ const controller = { busy: '', retry: jest.fn(), regenerate: jest.fn() } as unknown as DiyReprocessingController
+ render()
+ fireEvent.click(screen.getByRole('button', { name: '重新标注' }))
+ expect(controller.retry).not.toHaveBeenCalled()
+ fireEvent.change(screen.getByRole('textbox', { name: '调整要求(可选)' }), { target: { value: ' 38 的线压到了花瓶 ' } })
+ fireEvent.click(screen.getByRole('button', { name: '开始重新标注' }))
+ expect(controller.retry).toHaveBeenCalledWith('record', 7, 'current-version', 'trial', '38 的线压到了花瓶')
+ fireEvent.click(screen.getByRole('button', { name: '重新出图' }))
+ fireEvent.keyDown(screen.getByRole('textbox'), { key: 'Escape' })
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+ expect(controller.regenerate).not.toHaveBeenCalled()
+})
+
+test('candidate work does not spin current-image actions, and blocked work never spins', () => {
+ const controller = { busy: '', operation: 'annotate', retry: jest.fn(), regenerate: jest.fn() } as unknown as DiyReprocessingController
+ const { container, rerender } = render()
+ expect(container.querySelector('.animate-spin')).toBeNull()
+ expect(screen.getByRole('button', { name: '重新标注' })).toBeDisabled()
+ rerender()
+ expect(container.querySelector('.animate-spin')).toBeNull()
+})
diff --git a/furniture-3d-system/src/app/diy/components/DiySkuImageActions.tsx b/furniture-3d-system/src/app/diy/components/DiySkuImageActions.tsx
new file mode 100644
index 00000000..7225fe47
--- /dev/null
+++ b/furniture-3d-system/src/app/diy/components/DiySkuImageActions.tsx
@@ -0,0 +1,45 @@
+'use client'
+import { ImagePlus, RefreshCw } from 'lucide-react'
+import { useState } from 'react'
+import Button from '@/components/ui/Button'
+import type { DiyAiRenderDTO } from '@/lib/diy/ai-render'
+import type { DiyProcessingImageDTO } from '@/lib/diy/render-processing'
+import type { DiyReprocessingController } from '../hooks/useDiyReprocessing'
+import DiySkuRetryDialog from './DiySkuRetryDialog'
+
+export default function DiySkuImageActions({ record, image, controller, disabled = false, compact = false, baseVersionId }: {
+ record: DiyAiRenderDTO; image: DiyProcessingImageDTO; controller: DiyReprocessingController; disabled?: boolean; compact?: boolean; baseVersionId?: string
+}) {
+ const [requested, setRequested] = useState<'generate' | 'annotate' | null>(null)
+ if (record.mode !== 'sku' || record.operation) return null
+ const scene = record.sku?.template === 'gujia' && record.sku.background === 'scene'
+ const busy = Boolean(controller.busy) || record.status === 'PENDING' || disabled
+ // Version cards use their own status. A pending candidate must never spin the current image's buttons.
+ const current = !baseVersionId && !record.needsReview
+ ? controller.busy === `${record.id}:${image.index}` ? controller.operation : image.operation : undefined
+ const version = image.versions?.find(version => version.id === (baseVersionId || image.versions?.find(version => version.selected)?.id))
+ const imageUrl = version?.result?.originalUrl || version?.source.originalUrl || record.images?.find(result => result.storageKey === image.resultStorageKey)?.originalUrl || image.originalUrl
+ const submit = async (feedback: string) => {
+ const run = requested === 'generate' ? controller.regenerate : controller.retry
+ setRequested(null)
+ if (feedback) await run(record.id, image.index, image.resultStorageKey, baseVersionId, feedback)
+ else if (baseVersionId) await run(record.id, image.index, image.resultStorageKey, baseVersionId)
+ else await run(record.id, image.index, image.resultStorageKey)
+ }
+ const actionClass = compact ? '!h-6 !min-h-0 !min-w-0 !px-1 !py-0 !text-[10px] !whitespace-nowrap [&>span]:gap-1'
+ : 'min-w-0! whitespace-nowrap px-2! text-[11px]!'
+ return <>
+
+ {scene && }
+ {requested && setRequested(null)} onSubmit={submit}/>}
+ >
+}
diff --git a/furniture-3d-system/src/app/diy/components/DiySkuRetryDialog.tsx b/furniture-3d-system/src/app/diy/components/DiySkuRetryDialog.tsx
new file mode 100644
index 00000000..e571859a
--- /dev/null
+++ b/furniture-3d-system/src/app/diy/components/DiySkuRetryDialog.tsx
@@ -0,0 +1,29 @@
+'use client'
+import { useState } from 'react'
+import Modal from '@/components/ui/Modal'
+import Button from '@/components/ui/Button'
+
+export default function DiySkuRetryDialog({ kind, imageUrl, busy, onClose, onSubmit }: {
+ kind: 'generate' | 'annotate'; imageUrl: string; busy: boolean; onClose: () => void; onSubmit: (feedback: string) => Promise
+}) {
+ const [feedback, setFeedback] = useState('')
+ const label = kind === 'generate' ? '重新出图' : '重新标注'
+ return { if (event.key === 'Escape') { event.stopPropagation(); onClose() } }}>
+
+
+
+}
diff --git a/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.test.tsx b/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.test.tsx
index b5194bcb..6eae2183 100644
--- a/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.test.tsx
+++ b/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.test.tsx
@@ -4,10 +4,10 @@ import type { DiyAiRenderAccess } from '@/lib/diy/ai-render'
import type { DiyProcessingImageDTO } from '@/lib/diy/render-processing'
import type { DiyBatchImageActions } from '../../hooks/useDiyBatchImageActions'
import { useDiyReprocessing } from '../../hooks/useDiyReprocessing'
-import { generateDiyAiRender, retryDiyImageProcessing } from '../../lib/ai-api'
+import { generateDiyAiRender, retryDiyImageProcessing, regenerateDiyImage } from '../../lib/ai-api'
import DiyBatchProcessingRecord from './DiyBatchProcessingRecord'
-jest.mock('../../lib/ai-api', () => ({ retryDiyImageProcessing: jest.fn(), generateDiyAiRender: jest.fn() }))
+jest.mock('../../lib/ai-api', () => ({ retryDiyImageProcessing: jest.fn(), generateDiyAiRender: jest.fn(), regenerateDiyImage: jest.fn() }))
const access: DiyAiRenderAccess = { canView: true, canGenerate: true, canDownload: true, canDelete: true }
const raw: DiyProcessingImageDTO = { index: 2, originalUrl: '/saved/raw.png', status: 'failed', stage: 'localization',
@@ -16,14 +16,14 @@ const record = { id: 'render', name: '组合方案', mode: 'sku', status: 'FAILE
function actions() {
return { downloading: false, deletion: { deleting: false, requestDelete: jest.fn() }, setPreview: jest.fn(),
- reprocessing: { busy: '', error: '', retry: jest.fn() },
+ reprocessing: { busy: '', error: '', retry: jest.fn(), regenerate: jest.fn() },
} as unknown as DiyBatchImageActions
}
beforeEach(() => jest.clearAllMocks())
test.each([
[raw, '定位服务返回的数据格式不正确'],
- [{ ...raw, stage: 'layout', diagnosticCode: 'dimension_placement_failed', errorMessage: '尺寸标注未能完整排布;原图已保留,可重新标注' }, '尺寸排版失败'],
+ [{ ...raw, stage: 'layout', diagnosticCode: 'dimension_placement_failed', errorMessage: '尺寸标注未能完整排布;原图已保留,可重新标注' }, '尺寸线排布未完成'],
] as const)('keeps the raw image visible when processing fails (%s)', (image, reason) => {
const a = actions()
render()
@@ -33,7 +33,7 @@ test.each([
fireEvent.click(screen.getByRole('button', { name: '查看 组合方案 原图3' }))
expect(a.setPreview).toHaveBeenCalledWith(raw.originalUrl)
fireEvent.click(screen.getByRole('button', { name: '重新标注' }))
- expect(a.reprocessing.retry).toHaveBeenCalledWith('render', 2)
+ expect(a.reprocessing.retry).toHaveBeenCalledWith('render', 2, undefined)
fireEvent.click(screen.getByRole('button', { name: '删除失败记录' }))
expect(a.deletion.requestDelete).toHaveBeenCalledWith(record, { target: 'record' })
})
@@ -57,6 +57,17 @@ test('reuses the saved raw image through reprocess, locks repeat clicks, and ref
await waitFor(() => expect(refresh).toHaveBeenCalledTimes(1))
await waitFor(() => expect(button).toBeEnabled())
expect(generateDiyAiRender).not.toHaveBeenCalled()
+ expect(regenerateDiyImage).not.toHaveBeenCalled()
+})
+
+test('the user can choose regeneration directly on a failed scene instead of reannotation', () => {
+ const a = actions(), scene = { ...record, sku: { template: 'gujia', background: 'scene' } } as DiyAiBatchRecord
+ render()
+ expect(screen.getByRole('button', { name: '重新标注' })).toBeEnabled()
+ fireEvent.click(screen.getByRole('button', { name: '重新出图' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新出图' }))
+ expect(a.reprocessing.regenerate).toHaveBeenCalledWith('render', 2, undefined)
+ expect(a.reprocessing.retry).not.toHaveBeenCalled()
})
test('keeps originals available to viewers and while reannotation is pending', () => {
diff --git a/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.tsx b/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.tsx
index 4682e446..c36dfe79 100644
--- a/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.tsx
+++ b/furniture-3d-system/src/app/diy/components/batch/DiyBatchProcessingRecord.tsx
@@ -6,6 +6,8 @@ import type { DiyAiRenderAccess } from '@/lib/diy/ai-render'
import type { DiyProcessingImageDTO } from '@/lib/diy/render-processing'
import type { DiyBatchImageActions } from '../../hooks/useDiyBatchImageActions'
import DiyAiFailureNotice from '../DiyAiFailureNotice'
+import DiySkuImageActions from '../DiySkuImageActions'
+import DiyImageVersions from '../DiyImageVersions'
const actionClass = '!h-6 !min-h-0 !min-w-0 !px-1.5 !py-0 !text-[10px] focus:!px-1.5 focus:!py-0'
@@ -15,26 +17,27 @@ export default function DiyBatchProcessingRecord({ record, image, actions: a, ac
const busy = a.downloading || a.deletion.deleting || Boolean(a.reprocessing.busy)
const failed = image.status === 'failed'
const canRetry = failed && record.mode === 'sku' && !record.operation && access.canGenerate
- return
- }
{record.name}
-
{failed ? '待标注' : '标注中'}
+
{record.needsReview ? '待核对' : image.operation === 'generate' ? '重新出图中' : image.operation === 'annotate' ? '重新标注中' : awaitingChoice ? '待选用' : failed ? '待标注' : '标注中'}
- {failed ? '原图已生成,标注未完成' : '原图已生成,正在标注…'}
- {failed && 1 ? image.index : undefined}/>
}
+ {record.needsReview ? '任务已暂停,等待核对已有结果' : image.operation ? '正在重新处理,完成后对比选用…' : awaitingChoice ? '新结果已生成,请对比后选用' : failed ? '原图已生成,标注未完成' : '原图已生成,正在标注…'}
- {canRetry && void a.reprocessing.retry(record.id, image.index)}>重新标注}
+ {!comparing && canRetry && }
{showDelete && record.status === 'FAILED' && access.canDelete && a.deletion.requestDelete(record, { target: 'record' })}>删除失败记录}
+ {!comparing && failed && 1 ? image.index : undefined}/>
}
}
diff --git a/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.test.tsx b/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.test.tsx
index 97b687a7..98cd4441 100644
--- a/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.test.tsx
+++ b/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.test.tsx
@@ -16,7 +16,7 @@ function setup(overrides: Partial = {}) {
...overrides } as DiyAiBatchRecord
const actions = { downloading: false, deletion: { deleting: false, requestDelete: jest.fn() },
selection: { isSelected: jest.fn().mockReturnValue(false) }, setPreview: jest.fn(),
- reprocessing: { busy: '', error: '', retry: jest.fn() },
+ reprocessing: { busy: '', error: '', retry: jest.fn(), regenerate: jest.fn() },
} as unknown as DiyBatchImageActions
return { record, actions }
}
@@ -55,3 +55,27 @@ test('does not show an error panel for successful or pending records', () => {
rerender()
expect(screen.queryByRole('note')).not.toBeInTheDocument()
})
+
+test('blocked work is labeled for review even before the native job summary arrives', () => {
+ const { record, actions } = setup({ status: 'PENDING', needsReview: true, processing: undefined, errorMessage: null })
+ render()
+ expect(screen.getByText('待核对')).toBeInTheDocument()
+ expect(screen.queryByText('生成中')).not.toBeInTheDocument()
+})
+
+test('completed scene offers both operations by stable source index and result key', () => {
+ const image: DiyAiRenderImage = { storageKey: 'current', originalUrl: '/current.png', thumbnailUrl: '/current.png', width: 1440, height: 1440 }
+ const { record, actions } = setup({ status: 'SUCCEEDED', errorMessage: null, images: [image],
+ sku: { template: 'gujia', background: 'scene', title: '', color: '', features: '', showDimensions: true },
+ processing: { expected: 1, images: [{ index: 7, status: 'succeeded', originalUrl: '/raw.png', resultStorageKey: 'current' }] } })
+ const { rerender } = render()
+ fireEvent.click(screen.getByRole('button', { name: '重新标注' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新标注' }))
+ expect(actions.reprocessing.retry).toHaveBeenCalledWith('render', 7, 'current')
+ fireEvent.click(screen.getByRole('button', { name: '重新出图' }))
+ fireEvent.click(screen.getByRole('button', { name: '开始重新出图' }))
+ expect(actions.reprocessing.regenerate).toHaveBeenCalledWith('render', 7, 'current')
+ rerender()
+ expect(screen.getByRole('button', { name: '重新标注' })).toBeDisabled()
+ expect(screen.getByRole('button', { name: '重新出图' })).toBeDisabled()
+})
diff --git a/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.tsx b/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.tsx
index 20958312..51cd4a68 100644
--- a/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.tsx
+++ b/furniture-3d-system/src/app/diy/components/batch/DiyBatchRecord.tsx
@@ -13,6 +13,8 @@ import DiyDimensionActions from '../dimensions/DiyDimensionActions'
import { diyDisplayImageUrl } from '@/lib/diy/dimension-annotations'
import { canUseDiyBatchScene } from '../../lib/batch-scene-lock'
import DiyAiFailureNotice from '../DiyAiFailureNotice'
+import DiySkuImageActions from '../DiySkuImageActions'
+import DiyImageVersions from '../DiyImageVersions'
const actionClass = '!h-6 !min-h-0 !min-w-0 !px-1 !py-0 !text-[10px] focus:!px-1 focus:!py-0'
export default function DiyBatchRecord({ record, image, index, actions: a, access, onUseScene, sceneBusy }: {
@@ -27,11 +29,15 @@ export default function DiyBatchRecord({ record, image, index, actions: a, acces
const canLayout = access.canGenerate && record.mode !== 'scene' && !record.operation && record.status === 'SUCCEEDED'
const displayUrl = image ? diyDisplayImageUrl(record, image) : ''
const hasUnfinishedImages = record.processing?.images.some(item => item.status !== 'succeeded')
+ const processing = image ? record.processing?.images.find(item => item.resultStorageKey === image.storageKey) : undefined
+ const comparing = Boolean(processing?.versions && processing.versions.length > 1)
+ const awaitingChoice = processing?.versions?.some(version => !version.selected && version.result)
const picture = image ? /* eslint-disable-next-line @next/next/no-img-element */
:
const frame = 'flex aspect-[4/3] w-full items-center justify-center overflow-hidden rounded-md border border-zinc-100 bg-zinc-50'
- return
+ return
+ {comparing && processing ? :
{image ? a.setPreview(displayUrl)}
className={`${frame} cursor-zoom-in transition-colors ${selected ? '!border-[#47646b] ring-1 ring-[#47646b]/30' : 'hover:border-zinc-300'}`}>{picture}
@@ -39,16 +45,27 @@ export default function DiyBatchRecord({ record, image, index, actions: a, acces
{entry && a.selection.toggle(entry)} className="absolute left-2 top-2 !h-3.5 !min-h-0 !w-3.5 !min-w-0 cursor-pointer accent-[#47646b]"/>}
{record.operation && {record.operation === 'layout-replace' ? '排版图' : '改字图'}}
-
+ }
+ {comparing && entry &&