From 0c5988ed41b89fc09c6d6c678d1bd230e647724a Mon Sep 17 00:00:00 2001
From: lq1405 <2769838458@qq.com>
Date: Wed, 23 Oct 2024 22:59:29 +0800
Subject: [PATCH] =?UTF-8?q?V3.1.8=201.=20=E6=B7=BB=E5=8A=A0=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E9=AB=98=E6=B8=85=E5=80=8D=E7=8E=87=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E8=87=AA=E5=AE=9A=E4=B9=89=E9=AB=98?=
 =?UTF-8?q?=E6=B8=85=E5=80=8D=E7=8E=87=EF=BC=88=E6=94=AF=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E5=80=8D=E3=80=81=E4=B8=89=E5=80=8D=E5=92=8C=E5=9B=9B=E5=80=8D?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=AF=E4=B8=A4=E5=80=8D=EF=BC=89?=
 =?UTF-8?q?=202.=20=EF=BC=88=E8=81=9A=E5=90=88=E6=8E=A8=E6=96=87=EF=BC=89?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E8=8D=89=E7=A8=BF=E3=80=82?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BE=9D=E8=B5=96=E5=81=9A=E5=A5=BD=E7=9A=84?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E6=96=87=E4=BB=B6=EF=BC=8C=E5=8F=AA=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6=203.=20=EF=BC=88?=
 =?UTF-8?q?=E8=81=9A=E5=90=88=E6=8E=A8=E6=96=87=EF=BC=89=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=94=9F=E6=88=90=E8=8D=89=E7=A8=BF=204.=20?=
 =?UTF-8?q?=EF=BC=88=E8=81=9A=E5=90=88=E6=8E=A8=E6=96=87=EF=BC=89=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B0=8F=E8=AF=B4=E6=89=B9=E6=AC=A1=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=AF=A6=E7=BB=86=E7=95=8C=E9=9D=A2=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=8F=8C=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 resources/scripts/db/book.realm.lock          | Bin 1416 -> 1416 bytes
 resources/scripts/db/software.realm.lock      | Bin 1416 -> 1416 bytes
 src/define/db/model/Book/book.ts              |   2 +
 src/define/db/model/Book/bookTask.ts          |   2 +
 src/define/db/service/Book/bookBasic.ts       |  23 +-
 src/define/enum/bookEnum.ts                   |   3 +-
 src/main/IPCEvent/bookIpc.ts                  |   6 +-
 src/main/Public/publicMethod.js               | 655 ++++++------
 src/main/Service/Book/bookImage.ts            |  35 +-
 src/main/Service/Book/bookVideo.ts            | 111 +-
 src/main/Service/jianying/jianyingService.ts  |  79 +-
 src/model/Setting/softwareSetting.d.ts        |   1 +
 src/model/book.d.ts                           |   3 +
 src/preload/book.ts                           |   6 +-
 .../components/Backstep/oneImageReDrwa.vue    | 985 +++++++++---------
 .../ManageBook/BookTaskListAction.vue         |  37 +-
 .../ManageBookTaskGenerateInformation.vue     | 287 ++---
 .../src/components/Book/ManageBookTask.vue    | 390 +++----
 .../src/components/Book/ReverseManage.vue     |   2 +-
 .../src/components/Setting/Setting.vue        |  32 +-
 22 files changed, 1438 insertions(+), 1227 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7b3a63f..d0f5135 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "laitool",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "laitool",
