From b48ce89f4edbf0f696be1dd214e1d627149561f2 Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Sat, 10 Oct 2026 17:35:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=9B=BE=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E9=87=8D=E5=BB=BA=E6=88=96=E6=95=B4=E7=90=86=E8=BF=9B?= =?UTF-8?q?=E7=8E=B0=E6=9C=89=E5=AF=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MindMapRegenerateDialog.spec.ts | 80 ++++++++++++ src/__tests__/components/TagReview.spec.ts | 32 +++++ .../integration/review-recall-flow.spec.ts | 46 ++++++- src/components/MindMapRegenerateDialog.vue | 120 ++++++++++++++++++ src/components/ReviewRecall.vue | 72 +++++------ src/components/TagReview.vue | 56 ++++---- 6 files changed, 331 insertions(+), 75 deletions(-) create mode 100644 src/__tests__/components/MindMapRegenerateDialog.spec.ts create mode 100644 src/components/MindMapRegenerateDialog.vue diff --git a/src/__tests__/components/MindMapRegenerateDialog.spec.ts b/src/__tests__/components/MindMapRegenerateDialog.spec.ts new file mode 100644 index 0000000..8f6d190 --- /dev/null +++ b/src/__tests__/components/MindMapRegenerateDialog.spec.ts @@ -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 = {}) => + mount(MindMapRegenerateDialog, { + props: { modelValue: true, ...props }, + global: { plugins: [ElementPlus] }, + }) + +const findButton = (wrapper: ReturnType, 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() + }) +}) diff --git a/src/__tests__/components/TagReview.spec.ts b/src/__tests__/components/TagReview.spec.ts index d81c085..74b74aa 100644 --- a/src/__tests__/components/TagReview.spec.ts +++ b/src/__tests__/components/TagReview.spec.ts @@ -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, diff --git a/src/__tests__/integration/review-recall-flow.spec.ts b/src/__tests__/integration/review-recall-flow.spec.ts index e066e43..f9396e5 100644 --- a/src/__tests__/integration/review-recall-flow.spec.ts +++ b/src/__tests__/integration/review-recall-flow.spec.ts @@ -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)) diff --git a/src/components/MindMapRegenerateDialog.vue b/src/components/MindMapRegenerateDialog.vue new file mode 100644 index 0000000..942e3b6 --- /dev/null +++ b/src/components/MindMapRegenerateDialog.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/components/ReviewRecall.vue b/src/components/ReviewRecall.vue index 7eee484..0843dff 100644 --- a/src/components/ReviewRecall.vue +++ b/src/components/ReviewRecall.vue @@ -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 | null>(null); +// 重新生成方式选择:导图已存在时不再隐式走全量,由用户显式选择 +const regenerateDialogVisible = ref(false); +/** 用户编辑过的导图:两种方式对编辑内容的处置不同,弹窗里要说清楚 */ +const standardEdited = computed( + () => standard.value?.generator === "USER" || standard.value?.generator === "USER_MERGE", +); + // 回忆历史 const historyRecords = ref([]); 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="碎片的归属任务调整过,导图的取材已经不同步。重建由你手动触发:展开导图后点击「重新生成」,可选择全量重建或把新内容整理进现有导图。" />
@@ -726,6 +710,12 @@ onMounted(() => {
+ + 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(() => parseTree(map.value?.content)); +/** 用户编辑过的导图:两种重建方式对编辑内容的处置不同,弹窗里要说清楚 */ +const mapEdited = computed( + () => map.value?.generator === "USER" || map.value?.generator === "USER_MERGE", +); +// 重新生成方式选择:导图已存在时不再隐式走全量,由用户显式选择 +const regenerateDialogVisible = ref(false); const resultTree = computed(() => 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="重建由你手动触发:点「重新生成」,可选择全量重建或把新内容整理进现有导图。" />
@@ -414,6 +400,12 @@ onMounted(() => {
+ +