修复导出剪映草稿

src/pages/home/home.js

@@ -64,12 +64,12 @@ const Home = forwardRef((props, ref) => {
       setLoading(true);
       // 获取项目详情
       const segments = await bookInfoService.getBookInfoByBookId(projectId);
-      
+
       if (!segments || segments.length === 0) {
         toast.error('该项目没有字幕内容可下载');
         return;
       }
-      
+
       // 生成SRT格式内容
       const srtContent = segments
         .sort((a, b) => a.segment_id - b.segment_id)
@@ -77,24 +77,24 @@ const Home = forwardRef((props, ref) => {
           return `${segment.segment_id}\n${segment.start_time} --> ${segment.end_time}\n${segment.text}\n`;
         })
         .join('\n');
-      
+
       // 创建Blob对象
       const blob = new Blob([srtContent], { type: 'text/plain;charset=utf-8' });
-      
+
       // 创建下载链接
       const url = URL.createObjectURL(blob);
       const link = document.createElement('a');
       link.href = url;
       link.download = `${projectTitle || '项目'}.srt`;
-      
+
       // 触发下载
       document.body.appendChild(link);
       link.click();
-      
+
       // 清理
       document.body.removeChild(link);
       URL.revokeObjectURL(url);
-      
+
       toast.success('字幕下载成功');
     } catch (error) {
       console.error('下载字幕失败:', error);
@@ -110,35 +110,35 @@ const Home = forwardRef((props, ref) => {
       setLoading(true);
       // 获取项目详情
       const segments = await bookInfoService.getBookInfoByBookId(projectId);
-      
+
       if (!segments || segments.length === 0) {
         toast.error('该项目没有文本内容可下载');
         return;
       }
-      
+
       // 提取所有纯文本内容（不包含时间信息）
       const textContent = segments
         .sort((a, b) => a.segment_id - b.segment_id)
         .map(segment => segment.text)
         .join('\n\n');
-      
+
       // 创建Blob对象
       const blob = new Blob([textContent], { type: 'text/plain;charset=utf-8' });
-      
+
       // 创建下载链接
       const url = URL.createObjectURL(blob);
       const link = document.createElement('a');
       link.href = url;
       link.download = `${projectTitle || '项目'}_文案.txt`;
-      
+
       // 触发下载
       document.body.appendChild(link);
       link.click();
-      
+
       // 清理
       document.body.removeChild(link);
       URL.revokeObjectURL(url);
-      
+
       toast.success('文案下载成功');
     } catch (error) {
       console.error('下载文案失败:', error);
@@ -154,21 +154,21 @@ const Home = forwardRef((props, ref) => {
       setLoading(true);
       // 获取项目详情
       const segments = await bookInfoService.getBookInfoByBookId(projectId);
-      
+
       if (!segments || segments.length === 0) {
         toast.error('该项目没有文本内容可复制');
         return;
       }
-      
+
       // 提取所有纯文本内容（不包含时间信息）
       const textContent = segments
         .sort((a, b) => a.segment_id - b.segment_id)
         .map(segment => segment.text)
         .join('\n\n');
-      
+
       // 复制到剪贴板
       await navigator.clipboard.writeText(textContent);
-      
+
       toast.success('文案已复制到剪贴板');
     } catch (error) {
       console.error('复制文案失败:', error);
@@ -212,18 +212,18 @@ const Home = forwardRef((props, ref) => {
           toast.error('无法获取数据库路径');
           return;
         }
-        
+
         console.log('数据库路径:', dbPath);
-        
+
         // 获取数据库所在目录
         let dbDir = dbPath;
         const lastSlashIndex = Math.max(dbPath.lastIndexOf('/'), dbPath.lastIndexOf('\\'));
         if (lastSlashIndex !== -1) {
           dbDir = dbPath.substring(0, lastSlashIndex);
         }
-        
+
         console.log('数据库目录:', dbDir);
-        
+
         // 打开文件夹
         window.electron.files.showItemInFolder(dbDir);
         toast.success('已打开数据库所在文件夹');
@@ -246,9 +246,9 @@ const Home = forwardRef((props, ref) => {
           toast.error(`无法获取资源目录路径: ${result.error}`);
           return;
         }
-        
+
         console.log('资源目录路径:', result.path);
-        
+
         // 打开文件夹
         window.electron.files.showItemInFolder(result.path);
         toast.success('已打开资源文件夹');
@@ -270,7 +270,7 @@ const Home = forwardRef((props, ref) => {
   // 确认删除项目
   const confirmDeleteProject = async () => {
     if (!projectToDelete) return;
-    
+
     try {
       setLoading(true);
       await bookService.deleteBook(projectToDelete.id);
@@ -344,7 +344,7 @@ const Home = forwardRef((props, ref) => {
                   >
                     添加项目
                   </Button>
-                  
+
                   <Button
                     variant={hasValidToken() ? "outline-success" : "outline-warning"}
                     onClick={handleOpenApiSettings}
@@ -354,7 +354,7 @@ const Home = forwardRef((props, ref) => {
                   </Button>
                 </div>
               </div>
-              
+
               {!hasValidToken() && (
                 <Alert variant="warning" className="mt-3">
                   <Alert.Heading>请配置Coze API Token</Alert.Heading>
@@ -364,40 +364,41 @@ const Home = forwardRef((props, ref) => {
                   </p>
                 </Alert>
               )}
-              
+
               <div className="welcome-container">
                 {projects.length > 0 ? (
                   <div className="project-list-container">
                     <h4 className="mb-3">项目列表</h4>
-                    
+
                     <div className="mb-3 d-flex gap-2">
-                      <Button 
-                        variant="outline-secondary" 
+                      <Button
+                        variant="outline-secondary"
                         size="sm"
                         onClick={openDatabasePath}
                       >
                         <i className="bi bi-folder"></i> 打开数据库文件夹
                       </Button>
-                      
-                      <Button 
-                        variant="outline-secondary" 
+
+                      <Button
+                        variant="outline-secondary"
                         size="sm"
                         onClick={openResourcesPath}
                       >
                         <i className="bi bi-folder"></i> 打开资源文件夹
                       </Button>
                     </div>
-                    
+
                     <div className="table-responsive">
                       <Table striped hover className="project-table">
                         <thead>
                           <tr>
-                            <th>项目名称</th>
+                            <th>名称</th>
                             <th>创建时间</th>
-                            <th>字幕文件</th>
-                            <th>音频文件</th>
-                            <th>视频文件</th>
+                            <th>字幕</th>
+                            <th>音频</th>
+                            <th>视频</th>
                             <th>对口型视频</th>
+                            <th>剪映草稿</th>
                             <th>操作</th>
                           </tr>
                         </thead>
@@ -434,6 +435,13 @@ const Home = forwardRef((props, ref) => {
                                   <span className="text-muted">未生成</span>
                                 )}
                               </td>
+                              <td>
+                                {project.draft_url ? (
+                                  <Badge bg="success">已导出</Badge>
+                                ) : (
+                                  <span className="text-muted">未导出</span>
+                                )}
+                              </td>
                               <td className="action-buttons">
                                 <Button
                                   variant="outline-primary"
@@ -474,6 +482,18 @@ const Home = forwardRef((props, ref) => {
                                     播放对口型
                                   </Button>
                                 )}
+                                {project.draft_url && (
+                                  <Button
+                                    variant="outline-success"
+                                    size="sm"
+                                    onClick={() => {
+                                      navigator.clipboard.writeText(project.draft_url);
+                                      toast.success('剪映草稿链接已复制到剪贴板');
+                                    }}
+                                  >
+                                    复制草稿链接
+                                  </Button>
+                                )}
                                 <Button
                                   variant="outline-danger"
                                   size="sm"
@@ -505,12 +525,10 @@ const Home = forwardRef((props, ref) => {
                 </Button>
               </div>
 
-              <AudioUpload onAudioSelected={(audioFile) => setProjectAudioFile(audioFile)} />
-              
               <VideoUpload onVideoSelected={(videoFile) => setProjectVideoFile(videoFile)} />
-
-              <SubtitleUpload 
-                onProjectCreated={backToHome} 
+              <AudioUpload onAudioSelected={(audioFile) => setProjectAudioFile(audioFile)} />
+              <SubtitleUpload
+                onProjectCreated={backToHome}
                 projectAudioFile={projectAudioFile}
                 projectVideoFile={projectVideoFile}
               />
@@ -520,10 +538,10 @@ const Home = forwardRef((props, ref) => {
 
         </Container>
       </div>
-      
+
       {/* API设置对话框 */}
-      <Modal 
-        show={showApiSettings} 
+      <Modal
+        show={showApiSettings}
         onHide={handleCloseApiSettings}
         size="lg"
         centered
@@ -535,7 +553,7 @@ const Home = forwardRef((props, ref) => {
           <CozeApiSettings onSave={handleCloseApiSettings} />
         </Modal.Body>
       </Modal>
-      
+
       {/* 删除确认对话框 */}
       <Modal
         show={showDeleteConfirm}
@@ -554,8 +572,8 @@ const Home = forwardRef((props, ref) => {
           <Button variant="secondary" onClick={cancelDeleteProject}>
             取消
           </Button>
-          <Button 
-            variant="danger" 
+          <Button
+            variant="danger"
             onClick={confirmDeleteProject}
             disabled={loading}
           >
@@ -563,7 +581,7 @@ const Home = forwardRef((props, ref) => {
           </Button>
         </Modal.Footer>
       </Modal>
-      
+
       {/* 音频播放器模态框 */}
       <Modal
         show={showAudioPlayer}
@@ -578,9 +596,9 @@ const Home = forwardRef((props, ref) => {
             <div className="audio-player-container">
               <p>项目音频: {currentAudio.fileName}</p>
               <div className="audio-player">
-                <audio 
-                  controls 
-                  autoPlay 
+                <audio
+                  controls
+                  autoPlay
                   className="w-100"
                   src={`${currentAudio.fileName}`} // 实际开发中需要提供真实的音频文件URL
                 >
@@ -599,7 +617,7 @@ const Home = forwardRef((props, ref) => {
           </Button>
         </Modal.Footer>
       </Modal>
-      
+
       {/* 视频播放模态框 */}
       <Modal show={showVideoPlayer} onHide={closeVideoPlayer} size="lg" centered>
         <Modal.Header closeButton>
@@ -608,9 +626,9 @@ const Home = forwardRef((props, ref) => {
         <Modal.Body>
           {currentVideo && (
             <div className="video-player-container">
-              <video 
-                className="w-100" 
-                controls 
+              <video
+                className="w-100"
+                controls
                 autoPlay
                 src={currentVideo.path}
               >

src/pages/projectDetail/projectDetail.js

@@ -72,6 +72,9 @@ const ProjectDetail = () => {
   // 添加一个标志位来防止重复调用
   const [isGenerating, setIsGenerating] = useState(false);
 
+  // 添加一个状态变量防止重复检查
+  const [isCheckingGeneration, setIsCheckingGeneration] = useState(false);
+
   const fileInputRef = useRef(null);
 
   // 辅助函数：根据ID获取单个分镜信息
@@ -721,7 +724,14 @@ const ProjectDetail = () => {
 
   // 检查是否有正在进行的绘图任务
   const checkOngoingImageGeneration = async () => {
+    // 防止重复检查
+    if (isCheckingGeneration || isGenerating) {
+      console.log('已经在检查或正在生成图片中，跳过重复检查');
+      return null;
+    }
+
     try {
+      setIsCheckingGeneration(true);
       console.log('检查是否有正在进行的绘图任务');
 
       // 从数据库获取所有分镜
@@ -796,8 +806,8 @@ const ProjectDetail = () => {
         });
 
         // 检查是否已经在生成图片
-        if (!generatingImages) {
-          // 启动绘图任务
+        if (!generatingImages && !isGenerating) {
+          // 启动绘图任务，使用setTimeout避免可能的状态更新问题
           setTimeout(() => {
             generateAllImages(false);
           }, 1000);
@@ -812,6 +822,8 @@ const ProjectDetail = () => {
       localStorage.removeItem(`project_${projectId}_image_generation`);
       setGeneratingImages(false);
       setIsPaused(false);
+    } finally {
+      setIsCheckingGeneration(false);
     }
 
     return null;
@@ -1097,9 +1109,10 @@ const ProjectDetail = () => {
         // 检查最终状态
         const finalSegments = await bookInfoService.getBookInfoByBookId(parseInt(projectId));
         const stillPaused = finalSegments.some(segment => segment.draw_status === -1);
+        const anyPending = finalSegments.some(segment => segment.draw_status === 0 || segment.draw_status === 1);
 
-        if (!stillPaused) {
-          // 只有在非暂停状态下才清除生成状态
+        if (!stillPaused && !anyPending) {
+          // 只有在非暂停状态并且没有待处理的分镜时才清除生成状态
           setGeneratingImages(false);
           setIsPaused(false);
           localStorage.removeItem(`project_${projectId}_image_generation`);
@@ -1109,11 +1122,13 @@ const ProjectDetail = () => {
           } else {
             toast.warning(`图片生成结束，成功${successCount}张，失败${errorCount}张`);
           }
-        } else {
+        } else if (stillPaused) {
           toast.info('图片生成已暂停，可以稍后继续');
+        } else if (anyPending) {
+          console.log('还有待处理的分镜，等待下一轮处理');
         }
 
-        // 刷新数据
+        // 刷新数据，不触发检查
         await loadProjectDetail(true);
       } else {
         // 继续绘画: 将没有图片的、有描述词的分镜设置为排队状态(0)
@@ -1365,9 +1380,10 @@ const ProjectDetail = () => {
         // 检查最终状态
         const finalSegments = await bookInfoService.getBookInfoByBookId(parseInt(projectId));
         const stillPaused = finalSegments.some(segment => segment.draw_status === -1);
+        const anyPending = finalSegments.some(segment => segment.draw_status === 0 || segment.draw_status === 1);
 
-        if (!stillPaused) {
-          // 只有在非暂停状态下才清除生成状态
+        if (!stillPaused && !anyPending) {
+          // 只有在非暂停状态并且没有待处理的分镜时才清除生成状态
           setGeneratingImages(false);
           setIsPaused(false);
           localStorage.removeItem(`project_${projectId}_image_generation`);
@@ -1377,11 +1393,13 @@ const ProjectDetail = () => {
           } else {
             toast.warning(`图片生成结束，成功${successCount}张，失败${errorCount}张`);
           }
-        } else {
+        } else if (stillPaused) {
           toast.info('图片生成已暂停，可以稍后继续');
+        } else if (anyPending) {
+          console.log('还有待处理的分镜，等待下一轮处理');
         }
 
-        // 刷新数据
+        // 刷新数据，不触发检查
         await loadProjectDetail(true);
       }
     } finally {
@@ -2086,68 +2104,105 @@ const ProjectDetail = () => {
    * 处理导出剪映草稿
    */
   const handleExportDraft = async () => {
-    try {
-      // 检查是否有音频和视频
-      if (!project.audio_url || !project.lip_sync_video_path) {
-        toast.error('请先完成对口型视频生成');
-        return;
-      }
+    if (!hasValidToken()) {
+      toast.error('未配置Coze API Token，请先在首页点击"配置Coze API"按钮进行设置');
+      return;
+    }
 
-      // 检查是否有分镜数据
-      if (!segments || segments.length === 0) {
-        toast.error('没有可导出的分镜数据');
-        return;
-      }
+    // 检查必要条件
+    if (!project.audio_path) {
+      toast.error('项目缺少音频文件，无法导出剪映草稿');
+      return;
+    }
 
-      // 检查所有分镜是否都有必要的字段
-      const invalidSegments = segments.filter(segment => 
-        !segment.start_time || 
-        !segment.end_time || 
-        !segment.text || 
-        !segment.image_path
-      );
+    setExportingDraft(true);
+    try {
+      // 整理分镜数据
+      const orderedSegments = [...segments].sort((a, b) => a.segment_id - b.segment_id);
 
-      if (invalidSegments.length > 0) {
-        toast.error(`有${invalidSegments.length}个分镜缺少必要信息，请完善后再导出`);
+      // 检查分镜是否有必要的信息
+      const incompleteSegments = orderedSegments.filter(
+        segment => !segment.text || !segment.start_time || !segment.end_time
+      );
+      
+      if (incompleteSegments.length > 0) {
+        toast.error(`有${incompleteSegments.length}个分镜缺少必要信息（文本、开始时间或结束时间），请完善后再导出`);
         return;
       }
 
-      setExportingDraft(true);
-
-      // 转换时间格式为微秒
-      const textList = segments.map(segment => {
-        const startTime = convertTimeToMicroseconds(segment.start_time);
-        const endTime = convertTimeToMicroseconds(segment.end_time);
-        const duration = endTime - startTime;
-
+      // 构建文本列表 - 按照API要求格式化时间
+      const textList = orderedSegments.map((segment) => {
+        // 转换时间格式为微秒
+        const startTimeMs = convertTimeToMicroseconds(segment.start_time);
+        const endTimeMs = convertTimeToMicroseconds(segment.end_time);
+        
         return {
-          start_time: startTime,
-          end_time: endTime,
-          duration: duration,
           text: segment.text,
-          image_path: segment.image_path
+          start_time: startTimeMs,
+          end_time: endTimeMs,
+          duration: endTimeMs - startTimeMs,
+          // 添加可选的图片路径
+          image_path: segment.image_path || ""
         };
       });
 
-      // 调用工作流API
-      const cozeInstance = initCozeService();
-      const response = await cozeInstance.runWorkflow(WORKFLOW_IDS.exportJianyingDraft, {
-        audio_url: project.audio_url,
-        video_url: project.lip_sync_video_path,
-        text_list: textList
+      const cozeInstance = initCozeService({
+        timeout: 120000 // 设置120秒超时
       });
 
+      // 准备所有必要参数
+      const params = {
+        // 必填参数
+        project_id: projectId,
+        text_list: textList,
+        // 添加音频链接参数
+        audio_url: project.audio_url || project.audio_path,
+        // 添加可选参数
+        video_url: project.lip_sync_video_path || project.video_path || "",
+        project_title: project.title || "项目" + projectId
+      };
+
+      console.log("导出剪映草稿参数:", JSON.stringify(params, null, 2));
+
+      // 调用导出API - 使用runWorkflow替代exportToDraft
+      const response = await cozeInstance.runWorkflow(WORKFLOW_IDS.exportJianyingDraft, params);
+
       if (response && response.data) {
         try {
-          const result = JSON.parse(response.data);
-          if (result.output) {
-            toast.success('剪映草稿导出成功');
-            // 这里可以添加下载草稿文件的逻辑
+          // 解析响应数据
+          const responseObj = JSON.parse(response.data);
+          console.log("导出剪映草稿响应:", responseObj);
+          
+          // 检查状态码
+          if (response.code === 0) {
+            if (responseObj && responseObj.draft_url) {
+              const draftUrl = responseObj.draft_url;
+              
+              // 保存草稿链接到数据库
+              await bookService.updateBook(parseInt(projectId), {
+                draft_url: draftUrl
+              });
+              
+              // 更新本地状态
+              setProject(prev => ({
+                ...prev,
+                draft_url: draftUrl
+              }));
+              
+              toast.success('剪映草稿导出成功');
+              
+              // 刷新项目数据
+              await loadProjectDetail(true);
+            } else {
+              throw new Error('未找到有效的草稿链接');
+            }
           } else {
-            throw new Error('导出结果格式不正确');
+            // 导出失败
+            throw new Error(response.msg || '导出失败');
           }
         } catch (e) {
-          throw new Error('解析导出结果失败');
+          console.error('解析导出结果失败:', e);
+          throw new Error('解析导出结果失败: ' + e.message);
         }
       } else {
         throw new Error('导出失败，未收到有效响应');
@@ -2702,6 +2757,122 @@ const ProjectDetail = () => {
                 )}
               </Card.Body>
             </Card>
+
+            <Row className="mt-3">
+              {/* 项目媒体文件区域 */}
+              <Col md={12}>
+                <Card className="mb-3">
+                  <Card.Header>
+                    <div className="d-flex justify-content-between align-items-center">
+                      <h5 className="mb-0">项目媒体</h5>
+                      <div>
+                        {project.draft_url && (
+                          <Button
+                            variant="outline-success"
+                            size="sm"
+                            className="ms-2"
+                            onClick={() => {
+                              navigator.clipboard.writeText(project.draft_url);
+                              toast.success('剪映草稿链接已复制到剪贴板');
+                            }}
+                          >
+                            <i className="bi bi-clipboard"></i> 复制剪映草稿链接
+                          </Button>
+                        )}
+                        <Button
+                          variant="outline-primary"
+                          size="sm"
+                          className="ms-2"
+                          onClick={handleExportDraft}
+                          disabled={exportingDraft}
+                        >
+                          {exportingDraft ? (
+                            <>
+                              <Spinner
+                                as="span"
+                                animation="border"
+                                size="sm"
+                                role="status"
+                                aria-hidden="true"
+                              />
+                              <span className="ms-2">导出中...</span>
+                            </>
+                          ) : (
+                            '导出剪映草稿'
+                          )}
+                        </Button>
+                      </div>
+                    </div>
+                  </Card.Header>
+                  <Card.Body>
+                    <Row>
+                      {/* 项目画风 */}
+                      <Col md={3}>
+                        <Form.Group>
+                          <Form.Label>项目画风</Form.Label>
+                          <Dropdown>
+                            <Dropdown.Toggle 
+                              variant="outline-primary" 
+                              id="dropdown-style"
+                              disabled={loadingStyles}
+                              className="w-100 text-start"
+                            >
+                              {selectedStyle || '请选择画风'}
+                              {loadingStyles && (
+                                <Spinner
+                                  as="span"
+                                  animation="border"
+                                  size="sm"
+                                  role="status"
+                                  aria-hidden="true"
+                                  className="ms-2"
+                                />
+                              )}
+                            </Dropdown.Toggle>
+
+                            <Dropdown.Menu className="w-100">
+                              {stylesList.map((style, index) => (
+                                <Dropdown.Item
+                                  key={`style-${index}`}
+                                  onClick={() => handleStyleSelect(style)}
+                                >
+                                  {style}
+                                </Dropdown.Item>
+                              ))}
+                            </Dropdown.Menu>
+                          </Dropdown>
+                        </Form.Group>
+                      </Col>
+
+                      {/* 剪映草稿 */}
+                      <Col md={3}>
+                        <Form.Group>
+                          <Form.Label>剪映草稿</Form.Label>
+                          {project.draft_url ? (
+                            <div className="border rounded p-2 bg-light">
+                              <div className="text-truncate small" style={{maxWidth: '100%'}}>
+                                <a 
+                                  href={project.draft_url} 
+                                  target="_blank" 
+                                  rel="noopener noreferrer"
+                                  title={project.draft_url}
+                                >
+                                  {project.draft_url}
+                                </a>
+                              </div>
+                            </div>
+                          ) : (
+                            <Alert variant="warning" className="mb-0">
+                              <small>尚未导出剪映草稿</small>
+                            </Alert>
+                          )}
+                        </Form.Group>
+                      </Col>
+                    </Row>
+                  </Card.Body>
+                </Card>
+              </Col>
+            </Row>
           </div>
         ) : (
           <div className="text-center my-5">