From 72c0a037de2599a9d6d26c224c94216858f1f1e1 Mon Sep 17 00:00:00 2001
From: root <root@CHINAMI-4NQA0SV.>
Date: Mon, 21 Sep 2026 18:57:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(canvas):=20=E4=BB=BB=E5=8A=A1=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=81=A2=E5=A4=8D=20-=20=E5=85=BC=E5=AE=B9=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=8C=96=E6=96=87=E6=9C=AC=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/lib/canvas/canvas-project-domain.ts   | 12 +++++++++-
 web/src/services/api/generation-task.ts       | 24 +++++++++++++++++--
 web/test/canvas-storyboard-rows-parse.test.ts | 11 +++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/web/src/lib/canvas/canvas-project-domain.ts b/web/src/lib/canvas/canvas-project-domain.ts
index e489e2290..e846276fe 100644
--- a/web/src/lib/canvas/canvas-project-domain.ts
+++ b/web/src/lib/canvas/canvas-project-domain.ts
@@ -139,6 +139,14 @@ function parseStoryboardRowsPayload(raw: string): { title?: string; rows?: Array
             }
         }
     }
+    if (parsed.text && typeof parsed.text === "object") {
+        try {
+            const nested = parseStoryboardRowsPayload(JSON.stringify(parsed.text));
+            if (Array.isArray(nested.rows)) return nested;
+        } catch {
+            // 对象形式的 text 不是分镜载荷时，交由统一缺行校验报错。
+        }
+    }
     return parsed;
 }
 
@@ -146,7 +154,9 @@ export function storyboardRowsFromTask(task: GenerationTask) {
     const result = parseStoryboardRowsPayload(task.resultJson || "{}");
     if (!Array.isArray(result.rows) || !result.rows.length) throw new Error("分镜任务没有返回镜头行");
     return {
-        title: result.title?.trim(),
+        // 旧任务和部分模型会把 title 返回成对象/数组；恢复路径必须只接受字符串，
+        // 否则可选链只能防 undefined，仍会在对象上调用 trim 使整页恢复失败。
+        title: typeof result.title === "string" ? result.title.trim() : undefined,
         rows: result.rows.map((row, index) => {
             const next = createStoryboardRow(index + 1, {
                 ...row,
diff --git a/web/src/services/api/generation-task.ts b/web/src/services/api/generation-task.ts
index ecf078ae7..b1962c7be 100644
--- a/web/src/services/api/generation-task.ts
+++ b/web/src/services/api/generation-task.ts
@@ -498,7 +498,27 @@ function omittedImageQuality(value: string | undefined) {
 
 export function parseBackendGenerationResult(task: GenerationTask): BackendGenerationResult {
     if (!task.resultJson) throw new Error("后端任务没有返回结果");
-    const result = JSON.parse(task.resultJson) as BackendGenerationResult;
+    const result = JSON.parse(task.resultJson) as BackendGenerationResult & { text?: unknown };
     if (!result || typeof result !== "object") throw new Error("后端任务结果格式错误");
-    return result;
+    return { ...result, text: normalizeBackendText(result.text) };
+}
+
+function normalizeBackendText(value: unknown): string | undefined {
+    if (typeof value === "string") return value;
+    if (value === null || value === undefined) return undefined;
+    if (Array.isArray(value)) {
+        const text = value.map((item) => normalizeBackendText(item)).filter((item): item is string => Boolean(item)).join("");
+        return text || undefined;
+    }
+    if (typeof value === "object") {
+        const record = value as Record<string, unknown>;
+        for (const key of ["text", "content", "output_text", "value"]) {
+            if (!(key in record)) continue;
+            const nested = normalizeBackendText(record[key]);
+            if (nested !== undefined) return nested;
+        }
+        // 某些结构化文本任务直接把 JSON 载荷放进 text 对象，保留 JSON 供上层契约解析。
+        return JSON.stringify(value);
+    }
+    return String(value);
 }
diff --git a/web/test/canvas-storyboard-rows-parse.test.ts b/web/test/canvas-storyboard-rows-parse.test.ts
index a954cc5ab..7eca40de9 100644
--- a/web/test/canvas-storyboard-rows-parse.test.ts
+++ b/web/test/canvas-storyboard-rows-parse.test.ts
@@ -44,6 +44,17 @@ describe("storyboardRowsFromTask", () => {
         expect(storyboardRowsFromTask(task).rows).toHaveLength(1);
     });
 
+    test("title 不是字符串时仍可恢复任务结果", () => {
+        const task = storyboardTask(JSON.stringify({ title: { value: "章节" }, rows: [{ shotNumber: 1, plotDescription: "单镜头" }] }));
+        expect(storyboardRowsFromTask(task).title).toBeUndefined();
+        expect(storyboardRowsFromTask(task).rows).toHaveLength(1);
+    });
+
+    test("text 为结构化对象时仍可解析分镜行", () => {
+        const task = storyboardTask(JSON.stringify({ text: { title: "章节", rows: [{ shotNumber: 1, plotDescription: "单镜头" }] } }));
+        expect(storyboardRowsFromTask(task).rows).toHaveLength(1);
+    });
+
     test("text 内层不是 JSON 时抛出缺行错误", () => {
         // 无契约时期模型返回 Markdown 表格的真实场景。
         const task = storyboardTask(JSON.stringify({ mode: "text", text: "| 7-41 | 全景/拉远 | 桃园结义 |" }));