From d09e73d918870c6f170ea6b9f9ab97ce55a07756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Tue, 12 Aug 2025 23:25:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E8=B0=83=E8=AF=95=E4=BB=A3=E7=A0=81=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=BC=96=E8=BE=91=E6=A8=A1=E6=80=81=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E9=80=BB=E8=BE=91=E3=80=82?= =?UTF-8?q?=E5=90=8C=E6=97=B6=EF=BC=8C=E7=AE=80=E5=8C=96=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/pages/work-flow/use-workflow-data.tsx | 1 - components/ui/edit-modal.tsx | 8 +++++++- components/ui/shot-tab-content.tsx | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/components/pages/work-flow/use-workflow-data.tsx b/components/pages/work-flow/use-workflow-data.tsx index 86dd3e4..c1ab30e 100644 --- a/components/pages/work-flow/use-workflow-data.tsx +++ b/components/pages/work-flow/use-workflow-data.tsx @@ -215,7 +215,6 @@ export function useWorkflowData() { for (const task of all_task_data) { // 如果有已完成的数据，同步到状态 - console.log('000000000', taskData); if (task.task_name === 'generate_sketch' && (task.task_status !== 'COMPLETED' || taskData.sketch.total_count !== taskData.sketch.data.length)) { taskData.status = '1'; const realSketchResultData = task.task_result.data.filter((item: any) => item.image_path); diff --git a/components/ui/edit-modal.tsx b/components/ui/edit-modal.tsx index c2d1628..f39fcbb 100644 --- a/components/ui/edit-modal.tsx +++ b/components/ui/edit-modal.tsx @@ -118,6 +118,12 @@ export function EditModal({ setIsRemindFallbackOpen(false); } + const handleReset = () => { + console.log('handleReset'); + // 重置当前tab修改的数据 + + } + const renderTabContent = () => { switch (activeTab) { case '0': @@ -278,7 +284,7 @@ export function EditModal({ className="px-4 py-2 rounded-lg bg-white/10 text-white hover:bg-white/20 transition-colors" whileHover={{ scale: 1.02 }} whileTap={{ scale: 0.98 }} - onClick={onClose} + onClick={handleReset} > Reset diff --git a/components/ui/shot-tab-content.tsx b/components/ui/shot-tab-content.tsx index 52e419d..02bd772 100644 --- a/components/ui/shot-tab-content.tsx +++ b/components/ui/shot-tab-content.tsx @@ -8,7 +8,7 @@ import { PersonDetection, PersonDetectionScene } from './person-detection'; import { ShotsEditor } from './shot-editor/ShotsEditor'; import { CharacterLibrarySelector } from './character-library-selector'; import FloatingGlassPanel from './FloatingGlassPanel'; -import { ReplaceCharacterPanel, mockShots, mockCharacter } from './replace-character-panel'; +import { ReplaceCharacterPanel } from './replace-character-panel'; import HorizontalScroller from './HorizontalScroller'; import { useEditData } from '@/components/pages/work-flow/use-edit-data'; import { roleRecognitionResponse } from '@/app/service/usecase/ShotEditUsecase'; From 8b82f4628d6f66a35fc519e690a22de87bbd93c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Wed, 13 Aug 2025 01:06:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9A=82=E5=81=9C/=E6=92=AD=E6=94=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E5=9C=A8=E8=84=9A=E6=9C=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=E6=89=8D=E6=98=BE=E7=A4=BA=E3=80=82?= =?UTF-8?q?=E5=90=8C=E6=97=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/pages/work-flow.tsx | 2 +- components/pages/work-flow/use-workflow-data.tsx | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/pages/work-flow.tsx b/components/pages/work-flow.tsx index 5966bd3..d82dfcd 100644 --- a/components/pages/work-flow.tsx +++ b/components/pages/work-flow.tsx @@ -226,7 +226,7 @@ export default function WorkFlow() { {/* 暂停/播放按钮 */} { - (currentStep !== '6' && currentStep !== '0') && ( + (currentStep !== '6' && scriptData && scriptData.length > 0) && (
= 0 && roles.length !== task.task_result.data.length) { @@ -270,6 +272,7 @@ export function useWorkflowData() { loadingText = LOADING_TEXT_MAP.getShotSketchStatus; } + break; } if (task.task_name === 'generate_shot_sketch' && (task.task_status !== 'COMPLETED' || taskData.shot_sketch.total_count !== taskData.shot_sketch.data.length)) { const realShotResultData = task.task_result.data.filter((item: any) => item.url); @@ -302,6 +305,7 @@ export function useWorkflowData() { taskData.status = '3'; } setTotalSketchCount(task.task_result.total_count); + break; } if (task.task_name === 'generate_videos' && (task.task_status !== 'COMPLETED' || taskData.video.total_count !== taskData.video.data.length)) { const realTaskResultData = task.task_result.data.filter((item: any) => item.urls && item.urls.length > 0); @@ -335,6 +339,7 @@ export function useWorkflowData() { taskData.status = '5'; loadingText = LOADING_TEXT_MAP.postProduction('generating rough cut video...'); } + break; } // 粗剪 if (task.task_name === 'generate_final_simple_video') { @@ -361,7 +366,7 @@ export function useWorkflowData() { } } - console.log('----------finalStep', taskData.status); + console.log('-----look-finalStep-----', taskData.status); // 设置步骤 setCurrentStep(taskData.status); setTaskObject(prev => { @@ -439,7 +444,6 @@ export function useWorkflowData() { } } - let loadingText: any = LOADING_TEXT_MAP.initializing; if (status === 'COMPLETED') { loadingText = LOADING_TEXT_MAP.complete; }