-      "version": "3.1.7",
+      "version": "3.1.8",
       "hasInstallScript": true,
       "dependencies": {
         "@alicloud/alimt20181012": "^1.2.0",
diff --git a/package.json b/package.json
index 1aea370..1bfa724 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "laitool",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "An AI tool for image processing, video processing, and other functions.",
   "main": "./out/main/index.js",
   "author": "laitool.cn",
diff --git a/resources/scripts/db/book.realm.lock b/resources/scripts/db/book.realm.lock
index 208c139b4e3417207308e79979db4842ce2ff04c..8f0002c53d8f4ce7adee0ee13738d2fbca52c1f3 100644
GIT binary patch
literal 1416
zcmZQ%<Y16s;$r{-ZXj;y1vB9UNDKxTVGJBJOddw70o8#pHlP3$WP@Umd;;9wY7m#f
z!@>wmGl5A2k&dR$z*7e-39}QXG7U}L26gP}a?sQ<=sICFFBeVSgDzdH>hjRkH9Ysg
zstys(5dTJO#cpo_x_N%s)s>;C`w(Y?)!qs;bvM@NVpRtg1QP$z08AW4H=~(%VG_iB
QF!@n>Gz3ONfN%%^0KIN6P5=M^

literal 1416
zcmZQ%<Y16s;$wgT*IpP4LNg(88Ijn;FhS~Z=}~~n!Q@@w_Ev+9ezD0BOrsMB_d(P}
Vm>8ie8Rd_Lz-S1JhQN>t0RYd(23`OF

diff --git a/resources/scripts/db/software.realm.lock b/resources/scripts/db/software.realm.lock
index 6d334ea2987db5feece02731601c4b55856be6a5..734ea88519da13809baf6043ec342b90b1388dc7 100644
GIT binary patch
delta 57
xcmeC+?%)<=WaMCwVB%wdfu|D%%Nd_c>{J(i$^{eS0W&zBGH<-Non@i}9{>iH3a9`8

delta 57
xcmeC+?%)<=WaMCwVB%wdffEx2%NdVP>{J&%!37iJ0W*F)VcvLgJIh1|J^%$|3qSw>

diff --git a/src/define/db/model/Book/book.ts b/src/define/db/model/Book/book.ts
index 50a29cd..d7f69e2 100644
--- a/src/define/db/model/Book/book.ts
+++ b/src/define/db/model/Book/book.ts
@@ -12,6 +12,7 @@ export class BookModel extends Realm.Object<BookModel> {
   oldVideoPath: string | null
   srtPath: string | null
   audioPath: string | null
+  draftDepend?: string // 草稿依赖
   draftSrtStyle: string | null // 草稿字幕样式
   backgroundMusic: string | null // 背景音乐ID
   friendlyReminder: string | null // 友情提示
@@ -38,6 +39,7 @@ export class BookModel extends Realm.Object<BookModel> {
       oldVideoPath: 'string?',
       srtPath: 'string?',
       audioPath: 'string?',
+      draftDepend: "string?",
       draftSrtStyle: 'string?',
       backgroundMusic: 'string?',
       friendlyReminder: 'string?',
diff --git a/src/define/db/model/Book/bookTask.ts b/src/define/db/model/Book/bookTask.ts
index 110d75d..f54a7b6 100644
--- a/src/define/db/model/Book/bookTask.ts
+++ b/src/define/db/model/Book/bookTask.ts
@@ -43,6 +43,7 @@ export class BookTaskModel extends Realm.Object<BookTaskModel> {
   name: string
   generateVideoPath: string | null
   srtPath: string | null
+  draftDepend?: string // 草稿依赖
   audioPath: string | null
   draftSrtStyle: string | null // 草稿字幕样式
   backgroundMusic: string | null // 背景音乐ID
@@ -72,6 +73,7 @@ export class BookTaskModel extends Realm.Object<BookTaskModel> {
       name: 'string',
       generateVideoPath: 'string?',
       srtPath: 'string?',
+      draftDepend: "string?",
       audioPath: 'string?',
       draftSrtStyle: 'string?',
       backgroundMusic: 'string?',
diff --git a/src/define/db/service/Book/bookBasic.ts b/src/define/db/service/Book/bookBasic.ts
index 68444b9..5d8f273 100644
--- a/src/define/db/service/Book/bookBasic.ts
+++ b/src/define/db/service/Book/bookBasic.ts
@@ -176,6 +176,27 @@ const migration = (oldRealm: Realm, newRealm: Realm) => {
       newBookTask[i].messageName = ''
     }
   }
+  // if (oldRealm.schemaVersion < 25) {
+  //   const oldBookTask = oldRealm.objects('BookTaskDetail')
+  //   const newBookTask = newRealm.objects('BookTaskDetail')
+  //   for (let i = 0; i < oldBookTask.length; i++) {
+  //     newBookTask[i].draftDepend = undefined
+  //   }
+  // }
+  if (oldRealm.schemaVersion < 26) {
+    const oldBookTask = oldRealm.objects('BookTask')
+    const newBookTask = newRealm.objects('BookTask')
+    for (let i = 0; i < oldBookTask.length; i++) {
+      newBookTask[i].draftDepend = ''
+    }
+  }
+  if (oldRealm.schemaVersion < 27) {
+    const oldBookTask = oldRealm.objects('Book')
+    const newBookTask = newRealm.objects('Book')
+    for (let i = 0; i < oldBookTask.length; i++) {
+      newBookTask[i].draftDepend = ''
+    }
+  }
 }
 
 export class BaseRealmService extends BaseService {
@@ -217,7 +238,7 @@ export class BaseRealmService extends BaseService {
           BookTaskDetailModel
         ],
         path: this.dbpath,
-        schemaVersion: 24,
+        schemaVersion: 27,
         migration: migration
       }
       this.realm = await Realm.open(config)
diff --git a/src/define/enum/bookEnum.ts b/src/define/enum/bookEnum.ts
index ae11971..51401a5 100644
--- a/src/define/enum/bookEnum.ts
+++ b/src/define/enum/bookEnum.ts
@@ -232,7 +232,8 @@ export enum OperateBookType {
   BOOK = 'book', // 这个小说的所有批次
   BOOKTASK = 'bookTask', // 整个小说批次分镜合并
   BOOKTASKDETAIL = 'bookTaskDetail', // 单个分镜合并
-  UNDERBOOKTASK = 'underBookTask' // 执行小说批次任务的指定ID以及后面的所有的东西
+  UNDERBOOKTASK = 'underBookTask', // 执行小说批次任务的指定ID以及后面的所有的东西
+  ASSIGNBOOKTASK = 'assignBookTask' // 指定小说批次任务
 }
 
 export enum CopyImageType {
diff --git a/src/main/IPCEvent/bookIpc.ts b/src/main/IPCEvent/bookIpc.ts
index 93711db..090f3b6 100644
--- a/src/main/IPCEvent/bookIpc.ts
+++ b/src/main/IPCEvent/bookIpc.ts
@@ -241,14 +241,14 @@ export function BookIpc() {
   // 高清图片前检查，主要是检查图片大小
   ipcMain.handle(
     DEFINE_STRING.BOOK.CHECK_IMAGE_FILE_SIZE,
-    async (event, id, fileSize, operateBookType) =>
+    async (event, id: string | string[], fileSize: number, operateBookType: OperateBookType) =>
       await bookImage.CheckImageFileSize(id, fileSize, operateBookType)
   )
 
   // 开始执行高清图片
   ipcMain.handle(
     DEFINE_STRING.BOOK.HD_IMAGE,
-    async (event, id, scale, operateBookType) => await bookImage.HDImage(id, scale, operateBookType)
+    async (event, id: string | string[], scale: number, operateBookType: OperateBookType) => await bookImage.HDImage(id, scale, operateBookType)
   )
 
   // 删除所有的生成图片
@@ -310,7 +310,7 @@ export function BookIpc() {
   // 将小说任务添加到剪映草稿
   ipcMain.handle(
     DEFINE_STRING.BOOK.ADD_JIANYING_DRAFT,
-    async (event, id, operateBookType) => await bookVideo.AddJianyingDraft(id, operateBookType)
+    async (event, id: string | string[], operateBookType: OperateBookType) => await bookVideo.AddJianyingDraft(id, operateBookType)
   )
   //#endregion
 }
diff --git a/src/main/Public/publicMethod.js b/src/main/Public/publicMethod.js
index 29d0220..f0918b5 100644
--- a/src/main/Public/publicMethod.js
+++ b/src/main/Public/publicMethod.js
@@ -1,335 +1,370 @@
-import path from "path";
-import { define } from "../../define/define";
-import { Tools } from "../tools";
-import { DEFINE_STRING } from "../../define/define_string";
-import { get, has } from "lodash";
-const util = require('util');
-const { spawn, exec } = require('child_process');
-const execAsync = util.promisify(exec);
-const fspromises = require("fs").promises;
+import path from 'path'
+import { define } from '../../define/define'
+import { Tools } from '../tools'
+import { DEFINE_STRING } from '../../define/define_string'
+import { get, has } from 'lodash'
+const util = require('util')
+const { spawn, exec } = require('child_process')
+const execAsync = util.promisify(exec)
+const fspromises = require('fs').promises
 
 export class PublicMethod {
-    constructor(global) {
-        this.global = global;
-        this.tools = new Tools();
+  constructor(global) {
+    this.global = global
+    this.tools = new Tools()
+  }
+
+  /**
+   * 修改config.json文件中的指定的属性
+   * @param {*} value 0: 要修改的数据 1: 要修改的属性 2: 是否需要解析
+   * @returns
+   */
+  async SaveConfigJsonProperty(value) {
+    try {
+      let data = value[0]
+      let property = value[1]
+      let parse = value[2]
+      if (parse) {
+        data = JSON.parse(value[0])
+      }
+      let json_path = path.join(global.config.project_path, 'scripts/config.json')
+      // 判断文件是不是存在
+      let isExit = await this.tools.checkExists(json_path)
+      let json_data = {}
+      if (!isExit) {
+        const dirPath = path.dirname(json_path)
+        await fspromises.mkdir(dirPath, { recursive: true })
+        await fspromises.writeFile(json_path, '{}')
+      } else {
+        const o_data = await fspromises.readFile(json_path, 'utf8')
+        // 将读取的 JSON 字符串转换为 JavaScript 对象
+        let obj = JSON.parse(o_data)
+        json_data = obj
+      }
+      json_data[property] = data
+
+      await fspromises.writeFile(json_path, JSON.stringify(json_data))
+      return {
+        code: 1
+      }
+    } catch (error) {
+      throw error
     }
+  }
 
-    /**
-     * 修改config.json文件中的指定的属性
-     * @param {*} value 0: 要修改的数据 1: 要修改的属性 2: 是否需要解析
-     * @returns 
-     */
-    async SaveConfigJsonProperty(value) {
+  /**
+   * 返回当前项目的config.json文件中的指定的属性信息，若是没有传入属性，则返回所有的信息
+   * @param {Array} value 0 要获取的属性 1 返回的默认值
+   * @param {Boolean} ckeck 是否需要校验属性不存在
+   * @returns
+   */
+  async GetConfigJson(value, ckeck = true) {
+    try {
+      value = JSON.parse(value)
+      let srt_config_path = path.join(global.config.project_path, 'scripts/config.json')
+      let data = await this.tools.getJsonFilePropertyValue(
+        srt_config_path,
+        value[0],
+        value[1],
+        ckeck
+      )
+      return {
+        code: 1,
+        data: data
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+
+  /**
+   * 修改生成图片的任务队列数据
+   * @param {传入的要修改的数据数组} value
+   */
+  async ModifyImageTaskList(value) {
+    this.global.fileQueue.enqueue(
+      async () => {
         try {
-            let data = value[0];
-            let property = value[1];
-            let parse = value[2];
-            if (parse) {
-                data = JSON.parse(value[0])
-            }
-            let json_path = path.join(global.config.project_path, "scripts/config.json");
-            // 判断文件是不是存在
-            let isExit = await this.tools.checkExists(json_path);
-            let json_data = {};
-            if (!isExit) {
-                const dirPath = path.dirname(json_path);
-                await fspromises.mkdir(dirPath, { recursive: true });
-                await fspromises.writeFile(json_path, '{}');
-            }
-            else {
-                const o_data = await fspromises.readFile(json_path, 'utf8');
-                // 将读取的 JSON 字符串转换为 JavaScript 对象
-                let obj = JSON.parse(o_data);
-                json_data = obj;
-            }
-            json_data[property] = data;
-
-            await fspromises.writeFile(json_path, JSON.stringify(json_data));
-            return {
-                code: 1
-            }
+          let task_list_path = path.join(this.global.config.project_path, 'scripts/task_list.json')
+          let isE = await this.tools.checkExists(task_list_path)
+          if (!isE) {
+            throw new Error('任务队列文件不存在。请先添加 批次任务')
+          }
+          let task_list_json = JSON.parse(await fspromises.readFile(task_list_path, 'utf-8'))
+          // 循环循环数据。修改
+          for (let i = 0; i < value.length; i++) {
+            const element = value[i]
+            let index = task_list_json.task_list.findIndex((item) => item.id == element.id)
+            task_list_json.task_list[index] = element
+          }
+          await fspromises.writeFile(task_list_path, JSON.stringify(task_list_json))
         } catch (error) {
-            throw error;
+          throw error
         }
-    }
-
-    /**
-     * 返回当前项目的config.json文件中的指定的属性信息，若是没有传入属性，则返回所有的信息
-     * @param {Array} value 0 要获取的属性 1 返回的默认值
-     * @param {Boolean} ckeck 是否需要校验属性不存在
-     * @returns 
-     */
-    async GetConfigJson(value, ckeck = true) {
-        try {
-            value = JSON.parse(value)
-            let srt_config_path = path.join(global.config.project_path, "scripts/config.json");
-            let data = await this.tools.getJsonFilePropertyValue(srt_config_path, value[0], value[1], ckeck);
-            return {
-                code: 1,
-                data: data
-            }
-        } catch (error) {
-            throw error;
+      },
+      'modifyFile',
+      'modifyFile',
+      'task_list'
+    )
+    this.global.fileQueue.setSubBatchCompletionCallback(
+      'modifyFile',
+      'task_list',
+      async (failedTasks) => {
+        // 报错
+        if (failedTasks.length > 0) {
+          let message = ''
+          failedTasks.forEach(({ taskId, error }) => {
+            message += `${taskId}-, \n 错误信息: ${error}` + '\n'
+          })
+          throw new Error(message)
+          // this.global.newWindow[0].win.webContents.send(DEFINE_STRING.SHOW_MESSAGE_DIALOG, {
+          //     code: 0,
+          //     message: message
+          // })
         }
+        // else {
+        //     this.global.newWindow[0].win.webContents.send(DEFINE_STRING.SHOW_MESSAGE_DIALOG, {
+        //         code: 1,
+        //         message: "修改成功"
+        //     })
+        // }
+        return true
+      }
+    )
+  }
+
+  /**
+   * 高清指定的文件夹
+   * @param {要高清的文件夹} folder
+   */
+  async ImproveFolder(folder) {
+    try {
+      let bakPath = path.join(this.global.config.project_path, 'tmp/bak')
+      let oldInput = path.join(this.global.config.project_path, 'tmp/' + folder)
+      let newInput = path.join(this.global.config.project_path, 'tmp/bak/' + folder)
+      // 创建文件夹
+      let existFolder = await this.tools.checkExists(bakPath)
+      if (!existFolder) {
+        await fspromises.mkdir(bakPath, { recursive: true })
+      }
+
+      let isExistNewFolder = await this.tools.checkExists(newInput)
+      if (isExistNewFolder) {
+        await fspromises.rm(newInput, { recursive: true, force: true })
+      }
+      // 备份文件
+      await fspromises.rename(oldInput, newInput)
+      //创建同名的文件，用作输出
+      await fspromises.mkdir(oldInput, { recursive: true })
+
+      // 开始高清
+      let command = `"${path.join(
+        define.package_path,
+        'Improve/rnv.exe'
+      )}" -i "${newInput}" -o "${oldInput}" -s ${this.global.config.hdScale ?? 2}`
+      let out = await execAsync(command, { maxBuffer: 1024 * 1024 * 10, encoding: 'utf-8' })
+      console.log(out)
+      await this.ModifyTaskStatus('out_folder', folder, 'video_improvied')
+      this.global.newWindow[0].win.webContents.send(DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH, {
+        out_folder: folder,
+        status: 'video_improvied'
+      })
+    } catch (error) {
+      await this.ModifyTaskStatus('out_folder', folder, 'video_improvie_error')
+      this.global.newWindow[0].win.webContents.send(DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH, {
+        out_folder: folder,
+        status: 'video_improvie_error'
+      })
+      throw error
     }
+  }
 
-    /**
-     * 修改生成图片的任务队列数据
-     * @param {传入的要修改的数据数组} value 
-     */
-    async ModifyImageTaskList(value) {
-        this.global.fileQueue.enqueue(async () => {
-            try {
-                let task_list_path = path.join(this.global.config.project_path, "scripts/task_list.json");
-                let isE = await this.tools.checkExists(task_list_path);
-                if (!isE) {
-                    throw new Error("任务队列文件不存在。请先添加 批次任务");
-                }
-                let task_list_json = JSON.parse(await fspromises.readFile(task_list_path, "utf-8"));
-                // 循环循环数据。修改
-                for (let i = 0; i < value.length; i++) {
-                    const element = value[i];
-                    let index = task_list_json.task_list.findIndex(item => item.id == element.id);
-                    task_list_json.task_list[index] = element;
-                }
-                await fspromises.writeFile(task_list_path, JSON.stringify(task_list_json));
-            } catch (error) {
-                throw error;
-            }
-        }, "modifyFile", "modifyFile", "task_list")
-        this.global.fileQueue.setSubBatchCompletionCallback("modifyFile", "task_list", async (failedTasks) => {
-            // 报错
-            if (failedTasks.length > 0) {
-                let message = "";
-                failedTasks.forEach(({ taskId, error }) => {
-                    message += `${taskId}-, \n 错误信息: ${error}` + '\n';
-                });
-                throw new Error(message);
-                // this.global.newWindow[0].win.webContents.send(DEFINE_STRING.SHOW_MESSAGE_DIALOG, {
-                //     code: 0,
-                //     message: message
-                // })
-            }
-            // else {
-            //     this.global.newWindow[0].win.webContents.send(DEFINE_STRING.SHOW_MESSAGE_DIALOG, {
-            //         code: 1,
-            //         message: "修改成功"
-            //     })
-            // }
-            return true;
-        })
-    }
+  /**
+   * 生成SD相对的JSON文件。删除反推的txt文件
+   */
+  async AddWebuiJson() {
+    try {
+      // 读取所有txt文件
+      let txtfile = await this.tools.getFilesWithExtensions(
+        path.join(this.global.config.project_path, 'tmp/input_crop'),
+        '.txt'
+      )
+      let image = await this.tools.getFilesWithExtensions(
+        path.join(this.global.config.project_path, 'tmp/input_crop'),
+        '.png'
+      )
+      let promptJson = await this.tools.getFilesWithExtensions(
+        path.join(this.global.config.project_path, 'tmp/input_crop'),
+        '.json'
+      )
 
-
-    /**
-     * 高清指定的文件夹
-     * @param {要高清的文件夹} folder 
-     */
-    async ImproveFolder(folder) {
-        try {
-            let bakPath = path.join(this.global.config.project_path, "tmp/bak");
-            let oldInput = path.join(this.global.config.project_path, "tmp/" + folder);
-            let newInput = path.join(this.global.config.project_path, "tmp/bak/" + folder)
-            // 创建文件夹
-            let existFolder = await this.tools.checkExists(bakPath);
-            if (!existFolder) {
-                await fspromises.mkdir(bakPath, { recursive: true });
-            }
-
-            let isExistNewFolder = await this.tools.checkExists(newInput);
-            if (isExistNewFolder) {
-                await fspromises.rm(newInput, { recursive: true, force: true });
-            }
-            // 备份文件
-            await fspromises.rename(oldInput, newInput);
-            //创建同名的文件，用作输出
-            await fspromises.mkdir(oldInput, { recursive: true });
-
-            // 开始高清
-            let command = `"${path.join(define.package_path, "Improve/rnv.exe")}" -i "${newInput}" -o "${oldInput}"`;
-            let out = await execAsync(command, { maxBuffer: 1024 * 1024 * 10, encoding: 'utf-8' });
-            console.log(out);
-            await this.ModifyTaskStatus('out_folder', folder, "video_improvied");
-            this.global.newWindow[0].win.webContents.send(DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH, {
-                out_folder: folder,
-                status: "video_improvied"
-            })
-
-        } catch (error) {
-            await this.ModifyTaskStatus('out_folder', folder, "video_improvie_error");
-            this.global.newWindow[0].win.webContents.send(DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH, {
-                out_folder: folder,
-                status: "video_improvie_error"
-            })
-            throw error;
+      // json 已经存在，不做后续处理
+      if (image.length == promptJson.length) {
+        return {
+          code: 1
         }
-    }
+      }
 
-    /**
-    * 生成SD相对的JSON文件。删除反推的txt文件
-    */
-    async AddWebuiJson() {
-        try {
-            // 读取所有txt文件
-            let txtfile = await this.tools.getFilesWithExtensions(path.join(this.global.config.project_path, 'tmp/input_crop'), '.txt');
-            let image = await this.tools.getFilesWithExtensions(path.join(this.global.config.project_path, 'tmp/input_crop'), '.png');
-            let promptJson = await this.tools.getFilesWithExtensions(path.join(this.global.config.project_path, 'tmp/input_crop'), '.json');
+      if (txtfile.length != image.length) {
+        throw new Error('关键词文件和图片数量对不上，请检查！！')
+      }
+      let sd_config = JSON.parse(await fspromises.readFile(define.sd_setting, 'utf-8'))
 
-            // json 已经存在，不做后续处理
-            if (image.length == promptJson.length) {
-                return {
-                    code: 1,
-                }
-            }
-
-            if (txtfile.length != image.length) {
-                throw new Error("关键词文件和图片数量对不上，请检查！！")
-            }
-            let sd_config = JSON.parse(await fspromises.readFile(define.sd_setting, 'utf-8'));
-
-            for (let i = 0; i < image.length; i++) {
-                const element = image[i];
-                let txtpath = element.split('.png')[0] + '.txt';
-                let prompt = await fspromises.readFile(txtpath, 'utf-8');
-                // console.log(txtpath)
-                let obj = {}
-                obj.model = sd_config.setting.type;
-                obj.api = sd_config.setting.webui_api_url + 'sdapi/v1/img2img';
-                obj.webui_config = {
-                    sampler_name: sd_config.webui.sampler_name,
-                    prompt: prompt + ',' + sd_config.webui.prompt,
-                    negative_prompt: sd_config.webui.negative_prompt,
-                    batch_size: 1,
-                    steps: sd_config.webui.steps,
-                    cfg_scale: sd_config.webui.cfg_scale,
-                    denoising_strength: sd_config.webui.denoising_strength,
-                    width: sd_config.webui.width,
-                    height: sd_config.webui.height,
-                    seed: sd_config.setting.seed,
-                    init_images: element,
-                }
-                obj.adetailer = sd_config.webui.adetailer;
-
-                // 写入
-                await fspromises.writeFile(element + '.json', JSON.stringify(obj));
-                // 删除对应的txt文件
-                await fspromises.unlink(txtpath);
-            }
-
-            return {
-                code: 1,
-            }
-
-        } catch (error) {
-            throw error;
+      for (let i = 0; i < image.length; i++) {
+        const element = image[i]
+        let txtpath = element.split('.png')[0] + '.txt'
+        let prompt = await fspromises.readFile(txtpath, 'utf-8')
+        // console.log(txtpath)
+        let obj = {}
+        obj.model = sd_config.setting.type
+        obj.api = sd_config.setting.webui_api_url + 'sdapi/v1/img2img'
+        obj.webui_config = {
+          sampler_name: sd_config.webui.sampler_name,
+          prompt: prompt + ',' + sd_config.webui.prompt,
+          negative_prompt: sd_config.webui.negative_prompt,
+          batch_size: 1,
+          steps: sd_config.webui.steps,
+          cfg_scale: sd_config.webui.cfg_scale,
+          denoising_strength: sd_config.webui.denoising_strength,
+          width: sd_config.webui.width,
+          height: sd_config.webui.height,
+          seed: sd_config.setting.seed,
+          init_images: element
         }
-    }
+        obj.adetailer = sd_config.webui.adetailer
 
-    /**
-     * 获取当前项目的生图任务列表
-     */
-    async GetImageTask() {
-        try {
-            let json_path = path.join(this.global.config.project_path, "scripts/task_list.json");
-            let isExit = await this.tools.checkExists(json_path);
-            if (!isExit) {
-                return {
-                    code: 1,
-                    data: null
-                }
-            }
-            let json_data = JSON.parse(await fspromises.readFile(json_path));
-            return {
-                code: 1,
-                data: json_data
-            }
-        } catch (error) {
-            return {
-                code: 0,
-                message: error
-            }
+        // 写入
+        await fspromises.writeFile(element + '.json', JSON.stringify(obj))
+        // 删除对应的txt文件
+        await fspromises.unlink(txtpath)
+      }
+
+      return {
+        code: 1
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+
+  /**
+   * 获取当前项目的生图任务列表
+   */
+  async GetImageTask() {
+    try {
+      let json_path = path.join(this.global.config.project_path, 'scripts/task_list.json')
+      let isExit = await this.tools.checkExists(json_path)
+      if (!isExit) {
+        return {
+          code: 1,
+          data: null
         }
+      }
+      let json_data = JSON.parse(await fspromises.readFile(json_path))
+      return {
+        code: 1,
+        data: json_data
+      }
+    } catch (error) {
+      return {
+        code: 0,
+        message: error
+      }
     }
+  }
 
-
-    /**
-     * 修改任务的状态
-     * @param {查找的类型 id out_folder} type 
-     * @param {查找的类型} id 
-     * @param {新的状态} newStatus 
-     */
-    async ModifyTaskStatus(type, id, newStatus) {
-        this.global.fileQueue.enqueue(async () => {
-            try {
-                // 将修改数据写入到一个并发为 1 的队列中
-                let tmp_task = await fspromises.readFile(path.join(this.global.config.project_path, 'scripts/task_list.json'), 'utf-8');
-                console.log(tmp_task)
-                let task = JSON.parse(tmp_task);
-                if (type == "id") {
-                    let index = task.task_list.findIndex(item => item.id == id);
-                    if (index < 0) {
-                        throw new Error("传入的数据未找到");
-                    } else {
-                        task.task_list[index].status = newStatus;
-                    }
-                } else if (type == "out_folder") {
-                    let index = task.task_list.findIndex(item => item.out_folder == id);
-                    if (index < 0) {
-                        throw new Error("传入的数据未找到");
-                    } else {
-                        task.task_list[index].status = newStatus;
-                    }
-                } else {
-                    throw new Error("输入类型错误")
-                }
-                await fspromises.writeFile(path.join(this.global.config.project_path, 'scripts/task_list.json'), JSON.stringify(task));
-            } catch (error) {
-                throw error;
-            }
-        }, "modifyFile", "modifyFile", "task_list")
-        this.global.fileQueue.setSubBatchCompletionCallback("modifyFile", "task_list", async (failedTasks) => {
-            // 报错
-            if (failedTasks.length > 0) {
-                let message = "";
-                failedTasks.forEach(({ taskId, error }) => {
-                    message += `${taskId}-, \n 错误信息: ${error}` + '\n';
-                });
-
-                this.global.newWindow[0].win.webContents.send(DEFINE_STRING.SHOW_MESSAGE_DIALOG, {
-                    code: 0,
-                    message: message
-                })
-            }
-        })
-    }
-
-    /**
-     * 获取指定文件夹下面特定条件的文件夹
-     * @param {指定的文件夹目录} parentFolder 
-     * @param {查询条件 start end include} condition 
-     * @param {查询的值} value 
-     * @returns 
-     */
-    async getSubFolderList(parentFolder, condition, value) {
+  /**
+   * 修改任务的状态
+   * @param {查找的类型 id out_folder} type
+   * @param {查找的类型} id
+   * @param {新的状态} newStatus
+   */
+  async ModifyTaskStatus(type, id, newStatus) {
+    this.global.fileQueue.enqueue(
+      async () => {
         try {
-            // console.log(value);
-            let folders = await fspromises.readdir(parentFolder, { withFileTypes: true });
-            folders = folders.filter(item => item.isDirectory())
-                .map(item => item.name)
-
-            if (condition == "start") {
-                folders = folders.filter(item => item.startsWith(value));
-            } else if (condition == "end") {
-                folders = folders.filter(item => item.endsWith(value));
-            } else if (condition == "include") {
-                //包含过滤
-                folders = folders.filter(item => item.includes(value));
+          // 将修改数据写入到一个并发为 1 的队列中
+          let tmp_task = await fspromises.readFile(
+            path.join(this.global.config.project_path, 'scripts/task_list.json'),
+            'utf-8'
+          )
+          console.log(tmp_task)
+          let task = JSON.parse(tmp_task)
+          if (type == 'id') {
+            let index = task.task_list.findIndex((item) => item.id == id)
+            if (index < 0) {
+              throw new Error('传入的数据未找到')
             } else {
-                throw new Error("条件参数错误");
+              task.task_list[index].status = newStatus
             }
-            return folders;
+          } else if (type == 'out_folder') {
+            let index = task.task_list.findIndex((item) => item.out_folder == id)
+            if (index < 0) {
+              throw new Error('传入的数据未找到')
+            } else {
+              task.task_list[index].status = newStatus
+            }
+          } else {
+            throw new Error('输入类型错误')
+          }
+          await fspromises.writeFile(
+            path.join(this.global.config.project_path, 'scripts/task_list.json'),
+            JSON.stringify(task)
+          )
         } catch (error) {
-            throw error;
+          throw error
         }
+      },
+      'modifyFile',
+      'modifyFile',
+      'task_list'
+    )
+    this.global.fileQueue.setSubBatchCompletionCallback(
+      'modifyFile',
+      'task_list',
+      async (failedTasks) => {
+        // 报错
+        if (failedTasks.length > 0) {
+          let message = ''
+          failedTasks.forEach(({ taskId, error }) => {
+            message += `${taskId}-, \n 错误信息: ${error}` + '\n'
+          })
+
+          this.global.newWindow[0].win.webContents.send(DEFINE_STRING.SHOW_MESSAGE_DIALOG, {
+            code: 0,
+            message: message
+          })
+        }
+      }
+    )
+  }
+
+  /**
+   * 获取指定文件夹下面特定条件的文件夹
+   * @param {指定的文件夹目录} parentFolder
+   * @param {查询条件 start end include} condition
+   * @param {查询的值} value
+   * @returns
+   */
+  async getSubFolderList(parentFolder, condition, value) {
+    try {
+      // console.log(value);
+      let folders = await fspromises.readdir(parentFolder, { withFileTypes: true })
+      folders = folders.filter((item) => item.isDirectory()).map((item) => item.name)
+
+      if (condition == 'start') {
+        folders = folders.filter((item) => item.startsWith(value))
+      } else if (condition == 'end') {
+        folders = folders.filter((item) => item.endsWith(value))
+      } else if (condition == 'include') {
+        //包含过滤
+        folders = folders.filter((item) => item.includes(value))
+      } else {
+        throw new Error('条件参数错误')
+      }
+      return folders
+    } catch (error) {
+      throw error
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/main/Service/Book/bookImage.ts b/src/main/Service/Book/bookImage.ts
index a16f0e9..4b785d0 100644
--- a/src/main/Service/Book/bookImage.ts
+++ b/src/main/Service/Book/bookImage.ts
@@ -101,22 +101,30 @@ export class BookImage {
    * @param scale 高清的倍率
    * @param operateBookType 操作的类型（支持BOOK，BOOKTASK两种）
    */
-  async HDImage(id: string, scale: number, operateBookType: OperateBookType): Promise<GeneralResponse.ErrorItem | GeneralResponse.SuccessItem> {
+  async HDImage(id: string | string[], scale: number, operateBookType: OperateBookType): Promise<GeneralResponse.ErrorItem | GeneralResponse.SuccessItem> {
     try {
       if (scale <= 0 || scale > 4) {
         throw new Error('高清倍率只能是2，3，4')
       }
-      let bookTasks = undefined as Book.SelectBookTask[]
+      let bookTasks = [] as Book.SelectBookTask[]
       if (operateBookType == OperateBookType.BOOK) {
         // 获取所有的小说批次任务
         bookTasks = (await this.bookServiceBasic.GetBookTaskData({
-          bookId: id
+          bookId: id as string
         })).bookTasks
       } else if (operateBookType == OperateBookType.BOOKTASK) {
         // 获取当前的小说批次任务
         bookTasks = (await this.bookServiceBasic.GetBookTaskData({
-          id: id
+          id: id as string
         })).bookTasks
+      } else if (operateBookType == OperateBookType.ASSIGNBOOKTASK) {
+        for (let i = 0; i < id.length; i++) {
+          const element = id[i];
+          let tmpBookTask = (await this.bookServiceBasic.GetBookTaskData({
+            id: element
+          })).bookTasks
+          bookTasks.push(...tmpBookTask)
+        }
       } else {
         throw new Error("不支持的操作类型，请检查")
       }
@@ -195,20 +203,29 @@ export class BookImage {
    * @param fileSize 单个图片的文件大小
    * @param operateBookType 操作的类型（支持BOOK，BOOKTASK两种）
    */
-  async CheckImageFileSize(id: string, fileSize: number, operateBookType: OperateBookType) {
+  async CheckImageFileSize(id: string | string[], fileSize: number, operateBookType: OperateBookType) {
     try {
-      let bookTasks = undefined as Book.SelectBookTask[]
+      let bookTasks = [] as Book.SelectBookTask[]
       if (operateBookType == OperateBookType.BOOK) {
         // 获取所有的小说批次任务
         bookTasks = (await this.bookServiceBasic.GetBookTaskData({
-          bookId: id
+          bookId: id as string
         })).bookTasks
       } else if (operateBookType == OperateBookType.BOOKTASK) {
         // 获取当前的小说批次任务
         bookTasks = (await this.bookServiceBasic.GetBookTaskData({
-          id: id
+          id: id as string
         })).bookTasks
-      } else {
+      } else if (operateBookType == OperateBookType.ASSIGNBOOKTASK) {
+        for (let i = 0; i < id.length; i++) {
+          const element = id[i];
+          let tempBookTask = (await this.bookServiceBasic.GetBookTaskData({
+            id: element
+          })).bookTasks
+          bookTasks.push(...tempBookTask)
+        }
+      }
+      else {
         throw new Error("不支持的操作类型，请检查")
       }
 
diff --git a/src/main/Service/Book/bookVideo.ts b/src/main/Service/Book/bookVideo.ts
index 35f5c09..89a71c3 100644
--- a/src/main/Service/Book/bookVideo.ts
+++ b/src/main/Service/Book/bookVideo.ts
@@ -1,38 +1,24 @@
 import { OperateBookType } from "../../../define/enum/bookEnum";
 import { Book } from "../../../model/book";
 import { errorMessage, successMessage } from "../../Public/generalTools";
-import { BookService } from "../../../define/db/service/Book/bookService";
-import { BookTaskService } from "../../../define/db/service/Book/bookTaskService";
 import { GeneralResponse } from "../../../model/generalResponse";
 import { Setting } from '../../../main/setting/setting'
 import path from 'path'
 import { CheckFolderExistsOrCreate } from "../../../define/Tools/file";
-import { BookTaskDetailService } from "../../../define/db/service/Book/bookTaskDetailService";
 import fs from 'fs'
 import { ClipDraft } from '../../Public/clipDraft'
 import { BookServiceBasic } from "../ServiceBasic/bookServiceBasic";
+import { isEmpty } from "lodash";
+import JianyingService from "../jianying/jianyingService";
 
 export class BookVideo {
-  bookService: BookService
-  bookTaskService: BookTaskService
   setting: Setting
-  bookTaskDetailService: BookTaskDetailService
   bookServiceBasic: BookServiceBasic
+  jianyingService: JianyingService
   constructor() {
     this.setting = new Setting(global)
     this.bookServiceBasic = new BookServiceBasic()
-  }
-
-  async InitService() {
-    if (!this.bookService) {
-      this.bookService = await BookService.getInstance()
-    }
-    if (!this.bookTaskService) {
-      this.bookTaskService = await BookTaskService.getInstance()
-    }
-    if (!this.bookTaskDetailService) {
-      this.bookTaskDetailService = await BookTaskDetailService.getInstance()
-    }
+    this.jianyingService = new JianyingService()
   }
 
 
@@ -44,23 +30,22 @@ export class BookVideo {
   async UseBookVideoDataToBookTask(id: string, operateBookType: OperateBookType) {
     try {
       console.log(id, operateBookType)
-      await this.InitService();
       let book = undefined as Book.SelectBook;
       let bookTasks = undefined as Book.SelectBookTask[];
       if (operateBookType == OperateBookType.BOOK) {
-        book = this.bookService.GetBookDataById(id);
+        book = await this.bookServiceBasic.GetBookDataById(id);
         if (book == null) {
           throw new Error('未找到对应的小说')
         }
-        bookTasks = this.bookTaskService.GetBookTaskData({
+        bookTasks = (await this.bookServiceBasic.GetBookTaskData({
           bookId: id,
-        }).data;
+        })).bookTasks;
       } else if (operateBookType == OperateBookType.BOOKTASK) {
-        let bookTask = this.bookTaskService.GetBookTaskDataById(id);
+        let bookTask = await this.bookServiceBasic.GetBookTaskDataById(id);
         if (bookTask == null) {
           throw new Error('未找到对应的小说任务')
         }
-        book = this.bookService.GetBookDataById(bookTask.bookId);
+        book = await this.bookServiceBasic.GetBookDataById(bookTask.bookId);
         if (book == null) {
           throw new Error('未找到对应的小说')
         }
@@ -117,9 +102,9 @@ export class BookVideo {
       await CheckFolderExistsOrCreate(path.dirname(configPath));
 
       // 开始配置
-      let bookTaskDetail = this.bookTaskDetailService.GetBookTaskData({
+      let bookTaskDetail = await this.bookServiceBasic.GetBookTaskDetailData({
         bookTaskId: bookTask.id
-      }).data;
+      });
 
       let configData = {
         srt_time_information: [],
@@ -144,14 +129,7 @@ export class BookVideo {
           start_time: element.startTime,
           end_time: element.endTime,
           timeLimit: `${element.startTime} -- ${element.endTime}`,
-          subValue: element.subValue?.map(item => {
-            return {
-              start_time: item.startTime,
-              end_time: item.endTime,
-              srt_value: item.srtValue,
-              id: item.id
-            }
-          }),
+          subValue: element.subValue,
           character_tags: [],
           gpt_prompt: element.gptPrompt,
           mjMessage: element.mjMessage,
@@ -179,28 +157,29 @@ export class BookVideo {
    * @param operateBookType 
    * @returns 
    */
-  async AddJianyingDraft(id: string, operateBookType: OperateBookType): Promise<GeneralResponse.ErrorItem | GeneralResponse.SuccessItem> {
+  async AddJianyingDraft(id: string | string[], operateBookType: OperateBookType): Promise<GeneralResponse.ErrorItem | GeneralResponse.SuccessItem> {
     try {
-      await this.InitService();
       console.log(id, operateBookType)
       let book = undefined as Book.SelectBook
-      let bookTasks = undefined as Book.SelectBookTask[]
-      if (operateBookType == OperateBookType.BOOK) {
-        book = this.bookService.GetBookDataById(id);
-        if (book == null) {
-          throw new Error("没有找到对应的小说数据，请检查");
+      let bookTasks = [] as Book.SelectBookTask[]
+      if (operateBookType == OperateBookType.ASSIGNBOOKTASK) {
+        if (id.length <= 0) {
+          throw new Error("没有找到小说批次任务，请检查");
+        }
+        for (let i = 0; i < id.length; i++) {
+          const element = id[i];
+          let tempBookTask = await this.bookServiceBasic.GetBookTaskDataById(element as string);
+          bookTasks.push(tempBookTask)
+          book = await this.bookServiceBasic.GetBookDataById(tempBookTask.bookId);
         }
-        bookTasks = this.bookTaskService.GetBookTaskData({
-          bookId: id
-        }).data.bookTasks
       } else if (operateBookType == OperateBookType.BOOKTASK) {
         // 直接获取对应的数据
-        let tempBookTask = this.bookTaskService.GetBookTaskDataById(id);
+        let tempBookTask = await this.bookServiceBasic.GetBookTaskDataById(id as string);
         if (tempBookTask == null) {
           throw new Error("没有找到小说批次任务，请检查");
         }
         bookTasks = [tempBookTask]
-        book = this.bookService.GetBookDataById(tempBookTask.bookId);
+        book = await this.bookServiceBasic.GetBookDataById(tempBookTask.bookId);
         if (book == null) {
           throw new Error
         }
@@ -213,26 +192,38 @@ export class BookVideo {
       }
 
       // 判断是不是生成单个，每次生成都要修改一下配置文件 
-      // TODO 后面这个地方要修改
       // 调用生成草稿的方法
 
       let result = []
       for (let i = 0; i < bookTasks.length; i++) {
         const element = bookTasks[i];
-        await this.GenerateConfigFile(book, element);
-        // 数据处理完毕，开始输出
-        let clipDraft = new ClipDraft(global, [element.name, {
-          srt_path: element.srtPath,
-          audio_path: element.audioPath,
-          draft_srt_style: element.draftSrtStyle ? element.draftSrtStyle : "0",
-          background_music: element.backgroundMusic,
-          friendly_reminder: element.friendlyReminder ? element.friendlyReminder : "0",
-        }])
-        let res = await clipDraft.addDraft();
-        if (res.code == 0) {
-          throw new Error(res.message)
+        // 判断是不是又依赖的草稿，又依赖的草稿，对于依赖的草稿进行操作
+
+        if ((!isEmpty(element.draftDepend) && operateBookType != OperateBookType.ASSIGNBOOKTASK) || (operateBookType == OperateBookType.ASSIGNBOOKTASK && !isEmpty(book.draftDepend))) {
+          let draft_name = `${book.name}_${element.name}`;
+          if (draft_name == element.draftDepend) {
+            throw new Error("生成的草稿名称和依赖的草稿名称一样，请检查");
+          }
+          await this.jianyingService.GenerateDraftFromDepend(
+            operateBookType == OperateBookType.ASSIGNBOOKTASK ? book.draftDepend : element.draftDepend,
+            element.imageFolder, draft_name);
+          result.push(draft_name);
+        } else {
+          await this.GenerateConfigFile(book, element);
+          // 数据处理完毕，开始输出
+          let clipDraft = new ClipDraft(global, [element.name, {
+            srt_path: operateBookType == OperateBookType.ASSIGNBOOKTASK ? book.srtPath : element.srtPath,
+            audio_path: operateBookType == OperateBookType.ASSIGNBOOKTASK ? book.audioPath : element.audioPath,
+            draft_srt_style: operateBookType == OperateBookType.ASSIGNBOOKTASK ? (book.draftSrtStyle ? book.draftSrtStyle : '0') : (element.draftSrtStyle ? element.draftSrtStyle : "0"),
+            background_music: operateBookType == OperateBookType.ASSIGNBOOKTASK ? book.backgroundMusic : element.backgroundMusic,
+            friendly_reminder: operateBookType == OperateBookType.ASSIGNBOOKTASK ? (book.friendlyReminder ? book.bookFolderPath : '0') : (element.friendlyReminder ? element.friendlyReminder : "0"),
+          }])
+          let res = await clipDraft.addDraft();
+          if (res.code == 0) {
+            throw new Error(res.message)
+          }
+          result.push(res.draft_name);
         }
-        result.push(res.draft_name);
       }
       return successMessage(result, `${result.join('\n')} ${'\n'} 剪映草稿添加成功`, "BookTask_AddJianyingDraft")
 
diff --git a/src/main/Service/jianying/jianyingService.ts b/src/main/Service/jianying/jianyingService.ts
index a0385a7..355d19e 100644
--- a/src/main/Service/jianying/jianyingService.ts
+++ b/src/main/Service/jianying/jianyingService.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { CheckFileOrDirExist, DeleteFolderAllFile } from '../../../define/Tools/file';
+import { CheckFileOrDirExist, CopyFileOrFolder, DeleteFolderAllFile, GetFilesWithExtensions } from '../../../define/Tools/file';
 import fs from "fs";
 import { ValidateJson } from '../../../define/Tools/validate';
 import { FfmpegOptions } from '../ffmpegOptions';
@@ -38,7 +38,7 @@ class JianyingService {
    * @param projectDir 项目目录
    * @param packagePath 包路径
    */
-  async GetDraftFrameAndText(draftDir: string, projectDir: string, packagePath: string) {
+  public async GetDraftFrameAndText(draftDir: string, projectDir: string, packagePath: string) {
     try {
       // 获取草稿文件路径
       let draftJsonPath = path.resolve(draftDir, "draft_content.json");
@@ -101,6 +101,81 @@ class JianyingService {
     }
   }
 
+  /**
+   * 
+   * @param draftName 
+   * @param imageFolder
+   * 1、找到对应的依赖的草稿文件，
+   * 2、直接复制一个全新的草稿文件
+   * 3、解析复制出来的草稿文件
+   * 3、找到主轴，只能替换主轴的图片
+   * 3、找到对应的图片文件夹，然后替换对应的图片 
+   */
+  public async GenerateDraftFromDepend(dependDraftName: string, imageFolder: string, draftName: string) {
+    console.log(draftName);
+    let dependDraftPath = path.resolve(global.config.draft_path, dependDraftName);
+    if (!await CheckFileOrDirExist(dependDraftPath)) {
+      throw new Error("依赖的草稿文件不存在，请检查");
+    }
+    let draftPath = path.resolve(global.config.draft_path, draftName);
+    if (await CheckFileOrDirExist(draftPath)) {
+      // 删除文件夹
+      await DeleteFolderAllFile(draftPath, true);
+    }
+    // 复制
+    await CopyFileOrFolder(dependDraftPath, draftPath)
+
+    let images = await GetFilesWithExtensions(imageFolder, ['.png']);
+
+    // 开始处理数据
+    let draftJsonPath = path.resolve(draftPath, "draft_content.json");
+    if (!await CheckFileOrDirExist(draftJsonPath)) {
+      throw new Error("剪映草稿文件数据文件不存在，请先检查");
+    }
+    // 读取草稿文件内容
+    let draftJsonString = await fs.promises.readFile(draftJsonPath, "utf-8");
+    if (!ValidateJson(draftJsonString)) {
+      throw new Error("剪映草稿文件格式错误，请检查");
+    }
+    let draftJson = JSON.parse(draftJsonString);
+    let draftTracks = draftJson.tracks;
+    if (draftTracks.length <= 0) {
+      throw new Error("剪映草稿文件格式错误，没有轨道，请检查");
+    }
+
+    let videoTrack = draftTracks[0];// 只处理主轨道
+    if (videoTrack.type !== "video") {
+      throw new Error("剪映草稿文件格式错误，主轨道不是Video，请检查");
+    }
+    let videoTrackSegments = videoTrack.segments;
+    if (videoTrackSegments.length <= 0) {
+      throw new Error("剪映草稿文件格式错误，主轨道没有对应的图片节点，请检查");
+    }
+    let segmentMaterialNodes = [];
+    for (let i = 0; i < videoTrackSegments.length; i++) {
+      const element = videoTrackSegments[i];
+      let materialId = element.material_id;
+      let materialNode = this.FindNode(draftJson.materials.videos, "id", materialId);
+      segmentMaterialNodes.push(materialNode);
+    }
+
+    if (images.length !== segmentMaterialNodes.length) {
+      throw new Error("当前新增的任务对应的图片数量和依赖的草稿的主轨道的图片数量不一致，请检查");
+    }
+
+    // 直接修改
+    for (let i = 0; i < segmentMaterialNodes.length; i++) {
+      const element = segmentMaterialNodes[i];
+      if (!images[i]) {
+        throw new Error("图片数量不对应，请检查");
+      }
+      element.path = images[i];
+    }
+
+    // 好了 写出草稿文件
+    await fs.promises.writeFile(draftJsonPath, JSON.stringify(draftJson), "utf-8");
+  }
+
   /**
    * 在节点数组中查找指定类型和值的节点
    * @param nodes 节点数组
diff --git a/src/model/Setting/softwareSetting.d.ts b/src/model/Setting/softwareSetting.d.ts
index c7b30d7..3c769db 100644
--- a/src/model/Setting/softwareSetting.d.ts
+++ b/src/model/Setting/softwareSetting.d.ts
@@ -39,5 +39,6 @@ declare namespace SoftwareSettingModel {
     space_image: string = undefined // 空白图片
     gpt_key: string = undefined  // GPT KEY,
     laiApiSelect: string = undefined  // LaiAPI选择
+    hdScale: number = 2 // HD缩放
   }
 }
\ No newline at end of file
diff --git a/src/model/book.d.ts b/src/model/book.d.ts
index 43080fe..4fdf4c7 100644
--- a/src/model/book.d.ts
+++ b/src/model/book.d.ts
@@ -13,6 +13,7 @@ declare namespace Book {
     oldVideoPath?: string,
     srtPath?: string,
     audioPath?: string,
+    draftDepend?: string, // 草稿依赖
     imageFolder?: string,
     draftSrtStyle?: string | null // 草稿字幕样式
     backgroundMusic?: string | null // 背景音乐ID
@@ -54,6 +55,7 @@ declare namespace Book {
     generateVideoPath?: string,
     srtPath?: string,
     audioPath?: string,
+    draftDepend?: string,
     draftSrtStyle?: string | null // 草稿字幕样式
     backgroundMusic?: string | null // 背景音乐ID
     friendlyReminder?: string | null // 友情提示
@@ -147,6 +149,7 @@ declare namespace Book {
     bookTaskId?: string
     videoPath?: string  // 视频地址
     audioPath?: string  // 音频地址
+    draftDepend?: string  // 草稿依赖
     word?: string  // 文案
     oldImage?: string  // 旧图片（用于SD的图生图）
     afterGpt?: string  // GPT生成的文案
diff --git a/src/preload/book.ts b/src/preload/book.ts
index 9e35458..d1319bc 100644
--- a/src/preload/book.ts
+++ b/src/preload/book.ts
@@ -239,7 +239,7 @@ const book = {
     await ipcRenderer.invoke(DEFINE_STRING.BOOK.GENERATE_IMAGE_ALL, bookTaskId, imageCategory),
 
   // 高清图片前检查
-  CheckImageFileSize: async (id, fileSize, operateBookType) =>
+  CheckImageFileSize: async (id: string | string[], fileSize: number, operateBookType: OperateBookType) =>
     await ipcRenderer.invoke(
       DEFINE_STRING.BOOK.CHECK_IMAGE_FILE_SIZE,
       id,
@@ -248,7 +248,7 @@ const book = {
     ),
 
   // 高清图片任务
-  HDImage: async (id, scale, operateBookType) =>
+  HDImage: async (id: string | string[], scale: number, operateBookType: OperateBookType) =>
     await ipcRenderer.invoke(DEFINE_STRING.BOOK.HD_IMAGE, id, scale, operateBookType),
 
   // 将小说视频相关的设置添加到小说任务批次
@@ -260,7 +260,7 @@ const book = {
     ),
 
   // 添加数据到剪映草稿
-  AddJianyingDraft: async (id, operateBookType) =>
+  AddJianyingDraft: async (id: string | string[], operateBookType: OperateBookType) =>
     await ipcRenderer.invoke(DEFINE_STRING.BOOK.ADD_JIANYING_DRAFT, id, operateBookType)
 
   //#endregion
diff --git a/src/renderer/src/components/Backstep/oneImageReDrwa.vue b/src/renderer/src/components/Backstep/oneImageReDrwa.vue
index cc68a1b..2e15efd 100644
--- a/src/renderer/src/components/Backstep/oneImageReDrwa.vue
+++ b/src/renderer/src/components/Backstep/oneImageReDrwa.vue
@@ -70,8 +70,8 @@
   <n-data-table :columns="columns" :data="data" :pagination="pagination" :bordered="false" />
 </template>
 
-<script>
-import { defineComponent, ref, onMounted, onUnmounted, h, toRaw } from 'vue'
+<script setup>
+import { ref, onMounted, onUnmounted, h, toRaw } from 'vue'
 import {
   NButton,
   useMessage,
@@ -83,13 +83,12 @@ import {
   useDialog,
   NPopover,
   NTag,
-  NTabPane,
-  NTabs,
   NIcon
 } from 'naive-ui'
 import { DEFINE_STRING } from '../../../../define/define_string'
-import OneKeyMatrix from '../Backstep/OneKeyMatrix.vue'
 import { FolderOpenSharp as FolderOpen } from '@vicons/ionicons5'
+import { useSoftwareStore } from '../../../../stores/software'
+const softwareStore = useSoftwareStore()
 
 const buttonArr = [
   {
@@ -167,215 +166,202 @@ function statusAndMessage(row) {
   }
 }
 
-export default defineComponent({
-  components: {
-    NButton,
-    NDataTable,
-    NInput,
-    NSelect,
-    NForm,
-    NFormItem,
-    NPopover,
-    NTag,
-    NTabPane,
-    NTabs,
-    OneKeyMatrix,
-    NIcon,
-    FolderOpen
-  },
-  setup() {
-    let image_folder = ref('')
-    let message = useMessage()
-    let dialog = useDialog()
-    let data = ref([])
-    let options = ref([])
-    let backgroundMusicOptions = ref([])
-    let friendlyReminderOptions = ref([])
+let message = useMessage()
+let dialog = useDialog()
+let data = ref([])
+let backgroundMusicOptions = ref([])
 
-    let formValue = ref({
-      srt_path: null,
-      audio_path: null,
-      draft_srt_style: '0',
-      background_music: null,
-      friendly_reminder: '0'
-    })
+let formValue = ref({
+  srt_path: null,
+  audio_path: null,
+  draft_srt_style: '0',
+  background_music: null,
+  friendly_reminder: '0'
+})
 
-    /**
-     * 创建行
-     * @param {执行的方法} param0
-     */
-    const createColumns = ({
-      showRegenerateWindow,
-      AddClipDraft,
-      ImproveResolution,
-      GenerateVideo,
-      OpenFolder
-    }) => {
-      return [
-        {
-          title: '文件夹',
-          key: 'folder',
-          width: 200
-        },
-        {
-          title: '操作',
-          key: 'options',
-          width: 600,
-          render(row) {
-            const btn = buttonArr.map((item) => {
-              return h(
-                NButton,
-                {
-                  style: 'margin-right : 10px',
-                  strong: true,
-                  type: 'info',
-                  size: 'medium',
-                  onClick: () => {
-                    if (item.key == 'reDraw') {
-                      showRegenerateWindow(row)
-                    } else if (item.key == 'addClipDraft') {
-                      AddClipDraft(row)
-                    } else if (item.key == 'Improve') {
-                      // 高清
-                      ImproveResolution(row)
-                    } else if (item.key == 'GenerateVideo') {
-                      // 生成视频
-                      GenerateVideo(row)
-                    } else if (item.key == 'OpenFolder') {
-                      // 打开对应的文件夹
-                      OpenFolder(row)
-                    }
-                  }
-                },
-                {
-                  default: () => item.title
+/**
+ * 创建行
+ * @param {执行的方法} param0
+ */
+const createColumns = ({
+  showRegenerateWindow,
+  AddClipDraft,
+  ImproveResolution,
+  GenerateVideo,
+  OpenFolder
+}) => {
+  return [
+    {
+      title: '文件夹',
+      key: 'folder',
+      width: 200
+    },
+    {
+      title: '操作',
+      key: 'options',
+      width: 600,
+      render(row) {
+        const btn = buttonArr.map((item) => {
+          return h(
+            NButton,
+            {
+              style: 'margin-right : 10px',
+              strong: true,
+              type: 'info',
+              size: 'medium',
+              onClick: () => {
+                if (item.key == 'reDraw') {
+                  showRegenerateWindow(row)
+                } else if (item.key == 'addClipDraft') {
+                  AddClipDraft(row)
+                } else if (item.key == 'Improve') {
+                  // 高清
+                  ImproveResolution(row)
+                } else if (item.key == 'GenerateVideo') {
+                  // 生成视频
+                  GenerateVideo(row)
+                } else if (item.key == 'OpenFolder') {
+                  // 打开对应的文件夹
+                  OpenFolder(row)
                 }
-              )
-            })
-            btn.push(
-              h(
-                NButton,
-                {
-                  style: 'margin-right : 10px',
-                  strong: true,
-                  type: 'warning',
-                  size: 'medium',
-                  onClick: async () => {
-                    await StopTask(row)
-                  }
-                },
-                {
-                  default: () => '停止任务'
-                }
-              )
-            )
-            return btn
-          }
-        },
-        {
-          title: '状态',
-          key: 'status',
-          render(row) {
-            return h(
-              NPopover,
-              {
-                trigger: 'hover',
-                disabled: (() => {
-                  if (row.status == 'video_error') {
-                    return false
-                  } else {
-                    return true
-                  }
-                })()
-              },
-              {
-                default: () =>
-                  (() => {
-                    if (row.status == 'wait') {
-                      return 'warning'
-                    } else if (row.status == 'queue') {
-                      return 'info'
-                    } else if (row.status == 'ok') {
-                      return 'success'
-                    } else if (row.status == 'error') {
-                      return row.errorMessage
-                    }
-                  })(),
-                trigger: () =>
-                  h(
-                    NTag,
-                    {
-                      color: (() => statusAndMessage(row))().color
-                    },
-                    {
-                      default: () => statusAndMessage(row).tagLabel
-                    }
-                  )
               }
-            )
-          }
-        }
-      ]
-    }
-
-    /**
-     * 停止当前行的任务
-     */
-    async function StopTask(row) {
-      // 判断当前的状态是不是高清中和生成视频中
-
-      if (row.status == 'video_queue') {
-        await window.api.DeleteBackTask(
-          [DEFINE_STRING.QUEUE_BATCH.AUTO_VIDEO_GENERATE_SINGLE, row.folder, 'default'],
-          async (value) => {
-            if (value.code == 0) {
-              message.error(value.message)
-              return
+            },
+            {
+              default: () => item.title
             }
-            message.success('停止成功')
-            // 修改状态为 高清完成
-            // 修改状态
-            await window.api.ModifyGenerateTaskStatus(
-              ['out_folder', row.folder, 'video_improvied'],
-              (value) => {
-                if (value.code == 0) {
-                  message.error(value.message)
-                  return
-                }
+          )
+        })
+        btn.push(
+          h(
+            NButton,
+            {
+              style: 'margin-right : 10px',
+              strong: true,
+              type: 'warning',
+              size: 'medium',
+              onClick: async () => {
+                await StopTask(row)
               }
-            )
-          }
-        )
-      } else if (row.status == 'video_improving') {
-        await window.api.DeleteBackTask(
-          [DEFINE_STRING.QUEUE_BATCH.LOCAL_IMAGE_IMPROVE, row.folder, 'default'],
-          async (value) => {
-            if (value.code == 0) {
-              message.error(value.message)
-              return
+            },
+            {
+              default: () => '停止任务'
             }
-            message.success('停止成功')
-            // 修改状态
-            await window.api.ModifyGenerateTaskStatus(['out_folder', row.folder, 'ok'], (value) => {
-              if (value.code == 0) {
-                message.error(value.message)
-                return
-              }
-            })
-          }
+          )
+        )
+        return btn
+      }
+    },
+    {
+      title: '状态',
+      key: 'status',
+      render(row) {
+        return h(
+          NPopover,
+          {
+            trigger: 'hover',
+            disabled: (() => {
+              if (row.status == 'video_error') {
+                return false
+              } else {
+                return true
+              }
+            })()
+          },
+          {
+            default: () =>
+              (() => {
+                if (row.status == 'wait') {
+                  return 'warning'
+                } else if (row.status == 'queue') {
+                  return 'info'
+                } else if (row.status == 'ok') {
+                  return 'success'
+                } else if (row.status == 'error') {
+                  return row.errorMessage
+                }
+              })(),
+            trigger: () =>
+              h(
+                NTag,
+                {
+                  color: (() => statusAndMessage(row))().color
+                },
+                {
+                  default: () => statusAndMessage(row).tagLabel
+                }
+              )
+          }
         )
-      } else {
-        message.error('当前状态不是高清中或者生成视频中，无法停止')
       }
-
-      await InitData()
     }
+  ]
+}
 
-    /**
-     * 高清文件夹，只是加入队列
-     * @param {行数据} row
-     */
-    async function ImproveResolution(row) {
+/**
+ * 停止当前行的任务
+ */
+async function StopTask(row) {
+  // 判断当前的状态是不是高清中和生成视频中
+
+  if (row.status == 'video_queue') {
+    await window.api.DeleteBackTask(
+      [DEFINE_STRING.QUEUE_BATCH.AUTO_VIDEO_GENERATE_SINGLE, row.folder, 'default'],
+      async (value) => {
+        if (value.code == 0) {
+          message.error(value.message)
+          return
+        }
+        message.success('停止成功')
+        // 修改状态为 高清完成
+        // 修改状态
+        await window.api.ModifyGenerateTaskStatus(
+          ['out_folder', row.folder, 'video_improvied'],
+          (value) => {
+            if (value.code == 0) {
+              message.error(value.message)
+              return
+            }
+          }
+        )
+      }
+    )
+  } else if (row.status == 'video_improving') {
+    await window.api.DeleteBackTask(
+      [DEFINE_STRING.QUEUE_BATCH.LOCAL_IMAGE_IMPROVE, row.folder, 'default'],
+      async (value) => {
+        if (value.code == 0) {
+          message.error(value.message)
+          return
+        }
+        message.success('停止成功')
+        // 修改状态
+        await window.api.ModifyGenerateTaskStatus(['out_folder', row.folder, 'ok'], (value) => {
+          if (value.code == 0) {
+            message.error(value.message)
+            return
+          }
+        })
+      }
+    )
+  } else {
+    message.error('当前状态不是高清中或者生成视频中，无法停止')
+  }
+
+  await InitData()
+}
+
+/**
+ * 高清文件夹，只是加入队列
+ * @param {行数据} row
+ */
+async function ImproveResolution(row) {
+  let da = dialog.warning({
+    title: '高清确认',
+    content: `确认是不是要高清！当前的高清倍数为 ${softwareStore.globalSetting.hdScale} 倍，是否继续？`,
+    positiveText: '确定',
+    negativeText: '取消',
+    maskClosable: false,
+    onPositiveClick: async () => {
       await window.api.ImproveResolution([row.folder], (value) => {
         if (value.code == 1) {
           message.success('高清任务加入队列成功，请勿关闭软件')
@@ -384,327 +370,310 @@ export default defineComponent({
         }
       })
     }
+  })
+}
 
-    /**
-     * 将生成视频加入到队列中（目前一次最多三个）
-     * @param {行数据} row
-     */
-    async function GenerateVideo(row) {
-      let validateRes = await validateMustProperty()
-      if (!validateRes) {
-        return
-      }
-      await window.api.AutoGenerateVideo([[row.folder], toRaw(formValue.value)], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        message.success(row.folder + '添加到队列成功')
-      })
+/**
+ * 将生成视频加入到队列中（目前一次最多三个）
+ * @param {行数据} row
+ */
+async function GenerateVideo(row) {
+  let validateRes = await validateMustProperty()
+  if (!validateRes) {
+    return
+  }
+  await window.api.AutoGenerateVideo([[row.folder], toRaw(formValue.value)], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
     }
+    message.success(row.folder + '添加到队列成功')
+  })
+}
 
-    /**
-     * 一键生成所有的视频（加入队列中）
-     */
-    async function VideoGenerate() {
-      let validateRes = await validateMustProperty()
-      if (!validateRes) {
-        return
-      }
-      let f = []
-      for (let i = 0; i < data.value.length; i++) {
-        const item = data.value[i]
-        f.push(item.folder)
-      }
+/**
+ * 一键生成所有的视频（加入队列中）
+ */
+async function VideoGenerate() {
+  let validateRes = await validateMustProperty()
+  if (!validateRes) {
+    return
+  }
+  let f = []
+  for (let i = 0; i < data.value.length; i++) {
+    const item = data.value[i]
+    f.push(item.folder)
+  }
 
-      // await GenerateVideo(toRaw(item));
-      await window.api.AutoGenerateVideo([[...f], toRaw(formValue.value)], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        message.success('所有任务添加到队列成功')
-      })
+  // await GenerateVideo(toRaw(item));
+  await window.api.AutoGenerateVideo([[...f], toRaw(formValue.value)], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
     }
+    message.success('所有任务添加到队列成功')
+  })
+}
 
-    function OpenFolder(row) {
-      window.system.OpenFolder({
-        folderPath: 'tmp/' + row.folder,
-        baseProject: true
-      })
-    }
+function OpenFolder(row) {
+  window.system.OpenFolder({
+    folderPath: 'tmp/' + row.folder,
+    baseProject: true
+  })
+}
 
-    /**
-     * 高清所有文件夹，将所有需要高清的全部加入队列中
-     */
-    async function HdAllImages() {
-      dialog.warning({
-        title: '确认是不是要全部高清',
-        content: '确认是不是全部高清！分辨率太高，电脑会卡到爆的哦',
-        positiveText: '确定',
-        negativeText: '取消',
-        maskClosable: false,
-        onPositiveClick: async () => {
-          let arr = []
-          for (let item of data.value) {
-            arr.push(item.folder) // 这里应该可以正常访问和操作每个元素
-          }
+/**
+ * 高清所有文件夹，将所有需要高清的全部加入队列中
+ */
+async function HdAllImages() {
+  dialog.warning({
+    title: '确认是不是要全部高清',
+    content: `确认是不是全部高清！当前的高清倍数为 ${softwareStore.globalSetting.hdScale} 倍，是否继续？`,
+    positiveText: '确定',
+    negativeText: '取消',
+    maskClosable: false,
+    onPositiveClick: async () => {
+      let arr = []
+      for (let item of data.value) {
+        arr.push(item.folder) // 这里应该可以正常访问和操作每个元素
+      }
 
-          // 一次高清五个
-          await window.api.ImproveResolution(arr, (value) => {
-            console.log(value)
-            if (value.code == 1) {
-              message.success('所有的高清任务加入队列成功，请勿关闭软件')
-            } else {
-              message.error(`Error Message ${value.message}`)
-            }
-          })
-        }
-      })
-    }
-
-    /**
-     * 打开新的窗口
-     * @param {行数据} row
-     */
-    async function showRegenerateWindow(row) {
-      window.api.showNewWindow(['ReDrawImage', window.config.project_path + '/tmp/' + row.folder])
-    }
-
-    /**
-     * 验证当前表单的必填项
-     */
-    async function validateMustProperty(isBackgroundMusic = true) {
-      let validateData = toRaw(formValue.value)
-      if (validateData.srt_path == null || validateData.srt_path == '') {
-        message.error('SRT地址必填')
-        return false
-      }
-      if (validateData.audio_path == null || validateData.audio_path == '') {
-        message.error('配音地址必填')
-        return false
-      }
-      if (validateData.draft_srt_style == null || validateData.draft_srt_style == '') {
-        message.error('草稿样式必选')
-        return false
-      }
-      if (isBackgroundMusic) {
-        if (validateData.background_music == null || validateData.background_music == '') {
-          message.error('背景音乐必填')
-          return false
-        }
-      }
-      if (validateData.friendly_reminder == null || validateData.friendly_reminder == '') {
-        message.error('友情提示必填')
-        return false
-      }
-      return true
-    }
-
-    /**
-     * 生成剪映草稿
-     * @param {行数据} row
-     */
-    async function AddClipDraft(row) {
-      let validateRes = await validateMustProperty(false)
-      if (!validateRes) {
-        return
-      }
-      await window.api.addDraft([row.folder, toRaw(formValue.value)], (value) => {
+      // 一次高清五个
+      await window.api.ImproveResolution(arr, (value) => {
         console.log(value)
-        if (value.code == 0) {
-          message.error(value.message)
-          return
+        if (value.code == 1) {
+          message.success('所有的高清任务加入队列成功，请勿关闭软件')
         } else {
-          message.success(`添加成功，草稿名字：${value.draft_name}`)
+          message.error(`Error Message ${value.message}`)
         }
       })
     }
+  })
+}
 
-    /**
-     * 一键保存所有的草稿
-     */
-    async function ExportAllDraft() {
-      let validateRes = await validateMustProperty(false)
-      if (!validateRes) {
-        return
-      }
-      for (let i = 0; i < data.value.length; i++) {
-        const element = data.value[i]
-        await window.api.addDraft([element.folder, toRaw(formValue.value)], (value) => {
-          if (value.code == 0) {
-            message.error(value.message)
-            return
-          } else {
-            message.success(`添加成功，草稿名字：${value.draft_name}`)
-          }
-        })
-      }
-    }
+/**
+ * 打开新的窗口
+ * @param {行数据} row
+ */
+async function showRegenerateWindow(row) {
+  window.api.showNewWindow(['ReDrawImage', window.config.project_path + '/tmp/' + row.folder])
+}
 
-    /**
-     * 选择对应的字幕文件
-     */
-    async function SelectSrtFile() {
-      window.api.SelectFile(['srt'], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        formValue.value.srt_path = value.value
-      })
-    }
-
-    /**
-     * 选择对应的字幕文件
-     */
-    async function SelectMusicFile() {
-      window.api.SelectFile(['mp3', 'wav'], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        formValue.value.audio_path = value.value
-      })
-    }
-
-    async function InitData() {
-      // 获取对应的输出文件
-      await window.api.getSubFolderList(['start', 'output_crop'], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        data.value = value.data
-      })
-    }
-
-    onMounted(async () => {
-      // 获取对应的输出文件
-      await InitData()
-
-      // // 初始化获取字体样式
-      // await window.api.getTextStyleList((value) => {
-      //     if (value.code == 0) {
-      //         message.error(value.message);
-      //         return;
-      //     }
-      //     for (let i = 0; i < value.value.length; i++) {
-      //         const item = value.value[i];
-      //         let obj = {
-      //             label: item.name,
-      //             value: item.id,
-      //         }
-      //         options.value.push(obj);
-      //     }
-      //     // 设置默认选项
-      //     if (options.value.length > 0) {
-      //         formValue.value.draft_srt_style = options.value.filter(item => item.value == "1")[0].value;
-      //     }
-      // })
-
-      // 获取初始化的背景音乐列表
-      await window.api.GetBackgroundMusicConfigList((value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        for (let i = 0; i < value.value.length; i++) {
-          const element = value.value[i]
-          let obj = {
-            label: element.name,
-            value: element.id
-          }
-          backgroundMusicOptions.value.push(obj)
-        }
-      })
-
-      // 获取温馨提示列表
-      // await window.api.getFriendlyReminderList((value) => {
-      //     if (value.code == 0) {
-      //         message.error(value.message);
-      //         return;
-      //     }
-      //     value.value.forEach(item => {
-      //         let obj = {
-      //             label: item.name,
-      //             value: item.id
-      //         };
-      //         friendlyReminderOptions.value.push(obj);
-      //     });
-      //     // 设置默认选项
-      //     if (friendlyReminderOptions.value.length > 0) {
-      //         formValue.value.friendly_reminder = friendlyReminderOptions.value.filter(item => item.value == "1")[0].value;
-      //     }
-      // })
-
-      // 监听状态更新事件
-      window.api.setEventListen([DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH], (value) => {
-        console.log(value)
-        // 修改当前状态
-        let index = data.value.findIndex((item) => item.folder == value.out_folder)
-        if (index < 0) {
-          message.error('数据错误')
-          return
-        }
-        // 获取指定的数据进行状态更新
-        data.value[index].status = value.status
-      })
-
-      // 获取设置的配置
-      // 获取上一次选择的字幕，配音。未年检
-      await window.api.GetVideoGenerateConfig((value) => {
-        if (value.code == 0) {
-          message.error('获取初始化数据失败')
-          return
-        }
-        formValue.value.srt_path = value.data.srt_path
-        formValue.value.audio_path = value.data.audio_path
-        formValue.value.background_music = value.data.background_music
-      })
-    })
-
-    onUnmounted(() => {
-      window.api.removeEventListen(DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH)
-    })
-
-    /**
-     * 保存视频的基础信息
-     */
-    async function SaveVideoSrtAndAudioMessage() {
-      await window.api.SaveVideoSrtAndAudioMessage(
-        JSON.stringify(toRaw(formValue.value)),
-        (value) => {
-          if (value.code == 0) {
-            message.error(value.message)
-            return
-          }
-          message.success('保存成功')
-        }
-      )
-    }
-
-    return {
-      image_folder,
-      columns: createColumns({
-        showRegenerateWindow,
-        AddClipDraft,
-        ImproveResolution,
-        GenerateVideo,
-        OpenFolder
-      }),
-      data,
-      options,
-      backgroundMusicOptions,
-      friendlyReminderOptions,
-      formValue,
-      SelectSrtFile,
-      SelectMusicFile,
-      HdAllImages,
-      ExportAllDraft,
-      VideoGenerate,
-      SaveVideoSrtAndAudioMessage
+/**
+ * 验证当前表单的必填项
+ */
+async function validateMustProperty(isBackgroundMusic = true) {
+  let validateData = toRaw(formValue.value)
+  if (validateData.srt_path == null || validateData.srt_path == '') {
+    message.error('SRT地址必填')
+    return false
+  }
+  if (validateData.audio_path == null || validateData.audio_path == '') {
+    message.error('配音地址必填')
+    return false
+  }
+  if (validateData.draft_srt_style == null || validateData.draft_srt_style == '') {
+    message.error('草稿样式必选')
+    return false
+  }
+  if (isBackgroundMusic) {
+    if (validateData.background_music == null || validateData.background_music == '') {
+      message.error('背景音乐必填')
+      return false
     }
   }
+  if (validateData.friendly_reminder == null || validateData.friendly_reminder == '') {
+    message.error('友情提示必填')
+    return false
+  }
+  return true
+}
+
+/**
+ * 生成剪映草稿
+ * @param {行数据} row
+ */
+async function AddClipDraft(row) {
+  let validateRes = await validateMustProperty(false)
+  if (!validateRes) {
+    return
+  }
+  await window.api.addDraft([row.folder, toRaw(formValue.value)], (value) => {
+    console.log(value)
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    } else {
+      message.success(`添加成功，草稿名字：${value.draft_name}`)
+    }
+  })
+}
+
+/**
+ * 一键保存所有的草稿
+ */
+async function ExportAllDraft() {
+  let validateRes = await validateMustProperty(false)
+  if (!validateRes) {
+    return
+  }
+  for (let i = 0; i < data.value.length; i++) {
+    const element = data.value[i]
+    await window.api.addDraft([element.folder, toRaw(formValue.value)], (value) => {
+      if (value.code == 0) {
+        message.error(value.message)
+        return
+      } else {
+        message.success(`添加成功，草稿名字：${value.draft_name}`)
+      }
+    })
+  }
+}
+
+/**
+ * 选择对应的字幕文件
+ */
+async function SelectSrtFile() {
+  window.api.SelectFile(['srt'], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    }
+    formValue.value.srt_path = value.value
+  })
+}
+
+/**
+ * 选择对应的字幕文件
+ */
+async function SelectMusicFile() {
+  window.api.SelectFile(['mp3', 'wav'], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    }
+    formValue.value.audio_path = value.value
+  })
+}
+
+async function InitData() {
+  // 获取对应的输出文件
+  await window.api.getSubFolderList(['start', 'output_crop'], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    }
+    data.value = value.data
+  })
+}
+
+onMounted(async () => {
+  // 获取对应的输出文件
+  await InitData()
+
+  // // 初始化获取字体样式
+  // await window.api.getTextStyleList((value) => {
+  //     if (value.code == 0) {
+  //         message.error(value.message);
+  //         return;
+  //     }
+  //     for (let i = 0; i < value.value.length; i++) {
+  //         const item = value.value[i];
+  //         let obj = {
+  //             label: item.name,
+  //             value: item.id,
+  //         }
+  //         options.value.push(obj);
+  //     }
+  //     // 设置默认选项
+  //     if (options.value.length > 0) {
+  //         formValue.value.draft_srt_style = options.value.filter(item => item.value == "1")[0].value;
+  //     }
+  // })
+
+  // 获取初始化的背景音乐列表
+  await window.api.GetBackgroundMusicConfigList((value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    }
+    for (let i = 0; i < value.value.length; i++) {
+      const element = value.value[i]
+      let obj = {
+        label: element.name,
+        value: element.id
+      }
+      backgroundMusicOptions.value.push(obj)
+    }
+  })
+
+  // 获取温馨提示列表
+  // await window.api.getFriendlyReminderList((value) => {
+  //     if (value.code == 0) {
+  //         message.error(value.message);
+  //         return;
+  //     }
+  //     value.value.forEach(item => {
+  //         let obj = {
+  //             label: item.name,
+  //             value: item.id
+  //         };
+  //         friendlyReminderOptions.value.push(obj);
+  //     });
+  //     // 设置默认选项
+  //     if (friendlyReminderOptions.value.length > 0) {
+  //         formValue.value.friendly_reminder = friendlyReminderOptions.value.filter(item => item.value == "1")[0].value;
+  //     }
+  // })
+
+  // 监听状态更新事件
+  window.api.setEventListen([DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH], (value) => {
+    console.log(value)
+    // 修改当前状态
+    let index = data.value.findIndex((item) => item.folder == value.out_folder)
+    if (index < 0) {
+      message.error('数据错误')
+      return
+    }
+    // 获取指定的数据进行状态更新
+    data.value[index].status = value.status
+  })
+
+  // 获取设置的配置
+  // 获取上一次选择的字幕，配音。未年检
+  await window.api.GetVideoGenerateConfig((value) => {
+    if (value.code == 0) {
+      message.error('获取初始化数据失败')
+      return
+    }
+    formValue.value.srt_path = value.data.srt_path
+    formValue.value.audio_path = value.data.audio_path
+    formValue.value.background_music = value.data.background_music
+  })
+})
+
+onUnmounted(() => {
+  window.api.removeEventListen(DEFINE_STRING.VIDEO_GENERATE_STATUS_REFRESH)
+})
+
+/**
+ * 保存视频的基础信息
+ */
+async function SaveVideoSrtAndAudioMessage() {
+  await window.api.SaveVideoSrtAndAudioMessage(JSON.stringify(toRaw(formValue.value)), (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    }
+    message.success('保存成功')
+  })
+}
+
+let columns = createColumns({
+  showRegenerateWindow,
+  AddClipDraft,
+  ImproveResolution,
+  GenerateVideo,
+  OpenFolder
 })
 </script>
diff --git a/src/renderer/src/components/Book/Components/ManageBook/BookTaskListAction.vue b/src/renderer/src/components/Book/Components/ManageBook/BookTaskListAction.vue
index c2e776d..a0d6352 100644
--- a/src/renderer/src/components/Book/Components/ManageBook/BookTaskListAction.vue
+++ b/src/renderer/src/components/Book/Components/ManageBook/BookTaskListAction.vue
@@ -48,7 +48,6 @@ export default defineComponent({
 
   props: ['bookTask'],
   setup(props) {
-    
     let message = useMessage()
     let dialog = useDialog()
     let bookTask = ref(props.bookTask)
@@ -63,7 +62,6 @@ export default defineComponent({
      * @param e
      */
     async function ReSetBookTaskDetail(e) {
-      
       e.stopPropagation()
       dialog.warning({
         title: '重置小说任务',
@@ -115,15 +113,28 @@ export default defineComponent({
     }
 
     async function hdImageFunc(id, operateBookType) {
-      softwareStore.spin.spinning = true
-      softwareStore.spin.tip = '正在高清中。。。'
-      let res = await window.book.HDImage(id, 4, operateBookType)
-      softwareStore.spin.spinning = false
-      if (res.code == 1) {
-        message.success('高清成功')
-      } else {
-        message.error(res.message)
-      }
+      let da = dialog.warning({
+        title: '高清提示',
+        content: `是否确认高清，当前的高清倍数为 ${softwareStore.globalSetting.hdScale} 倍，是否继续？`,
+        positiveText: '继续',
+        negativeText: '取消',
+        onPositiveClick: async () => {
+          da.destroy()
+          softwareStore.spin.spinning = true
+          softwareStore.spin.tip = '正在高清中。。。'
+          let res = await window.book.HDImage(
+            id,
+            softwareStore.globalSetting.hdScale ?? 2,
+            operateBookType
+          )
+          softwareStore.spin.spinning = false
+          if (res.code == 1) {
+            message.success('高清成功')
+          } else {
+            message.error(res.message)
+          }
+        }
+      })
     }
 
     /**
@@ -171,10 +182,10 @@ export default defineComponent({
      */
     async function ClipDraft(e) {
       e.stopPropagation()
-      
+
       dialog.info({
         closeOnEsc: false,
-        title: '生成草稿前检查',
+        title: `生成草稿前检查 ${bookTask.value.name}`,
         maskClosable: false,
         content: () =>
           h(ManageBookTaskGenerateInformation, { bookTask: bookTask.value, type: 'bookTask' })
diff --git a/src/renderer/src/components/Book/Components/ManageBook/ManageBookTaskGenerateInformation.vue b/src/renderer/src/components/Book/Components/ManageBook/ManageBookTaskGenerateInformation.vue
index 1bdf1b3..7692175 100644
--- a/src/renderer/src/components/Book/Components/ManageBook/ManageBookTaskGenerateInformation.vue
+++ b/src/renderer/src/components/Book/Components/ManageBook/ManageBookTaskGenerateInformation.vue
@@ -46,15 +46,30 @@
         clearable
       />
     </n-form-item>
+    <n-form-item label="选择剪映草稿" path="backgroundMusic">
+      <div>
+        <div style="color: red">
+          注意：选择的草稿主轨道的图片数量要和当前的相同，会生成新的草稿并且只会替换图片，保留其余的数据
+        </div>
+        <n-select
+          style="width: 300px"
+          v-model:value="bookTask.draftDepend"
+          filterable
+          placeholder="选择样式"
+          :options="draftSelect"
+          clearable
+        />
+      </div>
+    </n-form-item>
     <n-form-item path="backgroundMusic">
-      <n-button :disabled="type == 'book'" type="info" @click="UseBookVideoDataToBookTask">{{
-        type == bookTask ? '应用主小说相关数据' : '当前就是用的主小说的数据'
-      }}</n-button>
+      <n-button :disabled="type == 'book'" type="info" @click="UseBookVideoDataToBookTask"
+        >应用主小说相关数据</n-button
+      >
       <n-button type="info" style="margin-left: 10px" @click="SaveVideoData">保存数据</n-button>
     </n-form-item>
     <div v-if="type == 'bookTask'" style="color: red">注意：在生成草稿前要先保存数据</div>
     <div v-else style="color: red">
-      注意：在生成草稿前要先保存数据，当前会生成全部的草稿，全部会使用上面的参数
+      注意：在生成草稿前要先保存数据，当前会生成选择的草稿，全部会使用上面的参数
     </div>
     <n-form-item style="display: flex; justify-content: flex-end">
       <n-button type="info" style="margin-left: 10px" @click="AddJianyingDraft">生成草稿</n-button>
@@ -62,136 +77,166 @@
   </n-form>
 </template>
 
-<script>
-import { ref, onMounted, defineComponent, onUnmounted, toRaw, watch } from 'vue'
+<script setup>
+import { ref, onMounted } from 'vue'
 import { useMessage, NForm, NFormItem, NButton, NIcon, NInput, NSelect } from 'naive-ui'
 import { FolderOpen } from '@vicons/ionicons5'
 import { OperateBookType } from '../../../../../../define/enum/bookEnum'
+import { useReverseManageStore } from '../../../../../../stores/reverseManage'
 
-export default defineComponent({
-  components: { NForm, NFormItem, NButton, NIcon, NInput, NSelect, FolderOpen },
-  props: ['bookTask', 'type'],
-  setup(props) {
-    let bookTask = ref(props.bookTask)
-    
-    let type = ref(props.type)
-    let backgroundMusicOptions = ref([])
-    let message = useMessage()
-    onMounted(async () => {
-      // 获取初始化的背景音乐列表
-      await window.api.GetBackgroundMusicConfigList((value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        for (let i = 0; i < value.value.length; i++) {
-          const element = value.value[i]
-          let obj = {
-            label: element.name,
-            value: element.id
-          }
-          backgroundMusicOptions.value.push(obj)
-        }
-      })
+let props = defineProps({
+  bookTask: undefined,
+  type: undefined,
+  selectBookTask: []
+})
+
+let bookTask = ref(props.bookTask)
+let type = ref(props.type)
+
+let backgroundMusicOptions = ref([])
+let message = useMessage()
+let draftSelect = ref([])
+let reverseManageStore = useReverseManageStore()
+
+onMounted(async () => {
+  // 获取草稿文件列表
+  window.api.getDraftFileList((value) => {
+    value.forEach((element) => {
+      let obj = {
+        label: element,
+        value: element
+      }
+      draftSelect.value.push(obj)
     })
-
-    /**
-     * 选择对应的字幕文件
-     */
-    async function SelectSrtFile() {
-      window.api.SelectFile(['srt'], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        bookTask.value.srtPath = value.value
-      })
+  })
+  // 获取初始化的背景音乐列表
+  await window.api.GetBackgroundMusicConfigList((value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
     }
-
-    /**
-     * 选择对应的配音文件
-     */
-    async function SelectMusicFile() {
-      window.api.SelectFile(['mp3', 'wav'], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        bookTask.value.audioPath = value.value
-      })
-    }
-
-    /**
-     * 应用主小说相关数据
-     */
-    async function UseBookVideoDataToBookTask() {
-      if (type.value == 'book') {
-        message.error('当前状态这个按钮不可用')
-        return
-      }
-      let res = await window.book.UseBookVideoDataToBookTask(
-        bookTask.value.id,
-        OperateBookType.BOOKTASK
-      )
-      
-      if (res.code == 0) {
-        message.error(res.message)
-      } else {
-        // 将数据写回去
-        bookTask.value.backgroundMusic = res.data.backgroundMusic
-        bookTask.value.friendlyReminder = res.data.friendlyReminder
-        bookTask.value.draftSrtStyle = res.data.draftSrtStyle
-        bookTask.value.srtPath = res.data.srtPath
-        bookTask.value.audioPath = res.data.audioPath
-
-        message.success('应用主小说相关数据成功')
+    for (let i = 0; i < value.value.length; i++) {
+      const element = value.value[i]
+      let obj = {
+        label: element.name,
+        value: element.id
       }
+      backgroundMusicOptions.value.push(obj)
     }
+  })
+})
 
-    /**
-     * 保存数据
-     */
-    async function SaveVideoData() {
-      let res = await window.db.UpdateBookTaskData(bookTask.value.id, {
-        srtPath: bookTask.value.srtPath,
-        audioPath: bookTask.value.audioPath,
-        backgroundMusic: bookTask.value.backgroundMusic,
-        friendlyReminder: bookTask.value.friendlyReminder,
-        draftSrtStyle: bookTask.value.draftSrtStyle
-      })
-      if (res.code == 0) {
-        message.error('保存小说批次数据失败')
-      } else {
-        message.success('保存小说批次数据成功')
-      }
+/**
+ * 选择对应的字幕文件
+ */
+async function SelectSrtFile() {
+  window.api.SelectFile(['srt'], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
     }
+    bookTask.value.srtPath = value.value
+  })
+}
 
-    /**
-     * 添加草稿
-     */
-    async function AddJianyingDraft() {
-      let res = await window.book.AddJianyingDraft(bookTask.value.id, OperateBookType.BOOKTASK)
-      window.api.showGlobalMessageDialog(res)
+/**
+ * 选择对应的配音文件
+ */
+async function SelectMusicFile() {
+  window.api.SelectFile(['mp3', 'wav'], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
     }
+    bookTask.value.audioPath = value.value
+  })
+}
 
-    return {
-      bookTask,
-      type,
-      AddJianyingDraft,
-      SelectSrtFile,
-      SelectMusicFile,
-      SaveVideoData,
-      UseBookVideoDataToBookTask,
-      backgroundMusicOptions,
-      rules: {
-        srtPath: [
-          { required: true, message: '请选择背景音乐', trigger: ['input', 'blur', 'change'] }
-        ],
-        audioPath: [
-          { required: true, message: '请选择音频文件', trigger: ['input', 'blur', 'change'] }
-        ]
-      }
-    }
+/**
+ * 应用主小说相关数据
+ */
+async function UseBookVideoDataToBookTask() {
+  if (type.value == 'book') {
+    message.error('当前状态这个按钮不可用')
+    return
   }
+  let res = await window.book.UseBookVideoDataToBookTask(
+    bookTask.value.id,
+    OperateBookType.BOOKTASK
+  )
+
+  if (res.code == 0) {
+    message.error(res.message)
+  } else {
+    // 将数据写回去
+    bookTask.value.backgroundMusic = res.data.backgroundMusic
+    bookTask.value.friendlyReminder = res.data.friendlyReminder
+    bookTask.value.draftSrtStyle = res.data.draftSrtStyle
+    bookTask.value.srtPath = res.data.srtPath
+    bookTask.value.audioPath = res.data.audioPath
+
+    message.success('应用主小说相关数据成功')
+  }
+}
+
+/**
+ * 保存数据
+ */
+async function SaveVideoData() {
+  console.log('SaveVideoData', bookTask.value)
+  if (props.type == 'book') {
+    let res = await window.db.UpdateBookData(bookTask.value.id, {
+      srtPath: bookTask.value.srtPath,
+      audioPath: bookTask.value.audioPath,
+      backgroundMusic: bookTask.value.backgroundMusic,
+      friendlyReminder: bookTask.value.friendlyReminder,
+      draftSrtStyle: bookTask.value.draftSrtStyle,
+      draftDepend: bookTask.value.draftDepend
+    })
+    if (res.code == 0) {
+      message.error(res.message)
+    } else {
+      message.success('保存小说数据成功')
+    }
+  } else if (props.type == 'bookTask') {
+    let res = await window.db.UpdateBookTaskData(bookTask.value.id, {
+      srtPath: bookTask.value.srtPath,
+      audioPath: bookTask.value.audioPath,
+      backgroundMusic: bookTask.value.backgroundMusic,
+      friendlyReminder: bookTask.value.friendlyReminder,
+      draftSrtStyle: bookTask.value.draftSrtStyle,
+      draftDepend: bookTask.value.draftDepend
+    })
+    if (res.code == 0) {
+      message.error(res.message)
+    } else {
+      message.success('保存小说批次数据成功')
+    }
+  } else {
+    message.error('未知的操作类型，请检查')
+  }
+}
+
+/**
+ * 添加草稿
+ */
+async function AddJianyingDraft() {
+  if (props.type == 'book') {
+    let res = await window.book.AddJianyingDraft(
+      props.selectBookTask,
+      OperateBookType.ASSIGNBOOKTASK
+    )
+    window.api.showGlobalMessageDialog(res)
+  } else if (props.type == 'bookTask') {
+    let res = await window.book.AddJianyingDraft(bookTask.value.id, OperateBookType.BOOKTASK)
+    window.api.showGlobalMessageDialog(res)
+  } else {
+    message.error('未知的操作类型，请检查')
+    return
+  }
+}
+let rules = ref({
+  srtPath: [{ required: true, message: '请选择背景音乐', trigger: ['input', 'blur', 'change'] }],
+  audioPath: [{ required: true, message: '请选择音频文件', trigger: ['input', 'blur', 'change'] }]
 })
 </script>
diff --git a/src/renderer/src/components/Book/ManageBookTask.vue b/src/renderer/src/components/Book/ManageBookTask.vue
index 693208f..050255b 100644
--- a/src/renderer/src/components/Book/ManageBookTask.vue
+++ b/src/renderer/src/components/Book/ManageBookTask.vue
@@ -1,21 +1,21 @@
 <template>
   <div style="margin-bottom: 5px; margin-left: 5px; display: flex; align-items: center">
-    <n-button :render-icon="renderIcon" size="small" type="info" @click="AddBookDialog"
+    <n-button :render-icon="renderIcon" size="small" type="info" @click="AddBookDialog()"
       >新增</n-button
     >
-    <n-button style="margin-left: 5px" size="small" type="info" @click="HDImageAll"
+    <n-button style="margin-left: 5px" size="small" type="info" @click="HDImageAll()"
       >一键高清</n-button
     >
-    <n-button style="margin-left: 5px" type="info" size="small" @click="DraftAll"
+    <n-button style="margin-left: 5px" type="info" size="small" @click="DraftAll()"
       >一键草稿</n-button
     >
-    <n-button style="margin-left: 5px" type="info" size="small" @click="VideoAll"
+    <n-button style="margin-left: 5px" type="info" size="small" @click="VideoAll()"
       >一键视频</n-button
     >
-    <n-button style="margin-left: 5px" type="info" size="small" @click="ResetAll"
+    <n-button style="margin-left: 5px" type="info" size="small" @click="ResetAll()"
       >一键重置</n-button
     >
-    <n-button style="margin-left: 5px" type="info" size="small" @click="DeleteAll"
+    <n-button style="margin-left: 5px" type="info" size="small" @click="DeleteAll()"
       >一键删除</n-button
     >
   </div>
@@ -26,11 +26,13 @@
       :data="reverseManageStore.bookTaskData"
       :scroll-x="800"
       :row-props="rowProps"
+      :row-key="rowKey"
+      @update:checked-row-keys="handleCheck"
     />
   </div>
 </template>
 
-<script>
+<script setup>
 import { ref, onMounted, defineComponent, onUnmounted, toRaw, watch, h } from 'vue'
 import { useMessage, useDialog, NButton, NDataTable, NIcon, NWatermark } from 'naive-ui'
 import { useReverseManageStore } from '../../../../stores/reverseManage'
@@ -42,198 +44,208 @@ import { OperateBookType } from '../../../../define/enum/bookEnum'
 import { DEFINE_STRING } from '../../../../define/define_string'
 import { ResponseMessageType } from '../../../../define/enum/softwareEnum'
 import AddBookTask from './Components/ManageBook/AddBookTask.vue'
+import ManageBookTaskGenerateInformation from './Components/ManageBook/ManageBookTaskGenerateInformation.vue'
 
-export default defineComponent({
-  components: {
-    NButton,
-    NDataTable,
-    BookTaskListAction,
-    NWatermark
-  },
+let reverseManageStore = useReverseManageStore()
+let softwareStore = useSoftwareStore()
+let dialog = useDialog()
+const router = useRouter()
+let message = useMessage()
+let columns = createColumns()
+const checkedRowKeysRef = ref([])
+onMounted(async () => {
+  window.api.setEventListen([DEFINE_STRING.BOOK.MAIN_DATA_RETURN], (value) => {
+    if (value.code == 0) {
+      message.error(value.message)
+      return
+    }
+    if (value.type == ResponseMessageType.HD_IMAGE) {
+      softwareStore.spin.tip = `正在高清中 ${value.data.current} / ${value.data.total}`
+    }
+  })
+})
 
-  setup() {
-    let reverseManageStore = useReverseManageStore()
-    let softwareStore = useSoftwareStore()
-    let dialog = useDialog()
-    const router = useRouter()
-    let message = useMessage()
-    onMounted(async () => {
-      window.api.setEventListen([DEFINE_STRING.BOOK.MAIN_DATA_RETURN], (value) => {
-        if (value.code == 0) {
-          message.error(value.message)
-          return
-        }
-        if (value.type == ResponseMessageType.HD_IMAGE) {
-          softwareStore.spin.tip = `正在高清中 ${value.data.current} / ${value.data.total}`
-        }
-      })
+onUnmounted(() => {
+  window.api.removeEventListen([DEFINE_STRING.BOOK.MAIN_DATA_RETURN])
+})
+
+function rowKey(row) {
+  return row.id
+}
+
+function handleCheck(rowKeys) {
+  checkedRowKeysRef.value = rowKeys
+}
+
+function createColumns() {
+  return [
+    {
+      type: 'selection'
+    },
+    {
+      title: 'No.',
+      key: 'no',
+      width: 80
+    },
+    {
+      title: '名称',
+      key: 'name',
+      width: 130
+    },
+    {
+      title: '风格',
+      key: 'styleList'
+    },
+    {
+      title: '前缀',
+      key: 'prefix',
+      width: 130
+    },
+    {
+      title: '状态',
+      key: 'status',
+      width: 100
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 215,
+      fixed: 'right',
+      render(row, index) {
+        return h(BookTaskListAction, {
+          bookTask: row
+        })
+      }
+    }
+  ]
+}
+
+/**
+ * 高清数据
+ */
+async function hdImageFunc(id, operateBookType) {
+  softwareStore.spin.spinning = true
+  softwareStore.spin.tip = '正在高清中。。。'
+  let res = await window.book.HDImage(id, 4, operateBookType)
+  softwareStore.spin.spinning = false
+  if (res.code == 1) {
+    message.success('高清成功')
+  } else {
+    message.error(res.message)
+  }
+}
+
+/**
+ * 一键高清全部
+ */
+async function HDImageAll() {
+  console.log('一键高清', checkedRowKeysRef.value)
+  if (checkedRowKeysRef.value.length == 0) {
+    message.error('请选择要高清的数据')
+    return
+  }
+  softwareStore.spin.spinning = true
+  softwareStore.spin.tip = '正在进行高清检查。。。'
+  let checkImage = await window.book.CheckImageFileSize(
+    [...checkedRowKeysRef.value],
+    10240,
+    OperateBookType.ASSIGNBOOKTASK
+  )
+  softwareStore.spin.spinning = false
+  if (checkImage.code == 0) {
+    message.error(checkImage.message)
+    return
+  }
+  // 高清检查完成
+  if (checkImage.data && checkImage.data.length > 0) {
+    // 出现了图片大的，用户判断是不是需要高清
+    let msg = checkImage.data.map((item, index) => {
+      return item.outImagePath + '\n'
     })
-
-    onUnmounted(() => {
-      window.api.removeEventListen([DEFINE_STRING.BOOK.MAIN_DATA_RETURN])
+    dialog.warning({
+      title: '高清警告',
+      content: '下面的图片大于10MB，是否继续高清？' + '\n' + msg,
+      positiveText: '确定',
+      negativeText: '取消',
+      onPositiveClick: async () => {
+        alert('确认高清')
+        await hdImageFunc([...checkedRowKeysRef.value], OperateBookType.ASSIGNBOOKTASK)
+      }
     })
+  } else {
+    // 没有就直接高清
+    await hdImageFunc([...checkedRowKeysRef.value], OperateBookType.ASSIGNBOOKTASK)
+  }
+}
 
-    function createColumns() {
-      return [
-        {
-          title: 'No.',
-          key: 'no',
-          width: 80
-        },
-        {
-          title: '名称',
-          key: 'name',
-          width: 130
-        },
-        {
-          title: '风格',
-          key: 'styleList'
-        },
-        {
-          title: '前缀',
-          key: 'prefix',
-          width: 130
-        },
-        {
-          title: '状态',
-          key: 'status',
-          width: 100
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: 215,
-          fixed: 'right',
-          render(row, index) {
-            
-            return h(BookTaskListAction, {
-              bookTask: row
-            })
-          }
-        }
-      ]
-    }
+async function AddBookDialog() {
+  message.info('新增' + reverseManageStore.selectBook.id)
+  dialog.create({
+    title: '新增小说批次任务',
+    showIcon: false,
+    content: () => h(AddBookTask),
+    style: { width: '600px' }
+  })
+}
 
-    /**
-     * 高清数据
-     */
-    async function hdImageFunc(id, operateBookType) {
-      softwareStore.spin.spinning = true
-      softwareStore.spin.tip = '正在高清中。。。'
-      let res = await window.book.HDImage(id, 4, operateBookType)
-      softwareStore.spin.spinning = false
-      if (res.code == 1) {
-        message.success('高清成功')
-      } else {
-        message.error(res.message)
-      }
-    }
-
-    /**
-     * 一键高清全部
-     */
-    async function HDImageAll() {
-      alert('高清全部')
-      softwareStore.spin.spinning = true
-      softwareStore.spin.tip = '正在进行高清检查。。。'
-      let checkImage = await window.book.CheckImageFileSize(
-        reverseManageStore.selectBook.id,
-        10240,
-        OperateBookType.BOOK
-      )
-      softwareStore.spin.spinning = false
-      if (checkImage.code == 0) {
-        message.error(checkImage.message)
-        return
-      }
-      // 高清检查完成
-      if (checkImage.data && checkImage.data.length > 0) {
-        // 出现了图片大的，用户判断是不是需要高清
-        let msg = checkImage.data.map((item, index) => {
-          return item.outImagePath + '\n'
-        })
-        dialog.warning({
-          title: '高清警告',
-          content: '下面的图片大于10MB，是否继续高清？' + '\n' + msg,
-          positiveText: '确定',
-          negativeText: '取消',
-          onPositiveClick: async () => {
-            alert('确认高清')
-            await hdImageFunc(reverseManageStore.selectBook.id, OperateBookType.BOOK)
-          }
-        })
-      } else {
-        // 没有就直接高清
-        await hdImageFunc(reverseManageStore.selectBook.id, OperateBookType.BOOK)
-      }
-    }
-
-    async function AddBookDialog() {
-      message.info('新增' + reverseManageStore.selectBook.id)
-      dialog.create({
-        title: '新增小说批次任务',
-        showIcon: false,
-        content: () => h(AddBookTask),
-        style: { width: '600px' }
+/**
+ * 一键生成草稿
+ */
+async function DraftAll() {
+  if (checkedRowKeysRef.value.length == 0) {
+    message.error('请选择要生成草稿的任务')
+    return
+  }
+  // 草稿弹窗
+  dialog.info({
+    closeOnEsc: false,
+    title: `生成草稿前检查 ${reverseManageStore.selectBook.name}`,
+    maskClosable: false,
+    content: () =>
+      h(ManageBookTaskGenerateInformation, {
+        bookTask: reverseManageStore.selectBook,
+        type: 'book',
+        selectBookTask: [...checkedRowKeysRef.value]
       })
-    }
+  })
+}
 
-    /**
-     * 一键生成草稿
-     */
-    async function DraftAll() {
-      alert('草稿全部')
-    }
+/**
+ * 一键生成视频
+ */
+async function VideoAll() {
+  alert('视频全部')
+}
 
-    /**
-     * 一键生成视频
-     */
-    async function VideoAll() {
-      alert('视频全部')
-    }
+/**
+ * 一键重置
+ */
+async function ResetAll() {
+  alert('重置全部')
+}
 
-    /**
-     * 一键重置
-     */
-    async function ResetAll() {
-      alert('重置全部')
-    }
-
-    /**
-     * 一键删除
-     */
-    async function DeleteAll() {
-      alert('删除全部')
-    }
-
-    return {
-      reverseManageStore,
-      AddBookDialog,
-      HDImageAll,
-      DraftAll,
-      VideoAll,
-      ResetAll,
-      DeleteAll,
-      columns: createColumns(),
-      renderIcon() {
-        return h(NIcon, null, {
-          default: () => h(AddSharp, { size: '40', color: 'white' }, {})
-        })
-      },
-      rowProps: (row) => {
-        return {
-          style: 'cursor: pointer;',
-          onClick: async () => {
-            // message.info(row.id)
-            reverseManageStore.selectBookTask = row
-            softwareStore.spin.spinning = true
-            softwareStore.spin.tip = '正在加载数据'
-            // 跳转
-            router.push({ name: 'manage_book', params: { id: row.id } })
-          }
-        }
-      }
+/**
+ * 一键删除
+ */
+async function DeleteAll() {
+  alert('删除全部')
+}
+const renderIcon = () => {
+  return h(NIcon, null, {
+    default: () => h(AddSharp, { size: '40', color: 'white' }, {})
+  })
+}
+const rowProps = (row) => {
+  return {
+    style: 'cursor: pointer;',
+    ondblclick: async () => {
+      // message.info(row.id)
+      reverseManageStore.selectBookTask = row
+      softwareStore.spin.spinning = true
+      softwareStore.spin.tip = '正在加载数据'
+      // 跳转
+      router.push({ name: 'manage_book', params: { id: row.id } })
     }
   }
-})
+}
 </script>
diff --git a/src/renderer/src/components/Book/ReverseManage.vue b/src/renderer/src/components/Book/ReverseManage.vue
index 6984b88..37a5db5 100644
--- a/src/renderer/src/components/Book/ReverseManage.vue
+++ b/src/renderer/src/components/Book/ReverseManage.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%">
     <ManageBook style="height: 100%" v-if="softwareStore.softWare.reverse_display_show" />
-    <n-split v-else direction="horizontal" :min="0.4" :max="0.8" :default-size="0.6" height="100%">
+    <n-split v-else direction="horizontal" :min="0.4" :max="0.8" :default-size="0.4" height="100%">
       <template #1> <ManageBook style="height: 100%" /> </template>
       <template #2>
         <ManageBookTask style="height: 100%" />
diff --git a/src/renderer/src/components/Setting/Setting.vue b/src/renderer/src/components/Setting/Setting.vue
index 8a46f12..e093f4e 100644
--- a/src/renderer/src/components/Setting/Setting.vue
+++ b/src/renderer/src/components/Setting/Setting.vue
@@ -46,14 +46,24 @@
               <template #unchecked> 亮 </template>
             </n-switch>
           </n-form-item>
-          <n-form-item label="人物场景选择模式" style="margin-left: 20px">
+          <n-form-item label="选择高清倍率" style="margin-left: 20px">
+            <n-select
+              size="small"
+              placeholder="请选择"
+              :options="hdSelectOptions"
+              v-model:value="formValue.hdScale"
+              style="width: 120px"
+            />
+          </n-form-item>
+          <n-form-item style="margin-left: 20px" label="人物场景选择模式">
             <n-select
               size="small"
               placeholder="请选择"
               :options="character_select_model_options"
               v-model:value="formValue.character_select_model"
               style="width: 120px"
-            />
+            >
+            </n-select>
           </n-form-item>
           <n-form-item style="margin-left: 20px"
             ><n-checkbox v-model:checked="formValue.window_wh_bm_remember"
@@ -212,12 +222,27 @@ export default defineComponent({
       theme: softwareStore.globalSetting.theme,
       character_select_model: window.config.character_select_model,
       window_wh_bm_remember: window.config.window_wh_bm_remember,
-      laiApiSelect: window.config.laiApiSelect ? window.config.laiApiSelect : LaiAPIType.MAIN
+      laiApiSelect: window.config.laiApiSelect ? window.config.laiApiSelect : LaiAPIType.MAIN,
+      hdScale: window.config.hdScale ?? 2
     })
     let show = ref(false)
     let gpt_options = ref([])
     let gpt_model_options = ref([])
     let character_select_model_options = ref([])
+    let hdSelectOptions = ref([
+      {
+        label: '2倍',
+        value: 2
+      },
+      {
+        label: '3倍',
+        value: 3
+      },
+      {
+        label: '4倍',
+        value: 4
+      }
+    ])
     let dialog = useDialog()
     let loading = ref(false)
     /**
@@ -472,6 +497,7 @@ export default defineComponent({
       AddGptPrompt,
       character_select_model_options,
       softwareStore,
+      hdSelectOptions,
       ModifyTranslateSetting,
       laiApiOptions: [
         {