zyc/video-flow-toon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '108' of https://github.com/HBAI-Ltd/Toonflow-app into 108

Browse Source
This commit is contained in:
小帅 2026-04-02 02:51:36 +08:00
commit c641cee831
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/routes/production/getFlowData.ts
View File

@ -27,7 +27,7 @@ export default router.post(
const assetsData = await u const assetsData = await u
.db("o_assets") .db("o_assets")
.leftJoin("o_image", "o_assets.imageId", "o_image.id") .leftJoin("o_image", "o_assets.imageId", "o_image.id")
.select("o_assets.*", "o_image.filePath", "o_image.state") .select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.errorReason")
// @ts-ignore // @ts-ignore
.where("o_assets.id", "in", assetIds) .where("o_assets.id", "in", assetIds)
.whereNull("o_assets.assetsId") .whereNull("o_assets.assetsId")
@ -35,7 +35,7 @@ export default router.post(
let childAssetsData = await u let childAssetsData = await u
.db("o_assets") .db("o_assets")
.leftJoin("o_image", "o_assets.imageId", "o_image.id") .leftJoin("o_image", "o_assets.imageId", "o_image.id")
.select("o_assets.*", "o_image.filePath", "o_image.state") .select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.errorReason")
.where("o_assets.projectId", projectId) .where("o_assets.projectId", projectId)
// @ts-ignore // @ts-ignore
.where("o_assets.id", "in", assetIds) .where("o_assets.id", "in", assetIds)
@ -141,6 +141,8 @@ export default router.post(
associateAssetsIds: assets2StoryboardMap[i.id!] ?? [], associateAssetsIds: assets2StoryboardMap[i.id!] ?? [],
src: i.filePath, src: i.filePath,
state: i.state, state: i.state,
videoDesc: i.videoDesc,
shouldGenerateImage: i.shouldGenerateImage,
reason: i?.reason ?? "", reason: i?.reason ?? "",
})) }))
.sort((a, b) => (a.index ?? 0) - (b.index ?? 0)); .sort((a, b) => (a.index ?? 0) - (b.index ?? 0));

2
src/routes/production/storyboard/editStoryboardInfo.ts
View File

@ -14,7 +14,7 @@ export default router.post(
videoDesc: z.string(), videoDesc: z.string(),
}), }),
async (req, res) => { async (req, res) => {
const { id, prompt } = req.body; const { id, prompt, videoDesc } = req.body;
await u.db("o_storyboard").where({ id }).update({ await u.db("o_storyboard").where({ id }).update({
prompt, prompt,
videoDesc, videoDesc,