fix(merge): 本地整合 - 保留主分支交互与样式并排除不安全用户删除

This commit is contained in:
ddCat committed 2026-09-07 23:02:34 +08:00
commit 14adaa1e99
100 files changed
+4845 -865

No files matched your search

+2 -2
View File
@@ -316,8 +316,8 @@ test("Create forwards owned result assets through one new canvas and the project
const canvasProject = readFileSync(resolve(import.meta.dir, "../src/pages/canvas/project.tsx"), "utf8");
expect(create).toContain('import { creationCanvasHandoffPath, creationResultAssetIds } from "@/lib/canvas/canvas-asset-handoff"');
expect(create).toContain("const resultAssetIds = result && resultUrls.length ? creationResultAssetIds(assets, { messageId: result.id, taskIds: result.taskIds || [], resultUrls }) : [];");
expect(create).toContain('const canvasHandoffPath = result ? creationCanvasHandoffPath(resultAssetIds, resultUrls.length) : "";');
expect(create).toContain("const resultAssetIds = resultUrls.length ? creationResultAssetIds(assets, { messageId: item.id, taskIds: item.taskIds || [], resultUrls }) : [];");
expect(create).toContain("const canvasHandoffPath = creationCanvasHandoffPath(resultAssetIds, resultUrls.length);");
expect(create).toContain('const canvasPath = canvasHandoffPath || "/canvas";');
expect(create).toContain('<Link to={canvasPath}>{canvasHandoffPath ? "添加到画布" : "打开画布"}</Link>');
expect(canvasIndex).toContain('const handoffMode = mode === "handoff"');