admin/MuMuAINovel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:1.修复章节规划预览窗口UI显示问题

Browse Source 
2.修复部分端点删除章节后字数没有更新的问题
This commit is contained in:
xiamuceer
2025-12-10 15:47:02 +08:00
parent 51d3b1ec1a
commit 9fcc06055c
6 changed files with 331 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/api/outlines.py
+56 -9
View File
@@ -279,9 +279,20 @@ async def delete_outline(
project_id = outline.project_id
deleted_order = outline.order_index
# 根据项目模式删除对应的章节
# 获取要删除的章节并计算总字数
deleted_word_count = 0
if project.outline_mode == 'one-to-one':
# one-to-one模式：通过chapter_number删除对应章节
# one-to-one模式：通过chapter_number获取对应章节
chapters_result = await db.execute(
select(Chapter).where(
Chapter.project_id == project_id,
Chapter.chapter_number == outline.order_index
)
)
chapters_to_delete = chapters_result.scalars().all()
deleted_word_count = sum(ch.word_count or 0 for ch in chapters_to_delete)
# 删除章节
delete_result = await db.execute(
delete(Chapter).where(
Chapter.project_id == project_id,
@@ -289,14 +300,26 @@ async def delete_outline(
)
)
deleted_chapters_count = delete_result.rowcount
logger.info(f"一对一模式：删除大纲 {outline_id}（序号{outline.order_index}），同时删除了第{outline.order_index}章（{deleted_chapters_count}个章节）")
logger.info(f"一对一模式：删除大纲 {outline_id}（序号{outline.order_index}），同时删除了第{outline.order_index}章（{deleted_chapters_count}个章节，{deleted_word_count}字）")
else:
# one-to-many模式：通过outline_id删除关联章节
# one-to-many模式：通过outline_id获取关联章节
chapters_result = await db.execute(
select(Chapter).where(Chapter.outline_id == outline_id)
)
chapters_to_delete = chapters_result.scalars().all()
deleted_word_count = sum(ch.word_count or 0 for ch in chapters_to_delete)
# 删除章节
delete_result = await db.execute(
delete(Chapter).where(Chapter.outline_id == outline_id)
)
deleted_chapters_count = delete_result.rowcount
logger.info(f"一对多模式：删除大纲 {outline_id}，同时删除了 {deleted_chapters_count} 个关联章节")
logger.info(f"一对多模式：删除大纲 {outline_id}，同时删除了 {deleted_chapters_count} 个关联章节（{deleted_word_count}字）")
# 更新项目字数
if deleted_word_count > 0:
project.current_words = max(0, project.current_words - deleted_word_count)
logger.info(f"更新项目字数：减少 {deleted_word_count} 字")
# 删除大纲
await db.delete(outline)
@@ -530,12 +553,24 @@ async def _generate_new_outline(
from sqlalchemy import delete as sql_delete
# 先删除所有旧章节（无论是一对一还是一对多模式）
# 先获取所有旧章节并计算总字数
old_chapters_result = await db.execute(
select(Chapter).where(Chapter.project_id == project.id)
)
old_chapters = old_chapters_result.scalars().all()
deleted_word_count = sum(ch.word_count or 0 for ch in old_chapters)
# 删除所有旧章节（无论是一对一还是一对多模式）
delete_result = await db.execute(
sql_delete(Chapter).where(Chapter.project_id == project.id)
)
deleted_chapters_count = delete_result.rowcount
logger.info(f"✅ 全新生成：删除了 {deleted_chapters_count} 个旧章节")
logger.info(f"✅ 全新生成：删除了 {deleted_chapters_count} 个旧章节（{deleted_word_count}字）")
# 更新项目字数
if deleted_word_count > 0:
project.current_words = max(0, project.current_words - deleted_word_count)
logger.info(f"更新项目字数：减少 {deleted_word_count} 字")
# 再删除所有旧大纲
delete_outline_result = await db.execute(
@@ -1156,12 +1191,24 @@ async def new_outline_generator(
from sqlalchemy import delete as sql_delete
# 先删除所有旧章节
# 先获取所有旧章节并计算总字数
old_chapters_result = await db.execute(
select(Chapter).where(Chapter.project_id == project_id)
)
old_chapters = old_chapters_result.scalars().all()
deleted_word_count = sum(ch.word_count or 0 for ch in old_chapters)
# 删除所有旧章节
delete_chapters_result = await db.execute(
sql_delete(Chapter).where(Chapter.project_id == project_id)
)
deleted_chapters_count = delete_chapters_result.rowcount
logger.info(f"✅ 全新生成：删除了 {deleted_chapters_count} 个旧章节")
logger.info(f"✅ 全新生成：删除了 {deleted_chapters_count} 个旧章节（{deleted_word_count}字）")
# 更新项目字数
if deleted_word_count > 0:
project.current_words = max(0, project.current_words - deleted_word_count)
logger.info(f"更新项目字数：减少 {deleted_word_count} 字")
# 再删除所有旧大纲
delete_outlines_result = await db.execute(
frontend/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "frontend",
"private": true,
"version": "1.0.11",
"version": "1.0.12",
"type": "module",
"scripts": {
"dev": "vite",
frontend/src/index.css
+4
View File
@@ -127,3 +127,7 @@ body {
justify-content: center;
}
}
.ant-tabs-dropdown {
z-index: 2000 !important;
}
frontend/src/pages/Chapters.tsx
+19 -1
View File
@@ -27,7 +27,7 @@ export default function Chapters() {
const [writingStyles, setWritingStyles] = useState<WritingStyle[]>([]);
const [selectedStyleId, setSelectedStyleId] = useState<number | undefined>();
const [targetWordCount, setTargetWordCount] = useState<number>(3000);
const [availableModels, setAvailableModels] = useState<Array<{value: string, label: string}>>([]);
const [availableModels, setAvailableModels] = useState<Array<{ value: string, label: string }>>([]);
const [selectedModel, setSelectedModel] = useState<string | undefined>();
const [batchSelectedModel, setBatchSelectedModel] = useState<string | undefined>(); // 批量生成的模型选择
const [temporaryNarrativePerspective, setTemporaryNarrativePerspective] = useState<string | undefined>(); // 临时人称选择
@@ -710,6 +710,12 @@ export default function Chapters() {
if (status.completed > 0) {
refreshChapters();
loadAnalysisTasks();
// 刷新项目信息以实时更新总字数统计
if (currentProject?.id) {
const updatedProject = await projectApi.getProject(currentProject.id);
setCurrentProject(updatedProject);
}
}
// 任务完成或失败，停止轮询
@@ -725,6 +731,12 @@ export default function Chapters() {
await refreshChapters();
await loadAnalysisTasks();
// 刷新项目信息以更新总字数统计
if (currentProject?.id) {
const updatedProject = await projectApi.getProject(currentProject.id);
setCurrentProject(updatedProject);
}
if (status.status === 'completed') {
message.success(`批量生成完成！成功生成 ${status.completed} 章`);
} else if (status.status === 'failed') {
@@ -770,6 +782,12 @@ export default function Chapters() {
// 取消后立即刷新章节列表和分析任务，显示已生成的章节
await refreshChapters();
await loadAnalysisTasks();
// 刷新项目信息以更新总字数统计
if (currentProject?.id) {
const updatedProject = await projectApi.getProject(currentProject.id);
setCurrentProject(updatedProject);
}
} catch (error: any) {
message.error('取消失败：' + (error.message || '未知错误'));
}
frontend/src/pages/Outline.tsx
+13 -4
View File
@@ -6,13 +6,13 @@ import { useOutlineSync } from '../store/hooks';
import { cardStyles } from '../components/CardStyles';
import { SSEPostClient } from '../utils/sseClient';
import { SSEProgressModal } from '../components/SSEProgressModal';
import { outlineApi, chapterApi } from '../services/api';
import { outlineApi, chapterApi, projectApi } from '../services/api';
import type { OutlineExpansionResponse, BatchOutlineExpansionResponse } from '../types';
const { TextArea } = Input;
export default function Outline() {
const { currentProject, outlines } = useStore();
const { currentProject, outlines, setCurrentProject } = useStore();
const [isGenerating, setIsGenerating] = useState(false);
const [editForm] = Form.useForm();
const [generateForm] = Form.useForm();
@@ -142,8 +142,12 @@ export default function Outline() {
try {
await deleteOutline(id);
message.success('删除成功');
// 删除后刷新大纲列表，确保显示最新的顺序
// 删除后刷新大纲列表和项目信息，更新字数显示
await refreshOutlines();
if (currentProject?.id) {
const updatedProject = await projectApi.getProject(currentProject.id);
setCurrentProject(updatedProject);
}
} catch {
message.error('删除失败');
}
@@ -745,7 +749,12 @@ export default function Outline() {
await Promise.all(deletePromises);
message.success(`已删除《${outlineTitle}》展开的所有 ${chapters.length} 个章节`);
refreshOutlines();
await refreshOutlines();
// 刷新项目信息以更新字数显示
if (currentProject?.id) {
const updatedProject = await projectApi.getProject(currentProject.id);
setCurrentProject(updatedProject);
}
} catch (error: any) {
message.error(error.response?.data?.detail || '删除章节失败');
}
run.py
+35
View File
@@ -0,0 +1,35 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
MuMuAINovel 服务启动脚本
用于快速启动后端服务
"""
import sys
import os
from pathlib import Path
# 将backend目录添加到Python路径
backend_dir = Path(__file__).parent / "backend"
sys.path.insert(0, str(backend_dir))
import uvicorn
from app.config import settings
if __name__ == "__main__":
print("=" * 60)
print(f"🚀 启动 {settings.app_name} v{settings.app_version}")
print("=" * 60)
print(f"📍 服务地址: http://{settings.app_host}:{settings.app_port}")
print(f"📚 API文档: http://{settings.app_host}:{settings.app_port}/docs")
print(f"🔧 调试模式: {'启用' if settings.debug else '禁用'}")
print(f"🗄️ 数据库: PostgreSQL")
print("=" * 60)
print()
uvicorn.run(
"app.main:app",
host=settings.app_host,
port=settings.app_port,
reload=settings.debug,
log_level="info"
)