feat: 导图重新生成支持选择全量重建或整理进现有导图
This commit is contained in:
@@ -0,0 +1,80 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { flushPromises, mount } from '@vue/test-utils'
|
||||
import ElementPlus from 'element-plus'
|
||||
import MindMapRegenerateDialog from '@/components/MindMapRegenerateDialog.vue'
|
||||
|
||||
/**
|
||||
* 导图重建方式选择弹窗:导图已存在时不再隐式走全量,
|
||||
* 由用户显式选择「整理进现有导图」或「全量重建」。
|
||||
*/
|
||||
const mountDialog = (props: Record<string, unknown> = {}) =>
|
||||
mount(MindMapRegenerateDialog, {
|
||||
props: { modelValue: true, ...props },
|
||||
global: { plugins: [ElementPlus] },
|
||||
})
|
||||
|
||||
const findButton = (wrapper: ReturnType<typeof mount>, label: string) =>
|
||||
wrapper.findAll('button').find((b) => b.text().trim() === label)!
|
||||
|
||||
describe('MindMapRegenerateDialog 导图重建方式', () => {
|
||||
it('默认选非破坏性的「整理进现有导图」,确定后 emit incremental 并关闭', async () => {
|
||||
const wrapper = mountDialog()
|
||||
await flushPromises()
|
||||
|
||||
expect(wrapper.text()).toContain('整理进现有导图')
|
||||
expect(wrapper.text()).toContain('全量重建')
|
||||
const radios = wrapper.findAll('input[type="radio"]')
|
||||
expect((radios[0].element as HTMLInputElement).checked).toBe(true)
|
||||
|
||||
await findButton(wrapper, '确定').trigger('click')
|
||||
|
||||
expect(wrapper.emitted('select')).toEqual([['incremental']])
|
||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([false])
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('切到「全量重建」后确定,emit full', async () => {
|
||||
const wrapper = mountDialog()
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.findAll('input[type="radio"]')[1].setValue()
|
||||
await findButton(wrapper, '确定').trigger('click')
|
||||
|
||||
expect(wrapper.emitted('select')).toEqual([['full']])
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('每次打开都重置回默认方式,不沿用上次选择', async () => {
|
||||
const wrapper = mountDialog({ modelValue: false })
|
||||
await wrapper.setProps({ modelValue: true })
|
||||
await flushPromises()
|
||||
await wrapper.findAll('input[type="radio"]')[1].setValue()
|
||||
|
||||
await wrapper.setProps({ modelValue: false })
|
||||
await wrapper.setProps({ modelValue: true })
|
||||
await flushPromises()
|
||||
|
||||
expect((wrapper.findAll('input[type="radio"]')[0].element as HTMLInputElement).checked).toBe(true)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('编辑过的导图额外提示两种方式对编辑内容的处置差异', async () => {
|
||||
const wrapper = mountDialog({ edited: true })
|
||||
await flushPromises()
|
||||
|
||||
expect(wrapper.text()).toContain('保留你编辑过的节点')
|
||||
expect(wrapper.text()).toContain('你手动编辑过的内容会丢失')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('取消只关闭弹窗,不提交任何方式', async () => {
|
||||
const wrapper = mountDialog()
|
||||
await flushPromises()
|
||||
|
||||
await findButton(wrapper, '取消').trigger('click')
|
||||
|
||||
expect(wrapper.emitted('select')).toBeUndefined()
|
||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([false])
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
@@ -156,6 +156,38 @@ describe('TagReview 按标签复习(闭环-04)', () => {
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('导图已存在时点“重新生成”先选方式,默认“整理进现有导图”提交 incremental', async () => {
|
||||
vi.mocked(queryTagMindMap).mockResolvedValue({
|
||||
code: 200,
|
||||
data: { scopeKey: 'SCOPE_1', tags: ['英语'], mode: 'UNION', map: tagMap, latestRecallRecord: null },
|
||||
} as never)
|
||||
const wrapper = await mountTagReview()
|
||||
await selectTags(wrapper, ['英语'])
|
||||
const start = wrapper.findAll('button').find((b) => b.text().includes('开始复习'))
|
||||
await start!.trigger('click')
|
||||
await flushPromises()
|
||||
vi.mocked(submitAiTask).mockClear()
|
||||
|
||||
const regenerate = wrapper.findAll('button').find((b) => b.text().trim() === '重新生成')
|
||||
await regenerate!.trigger('click')
|
||||
await flushPromises()
|
||||
|
||||
// 不再隐式全量:弹窗里两种方式都可见
|
||||
expect(wrapper.text()).toContain('整理进现有导图')
|
||||
expect(wrapper.text()).toContain('全量重建')
|
||||
|
||||
const confirm = wrapper.findAll('button').find((b) => b.text().trim() === '确定')
|
||||
await confirm!.trigger('click')
|
||||
await flushPromises()
|
||||
|
||||
expect(submitAiTask).toHaveBeenCalledWith({
|
||||
type: 'TAG_MIND_MAP',
|
||||
targetNum: 'SCOPE_1',
|
||||
params: { tags: ['英语'], combineMode: 'UNION', mode: 'incremental' },
|
||||
})
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('回忆内容只有一个节点时拒绝提交,补全后才提交对比任务', async () => {
|
||||
vi.mocked(queryTagMindMap).mockResolvedValue({
|
||||
code: 200,
|
||||
|
||||
@@ -193,8 +193,50 @@ describe('ReviewRecall 交互流程(集成)', () => {
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('标准导图不存在时自动提交 MIND_MAP(ensure) 任务并轮询补生成', async () => {
|
||||
vi.mocked(getStandardMindMap)
|
||||
it('导图已存在时点“重新生成”先让用户选方式,默认“整理进现有导图”提交 MIND_MAP(incremental)', async () => {
|
||||
const { wrapper } = await mountPage()
|
||||
await findButton(wrapper, '展开').trigger('click')
|
||||
await flushPromises()
|
||||
await findButton(wrapper, '重新生成').trigger('click')
|
||||
await flushPromises()
|
||||
|
||||
// 不再隐式全量:弹窗里两种方式都可见
|
||||
expect(wrapper.text()).toContain('整理进现有导图')
|
||||
expect(wrapper.text()).toContain('全量重建')
|
||||
|
||||
await findButton(wrapper, '确定').trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
|
||||
expect(submitAiTask).toHaveBeenCalledWith({
|
||||
type: 'MIND_MAP',
|
||||
targetNum: 'T001',
|
||||
params: { mode: 'incremental' },
|
||||
})
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('选择“全量重建”后提交 MIND_MAP(full)', async () => {
|
||||
const { wrapper } = await mountPage()
|
||||
await findButton(wrapper, '展开').trigger('click')
|
||||
await flushPromises()
|
||||
await findButton(wrapper, '重新生成').trigger('click')
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.findAll('input[type="radio"]')[1].setValue()
|
||||
await findButton(wrapper, '确定').trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
|
||||
expect(submitAiTask).toHaveBeenCalledWith({
|
||||
type: 'MIND_MAP',
|
||||
targetNum: 'T001',
|
||||
params: { mode: 'full' },
|
||||
})
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('标准导图不存在时自动提交 MIND_MAP(ensure) 任务并轮询补生成', async () => { vi.mocked(getStandardMindMap)
|
||||
.mockResolvedValueOnce(ok(null))
|
||||
.mockResolvedValue(ok(standardMap))
|
||||
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, watch } from "vue";
|
||||
|
||||
/**
|
||||
* 重新生成导图的方式选择:导图已存在时,让用户在「整理进现有导图」和「全量重建」之间选。
|
||||
*
|
||||
* 背景:产生新碎片后导图只是「待更新」,很多人只想让 AI 把新内容补进现有结构,
|
||||
* 不希望整张导图被推倒重来;所以这里不做隐式默认,交给用户显式选择。
|
||||
*/
|
||||
export type MindMapRegenerateMode = "full" | "incremental";
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: boolean;
|
||||
/** 导图是否被用户编辑过:用于提示两种方式对「你的编辑」分别意味着什么 */
|
||||
edited?: boolean;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: "update:modelValue", value: boolean): void;
|
||||
(e: "select", mode: MindMapRegenerateMode): void;
|
||||
}>();
|
||||
|
||||
// 默认选非破坏性的「整理进现有导图」,避免手滑丢掉现有结构
|
||||
const mode = ref<MindMapRegenerateMode>("incremental");
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(visible) => {
|
||||
if (visible) mode.value = "incremental";
|
||||
},
|
||||
);
|
||||
|
||||
const close = () => emit("update:modelValue", false);
|
||||
|
||||
const confirm = () => {
|
||||
const selected = mode.value;
|
||||
emit("select", selected);
|
||||
close();
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="modelValue"
|
||||
class="mind-map-regenerate-dialog"
|
||||
title="重新生成导图"
|
||||
width="480px"
|
||||
@update:model-value="emit('update:modelValue', $event)"
|
||||
>
|
||||
<p class="regenerate-hint">已有导图,请选择这次重新生成的方式:</p>
|
||||
|
||||
<el-radio-group v-model="mode" class="regenerate-modes">
|
||||
<el-radio value="incremental" class="regenerate-mode">
|
||||
<span class="mode-title">整理进现有导图</span>
|
||||
<span class="mode-desc">
|
||||
AI 依据全部碎片重新梳理,把新内容合并到现有导图{{ edited ? ",并保留你编辑过的节点" : "" }}。
|
||||
</span>
|
||||
</el-radio>
|
||||
<el-radio value="full" class="regenerate-mode">
|
||||
<span class="mode-title">全量重建</span>
|
||||
<span class="mode-desc">
|
||||
丢弃当前结构,从全部碎片生成一张全新的导图{{ edited ? ",你手动编辑过的内容会丢失" : "" }}。
|
||||
</span>
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
|
||||
<template #footer>
|
||||
<el-button @click="close">取消</el-button>
|
||||
<el-button type="primary" @click="confirm">确定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.regenerate-hint {
|
||||
margin: 0 0 12px;
|
||||
font-size: 13px;
|
||||
color: var(--text-secondary);
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.regenerate-modes {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.regenerate-mode {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
height: auto;
|
||||
margin-right: 0;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid var(--border-soft);
|
||||
border-radius: 8px;
|
||||
background: var(--surface-strong);
|
||||
}
|
||||
|
||||
.regenerate-mode :deep(.el-radio__label) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
line-height: 1.5;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.mode-title {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.mode-desc {
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
word-break: break-word;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
</style>
|
||||
@@ -10,9 +10,12 @@ import {
|
||||
type RecallRecord,
|
||||
} from "@/api/standardMindMap";
|
||||
import type { RecallCompareParams } from "@/api/aiTasks";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import { ElMessage } from "element-plus";
|
||||
import MindMapViewer, { type MindMapTreeNode } from "@/components/MindMapViewer.vue";
|
||||
import GuidanceDialog from "@/components/GuidanceDialog.vue";
|
||||
import MindMapRegenerateDialog, {
|
||||
type MindMapRegenerateMode,
|
||||
} from "@/components/MindMapRegenerateDialog.vue";
|
||||
import {
|
||||
isAiTaskCancelled,
|
||||
useAiTask,
|
||||
@@ -69,6 +72,13 @@ const editOutline = ref("");
|
||||
const savingStandard = ref(false);
|
||||
const editViewer = ref<InstanceType<typeof MindMapViewer> | null>(null);
|
||||
|
||||
// 重新生成方式选择:导图已存在时不再隐式走全量,由用户显式选择
|
||||
const regenerateDialogVisible = ref(false);
|
||||
/** 用户编辑过的导图:两种方式对编辑内容的处置不同,弹窗里要说清楚 */
|
||||
const standardEdited = computed(
|
||||
() => standard.value?.generator === "USER" || standard.value?.generator === "USER_MERGE",
|
||||
);
|
||||
|
||||
// 回忆历史
|
||||
const historyRecords = ref<RecallRecord[]>([]);
|
||||
const showHistory = ref(false);
|
||||
@@ -251,52 +261,26 @@ const findNodeByPath = (node: MindMapTreeNode, path: string): MindMapTreeNode |
|
||||
return null;
|
||||
};
|
||||
|
||||
// 重新生成(防抖 + 用户编辑时弹窗选模式)
|
||||
const handleRegenerate = async () => {
|
||||
// 重新生成入口(防抖):导图已存在时先弹窗让用户选「整理进现有导图 / 全量重建」
|
||||
const handleRegenerate = () => {
|
||||
// 防抖:正在生成中跳过
|
||||
if (regenerating.value) return;
|
||||
|
||||
let mode: "full" | "incremental" = "full";
|
||||
|
||||
// 如果用户编辑过,弹窗选择生成模式
|
||||
if (standard.value?.generator === "USER" || standard.value?.generator === "USER_MERGE") {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
"检测到您已编辑过标准思维导图,请选择重新生成方式:",
|
||||
"重新生成",
|
||||
{
|
||||
confirmButtonText: "全量重新生成",
|
||||
cancelButtonText: "增量更新(保留编辑)",
|
||||
type: "warning",
|
||||
distinguishCancelAndClose: true,
|
||||
}
|
||||
);
|
||||
// confirm → 全量(保持 mode = "full")
|
||||
} catch (e) {
|
||||
if (e === "cancel" || String(e).includes("cancel")) {
|
||||
mode = "incremental";
|
||||
} else {
|
||||
return; // 点 X 关闭 → 不做操作
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 未编辑过的简单确认
|
||||
try {
|
||||
await ElMessageBox.confirm("重新生成将从学习数据中重新生成标准思维导图,确定?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "info",
|
||||
});
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
// 还没有导图时没有「现有结构」可整理,直接全量生成
|
||||
if (!standard.value) {
|
||||
void regenerateWithMode("full");
|
||||
return;
|
||||
}
|
||||
regenerateDialogVisible.value = true;
|
||||
};
|
||||
|
||||
// 提交 MIND_MAP 任务并轮询
|
||||
// 用户选好方式后提交 MIND_MAP 任务并轮询
|
||||
const regenerateWithMode = async (mode: MindMapRegenerateMode) => {
|
||||
try {
|
||||
await mindMapTask.run("MIND_MAP", taskNum.value, { mode });
|
||||
await refreshStandardMap();
|
||||
ElMessage.success(mode === "incremental" ? "标准思维导图已增量更新" : "标准思维导图已重新生成");
|
||||
ElMessage.success(
|
||||
mode === "incremental" ? "新碎片已整理进标准思维导图" : "标准思维导图已重新生成",
|
||||
);
|
||||
} catch (e) {
|
||||
if (isAiTaskCancelled(e)) return;
|
||||
ElMessage.error(errorMessageOf(e, "重新生成失败"));
|
||||
@@ -646,7 +630,7 @@ onMounted(() => {
|
||||
show-icon
|
||||
:closable="false"
|
||||
title="内容归属已变化,这张标准导图需要重建"
|
||||
description="碎片的归属任务调整过,导图的取材已经不同步。重建由你手动触发:展开导图后点击「重新生成」。"
|
||||
description="碎片的归属任务调整过,导图的取材已经不同步。重建由你手动触发:展开导图后点击「重新生成」,可选择全量重建或把新内容整理进现有导图。"
|
||||
/>
|
||||
|
||||
<div v-if="!standard" class="empty-state">
|
||||
@@ -726,6 +710,12 @@ onMounted(() => {
|
||||
</article>
|
||||
</div>
|
||||
|
||||
<MindMapRegenerateDialog
|
||||
v-model="regenerateDialogVisible"
|
||||
:edited="standardEdited"
|
||||
@select="regenerateWithMode"
|
||||
/>
|
||||
|
||||
<GuidanceDialog
|
||||
v-model="guidance.visible"
|
||||
:task-num="taskNum"
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from "vue";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import { ElMessage } from "element-plus";
|
||||
import MindMapViewer, { type MindMapTreeNode } from "@/components/MindMapViewer.vue";
|
||||
import MindMapRegenerateDialog, {
|
||||
type MindMapRegenerateMode,
|
||||
} from "@/components/MindMapRegenerateDialog.vue";
|
||||
import {
|
||||
listTagRecallRecords,
|
||||
queryTagMindMap,
|
||||
@@ -63,6 +66,12 @@ const parseTree = (content?: string): MindMapTreeNode | null => {
|
||||
|
||||
const map = computed(() => view.value?.map || null);
|
||||
const standardTree = computed<MindMapTreeNode | null>(() => parseTree(map.value?.content));
|
||||
/** 用户编辑过的导图:两种重建方式对编辑内容的处置不同,弹窗里要说清楚 */
|
||||
const mapEdited = computed(
|
||||
() => map.value?.generator === "USER" || map.value?.generator === "USER_MERGE",
|
||||
);
|
||||
// 重新生成方式选择:导图已存在时不再隐式走全量,由用户显式选择
|
||||
const regenerateDialogVisible = ref(false);
|
||||
const resultTree = computed<MindMapTreeNode | null>(() => lastResult.value?.matchedTree || null);
|
||||
|
||||
/** 回忆导图的初始根节点:只给主题,内容凭记忆补全 */
|
||||
@@ -173,45 +182,22 @@ const generateMap = async (mode: "full" | "incremental" | "ensure" = "ensure") =
|
||||
});
|
||||
await refreshMap();
|
||||
recallTree.value = buildEmptyRecallTree();
|
||||
ElMessage.success(mode === "incremental" ? "标签导图已增量更新" : "标签导图已生成");
|
||||
ElMessage.success(mode === "incremental" ? "新碎片已整理进标签导图" : "标签导图已生成");
|
||||
} catch (e) {
|
||||
if (isAiTaskCancelled(e)) return;
|
||||
ElMessage.error(errorMessageOf(e, "标签导图生成失败,请稍后重试"));
|
||||
}
|
||||
};
|
||||
|
||||
const handleRegenerate = async () => {
|
||||
// 重新生成入口(防抖):导图已存在时先弹窗让用户选「整理进现有导图 / 全量重建」
|
||||
const handleRegenerate = () => {
|
||||
if (generating.value) return;
|
||||
let mode: "full" | "incremental" = "full";
|
||||
if (map.value?.generator === "USER" || map.value?.generator === "USER_MERGE") {
|
||||
try {
|
||||
await ElMessageBox.confirm("检测到这张标签导图被编辑过,请选择重新生成方式:", "重新生成", {
|
||||
confirmButtonText: "全量重新生成",
|
||||
cancelButtonText: "增量更新(保留编辑)",
|
||||
type: "warning",
|
||||
distinguishCancelAndClose: true,
|
||||
});
|
||||
} catch (e) {
|
||||
if (e === "cancel" || String(e).includes("cancel")) {
|
||||
mode = "incremental";
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
await ElMessageBox.confirm("重新生成会从带这些标签的碎片里重新提取结构,确定?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "info",
|
||||
});
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
}
|
||||
await generateMap(mode);
|
||||
regenerateDialogVisible.value = true;
|
||||
};
|
||||
|
||||
// 用户选好方式后真正提交 TAG_MIND_MAP 任务
|
||||
const regenerateWithMode = (mode: MindMapRegenerateMode) => generateMap(mode);
|
||||
|
||||
const startEditStandard = () => {
|
||||
editing.value = true;
|
||||
};
|
||||
@@ -338,7 +324,7 @@ onMounted(() => {
|
||||
show-icon
|
||||
:closable="false"
|
||||
title="内容归属或标签变化,这张导图需要重建"
|
||||
description="重建由你手动触发:点「重新生成」。"
|
||||
description="重建由你手动触发:点「重新生成」,可选择全量重建或把新内容整理进现有导图。"
|
||||
/>
|
||||
<div v-if="!map" class="empty-state">
|
||||
<el-empty description="这个标签范围还没有导图" :image-size="64">
|
||||
@@ -414,6 +400,12 @@ onMounted(() => {
|
||||
</div>
|
||||
</article>
|
||||
</template>
|
||||
|
||||
<MindMapRegenerateDialog
|
||||
v-model="regenerateDialogVisible"
|
||||
:edited="mapEdited"
|
||||
@select="regenerateWithMode"
|
||||
/>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user