From 90f96e17c41e1dbea7dcabcd95405231fa8971dc Mon Sep 17 00:00:00 2001 From: WuYongJie Date: Mon, 16 Nov 2026 10:42:34 +0800 Subject: [PATCH] fix(diy): support scene retries, annotation review and selected replacements Allow one current image and one retry candidate per slot, with explicit selection. Keep saved scene references and editable feedback for regeneration and annotation. Improve outer-edge placement, 16px offsets and terminal task recovery. Exclude XG0268 and unrelated registered changes. --- .../diy/ai-renders/[id]/regenerate/route.ts | 13 +++ .../api/diy/ai-renders/[id]/versions/route.ts | 13 +++ .../diy/components/DiyAiProcessingResults.tsx | 30 +++-- .../app/diy/components/DiyAiResultCard.tsx | 24 +++- .../diy/components/DiyImageVersions.test.tsx | 60 ++++++++++ .../app/diy/components/DiyImageVersions.tsx | 45 ++++++++ .../components/DiySkuImageActions.test.tsx | 49 +++++++++ .../app/diy/components/DiySkuImageActions.tsx | 45 ++++++++ .../app/diy/components/DiySkuRetryDialog.tsx | 29 +++++ .../batch/DiyBatchProcessingRecord.test.tsx | 21 +++- .../batch/DiyBatchProcessingRecord.tsx | 23 ++-- .../components/batch/DiyBatchRecord.test.tsx | 26 ++++- .../diy/components/batch/DiyBatchRecord.tsx | 25 ++++- .../components/batch/DiyBatchResults.test.tsx | 15 +++ .../diy/components/batch/DiyBatchResults.tsx | 5 +- .../app/diy/hooks/useDiyReprocessing.test.tsx | 29 +++++ .../src/app/diy/hooks/useDiyReprocessing.ts | 25 +++-- furniture-3d-system/src/app/diy/lib/ai-api.ts | 10 +- .../src/app/diy/lib/failure-guidance.test.ts | 15 +++ .../src/app/diy/lib/failure-guidance.ts | 20 +++- .../src/lib/diy/door-appearance.ts | 3 +- .../src/lib/diy/image-versions.test.ts | 25 +++++ .../src/lib/diy/image-versions.ts | 39 +++++++ .../src/lib/diy/negative-prompt.ts | 7 ++ .../src/lib/diy/render-processing.ts | 27 ++++- .../lib/diy/sku/annotation-placement.test.ts | 45 +++++++- .../src/lib/diy/sku/annotation-placement.ts | 57 +++++----- .../lib/diy/sku/annotation-scene-view.test.ts | 24 +++- .../src/lib/diy/sku/annotation-scene-view.ts | 7 +- .../src/lib/diy/sku/annotation-visibility.ts | 27 +++++ .../src/lib/diy/sku/retry-review.ts | 31 ++++++ .../src/lib/diy/sku/scene-layout.ts | 2 +- .../diy-image-version.repository.test.ts | 63 +++++++++++ .../__tests__/diy-render-guard.test.ts | 7 ++ ...diy-render-regeneration.repository.test.ts | 35 ++++++ ...diy-render-reprocessing.repository.test.ts | 67 ++++++++++- .../diy-image-version.repository.ts | 40 +++++++ .../server/repositories/diy-render-guard.ts | 4 +- .../diy-render-regeneration.repository.ts | 44 ++++++++ .../diy-render-reprocessing.repository.ts | 39 +++++-- .../__tests__/diy-ai-batch.service.test.ts | 11 ++ .../__tests__/diy-ai-render.service.test.ts | 33 ++++++ .../__tests__/diy-ai-render.storage.test.ts | 20 ++++ .../diy-image-version-processing.test.ts | 104 ++++++++++++++++++ .../__tests__/diy-render-processing.test.ts | 32 ++++++ .../__tests__/diy-render-regeneration.test.ts | 82 ++++++++++++++ .../__tests__/diy-scene-outer-edge.test.ts | 17 ++- .../services/__tests__/diy-sku-image.test.ts | 10 ++ .../services/__tests__/diy-sku-render.test.ts | 6 + .../__tests__/diy-sku-retry-review.test.ts | 75 +++++++++++++ .../__tests__/diy-sku-review-vision.test.ts | 35 ++++++ .../__tests__/diy-sku-scene-image.test.ts | 43 +++++++- .../__tests__/diy-sku-scene-location.test.ts | 40 +++++++ .../server/services/diy-ai-batch.service.ts | 10 +- .../server/services/diy-ai-render.create.ts | 8 +- .../server/services/diy-ai-render.service.ts | 9 +- .../server/services/diy-ai-render.storage.ts | 17 ++- .../server/services/diy-batch-scene-lock.ts | 3 +- .../services/diy-image-version-processing.ts | 70 ++++++++++++ .../services/diy-image-version.service.ts | 14 +++ .../diy-render-negative-prompt.test.ts | 27 +++++ .../services/diy-render-negative-prompt.ts | 17 +++ .../server/services/diy-render-processing.ts | 15 ++- .../diy-render-regeneration-completion.ts | 24 ++++ .../diy-render-regeneration.service.ts | 58 ++++++++++ .../diy-render-reprocessing.service.ts | 2 +- .../services/diy-scene-placement-prompt.ts | 5 +- .../services/diy-scene-reference-prompt.ts | 2 +- .../services/diy-sku-edge-refinement.ts | 14 ++- .../src/server/services/diy-sku-image.ts | 32 ++++-- .../src/server/services/diy-sku-prompt.ts | 8 +- .../server/services/diy-sku-retry-review.ts | 49 +++++++++ .../server/services/diy-sku-review-crops.ts | 20 ++++ .../server/services/diy-sku-review-vision.ts | 38 +++++++ .../server/services/diy-sku-scene-image.ts | 24 +++- .../server/services/diy-sku-scene-location.ts | 52 ++++++++- .../server/services/diy-sku-scene-prompt.ts | 2 + .../services/native-image-generation.types.ts | 2 +- .../native-render-completion.service.ts | 10 +- 79 files changed, 2006 insertions(+), 149 deletions(-) create mode 100644 furniture-3d-system/src/app/api/diy/ai-renders/[id]/regenerate/route.ts create mode 100644 furniture-3d-system/src/app/api/diy/ai-renders/[id]/versions/route.ts create mode 100644 furniture-3d-system/src/app/diy/components/DiyImageVersions.test.tsx create mode 100644 furniture-3d-system/src/app/diy/components/DiyImageVersions.tsx create mode 100644 furniture-3d-system/src/app/diy/components/DiySkuImageActions.test.tsx create mode 100644 furniture-3d-system/src/app/diy/components/DiySkuImageActions.tsx create mode 100644 furniture-3d-system/src/app/diy/components/DiySkuRetryDialog.tsx create mode 100644 furniture-3d-system/src/app/diy/hooks/useDiyReprocessing.test.tsx create mode 100644 furniture-3d-system/src/lib/diy/image-versions.test.ts create mode 100644 furniture-3d-system/src/lib/diy/image-versions.ts create mode 100644 furniture-3d-system/src/lib/diy/negative-prompt.ts create mode 100644 furniture-3d-system/src/lib/diy/sku/annotation-visibility.ts create mode 100644 furniture-3d-system/src/lib/diy/sku/retry-review.ts create mode 100644 furniture-3d-system/src/server/repositories/__tests__/diy-image-version.repository.test.ts create mode 100644 furniture-3d-system/src/server/repositories/__tests__/diy-render-regeneration.repository.test.ts create mode 100644 furniture-3d-system/src/server/repositories/diy-image-version.repository.ts create mode 100644 furniture-3d-system/src/server/repositories/diy-render-regeneration.repository.ts create mode 100644 furniture-3d-system/src/server/services/__tests__/diy-ai-render.storage.test.ts create mode 100644 furniture-3d-system/src/server/services/__tests__/diy-image-version-processing.test.ts create mode 100644 furniture-3d-system/src/server/services/__tests__/diy-render-regeneration.test.ts create mode 100644 furniture-3d-system/src/server/services/__tests__/diy-sku-retry-review.test.ts create mode 100644 furniture-3d-system/src/server/services/__tests__/diy-sku-review-vision.test.ts create mode 100644 furniture-3d-system/src/server/services/__tests__/diy-sku-scene-location.test.ts create mode 100644 furniture-3d-system/src/server/services/diy-image-version-processing.ts create mode 100644 furniture-3d-system/src/server/services/diy-image-version.service.ts create mode 100644 furniture-3d-system/src/server/services/diy-render-negative-prompt.test.ts create mode 100644 furniture-3d-system/src/server/services/diy-render-negative-prompt.ts create mode 100644 furniture-3d-system/src/server/services/diy-render-regeneration-completion.ts create mode 100644 furniture-3d-system/src/server/services/diy-render-regeneration.service.ts create mode 100644 furniture-3d-system/src/server/services/diy-sku-retry-review.ts create mode 100644 furniture-3d-system/src/server/services/diy-sku-review-crops.ts create mode 100644 furniture-3d-system/src/server/services/diy-sku-review-vision.ts create mode 100644 furniture-3d-system/src/server/services/diy-sku-scene-prompt.ts diff --git a/furniture-3d-system/src/app/api/diy/ai-renders/[id]/regenerate/route.ts b/furniture-3d-system/src/app/api/diy/ai-renders/[id]/regenerate/route.ts new file mode 100644 index 00000000..a3f34db1 --- /dev/null +++ b/furniture-3d-system/src/app/api/diy/ai-renders/[id]/regenerate/route.ts @@ -0,0 +1,13 @@ +import type { NextRequest } from 'next/server' +import { handleRequest, jsonSuccess } from '@/server/core/response' +import { AppError, ErrorCode } from '@/server/core/errors' +import { regenerateDiyImage } from '@/server/services/diy-render-regeneration.service' + +export async function POST(request: NextRequest, context: { params: Promise<{ id: string }> }) { + return handleRequest(request, async ctx => { + let input: unknown + try { input = await request.json() } catch { throw new AppError(ErrorCode.VALIDATION_FAILED, '重新出图参数格式无效') } + const { id } = await context.params + return jsonSuccess(await regenerateDiyImage(id, input, ctx.user), 202, ctx.requestId) + }, { requireAuth: true }) +} diff --git a/furniture-3d-system/src/app/api/diy/ai-renders/[id]/versions/route.ts b/furniture-3d-system/src/app/api/diy/ai-renders/[id]/versions/route.ts new file mode 100644 index 00000000..cb8e1773 --- /dev/null +++ b/furniture-3d-system/src/app/api/diy/ai-renders/[id]/versions/route.ts @@ -0,0 +1,13 @@ +import type { NextRequest } from 'next/server' +import { handleRequest, jsonSuccess } from '@/server/core/response' +import { AppError, ErrorCode } from '@/server/core/errors' +import { chooseDiyImageVersion } from '@/server/services/diy-image-version.service' + +export async function POST(request: NextRequest, context: { params: Promise<{ id: string }> }) { + return handleRequest(request, async ctx => { + let input: unknown + try { input = await request.json() } catch { throw new AppError(ErrorCode.VALIDATION_FAILED, '图片选用参数格式无效') } + const { id } = await context.params + return jsonSuccess(await chooseDiyImageVersion(id, input, ctx.user), 200, ctx.requestId) + }, { requireAuth: true }) +} diff --git a/furniture-3d-system/src/app/diy/components/DiyAiProcessingResults.tsx b/furniture-3d-system/src/app/diy/components/DiyAiProcessingResults.tsx index 0abac7d3..7d2ee749 100644 --- a/furniture-3d-system/src/app/diy/components/DiyAiProcessingResults.tsx +++ b/furniture-3d-system/src/app/diy/components/DiyAiProcessingResults.tsx @@ -1,30 +1,36 @@ 'use client' -import { Download, RefreshCw } from 'lucide-react' +import { Download } from 'lucide-react' import Button from '@/components/ui/Button' import type { DiyAiRenderDTO } from '@/lib/diy/ai-render' import type { DiyAiRenderController } from '../hooks/useDiyAiRender' -import { useDiyReprocessing } from '../hooks/useDiyReprocessing' +import { useDiyReprocessing, type DiyReprocessingController } from '../hooks/useDiyReprocessing' import DiyAiFailureNotice from './DiyAiFailureNotice' +import DiySkuImageActions from './DiySkuImageActions' +import DiyImageVersions from './DiyImageVersions' -export default function DiyAiProcessingResults({ record, ai, onPreview }: { record: DiyAiRenderDTO; ai: DiyAiRenderController; onPreview: (url: string) => void }) { - const retry = useDiyReprocessing(ai.refresh) +export default function DiyAiProcessingResults({ record, ai, onPreview, controller }: { record: DiyAiRenderDTO; ai: DiyAiRenderController; onPreview: (url: string) => void; controller?: DiyReprocessingController }) { + const ownController = useDiyReprocessing(ai.refresh), retry = controller || ownController if (!record.processing) return null - const pending = record.processing.images.filter(image => image.status !== 'succeeded') - const failed = pending.filter(image => image.status === 'failed').length + const pending = record.processing.images.filter(image => image.status !== 'succeeded' + && !record.images.some(result => result.storageKey === image.resultStorageKey)) + const awaitingChoice = pending.filter(image => image.versions?.some(version => !version.selected && version.result)).length + const failed = pending.filter(image => image.status === 'failed' && !image.versions?.some(version => version.result)).length return
-

成功 {record.images.length}/{record.processing.expected} 张{failed ? ` · ${failed}张后处理失败` : pending.length ? ' · 正在处理原图…' : ''}

- {retry.error &&

{retry.error}

} +

已选用 {record.images.length}/{record.processing.expected} 张{record.needsReview ? ' · 任务已暂停,待核对' : awaitingChoice ? ` · ${awaitingChoice}张可对比选用` : failed ? ` · ${failed}张后处理失败` : pending.length ? ' · 正在处理原图…' : ''}

+ {!controller && retry.error &&

{retry.error}

} {pending.map(image =>
+ {image.versions && image.versions.length > 1 ? : <> {image.status === 'failed' ? - :

原图已生成,正在处理…

} + :

{record.needsReview ? '任务已暂停,待核对已有结果' : '原图已生成,正在处理…'}

} + }
- {image.status === 'failed' && record.mode === 'sku' && !record.operation && ai.access.canGenerate && } + {(!image.versions || image.versions.length < 2) && image.status === 'failed' && ai.access.canGenerate && } {ai.access.canDownload && }
diff --git a/furniture-3d-system/src/app/diy/components/DiyAiResultCard.tsx b/furniture-3d-system/src/app/diy/components/DiyAiResultCard.tsx index 422daca3..1d487464 100644 --- a/furniture-3d-system/src/app/diy/components/DiyAiResultCard.tsx +++ b/furniture-3d-system/src/app/diy/components/DiyAiResultCard.tsx @@ -10,6 +10,9 @@ import DiyDimensionActions from './dimensions/DiyDimensionActions' import { diyDisplayImageUrl, type DiyDimensionSelection } from '@/lib/diy/dimension-annotations' import DiyAiProcessingResults from './DiyAiProcessingResults' import DiyAiFailureNotice from './DiyAiFailureNotice' +import { useDiyReprocessing } from '../hooks/useDiyReprocessing' +import DiySkuImageActions from './DiySkuImageActions' +import DiyImageVersions from './DiyImageVersions' export const diyRenderLabel = (record: DiyAiRenderDTO) => record.operation === 'local-preview' ? '本地截图' : record.operation === 'text-replace' ? '文字替换' : record.operation === 'layout-replace' ? '排版图' : record.mode === 'sku' ? 'SKU 图' : record.mode === 'scene' ? '效果图' : '白底图' @@ -20,7 +23,9 @@ export default function DiyAiResultCard({ record, ai, onPreview, onEdit, onLayou onEdit: (selection: DiyImageSelection) => void; onLayout: (selection: DiyImageSelection) => void; onDimensions: (selection: DiyDimensionSelection) => void }) { const label = diyRenderLabel(record) + const replacement = useDiyReprocessing(ai.refresh) const hasProcessingFailure = record.processing?.images.some(image => image.status === 'failed') + const hasComparison = record.processing?.images.some(image => image.versions && image.versions.length > 1) return
{record.name} @@ -31,24 +36,33 @@ export default function DiyAiResultCard({ record, ai, onPreview, onEdit, onLayou
{record.needsReview &&

待核对 · 后台已暂停,不占生成名额

} - {record.status === 'PENDING' && !record.needsReview && !record.errorMessage &&

{record.processing ? '正在处理原图…' : '正在生成…'}

} + {record.status === 'PENDING' && !record.needsReview && !record.errorMessage &&

{record.processing?.images.some(image => image.operation) ? '正在重新处理,完成后对比选用…' : record.processing ? '正在处理原图…' : '正在生成…'}

} + {replacement.error &&

{replacement.error}

} {record.status === 'PENDING' && record.errorMessage &&

{record.errorMessage}

} - {record.status !== 'PENDING' && (record.status === 'FAILED' || record.errorMessage) && !hasProcessingFailure && } - + {record.status !== 'PENDING' && record.images.length > 0 && record.errorMessage?.includes('原成图已保留') &&

本次重新处理失败,原成图已保留。

} + {record.status !== 'PENDING' && (record.status === 'FAILED' || record.errorMessage) && !hasProcessingFailure && !hasComparison && } + {record.status === 'FAILED' && !record.images.length && ai.access.canDelete && } {record.images.map((image, index) => { const displayUrl = diyDisplayImageUrl(record, image) + const processing = record.processing?.images.find(item => item.resultStorageKey === image.storageKey) + const comparing = Boolean(processing?.versions && processing.versions.length > 1) const selection: DiyImageSelection = { recordId: record.id, storageKey: image.storageKey, url: image.originalUrl, name: `${record.name}-${label}-${index + 1}`, width: image.width, height: image.height } const canLayout = ai.access.canGenerate && record.mode !== 'scene' && (!record.operation || record.operation === 'local-preview') && record.status === 'SUCCEEDED' return
- + } + {!comparing && ai.access.canGenerate && processing &&
+ +
}
{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() } }}> + +
{ event.preventDefault(); if (!busy) void onSubmit(feedback.trim()) }}> +

{label}

+ {/* eslint-disable-next-line @next/next/no-img-element */} + 本次调整的版本 +