diff --git a/src/__tests__/api/reportFragments.spec.ts b/src/__tests__/api/reportFragments.spec.ts index 77428cb..b5b921e 100644 --- a/src/__tests__/api/reportFragments.spec.ts +++ b/src/__tests__/api/reportFragments.spec.ts @@ -5,12 +5,19 @@ vi.mock('@/utils/request', () => ({ get: vi.fn(), post: vi.fn(), put: vi.fn(), - delete: vi.fn(), + del: vi.fn(), }, })) import request from '@/utils/request' -import { createFragments } from '@/api/reportFragments' +import { + createFragments, + deleteFragment, + getFragmentsBySession, + getPendingOwnershipFragments, + updateFragmentOwnership, + updateFragments, +} from '@/api/reportFragments' const mockedRequest = vi.mocked(request) @@ -19,17 +26,64 @@ describe('reportFragments API', () => { vi.clearAllMocks() }) - it('createFragments sends POST with sessionNum and content', async () => { + it('createFragments sends POST with 记录上下文 contextNum and content', async () => { mockedRequest.post.mockResolvedValue({ code: 200, data: { id: 1 } }) const result = await createFragments('S001', '学习了递归') expect(mockedRequest.post).toHaveBeenCalledWith( '/report-fragments', { - sessionNum: 'S001', + contextNum: 'S001', content: '学习了递归', }, { timeout: 300000 }, ) expect(result).toEqual({ code: 200, data: { id: 1 } }) }) + + it('updateFragments sends only the provided fields', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: null }) + await updateFragments(7, { content: '改后的正文' }) + expect(mockedRequest.put).toHaveBeenCalledWith('/report-fragments/7', { content: '改后的正文' }) + + await updateFragments(8, { ownerTaskNum: 'T002' }) + expect(mockedRequest.put).toHaveBeenCalledWith('/report-fragments/8', { ownerTaskNum: 'T002' }) + }) + + it('updateFragments supports clearing ownership with an empty string', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: null }) + await updateFragments(9, { ownerTaskNum: '' }) + expect(mockedRequest.put).toHaveBeenCalledWith('/report-fragments/9', { ownerTaskNum: '' }) + }) + + it('updateFragmentOwnership calls the dedicated ownership endpoint', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: null }) + await updateFragmentOwnership(3, 'T001') + expect(mockedRequest.put).toHaveBeenCalledWith('/report-fragments/3/ownership', { ownerTaskNum: 'T001' }) + }) + + it('deleteFragment sends DELETE to the fragment endpoint', async () => { + mockedRequest.del.mockResolvedValue({ code: 200 }) + await deleteFragment(5) + expect(mockedRequest.del).toHaveBeenCalledWith('/report-fragments/5') + }) + + it('getFragmentsBySession queries fragments by 记录上下文', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: [] }) + await getFragmentsBySession('S001') + expect(mockedRequest.get).toHaveBeenCalledWith('/report-fragments/session/S001') + }) + + it('getPendingOwnershipFragments queries the 待归类 list', async () => { + const fragment = { + id: 11, + contextNum: 'S001', + contextType: 'SESSION', + ownerTaskNum: null, + content: '待归类内容', + } + mockedRequest.get.mockResolvedValue({ code: 200, data: [fragment] }) + const result = await getPendingOwnershipFragments() + expect(mockedRequest.get).toHaveBeenCalledWith('/report-fragments/pending-ownership') + expect(result.data).toEqual([fragment]) + }) }) diff --git a/src/__tests__/api/review.spec.ts b/src/__tests__/api/review.spec.ts index 8ade80b..0a5ead7 100644 --- a/src/__tests__/api/review.spec.ts +++ b/src/__tests__/api/review.spec.ts @@ -11,12 +11,14 @@ vi.mock('@/utils/request', () => ({ import request from '@/utils/request' import { + deleteReport, getFragmentDetail, - getReportDetail, + getReportDetailStructured, getReviewFeed, getReviewTaskStats, getReviewTaskStatsByTask, getTaskReview, + updateReport, } from '@/api/review' const mockedRequest = vi.mocked(request) @@ -57,13 +59,25 @@ describe('review API', () => { expect(mockedRequest.get).toHaveBeenCalledWith('/review/tasks/T001') }) - it('getReportDetail calls GET /review/report/:id', async () => { + it('getReportDetailStructured calls GET /review/report/:id/structured', async () => { mockedRequest.get.mockResolvedValue({ code: 200, data: { id: 1 } }) - const result = await getReportDetail(1) - expect(mockedRequest.get).toHaveBeenCalledWith('/review/report/1') + const result = await getReportDetailStructured(1) + expect(mockedRequest.get).toHaveBeenCalledWith('/review/report/1/structured') expect(result).toEqual({ code: 200, data: { id: 1 } }) }) + it('updateReport sends only the provided sections', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: null }) + await updateReport(1, { sessionSummary: '摘要' }) + expect(mockedRequest.put).toHaveBeenCalledWith('/review/report/1', { sessionSummary: '摘要' }) + }) + + it('deleteReport sends DELETE /review/report/:id', async () => { + mockedRequest.del.mockResolvedValue({ code: 200 }) + await deleteReport(1) + expect(mockedRequest.del).toHaveBeenCalledWith('/review/report/1') + }) + it('getFragmentDetail calls GET /review/fragment/:id', async () => { mockedRequest.get.mockResolvedValue({ code: 200, data: { id: 5 } }) await getFragmentDetail(5) @@ -75,5 +89,4 @@ describe('review API', () => { await getTaskReview('T001') expect(mockedRequest.get).toHaveBeenCalledWith('/review/task/T001') }) - }) diff --git a/src/__tests__/api/studySessions.spec.ts b/src/__tests__/api/studySessions.spec.ts index 9b501e9..0e8558a 100644 --- a/src/__tests__/api/studySessions.spec.ts +++ b/src/__tests__/api/studySessions.spec.ts @@ -53,22 +53,30 @@ describe('studySessions API', () => { ) }) - it('endSession sends POST with default content', async () => { + it('endSession sends POST with the three report sections', async () => { mockedRequest.post.mockResolvedValue({ code: 200, data: null }) - await endSession('S001') + await endSession('S001', { + sessionSummary: '会话摘要', + expectationVerdict: '预期达成判断', + freeSummary: '自由总结', + }) expect(mockedRequest.post).toHaveBeenCalledWith( '/study-sessions/S001/study-sessions/ended', - { content: '任务结束' }, + { + sessionSummary: '会话摘要', + expectationVerdict: '预期达成判断', + freeSummary: '自由总结', + }, { timeout: 300000 } ) }) - it('endSession sends POST with custom content', async () => { + it('endSession sends an empty body when no section is provided', async () => { mockedRequest.post.mockResolvedValue({ code: 200, data: null }) - await endSession('S001', '自定义结束') + await endSession('S001') expect(mockedRequest.post).toHaveBeenCalledWith( '/study-sessions/S001/study-sessions/ended', - { content: '自定义结束' }, + {}, { timeout: 300000 } ) }) diff --git a/src/__tests__/api/tasks.spec.ts b/src/__tests__/api/tasks.spec.ts index 87cb289..800ce0f 100644 --- a/src/__tests__/api/tasks.spec.ts +++ b/src/__tests__/api/tasks.spec.ts @@ -14,6 +14,7 @@ import { createTaskApplication, deleteTaskApplication, getTaskApplications, + getTaskDeletionPreview, updateTaskApplication, } from '@/api/tasks' @@ -48,4 +49,21 @@ describe('tasks API', () => { await deleteTaskApplication(1) expect(mockedRequest.del).toHaveBeenCalledWith('/tasks/applications/1') }) + + it('getTaskDeletionPreview calls GET /tasks/:taskId/deletion-preview', async () => { + const preview = { + releasedFragments: 4, + deletedSessions: 2, + deletedReports: 2, + deletedMindMaps: 1, + deletedRecallRecords: 3, + deletedApplications: 1, + } + mockedRequest.get.mockResolvedValue({ code: 200, data: preview }) + + const result = await getTaskDeletionPreview(9) + + expect(mockedRequest.get).toHaveBeenCalledWith('/tasks/9/deletion-preview') + expect(result.data).toEqual(preview) + }) }) diff --git a/src/__tests__/components/StartTask.spec.ts b/src/__tests__/components/StartTask.spec.ts index 4d59024..44b3033 100644 --- a/src/__tests__/components/StartTask.spec.ts +++ b/src/__tests__/components/StartTask.spec.ts @@ -182,23 +182,24 @@ describe('StartTask.vue', () => { wrapper.unmount() }) - it('endTimer refuses empty content without calling API', async () => { + it('endTimer refuses an empty three-section report without calling API', async () => { const wrapper = await mountTask() - await wrapper.vm.endTimer('') + await wrapper.vm.endTimer({ sessionSummary: '', expectationVerdict: '', freeSummary: ' ' }) expect(ElMessage.warning).toHaveBeenCalledWith('请输入学习总结内容') expect(endSession).not.toHaveBeenCalled() wrapper.unmount() }) - it('endTimer ends session and navigates to study page', async () => { + it('endTimer submits all three sections and navigates to study page', async () => { vi.mocked(endSession).mockResolvedValue({ code: 200, message: '请求成功' } as any) const wrapper = await mountTask() - await wrapper.vm.endTimer('学习总结内容') + const sections = { sessionSummary: '摘要', expectationVerdict: '判断', freeSummary: '自由总结' } + await wrapper.vm.endTimer(sections) - expect(endSession).toHaveBeenCalledWith('SESSION_001', '学习总结内容') + expect(endSession).toHaveBeenCalledWith('SESSION_001', sections) expect(ElMessage.success).toHaveBeenCalledWith('任务结束') expect(localStorage.getItem('activeSession')).toBeNull() expect(router.currentRoute.value.path).toBe('/study') @@ -212,7 +213,7 @@ describe('StartTask.vue', () => { } as any) const wrapper = await mountTask() - await wrapper.vm.endTimer('学习总结内容') + await wrapper.vm.endTimer({ sessionSummary: '摘要', expectationVerdict: '', freeSummary: '' }) expect(ElMessage.warning).toHaveBeenCalledWith('本次有效学习时间不足10分钟,不计入总学习时间') wrapper.unmount() diff --git a/src/__tests__/components/Welcome.spec.ts b/src/__tests__/components/Welcome.spec.ts index 8634d00..32add89 100644 --- a/src/__tests__/components/Welcome.spec.ts +++ b/src/__tests__/components/Welcome.spec.ts @@ -3,21 +3,31 @@ import { flushPromises, mount } from '@vue/test-utils' import ElementPlus from 'element-plus' import { createMemoryHistory, createRouter } from 'vue-router' import Welcome from '@/components/Welcome.vue' -import { getReviewFeed } from '@/api/review' +import { getReviewFeed, getReviewTaskStats } from '@/api/review' +import { updateFragmentOwnership } from '@/api/reportFragments' +import appRouter from '@/router' import { BASE_SPEED_PX_PER_SEC, NARROW_SPEED_FACTOR } from '@/utils/autoScroll' vi.mock('@/api/review', () => ({ getReviewFeed: vi.fn(), + getReviewTaskStats: vi.fn(), getTaskReview: vi.fn(), })) +vi.mock('@/api/reportFragments', () => ({ + updateFragmentOwnership: vi.fn(), +})) + const makeFragment = (id: number) => ({ id, - sessionNum: `SESSION_${id}`, + contextNum: `SESSION_${id}`, + contextType: 'SESSION', taskName: `任务${id}`, taskNum: `T${id}`, sourceType: 'FRAGMENT', content: `残片内容${id}`, + createdTime: '2026-01-01 10:00:00', + pendingOwnership: false, }) const router = createRouter({ @@ -232,3 +242,77 @@ describe('Welcome 首页滚动条', () => { removeSpy.mockRestore() }) }) + +/** + * 待归类内容(归属-01):Feed 卡片打「待归类」标记,并在卡片上就地完成归类,不必进详情。 + */ +describe('Welcome Feed 待归类内容', () => { + beforeEach(() => { + vi.clearAllMocks() + stubLayout(4000, 1000) + vi.mocked(getReviewTaskStats).mockResolvedValue({ + code: 200, + data: [ + { taskNum: 'T002', taskName: 'TypeScript 类型体操' }, + ], + } as never) + vi.mocked(updateFragmentOwnership).mockResolvedValue({ code: 200, data: null } as never) + }) + + it('pendingOwnership 的残片在 Feed 上打「待归类」标记', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ + code: 200, + data: [{ ...makeFragment(1), taskNum: null, taskName: null, pendingOwnership: true }], + } as never) + const wrapper = await mountWelcome() + + expect(wrapper.find('.chip-pending').exists()).toBe(true) + expect(wrapper.find('.review-chip').text()).toContain('待归类') + }) + + it('点击待归类残片弹归类弹窗,选定任务后就地归类并刷新 Feed', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ + code: 200, + data: [{ ...makeFragment(1), taskNum: null, taskName: null, pendingOwnership: true }], + } as never) + const wrapper = await mountWelcome() + + await wrapper.find('.review-chip').trigger('click') + await flushPromises() + + expect(wrapper.text()).toContain('归类这条学习残片') + expect(getReviewTaskStats).toHaveBeenCalled() + + wrapper.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'T002') + await flushPromises() + + const confirm = wrapper.findAll('button').find((b) => b.text().trim() === '确定归类') + await confirm!.trigger('click') + await flushPromises() + + expect(updateFragmentOwnership).toHaveBeenCalledWith(1, 'T002') + // 归类成功后重新拉取 Feed + expect(getReviewFeed).toHaveBeenCalledTimes(2) + wrapper.unmount() + }) + + it('「升格为新任务」跳转到已有的新建任务流程并带上残片编号', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ + code: 200, + data: [{ ...makeFragment(7), taskNum: null, taskName: null, pendingOwnership: true }], + } as never) + const pushSpy = vi.spyOn(appRouter, 'push').mockResolvedValue() + const wrapper = await mountWelcome() + + await wrapper.find('.review-chip').trigger('click') + await flushPromises() + + const promote = wrapper.findAll('button').find((b) => b.text().trim() === '升格为新任务') + await promote!.trigger('click') + await flushPromises() + + expect(pushSpy).toHaveBeenCalledWith({ name: 'add-task', query: { promoteFragment: '7' } }) + pushSpy.mockRestore() + wrapper.unmount() + }) +}) diff --git a/src/__tests__/integration/review-detail-export-flow.spec.ts b/src/__tests__/integration/review-detail-export-flow.spec.ts index e91fb15..71a461a 100644 --- a/src/__tests__/integration/review-detail-export-flow.spec.ts +++ b/src/__tests__/integration/review-detail-export-flow.spec.ts @@ -3,15 +3,17 @@ import { flushPromises, mount } from '@vue/test-utils' import ElementPlus, { ElMessage } from 'element-plus' import { createMemoryHistory, createRouter } from 'vue-router' import ReviewDetail from '@/components/ReviewDetail.vue' -import { getReportDetail, getTaskReview } from '@/api/review' +import { getReportDetailStructured, getTaskReview } from '@/api/review' import { getSessionDetail } from '@/api/studySessions' import { exportTask } from '@/api/export' import { downloadTextFile } from '@/utils/download' vi.mock('@/api/review', () => ({ + deleteReport: vi.fn(), getFragmentDetail: vi.fn(), - getReportDetail: vi.fn(), + getReportDetailStructured: vi.fn(), getTaskReview: vi.fn(), + updateReport: vi.fn(), })) vi.mock('@/api/studySessions', () => ({ @@ -19,6 +21,7 @@ vi.mock('@/api/studySessions', () => ({ })) vi.mock('@/api/reportFragments', () => ({ + deleteFragment: vi.fn(), updateFragments: vi.fn(), })) @@ -33,12 +36,14 @@ vi.mock('@/utils/download', () => ({ const taskReviewItem = { id: 1, - sessionNum: 'S001', + sourceType: 'REPORT', taskNum: 'T001', taskName: '学习 Vue3 组合式 API', - sourceType: 'REPORT', content: '# 学习报告', createdTime: '2026-01-01 10:00:00', + pendingOwnership: false, + contextType: 'SESSION', + contextNum: 'S001', } const exportResult = { @@ -55,9 +60,20 @@ describe('ReviewDetail 任务导出流程(集成)', () => { beforeEach(() => { vi.clearAllMocks() vi.mocked(getTaskReview).mockResolvedValue({ code: 200, data: [taskReviewItem] }) - vi.mocked(getReportDetail).mockResolvedValue({ + vi.mocked(getReportDetailStructured).mockResolvedValue({ code: 200, - data: { content: '# 学习报告', sessionNum: 'S001' }, + data: { + id: 1, + sessionNum: 'S001', + sessionTaskNum: 'T001', + sessionTaskName: '学习 Vue3 组合式 API', + sessionExpectation: '本次学习预期', + sessionSummary: '# 会话摘要', + expectationVerdict: '基本达成', + freeSummary: '# 自由总结', + createdTime: '2026-01-01 10:00:00', + fragmentGroups: [], + }, }) vi.mocked(getSessionDetail).mockResolvedValue({ code: 200, diff --git a/src/__tests__/integration/review-export-flow.spec.ts b/src/__tests__/integration/review-export-flow.spec.ts index c1c2150..2359202 100644 --- a/src/__tests__/integration/review-export-flow.spec.ts +++ b/src/__tests__/integration/review-export-flow.spec.ts @@ -4,6 +4,7 @@ import ElementPlus, { ElDatePicker, ElDialog, ElMessage } from 'element-plus' import { createMemoryHistory, createRouter } from 'vue-router' import Review from '@/components/Review.vue' import { getReviewTaskStats } from '@/api/review' +import { getPendingOwnershipFragments } from '@/api/reportFragments' import { exportRange } from '@/api/export' import { downloadTextFile } from '@/utils/download' @@ -13,6 +14,11 @@ vi.mock('@/api/review', () => ({ getTaskReview: vi.fn(), })) +vi.mock('@/api/reportFragments', () => ({ + getPendingOwnershipFragments: vi.fn(), + updateFragmentOwnership: vi.fn(), +})) + vi.mock('@/api/export', () => ({ exportTask: vi.fn(), exportRange: vi.fn(), @@ -48,6 +54,7 @@ describe('Review 导出流程(集成)', () => { vi.clearAllMocks() vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) vi.mocked(exportRange).mockResolvedValue({ code: 200, data: exportResult }) + vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never) }) const mountReview = async () => { diff --git a/src/__tests__/integration/review-overview-flow.spec.ts b/src/__tests__/integration/review-overview-flow.spec.ts index 5d48195..c2f120f 100644 --- a/src/__tests__/integration/review-overview-flow.spec.ts +++ b/src/__tests__/integration/review-overview-flow.spec.ts @@ -4,6 +4,7 @@ import ElementPlus from 'element-plus' import { createMemoryHistory, createRouter } from 'vue-router' import Review from '@/components/Review.vue' import { getReviewTaskStats } from '@/api/review' +import { getPendingOwnershipFragments, updateFragmentOwnership } from '@/api/reportFragments' vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), @@ -11,6 +12,11 @@ vi.mock('@/api/review', () => ({ getTaskReview: vi.fn(), })) +vi.mock('@/api/reportFragments', () => ({ + getPendingOwnershipFragments: vi.fn(), + updateFragmentOwnership: vi.fn(), +})) + const tasks = [ { taskNum: 'T001', @@ -37,6 +43,7 @@ const tasks = [ describe('Review 交互流程(集成)', () => { beforeEach(() => { vi.clearAllMocks() + vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never) }) const mountReview = async () => { @@ -151,4 +158,69 @@ describe('Review 交互流程(集成)', () => { expect(wrapper.text()).toContain('暂无复习任务') expect(wrapper.text()).not.toContain('复习数据加载失败') }) + + it('有待归类碎片时展示独立区块并标出条数', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ + code: 200, + data: [ + { id: 11, contextNum: 'S001', contextType: 'SESSION', ownerTaskNum: null, content: '待归类内容 A' }, + { id: 12, contextNum: 'S002', contextType: 'SESSION', ownerTaskNum: null, content: '待归类内容 B' }, + ], + } as never) + const { wrapper } = await mountReview() + + expect(wrapper.text()).toContain('待归类内容(2 条)') + expect(wrapper.text()).toContain('待归类内容 A') + }) + + it('无待归类碎片时不展示该区块', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + const { wrapper } = await mountReview() + + expect(wrapper.text()).not.toContain('待归类内容') + }) + + it('在总览待归类区块里选任务就地归类,成功后重新拉取待归类列表', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getPendingOwnershipFragments) + .mockResolvedValueOnce({ + code: 200, + data: [{ id: 11, contextNum: 'S001', contextType: 'SESSION', ownerTaskNum: null, content: '待归类内容 A' }], + } as never) + .mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(updateFragmentOwnership).mockResolvedValue({ code: 200, data: null } as never) + const { wrapper } = await mountReview() + + expect(wrapper.text()).toContain('待归类内容(1 条)') + + wrapper.findAllComponents({ name: 'ElSelect' })[0].vm.$emit('update:modelValue', 'T002') + await flushPromises() + + const classify = wrapper.findAll('button').find((b) => b.text().trim() === '归类') + expect(classify).toBeTruthy() + await classify!.trigger('click') + await flushPromises() + + expect(updateFragmentOwnership).toHaveBeenCalledWith(11, 'T002') + expect(getPendingOwnershipFragments).toHaveBeenCalledTimes(2) + expect(wrapper.text()).not.toContain('待归类内容(1 条)') + }) + + it('「升格为新任务」跳转到已有的新建任务流程并带上碎片编号', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ + code: 200, + data: [{ id: 11, contextNum: 'S001', contextType: 'SESSION', ownerTaskNum: null, content: '待归类内容 A' }], + } as never) + const { wrapper, router } = await mountReview() + const pushSpy = vi.spyOn(router, 'push').mockResolvedValue() + + const promote = wrapper.findAll('button').find((b) => b.text().trim() === '升格为新任务') + await promote!.trigger('click') + await flushPromises() + + expect(pushSpy).toHaveBeenCalledWith({ name: 'add-task', query: { promoteFragment: '11' } }) + pushSpy.mockRestore() + }) }) diff --git a/src/__tests__/integration/review-report-flow.spec.ts b/src/__tests__/integration/review-report-flow.spec.ts new file mode 100644 index 0000000..2e388cb --- /dev/null +++ b/src/__tests__/integration/review-report-flow.spec.ts @@ -0,0 +1,164 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { flushPromises, mount } from '@vue/test-utils' +import ElementPlus, { ElMessage, ElMessageBox } from 'element-plus' +import { createMemoryHistory, createRouter } from 'vue-router' +import ReviewDetail from '@/components/ReviewDetail.vue' +import { deleteReport, getReportDetailStructured, getTaskReview, updateReport } from '@/api/review' +import { getSessionDetail } from '@/api/studySessions' + +vi.mock('@/api/review', () => ({ + deleteReport: vi.fn(), + getFragmentDetail: vi.fn(), + getReportDetailStructured: vi.fn(), + getTaskReview: vi.fn(), + updateReport: vi.fn(), +})) + +vi.mock('@/api/studySessions', () => ({ + getSessionDetail: vi.fn(), +})) + +vi.mock('@/api/reportFragments', () => ({ + deleteFragment: vi.fn(), + updateFragments: vi.fn(), +})) + +const reportDetail = { + id: 1, + sessionNum: 'S001', + sessionTaskNum: 'T001', + sessionTaskName: '学习 Vue3 组合式 API', + sessionExpectation: '理解组合式 API', + sessionSummary: '学了 ref 与 reactive', + expectationVerdict: '基本达成预期', + freeSummary: '还需要练一下 provide/inject', + createdTime: '2026-01-01 10:00:00', + fragmentGroups: [ + { + taskNum: 'T001', + taskName: '学习 Vue3 组合式 API', + branch: false, + fragments: [{ id: 11, content: 'ref 是响应式引用', ownerTaskNum: 'T001' }], + }, + { + taskNum: 'T002', + taskName: 'TypeScript 类型体操', + branch: true, + fragments: [{ id: 12, content: '1B = one billion', ownerTaskNum: 'T002' }], + }, + ], +} + +/** + * 交互式集成测试:学习报告结构化展示 + 编辑 + 删除(报告-01)。 + * 删除报告必须明示「本次学习的 N 条碎片会保留」,因为碎片可能已归属到其他任务。 + */ +describe('ReviewDetail 报告结构化管理(集成)', () => { + beforeEach(() => { + vi.clearAllMocks() + vi.mocked(getReportDetailStructured).mockResolvedValue({ code: 200, data: reportDetail } as never) + vi.mocked(getTaskReview).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(getSessionDetail).mockResolvedValue({ + code: 200, + data: { + sessionNum: 'S001', + sessionState: 'ENDED', + taskNum: 'T001', + taskId: 1, + taskName: '学习 Vue3 组合式 API', + actualTime: 600, + effectiveTime: 500, + effectivenessRatio: 0.8, + }, + } as never) + vi.mocked(updateReport).mockResolvedValue({ code: 200, data: null } as never) + vi.mocked(deleteReport).mockResolvedValue({ code: 200, data: null } as never) + vi.mocked(ElMessageBox.confirm).mockResolvedValue('confirm') + }) + + const mountReport = async () => { + const router = createRouter({ + history: createMemoryHistory(), + routes: [ + { path: '/review', component: { template: '
' } }, + { path: '/review/detail/:type/:id', component: ReviewDetail }, + ], + }) + await router.push('/review/detail/report/1') + await router.isReady() + + const wrapper = mount(ReviewDetail, { + global: { + plugins: [ElementPlus, router], + stubs: { ElTag: true }, + }, + }) + await flushPromises() + return { wrapper, router } + } + + it('按三段标题展示报告,第四段按内容归属分组并标注旁支', async () => { + const { wrapper } = await mountReport() + + const text = wrapper.text() + expect(text).toContain('会话摘要') + expect(text).toContain('预期达成判断') + expect(text).toContain('按内容归属分组的碎片') + expect(text).toContain('自由总结') + expect(text).toContain('学了 ref 与 reactive') + expect(text).toContain('基本达成预期') + expect(text).toContain('1B = one billion') + expect(text).toContain('旁支') + }) + + it('编辑报告三段后一起提交,界面同步更新', async () => { + const { wrapper } = await mountReport() + + const editButton = wrapper.findAll('button').find((b) => b.text().trim() === '编辑报告') + await editButton!.trigger('click') + await flushPromises() + + const textareas = wrapper.findAll('textarea') + expect(textareas).toHaveLength(3) + await textareas[0].setValue('新的会话摘要') + await textareas[1].setValue('新的预期判断') + await textareas[2].setValue('新的自由总结') + + const saveButton = wrapper.findAll('button').find((b) => b.text().trim() === '保存') + await saveButton!.trigger('click') + await flushPromises() + + expect(updateReport).toHaveBeenCalledWith(1, { + sessionSummary: '新的会话摘要', + expectationVerdict: '新的预期判断', + freeSummary: '新的自由总结', + }) + expect(ElMessage.success).toHaveBeenCalledWith('报告已更新') + expect(wrapper.text()).toContain('新的会话摘要') + }) + + it('删除报告时明示碎片会保留,确认后调用删除接口并回到总览', async () => { + const { wrapper, router } = await mountReport() + + const deleteButton = wrapper.findAll('button').find((b) => b.text().trim() === '删除报告') + await deleteButton!.trigger('click') + await flushPromises() + + const confirmMessage = vi.mocked(ElMessageBox.confirm).mock.calls[0][0] + expect(String(confirmMessage)).toContain('2 条碎片会保留') + expect(deleteReport).toHaveBeenCalledWith(1) + expect(ElMessage.success).toHaveBeenCalledWith('学习报告已删除') + expect(router.currentRoute.value.path).toBe('/review') + }) + + it('用户取消删除时不调用删除接口', async () => { + vi.mocked(ElMessageBox.confirm).mockRejectedValue('cancel') + const { wrapper } = await mountReport() + + const deleteButton = wrapper.findAll('button').find((b) => b.text().trim() === '删除报告') + await deleteButton!.trigger('click') + await flushPromises() + + expect(deleteReport).not.toHaveBeenCalled() + }) +}) diff --git a/src/__tests__/integration/start-task-conflict-flow.spec.ts b/src/__tests__/integration/start-task-conflict-flow.spec.ts index 5e75eed..fc8d04c 100644 --- a/src/__tests__/integration/start-task-conflict-flow.spec.ts +++ b/src/__tests__/integration/start-task-conflict-flow.spec.ts @@ -140,7 +140,7 @@ describe('StartTask 活跃会话拦截出口(集成,会话-05)', () => { expect(endSession).toHaveBeenCalledWith( 'SESSION_OLD', - expect.stringContaining('开始新任务时结束了这个会话'), + { freeSummary: expect.stringContaining('开始新任务时结束了这个会话') }, ) // 解除阻塞后继续开始当前任务 expect(startOrContinueStudySession).toHaveBeenCalledWith('T001') diff --git a/src/__tests__/integration/start-task-flow.spec.ts b/src/__tests__/integration/start-task-flow.spec.ts index d4ca7d0..d082b7c 100644 --- a/src/__tests__/integration/start-task-flow.spec.ts +++ b/src/__tests__/integration/start-task-flow.spec.ts @@ -157,4 +157,33 @@ describe('StartTask 交互流程(集成)', () => { expect(endSession).not.toHaveBeenCalled() wrapper.unmount() }) + + it('结束会话弹窗按三段分别编辑,提交时三段一起发', async () => { + vi.mocked(endSession).mockResolvedValue(ok()) + const { wrapper } = await mountPage() + + await findButton(wrapper, '结束会话').trigger('click') + await flushPromises() + + // 报告为结构化三段,各自标题化呈现 + expect(wrapper.text()).toContain('会话摘要') + expect(wrapper.text()).toContain('预期达成判断') + expect(wrapper.text()).toContain('自由总结') + + const textareas = wrapper.findAll('textarea') + expect(textareas).toHaveLength(3) + await textareas[0].setValue('会话摘要内容') + await textareas[1].setValue('预期达成判断内容') + await textareas[2].setValue('自由总结内容') + + await findButton(wrapper, '确认结束').trigger('click') + await flushPromises() + + expect(endSession).toHaveBeenCalledWith('SESSION_001', { + sessionSummary: '会话摘要内容', + expectationVerdict: '预期达成判断内容', + freeSummary: '自由总结内容', + }) + wrapper.unmount() + }) }) diff --git a/src/__tests__/integration/study-delete-flow.spec.ts b/src/__tests__/integration/study-delete-flow.spec.ts new file mode 100644 index 0000000..ab37085 --- /dev/null +++ b/src/__tests__/integration/study-delete-flow.spec.ts @@ -0,0 +1,135 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { flushPromises, mount } from '@vue/test-utils' +import ElementPlus, { ElMessage } from 'element-plus' +import { createMemoryHistory, createRouter } from 'vue-router' +import Study from '@/components/Study.vue' +import request from '@/utils/request' +import { getTaskDeletionPreview, getTaskApplications } from '@/api/tasks' +import { getReviewTaskStatsByTask } from '@/api/review' + +vi.mock('@/utils/request', () => ({ + default: { + get: vi.fn(), + post: vi.fn(), + put: vi.fn(), + del: vi.fn(), + request: vi.fn(), + }, +})) + +vi.mock('@/api/tasks', () => ({ + getPriorityWeights: vi.fn(), + getTaskApplications: vi.fn(), + getTaskDeletionPreview: vi.fn(), + savePriorityWeights: vi.fn(), + updateTaskApplication: vi.fn(), +})) + +vi.mock('@/api/review', () => ({ + getReviewTaskStatsByTask: vi.fn(), +})) + +const mockedRequest = vi.mocked(request) + +const taskRecord = { + id: 9, + taskNum: 'T009', + taskName: '删除前的任务', + taskDescription: '描述', + materialUrl: '', + taskPriority: 3, +} + +const deletionPreview = { + releasedFragments: 4, + deletedSessions: 2, + deletedReports: 2, + deletedMindMaps: 1, + deletedRecallRecords: 3, + deletedApplications: 1, +} + +/** + * 交互式集成测试:删除任务前先拉影响范围,弹窗分两栏列出 + * 「即将删除」与「即将保留(碎片进入待归类)」,避免用户以为删干净了。 + */ +describe('Study 删除任务影响范围(集成)', () => { + beforeEach(() => { + vi.clearAllMocks() + vi.mocked(request.get).mockResolvedValue({ + code: 200, + data: { total: 1, records: [taskRecord] }, + } as never) + vi.mocked(request.del).mockResolvedValue({ code: 200, data: null } as never) + vi.mocked(getTaskDeletionPreview).mockResolvedValue({ code: 200, data: deletionPreview } as never) + vi.mocked(getTaskApplications).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(getReviewTaskStatsByTask).mockResolvedValue({ code: 200, data: {} } as never) + }) + + const mountStudy = async () => { + const router = createRouter({ + history: createMemoryHistory(), + routes: [ + { path: '/study', component: Study }, + { path: '/add-task', name: 'add-task', component: { template: '
' } }, + { path: '/update-task/:taskId', name: 'update-task', component: { template: '
' } }, + { path: '/start-task/:taskNum', component: { template: '
' } }, + ], + }) + await router.push('/study') + await router.isReady() + + const wrapper = mount(Study, { + global: { + plugins: [ElementPlus, router], + stubs: { ElTag: true }, + }, + }) + await flushPromises() + return { wrapper } + } + + it('点击删除任务先拉取影响范围,弹窗分两栏列出删除项与保留项', async () => { + const { wrapper } = await mountStudy() + + const removeButton = wrapper.findAll('button').find((b) => b.text().trim() === '删除任务') + await removeButton!.trigger('click') + await flushPromises() + + expect(getTaskDeletionPreview).toHaveBeenCalledWith(9) + const text = wrapper.text() + expect(text).toContain('即将删除') + expect(text).toContain('即将保留') + expect(text).toContain('学习会话:2 个') + expect(text).toContain('学习报告:2 份') + expect(text).toContain('学习残片:4 条') + expect(text).toContain('进入「待归类」') + }) + + it('确认删除后调用任务删除接口并从列表移除', async () => { + const { wrapper } = await mountStudy() + + const removeButton = wrapper.findAll('button').find((b) => b.text().trim() === '删除任务') + await removeButton!.trigger('click') + await flushPromises() + + const confirm = wrapper.findAll('button').find((b) => b.text().trim() === '确定删除') + await confirm!.trigger('click') + await flushPromises() + + expect(mockedRequest.del).toHaveBeenCalledWith('/tasks/9', {}) + expect(ElMessage.success).toHaveBeenCalledWith('任务 删除前的任务 删除成功') + }) + + it('拉取影响范围失败时不弹出删除弹窗,也不删除任务', async () => { + vi.mocked(getTaskDeletionPreview).mockRejectedValue({ code: 500, message: '服务异常' }) + const { wrapper } = await mountStudy() + + const removeButton = wrapper.findAll('button').find((b) => b.text().trim() === '删除任务') + await removeButton!.trigger('click') + await flushPromises() + + expect(wrapper.text()).not.toContain('即将保留') + expect(mockedRequest.del).not.toHaveBeenCalled() + }) +}) diff --git a/src/api/reportFragments.ts b/src/api/reportFragments.ts index 2b54e64..41615ba 100644 --- a/src/api/reportFragments.ts +++ b/src/api/reportFragments.ts @@ -4,14 +4,54 @@ import request from "@/utils/request"; // 残片生成走 AI 聚合,耗时较长,放宽到 5 分钟(默认全局 30s) const AI_TIMEOUT = { timeout: 300_000 }; -export const createFragments = (sessionNum: string, content: string) => { - return request.post(`/report-fragments`, { sessionNum, content }, AI_TIMEOUT) +/** 记录上下文类型:碎片产生于学习会话或复习行为 */ +export type FragmentContextType = "SESSION" | "REVIEW"; + +/** + * 知识碎片同时承载两个维度:记录上下文(contextType + contextNum,系统确定、不可变) + * 与内容归属(ownerTaskNum,用户可改、可为空;为空即待归类)。 + */ +export interface ReportFragment { + id: number; + contextNum: string; + contextType: FragmentContextType; + /** 内容归属的任务编号;null 表示待归类 */ + ownerTaskNum: string | null; + content: string; + createdTime?: string; } -export const updateFragments = (id: number, content: string) => { - return request.put(`/report-fragments/${id}`, { content }) +export const createFragments = (contextNum: string, content: string) => { + return request.post(`/report-fragments`, { contextNum, content }, AI_TIMEOUT) } +/** + * 修改碎片正文与内容归属:不传的字段表示本次不改; + * ownerTaskNum 传空串表示清空归属(回到待归类)。 + */ +export const updateFragments = ( + id: number, + payload: { content?: string; ownerTaskNum?: string }, +) => { + return request.put(`/report-fragments/${id}`, payload) +} + +/** 专门的归类动作;ownerTaskNum 传空串表示回到待归类 */ +export const updateFragmentOwnership = (id: number, ownerTaskNum: string) => { + return request.put(`/report-fragments/${id}/ownership`, { ownerTaskNum }) +} + +/** 软删除知识碎片 */ +export const deleteFragment = (id: number) => { + return request.del(`/report-fragments/${id}`) +} + +/** 某会话产生的碎片(按记录上下文查询) */ export const getFragmentsBySession = (sessionNum: string) => { - return request.get(`/report-fragments/session/${sessionNum}`) + return request.get(`/report-fragments/session/${sessionNum}`) +} + +/** 待归类内容:还没有内容归属的碎片,按时间倒序 */ +export const getPendingOwnershipFragments = () => { + return request.get(`/report-fragments/pending-ownership`) } diff --git a/src/api/review.ts b/src/api/review.ts index ab2c418..0eaa122 100644 --- a/src/api/review.ts +++ b/src/api/review.ts @@ -1,13 +1,25 @@ import request from "@/utils/request"; +import type { ReportFragment } from "./reportFragments"; +/** + * 复习 Feed / 任务记录条目,同时承载两个独立维度: + * - taskNum / taskName 是内容归属:碎片取自身归属,报告取产生它的会话所属任务; + * - contextType / contextNum 是记录上下文:用于界面按来源分组。 + */ export interface ReviewFeedItem { id: number; - sessionNum: string; - taskNum: string; - taskName: string; sourceType: "REPORT" | "FRAGMENT"; + /** 内容归属的任务编号;碎片待归类时为 null */ + taskNum: string | null; + taskName: string | null; content: string; createdTime: string; + /** 仅碎片有意义:内容归属为空,等待归类 */ + pendingOwnership: boolean; + /** 记录上下文类型:SESSION | REVIEW */ + contextType: string | null; + /** 记录上下文编号:学习会话编号或复习行为编号 */ + contextNum: string | null; } export interface ReviewTaskStats { @@ -24,6 +36,43 @@ export interface ReviewTaskStats { reviewDurationSeconds: number; } +/** 学习报告第四段里的一条碎片(按当前内容归属实时聚合而来) */ +export interface StudyReportFragment { + id: number; + content: string; + contextType?: string | null; + contextNum?: string | null; + ownerTaskNum?: string | null; + createdTime?: string; +} + +/** 学习报告第四段:按内容归属分组后的一组碎片 */ +export interface FragmentGroup { + /** 归属任务编号;null 表示待归类 */ + taskNum: string | null; + taskName: string | null; + /** 旁支:归属不等于本报告所属会话的任务 */ + branch: boolean; + fragments: StudyReportFragment[]; +} + +/** 学习报告结构化详情:三段落库文本 + 第四段实时聚合的碎片分组 */ +export interface StudyReportDetail { + id: number; + sessionNum: string; + sessionTaskNum?: string | null; + sessionTaskName?: string | null; + sessionExpectation?: string | null; + /** 会话摘要:这次实际学了什么 */ + sessionSummary: string | null; + /** 预期达成判断:对照学习预期得出的结论 */ + expectationVerdict: string | null; + /** 自由总结:用户对本次学习的叙述 */ + freeSummary: string | null; + createdTime: string; + fragmentGroups: FragmentGroup[]; +} + export const getReviewFeed = (limit: number = 30, mode: "recent" | "random" | "smart" = "recent") => { return request.get("/review/feed", { limit, mode }); }; @@ -36,14 +85,27 @@ export const getReviewTaskStatsByTask = (taskNum: string) => { return request.get(`/review/tasks/${taskNum}`); }; -export const getReportDetail = (id: number) => { - return request.get(`/review/report/${id}`); +export const getReportDetailStructured = (id: number) => { + return request.get(`/review/report/${id}/structured`); +}; + +/** 修改报告三段文本;不传的段表示本次不改,传空串表示清空该段 */ +export const updateReport = ( + id: number, + payload: { sessionSummary?: string; expectationVerdict?: string; freeSummary?: string }, +) => { + return request.put(`/review/report/${id}`, payload); +}; + +/** 删除报告(软删除);不连带删除知识碎片 */ +export const deleteReport = (id: number) => { + return request.del(`/review/report/${id}`); }; export const getFragmentDetail = (id: number) => { - return request.get(`/review/fragment/${id}`); + return request.get(`/review/fragment/${id}`); }; export const getTaskReview = (taskNum: string) => { - return request.get(`/review/task/${taskNum}`); + return request.get(`/review/task/${taskNum}`); }; diff --git a/src/api/standardMindMap.ts b/src/api/standardMindMap.ts index 3255147..e729c38 100644 --- a/src/api/standardMindMap.ts +++ b/src/api/standardMindMap.ts @@ -15,6 +15,9 @@ export interface StandardMindMap { generatedTime?: string; createdTime?: string; lastModifiedTime?: string; + /** 内容归属发生变化后置为 true:表示这张导图需要重建(重建由用户手动触发) */ + needsUpdate?: boolean; + needsUpdateTime?: string; } export interface RecallRecord { diff --git a/src/api/studySessions.ts b/src/api/studySessions.ts index 2c54dac..5e39207 100644 --- a/src/api/studySessions.ts +++ b/src/api/studySessions.ts @@ -49,9 +49,19 @@ export const pauseSession = (sessionNum: string, endTime?: Date) => { return request.post(`/study-sessions/${sessionNum}/study-sessions/pause`, null, { params }); }; +/** 结束学习会话时提交的学习报告:三段文本都为可选,但至少要有一段 */ +export interface ReportSections { + /** 会话摘要:这次实际学了什么 */ + sessionSummary?: string; + /** 预期达成判断:对照学习预期得出的结论 */ + expectationVerdict?: string; + /** 自由总结:用户对本次学习的叙述 */ + freeSummary?: string; +} + /** 结束会话会触发后端报告生成,耗时较长 */ -export const endSession = (sessionNum: string, content: string = "任务结束") => { - return request.post(`/study-sessions/${sessionNum}/study-sessions/ended`, { content }, AI_TIMEOUT); +export const endSession = (sessionNum: string, sections: ReportSections = {}) => { + return request.post(`/study-sessions/${sessionNum}/study-sessions/ended`, sections, AI_TIMEOUT); }; /** 误操作结束学习会话:需输入确认语,严格零数据关闭(删除会话与预期) */ diff --git a/src/api/tasks.ts b/src/api/tasks.ts index d513dd1..12aa400 100644 --- a/src/api/tasks.ts +++ b/src/api/tasks.ts @@ -43,6 +43,23 @@ export const deleteTaskApplication = (id: number) => { return request.del(`/tasks/applications/${id}`); }; +// ============ 任务删除影响范围 ============ + +/** 删除任务前的预览:哪些会一并删除、哪些会保留并进入待归类 */ +export interface TaskDeletionPreview { + /** 将保留的知识碎片条数(内容归属置空,进入待归类) */ + releasedFragments: number; + deletedSessions: number; + deletedReports: number; + deletedMindMaps: number; + deletedRecallRecords: number; + deletedApplications: number; +} + +export const getTaskDeletionPreview = (taskId: number) => { + return request.get(`/tasks/${taskId}/deletion-preview`); +}; + // ============ 优先级权重配置 ============ export interface PriorityWeights { diff --git a/src/components/Review.vue b/src/components/Review.vue index 0ba8545..92acd8f 100644 --- a/src/components/Review.vue +++ b/src/components/Review.vue @@ -6,6 +6,11 @@ import { getReviewTaskStats, type ReviewTaskStats, } from "@/api/review"; +import { + getPendingOwnershipFragments, + updateFragmentOwnership, + type ReportFragment, +} from "@/api/reportFragments"; import { exportRange, type ExportFormat } from "@/api/export"; import { downloadTextFile } from "@/utils/download"; @@ -15,6 +20,11 @@ const loading = ref(false); const loadFailed = ref(false); const tasks = ref([]); +// 待归类内容:归属-01 要求在总览里独立成块,回答「还欠多少」 +const pendingFragments = ref([]); +const pendingSelection = ref>({}); +const classifyingId = ref(null); + const exportDialogVisible = ref(false); const exportScope = ref<"all" | "range">("all"); const exportDateRange = ref<[string, string] | null>(null); @@ -55,6 +65,43 @@ const openTaskReview = (row: ReviewTaskStats) => { router.push(`/review/detail/task/${encodeURIComponent(row.taskNum)}`); }; +const loadPendingOwnership = async () => { + try { + const res = await getPendingOwnershipFragments(); + pendingFragments.value = res?.data || []; + } catch { + // 待归类加载失败不影响总览主体 + pendingFragments.value = []; + } +}; + +/** 就地归类到已有任务 */ +const confirmPendingClassify = async (fragment: ReportFragment) => { + const ownerTaskNum = pendingSelection.value[fragment.id]; + if (!ownerTaskNum) { + ElMessage.warning("请先选择要归类到的任务"); + return; + } + if (classifyingId.value !== null) return; + classifyingId.value = fragment.id; + try { + const res = await updateFragmentOwnership(fragment.id, ownerTaskNum); + if (res?.code === 200) { + ElMessage.success("已归类,这条内容有了归属任务"); + await loadPendingOwnership(); + } + } catch { + // 请求层已提示具体错误 + } finally { + classifyingId.value = null; + } +}; + +/** 升格为新任务:走已有的新建任务流程,创建后由 TaskForm 调用归类接口 */ +const promotePendingFragment = (fragment: ReportFragment) => { + router.push({ name: "add-task", query: { promoteFragment: String(fragment.id) } }); +}; + const openExportDialog = () => { exportScope.value = "all"; exportDateRange.value = null; @@ -93,6 +140,7 @@ const confirmExport = async () => { onMounted(() => { loadTasks(); + loadPendingOwnership(); }); @@ -118,6 +166,41 @@ onMounted(() => {
+
+
+

待归类内容({{ pendingFragments.length }} 条)

+ 这些内容还没有归属任务,选一个任务归类,或升格为新任务。 +
+
+
+
{{ fragment.content }}
+
+ + + + 归类 + 升格为新任务 +
+
+
+
+
{ gap: 10px; } +.pending-card { + padding: 16px 18px; + display: flex; + flex-direction: column; + gap: 12px; +} + +.pending-head { + display: flex; + align-items: baseline; + flex-wrap: wrap; + gap: 8px 12px; +} + +.pending-head h3 { + margin: 0; + font-size: 15px; + color: var(--green-900); +} + +.pending-hint { + font-size: 13px; + color: var(--text-secondary); +} + +.pending-list { + display: flex; + flex-direction: column; + gap: 10px; +} + +.pending-item { + border: 1px solid var(--border-soft); + border-left: 3px solid var(--accent-warning); + border-radius: 8px; + padding: 10px 12px; + background: var(--accent-warning-soft); + display: flex; + flex-direction: column; + gap: 8px; +} + +.pending-content { + font-size: 14px; + line-height: 1.7; + color: var(--text-primary); + word-break: break-word; + overflow-wrap: anywhere; +} + +.pending-actions { + display: flex; + justify-content: flex-end; + flex-wrap: wrap; + gap: 8px; +} + +.pending-select { + width: 200px; +} + .task-card { padding: 14px 16px; display: flex; @@ -342,5 +486,9 @@ onMounted(() => { width: auto; margin-left: auto; } + + .pending-select { + width: 100%; + } } diff --git a/src/components/ReviewDetail.vue b/src/components/ReviewDetail.vue index 3a19492..2e6393c 100644 --- a/src/components/ReviewDetail.vue +++ b/src/components/ReviewDetail.vue @@ -2,18 +2,21 @@ import { computed, ref, watch } from "vue"; import { useRoute, useRouter } from "vue-router"; import { + deleteReport, getFragmentDetail, - getReportDetail, + getReportDetailStructured, getTaskReview, + updateReport, type ReviewFeedItem, + type StudyReportDetail, } from "@/api/review"; import { getSessionDetail } from "@/api/studySessions"; import type { SessionDetail } from "@/api/studySessions"; -import { updateFragments } from "@/api/reportFragments"; +import { deleteFragment, updateFragments } from "@/api/reportFragments"; import { exportTask, type ExportFormat } from "@/api/export"; import { downloadTextFile } from "@/utils/download"; import { formatRatio } from "@/utils/format"; -import { ElMessage } from "element-plus"; +import { ElMessage, ElMessageBox } from "element-plus"; import MarkdownRenderer from "@/components/MarkdownRenderer.vue"; const route = useRoute(); @@ -23,8 +26,8 @@ const router = useRouter(); const goToRecall = () => { const tn = taskNum.value; if (!tn) return; - if (content.value && content.value.trim()) { - router.push(`/review/recall/${tn}?focusContent=${encodeURIComponent(content.value.substring(0, 500))}`); + if (focusText.value && focusText.value.trim()) { + router.push(`/review/recall/${tn}?focusContent=${encodeURIComponent(focusText.value.substring(0, 500))}`); } else { router.push(`/review/recall/${tn}`); } @@ -42,10 +45,21 @@ const content = ref(""); const sourceTypeLabel = ref(""); const taskNum = ref(""); +/** 报告结构化详情(三段文本 + 按当前内容归属聚合的碎片分组) */ +const reportDetail = ref(null); +/** 残片的内容归属;null 表示待归类 */ +const fragmentOwnership = ref(null); + const isEditing = ref(false); const editContent = ref(""); const saving = ref(false); +// 报告三段编辑 +const isEditingReport = ref(false); +const editReport = ref({ sessionSummary: "", expectationVerdict: "", freeSummary: "" }); +const savingReport = ref(false); +const deleting = ref(false); + const exportDialogVisible = ref(false); const exportFormat = ref("markdown"); const exporting = ref(false); @@ -53,12 +67,35 @@ const exporting = ref(false); const sessionInfo = ref(null); const taskSessions = ref<{ - sessionNum: string; + contextNum: string; startTime: string; report: ReviewFeedItem | null; fragments: ReviewFeedItem[]; }[]>([]); +/** 回忆复习起点使用的正文 */ +const focusText = computed(() => { + if (contentType.value === "report") { + const detail = reportDetail.value; + return detail ? (detail.freeSummary || detail.sessionSummary || "") : ""; + } + return content.value; +}); + +/** 本次学习产生的碎片条数(删除报告时用于说明碎片会保留) */ +const reportFragmentCount = computed(() => + (reportDetail.value?.fragmentGroups || []).reduce((acc, group) => acc + group.fragments.length, 0), +); + +/** 从异常里取用户可见文案 */ +const errorMessageOf = (error: unknown, fallback: string): string => { + if (error && typeof error === "object" && "message" in error) { + const message = (error as { message?: unknown }).message; + if (typeof message === "string" && message.trim()) return message; + } + return fallback; +}; + const formatDuration = (seconds?: number): string => { if (seconds == null) return "-"; const h = Math.floor(seconds / 3600); @@ -69,6 +106,7 @@ const formatDuration = (seconds?: number): string => { return `${s}秒`; }; +/** 任务记录按记录上下文(contextNum)分组:报告与碎片是两个视角,不重复 */ const loadTaskHistory = async (tn: string) => { try { const res = await getTaskReview(tn); @@ -76,20 +114,21 @@ const loadTaskHistory = async (tn: string) => { const map = new Map(); for (const item of items) { - const entry = map.get(item.sessionNum) || { report: null, fragments: [], startTime: item.createdTime }; + const contextKey = item.contextNum || "unknown"; + const entry = map.get(contextKey) || { report: null, fragments: [], startTime: item.createdTime }; if (item.sourceType === "REPORT") { entry.report = item; } else { entry.fragments.push(item); } - if (!map.has(item.sessionNum)) { - map.set(item.sessionNum, entry); + if (!map.has(contextKey)) { + map.set(contextKey, entry); } } taskSessions.value = Array.from(map.entries()) - .map(([sessionNum, data]) => ({ - sessionNum, + .map(([contextNum, data]) => ({ + contextNum, startTime: data.startTime, report: data.report, fragments: data.fragments, @@ -103,10 +142,13 @@ const loadTaskHistory = async (tn: string) => { const loadDetail = async () => { loading.value = true; isEditing.value = false; + isEditingReport.value = false; editContent.value = ""; content.value = ""; sourceTypeLabel.value = ""; taskNum.value = ""; + reportDetail.value = null; + fragmentOwnership.value = null; sessionInfo.value = null; taskSessions.value = []; if (isTaskMode.value) { @@ -122,31 +164,46 @@ const loadDetail = async () => { activeType.value = first.sourceType.toLowerCase(); activeId.value = first.id; } - let res; if (contentType.value === "report") { - res = await getReportDetail(contentId.value); sourceTypeLabel.value = "学习报告"; - } else { - res = await getFragmentDetail(contentId.value); - sourceTypeLabel.value = "学习残片"; - } - const data = res?.data; - content.value = data?.content || ""; - - const sessionNum = data?.sessionNum; - if (sessionNum) { - try { - const sessionRes = await getSessionDetail(sessionNum); - const info = sessionRes?.data; - sessionInfo.value = info || null; - taskNum.value = info?.taskNum || ""; - - if (info?.taskNum) { - await loadTaskHistory(info.taskNum); + const res = await getReportDetailStructured(contentId.value); + const detail = res?.data; + if (!detail) return; + reportDetail.value = detail; + editReport.value = { + sessionSummary: detail.sessionSummary || "", + expectationVerdict: detail.expectationVerdict || "", + freeSummary: detail.freeSummary || "", + }; + taskNum.value = detail.sessionTaskNum || ""; + if (detail.sessionNum) { + try { + const sessionRes = await getSessionDetail(detail.sessionNum); + sessionInfo.value = sessionRes?.data || null; + } catch { + // 非关键数据 } - } catch { - // 非关键数据 } + } else { + sourceTypeLabel.value = "学习残片"; + const res = await getFragmentDetail(contentId.value); + const data = res?.data; + if (!data) return; + content.value = data.content || ""; + fragmentOwnership.value = data.ownerTaskNum || null; + if (data.contextNum) { + try { + const sessionRes = await getSessionDetail(data.contextNum); + const info = sessionRes?.data; + sessionInfo.value = info || null; + taskNum.value = data.ownerTaskNum || info?.taskNum || ""; + } catch { + // 非关键数据 + } + } + } + if (taskNum.value) { + await loadTaskHistory(taskNum.value); } } finally { loading.value = false; @@ -207,7 +264,7 @@ const saveEdit = async () => { } saving.value = true; try { - const res = await updateFragments(contentId.value, editContent.value); + const res = await updateFragments(contentId.value, { content: editContent.value }); if (res?.code === 200) { content.value = editContent.value; isEditing.value = false; @@ -218,13 +275,110 @@ const saveEdit = async () => { } else { ElMessage.error(res?.message || "保存失败"); } - } catch (e: any) { - ElMessage.error(e.message || "请求失败"); + } catch (e: unknown) { + ElMessage.error(errorMessageOf(e, "请求失败")); } finally { saving.value = false; } }; +// ============ 报告的编辑与删除(报告-01) ============ + +const enterReportEdit = () => { + const detail = reportDetail.value; + if (!detail) return; + editReport.value = { + sessionSummary: detail.sessionSummary || "", + expectationVerdict: detail.expectationVerdict || "", + freeSummary: detail.freeSummary || "", + }; + isEditingReport.value = true; +}; + +const cancelReportEdit = () => { + isEditingReport.value = false; +}; + +const saveReportEdit = async () => { + const detail = reportDetail.value; + if (!detail || savingReport.value) return; + savingReport.value = true; + try { + const payload = { + sessionSummary: editReport.value.sessionSummary, + expectationVerdict: editReport.value.expectationVerdict, + freeSummary: editReport.value.freeSummary, + }; + const res = await updateReport(detail.id, payload); + if (res?.code === 200) { + detail.sessionSummary = payload.sessionSummary; + detail.expectationVerdict = payload.expectationVerdict; + detail.freeSummary = payload.freeSummary; + isEditingReport.value = false; + ElMessage.success("报告已更新"); + } else { + ElMessage.error(res?.message || "保存失败"); + } + } catch (e: unknown) { + ElMessage.error(errorMessageOf(e, "请求失败")); + } finally { + savingReport.value = false; + } +}; + +const removeReport = async () => { + const detail = reportDetail.value; + if (!detail || deleting.value) return; + // 碎片是独立原料,可能已归属到其他任务:删除报告不连带删碎片,必须明示 + const count = reportFragmentCount.value; + try { + await ElMessageBox.confirm( + `删除这份学习报告后不可恢复。本次学习的 ${count} 条碎片会保留,不会被一并删除(它们可能已归属到其他任务)。`, + "确认删除", + { confirmButtonText: "确定删除", cancelButtonText: "取消", type: "warning" }, + ); + } catch { + return; + } + deleting.value = true; + try { + const res = await deleteReport(detail.id); + if (res?.code === 200) { + ElMessage.success("学习报告已删除"); + await router.push("/review"); + } + } catch { + // 请求层已提示具体错误 + } finally { + deleting.value = false; + } +}; + +const removeFragment = async () => { + if (deleting.value) return; + try { + await ElMessageBox.confirm( + "删除这条学习残片后不可恢复。它所属的学习报告不会一并删除。", + "确认删除", + { confirmButtonText: "确定删除", cancelButtonText: "取消", type: "warning" }, + ); + } catch { + return; + } + deleting.value = true; + try { + const res = await deleteFragment(contentId.value); + if (res?.code === 200) { + ElMessage.success("学习残片已删除"); + await router.push("/review"); + } + } catch { + // 请求层已提示具体错误 + } finally { + deleting.value = false; + } +}; + watch( () => [route.params.type, route.params.id, route.params.taskNum], () => { @@ -264,6 +418,14 @@ watch( > 编辑 + + 编辑报告 + 导出该任务 + + {{ contentType === "report" ? "删除报告" : "删除残片" }} +
实际:{{ formatDuration(sessionInfo.actualTime) }} @@ -288,8 +460,42 @@ watch( 效率:{{ formatRatio(sessionInfo.effectivenessRatio) }}
- -
+ +
+
+ 会话摘要 + +
+
+ 预期达成判断 + +
+
+ 自由总结 + +
+
+ 取消 + 保存 +
+
+ +
保存
- + + + @@ -315,15 +570,15 @@ watch(

该任务下的所有学习记录

{{ session.startTime?.replace("T", " ")?.substring(0, 16) }} - 当前 + 当前
@@ -436,6 +691,130 @@ watch( padding: 40px 0; } +.ownership-hint { + margin: 16px 0 0; + font-size: 12px; + color: var(--text-secondary); +} + +/* 报告结构化展示 */ +.report-body { + display: flex; + flex-direction: column; + gap: 18px; +} + +.report-section + .report-section { + padding-top: 16px; + border-top: 1px solid var(--border-soft); +} + +.report-section h4 { + margin: 0 0 8px; + font-size: 14px; + color: var(--green-800); +} + +.report-text { + line-height: 1.8; + color: var(--text-primary); + font-size: 15px; + word-break: break-word; + overflow-wrap: break-word; +} + +.empty-section { + margin: 0; + color: var(--text-secondary); + font-size: 13px; +} + +.fragment-groups { + display: flex; + flex-direction: column; + gap: 12px; +} + +.fragment-group { + border: 1px solid var(--border-soft); + border-radius: 8px; + padding: 10px 12px; + background: #fbfefc; +} + +.fragment-group-head { + display: flex; + align-items: center; + gap: 8px; + margin-bottom: 8px; +} + +.fragment-group-name { + font-size: 13px; + font-weight: 600; + color: var(--green-900); +} + +.branch-badge { + font-size: 11px; + font-weight: 700; + padding: 1px 8px; + border-radius: 10px; + background: var(--accent-warning-soft); + color: var(--accent-warning-strong); +} + +.fragment-group-item { + font-size: 14px; + line-height: 1.7; + color: var(--text-primary); + padding: 6px 0; + border-top: 1px dashed var(--border-soft); + word-break: break-word; + overflow-wrap: break-word; +} + +.fragment-group-item:first-of-type { + border-top: none; +} + +.edit-area { + margin-top: 12px; + display: flex; + flex-direction: column; + gap: 12px; +} + +.edit-field { + display: flex; + flex-direction: column; + gap: 6px; +} + +.edit-label { + font-size: 13px; + font-weight: 600; + color: var(--green-800); +} + +.export-field { + display: flex; + flex-direction: column; + gap: 8px; +} + +.export-label { + font-size: 13px; + color: var(--text-secondary); +} + +.edit-actions { + display: flex; + justify-content: flex-end; + gap: 8px; + margin-top: 12px; +} + /* 历史记录卡片 */ .history-card { padding: 20px 22px; @@ -534,27 +913,4 @@ watch( background: var(--accent-warning-soft); color: var(--accent-warning-strong); } - -.edit-area { - margin-top: 12px; -} - -.export-field { - display: flex; - flex-direction: column; - gap: 8px; -} - -.export-label { - font-size: 13px; - color: var(--text-secondary); -} - -.edit-actions { - display: flex; - justify-content: flex-end; - gap: 8px; - margin-top: 12px; -} - diff --git a/src/components/ReviewRecall.vue b/src/components/ReviewRecall.vue index 5cbcb53..4b59ded 100644 --- a/src/components/ReviewRecall.vue +++ b/src/components/ReviewRecall.vue @@ -625,6 +625,16 @@ onMounted(() => {

+ +
@@ -824,6 +834,10 @@ onMounted(() => { flex-wrap: wrap; } +.needs-update-hint { + margin-bottom: 12px; +} + .standard-outline { white-space: pre-wrap; font-size: 13px; diff --git a/src/components/StartTask.vue b/src/components/StartTask.vue index 392cf81..3eff8bc 100644 --- a/src/components/StartTask.vue +++ b/src/components/StartTask.vue @@ -21,7 +21,7 @@ import MarkdownRenderer from "@/components/MarkdownRenderer.vue"; import { renderMarkdown } from "@/utils/markdown"; import { formatRatio } from "@/utils/format"; import { useSessionHistory } from "@/components/composables/useSessionHistory"; -import { useSummaryReport } from "@/components/composables/useSummaryReport"; +import { useSummaryReport, isSummarySectionsEmpty, type SummarySections } from "@/components/composables/useSummaryReport"; import { useSessionExpectation } from "@/components/composables/useSessionExpectation"; const { @@ -85,7 +85,7 @@ const resolveConflict = (action: ConflictAction) => { const resolveStaleSessionByEnding = async (active: ActiveSessionInfo): Promise => { conflictResolving.value = "end"; try { - const res = await endSession(active.sessionNum, STALE_SESSION_SUMMARY); + const res = await endSession(active.sessionNum, { freeSummary: STALE_SESSION_SUMMARY }); if (res.code !== 200) { ElMessage.error(res.message || "结束旧会话失败"); return false; @@ -121,10 +121,13 @@ const resolveStaleSessionByDiscarding = async (active: ActiveSessionInfo): Promi } }; -// 结束会话总结弹窗(有残片时先取 AI 草稿,等待期间展示已等待秒数) +// 结束会话总结弹窗(报告为结构化三段;有残片时先取 AI 草稿,等待期间展示已等待秒数) const { summaryDialogVisible, - summaryContent, + sessionSummary, + expectationVerdict, + freeSummary, + sections: summarySections, summaryPreview, summaryLoading, summaryLoadingSeconds, @@ -407,8 +410,8 @@ const clearBreakState = () => { isBreak.value = false; }; -const endTimer = async (content: string) => { - if (!content) { +const endTimer = async (sections: SummarySections) => { + if (isSummarySectionsEmpty(sections)) { ElMessage.warning("请输入学习总结内容"); return; } @@ -426,7 +429,7 @@ const endTimer = async (content: string) => { endingSession.value = true; try { - const res = await endSession(taskInfo.value.sessionNum, content); + const res = await endSession(taskInfo.value.sessionNum, sections); if (res.code === 200) { if (res.message && res.message !== "请求成功") { ElMessage.warning(res.message); @@ -624,7 +627,7 @@ const saveEditFragment = async (id: number) => { } savingFragment.value = true; try { - const res = await updateFragments(id, editFragmentContent.value); + const res = await updateFragments(id, { content: editFragmentContent.value }); if (res?.code === 200) { const item = fragmentsList.value.find((f) => f.id === id); if (item) item.content = editFragmentContent.value; @@ -836,7 +839,7 @@ defineExpose({
- {{ item.sessionNum }} + {{ item.contextNum || item.sessionNum }}
@@ -917,21 +920,53 @@ defineExpose({ @click="summaryPreview = true" >预览
- +
+
+ 会话摘要 + +
+
+ 预期达成判断 + +
+
+ 自由总结 + +
+
- +
+

会话摘要

+ +
+
+

预期达成判断

+ +
+
+

自由总结

+ +
@@ -1165,6 +1200,37 @@ defineExpose({ background: #fff; } +.summary-fields { + display: flex; + flex-direction: column; + gap: 12px; + padding: 12px 16px; +} + +.summary-field { + display: flex; + flex-direction: column; + gap: 6px; +} + +.summary-field-label { + font-size: 13px; + font-weight: 600; + color: var(--green-800); +} + +.summary-preview-block + .summary-preview-block { + margin-top: 14px; + padding-top: 12px; + border-top: 1px solid var(--border-soft); +} + +.summary-preview-block h4 { + margin: 0 0 6px; + font-size: 13px; + color: var(--green-800); +} + .status-text { font-size: 14px; color: var(--text-secondary); diff --git a/src/components/Study.vue b/src/components/Study.vue index 676f983..6b43b09 100644 --- a/src/components/Study.vue +++ b/src/components/Study.vue @@ -2,7 +2,7 @@ import { computed, onMounted, ref, watch } from "vue"; import request from "@/utils/request"; import router from "@/router"; -import { ElMessage, ElMessageBox } from "element-plus"; +import { ElMessage } from "element-plus"; import { getReviewTaskStatsByTask } from "@/api/review"; import { renderMarkdown } from "@/utils/markdown"; import { applicationStatusOptions } from "@/utils/taskApplication"; @@ -10,10 +10,12 @@ import { applicationStatusOptions } from "@/utils/taskApplication"; import { getPriorityWeights, getTaskApplications, + getTaskDeletionPreview, savePriorityWeights, updateTaskApplication, type PriorityWeights, type TaskApplication, + type TaskDeletionPreview, } from "@/api/tasks"; import { getUrlTitle } from "@/utils/fetchTitle"; @@ -47,6 +49,10 @@ const appUrlTitles = ref>({}); const updatingApplicationId = ref(null); const removingTask = ref(false); const weightsLoading = ref(false); +// 删除任务前先拉影响范围:分两栏列出「即将删除」与「即将保留(碎片进入待归类)」 +const deleteDialogVisible = ref(false); +const deletePreview = ref(null); +const deletingTask = ref(false); const selectedTask = computed(() => tasks.value.find((item) => item.taskId === selectedTaskId.value) || null @@ -212,23 +218,39 @@ const removeTask = async () => { } if (removingTask.value) return; removingTask.value = true; - const target = selectedTask.value; try { - await ElMessageBox.confirm(`确定删除任务「${target.title}」?关联的学习会话、学习报告、应用场景等数据将被一并删除。`, "确认删除", { - confirmButtonText: "确定删除", - cancelButtonText: "取消", - type: "warning", - }); + const res = await getTaskDeletionPreview(selectedTask.value.taskId); + const preview = res?.data; + if (!preview) { + ElMessage.error("暂时无法获取删除影响范围,请稍后再试"); + return; + } + deletePreview.value = preview; + deleteDialogVisible.value = true; + } catch { + // 请求层已提示具体错误 + } finally { + removingTask.value = false; + } +}; + +const confirmRemoveTask = async () => { + const target = selectedTask.value; + if (!target || deletingTask.value) return; + deletingTask.value = true; + try { const res = await request.del(`/tasks/${target.taskId}`, {}); if (res.code === 200) { ElMessage.success(`任务 ${target.title} 删除成功`); + deleteDialogVisible.value = false; + deletePreview.value = null; tasks.value = tasks.value.filter((item) => item.taskId !== target.taskId); selectedTaskId.value = tasks.value[0]?.taskId ?? null; } } catch { - // 用户取消或删除失败,保持页面状态 + // 请求层已提示具体错误 } finally { - removingTask.value = false; + deletingTask.value = false; } }; @@ -439,6 +461,39 @@ onMounted(() => {
+ + + + +

调整五个维度在优先级计算中的占比,保存后全部任务将按新权重重新排序。 @@ -474,6 +529,55 @@ onMounted(() => { color: var(--text-secondary); } +.delete-hint { + margin: 0 0 14px; + font-size: 14px; + color: var(--text-primary); +} + +.delete-columns { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 12px; +} + +.delete-column { + border: 1px solid var(--border-soft); + border-radius: 8px; + padding: 12px 14px; + background: #fbfefc; +} + +.delete-column h4 { + margin: 0 0 8px; + font-size: 13px; + color: #c62828; +} + +.delete-column ul { + margin: 0; + padding-left: 18px; + font-size: 13px; + line-height: 1.9; + color: var(--text-primary); +} + +.delete-column-keep { + border-color: var(--accent-success-strong, #2f8f68); + background: var(--accent-success-softer, #f2faf5); +} + +.delete-column-keep h4 { + color: var(--green-800); +} + +.delete-keep-note { + margin: 10px 0 0; + font-size: 12px; + line-height: 1.7; + color: var(--text-secondary); +} + .weight-row { display: flex; align-items: center; @@ -776,6 +880,10 @@ onMounted(() => { gap: 8px; } + .delete-columns { + grid-template-columns: 1fr; + } + .weight-label { width: 64px; font-size: 13px; diff --git a/src/components/TaskForm.vue b/src/components/TaskForm.vue index e43ac5f..5632f1d 100644 --- a/src/components/TaskForm.vue +++ b/src/components/TaskForm.vue @@ -13,6 +13,7 @@ import { import { getUrlTitle } from "@/utils/fetchTitle"; import { renderMarkdown } from "@/utils/markdown"; import { applicationStatusOptions } from "@/utils/taskApplication"; +import { updateFragmentOwnership } from "@/api/reportFragments"; const router = useRouter(); const route = useRoute(); @@ -178,6 +179,16 @@ const convertMaterialUrls = async () => { materialUrl.value = result; }; +/** 待归类内容升格为新任务:任务创建成功后回填内容归属 */ +const classifyPromotedFragment = async (fragmentId: number, taskNum: string) => { + try { + await updateFragmentOwnership(fragmentId, taskNum); + ElMessage.success("新任务已创建,内容已归类"); + } catch { + ElMessage.warning("新任务已创建,但归类失败,可在复习总览重新归类"); + } +}; + const createTask = async () => { if (submitting.value) return; submitting.value = true; @@ -190,8 +201,15 @@ const createTask = async () => { ...priority.value, }); if (result.code === 200) { - ElMessage.success("创建任务成功"); - await router.push({ name: "study" }); + // 从待归类内容升格为新任务:创建成功后把内容归到这个新任务下 + const promoteFragmentId = Number(route.query.promoteFragment); + if (promoteFragmentId) { + await classifyPromotedFragment(promoteFragmentId, String(result.data ?? "")); + await router.push("/review"); + } else { + ElMessage.success("创建任务成功"); + await router.push({ name: "study" }); + } } else { ElMessage.error("任务创建失败:" + result.message); } diff --git a/src/components/Welcome.vue b/src/components/Welcome.vue index 73d9135..92c4ea1 100644 --- a/src/components/Welcome.vue +++ b/src/components/Welcome.vue @@ -1,7 +1,9 @@