Merge branch 'dev' of https://git.qikongjian.com/77media/video-flow into dev

components/pages/work-flow.tsx

@@ -226,7 +226,7 @@ export default function WorkFlow() {
 
         {/* 暂停/播放按钮 */}
         {
-          (currentStep !== '6' && currentStep !== '0') && (
+          (currentStep !== '6' && scriptData && scriptData.length > 0) && (
             <div className="absolute right-12 bottom-16 z-[49] flex gap-4">
               <GlassIconButton
                 icon={isPauseWorkFlow ? Play : Pause}

components/pages/work-flow/use-workflow-data.tsx

@@ -211,11 +211,11 @@ export function useWorkflowData() {
       all_task_data[0] = all_task_data[1];
       all_task_data[1] = temp;
 
-      console.log('all_task_data', all_task_data);
+      console.log('---look-all_task_data', all_task_data);
+      console.log('---look-taskData', taskData);
       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);
@@ -245,6 +245,7 @@ export function useWorkflowData() {
             taskData.status = '2';
           }
           setTotalSketchCount(task.task_result.total_count);
+          break;
         }
         if (task.task_name === 'generate_character' && (task.task_status !== 'COMPLETED' || taskData.character.total_count !== taskData.character.data.length)) {
           if (task.task_result.data.length >= 0 && roles.length !== task.task_result.data.length) {
@@ -271,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);
@@ -303,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);
@@ -336,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') {
@@ -362,7 +366,7 @@ export function useWorkflowData() {
         }
       }
 
-      console.log('----------finalStep', taskData.status);
+      console.log('-----look-finalStep-----', taskData.status);
       // 设置步骤
       setCurrentStep(taskData.status);
       setTaskObject(prev => {
@@ -440,7 +444,6 @@ export function useWorkflowData() {
         }
       }
 
-      let loadingText: any = LOADING_TEXT_MAP.initializing;
       if (status === 'COMPLETED') {
         loadingText = LOADING_TEXT_MAP.complete;
       }

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
                   </motion.button>

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';