From 232fdb88adc49471b2820023d86dd4935c78bc82 Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Fri, 9 Oct 2026 19:49:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=85=A5=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E3=80=81=E5=A4=8D=E4=B9=A0=E5=8F=8D=E9=A6=88=E3=80=81=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=A1=A3=E4=BD=8D=E4=B8=8E=E5=AD=A6=E4=B9=A0=E5=BC=95?= =?UTF-8?q?=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/__tests__/api/guidance.spec.ts | 70 ++++ src/__tests__/api/markers.spec.ts | 82 ++++ src/__tests__/api/review.spec.ts | 29 ++ src/__tests__/components/Welcome.spec.ts | 124 +++++- src/__tests__/composables/useAiTask.spec.ts | 12 + src/__tests__/composables/useMarkers.spec.ts | 105 +++++ .../integration/guidance-flow.spec.ts | 169 ++++++++ .../integration/review-export-flow.spec.ts | 13 + .../integration/review-overview-flow.spec.ts | 97 ++++- src/api/guidance.ts | 61 +++ src/api/markers.ts | 72 ++++ src/api/review.ts | 50 +++ src/components/GuidanceDialog.vue | 322 +++++++++++++++ src/components/MarkerChips.vue | 209 ++++++++++ src/components/Review.vue | 390 +++++++++++++++++- src/components/ReviewRecall.vue | 22 + src/components/Welcome.vue | 245 ++++++++++- src/components/composables/useAiTask.ts | 12 +- src/components/composables/useGuidance.ts | 237 +++++++++++ src/components/composables/useMarkers.ts | 125 ++++++ 20 files changed, 2433 insertions(+), 13 deletions(-) create mode 100644 src/__tests__/api/guidance.spec.ts create mode 100644 src/__tests__/api/markers.spec.ts create mode 100644 src/__tests__/composables/useMarkers.spec.ts create mode 100644 src/__tests__/integration/guidance-flow.spec.ts create mode 100644 src/api/guidance.ts create mode 100644 src/api/markers.ts create mode 100644 src/components/GuidanceDialog.vue create mode 100644 src/components/MarkerChips.vue create mode 100644 src/components/composables/useGuidance.ts create mode 100644 src/components/composables/useMarkers.ts diff --git a/src/__tests__/api/guidance.spec.ts b/src/__tests__/api/guidance.spec.ts new file mode 100644 index 0000000..0f5766f --- /dev/null +++ b/src/__tests__/api/guidance.spec.ts @@ -0,0 +1,70 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' + +vi.mock('@/utils/request', () => ({ + default: { + get: vi.fn(), + post: vi.fn(), + put: vi.fn(), + del: vi.fn(), + }, +})) + +import request from '@/utils/request' +import { + abandonGuidance, + createGuidanceFragment, + getGuidanceSession, + startGuidance, + submitGuidanceTurn, +} from '@/api/guidance' + +const mockedRequest = vi.mocked(request) + +describe('guidance API', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('startGuidance 提交任务与概念', async () => { + mockedRequest.post.mockResolvedValue({ code: 200, data: { guidanceNum: 'G1' } }) + await startGuidance('T001', '组合式 API') + expect(mockedRequest.post).toHaveBeenCalledWith('/review/guidance', { + taskNum: 'T001', + concept: '组合式 API', + }) + }) + + it('submitGuidanceTurn 提交本轮消息', async () => { + mockedRequest.post.mockResolvedValue({ code: 200, data: { taskNum: 'AI2' } }) + await submitGuidanceTurn('G1', '我的理解是') + expect(mockedRequest.post).toHaveBeenCalledWith('/review/guidance/G1/turns', { message: '我的理解是' }) + }) + + it('getGuidanceSession 读取会话用于恢复对话', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: { guidanceNum: 'G1' } }) + await getGuidanceSession('G1') + expect(mockedRequest.get).toHaveBeenCalledWith('/review/guidance/G1') + }) + + it('createGuidanceFragment 提交内容与耗时快照', async () => { + mockedRequest.post.mockResolvedValue({ code: 200, data: { id: 5 } }) + await createGuidanceFragment('G1', { + content: '收获', + reviewStartedAt: '2026-01-01T10:00:00', + reviewLastInteractionAt: '2026-01-01T10:01:00', + reviewDurationSeconds: 60, + }) + expect(mockedRequest.post).toHaveBeenCalledWith('/review/guidance/G1/fragments', { + content: '收获', + reviewStartedAt: '2026-01-01T10:00:00', + reviewLastInteractionAt: '2026-01-01T10:01:00', + reviewDurationSeconds: 60, + }) + }) + + it('abandonGuidance 放弃这次引导', async () => { + mockedRequest.del.mockResolvedValue({ code: 200, data: null }) + await abandonGuidance('G1') + expect(mockedRequest.del).toHaveBeenCalledWith('/review/guidance/G1') + }) +}) diff --git a/src/__tests__/api/markers.spec.ts b/src/__tests__/api/markers.spec.ts new file mode 100644 index 0000000..7bc6cde --- /dev/null +++ b/src/__tests__/api/markers.spec.ts @@ -0,0 +1,82 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' + +vi.mock('@/utils/request', () => ({ + default: { + get: vi.fn(), + post: vi.fn(), + put: vi.fn(), + del: vi.fn(), + }, +})) + +import request from '@/utils/request' +import { + addUserTag, + deleteMarker, + filterByMarker, + getMarkers, + getMarkersBatch, + getUserTagUsage, + renameUserTag, +} from '@/api/markers' + +const mockedRequest = vi.mocked(request) + +describe('markers API', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('getMarkers 按对象查询标记', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: [] }) + await getMarkers('FRAGMENT', '12') + expect(mockedRequest.get).toHaveBeenCalledWith('/markers', { objectType: 'FRAGMENT', objectNum: '12' }) + }) + + it('getMarkersBatch 用 body 传对象标识、用 query 传对象类型', async () => { + mockedRequest.post.mockResolvedValue({ code: 200, data: {} }) + await getMarkersBatch('FRAGMENT', ['1', '2']) + expect(mockedRequest.post).toHaveBeenCalledWith('/markers/batch', ['1', '2'], { + params: { objectType: 'FRAGMENT' }, + }) + }) + + it('addUserTag 提交对象与标签名', async () => { + mockedRequest.post.mockResolvedValue({ code: 200, data: { id: 1 } }) + await addUserTag('TASK', 'T001', '英语') + expect(mockedRequest.post).toHaveBeenCalledWith('/markers', { + objectType: 'TASK', + objectNum: 'T001', + markerName: '英语', + }) + }) + + it('deleteMarker 删除指定标记', async () => { + mockedRequest.del.mockResolvedValue({ code: 200, data: null }) + await deleteMarker(9) + expect(mockedRequest.del).toHaveBeenCalledWith('/markers/9') + }) + + it('renameUserTag 传旧名与新名', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: 2 }) + const result = await renameUserTag('英语', '英文') + expect(mockedRequest.put).toHaveBeenCalledWith('/markers/rename', { oldName: '英语', newName: '英文' }) + expect(result).toEqual({ code: 200, data: 2 }) + }) + + it('filterByMarker 按单一标记筛选对象', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: ['1', '2'] }) + await filterByMarker({ objectType: 'FRAGMENT', markerName: '英语', kind: 'USER' }) + expect(mockedRequest.get).toHaveBeenCalledWith('/markers/filter', { + objectType: 'FRAGMENT', + markerName: '英语', + kind: 'USER', + }) + }) + + it('getUserTagUsage 拉取标签与用量', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: [] }) + await getUserTagUsage() + expect(mockedRequest.get).toHaveBeenCalledWith('/markers/tags') + }) +}) diff --git a/src/__tests__/api/review.spec.ts b/src/__tests__/api/review.spec.ts index 0a5ead7..c6da061 100644 --- a/src/__tests__/api/review.spec.ts +++ b/src/__tests__/api/review.spec.ts @@ -17,7 +17,11 @@ import { getReviewFeed, getReviewTaskStats, getReviewTaskStatsByTask, + getSortPreference, getTaskReview, + saveSortPreference, + submitReviewFeedback, + touchReviewFragment, updateReport, } from '@/api/review' @@ -89,4 +93,29 @@ describe('review API', () => { await getTaskReview('T001') expect(mockedRequest.get).toHaveBeenCalledWith('/review/task/T001') }) + + it('submitReviewFeedback sends only the toggled action', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: { mastered: true, revisit: false } }) + const result = await submitReviewFeedback(7, { mastered: true }) + expect(mockedRequest.put).toHaveBeenCalledWith('/review/feed/7/feedback', { mastered: true }) + expect(result).toEqual({ code: 200, data: { mastered: true, revisit: false } }) + }) + + it('touchReviewFragment posts to the touched endpoint', async () => { + mockedRequest.post.mockResolvedValue({ code: 200, data: null }) + await touchReviewFragment(7) + expect(mockedRequest.post).toHaveBeenCalledWith('/review/feed/7/touched') + }) + + it('getSortPreference calls GET /review/sort-preference', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: { preset: 'TIME_FIRST', description: '久未接触' } }) + await getSortPreference() + expect(mockedRequest.get).toHaveBeenCalledWith('/review/sort-preference') + }) + + it('saveSortPreference sends the preset', async () => { + mockedRequest.put.mockResolvedValue({ code: 200, data: { preset: 'BALANCED', description: '均衡' } }) + await saveSortPreference('BALANCED') + expect(mockedRequest.put).toHaveBeenCalledWith('/review/sort-preference', { preset: 'BALANCED' }) + }) }) diff --git a/src/__tests__/components/Welcome.spec.ts b/src/__tests__/components/Welcome.spec.ts index 32add89..e3eadd6 100644 --- a/src/__tests__/components/Welcome.spec.ts +++ b/src/__tests__/components/Welcome.spec.ts @@ -3,7 +3,9 @@ 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, getReviewTaskStats } from '@/api/review' +import { resetGuidanceAvailability } from '@/components/composables/useGuidance' +import { getReviewFeed, getReviewTaskStats, submitReviewFeedback, touchReviewFragment } from '@/api/review' +import { filterByMarker, getMarkersBatch } from '@/api/markers' import { updateFragmentOwnership } from '@/api/reportFragments' import appRouter from '@/router' import { BASE_SPEED_PX_PER_SEC, NARROW_SPEED_FACTOR } from '@/utils/autoScroll' @@ -12,6 +14,17 @@ vi.mock('@/api/review', () => ({ getReviewFeed: vi.fn(), getReviewTaskStats: vi.fn(), getTaskReview: vi.fn(), + submitReviewFeedback: vi.fn(), + touchReviewFragment: vi.fn(), +})) + +vi.mock('@/api/markers', () => ({ + getMarkersBatch: vi.fn(), + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), + getUserTagUsage: vi.fn(), + renameUserTag: vi.fn(), })) vi.mock('@/api/reportFragments', () => ({ @@ -104,6 +117,9 @@ beforeEach(() => { return anim as unknown as Animation }) Element.prototype.animate = animateSpy as unknown as Element['animate'] + resetGuidanceAvailability() + vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: {} } as never) + vi.mocked(touchReviewFragment).mockResolvedValue({ code: 200, data: null } as never) vi.mocked(getReviewFeed).mockResolvedValue({ code: 200, data: [makeFragment(1), makeFragment(2)] }) }) @@ -316,3 +332,109 @@ describe('Welcome Feed 待归类内容', () => { wrapper.unmount() }) }) + +/** + * 标记(标记-01)与复习反馈动作(复习-02)、Feed 摘要(复习-05)在 Feed 卡片上的行为。 + */ +describe('Welcome Feed 标记、反馈与摘要', () => { + const systemMarker = { + id: 11, + objectType: 'FRAGMENT', + objectNum: '1', + kind: 'SYSTEM', + markerName: '来源', + markerValue: '学习引导', + } + const userTag = { + id: 12, + objectType: 'FRAGMENT', + objectNum: '1', + kind: 'USER', + markerName: '英语', + markerValue: null, + } + + beforeEach(() => { + vi.clearAllMocks() + stubLayout(4000, 1000) + }) + + it('系统标记成对只读展示,用户标签可点', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ code: 200, data: [makeFragment(1)] } as never) + vi.mocked(getMarkersBatch).mockResolvedValue({ + code: 200, + data: { '1': [systemMarker, userTag] }, + } as never) + const wrapper = await mountWelcome() + + expect(wrapper.find('.marker-system').text()).toContain('来源=学习引导') + expect(wrapper.find('.marker-user').text()).toContain('英语') + }) + + it('点用户标签按单一标记筛选,显示当前条件并可清除', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ code: 200, data: [makeFragment(1), makeFragment(2)] } as never) + vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: { '1': [userTag] } } as never) + vi.mocked(filterByMarker).mockResolvedValue({ code: 200, data: ['1'] } as never) + const wrapper = await mountWelcome() + + await wrapper.find('.marker-user').trigger('click') + await flushPromises() + + expect(filterByMarker).toHaveBeenCalledWith({ objectType: 'FRAGMENT', markerName: '英语', kind: 'USER' }) + expect(wrapper.text()).toContain('正在按标签「英语」筛选') + expect(wrapper.text()).not.toContain('残片内容2') + + const clear = wrapper.findAll('button').find((b) => b.text().includes('清除筛选')) + await clear!.trigger('click') + await flushPromises() + + expect(wrapper.text()).not.toContain('正在按标签') + expect(wrapper.text()).toContain('残片内容2') + }) + + it('反馈动作调用接口并按回显切换,再次点击可取消,不产生状态徽标', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ code: 200, data: [makeFragment(1)] } as never) + vi.mocked(submitReviewFeedback) + .mockResolvedValueOnce({ code: 200, data: { mastered: true, revisit: false } } as never) + .mockResolvedValueOnce({ code: 200, data: { mastered: false, revisit: false } } as never) + const wrapper = await mountWelcome() + + const mastered = wrapper.findAll('button').find((b) => b.text().trim() === '已掌握') + await mastered!.trigger('click') + await flushPromises() + + expect(submitReviewFeedback).toHaveBeenCalledWith(1, { mastered: true }) + expect(mastered!.classes()).toContain('is-active') + // 反馈只影响出现概率,不做徽标、统计或待复习列表 + expect(wrapper.find('.el-badge').exists()).toBe(false) + expect(wrapper.text()).not.toContain('待复习') + + await mastered!.trigger('click') + await flushPromises() + expect(submitReviewFeedback).toHaveBeenLastCalledWith(1, { mastered: false }) + expect(mastered!.classes()).not.toContain('is-active') + }) + + it('展开查看残片时会记录一次接触', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ code: 200, data: [makeFragment(1)] } as never) + const wrapper = await mountWelcome() + + await wrapper.find('.review-chip').trigger('click') + await flushPromises() + + expect(touchReviewFragment).toHaveBeenCalledWith(1) + }) + + it('摘要被截断时在回忆卡片说明全文长度', async () => { + vi.mocked(getReviewFeed).mockResolvedValue({ + code: 200, + data: [{ ...makeFragment(1), content: '这是摘要', contentLength: 380, contentTruncated: true }], + } as never) + const wrapper = await mountWelcome() + + await wrapper.find('.review-chip').trigger('click') + await flushPromises() + + expect(wrapper.text()).toContain('全文 380 字') + }) +}) diff --git a/src/__tests__/composables/useAiTask.spec.ts b/src/__tests__/composables/useAiTask.spec.ts index f94e3e4..c431bf3 100644 --- a/src/__tests__/composables/useAiTask.spec.ts +++ b/src/__tests__/composables/useAiTask.spec.ts @@ -143,4 +143,16 @@ describe('useAiTask', () => { expect(getAiTask).not.toHaveBeenCalled() expect(running.value).toBe(false) }) + + it('poll 直接轮询已提交的任务并返回结果', async () => { + vi.mocked(getAiTask).mockResolvedValue(ok(task({ status: 'SUCCEEDED', result: { reply: 'AI 的回复' } }))) + + const { poll, running } = useAiTask() + const result = await poll('AI002') + + expect(getAiTask).toHaveBeenCalledWith('AI002') + expect(submitAiTask).not.toHaveBeenCalled() + expect(result).toEqual({ reply: 'AI 的回复' }) + expect(running.value).toBe(false) + }) }) diff --git a/src/__tests__/composables/useMarkers.spec.ts b/src/__tests__/composables/useMarkers.spec.ts new file mode 100644 index 0000000..34c140b --- /dev/null +++ b/src/__tests__/composables/useMarkers.spec.ts @@ -0,0 +1,105 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' + +vi.mock('@/api/markers', () => ({ + getMarkersBatch: vi.fn(), + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), +})) + +import { addUserTag, deleteMarker, filterByMarker, getMarkersBatch, type Marker } from '@/api/markers' +import { deleteUserTagEverywhere, useMarkers } from '@/components/composables/useMarkers' + +const ok = (data: T) => ({ code: 200, message: '请求成功', data }) + +const userMarker = (overrides: Partial = {}): Marker => ({ + id: 1, + objectType: 'FRAGMENT', + objectNum: '1', + kind: 'USER', + markerName: '英语', + markerValue: null, + ...overrides, +}) + +describe('useMarkers', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('load 批量取回一页对象的标记,markersOf 按对象返回', async () => { + vi.mocked(getMarkersBatch).mockResolvedValue(ok({ '1': [userMarker()] })) + const board = useMarkers('FRAGMENT') + + await board.load(['1', '2', '1']) + + expect(getMarkersBatch).toHaveBeenCalledWith('FRAGMENT', ['1', '2']) + expect(board.markersOf('1')).toHaveLength(1) + expect(board.markersOf('2')).toEqual([]) + }) + + it('addTag 幂等追加用户标签', async () => { + vi.mocked(getMarkersBatch).mockResolvedValue(ok({})) + vi.mocked(addUserTag).mockResolvedValue(ok(userMarker({ id: 9, markerName: '重点' }))) + const board = useMarkers('TASK') + + const added = await board.addTag('T001', ' 重点 ') + + expect(added).toBe(true) + expect(addUserTag).toHaveBeenCalledWith('TASK', 'T001', '重点') + expect(board.markersOf('T001')[0].markerName).toBe('重点') + }) + + it('removeTag 删除后从本地列表移除', async () => { + vi.mocked(getMarkersBatch).mockResolvedValue(ok({ '1': [userMarker({ id: 5 })] })) + vi.mocked(deleteMarker).mockResolvedValue(ok(null)) + const board = useMarkers('FRAGMENT') + + await board.load(['1']) + await board.removeTag('1', board.markersOf('1')[0]) + + expect(deleteMarker).toHaveBeenCalledWith(5) + expect(board.markersOf('1')).toEqual([]) + }) + + it('filterByTag 用用户标签筛选并返回对象标识集合', async () => { + vi.mocked(filterByMarker).mockResolvedValue(ok(['1', '2'])) + const board = useMarkers('FRAGMENT') + + const ids = await board.filterByTag(userMarker()) + + expect(filterByMarker).toHaveBeenCalledWith({ + objectType: 'FRAGMENT', + markerName: '英语', + kind: 'USER', + }) + expect(ids.has('2')).toBe(true) + }) +}) + +describe('deleteUserTagEverywhere', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('跨碎片与任务收集同名用户标签并逐条删除', async () => { + vi.mocked(filterByMarker).mockImplementation(async (params) => + ok(params.objectType === 'FRAGMENT' ? ['1'] : ['T1']), + ) + vi.mocked(getMarkersBatch).mockImplementation(async (objectType) => + ok( + objectType === 'FRAGMENT' + ? { '1': [userMarker({ id: 5 }), userMarker({ id: 6, kind: 'SYSTEM', markerName: '来源', markerValue: '学习引导' })] } + : { T1: [userMarker({ id: 7, objectType: 'TASK', objectNum: 'T1' }), userMarker({ id: 8, objectType: 'TASK', objectNum: 'T1', markerName: '其他' })] }, + ), + ) + vi.mocked(deleteMarker).mockResolvedValue(ok(null)) + + const removed = await deleteUserTagEverywhere('英语') + + expect(removed).toBe(2) + expect(deleteMarker).toHaveBeenCalledTimes(2) + expect(deleteMarker).toHaveBeenCalledWith(5) + expect(deleteMarker).toHaveBeenCalledWith(7) + }) +}) diff --git a/src/__tests__/integration/guidance-flow.spec.ts b/src/__tests__/integration/guidance-flow.spec.ts new file mode 100644 index 0000000..d6b1742 --- /dev/null +++ b/src/__tests__/integration/guidance-flow.spec.ts @@ -0,0 +1,169 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { flushPromises, mount } from '@vue/test-utils' +import { nextTick } from 'vue' +import ElementPlus, { ElMessage } from 'element-plus' +import GuidanceDialog from '@/components/GuidanceDialog.vue' +import { + abandonGuidance, + createGuidanceFragment, + getGuidanceSession, + startGuidance, + submitGuidanceTurn, +} from '@/api/guidance' +import { getAiTask, type AiTask } from '@/api/aiTasks' +import { + guidanceUnavailable, + resetGuidanceAvailability, +} from '@/components/composables/useGuidance' + +vi.mock('@/api/guidance', () => ({ + startGuidance: vi.fn(), + submitGuidanceTurn: vi.fn(), + getGuidanceSession: vi.fn(), + createGuidanceFragment: vi.fn(), + abandonGuidance: vi.fn(), +})) + +vi.mock('@/api/aiTasks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + submitAiTask: vi.fn(), + getAiTask: vi.fn(), + getLatestAiTask: vi.fn(), + } +}) + +const ok = (data: T) => ({ code: 200, message: '请求成功', data }) + +const aiTask = (overrides: Partial = {}): AiTask => ({ + taskNum: 'AI1', + type: 'MIND_MAP', + targetNum: 'G1', + status: 'SUCCEEDED', + ...overrides, +}) + +const STORAGE_KEY = 'lpt-guidance:T001:组合式 API' + +const findButton = (wrapper: ReturnType, text: string) => + wrapper.findAll('button').find((b) => b.text().trim() === text) + +const mountDialog = async () => { + const wrapper = mount(GuidanceDialog, { + props: { modelValue: false, taskNum: 'T001', concept: '组合式 API' }, + global: { plugins: [ElementPlus] }, + }) + await wrapper.setProps({ modelValue: true }) + await flushPromises() + await nextTick() + await flushPromises() + return wrapper +} + +/** + * 学习引导主流程(复习-06):开对话 → 多轮 → 确认产出碎片 / 放弃 / AI 失败置不可用。 + */ +describe('学习引导(集成)', () => { + beforeEach(() => { + vi.clearAllMocks() + resetGuidanceAvailability() + localStorage.clear() + vi.mocked(startGuidance).mockResolvedValue( + ok({ guidanceNum: 'G1', taskNum: 'T001', concept: '组合式 API', aiTaskNum: 'AI1' }), + ) + vi.mocked(getAiTask).mockResolvedValue(ok(aiTask({ result: { reply: '第一个问题' } }))) + }) + + it('开启引导后展示 AI 提出的第一个问题(不判分、不设轮数上限)', async () => { + const wrapper = await mountDialog() + + expect(startGuidance).toHaveBeenCalledWith('T001', '组合式 API') + expect(wrapper.text()).toContain('正在引导的概念') + expect(wrapper.text()).toContain('第一个问题') + }) + + it('多轮对话:发送后回显用户输入并展示 AI 回复', async () => { + vi.mocked(getAiTask) + .mockResolvedValueOnce(ok(aiTask({ result: { reply: '第一个问题' } }))) + .mockResolvedValueOnce(ok(aiTask({ taskNum: 'AI2', result: { reply: 'AI 的回复' } }))) + vi.mocked(submitGuidanceTurn).mockResolvedValue(ok({ taskNum: 'AI2' })) + + const wrapper = await mountDialog() + await wrapper.find('textarea').setValue('我认为 ref 是响应式容器') + await findButton(wrapper, '发送')!.trigger('click') + await flushPromises() + + expect(submitGuidanceTurn).toHaveBeenCalledWith('G1', '我认为 ref 是响应式容器') + expect(wrapper.text()).toContain('我认为 ref 是响应式容器') + expect(wrapper.text()).toContain('AI 的回复') + }) + + it('确认后把收获记成知识碎片,带上本次耗时快照', async () => { + vi.mocked(createGuidanceFragment).mockResolvedValue(ok({ id: 5 })) + + const wrapper = await mountDialog() + await findButton(wrapper, '记成知识碎片')!.trigger('click') + await flushPromises() + + const textareas = wrapper.findAll('textarea') + await textareas[textareas.length - 1].setValue('这次搞懂了 ref 和 reactive 的区别') + await findButton(wrapper, '确认记成碎片')!.trigger('click') + await flushPromises() + + expect(createGuidanceFragment).toHaveBeenCalledWith( + 'G1', + expect.objectContaining({ content: '这次搞懂了 ref 和 reactive 的区别' }), + ) + expect(vi.mocked(ElMessage.success)).toHaveBeenCalled() + }) + + it('放弃引导不产出任何数据', async () => { + vi.mocked(abandonGuidance).mockResolvedValue(ok(null)) + + const wrapper = await mountDialog() + await findButton(wrapper, '放弃这次引导')!.trigger('click') + await flushPromises() + + expect(abandonGuidance).toHaveBeenCalledWith('G1') + expect(createGuidanceFragment).not.toHaveBeenCalled() + }) + + it('AI 失败时给出可读提示并把入口置为不可用', async () => { + vi.mocked(getAiTask).mockResolvedValue( + ok(aiTask({ status: 'FAILED', errorMessage: 'AI 暂时用不了' })), + ) + + const wrapper = await mountDialog() + + expect(wrapper.text()).toContain('AI 暂时用不了') + expect(guidanceUnavailable.value).toBe(true) + // 入口整体停用:输入与「记成知识碎片」不再可用 + expect(findButton(wrapper, '发送')).toBeUndefined() + expect(findButton(wrapper, '记成知识碎片')).toBeUndefined() + }) + + it('离开页面再回来用 GET 恢复同一段对话,不重新开启', async () => { + localStorage.setItem(STORAGE_KEY, 'G9') + vi.mocked(getGuidanceSession).mockResolvedValue( + ok({ + guidanceNum: 'G9', + taskNum: 'T001', + concept: '组合式 API', + turnsPayload: JSON.stringify([ + { role: 'assistant', content: '上次聊到哪了' }, + { role: 'user', content: '聊到 ref' }, + ]), + reviewDurationSeconds: 30, + finished: false, + }), + ) + + const wrapper = await mountDialog() + + expect(getGuidanceSession).toHaveBeenCalledWith('G9') + expect(startGuidance).not.toHaveBeenCalled() + expect(wrapper.text()).toContain('上次聊到哪了') + expect(wrapper.text()).toContain('聊到 ref') + }) +}) diff --git a/src/__tests__/integration/review-export-flow.spec.ts b/src/__tests__/integration/review-export-flow.spec.ts index 2359202..f4d25dc 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 { getMarkersBatch } from '@/api/markers' import { getPendingOwnershipFragments } from '@/api/reportFragments' import { exportRange } from '@/api/export' import { downloadTextFile } from '@/utils/download' @@ -12,6 +13,17 @@ vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), getReviewFeed: vi.fn(), getTaskReview: vi.fn(), + getSortPreference: vi.fn(), + saveSortPreference: vi.fn(), +})) + +vi.mock('@/api/markers', () => ({ + getMarkersBatch: vi.fn(), + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), + getUserTagUsage: vi.fn(), + renameUserTag: vi.fn(), })) vi.mock('@/api/reportFragments', () => ({ @@ -53,6 +65,7 @@ describe('Review 导出流程(集成)', () => { beforeEach(() => { vi.clearAllMocks() vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: {} } as never) vi.mocked(exportRange).mockResolvedValue({ code: 200, data: exportResult }) vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never) }) diff --git a/src/__tests__/integration/review-overview-flow.spec.ts b/src/__tests__/integration/review-overview-flow.spec.ts index c2f120f..fc45d7b 100644 --- a/src/__tests__/integration/review-overview-flow.spec.ts +++ b/src/__tests__/integration/review-overview-flow.spec.ts @@ -3,13 +3,25 @@ import { flushPromises, mount } from '@vue/test-utils' import ElementPlus from 'element-plus' import { createMemoryHistory, createRouter } from 'vue-router' import Review from '@/components/Review.vue' -import { getReviewTaskStats } from '@/api/review' +import { getReviewTaskStats, getSortPreference, saveSortPreference } from '@/api/review' +import { filterByMarker, getMarkersBatch, getUserTagUsage, renameUserTag } from '@/api/markers' import { getPendingOwnershipFragments, updateFragmentOwnership } from '@/api/reportFragments' vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), getReviewFeed: vi.fn(), getTaskReview: vi.fn(), + getSortPreference: vi.fn(), + saveSortPreference: vi.fn(), +})) + +vi.mock('@/api/markers', () => ({ + getMarkersBatch: vi.fn(), + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), + getUserTagUsage: vi.fn(), + renameUserTag: vi.fn(), })) vi.mock('@/api/reportFragments', () => ({ @@ -44,6 +56,11 @@ describe('Review 交互流程(集成)', () => { beforeEach(() => { vi.clearAllMocks() vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: {} } as never) + vi.mocked(getSortPreference).mockResolvedValue({ + code: 200, + data: { preset: 'TIME_FIRST', description: '久未接触的更容易出现' }, + } as never) }) const mountReview = async () => { @@ -223,4 +240,82 @@ describe('Review 交互流程(集成)', () => { expect(pushSpy).toHaveBeenCalledWith({ name: 'add-task', query: { promoteFragment: '11' } }) pushSpy.mockRestore() }) + + it('任务卡片展示标记,点用户标签按单一标记筛选并可清除', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getMarkersBatch).mockResolvedValue({ + code: 200, + data: { T001: [{ id: 21, objectType: 'TASK', objectNum: 'T001', kind: 'USER', markerName: '重点', markerValue: null }] }, + } as never) + vi.mocked(filterByMarker).mockResolvedValue({ code: 200, data: ['T001'] } as never) + const { wrapper } = await mountReview() + + expect(wrapper.find('.marker-user').text()).toContain('重点') + await wrapper.find('.marker-user').trigger('click') + await flushPromises() + + expect(filterByMarker).toHaveBeenCalledWith({ objectType: 'TASK', markerName: '重点', kind: 'USER' }) + expect(wrapper.text()).toContain('正在按标签「重点」筛选任务') + expect(wrapper.text()).not.toContain('TypeScript 类型体操') + }) + + it('打开智能排序偏好,展示三档语义选项与当前档位说明', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + const { wrapper } = await mountReview() + + expect(getSortPreference).toHaveBeenCalled() + const open = wrapper.findAll('button').find((b) => b.text().trim() === '智能排序偏好') + await open!.trigger('click') + await flushPromises() + + expect(wrapper.text()).toContain('时间为主') + expect(wrapper.text()).toContain('均衡') + expect(wrapper.text()).toContain('掌握度为主') + expect(wrapper.text()).toContain('久未接触的更容易出现') + }) + + it('选择档位并保存时调用保存接口', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(saveSortPreference).mockResolvedValue({ + code: 200, + data: { preset: 'MASTERY_FIRST', description: '回忆覆盖率低的更容易出现' }, + } as never) + const { wrapper } = await mountReview() + + await wrapper.findAll('button').find((b) => b.text().trim() === '智能排序偏好')!.trigger('click') + await flushPromises() + + const radioGroup = wrapper.findAllComponents({ name: 'ElRadioGroup' })[0] + radioGroup.vm.$emit('update:modelValue', 'MASTERY_FIRST') + await flushPromises() + + await wrapper.findAll('button').find((b) => b.text().trim() === '保存')!.trigger('click') + await flushPromises() + + expect(saveSortPreference).toHaveBeenCalledWith('MASTERY_FIRST') + }) + + it('标签管理列出标签与用量,并支持重命名', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getUserTagUsage).mockResolvedValue({ + code: 200, + data: [{ markerName: '英语', markerCount: 3, objectCount: 2 }], + } as never) + vi.mocked(renameUserTag).mockResolvedValue({ code: 200, data: 2 } as never) + const { wrapper } = await mountReview() + + await wrapper.findAll('button').find((b) => b.text().trim() === '标签管理')!.trigger('click') + await flushPromises() + + expect(wrapper.text()).toContain('英语') + expect(wrapper.text()).toContain('2 个内容 · 3 次使用') + + await wrapper.findAll('button').find((b) => b.text().trim() === '重命名')!.trigger('click') + await flushPromises() + await wrapper.find('.tag-rename-input').setValue('英文') + await wrapper.findAll('button').find((b) => b.text().trim() === '保存')!.trigger('click') + await flushPromises() + + expect(renameUserTag).toHaveBeenCalledWith('英语', '英文') + }) }) diff --git a/src/api/guidance.ts b/src/api/guidance.ts new file mode 100644 index 0000000..1a1887e --- /dev/null +++ b/src/api/guidance.ts @@ -0,0 +1,61 @@ +// src/api/guidance.ts +import request from "@/utils/request"; +import type { ReportFragment } from "./reportFragments"; + +/** 学习引导的一轮对话:role 由后端给出 */ +export interface GuidanceTurn { + role: "user" | "assistant"; + content: string; +} + +/** 开启引导的返回:已同时提交了第一个 AI 任务 */ +export interface GuidanceStart { + guidanceNum: string; + taskNum: string; + concept: string; + aiTaskNum: string; +} + +/** 一次学习引导会话(离开页面后可凭 guidanceNum 恢复) */ +export interface GuidanceSession { + guidanceNum: string; + taskNum: string; + concept: string; + /** 对话轮次 JSON 字符串:[{role, content}] */ + turnsPayload: string; + reviewDurationSeconds: number; + finished: boolean; +} + +/** 确认产出碎片时上报的复习耗时快照(与回忆对比同一口径) */ +export interface GuidanceFragmentPayload { + content: string; + reviewStartedAt?: string; + reviewLastInteractionAt?: string; + reviewDurationSeconds?: number; +} + +/** 开启一次学习引导并提交第一个问题 */ +export const startGuidance = (taskNum: string, concept: string) => { + return request.post("/review/guidance", { taskNum, concept }); +}; + +/** 继续一轮:提交用户的回答/追问,返回本轮 AI 任务 */ +export const submitGuidanceTurn = (guidanceNum: string, message: string) => { + return request.post<{ taskNum: string }>(`/review/guidance/${guidanceNum}/turns`, { message }); +}; + +/** 读取引导会话当前状态(含对话轮次),用于离开页面后回来继续 */ +export const getGuidanceSession = (guidanceNum: string) => { + return request.get(`/review/guidance/${guidanceNum}`); +}; + +/** 用户确认产出:把这次引导的收获记成一条知识碎片 */ +export const createGuidanceFragment = (guidanceNum: string, payload: GuidanceFragmentPayload) => { + return request.post(`/review/guidance/${guidanceNum}/fragments`, payload); +}; + +/** 放弃这次引导:不产出任何数据 */ +export const abandonGuidance = (guidanceNum: string) => { + return request.del(`/review/guidance/${guidanceNum}`); +}; diff --git a/src/api/markers.ts b/src/api/markers.ts new file mode 100644 index 0000000..2f14ff4 --- /dev/null +++ b/src/api/markers.ts @@ -0,0 +1,72 @@ +// src/api/markers.ts +import request from "@/utils/request"; + +/** 标记对象类型:知识碎片用数字 id 字符串,学习任务用任务编号 */ +export type MarkerObjectType = "FRAGMENT" | "TASK"; + +/** 标记类别:系统标记只读,用户标签可增删改 */ +export type MarkerKind = "SYSTEM" | "USER"; + +/** + * 统一标记(标记-01):附加在对象上的一段轻量元信息,不是状态、不参与聚合。 + * 系统标记成对表达(如 markerName=来源 / markerValue=学习引导),用户标签只有名字。 + */ +export interface Marker { + id: number; + objectType: MarkerObjectType; + objectNum: string; + kind: MarkerKind; + markerName: string; + markerValue: string | null; +} + +/** 用户标签的使用情况(标签管理入口) */ +export interface MarkerUsage { + markerName: string; + markerCount: number; + objectCount: number; +} + +export interface MarkerFilterParams { + objectType: MarkerObjectType; + markerName: string; + markerValue?: string; + kind?: MarkerKind; +} + +/** 列出某个对象上的全部标记 */ +export const getMarkers = (objectType: MarkerObjectType, objectNum: string) => { + return request.get("/markers", { objectType, objectNum }); +}; + +/** 批量列出多个对象的标记:列表页一次取回,避免逐个请求 */ +export const getMarkersBatch = (objectType: MarkerObjectType, objectNums: string[]) => { + return request.post>("/markers/batch", objectNums, { + params: { objectType }, + }); +}; + +/** 给对象打一个用户标签(幂等) */ +export const addUserTag = (objectType: MarkerObjectType, objectNum: string, markerName: string) => { + return request.post("/markers", { objectType, objectNum, markerName }); +}; + +/** 删除一条用户标签;系统标记不可删除(后端返回业务错误) */ +export const deleteMarker = (id: number) => { + return request.del(`/markers/${id}`); +}; + +/** 重命名用户标签,返回被改写的条数(影响所有带该标签的对象) */ +export const renameUserTag = (oldName: string, newName: string) => { + return request.put("/markers/rename", { oldName, newName }); +}; + +/** 按单一标记筛选对象,返回对象标识列表(点标签即筛选) */ +export const filterByMarker = (params: MarkerFilterParams) => { + return request.get("/markers/filter", params); +}; + +/** 当前用户用过的标签与用量 */ +export const getUserTagUsage = () => { + return request.get("/markers/tags"); +}; diff --git a/src/api/review.ts b/src/api/review.ts index c2cd2d7..fe01d98 100644 --- a/src/api/review.ts +++ b/src/api/review.ts @@ -12,7 +12,12 @@ export interface ReviewFeedItem { /** 内容归属的任务编号;碎片待归类时为 null */ taskNum: string | null; taskName: string | null; + /** 内容摘要(复习-05):Feed 只回摘要,全文由详情接口按需拉取 */ content: string; + /** 原文总长度(字符数),供界面标注「全文 N 字」 */ + contentLength: number; + /** content 是否为截断后的摘要 */ + contentTruncated: boolean; createdTime: string; /** 仅碎片有意义:内容归属为空,等待归类 */ pendingOwnership: boolean; @@ -77,6 +82,51 @@ export const getReviewFeed = (limit: number = 30, mode: "recent" | "random" | "s return request.get("/review/feed", { limit, mode }); }; +// ============ 复习反馈动作(复习-02) ============ + +/** 反馈动作本身只影响出现概率,不产生状态展示 */ +export interface ReviewFeedbackPayload { + mastered?: boolean; + revisit?: boolean; +} + +/** 回显动作后的状态,供本次浏览内切换按钮 */ +export interface ReviewFeedbackState { + mastered: boolean; + revisit: boolean; +} + +/** 标记或取消「已掌握」「稍后再看」,返回动作后的状态 */ +export const submitReviewFeedback = (fragmentId: number, payload: ReviewFeedbackPayload) => { + return request.put(`/review/feed/${fragmentId}/feedback`, payload); +}; + +/** 记录一次「接触」(展开查看时调用):刷新最近接触时间,参与智能排序 */ +export const touchReviewFragment = (fragmentId: number) => { + return request.post(`/review/feed/${fragmentId}/touched`); +}; + +// ============ 复习排序偏好(复习-01) ============ + +/** 智能排序档位:时间为主 / 均衡 / 掌握度为主 */ +export type ReviewSortPreset = "TIME_FIRST" | "BALANCED" | "MASTERY_FIRST"; + +export interface ReviewSortPreference { + preset: ReviewSortPreset; + /** 档位的中文说明(由后端给出) */ + description: string; +} + +/** 读取当前排序偏好 */ +export const getSortPreference = () => { + return request.get("/review/sort-preference"); +}; + +/** 保存排序偏好:三档预设,不做精确权重 */ +export const saveSortPreference = (preset: ReviewSortPreset) => { + return request.put("/review/sort-preference", { preset }); +}; + export const getReviewTaskStats = () => { return request.get("/review/tasks"); }; diff --git a/src/components/GuidanceDialog.vue b/src/components/GuidanceDialog.vue new file mode 100644 index 0000000..75697ec --- /dev/null +++ b/src/components/GuidanceDialog.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/src/components/MarkerChips.vue b/src/components/MarkerChips.vue new file mode 100644 index 0000000..1f2d29f --- /dev/null +++ b/src/components/MarkerChips.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/components/Review.vue b/src/components/Review.vue index 92acd8f..2c1dbc8 100644 --- a/src/components/Review.vue +++ b/src/components/Review.vue @@ -1,9 +1,13 @@ @@ -148,6 +321,8 @@ onMounted(() => {
刷新 + 智能排序偏好 + 标签管理 导出数据
@@ -201,9 +376,14 @@ onMounted(() => { -
+
+ 正在按标签「{{ markerFilter.markerName }}」筛选任务 + 清除筛选 +
+ +
{ 学习报告数量:{{ row.reportCount || 0 }} 学习残片数量:{{ row.fragmentCount || 0 }}
+
+ +
查看详情 → @@ -238,6 +426,12 @@ onMounted(() => {
+ + 清除筛选 + { + + +

+ 决定复习内容出现的优先顺序。这是三档语义偏好,不是精确权重。 +

+ + + {{ option.label }} + {{ option.hint }} + + +

+ 当前档位说明:{{ sortPreference.description }} +

+ +
+ + +

这些是你给学习内容打的标签。重命名会影响所有带该标签的内容。

+
+
+ + +
+ +
+ +
@@ -470,6 +726,134 @@ onMounted(() => { gap: 8px; } +.page-toolbar { + display: flex; + justify-content: flex-end; + flex-wrap: wrap; + gap: 8px; +} + +.marker-filter-bar { + display: flex; + align-items: center; + gap: 8px; + font-size: 13px; + color: var(--green-800); + background: var(--accent-success-softer); + border: 1px solid var(--accent-success-soft); + border-radius: 8px; + padding: 6px 12px; +} + +.task-card-markers { + display: flex; +} + +.sort-hint { + margin: 0 0 14px; + font-size: 13px; + color: var(--text-secondary); + line-height: 1.6; +} + +.sort-options { + display: flex; + flex-direction: column; + align-items: stretch; + gap: 8px; +} + +.sort-option { + display: flex; + align-items: flex-start; + height: auto; + padding: 8px 10px; + border: 1px solid var(--border-soft); + border-radius: 8px; + margin-right: 0; +} + +.sort-option-label { + font-weight: 600; + color: var(--green-800); +} + +.sort-option-hint { + margin-left: 8px; + font-size: 12px; + color: var(--text-secondary); +} + +.sort-current { + margin: 14px 0 0; + font-size: 12px; + color: var(--text-secondary); +} + +.tag-hint { + margin: 0 0 12px; + font-size: 13px; + color: var(--text-secondary); + line-height: 1.6; +} + +.tag-list { + display: flex; + flex-direction: column; + gap: 8px; + min-height: 60px; +} + +.tag-item { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + gap: 8px; + padding: 8px 12px; + border: 1px solid var(--border-soft); + border-radius: 8px; + background: var(--surface-strong); +} + +.tag-info { + display: flex; + flex-direction: column; + gap: 2px; +} + +.tag-name { + font-weight: 600; + color: var(--green-800); +} + +.tag-usage { + font-size: 12px; + color: var(--text-secondary); +} + +.tag-actions { + display: flex; + gap: 6px; + flex-shrink: 0; +} + +.tag-rename-input { + flex: 1; + min-width: 120px; + font-size: 13px; + padding: 5px 8px; + border: 1px solid var(--border-soft); + border-radius: 6px; + color: var(--text-primary); + background: var(--surface-strong); +} + +.tag-rename-input:focus { + outline: none; + border-color: var(--green-600); +} + @media (max-width: 900px) { .summary-grid { grid-template-columns: 1fr; diff --git a/src/components/ReviewRecall.vue b/src/components/ReviewRecall.vue index 4b59ded..c47e96d 100644 --- a/src/components/ReviewRecall.vue +++ b/src/components/ReviewRecall.vue @@ -12,6 +12,8 @@ import { import type { RecallCompareParams } from "@/api/aiTasks"; import { ElMessage, ElMessageBox } from "element-plus"; import MindMapViewer, { type MindMapTreeNode } from "@/components/MindMapViewer.vue"; +import GuidanceDialog from "@/components/GuidanceDialog.vue"; +import { guidanceUnavailable } from "@/components/composables/useGuidance"; import { isAiTaskCancelled, useAiTask, @@ -459,6 +461,15 @@ const handleNodeSelect = (node: { title: string; path: string; childCount: numbe focusConfirmVisible.value = true; }; +// 学习引导入口:对选中的概忾与 AI 多轮对话 +const guidance = ref<{ visible: boolean; concept: string }>({ visible: false, concept: "" }); + +const openGuidanceForNode = () => { + if (!selectedNodeInfo.value || guidanceUnavailable.value) return; + focusConfirmVisible.value = false; + guidance.value = { visible: true, concept: selectedNodeInfo.value.title }; +}; + // 确认以选中节点为起点 const confirmFocus = () => { if (selectedNodeInfo.value) { @@ -501,6 +512,11 @@ onMounted(() => {

@@ -711,6 +727,12 @@ onMounted(() => { + + diff --git a/src/components/Welcome.vue b/src/components/Welcome.vue index 92c4ea1..756b908 100644 --- a/src/components/Welcome.vue +++ b/src/components/Welcome.vue @@ -2,8 +2,20 @@ import { computed, nextTick, onBeforeUnmount, onMounted, ref } from "vue"; import { ElMessage } from "element-plus"; import router from "@/router"; -import { getReviewFeed, getReviewTaskStats, getTaskReview, type ReviewFeedItem } from "@/api/review"; +import { + getReviewFeed, + getReviewTaskStats, + getTaskReview, + submitReviewFeedback, + touchReviewFragment, + type ReviewFeedItem, +} from "@/api/review"; import { updateFragmentOwnership } from "@/api/reportFragments"; +import type { Marker } from "@/api/markers"; +import { useMarkers } from "@/components/composables/useMarkers"; +import { guidanceUnavailable } from "@/components/composables/useGuidance"; +import MarkerChips from "@/components/MarkerChips.vue"; +import GuidanceDialog from "@/components/GuidanceDialog.vue"; import { clampAutoScrollTime, measureAutoScroll, @@ -24,7 +36,13 @@ interface FragmentChip { contextNum: string | null; taskName: string | null; taskNum: string | null; + /** 截断后的展示文本 */ content: string; + /** 摘要原文(≤200 字),学习引导的概念取它 */ + rawContent: string; + /** 原文总长度与是否截断(复习-05) */ + contentLength: number; + contentTruncated: boolean; /** 内容归属为空:需要在 Feed 卡片上就地归类 */ pendingOwnership: boolean; } @@ -32,16 +50,36 @@ interface FragmentChip { const truncateContent = (content: string, maxLength = 120) => content.length > maxLength ? content.substring(0, maxLength) + "..." : content; +// 标记:一页对象的标记一次取回;点用户标签做单一标记筛选 +const fragmentMarkers = useMarkers("FRAGMENT"); +const markerFilter = ref<{ markerName: string } | null>(null); +const filteredFragmentIds = ref | null>(null); + +// 反馈动作的本地回显:刷新后回到未选中,这是有意行为,不做任何状态展示 +const feedbackState = ref>({}); +const feedbackBusy = ref>({}); + +// 学习引导入口 +const guidance = ref<{ visible: boolean; taskNum: string; concept: string }>({ + visible: false, + taskNum: "", + concept: "", +}); + // 滚动条只展示学习残片,每条残片单独作为 chip const fragmentChips = computed(() => reviewItems.value .filter(item => item.sourceType === "FRAGMENT") + .filter(item => !filteredFragmentIds.value || filteredFragmentIds.value.has(String(item.id))) .map(item => ({ id: item.id, contextNum: item.contextNum, taskName: item.taskName, taskNum: item.taskNum, content: truncateContent(item.content), + rawContent: item.content, + contentLength: item.contentLength, + contentTruncated: item.contentTruncated, pendingOwnership: item.pendingOwnership, })), ); @@ -101,6 +139,64 @@ const promoteToNewTask = () => { router.push({ name: "add-task", query: { promoteFragment: String(fragment.id) } }); }; +const refreshAutoScroll = async () => { + await nextTick(); + startAutoScroll(); +}; + +/** 点标签即筛选(单一标记,不做多标记组合) */ +const applyMarkerFilter = async (marker: Marker) => { + const ids = await fragmentMarkers.filterByTag(marker); + filteredFragmentIds.value = ids; + markerFilter.value = { markerName: marker.markerName }; + await refreshAutoScroll(); +}; + +const clearMarkerFilter = async () => { + markerFilter.value = null; + filteredFragmentIds.value = null; + await refreshAutoScroll(); +}; + +const addChipTag = async (chip: FragmentChip, markerName: string) => { + await fragmentMarkers.addTag(String(chip.id), markerName); +}; + +const removeChipTag = async (chip: FragmentChip, marker: Marker) => { + await fragmentMarkers.removeTag(String(chip.id), marker); +}; + +/** 反馈动作的按钮态来自接口回显;不展示徽标、不统计、不做待复习列表 */ +const feedbackOf = (chip: FragmentChip) => + feedbackState.value[chip.id] || { mastered: false, revisit: false }; + +const toggleFeedback = async (chip: FragmentChip, action: "mastered" | "revisit") => { + if (feedbackBusy.value[chip.id]) return; + const current = feedbackOf(chip); + const payload = + action === "mastered" ? { mastered: !current.mastered } : { revisit: !current.revisit }; + feedbackBusy.value = { ...feedbackBusy.value, [chip.id]: true }; + try { + const res = await submitReviewFeedback(chip.id, payload); + const echoed = res?.data; + if (echoed) { + feedbackState.value = { + ...feedbackState.value, + [chip.id]: { mastered: !!echoed.mastered, revisit: !!echoed.revisit }, + }; + } + } catch { + // 请求层已提示具体错误,这里不改变按钮态 + } finally { + feedbackBusy.value = { ...feedbackBusy.value, [chip.id]: false }; + } +}; + +const openGuidance = (chip: FragmentChip) => { + if (!chip.taskNum || guidanceUnavailable.value) return; + guidance.value = { visible: true, taskNum: chip.taskNum, concept: chip.rawContent || chip.content }; +}; + // 复制多份实现无缝循环,份数按轨道宽度动态补足 const duplicatedChips = computed(() => Array.from({ length: repeatCount.value }, () => fragmentChips.value).flat(), @@ -110,6 +206,12 @@ const loadReviewFeed = async () => { try { const res = await getReviewFeed(100, "smart"); reviewItems.value = res?.data || []; + // 标记一次取回一页:与 Feed 同一批碎片 + await fragmentMarkers.load( + reviewItems.value + .filter(item => item.sourceType === "FRAGMENT") + .map(item => String(item.id)), + ); } catch { // feed 加载失败不影响页面主体功能 } finally { @@ -139,6 +241,10 @@ const recallCard = ref<{ }); const openRecallCard = (fragment: FragmentChip) => { + // 展开查看即记录一次「接触」,刷新最近接触时间(参与智能排序) + touchReviewFragment(fragment.id).catch(() => { + // 接触时间记录失败不影响查看 + }); recallCard.value = { visible: true, fragment, @@ -347,6 +453,10 @@ onBeforeUnmount(() => {
+
+ 正在按标签「{{ markerFilter.markerName }}」筛选 + 清除筛选 +
{ class="review-chip fragment-chip" @click="handleChipClick(chip, $event)" > - {{ chip.taskName }} - 待归类 - {{ chip.content }} + + {{ chip.taskName }} + 待归类 + {{ chip.content }} + + + + + + + + +
@@ -415,6 +559,9 @@ onBeforeUnmount(() => { + + @@ -557,10 +714,25 @@ onBeforeUnmount(() => { .review-scroll-header { display: flex; - justify-content: flex-end; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; + gap: 8px 12px; margin-bottom: 10px; } +.marker-filter-bar { + display: flex; + align-items: center; + gap: 6px; + font-size: 13px; + color: var(--green-800); + background: var(--accent-success-softer); + border: 1px solid var(--accent-success-soft); + border-radius: 8px; + padding: 2px 8px; +} + .color-legend { font-size: 12px; color: var(--text-secondary); @@ -599,8 +771,9 @@ onBeforeUnmount(() => { .review-chip { display: inline-flex; - align-items: center; - gap: 10px; + flex-direction: column; + align-items: flex-start; + gap: 6px; padding: 8px 16px; background: var(--surface-strong); border: 1px solid var(--border-soft); @@ -611,6 +784,52 @@ onBeforeUnmount(() => { user-select: none; } +.chip-main { + display: inline-flex; + align-items: center; + gap: 10px; +} + +.chip-markers, +.chip-actions { + display: inline-flex; + align-items: center; + gap: 6px; + flex-wrap: wrap; +} + +.chip-action { + border: 1px solid var(--border-soft); + background: transparent; + color: var(--text-secondary); + font-size: 12px; + border-radius: 10px; + padding: 1px 9px; + cursor: pointer; + transition: background 0.15s, color 0.15s, border-color 0.15s; +} + +.chip-action:hover:not(:disabled) { + border-color: var(--green-600); + color: var(--green-700); +} + +.chip-action.is-active { + background: var(--accent-success-soft); + border-color: var(--green-600); + color: var(--green-700); +} + +.chip-action:disabled { + cursor: not-allowed; + opacity: 0.55; +} + +.chip-action-guidance { + color: var(--green-700); + border-color: var(--green-600); +} + .review-chip:hover { box-shadow: var(--shadow-soft); background: var(--accent-success-softer); @@ -653,6 +872,12 @@ onBeforeUnmount(() => { white-space: normal; } +.classify-full-hint { + margin: -6px 0 12px; + font-size: 12px; + color: var(--text-secondary); +} + .classify-hint { margin: 0 0 12px; font-size: 13px; @@ -696,6 +921,12 @@ onBeforeUnmount(() => { white-space: normal; } +.recall-full-hint { + margin: -6px 0 12px; + font-size: 12px; + color: var(--text-secondary); +} + .recall-error { margin: 0 0 10px; color: var(--el-color-danger, #f56c6c); diff --git a/src/components/composables/useAiTask.ts b/src/components/composables/useAiTask.ts index 4c3202b..360dfd8 100644 --- a/src/components/composables/useAiTask.ts +++ b/src/components/composables/useAiTask.ts @@ -123,6 +123,16 @@ export function useAiTask() { } }; + /** 轮询一个已经提交的任务(如学习引导每轮对话),返回 SUCCEEDED 的 result */ + const poll = async (aiTaskNum: string): Promise => { + const token = startTracking(); + try { + return await pollUntilDone(aiTaskNum); + } finally { + stopTracking(token); + } + }; + /** 恢复进行中的任务:找到就继续轮询,没找到返回 found=false */ const resume = async (type: AiTaskType, targetNum: string): Promise => { const res = await getLatestAiTask(type, targetNum); @@ -133,5 +143,5 @@ export function useAiTask() { return { found: true, done }; }; - return { seconds, running, run, resume, stop }; + return { seconds, running, run, resume, poll, stop }; } diff --git a/src/components/composables/useGuidance.ts b/src/components/composables/useGuidance.ts new file mode 100644 index 0000000..0f8625b --- /dev/null +++ b/src/components/composables/useGuidance.ts @@ -0,0 +1,237 @@ +// src/components/composables/useGuidance.ts +import { ref } from "vue"; +import { + abandonGuidance, + createGuidanceFragment, + getGuidanceSession, + startGuidance, + submitGuidanceTurn, + type GuidanceSession, + type GuidanceTurn, +} from "@/api/guidance"; +import { useAiTask } from "./useAiTask"; +import { useReviewDuration } from "./useReviewDuration"; + +/** + * 学习引导可用性:没有探测接口,一旦「首次提交失败 / AI 任务失败」就把入口整体置为不可用。 + * 这是模块级状态,只影响引导本身,不牵连复习其他部分;刷新页面即复位。 + */ +export const guidanceUnavailable = ref(false); + +export const markGuidanceUnavailable = () => { + guidanceUnavailable.value = true; +}; + +/** 供测试复位模块级状态 */ +export const resetGuidanceAvailability = () => { + guidanceUnavailable.value = false; +}; + +/** 从异常里取用户可见文案 */ +const errorMessageOf = (error: unknown, fallback: string): string => { + if (error instanceof Error && error.message) return error.message; + 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 parseTurns = (payload: string): GuidanceTurn[] => { + try { + const parsed = JSON.parse(payload); + if (!Array.isArray(parsed)) return []; + return parsed + .filter((item): item is GuidanceTurn => + !!item && typeof item === "object" && + (item.role === "user" || item.role === "assistant") && + typeof item.content === "string", + ) + .map((item) => ({ role: item.role, content: item.content })); + } catch { + return []; + } +}; + +const storageKey = (taskNum: string, concept: string) => `lpt-guidance:${taskNum}:${concept}`; + +/** + * 一次学习引导会话的状态机:开启/恢复对话、多轮问答、确认产出碎片、放弃。 + * 对话上下文一律以后端会话为准;AI 每轮的回复通过轮询 AI 任务获取。 + */ +export function useGuidanceSession() { + const session = ref(null); + const turns = ref([]); + const starting = ref(false); + const sending = ref(false); + const error = ref(""); + const aiTask = useAiTask(); + const { seconds: waitingSeconds, running: waiting } = aiTask; + const { start: startDuration, markInteraction, snapshot, stop: stopDuration } = useReviewDuration(); + + const unavailable = guidanceUnavailable; + + /** 轮询本轮 AI 任务,取出回复文本 */ + const pollReply = async (aiTaskNum: string): Promise => { + const result = await aiTask.poll(aiTaskNum); + const reply = result?.reply; + if (typeof reply !== "string" || !reply.trim()) { + throw new Error("AI 这次没有给出回应,请稍后再试"); + } + return reply; + }; + + const clearStorage = (taskNum: string, concept: string) => { + localStorage.removeItem(storageKey(taskNum, concept)); + }; + + const reset = () => { + session.value = null; + turns.value = []; + starting.value = false; + sending.value = false; + error.value = ""; + }; + + /** 打开引导:优先恢复未结束的会话,否则新开一次 */ + const open = async (taskNum: string, concept: string) => { + reset(); + if (!taskNum || !concept) { + error.value = "这条内容还没有归属任务,暂时不能做学习引导"; + return; + } + + // 离开页面再回来:用本地记下的编号恢复同一段对话 + const stored = localStorage.getItem(storageKey(taskNum, concept)); + if (stored) { + try { + const res = await getGuidanceSession(stored); + const restored = res?.data; + if (restored && !restored.finished) { + session.value = restored; + turns.value = parseTurns(restored.turnsPayload); + startDuration(); + return; + } + clearStorage(taskNum, concept); + } catch { + clearStorage(taskNum, concept); + } + } + + if (unavailable.value) { + error.value = "学习引导暂时用不了,可以先继续复习,等 AI 恢复后再来。"; + return; + } + + starting.value = true; + try { + const res = await startGuidance(taskNum, concept); + const data = res?.data; + if (!data?.guidanceNum || !data.aiTaskNum) { + throw new Error("学习引导没开起来,请稍后再试"); + } + session.value = { + guidanceNum: data.guidanceNum, + taskNum: data.taskNum, + concept: data.concept, + turnsPayload: "[]", + reviewDurationSeconds: 0, + finished: false, + }; + localStorage.setItem(storageKey(taskNum, concept), data.guidanceNum); + startDuration(); + const reply = await pollReply(data.aiTaskNum); + turns.value = [{ role: "assistant", content: reply }]; + } catch (e) { + markGuidanceUnavailable(); + error.value = errorMessageOf(e, "学习引导暂时用不了,可以先继续复习,等 AI 恢复后再来。"); + } finally { + starting.value = false; + } + }; + + /** 发送一轮:先回显用户输入,再轮询 AI 回复 */ + const send = async (message: string): Promise => { + const text = message.trim(); + if (!session.value || !text || sending.value || waiting.value || unavailable.value) return false; + sending.value = true; + error.value = ""; + markInteraction(); + turns.value = [...turns.value, { role: "user", content: text }]; + try { + const res = await submitGuidanceTurn(session.value.guidanceNum, text); + const aiTaskNum = res?.data?.taskNum; + if (!aiTaskNum) throw new Error("这一轮没有提交成功,请稍后再试"); + const reply = await pollReply(aiTaskNum); + turns.value = [...turns.value, { role: "assistant", content: reply }]; + return true; + } catch (e) { + markGuidanceUnavailable(); + error.value = errorMessageOf(e, "AI 暂时没有回应,学习引导已停用,可以先继续复习。"); + return false; + } finally { + sending.value = false; + } + }; + + /** 确认产出碎片;耗时快照与回忆对比同一口径 */ + const confirmFragment = async (content: string): Promise => { + const text = content.trim(); + if (!session.value || session.value.finished || !text) return false; + const timing = snapshot(); + markInteraction(); + try { + const res = await createGuidanceFragment(session.value.guidanceNum, { + content: text, + reviewStartedAt: timing.startedAt, + reviewLastInteractionAt: timing.lastInteractionAt, + reviewDurationSeconds: timing.durationSeconds, + }); + if (res?.code === 200) { + session.value = { ...session.value, finished: true }; + clearStorage(session.value.taskNum, session.value.concept); + stopDuration(); + return true; + } + error.value = "这条收获没能记下来,请稍后再试"; + return false; + } catch (e) { + error.value = errorMessageOf(e, "这条收获没能记下来,请稍后再试"); + return false; + } + }; + + /** 放弃这次引导:不产出任何数据 */ + const abandon = async (): Promise => { + const current = session.value; + if (!current) return; + if (!current.finished) { + try { + await abandonGuidance(current.guidanceNum); + } catch { + // 放弃失败也不该拦住用户,本地照常收尾 + } + } + clearStorage(current.taskNum, current.concept); + stopDuration(); + session.value = { ...current, finished: true }; + }; + + return { + session, + turns, + starting, + sending, + waiting, + waitingSeconds, + error, + unavailable, + open, + send, + confirmFragment, + abandon, + markInteraction, + reset, + }; +} diff --git a/src/components/composables/useMarkers.ts b/src/components/composables/useMarkers.ts new file mode 100644 index 0000000..720e29f --- /dev/null +++ b/src/components/composables/useMarkers.ts @@ -0,0 +1,125 @@ +// src/components/composables/useMarkers.ts +import { ref } from "vue"; +import { + addUserTag, + deleteMarker, + filterByMarker, + getMarkersBatch, + type Marker, + type MarkerObjectType, +} from "@/api/markers"; + +/** + * 某个对象类型下的标记板:批量取回一页对象的标记,并就地增删用户标签。 + * 系统标记只读,弹筛选用的是用户标签。 + */ +export function useMarkers(objectType: MarkerObjectType) { + const markersByObject = ref>({}); + + /** 批量取回;失败时按「没有标记」处理,不阻塞列表主体 */ + const load = async (objectNums: string[]) => { + const unique = [...new Set(objectNums.filter(Boolean))]; + if (unique.length === 0) { + markersByObject.value = {}; + return; + } + try { + const res = await getMarkersBatch(objectType, unique); + markersByObject.value = res?.data || {}; + } catch { + markersByObject.value = {}; + } + }; + + const markersOf = (objectNum: string): Marker[] => markersByObject.value[objectNum] || []; + + const addTag = async (objectNum: string, markerName: string): Promise => { + const name = markerName.trim(); + if (!name) return false; + try { + const res = await addUserTag(objectType, objectNum, name); + const created = res?.data; + if (res?.code === 200 && created) { + const existing = markersByObject.value[objectNum] || []; + if (!existing.some((marker) => marker.kind === "USER" && marker.markerName === created.markerName)) { + markersByObject.value = { ...markersByObject.value, [objectNum]: [...existing, created] }; + } + return true; + } + } catch { + // 请求层已提示具体错误 + } + return false; + }; + + const removeTag = async (objectNum: string, marker: Marker): Promise => { + try { + const res = await deleteMarker(marker.id); + if (res?.code === 200) { + markersByObject.value = { + ...markersByObject.value, + [objectNum]: (markersByObject.value[objectNum] || []).filter((item) => item.id !== marker.id), + }; + return true; + } + } catch { + // 请求层已提示具体错误 + } + return false; + }; + + /** 点标签即筛选:返回带该用户标签的对象标识集合 */ + const filterByTag = async (marker: Marker): Promise> => { + const res = await filterByMarker({ + objectType, + markerName: marker.markerName, + kind: "USER", + }); + return new Set(res?.data || []); + }; + + return { markersByObject, load, markersOf, addTag, removeTag, filterByTag }; +} + +/** + * 删除一个用户标签(影响所有带该标签的对象)。 + * 后端只提供按标记 id 删除,因此先按标签名筛出对象,再逐条取回 id 删除。 + */ +export const deleteUserTagEverywhere = async (markerName: string): Promise => { + const objectTypes: MarkerObjectType[] = ["FRAGMENT", "TASK"]; + const markerIds: number[] = []; + + for (const objectType of objectTypes) { + let objectNums: string[] = []; + try { + const res = await filterByMarker({ objectType, markerName, kind: "USER" }); + objectNums = res?.data || []; + } catch { + continue; + } + if (objectNums.length === 0) continue; + try { + const batch = await getMarkersBatch(objectType, objectNums); + for (const list of Object.values(batch?.data || {})) { + for (const marker of list) { + if (marker.kind === "USER" && marker.markerName === markerName) { + markerIds.push(marker.id); + } + } + } + } catch { + // 跳过该对象类型,尽量删掉其余 + } + } + + let removed = 0; + for (const id of markerIds) { + try { + await deleteMarker(id); + removed += 1; + } catch { + // 单条失败不影响其余 + } + } + return removed; +};