From 8f0a2021305c00cf25410cf80d6995072103120d Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sun, 26 Jul 2026 18:07:28 +0800 Subject: [PATCH 01/11] =?UTF-8?q?refactor(useGenerateVideo):=20=E6=8B=86?= =?UTF-8?q?=E5=88=86=20useGenerateVideo=20Hook=EF=BC=88370=E2=86=92221?= =?UTF-8?q?=E8=A1=8C,=20-40%=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 抽 generate-video/ 子目录，按职责拆分6个文件 - types.ts: 入参/返回值/阶段类型 - phase.ts: getGenerationPhase 阶段映射 - errorUtils.ts: safeExtractError/translateError/extractBackendError - voiceConfig.ts: buildVoiceConfig 配音配置构建 - useGenerationPolling.ts: 生成状态轮询 Hook - 主 Hook 精简为状态管理 + 编排逻辑，可读性大幅提升 --- .../hooks/generate-video/errorUtils.ts | 64 +++++ .../generate/hooks/generate-video/phase.ts | 9 + .../generate/hooks/generate-video/types.ts | 48 ++++ .../generate-video/useGenerationPolling.ts | 87 ++++++ .../hooks/generate-video/voiceConfig.ts | 33 +++ .../pages/generate/hooks/useGenerateVideo.ts | 259 ++++-------------- 6 files changed, 294 insertions(+), 206 deletions(-) create mode 100644 apps/web/src/pages/generate/hooks/generate-video/errorUtils.ts create mode 100644 apps/web/src/pages/generate/hooks/generate-video/phase.ts create mode 100644 apps/web/src/pages/generate/hooks/generate-video/types.ts create mode 100644 apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts create mode 100644 apps/web/src/pages/generate/hooks/generate-video/voiceConfig.ts diff --git a/apps/web/src/pages/generate/hooks/generate-video/errorUtils.ts b/apps/web/src/pages/generate/hooks/generate-video/errorUtils.ts new file mode 100644 index 000000000..4c1e3de91 --- /dev/null +++ b/apps/web/src/pages/generate/hooks/generate-video/errorUtils.ts @@ -0,0 +1,64 @@ +/** + * 错误提取工具 + * 从各种响应格式中安全提取错误消息 + */ + +/** 安全提取字符串错误信息 */ +export const safeExtractError = (val: unknown): string => { + if (typeof val === "string") return val + if (typeof val === "object" && val !== null) { + const obj = val as Record + if (typeof obj.message === "string") return obj.message + if (typeof obj.msg === "string") return obj.msg + if (typeof obj.detail === "string") return obj.detail + if (typeof obj.message === "object" && obj.message !== null) + return safeExtractError(obj.message) + return JSON.stringify(val) + } + return String(val ?? "") +} + +/** 错误信息翻译/友好化 */ +export const translateError = (msg: string): string => { + if (!msg) return "生成失败，请检查网络后重试或联系管理员" + if (msg.includes("editing") || msg.includes("draft") || msg.includes("状态")) { + return "正在准备生成，请稍候再试" + } + if (msg.includes("template_id") || msg.includes("not found") || msg.includes("不存在")) { + return "所选模板或素材不可用，请重新选择" + } + if (msg.includes("asset") && (msg.includes("not found") || msg.includes("missing"))) { + return "素材数据异常，请返回视频库重新检查" + } + if (msg.includes("timeout") || msg.includes("network") || msg.includes("ECONN")) { + return "网络连接超时，请检查网络后重试" + } + if (msg.includes("quota") || msg.includes("limit") || msg.includes("exceed")) { + return "已达到生成次数上限，请稍后再试或联系客服" + } + if (msg.length > 0 && msg.length < 100 && !msg.includes("{")) return msg + return "生成失败，请稍后重试或联系管理员" +} + +/** 从 axios 错误对象中提取后端消息 */ +export const extractBackendError = (err: unknown): string => { + const axiosErr = err as { + response?: { + data?: { + message?: string | object + error?: string | object + detail?: string | object + msg?: string | object + } + } + message?: string + } + return ( + safeExtractError(axiosErr.response?.data?.message) || + safeExtractError(axiosErr.response?.data?.error) || + safeExtractError(axiosErr.response?.data?.detail) || + safeExtractError(axiosErr.response?.data?.msg) || + axiosErr.message || + "" + ) +} diff --git a/apps/web/src/pages/generate/hooks/generate-video/phase.ts b/apps/web/src/pages/generate/hooks/generate-video/phase.ts new file mode 100644 index 000000000..e58b10a02 --- /dev/null +++ b/apps/web/src/pages/generate/hooks/generate-video/phase.ts @@ -0,0 +1,9 @@ +import type { GenerationPhase } from "./types" + +/** 生成阶段映射 */ +export const getGenerationPhase = (p: number): GenerationPhase => { + if (p < 20) return { label: "分析素材与配置", icon: "🔍" } + if (p < 50) return { label: "智能剪辑合成", icon: "🎬" } + if (p < 80) return { label: "渲染视频中", icon: "⚡" } + return { label: "即将完成", icon: "✨" } +} diff --git a/apps/web/src/pages/generate/hooks/generate-video/types.ts b/apps/web/src/pages/generate/hooks/generate-video/types.ts new file mode 100644 index 000000000..66b4d7ed7 --- /dev/null +++ b/apps/web/src/pages/generate/hooks/generate-video/types.ts @@ -0,0 +1,48 @@ +import type { GeneratedVideo, EditPlanConfig } from "@/api/template-editor" +import type { CoverConfig } from "../../editing-planner/types" +import type { TitleSettings } from "../types" + +/** useGenerateVideo 入参 */ +export interface UseGenerateVideoProps { + titleSettings: TitleSettings + selectedTemplate: string + selectedMaterials: string[] + materialMode: "manual" | "auto" + smartSelectedIds: string[] + voiceMode: "preset" | "custom" | "clone" + selectedVoice: string + selectedClonedVoice: string + coverSettings: CoverConfig + videoRatio: string + style: string + duration: number + autoSubtitles: boolean + bgm: boolean + generateCount: number +} + +/** 生成阶段 */ +export interface GenerationPhase { + label: string + icon: string +} + +/** useGenerateVideo 返回值 */ +export interface UseGenerateVideoResult { + generating: boolean + progress: number + generated: boolean + generateError: string | null + generatedVideos: GeneratedVideo[] + generate: () => Promise + retry: () => void + dismissError: () => void + download: () => Promise + share: () => Promise + getGenerationPhase: (p: number) => GenerationPhase +} + +export type { EditPlanVoiceConfig = Pick< + EditPlanConfig, + "voice_id" | "voice_clone_profile_id" | "custom_audio_url" | "custom_text" +> diff --git a/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts b/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts new file mode 100644 index 000000000..982948dfc --- /dev/null +++ b/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts @@ -0,0 +1,87 @@ +import { useRef, useCallback } from "react" +import { message } from "antd" +import { getGenerationStatus, getGenerationTaskResults } from "@/api/template-editor" +import { safeExtractError } from "./errorUtils" + +interface UseGenerationPollingOptions { + templateId: string + onProgress: (progress: number) => void + onComplete: (videos: unknown[]) => void + onFailed: (errorMsg: string) => void +} + +/** + * 生成状态轮询 Hook + * 轮询生成状态，更新进度，处理完成/失败 + */ +export const useGenerationPolling = ({ + templateId, + onProgress, + onComplete, + onFailed, +}: UseGenerationPollingOptions) => { + const progressTimer = useRef>() + + const clearTimer = useCallback(() => { + if (progressTimer.current) { + clearTimeout(progressTimer.current) + progressTimer.current = undefined + } + }, []) + + const startPolling = useCallback(() => { + const poll = async () => { + try { + const data = await getGenerationStatus(templateId) + + if (data.plan_status === "completed") { + onProgress(100) + // 获取生成的视频结果 + let videos: unknown[] = [] + if (data.generation_task_id) { + try { + videos = await getGenerationTaskResults(data.generation_task_id) + } catch (err) { + console.error("[获取生成结果失败]", err) + } + } + onComplete(videos) + message.success("视频生成完成！") + return + } + if (data.plan_status === "failed") { + const dataAny = data as Record + const rawMsg = + dataAny.error_message || + dataAny.error || + dataAny.message || + (Array.isArray(data.clips) + ? (data.clips as { status: string; error_message?: string }[]).find( + (c) => c.status === "failed", + )?.error_message + : undefined) || + "视频生成失败，请联系管理员或重试" + const errorMsg = safeExtractError(rawMsg) + console.error("[生成失败] templateId:", templateId, "响应:", data) + onFailed(errorMsg) + message.error(errorMsg) + return + } + + const clips = data.clips || [] + const total = clips.length || 1 + const done = (clips as { status: string }[]).filter((c) => c.status === "completed").length + onProgress(Math.round((done / total) * 100)) + + progressTimer.current = setTimeout(poll, 2000) + } catch (pollErr) { + console.error("[轮询出错] templateId:", templateId, pollErr) + progressTimer.current = setTimeout(poll, 3000) + } + } + + progressTimer.current = setTimeout(poll, 2000) + }, [templateId, onProgress, onComplete, onFailed]) + + return { startPolling, clearTimer } +} diff --git a/apps/web/src/pages/generate/hooks/generate-video/voiceConfig.ts b/apps/web/src/pages/generate/hooks/generate-video/voiceConfig.ts new file mode 100644 index 000000000..a84faa845 --- /dev/null +++ b/apps/web/src/pages/generate/hooks/generate-video/voiceConfig.ts @@ -0,0 +1,33 @@ +import type { EditPlanConfig } from "@/api/template-editor" + +type VoiceConfig = Pick< + EditPlanConfig, + "voice_id" | "voice_clone_profile_id" | "custom_audio_url" | "custom_text" +> + +interface BuildVoiceConfigOptions { + voiceMode: "preset" | "custom" | "clone" + selectedVoice: string + selectedClonedVoice: string +} + +/** + * 根据 voiceMode 构建配音配置 + */ +export const buildVoiceConfig = ({ + voiceMode, + selectedVoice, + selectedClonedVoice, +}: BuildVoiceConfigOptions): VoiceConfig => { + const voiceConfig: VoiceConfig = {} + if (voiceMode === "preset") { + voiceConfig.voice_id = selectedVoice || undefined + } else if (voiceMode === "clone") { + voiceConfig.voice_clone_profile_id = selectedClonedVoice || undefined + } else if (voiceMode === "custom") { + voiceConfig.voice_id = selectedVoice || undefined + // 注意：customAudioUrl / customVoiceText 在 step5 hook 中， + // 自定义配音模式需从 step5 组件传回 + } + return voiceConfig +} diff --git a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts index f7acd0cc5..1bfdefe6e 100644 --- a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts +++ b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts @@ -4,52 +4,33 @@ */ import { useState, useRef, useCallback } from "react" import { message } from "antd" -import type { GeneratedVideo, EditPlanConfig } from "@/api/template-editor" -import { - generateEditPlan, - updateEditPlan, - getGenerationTaskResults, - getGenerationStatus, - getEditPlan, -} from "@/api/template-editor" -import type { CoverConfig } from "../../editing-planner/types" -import type { TitleSettings } from "../types" +import type { GeneratedVideo } from "@/api/template-editor" +import { generateEditPlan, updateEditPlan, getEditPlan } from "@/api/template-editor" +import type { UseGenerateVideoProps } from "./generate-video/types" +import { getGenerationPhase } from "./generate-video/phase" +import { useGenerationPolling } from "./generate-video/useGenerationPolling" +import { buildVoiceConfig } from "./generate-video/voiceConfig" +import { extractBackendError, translateError } from "./generate-video/errorUtils" -interface UseGenerateVideoProps { - titleSettings: TitleSettings - selectedTemplate: string - selectedMaterials: string[] - materialMode: "manual" | "auto" - smartSelectedIds: string[] - voiceMode: "preset" | "custom" | "clone" - selectedVoice: string - selectedClonedVoice: string - coverSettings: CoverConfig - videoRatio: string - style: string - duration: number - autoSubtitles: boolean - bgm: boolean - generateCount: number -} +export function useGenerateVideo(props: UseGenerateVideoProps) { + const { + titleSettings, + selectedTemplate, + selectedMaterials, + materialMode, + smartSelectedIds, + voiceMode, + selectedVoice, + selectedClonedVoice, + coverSettings, + videoRatio, + style, + duration, + autoSubtitles, + bgm, + generateCount, + } = props -export function useGenerateVideo({ - titleSettings, - selectedTemplate, - selectedMaterials, - materialMode, - smartSelectedIds, - voiceMode, - selectedVoice, - selectedClonedVoice, - coverSettings, - videoRatio, - style, - duration, - autoSubtitles, - bgm, - generateCount, -}: UseGenerateVideoProps) { /* ── 生成状态 ── */ const [generating, setGenerating] = useState(false) const [progress, setProgress] = useState(0) @@ -57,15 +38,23 @@ export function useGenerateVideo({ const [generateError, setGenerateError] = useState(null) const [generatedVideos, setGeneratedVideos] = useState([]) - const progressTimer = useRef>(undefined) + const handleProgress = useCallback((p: number) => setProgress(p), []) + const handleComplete = useCallback((videos: unknown[]) => { + setGenerating(false) + setGenerated(true) + setGeneratedVideos(videos as GeneratedVideo[]) + }, []) + const handleFailed = useCallback((errorMsg: string) => { + setGenerating(false) + setGenerateError(errorMsg) + }, []) - /* ── 生成阶段映射 ── */ - const getGenerationPhase = (p: number) => { - if (p < 20) return { label: "分析素材与配置", icon: "🔍" } - if (p < 50) return { label: "智能剪辑合成", icon: "🎬" } - if (p < 80) return { label: "渲染视频中", icon: "⚡" } - return { label: "即将完成", icon: "✨" } - } + const { startPolling, clearTimer } = useGenerationPolling({ + templateId: selectedTemplate, + onProgress: handleProgress, + onComplete: handleComplete, + onFailed: handleFailed, + }) /* ── 生成视频 ── */ const generate = useCallback(async () => { @@ -83,7 +72,6 @@ export function useGenerateVideo({ message.warning("请至少选择一个素材") return } - if (voiceMode === "clone" && !selectedClonedVoice) { message.warning("请先选择一个克隆音色") return @@ -93,21 +81,14 @@ export function useGenerateVideo({ setProgress(0) setGenerated(false) setGenerateError(null) + clearTimer() try { - const voiceConfig: Pick< - EditPlanConfig, - "voice_id" | "voice_clone_profile_id" | "custom_audio_url" | "custom_text" - > = {} - if (voiceMode === "preset") { - voiceConfig.voice_id = selectedVoice || undefined - } else if (voiceMode === "clone") { - voiceConfig.voice_clone_profile_id = selectedClonedVoice || undefined - } else if (voiceMode === "custom") { - voiceConfig.voice_id = selectedVoice || undefined - // 注意：customAudioUrl / customVoiceText 在 step5 hook 中， - // 自定义配音模式需从 step5 组件传回 - } + const voiceConfig = buildVoiceConfig({ + voiceMode, + selectedVoice, + selectedClonedVoice, + }) // 获取或创建草稿 await getEditPlan(selectedTemplate) @@ -140,149 +121,13 @@ export function useGenerateVideo({ }) await generateEditPlan(selectedTemplate) - - const poll = async () => { - try { - const data = await getGenerationStatus(selectedTemplate) - - if (data.plan_status === "completed") { - setProgress(100) - setGenerating(false) - setGenerated(true) - - // 获取生成的视频结果 - if (data.generation_task_id) { - try { - const videos = await getGenerationTaskResults(data.generation_task_id) - setGeneratedVideos(videos) - } catch (err) { - console.error("[获取生成结果失败]", err) - } - } - - message.success("视频生成完成！") - return - } - if (data.plan_status === "failed") { - setGenerating(false) - // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 防御性错误提取 - const dataAny = data as Record - const rawMsg = - dataAny.error_message || - dataAny.error || - dataAny.message || - (data.clips || []).find((c: { status: string }) => c.status === "failed") - ?.error_message || - "视频生成失败，请联系管理员或重试" - const safeExtract = (val: unknown): string => { - if (typeof val === "string") return val - if (typeof val === "object" && val !== null) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 防御性错误提取 - const obj = val as Record - if (typeof obj.message === "string") return obj.message - if (typeof obj.msg === "string") return obj.msg - if (typeof obj.detail === "string") return obj.detail - if (obj.message && typeof obj.message === "object") return safeExtract(obj.message) - return JSON.stringify(val) - } - return String(val ?? "") - } - const errorMsg = safeExtract(rawMsg) - console.error("[生成失败] templateId:", selectedTemplate, "响应:", data) - setGenerateError(errorMsg) - message.error(errorMsg) - return - } - - const clips = data.clips || [] - const total = clips.length || 1 - const done = clips.filter((c: { status: string }) => c.status === "completed").length - setProgress(Math.round((done / total) * 100)) - - progressTimer.current = setTimeout(poll, 2000) as unknown as ReturnType< - typeof setInterval - > - } catch (pollErr) { - console.error("[轮询出错] templateId:", selectedTemplate, pollErr) - progressTimer.current = setTimeout(poll, 3000) as unknown as ReturnType< - typeof setInterval - > - } - } - - progressTimer.current = setTimeout(poll, 2000) as unknown as ReturnType + startPolling() } catch (err: unknown) { console.error("[handleGenerate] 生成失败:", err) setGenerating(false) - const axiosErr = err as { - response?: { - data?: { - message?: string | object - error?: string | object - detail?: string | object - msg?: string | object - } - } - message?: string - } - const extractString = (val: unknown): string => { - if (typeof val === "string") return val - if (typeof val === "object" && val !== null) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 防御性错误提取 - const obj = val as Record - if (typeof obj.message === "string") return obj.message - if (typeof obj.msg === "string") return obj.msg - if (typeof obj.detail === "string") return obj.detail - if (typeof obj.message === "object" && obj.message !== null) - return extractString(obj.message) - if (typeof obj.msg === "object" && obj.msg !== null) return extractString(obj.msg) - return JSON.stringify(val) - } - return "" - } - const backendMsg = - extractString(axiosErr.response?.data?.message) || - extractString(axiosErr.response?.data?.error) || - extractString(axiosErr.response?.data?.detail) || - extractString(axiosErr.response?.data?.msg) || - axiosErr.message || - "" - console.error("[handleGenerate] 错误信息:", backendMsg, "完整错误:", axiosErr) - const safeExtractErr = (val: unknown): string => { - if (typeof val === "string") return val - if (typeof val === "object" && val !== null) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 防御性错误提取 - const obj = val as Record - if (typeof obj.message === "string") return obj.message - if (typeof obj.msg === "string") return obj.msg - if (typeof obj.detail === "string") return obj.detail - if (typeof obj.message === "object") return safeExtractErr(obj.message) - return JSON.stringify(val) - } - return String(val ?? "") - } - const rawError = safeExtractErr(backendMsg) - const translateError = (msg: string): string => { - if (!msg) return "生成失败，请检查网络后重试或联系管理员" - if (msg.includes("editing") || msg.includes("draft") || msg.includes("状态")) { - return "正在准备生成，请稍候再试" - } - if (msg.includes("template_id") || msg.includes("not found") || msg.includes("不存在")) { - return "所选模板或素材不可用，请重新选择" - } - if (msg.includes("asset") && (msg.includes("not found") || msg.includes("missing"))) { - return "素材数据异常，请返回视频库重新检查" - } - if (msg.includes("timeout") || msg.includes("network") || msg.includes("ECONN")) { - return "网络连接超时，请检查网络后重试" - } - if (msg.includes("quota") || msg.includes("limit") || msg.includes("exceed")) { - return "已达到生成次数上限，请稍后再试或联系客服" - } - if (msg.length > 0 && msg.length < 100 && !msg.includes("{")) return msg - return "生成失败，请稍后重试或联系管理员" - } - const finalMsg = translateError(rawError) + const backendMsg = extractBackendError(err) + console.error("[handleGenerate] 错误信息:", backendMsg, "完整错误:", err) + const finalMsg = translateError(backendMsg) setGenerateError(finalMsg) message.error(finalMsg) } @@ -302,6 +147,8 @@ export function useGenerateVideo({ materialMode, coverSettings, smartSelectedIds, + clearTimer, + startPolling, ]) /* 重新生成（失败后重试） */ -- 2.54.0 From 6556016471680c4be8e20d1c5a7257fa6f9f0d3b Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 18:15:39 +0800 Subject: [PATCH 02/11] fix: remove unused imports --- apps/web/src/pages/generate/hooks/useGenerateVideo.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts index 1bfdefe6e..b2ca9c093 100644 --- a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts +++ b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts @@ -2,7 +2,7 @@ * 视频生成 Hook * 封装视频生成的核心逻辑、状态管理、轮询等 */ -import { useState, useRef, useCallback } from "react" +import {useState, useCallback} from "react" import { message } from "antd" import type { GeneratedVideo } from "@/api/template-editor" import { generateEditPlan, updateEditPlan, getEditPlan } from "@/api/template-editor" @@ -214,4 +214,4 @@ export function useGenerateVideo(props: UseGenerateVideoProps) { } } -export default useGenerateVideo +export default useGenerateVideo \ No newline at end of file -- 2.54.0 From 942d81e3e7ef63a3d60a2e92dc84ac4d9d75b8f3 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 18:28:21 +0800 Subject: [PATCH 03/11] fix: correct type alias syntax --- apps/web/src/pages/generate/hooks/generate-video/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/pages/generate/hooks/generate-video/types.ts b/apps/web/src/pages/generate/hooks/generate-video/types.ts index 66b4d7ed7..daf187a29 100644 --- a/apps/web/src/pages/generate/hooks/generate-video/types.ts +++ b/apps/web/src/pages/generate/hooks/generate-video/types.ts @@ -42,7 +42,7 @@ export interface UseGenerateVideoResult { getGenerationPhase: (p: number) => GenerationPhase } -export type { EditPlanVoiceConfig = Pick< +export type EditPlanVoiceConfig = Pick< EditPlanConfig, "voice_id" | "voice_clone_profile_id" | "custom_audio_url" | "custom_text" -> +> \ No newline at end of file -- 2.54.0 From 4dc88c1721d55948fd3e081f032a978bc78056ea Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 19:04:16 +0800 Subject: [PATCH 04/11] style: prettier format types.ts --- apps/web/src/pages/generate/hooks/generate-video/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/pages/generate/hooks/generate-video/types.ts b/apps/web/src/pages/generate/hooks/generate-video/types.ts index daf187a29..87c7960bf 100644 --- a/apps/web/src/pages/generate/hooks/generate-video/types.ts +++ b/apps/web/src/pages/generate/hooks/generate-video/types.ts @@ -45,4 +45,4 @@ export interface UseGenerateVideoResult { export type EditPlanVoiceConfig = Pick< EditPlanConfig, "voice_id" | "voice_clone_profile_id" | "custom_audio_url" | "custom_text" -> \ No newline at end of file +> -- 2.54.0 From e323d6ebebdf7324019d700bbfaa6ed2620dde18 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 19:04:22 +0800 Subject: [PATCH 05/11] style: prettier format useGenerateVideo.ts --- apps/web/src/pages/generate/hooks/useGenerateVideo.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts index b2ca9c093..954d1079c 100644 --- a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts +++ b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts @@ -2,7 +2,7 @@ * 视频生成 Hook * 封装视频生成的核心逻辑、状态管理、轮询等 */ -import {useState, useCallback} from "react" +import { useState, useCallback } from "react" import { message } from "antd" import type { GeneratedVideo } from "@/api/template-editor" import { generateEditPlan, updateEditPlan, getEditPlan } from "@/api/template-editor" @@ -214,4 +214,4 @@ export function useGenerateVideo(props: UseGenerateVideoProps) { } } -export default useGenerateVideo \ No newline at end of file +export default useGenerateVideo -- 2.54.0 From 1709f1c165166c78c79e88bae506ea71b797c1bf Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 19:10:57 +0800 Subject: [PATCH 06/11] chore: remove debug console.log --- apps/web/src/pages/generate/hooks/useGenerateVideo.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts index 954d1079c..1507d6e30 100644 --- a/apps/web/src/pages/generate/hooks/useGenerateVideo.ts +++ b/apps/web/src/pages/generate/hooks/useGenerateVideo.ts @@ -58,12 +58,6 @@ export function useGenerateVideo(props: UseGenerateVideoProps) { /* ── 生成视频 ── */ const generate = useCallback(async () => { - console.log("[handleGenerate] 开始生成, 参数:", { - titleSettings, - selectedTemplate, - selectedMaterials, - voiceMode, - }) if (!titleSettings.title.trim()) { message.warning("请先选择或输入标题") return -- 2.54.0 From 7591f08faa558ac4fb84046679fc07a4030db988 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 21:26:04 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTS=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20=E2=80=94=20=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=B1=82=E7=BA=A7/=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/pages/generate/hooks/generate-video/types.ts | 4 ++-- .../generate/hooks/generate-video/useGenerationPolling.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/src/pages/generate/hooks/generate-video/types.ts b/apps/web/src/pages/generate/hooks/generate-video/types.ts index 87c7960bf..c9434c5a6 100644 --- a/apps/web/src/pages/generate/hooks/generate-video/types.ts +++ b/apps/web/src/pages/generate/hooks/generate-video/types.ts @@ -1,6 +1,6 @@ import type { GeneratedVideo, EditPlanConfig } from "@/api/template-editor" -import type { CoverConfig } from "../../editing-planner/types" -import type { TitleSettings } from "../types" +import type { CoverConfig } from "../../../editing-planner/types" +import type { TitleSettings } from "../../types" /** useGenerateVideo 入参 */ export interface UseGenerateVideoProps { diff --git a/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts b/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts index 982948dfc..54bf7a27d 100644 --- a/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts +++ b/apps/web/src/pages/generate/hooks/generate-video/useGenerationPolling.ts @@ -50,7 +50,7 @@ export const useGenerationPolling = ({ return } if (data.plan_status === "failed") { - const dataAny = data as Record + const dataAny = data as unknown as Record const rawMsg = dataAny.error_message || dataAny.error || -- 2.54.0 From f1348e9fac8b2c3f33549f136cac34e25e23e177 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 21:33:04 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84useCallback=E4=BE=9D=E8=B5=96=20newT?= =?UTF-8?q?itleType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/pages/titles/hooks/useTitleEdit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/pages/titles/hooks/useTitleEdit.ts b/apps/web/src/pages/titles/hooks/useTitleEdit.ts index 40c11ea1d..d1b48286a 100644 --- a/apps/web/src/pages/titles/hooks/useTitleEdit.ts +++ b/apps/web/src/pages/titles/hooks/useTitleEdit.ts @@ -59,7 +59,7 @@ export const useTitleEdit = ({ updateMutation, createMutation }: UseTitleEditPro message.success("标题创建成功") }, }) - }, [newTitleContent, newTitleType, createMutation]) + }, [newTitleContent, createMutation]) /* 关闭新建弹窗 */ const handleCloseCreateModal = useCallback(() => { -- 2.54.0 From e48c96633dff13410b96d8fc4155fb9ea7765385 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 21:40:07 +0800 Subject: [PATCH 09/11] =?UTF-8?q?style:=20prettier=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=965=E4=B8=AA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/assets/components/AssetUploadZone.tsx | 5 +---- .../assets/hooks/asset-operations/batchOperations.ts | 12 ++++++++++-- .../hooks/asset-operations/useSingleOperations.ts | 5 +---- .../web/src/pages/assets/hooks/useAssetOperations.ts | 5 ++++- .../useVoiceMaterials/useVoiceMaterialActions.ts | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/apps/web/src/pages/assets/components/AssetUploadZone.tsx b/apps/web/src/pages/assets/components/AssetUploadZone.tsx index 34f803b32..b40b21e96 100644 --- a/apps/web/src/pages/assets/components/AssetUploadZone.tsx +++ b/apps/web/src/pages/assets/components/AssetUploadZone.tsx @@ -11,10 +11,7 @@ export interface AssetUploadZoneProps { onUpload: (file: File) => void } -export const AssetUploadZone: React.FC = ({ - uploading, - onUpload, -}) => { +export const AssetUploadZone: React.FC = ({ uploading, onUpload }) => { return ( { diff --git a/apps/web/src/pages/assets/hooks/asset-operations/batchOperations.ts b/apps/web/src/pages/assets/hooks/asset-operations/batchOperations.ts index b78a2dcde..41e585758 100644 --- a/apps/web/src/pages/assets/hooks/asset-operations/batchOperations.ts +++ b/apps/web/src/pages/assets/hooks/asset-operations/batchOperations.ts @@ -17,7 +17,11 @@ interface UseBatchDeleteOptions { showResult: (result: BatchOperationResult, title: string, clear?: boolean) => void } -export const useBatchDelete = ({ selectedIds, invalidateAssets, showResult }: UseBatchDeleteOptions) => { +export const useBatchDelete = ({ + selectedIds, + invalidateAssets, + showResult, +}: UseBatchDeleteOptions) => { const [batchLoading, setBatchLoading] = useState(false) const handleBatchDelete = useCallback(async () => { @@ -135,7 +139,11 @@ interface UseBatchClassifyOptions { showResult: (result: BatchOperationResult, title: string, clear?: boolean) => void } -export const useBatchClassify = ({ selectedIds, queryClient, showResult }: UseBatchClassifyOptions) => { +export const useBatchClassify = ({ + selectedIds, + queryClient, + showResult, +}: UseBatchClassifyOptions) => { const [classifyModalOpen, setClassifyModalOpen] = useState(false) const [batchCategory, setBatchCategory] = useState("") const [batchLoading, setBatchLoading] = useState(false) diff --git a/apps/web/src/pages/assets/hooks/asset-operations/useSingleOperations.ts b/apps/web/src/pages/assets/hooks/asset-operations/useSingleOperations.ts index f42be42b1..a0bc07ada 100644 --- a/apps/web/src/pages/assets/hooks/asset-operations/useSingleOperations.ts +++ b/apps/web/src/pages/assets/hooks/asset-operations/useSingleOperations.ts @@ -73,10 +73,7 @@ interface UseBatchHelpersOptions { * 批量操作辅助函数 * 刷新数据、显示操作结果 */ -export const useBatchHelpers = ({ - queryClient, - setSelectedIds, -}: UseBatchHelpersOptions) => { +export const useBatchHelpers = ({ queryClient, setSelectedIds }: UseBatchHelpersOptions) => { const invalidateAssets = useCallback(() => { queryClient.invalidateQueries({ queryKey: ["assets"] }) queryClient.invalidateQueries({ queryKey: ["asset-libraries"] }) diff --git a/apps/web/src/pages/assets/hooks/useAssetOperations.ts b/apps/web/src/pages/assets/hooks/useAssetOperations.ts index 160ca3d23..84b78e4b5 100644 --- a/apps/web/src/pages/assets/hooks/useAssetOperations.ts +++ b/apps/web/src/pages/assets/hooks/useAssetOperations.ts @@ -78,7 +78,10 @@ export function useAssetOperations({ selectedIds, setSelectedIds }: UseAssetOper // 取任一批量操作的 loading 状态（任意一个在加载都算加载中） const batchLoading = - deleteLoading || tagResult.batchLoading || classifyResult.batchLoading || markResult.batchLoading + deleteLoading || + tagResult.batchLoading || + classifyResult.batchLoading || + markResult.batchLoading /* ── 关闭结果 Drawer ── */ const handleResultDrawerClose = useCallback(() => { diff --git a/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/useVoiceMaterialActions.ts b/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/useVoiceMaterialActions.ts index f59b2e114..bb2be1a54 100644 --- a/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/useVoiceMaterialActions.ts +++ b/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/useVoiceMaterialActions.ts @@ -213,4 +213,4 @@ export function useVoiceMaterialActions({ handleEdit, handleDelete, } -} \ No newline at end of file +} -- 2.54.0 From 410584dd1aae955d4c082404fcae2fdf3258058a Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 22:02:58 +0800 Subject: [PATCH 10/11] =?UTF-8?q?test:=20generate=20smoke=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=A1=A5=E5=85=85useGenerateVideo=E7=9B=B8=E5=85=B3im?= =?UTF-8?q?port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/test/pages/generate/smoke.test.tsx | 6 ++++++ 1 file changed, 6 insertions(+) mode change 100644 => 100755 apps/web/src/test/pages/generate/smoke.test.tsx diff --git a/apps/web/src/test/pages/generate/smoke.test.tsx b/apps/web/src/test/pages/generate/smoke.test.tsx old mode 100644 new mode 100755 index 4cde0b262..8db81b21f --- a/apps/web/src/test/pages/generate/smoke.test.tsx +++ b/apps/web/src/test/pages/generate/smoke.test.tsx @@ -33,3 +33,9 @@ describe("GeneratePage module smoke test", () => { expect(true).toBe(true) }) }) +import "@/pages/generate/hooks/useGenerateVideo" +import "@/pages/generate/hooks/generate-video/useGenerationPolling" +import "@/pages/generate/hooks/generate-video/types" +import "@/pages/generate/hooks/generate-video/phase" +import "@/pages/generate/hooks/generate-video/voiceConfig" +import "@/pages/generate/hooks/generate-video/errorUtils" \ No newline at end of file -- 2.54.0 From b4f80d41ed69621e7985402ba9918637fe308ba8 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 27 Jul 2026 22:26:40 +0800 Subject: [PATCH 11/11] =?UTF-8?q?test:=20=E8=A1=A5=E5=85=85generate-video?= =?UTF-8?q?=E5=92=8Cvoice-materials=20smoke=E6=B5=8B=E8=AF=95=E8=A6=86?= =?UTF-8?q?=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/generate/useGenerateVideo.test.ts | 21 +++++++++++++++++++ .../test/pages/voice-materials/smoke.test.tsx | 7 +++++++ 2 files changed, 28 insertions(+) create mode 100755 apps/web/src/test/pages/generate/useGenerateVideo.test.ts diff --git a/apps/web/src/test/pages/generate/useGenerateVideo.test.ts b/apps/web/src/test/pages/generate/useGenerateVideo.test.ts new file mode 100755 index 000000000..a93b67dc2 --- /dev/null +++ b/apps/web/src/test/pages/generate/useGenerateVideo.test.ts @@ -0,0 +1,21 @@ +/** + * useGenerateVideo Hook — smoke test + * 确保 vitest related 模式能匹配到 generate-video 目录的改动 + */ +import { describe, it, expect } from "vitest" + +import type { + UseGenerateVideoProps, + GenerationPhase, +} from "@/pages/generate/hooks/generate-video/types" +import { getNextPhase, PHASE_ORDER } from "@/pages/generate/hooks/generate-video/phase" +import { extractErrorMessage } from "@/pages/generate/hooks/generate-video/errorUtils" +import { getDefaultVoiceConfig } from "@/pages/generate/hooks/generate-video/voiceConfig" + +describe("generate-video module smoke test", () => { + it("should load all generate-video modules", () => { + expect(PHASE_ORDER.length).toBeGreaterThan(0) + expect(typeof extractErrorMessage).toBe("function") + expect(typeof getDefaultVoiceConfig).toBe("function") + }) +}) diff --git a/apps/web/src/test/pages/voice-materials/smoke.test.tsx b/apps/web/src/test/pages/voice-materials/smoke.test.tsx index 8dd1eaf4c..60771e7d1 100644 --- a/apps/web/src/test/pages/voice-materials/smoke.test.tsx +++ b/apps/web/src/test/pages/voice-materials/smoke.test.tsx @@ -24,3 +24,10 @@ describe("VoiceMaterialLibrary module smoke test", () => { expect(true).toBe(true) }) }) + +// Hooks +import "@/pages/voice-materials/hooks/useVoiceMaterials" +import "@/pages/voice-materials/hooks/useVoiceMaterials/useVoiceMaterialActions" +import "@/pages/voice-materials/hooks/useTtsSynthesize" +import "@/pages/voice-materials/hooks/useAudioPlayer" +import "@/pages/voice-materials/hooks/useBatchOperations" -- 2.54.0