修复聚合推文剪映抽帧时,导入srt没有输入
(聚合推文) SD 反推,MJ反推添加单句洗稿功能
(聚合推文)小说任务列表,添加进入出图文件夹的菜单
(聚合推文)新增一键出图
(聚合推文)新增默认出图方式设置,
5.1只对原创生效,SD反推默认是SD,MJ反推默认是MJ
5.2添加批次的默认出图方式同 a点说明,但是选择了 选择旧批次,新批次的默认出图方式会继承
后台任务,完成后台任务的可视化界面
(聚合推文)小说详情界面,添加小说和批次名称显示
This commit is contained in:
2024-11-02 18:18:55 +08:00
parent 22cfe65dde
commit 51deef0c09
64 changed files with 2051 additions and 1136 deletions
+1 -1
View File
@@ -205,7 +205,7 @@ export class BookService extends BaseRealmService {
} else if (book.type == BookType.MJ_REVERSE) {
imageCategory = BookImageCategory.MJ
} else if (book.type == BookType.ORIGINAL) {
imageCategory = BookImageCategory.MJ
imageCategory = global.config.defaultImageMode
} else {
throw new Error('未知的小说类型')
}
@@ -104,6 +104,9 @@ const BOOK = {
*/
GET_IMAGE_URL_AND_DOWNLOAD: "GET_IMAGE_URL_AND_DOWNLOAD",
/** 添加一键生图后台任务 */
GENERATE_ALL_TASK_IMAGE: "GENERATE_ALL_TASK_IMAGE",
//#endregion
COMPUTE_STORYBOARD: 'COMPUTE_STORYBOARD',
+2 -8
View File
@@ -3,6 +3,7 @@ import TASK from "./taskDefineString"
import TTS from "./ttsDefineString"
import SETTING from "./settingDefineString"
import BOOK from "./bookDefineString"
import WRITE from "./writeDefineString"
export const DEFINE_STRING = {
SYSTEM: SYSTEM,
@@ -10,6 +11,7 @@ export const DEFINE_STRING = {
TTS: TTS,
BOOK: BOOK,
SETTING: SETTING,
WRITE: WRITE,
SHOW_GLOBAL_MESSAGE: "SHOW_GLOBAL_MESSAGE",
SHOW_GLOBAL_MAIN_NOTIFICATION: 'SHOW_GLOBAL_MAIN_NOTIFICATION',
OPEN_DEV_TOOLS_PASSWORD: 'OPEN_DEV_TOOLS_PASSWORD',
@@ -246,14 +248,6 @@ export const DEFINE_STRING = {
*/
GET_SCENE_PRESET: "GET_SCENE_PRESET"
},
WRITE: {
GET_WRITE_CONFIG: 'GET_WRITE_CONFIG',
SAVE_WRITE_CONFIG: 'SAVE_WRITE_CONFIG',
ACTION_START: 'ACTION_START',
GET_SUBTITLE_SETTING: "GET_SUBTITLE_SETTING",
RESET_SUBTITLE_SETTING: "RESET_SUBTITLE_SETTING",
SAVE_SUBTITLE_SETTING: "SAVE_SUBTITLE_SETTING",
},
DB: {
UPDATE_BOOK_TASK_DATA: "UPDATE_BOOK_TASK_DATA",
UPDATE_BOOK_TASK_DETAIL_DATA: "UPDATE_BOOK_TASK_DETAIL_DATA",
@@ -9,6 +9,9 @@ const TASK = {
/** 获取等待中的任务 */
GET_ALL_STATUS_TASK_COUNT: "GET_ALL_STATUS_TASK_COUNT",
/** 获取后台任务的集合,分页 */
GET_BACK_TASK_COLLECTION: "GET_BACK_TASK_COLLECTION",
};
export default TASK;
@@ -0,0 +1,15 @@
const WRITE = {
GET_WRITE_CONFIG: 'GET_WRITE_CONFIG',
SAVE_WRITE_CONFIG: 'SAVE_WRITE_CONFIG',
ACTION_START: 'ACTION_START',
GET_SUBTITLE_SETTING: "GET_SUBTITLE_SETTING",
RESET_SUBTITLE_SETTING: "RESET_SUBTITLE_SETTING",
SAVE_SUBTITLE_SETTING: "SAVE_SUBTITLE_SETTING",
/** 生成洗稿后文案 */
GENERATE_AFTER_GPT_WORD: "GENERATE_AFTER_GPT_WORD",
/** 生成洗稿后文案返回数据,前端接收 */
GENERATE_AFTER_GPT_WORD_RESPONSE: "GENERATE_AFTER_GPT_WORD_RESPONSE"
}
export default WRITE
+141
View File
@@ -282,3 +282,144 @@ export enum BookTagSelectType {
// 标签
TAG = 'tag'
}
/**
* 根据Key返回指定的后台任务类型的label
* @param key
* @returns
*/
export function GetBookBackTaskTypeLabel(key: string) {
switch (key) {
case BookBackTaskType.STORYBOARD:
return '分镜计算';
case BookBackTaskType.SPLIT:
return '分割视频';
case BookBackTaskType.AUDIO:
return '提取音频';
case BookBackTaskType.RECOGNIZE:
return '识别字幕';
case BookBackTaskType.FRAME:
return '抽帧';
case BookBackTaskType.MJ_REVERSE:
return 'MJ反推';
case BookBackTaskType.SD_REVERSE:
return 'SD反推';
case BookBackTaskType.MJ_IMAGE:
return 'MJ生成图片';
case BookBackTaskType.SD_IMAGE:
return 'SD生成图片';
case BookBackTaskType.FLUX_FORGE_IMAGE:
return 'flux forge生成图片';
case BookBackTaskType.FLUX_API_IMAGE:
return 'flux api生成图片';
case BookBackTaskType.D3_IMAGE:
return 'D3生成图片';
case BookBackTaskType.HD:
return '高清';
case BookBackTaskType.COMPOSING:
return '合成视频';
case BookBackTaskType.INFERENCE:
return '推理';
case BookBackTaskType.TRANSLATE:
return '翻译';
default:
return key;
}
}
/**
* 根据Key返回指定的后台任务状态的label
* @param key
* @returns
*/
export function GetBookTaskDetailStatusLabel(key: string) {
switch (key) {
case BookTaskStatus.WAIT:
return '等待';
case BookTaskStatus.STORYBOARD:
return '分镜计算中';
case BookTaskStatus.STORYBOARD_FAIL:
return '分镜计算失败';
case BookTaskStatus.STORYBOARD_DONE:
return '分镜计算完成';
case BookTaskStatus.SPLIT:
return '分割视频中';
case BookTaskStatus.SPLIT_FAIL:
return '分割视频失败';
case BookTaskStatus.SPLIT_DONE:
return '分割视频完成';
case BookTaskStatus.AUDIO:
return '提取音频中';
case BookTaskStatus.AUDIO_FAIL:
return '提取音频失败';
case BookTaskStatus.AUDIO_DONE:
return '提取音频完成';
case BookTaskStatus.RECOGNIZE:
return '识别字幕中';
case BookTaskStatus.RECOGNIZE_FAIL:
return '识别字幕失败';
case BookTaskStatus.RECOGNIZE_DONE:
return '识别字幕完成';
case BookTaskStatus.FRAME:
return '抽帧中';
case BookTaskStatus.FRAME_FAIL:
return '抽帧失败';
case BookTaskStatus.FRAME_DONE:
return '抽帧完成';
case BookTaskStatus.REVERSE:
return '反推中';
case BookTaskStatus.REVERSE_FAIL:
return '反推失败';
case BookTaskStatus.REVERSE_DONE:
return '反推完成';
case BookTaskStatus.IMAGE:
return '生成图片中';
case BookTaskStatus.IMAGE_FAIL:
return '生成图片失败';
case BookTaskStatus.IMAGE_DONE:
return '生成图片完成';
case BookTaskStatus.HD:
return '高清中';
case BookTaskStatus.HD_FAIL:
return '高清失败';
case BookTaskStatus.HD_DONE:
return '高清完成';
case BookTaskStatus.COMPOSING:
return '合成视频中';
case BookTaskStatus.COMPOSING_FAIL:
return '合成视频失败';
case BookTaskStatus.COMPOSING_DONE:
return '合成视频完成';
case BookTaskStatus.DRAFT_DONE:
return '添加草稿完成';
case BookTaskStatus.DRAFT_FAIL:
return '添加草稿失败';
default:
return key;
}
}
/**
* 根据Key返回指定的后台任务状态的label
* @param key
* @returns
*/
export function GetBookBackTaskStatusLabel(key: string) {
switch (key) {
case BookBackTaskStatus.WAIT:
return '等待';
case BookBackTaskStatus.RUNNING:
return '运行中';
case BookBackTaskStatus.PAUSE:
return '暂停';
case BookBackTaskStatus.DONE:
return '完成';
case BookBackTaskStatus.FAIL:
return '失败';
case BookBackTaskStatus.RECONNECT:
return '重连';
default:
return key;
}
}