Merge pull request '保留画布恢复后的语音识别文字' (#97) from codex/daily-model-followup-20261116 into main

This commit is contained in:
WuYongJie 2026-11-16 18:16:15 +08:00
commit a7fdff59fc
4 changed files with 29 additions and 7 deletions

View File

@ -2,6 +2,7 @@
import { fetchUploadWithRetry } from "@/lib/client/upload-with-retry"; import { fetchUploadWithRetry } from "@/lib/client/upload-with-retry";
import { useCanvasGroupRuns } from "@/hooks/use-canvas-group-runs"; import { useCanvasGroupRuns } from "@/hooks/use-canvas-group-runs";
import { hasRecoverableCanvasTask } from "@/lib/video-canvas/task-recovery"; import { hasRecoverableCanvasTask } from "@/lib/video-canvas/task-recovery";
import { restoreTextResourceContent } from "@/lib/video-canvas/text-resource";
import { GroupStoryboardPreview } from "./GroupStoryboardPreview"; import { GroupStoryboardPreview } from "./GroupStoryboardPreview";
import { CanvasGroupToolbar } from "./CanvasGroupToolbar"; import { CanvasGroupToolbar } from "./CanvasGroupToolbar";
import { isCanvasGroup, groupMembers, makeCanvasGroup, ungroupCanvasNodes, moveCanvasSelection, layoutCanvasGroup, migrateLegacyGroups, exportCanvasGroup, instantiateCanvasGroup, groupBounds, assignGroupMembers } from "@/lib/video-canvas/groups"; import { isCanvasGroup, groupMembers, makeCanvasGroup, ungroupCanvasNodes, moveCanvasSelection, layoutCanvasGroup, migrateLegacyGroups, exportCanvasGroup, instantiateCanvasGroup, groupBounds, assignGroupMembers } from "@/lib/video-canvas/groups";
@ -4145,7 +4146,7 @@ function normalizeTextResourceNode(node: CloneNode, fallbackIndex: number): Clon
draftValues: { draftValues: {
...(node.draftValues || {}), ...(node.draftValues || {}),
action: "TEXT_RESOURCE", action: "TEXT_RESOURCE",
content: Array.isArray(node.draftValues?.content) ? node.draftValues?.content : [], content: restoreTextResourceContent(node.draftValues),
nodeType: "text", nodeType: "text",
scriptRole: "resource", scriptRole: "resource",
viewMode: undefined, viewMode: undefined,
@ -21478,12 +21479,7 @@ function PureTextResourceCanvasNode({
onTextResourceChange: (content: string) => void; onTextResourceChange: (content: string) => void;
selected: boolean; selected: boolean;
}) { }) {
const contentValues = node.draftValues?.content; const textContent = restoreTextResourceContent(node.draftValues)[0] || "";
const textContent = typeof contentValues === "string"
? contentValues
: Array.isArray(contentValues) && typeof contentValues[0] === "string"
? contentValues[0]
: "";
return ( return (
<div className="h-full w-full"> <div className="h-full w-full">

View File

@ -139,6 +139,10 @@
本轮修复语音识别成功后画布结果为空的问题:新结果采用画布文本结构,已保存的字符串结果也可直接显示和编辑;重复查询不会覆盖人工修改。音频生成节点显示排队、处理中及失败信息,不再以空播放器及默认三秒时长表示未完成任务。相关回归 72 项和 TypeScript 检查通过;内置浏览器独立页面已验证新旧文字显示、中文与尺寸编辑、空格保留及等待/失败状态,待正式发布。 本轮修复语音识别成功后画布结果为空的问题:新结果采用画布文本结构,已保存的字符串结果也可直接显示和编辑;重复查询不会覆盖人工修改。音频生成节点显示排队、处理中及失败信息,不再以空播放器及默认三秒时长表示未完成任务。相关回归 72 项和 TypeScript 检查通过;内置浏览器独立页面已验证新旧文字显示、中文与尺寸编辑、空格保留及等待/失败状态,待正式发布。
画布恢复时统一读取字符串和数组格式的文本,保留中文、尺寸及空格;缺少内容的历史识别节点从已保存的识别文本恢复,人工编辑和主动清空保持优先。恢复与任务相关回归 46 项、TypeScript 检查及内置浏览器的实际恢复组件验收通过,等待生产画布刷新验收。
音乐原任务已成功完成并保存七牛,网页解码时长约 150 秒并可播放。供应商核对确认只受理及扣费一次;本项目工作进程续查一次原任务,没有重新派发。声音克隆与声音设计在内置浏览器均播放到结尾。
### 剩余上游事项 ### 剩余上游事项
| 型号 | 当前阻塞 | 处理方 | | 型号 | 当前阻塞 | 处理方 |

View File

@ -0,0 +1,9 @@
export function restoreTextResourceContent(draft?: Record<string, any>): string[] {
const content = draft?.content;
if (typeof content === "string") return [content];
// An empty string in the array is an intentional edit and must stay empty.
if (Array.isArray(content) && content.length) return content;
if (draft?.audioMeta?.outputType === "text" && typeof draft.text === "string")
return [draft.text];
return [];
}

View File

@ -16,6 +16,7 @@ import {
type CanvasGenerationTask, type CanvasGenerationTask,
} from "@/lib/video-canvas/task-contract"; } from "@/lib/video-canvas/task-contract";
import { chooseStoryVideoSettings } from "@/lib/video-canvas/model-matching"; import { chooseStoryVideoSettings } from "@/lib/video-canvas/model-matching";
import { restoreTextResourceContent } from "@/lib/video-canvas/text-resource";
type TaskNode = { id: string; draftValues?: Record<string, any>; [key: string]: any }; type TaskNode = { id: string; draftValues?: Record<string, any>; [key: string]: any };
const node: TaskNode = { const node: TaskNode = {
id: "n1", id: "n1",
@ -88,6 +89,18 @@ test("does not resurrect nodes removed after task creation or hidden on the serv
), ),
).toEqual([]); ).toEqual([]);
}); });
test("saved speech text survives reload and retains subsequent edits, including an empty edit", () => {
const text = "这是由壹点测试画布的语音验收,尺寸 15mm。 ";
const saved = { content: text, text, audioMeta: { outputType: "text" } };
expect(restoreTextResourceContent(JSON.parse(JSON.stringify(saved)))).toEqual([text]);
expect(restoreTextResourceContent({ ...saved, content: [] })).toEqual([text]);
for (const edit of ["已校对的中文 20mm。 ", ""]) {
const updated = { ...saved, content: [edit] };
expect(restoreTextResourceContent(JSON.parse(JSON.stringify(updated)))).toEqual([edit]);
}
expect(restoreTextResourceContent({ content: [] })).toEqual([]);
});
test("late result from an older request cannot overwrite a new generation on the same node", () => { test("late result from an older request cannot overwrite a new generation on the same node", () => {
const current = { const current = {
...node, ...node,