分镜图片按照index排序

This commit is contained in:
小帅 2026-03-27 13:40:00 +08:00
parent 0fee2f79f1
commit 3bdeac6cf0
5 changed files with 64 additions and 96 deletions

View File

@ -1,4 +1,4 @@
// @routes-hash 557dfd43a824a4bd4170d0e2c9a6b45c // @routes-hash 9559cc3a8cb0291f04970e9ba299265f
import { Express } from "express"; import { Express } from "express";
import route1 from "./routes/agents/clearMemory"; import route1 from "./routes/agents/clearMemory";
@ -71,34 +71,35 @@ import route67 from "./routes/script/getScrptApi";
import route68 from "./routes/script/updateScript"; import route68 from "./routes/script/updateScript";
import route69 from "./routes/scriptAgent/getPlanData"; import route69 from "./routes/scriptAgent/getPlanData";
import route70 from "./routes/scriptAgent/setPlanData"; import route70 from "./routes/scriptAgent/setPlanData";
import route71 from "./routes/setting/agentDeploy/agentSetKey"; import route71 from "./routes/setting/about/checkUpdate";
import route72 from "./routes/setting/agentDeploy/deployAgentModel"; import route72 from "./routes/setting/agentDeploy/agentSetKey";
import route73 from "./routes/setting/agentDeploy/getAgentDeploy"; import route73 from "./routes/setting/agentDeploy/deployAgentModel";
import route74 from "./routes/setting/dbConfig/clearData"; import route74 from "./routes/setting/agentDeploy/getAgentDeploy";
import route75 from "./routes/setting/fileManagement/openFolder"; import route75 from "./routes/setting/dbConfig/clearData";
import route76 from "./routes/setting/getTextModel"; import route76 from "./routes/setting/fileManagement/openFolder";
import route77 from "./routes/setting/loginConfig/getUser"; import route77 from "./routes/setting/getTextModel";
import route78 from "./routes/setting/loginConfig/updateUserPwd"; import route78 from "./routes/setting/loginConfig/getUser";
import route79 from "./routes/setting/memoryConfig/delAllMemory"; import route79 from "./routes/setting/loginConfig/updateUserPwd";
import route80 from "./routes/setting/memoryConfig/getMemory"; import route80 from "./routes/setting/memoryConfig/delAllMemory";
import route81 from "./routes/setting/memoryConfig/sureMemory"; import route81 from "./routes/setting/memoryConfig/getMemory";
import route82 from "./routes/setting/skillManagement/addSkill"; import route82 from "./routes/setting/memoryConfig/sureMemory";
import route83 from "./routes/setting/skillManagement/deleteSkill"; import route83 from "./routes/setting/skillManagement/addSkill";
import route84 from "./routes/setting/skillManagement/embeddingSkill"; import route84 from "./routes/setting/skillManagement/deleteSkill";
import route85 from "./routes/setting/skillManagement/generateDescription"; import route85 from "./routes/setting/skillManagement/embeddingSkill";
import route86 from "./routes/setting/skillManagement/getSkillList"; import route86 from "./routes/setting/skillManagement/generateDescription";
import route87 from "./routes/setting/skillManagement/scanSkills"; import route87 from "./routes/setting/skillManagement/getSkillList";
import route88 from "./routes/setting/skillManagement/updateSkill"; import route88 from "./routes/setting/skillManagement/scanSkills";
import route89 from "./routes/setting/vendorConfig/addVendor"; import route89 from "./routes/setting/skillManagement/updateSkill";
import route90 from "./routes/setting/vendorConfig/deleteVendor"; import route90 from "./routes/setting/vendorConfig/addVendor";
import route91 from "./routes/setting/vendorConfig/getVendorList"; import route91 from "./routes/setting/vendorConfig/deleteVendor";
import route92 from "./routes/setting/vendorConfig/modelTest"; import route92 from "./routes/setting/vendorConfig/getVendorList";
import route93 from "./routes/setting/vendorConfig/updateVendor"; import route93 from "./routes/setting/vendorConfig/modelTest";
import route94 from "./routes/task/getProject"; import route94 from "./routes/setting/vendorConfig/updateVendor";
import route95 from "./routes/task/getTaskApi"; import route95 from "./routes/task/getProject";
import route96 from "./routes/task/getTaskCategories"; import route96 from "./routes/task/getTaskApi";
import route97 from "./routes/task/taskDetails"; import route97 from "./routes/task/getTaskCategories";
import route98 from "./routes/test/test"; import route98 from "./routes/task/taskDetails";
import route99 from "./routes/test/test";
export default async (app: Express) => { export default async (app: Express) => {
app.use("/api/agents/clearMemory", route1); app.use("/api/agents/clearMemory", route1);
@ -171,32 +172,33 @@ export default async (app: Express) => {
app.use("/api/script/updateScript", route68); app.use("/api/script/updateScript", route68);
app.use("/api/scriptAgent/getPlanData", route69); app.use("/api/scriptAgent/getPlanData", route69);
app.use("/api/scriptAgent/setPlanData", route70); app.use("/api/scriptAgent/setPlanData", route70);
app.use("/api/setting/agentDeploy/agentSetKey", route71); app.use("/api/setting/about/checkUpdate", route71);
app.use("/api/setting/agentDeploy/deployAgentModel", route72); app.use("/api/setting/agentDeploy/agentSetKey", route72);
app.use("/api/setting/agentDeploy/getAgentDeploy", route73); app.use("/api/setting/agentDeploy/deployAgentModel", route73);
app.use("/api/setting/dbConfig/clearData", route74); app.use("/api/setting/agentDeploy/getAgentDeploy", route74);
app.use("/api/setting/fileManagement/openFolder", route75); app.use("/api/setting/dbConfig/clearData", route75);
app.use("/api/setting/getTextModel", route76); app.use("/api/setting/fileManagement/openFolder", route76);
app.use("/api/setting/loginConfig/getUser", route77); app.use("/api/setting/getTextModel", route77);
app.use("/api/setting/loginConfig/updateUserPwd", route78); app.use("/api/setting/loginConfig/getUser", route78);
app.use("/api/setting/memoryConfig/delAllMemory", route79); app.use("/api/setting/loginConfig/updateUserPwd", route79);
app.use("/api/setting/memoryConfig/getMemory", route80); app.use("/api/setting/memoryConfig/delAllMemory", route80);
app.use("/api/setting/memoryConfig/sureMemory", route81); app.use("/api/setting/memoryConfig/getMemory", route81);
app.use("/api/setting/skillManagement/addSkill", route82); app.use("/api/setting/memoryConfig/sureMemory", route82);
app.use("/api/setting/skillManagement/deleteSkill", route83); app.use("/api/setting/skillManagement/addSkill", route83);
app.use("/api/setting/skillManagement/embeddingSkill", route84); app.use("/api/setting/skillManagement/deleteSkill", route84);
app.use("/api/setting/skillManagement/generateDescription", route85); app.use("/api/setting/skillManagement/embeddingSkill", route85);
app.use("/api/setting/skillManagement/getSkillList", route86); app.use("/api/setting/skillManagement/generateDescription", route86);
app.use("/api/setting/skillManagement/scanSkills", route87); app.use("/api/setting/skillManagement/getSkillList", route87);
app.use("/api/setting/skillManagement/updateSkill", route88); app.use("/api/setting/skillManagement/scanSkills", route88);
app.use("/api/setting/vendorConfig/addVendor", route89); app.use("/api/setting/skillManagement/updateSkill", route89);
app.use("/api/setting/vendorConfig/deleteVendor", route90); app.use("/api/setting/vendorConfig/addVendor", route90);
app.use("/api/setting/vendorConfig/getVendorList", route91); app.use("/api/setting/vendorConfig/deleteVendor", route91);
app.use("/api/setting/vendorConfig/modelTest", route92); app.use("/api/setting/vendorConfig/getVendorList", route92);
app.use("/api/setting/vendorConfig/updateVendor", route93); app.use("/api/setting/vendorConfig/modelTest", route93);
app.use("/api/task/getProject", route94); app.use("/api/setting/vendorConfig/updateVendor", route94);
app.use("/api/task/getTaskApi", route95); app.use("/api/task/getProject", route95);
app.use("/api/task/getTaskCategories", route96); app.use("/api/task/getTaskApi", route96);
app.use("/api/task/taskDetails", route97); app.use("/api/task/getTaskCategories", route97);
app.use("/api/test/test", route98); app.use("/api/task/taskDetails", route98);
app.use("/api/test/test", route99);
} }

View File

@ -88,7 +88,6 @@ export default router.post(
} else { } else {
try { try {
const storyboardData = await u.db("o_storyboard").where("scriptId", episodesId); const storyboardData = await u.db("o_storyboard").where("scriptId", episodesId);
console.log("%c Line:90 🍡 storyboardData", "background:#ed9ec7", storyboardData.length);
await Promise.all( await Promise.all(
storyboardData.map(async (i) => { storyboardData.map(async (i) => {
if (i.filePath) { if (i.filePath) {
@ -165,6 +164,7 @@ export default router.post(
const buildStoryboardItem = (i: (typeof storyboardData)[number], existing: any = {}) => ({ const buildStoryboardItem = (i: (typeof storyboardData)[number], existing: any = {}) => ({
...existing, ...existing,
id: i.id, id: i.id,
index: i.index,
title: i.title, title: i.title,
description: i.description, description: i.description,
camera: i.camera, camera: i.camera,
@ -199,8 +199,7 @@ export default router.post(
orderedStoryboard.push(buildStoryboardItem(i)); orderedStoryboard.push(buildStoryboardItem(i));
} }
}); });
flowData.storyboard = orderedStoryboard.sort((a, b) => (a.index ?? 0) - (b.index ?? 0));
flowData.storyboard = orderedStoryboard;
res.status(200).send(success(flowData)); res.status(200).send(success(flowData));
} catch (err) { } catch (err) {
res.status(400).send(error()); res.status(400).send(error());

View File

@ -13,7 +13,7 @@ export default router.post(
const { scriptId } = req.body; const { scriptId } = req.body;
//查询分镜数据 //查询分镜数据
const storyboards = await u.db("o_storyboard").where("o_storyboard.scriptId", scriptId).select("*").orderBy("o_storyboard.createTime", "asc"); const storyboards = await u.db("o_storyboard").where("o_storyboard.scriptId", scriptId).select("*").orderBy("index", "asc");
const storyboardsList = await Promise.all( const storyboardsList = await Promise.all(
storyboards.map(async (item) => { storyboards.map(async (item) => {

View File

@ -12,7 +12,7 @@ export default router.post(
}), }),
async (req, res) => { async (req, res) => {
const { scriptId } = req.body; const { scriptId } = req.body;
const storyboardData = await u.db("o_storyboard").where({ scriptId }); const storyboardData = await u.db("o_storyboard").where({ scriptId }).orderBy("index", "asc");
const data = await Promise.all( const data = await Promise.all(
storyboardData.map(async (i) => { storyboardData.map(async (i) => {
return { return {
@ -83,7 +83,6 @@ export default router.post(
}; };
}), }),
); );
res.status(200).send(success(result)); res.status(200).send(success(result));
}, },
); );

View File

@ -1,36 +1,6 @@
// @db-hash 579a004cc745580469a24ee71f5f51c3 // @db-hash d807205fbb27fc5ddb04cae060fb4430
//该文件由脚本自动生成,请勿手动修改 //该文件由脚本自动生成,请勿手动修改
export interface _o_project_old_20260326 {
'artStyle'?: string | null;
'createTime'?: number | null;
'id'?: number | null;
'intro'?: string | null;
'name'?: string | null;
'projectType'?: string | null;
'type'?: string | null;
'userId'?: number | null;
'videoRatio'?: string | null;
}
export interface _o_storyboard_old_20260325 {
'camera'?: string | null;
'createTime'?: number | null;
'description'?: string | null;
'duration'?: string | null;
'filePath'?: string | null;
'frameMode'?: string | null;
'id'?: number;
'lines'?: string | null;
'mode'?: string | null;
'model'?: string | null;
'prompt'?: string | null;
'reason'?: string | null;
'resolution'?: string | null;
'scriptId'?: number | null;
'sound'?: string | null;
'state'?: string | null;
'title'?: string | null;
}
export interface memories { export interface memories {
'content': string; 'content': string;
'createTime': number; 'createTime': number;
@ -250,8 +220,6 @@ export interface o_videoConfig {
} }
export interface DB { export interface DB {
"_o_project_old_20260326": _o_project_old_20260326;
"_o_storyboard_old_20260325": _o_storyboard_old_20260325;
"memories": memories; "memories": memories;
"o_agentDeploy": o_agentDeploy; "o_agentDeploy": o_agentDeploy;
"o_agentWorkData": o_agentWorkData; "o_agentWorkData": o_agentWorkData;