修复bug

data/version.txt

@@ -1 +1 @@
-1.1.3
+1.1.4

src/router.ts

@@ -1,4 +1,4 @@
-// @routes-hash 62534cff632db5d31442f1bca1932925
+// @routes-hash e4baae699964f90e2e79664131c1c486
 import { Express } from "express";
 
 import route1 from "./routes/agents/clearMemory";
@@ -123,27 +123,28 @@ import route119 from "./routes/setting/loginConfig/updateUserPwd";
 import route120 from "./routes/setting/memoryConfig/delAllMemory";
 import route121 from "./routes/setting/memoryConfig/getMemory";
 import route122 from "./routes/setting/memoryConfig/sureMemory";
-import route123 from "./routes/setting/promptManage/getPrompt";
+import route123 from "./routes/setting/modelMap/getImageAndVideoModel";
-import route124 from "./routes/setting/promptManage/updatePrompt";
+import route124 from "./routes/setting/promptManage/getPrompt";
-import route125 from "./routes/setting/skillManagement/getSkillContent";
+import route125 from "./routes/setting/promptManage/updatePrompt";
-import route126 from "./routes/setting/skillManagement/getSkillList";
+import route126 from "./routes/setting/skillManagement/getSkillContent";
-import route127 from "./routes/setting/skillManagement/saveSkillContent";
+import route127 from "./routes/setting/skillManagement/getSkillList";
-import route128 from "./routes/setting/vendorConfig/addVendor";
+import route128 from "./routes/setting/skillManagement/saveSkillContent";
-import route129 from "./routes/setting/vendorConfig/addVendorModel";
+import route129 from "./routes/setting/vendorConfig/addVendor";
-import route130 from "./routes/setting/vendorConfig/deleteVendor";
+import route130 from "./routes/setting/vendorConfig/addVendorModel";
-import route131 from "./routes/setting/vendorConfig/delVendorModel";
+import route131 from "./routes/setting/vendorConfig/deleteVendor";
-import route132 from "./routes/setting/vendorConfig/enableVendor";
+import route132 from "./routes/setting/vendorConfig/delVendorModel";
-import route133 from "./routes/setting/vendorConfig/getCodeByLink";
+import route133 from "./routes/setting/vendorConfig/enableVendor";
-import route134 from "./routes/setting/vendorConfig/getVendorList";
+import route134 from "./routes/setting/vendorConfig/getCodeByLink";
-import route135 from "./routes/setting/vendorConfig/modelTest";
+import route135 from "./routes/setting/vendorConfig/getVendorList";
-import route136 from "./routes/setting/vendorConfig/updateCode";
+import route136 from "./routes/setting/vendorConfig/modelTest";
-import route137 from "./routes/setting/vendorConfig/updateVendorInputs";
+import route137 from "./routes/setting/vendorConfig/updateCode";
-import route138 from "./routes/setting/vendorConfig/upVendorModel";
+import route138 from "./routes/setting/vendorConfig/updateVendorInputs";
-import route139 from "./routes/task/getProject";
+import route139 from "./routes/setting/vendorConfig/upVendorModel";
-import route140 from "./routes/task/getTaskApi";
+import route140 from "./routes/task/getProject";
-import route141 from "./routes/task/getTaskCategories";
+import route141 from "./routes/task/getTaskApi";
-import route142 from "./routes/task/taskDetails";
+import route142 from "./routes/task/getTaskCategories";
-import route143 from "./routes/test/test";
+import route143 from "./routes/task/taskDetails";
+import route144 from "./routes/test/test";
 
 export default async (app: Express) => {
   app.use("/api/agents/clearMemory", route1);
@@ -268,25 +269,26 @@ export default async (app: Express) => {
   app.use("/api/setting/memoryConfig/delAllMemory", route120);
   app.use("/api/setting/memoryConfig/getMemory", route121);
   app.use("/api/setting/memoryConfig/sureMemory", route122);
-  app.use("/api/setting/promptManage/getPrompt", route123);
+  app.use("/api/setting/modelMap/getImageAndVideoModel", route123);
-  app.use("/api/setting/promptManage/updatePrompt", route124);
+  app.use("/api/setting/promptManage/getPrompt", route124);
-  app.use("/api/setting/skillManagement/getSkillContent", route125);
+  app.use("/api/setting/promptManage/updatePrompt", route125);
-  app.use("/api/setting/skillManagement/getSkillList", route126);
+  app.use("/api/setting/skillManagement/getSkillContent", route126);
-  app.use("/api/setting/skillManagement/saveSkillContent", route127);
+  app.use("/api/setting/skillManagement/getSkillList", route127);
-  app.use("/api/setting/vendorConfig/addVendor", route128);
+  app.use("/api/setting/skillManagement/saveSkillContent", route128);
-  app.use("/api/setting/vendorConfig/addVendorModel", route129);
+  app.use("/api/setting/vendorConfig/addVendor", route129);
-  app.use("/api/setting/vendorConfig/deleteVendor", route130);
+  app.use("/api/setting/vendorConfig/addVendorModel", route130);
-  app.use("/api/setting/vendorConfig/delVendorModel", route131);
+  app.use("/api/setting/vendorConfig/deleteVendor", route131);
-  app.use("/api/setting/vendorConfig/enableVendor", route132);
+  app.use("/api/setting/vendorConfig/delVendorModel", route132);
-  app.use("/api/setting/vendorConfig/getCodeByLink", route133);
+  app.use("/api/setting/vendorConfig/enableVendor", route133);
-  app.use("/api/setting/vendorConfig/getVendorList", route134);
+  app.use("/api/setting/vendorConfig/getCodeByLink", route134);
-  app.use("/api/setting/vendorConfig/modelTest", route135);
+  app.use("/api/setting/vendorConfig/getVendorList", route135);
-  app.use("/api/setting/vendorConfig/updateCode", route136);
+  app.use("/api/setting/vendorConfig/modelTest", route136);
-  app.use("/api/setting/vendorConfig/updateVendorInputs", route137);
+  app.use("/api/setting/vendorConfig/updateCode", route137);
-  app.use("/api/setting/vendorConfig/upVendorModel", route138);
+  app.use("/api/setting/vendorConfig/updateVendorInputs", route138);
-  app.use("/api/task/getProject", route139);
+  app.use("/api/setting/vendorConfig/upVendorModel", route139);
-  app.use("/api/task/getTaskApi", route140);
+  app.use("/api/task/getProject", route140);
-  app.use("/api/task/getTaskCategories", route141);
+  app.use("/api/task/getTaskApi", route141);
-  app.use("/api/task/taskDetails", route142);
+  app.use("/api/task/getTaskCategories", route142);
-  app.use("/api/test/test", route143);
+  app.use("/api/task/taskDetails", route143);
+  app.use("/api/test/test", route144);
 }

src/routes/production/assets/deleteAssetsDireve.ts

@@ -13,6 +13,11 @@ export default router.post(
   }),
   async (req, res) => {
     const { id, projectId } = req.body;
+    const assetsFirstData = await u.db("o_assets").where("id", id).first();
+    if (!assetsFirstData) {
+      return res.status(404).send({ error: "资源未找到" });
+    }
+    if (assetsFirstData?.flowId) await u.db("o_imageFlow").where("id", assetsFirstData?.flowId).delete();
     await u.db("o_assets").where("id", id).delete();
     await u.db("o_assets2Storyboard").where("assetId", id).delete();
     res.status(200).send(success({ message: "视频删除成功" }));

src/routes/production/storyboard/removeFrame.ts

@@ -12,8 +12,9 @@ export default router.post(
   }),
   async (req, res) => {
     const { id } = req.body;
-    const storyboardData = await u.db("o_storyboard").where("id", id).select("id", "track", "trackId").first();
+    const storyboardData = await u.db("o_storyboard").where("id", id).select("id", "track", "trackId", "flowId").first();
     if (!storyboardData) return res.status(400).send(error("未找到该分镜"));
+    if (storyboardData?.flowId) await u.db("o_imageFlow").where("id", storyboardData?.flowId).delete();
     const trackData = await u.db("o_storyboard").where("track", storyboardData.track).select("id");
     if (trackData.length == 1) await u.db("o_videoTrack").where("id", storyboardData.trackId).delete();
     await u.db("o_storyboard").where("id", id).delete();

src/routes/setting/modelMap/getImageAndVideoModel.ts

@@ -0,0 +1,38 @@
+import express from "express";
+import u from "@/utils";
+import { z } from "zod";
+import { success } from "@/lib/responseFormat";
+import { validateFields } from "@/middleware/middleware";
+const router = express.Router();
+
+export default router.post(
+    "/",
+    async (req, res) => {
+        const dataList = await u.db("o_vendorConfig").select("id").where("enable", 1);
+        if (!dataList || dataList.length === 0) {
+            return res.status(404).send({ error: "模型未找到" });
+        }
+        const types = ['image', 'video'];
+        const modelList = await Promise.all(dataList.map((i) => u.vendor.getModelList(i.id!)));
+        const result = await Promise.all(
+            dataList.map(async (data, index) => {
+                const vendorData = await u.vendor.getVendor(data.id!);
+                console.log("%c Line:20 🌶 vendorData", "background:#42b983", vendorData);
+                const models = modelList[index];
+                const filtered =
+                    models.filter((item: { type: string }) => types.includes(item.type));
+                console.log("%c Line:30 🍺 vendorData.mode", "background:#42b983", vendorData.mode);
+
+                return filtered.map((item: { name: string; modelName: string; type: string }) => ({
+                    id: data.id,
+                    label: item.name,
+                    value: item.modelName,
+                    type: item.type,
+                    name: vendorData.name,
+                    mode: item.mode
+                }));
+            }),
+        );
+        res.status(200).send(success(result.flat()));
+    },
+);

src/types/database.d.ts

@@ -1,4 +1,4 @@
-// @db-hash 3296433eb24314b094ac5d3839c049c5
+// @db-hash 8669d907d827a8f55da1f1724d7ece06
 //该文件由脚本自动生成，请勿手动修改
 
 export interface memories {
@@ -201,6 +201,7 @@ export interface o_user {
   'password'?: string | null;
 }
 export interface o_vendorConfig {
+  'code'?: string | null;
   'enable'?: number | null;
   'id'?: string;
   'inputValues'?: string | null;