From 33b1c8a9326ea95d108f67148a3b468defe2550c Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Sat, 10 Oct 2026 14:38:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=8F=AA=E8=AF=BB?= =?UTF-8?q?=E5=B9=B6=E6=8A=8A=E6=AE=8B=E7=89=87=E6=93=8D=E4=BD=9C=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 7 - src/__tests__/components/Review.spec.ts | 88 +++++++ src/__tests__/components/ReviewDetail.spec.ts | 182 ++++++++++++++ src/__tests__/components/Welcome.spec.ts | 136 ++-------- src/components/Review.vue | 34 ++- src/components/ReviewDetail.vue | 129 +++++++++- src/components/Welcome.vue | 233 +----------------- 7 files changed, 454 insertions(+), 355 deletions(-) create mode 100644 src/__tests__/components/Review.spec.ts create mode 100644 src/__tests__/components/ReviewDetail.spec.ts diff --git a/AGENTS.md b/AGENTS.md index 0aaf231..ff6dbe8 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,13 +7,6 @@ - 提交信息必须简短且使用中文,不要使用英文长句。 - 格式:`类型: 简述`,例如 `feat: 新增学习会话页面`、`fix: 修复路由守卫401跳转`、`docs: 补充组件说明`。 -## 并行与委派 - -- **默认并行**:互不依赖的多个任务必须同时推进,不要逐个串行。 -- 同一仓库/工作目录同时只允许一个写入者(第二个写入者要么等,要么用 worktree 隔离)。 -- 只有存在真实依赖(后一步要用前一步的产出)时才串行,并在派发说明里写明依赖点。 -- 子代理不要改 meta 仓库的 `OPTIMIZATION_BACKLOG.md`,完成情况由主代理统一记录。 - ## 技术栈 - 框架:Vue 3 + TypeScript + Vite 5 diff --git a/src/__tests__/components/Review.spec.ts b/src/__tests__/components/Review.spec.ts new file mode 100644 index 0000000..7910e99 --- /dev/null +++ b/src/__tests__/components/Review.spec.ts @@ -0,0 +1,88 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +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 { getPendingOwnershipFragments } from '@/api/reportFragments' +import { filterByMarker, getMarkersBatch } from '@/api/markers' + +vi.mock('@/api/review', () => ({ + getReviewTaskStats: vi.fn(), + getSortPreference: vi.fn(), + saveSortPreference: vi.fn(), +})) + +vi.mock('@/api/reportFragments', () => ({ + getPendingOwnershipFragments: vi.fn(), + updateFragmentOwnership: vi.fn(), +})) + +vi.mock('@/api/markers', () => ({ + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), + getMarkersBatch: vi.fn(), + getUserTagUsage: vi.fn(), + renameUserTag: vi.fn(), +})) + +vi.mock('@/api/export', () => ({ + exportRange: vi.fn(), +})) + +const task = (taskNum: string, taskName: string) => ({ + taskNum, + taskName, + reportCount: 1, + fragmentCount: 2, + effectiveTime: 0, + reviewDurationSeconds: 0, +}) + +const mountReview = async (query: Record = {}) => { + const testRouter = createRouter({ + history: createMemoryHistory(), + routes: [{ path: '/review', component: Review }], + }) + await testRouter.push({ path: '/review', query }) + await testRouter.isReady() + const wrapper = mount(Review, { + global: { plugins: [ElementPlus, testRouter], stubs: { ElTag: true } }, + }) + await flushPromises() + return { wrapper, testRouter } +} + +beforeEach(() => { + vi.clearAllMocks() + vi.mocked(getReviewTaskStats).mockResolvedValue({ + code: 200, + data: [task('T1', '英语任务'), task('T2', '数学任务')], + } as never) + vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: {} } as never) +}) + +describe('Review 按标签筛选(闭环-01 跳转入口)', () => { + it('带 markerName 进入时按该标签筛选任务', async () => { + vi.mocked(filterByMarker).mockResolvedValue({ code: 200, data: ['T1'] } as never) + const { wrapper } = await mountReview({ markerName: '英语' }) + + expect(filterByMarker).toHaveBeenCalledWith({ objectType: 'TASK', markerName: '英语', kind: 'USER' }) + expect(wrapper.text()).toContain('正在按标签「英语」筛选任务') + expect(wrapper.text()).toContain('英语任务') + expect(wrapper.text()).not.toContain('数学任务') + + wrapper.unmount() + }) + + it('不带 markerName 进入时不筛选', async () => { + const { wrapper } = await mountReview() + + expect(filterByMarker).not.toHaveBeenCalled() + expect(wrapper.text()).toContain('数学任务') + + wrapper.unmount() + }) +}) diff --git a/src/__tests__/components/ReviewDetail.spec.ts b/src/__tests__/components/ReviewDetail.spec.ts new file mode 100644 index 0000000..fade442 --- /dev/null +++ b/src/__tests__/components/ReviewDetail.spec.ts @@ -0,0 +1,182 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { flushPromises, mount } from '@vue/test-utils' +import ElementPlus from 'element-plus' +import { createMemoryHistory, createRouter } from 'vue-router' +import ReviewDetail from '@/components/ReviewDetail.vue' +import { getFragmentDetail, getTaskReview, submitReviewFeedback } from '@/api/review' +import { getSessionDetail } from '@/api/studySessions' +import { addUserTag, deleteMarker, getMarkersBatch } from '@/api/markers' +import { startGuidance } from '@/api/guidance' +import { getAiTask } from '@/api/aiTasks' + +vi.mock('@/api/review', () => ({ + deleteReport: vi.fn(), + getFragmentDetail: vi.fn(), + getReportDetailStructured: vi.fn(), + getTaskReview: vi.fn(), + submitReviewFeedback: vi.fn(), + updateReport: vi.fn(), +})) + +vi.mock('@/api/reportFragments', () => ({ + deleteFragment: vi.fn(), + updateFragments: vi.fn(), +})) + +vi.mock('@/api/markers', () => ({ + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), + getMarkersBatch: vi.fn(), +})) + +vi.mock('@/api/studySessions', () => ({ + getSessionDetail: vi.fn(), +})) + +vi.mock('@/api/export', () => ({ + exportTask: vi.fn(), +})) + +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 userTag = { + id: 21, + objectType: 'FRAGMENT', + objectNum: '7', + kind: 'USER', + markerName: '英语', + markerValue: null, +} + +const mountDetail = async () => { + const testRouter = createRouter({ + history: createMemoryHistory(), + routes: [ + { path: '/', component: { template: '
' } }, + { path: '/review', component: { template: '
' } }, + { path: '/review/detail/:type/:id', component: ReviewDetail }, + ], + }) + await testRouter.push('/review/detail/fragment/7') + await testRouter.isReady() + const wrapper = mount(ReviewDetail, { + global: { + plugins: [ElementPlus, testRouter], + // jsdom 下 Element Plus 的 el-tag 过渡挂载钩子会报错(shallow 之外的场景),这里只桩掉它 + stubs: { ElTag: true }, + }, + }) + await flushPromises() + return { wrapper, testRouter } +} + +beforeEach(() => { + vi.clearAllMocks() + vi.mocked(getFragmentDetail).mockResolvedValue({ + code: 200, + data: { id: 7, content: '残片正文', contextNum: 'SESSION_1', ownerTaskNum: 'T001' }, + } as never) + vi.mocked(getSessionDetail).mockResolvedValue({ + code: 200, + data: { sessionNum: 'SESSION_1', taskNum: 'T001', taskName: '测试任务', actualTime: 60, effectiveTime: 60, effectivenessRatio: 1 }, + } as never) + vi.mocked(getTaskReview).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: { '7': [userTag] } } as never) +}) + +describe('ReviewDetail 残片操作(闭环-01)', () => { + it('展示残片的标记,并可就地加标签与删除标签', async () => { + vi.mocked(addUserTag).mockResolvedValue({ code: 200, data: { ...userTag, id: 22, markerName: '数学' } } as never) + vi.mocked(deleteMarker).mockResolvedValue({ code: 200 } as never) + const { wrapper } = await mountDetail() + + expect(getMarkersBatch).toHaveBeenCalledWith('FRAGMENT', ['7']) + expect(wrapper.find('.marker-user').text()).toContain('英语') + + await wrapper.find('.marker-add-toggle').trigger('click') + const input = wrapper.find('.marker-add-input') + await input.setValue('数学') + await input.trigger('keydown.enter') + await flushPromises() + + expect(addUserTag).toHaveBeenCalledWith('FRAGMENT', '7', '数学') + wrapper.unmount() + }) + + it('点残片标签跳回复习总览并带筛选条件', async () => { + const { wrapper, testRouter } = await mountDetail() + const pushSpy = vi.spyOn(testRouter, 'push') + + await wrapper.find('.marker-user').trigger('click') + await flushPromises() + + expect(pushSpy).toHaveBeenCalledWith({ path: '/review', query: { markerName: '英语' } }) + pushSpy.mockRestore() + wrapper.unmount() + }) + + it('反馈动作调用接口并按回显切换,不产生状态徽标', async () => { + 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 mountDetail() + + const mastered = wrapper.findAll('button').find((b) => b.text().trim() === '已掌握') + expect(mastered).toBeDefined() + await mastered!.trigger('click') + await flushPromises() + + expect(submitReviewFeedback).toHaveBeenCalledWith(7, { mastered: true }) + expect(mastered!.classes()).toContain('el-button--success') + // 反馈只影响出现概率,不做徽标、统计或待复习列表 + expect(wrapper.find('.el-badge').exists()).toBe(false) + expect(wrapper.text()).not.toContain('待复习') + + await mastered!.trigger('click') + await flushPromises() + expect(submitReviewFeedback).toHaveBeenLastCalledWith(7, { mastered: false }) + expect(mastered!.classes()).not.toContain('el-button--success') + + wrapper.unmount() + }) + + it('学习引导入口打开弹窗并带上任务与概念', async () => { + vi.mocked(startGuidance).mockResolvedValue({ + code: 200, + data: { guidanceNum: 'G1', taskNum: 'T001', concept: '残片正文', aiTaskNum: 'AI1' }, + } as never) + vi.mocked(getAiTask).mockResolvedValue({ + code: 200, + data: { + taskNum: 'AI1', + type: 'GUIDANCE', + targetNum: 'G1', + status: 'SUCCEEDED', + result: { reply: '第一个问题' }, + }, + } as never) + const { wrapper } = await mountDetail() + + const guidanceButton = wrapper.findAll('button').find((b) => b.text().trim() === '学习引导') + expect(guidanceButton).toBeDefined() + await guidanceButton!.trigger('click') + await flushPromises() + + expect(startGuidance).toHaveBeenCalledWith('T001', '残片正文') + expect(wrapper.text()).toContain('正在引导的概念') + + wrapper.unmount() + }) +}) diff --git a/src/__tests__/components/Welcome.spec.ts b/src/__tests__/components/Welcome.spec.ts index 5472a6d..65185f1 100644 --- a/src/__tests__/components/Welcome.spec.ts +++ b/src/__tests__/components/Welcome.spec.ts @@ -2,12 +2,9 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest' import { flushPromises, mount } from '@vue/test-utils' import ElementPlus from 'element-plus' import { createMemoryHistory, createRouter } from 'vue-router' -import { nextTick } from 'vue' import Welcome from '@/components/Welcome.vue' import { getReviewFeed, getReviewTaskStats, submitReviewFeedback, touchReviewFragment } from '@/api/review' -import { getAiTask } from '@/api/aiTasks' -import { startGuidance } from '@/api/guidance' -import { filterByMarker, getMarkersBatch } from '@/api/markers' +import { 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' @@ -132,7 +129,6 @@ beforeEach(() => { return anim as unknown as Animation }) Element.prototype.animate = animateSpy as unknown as Element['animate'] - 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)] }) }) @@ -348,85 +344,47 @@ describe('Welcome Feed 待归类内容', () => { }) /** - * 标记(标记-01)与复习反馈动作(复习-02)、Feed 摘要(复习-05)在 Feed 卡片上的行为。 + * 闭环-01:首页只读。打标签、反馈(已掌握/稍后再看)与学习引导都不在 Feed 卡片上, + * 它们统一落在残片详情页(ReviewDetail.vue);首页只保留展示、导航与待归类归类。 */ -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, - } - +describe('Welcome Feed 只读化(闭环-01)', () => { beforeEach(() => { vi.clearAllMocks() stubLayout(4000, 1000) }) - it('系统标记成对只读展示,用户标签可点', async () => { + 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('英语') + expect(getMarkersBatch).not.toHaveBeenCalled() + expect(wrapper.find('.marker-system').exists()).toBe(false) + expect(wrapper.find('.marker-user').exists()).toBe(false) + const buttonTexts = wrapper.findAll('button').map((b) => b.text().trim()) + expect(buttonTexts).not.toContain('已掌握') + expect(buttonTexts).not.toContain('稍后再看') + expect(buttonTexts).not.toContain('学习引导') + expect(wrapper.find('.color-legend').exists()).toBe(false) + expect(submitReviewFeedback).not.toHaveBeenCalled() + + wrapper.unmount() }) - 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 () => { + 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 pushSpy = vi.spyOn(appRouter, 'push').mockResolvedValue() const wrapper = await mountWelcome() - const mastered = wrapper.findAll('button').find((b) => b.text().trim() === '已掌握') - await mastered!.trigger('click') + await wrapper.find('.review-chip').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('待复习') + const detail = wrapper.findAll('button').find((b) => b.text().trim() === '查看详情') + expect(detail).toBeDefined() + await detail!.trigger('click') - await mastered!.trigger('click') - await flushPromises() - expect(submitReviewFeedback).toHaveBeenLastCalledWith(1, { mastered: false }) - expect(mastered!.classes()).not.toContain('is-active') + expect(pushSpy).toHaveBeenCalledWith('/review/detail/fragment/1') + pushSpy.mockRestore() + wrapper.unmount() }) it('展开查看残片时会记录一次接触', async () => { @@ -452,47 +410,3 @@ describe('Welcome Feed 标记、反馈与摘要', () => { expect(wrapper.text()).toContain('全文 380 字') }) }) - -/** - * 学习引导入口(复习-06):入口只依赖是否归属任务,不因 AI 失败被停用。 - */ -describe('Welcome 学习引导入口', () => { - beforeEach(() => { - vi.clearAllMocks() - stubLayout(4000, 1000) - vi.mocked(getReviewFeed).mockResolvedValue({ code: 200, data: [makeFragment(1)] } as never) - vi.mocked(startGuidance).mockResolvedValue({ - code: 200, - data: { guidanceNum: 'G1', taskNum: 'T001', concept: '残片内容1', aiTaskNum: 'AI1' }, - } as never) - vi.mocked(getAiTask).mockResolvedValue({ - code: 200, - data: { - taskNum: 'AI1', - type: 'GUIDANCE', - targetNum: 'G1', - status: 'SUCCEEDED', - result: { reply: '第一个问题' }, - }, - } as never) - }) - - it('残片有归属任务时「学习引导」入口不禁用,点击后打开引导弹窗', async () => { - const wrapper = await mountWelcome() - - const guidanceButton = wrapper.findAll('button').find((b) => b.text().trim() === '学习引导') - expect(guidanceButton).toBeDefined() - expect(guidanceButton!.attributes('disabled')).toBeUndefined() - expect(guidanceButton!.attributes('title')).toBe('和 AI 一起把这个概念聊透') - - await guidanceButton!.trigger('click') - await flushPromises() - await nextTick() - - expect(startGuidance).toHaveBeenCalledWith('T1', '残片内容1') - expect(wrapper.find('.guidance-dialog').exists()).toBe(true) - expect(wrapper.text()).toContain('正在引导的概念') - - wrapper.unmount() - }) -}) diff --git a/src/components/Review.vue b/src/components/Review.vue index 2c1dbc8..c8a5c45 100644 --- a/src/components/Review.vue +++ b/src/components/Review.vue @@ -1,6 +1,6 @@ diff --git a/src/components/ReviewDetail.vue b/src/components/ReviewDetail.vue index 2e6393c..4a90d0f 100644 --- a/src/components/ReviewDetail.vue +++ b/src/components/ReviewDetail.vue @@ -6,6 +6,7 @@ import { getFragmentDetail, getReportDetailStructured, getTaskReview, + submitReviewFeedback, updateReport, type ReviewFeedItem, type StudyReportDetail, @@ -18,6 +19,10 @@ import { downloadTextFile } from "@/utils/download"; import { formatRatio } from "@/utils/format"; import { ElMessage, ElMessageBox } from "element-plus"; import MarkdownRenderer from "@/components/MarkdownRenderer.vue"; +import MarkerChips from "@/components/MarkerChips.vue"; +import GuidanceDialog from "@/components/GuidanceDialog.vue"; +import { useMarkers } from "@/components/composables/useMarkers"; +import type { Marker } from "@/api/markers"; const route = useRoute(); const router = useRouter(); @@ -66,6 +71,59 @@ const exporting = ref(false); const sessionInfo = ref(null); +// 闭环-01:残片的打标签、反馈与学习引导都集中在详情页 +const fragmentMarkers = useMarkers("FRAGMENT"); +const fragmentTagList = computed(() => + contentType.value === "fragment" ? fragmentMarkers.markersOf(String(contentId.value)) : [], +); +// 反馈只记录本次浏览内的点击态,不做状态展示(与复习-02 的口径一致) +const feedback = ref({ mastered: false, revisit: false }); +const feedbackBusy = ref(false); +const guidanceVisible = ref(false); +const guidanceTaskNum = ref(""); +const guidanceConcept = ref(""); + +const addFragmentTag = async (markerName: string) => { + await fragmentMarkers.addTag(String(contentId.value), markerName); +}; + +const removeFragmentTag = async (marker: Marker) => { + await fragmentMarkers.removeTag(String(contentId.value), marker); +}; + +/** 点标签即跳回复习总览按该标签筛选任务(单一标记,不做组合) */ +const goToMarkerFilteredReview = (marker: Marker) => { + router.push({ path: "/review", query: { markerName: marker.markerName } }); +}; + +const toggleFeedback = async (action: "mastered" | "revisit") => { + if (feedbackBusy.value) return; + const payload = + action === "mastered" + ? { mastered: !feedback.value.mastered } + : { revisit: !feedback.value.revisit }; + feedbackBusy.value = true; + try { + const res = await submitReviewFeedback(contentId.value, payload); + const echoed = res?.data; + if (echoed) { + feedback.value = { mastered: !!echoed.mastered, revisit: !!echoed.revisit }; + } + } catch { + // 请求层已提示具体错误,这里不改变按钮态 + } finally { + feedbackBusy.value = false; + } +}; + +/** 学习引导入口:只依赖是否归属任务,不因 AI 失败被停用 */ +const openGuidance = () => { + if (!taskNum.value) return; + guidanceTaskNum.value = taskNum.value; + guidanceConcept.value = content.value || ""; + guidanceVisible.value = true; +}; + const taskSessions = ref<{ contextNum: string; startTime: string; @@ -191,6 +249,8 @@ const loadDetail = async () => { if (!data) return; content.value = data.content || ""; fragmentOwnership.value = data.ownerTaskNum || null; + feedback.value = { mastered: false, revisit: false }; + await fragmentMarkers.load([String(contentId.value)]); if (data.contextNum) { try { const sessionRes = await getSessionDetail(data.contextNum); @@ -460,6 +520,39 @@ watch( 效率:{{ formatRatio(sessionInfo.effectivenessRatio) }}
+ +
+ + + 已掌握 + 稍后再看 + 学习引导 + +
+
@@ -627,6 +720,13 @@ watch( + + @@ -639,11 +739,6 @@ watch( margin: 0 auto; } -.content-card { - padding: 22px; - min-height: 120px; -} - .content-meta { display: flex; align-items: center; @@ -652,6 +747,30 @@ watch( flex-wrap: wrap; } +.fragment-controls { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + flex-wrap: wrap; + margin-bottom: 14px; + padding: 10px 12px; + border: 1px solid var(--border-soft); + border-radius: 8px; + background: var(--accent-success-softer); +} + +.fragment-controls-actions { + display: inline-flex; + align-items: center; + gap: 8px; +} + +.content-card { + padding: 22px; + min-height: 120px; +} + .session-stats { display: flex; flex-wrap: wrap; diff --git a/src/components/Welcome.vue b/src/components/Welcome.vue index 21230c2..4570eee 100644 --- a/src/components/Welcome.vue +++ b/src/components/Welcome.vue @@ -6,15 +6,10 @@ 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 MarkerChips from "@/components/MarkerChips.vue"; -import GuidanceDialog from "@/components/GuidanceDialog.vue"; import { clampAutoScrollTime, measureAutoScroll, @@ -37,8 +32,6 @@ interface FragmentChip { taskNum: string | null; /** 截断后的展示文本 */ content: string; - /** 摘要原文(≤200 字),学习引导的概念取它 */ - rawContent: string; /** 原文总长度与是否截断(复习-05) */ contentLength: number; contentTruncated: boolean; @@ -49,34 +42,18 @@ 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: "", -}); +// 闭环-01:首页只读,打标签、反馈(已掌握/稍后再看)与学习引导都在残片详情页完成 // 滚动条只展示学习残片,每条残片单独作为 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, @@ -138,62 +115,10 @@ 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) return; - guidance.value = { visible: true, taskNum: chip.taskNum, concept: chip.rawContent || chip.content }; +/** 进入残片详情页:打标签、反馈与学习引导都在那里完成(闭环-01) */ +const goToFragmentDetail = (fragment: FragmentChip) => { + recallCard.value.visible = false; + router.push(`/review/detail/fragment/${fragment.id}`); }; // 复制多份实现无缝循环,份数按轨道宽度动态补足 @@ -205,12 +130,6 @@ 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 { @@ -451,22 +370,6 @@ onBeforeUnmount(() => {
-
-
- 正在按标签「{{ markerFilter.markerName }}」筛选 - 清除筛选 -
- - - 学习残片 - - -
{ 待归类 {{ chip.content }} - - - - - - - -
@@ -649,15 +521,15 @@ onBeforeUnmount(() => { 前往回忆复习 关闭 + 查看详情 -
@@ -710,49 +582,6 @@ onBeforeUnmount(() => { overflow: hidden; } -.review-scroll-header { - display: flex; - 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); - display: inline-flex; - align-items: center; - gap: 12px; - cursor: help; - outline: none; -} - -.dot { - display: inline-block; - width: 8px; - height: 8px; - border-radius: 2px; - margin-right: 3px; -} - -.dot-fragment { - background: var(--accent-warning); -} - .review-scroll-track { overflow: hidden; /* 限制横向手势交给脚本处理,避免拖动时页面跟着晃 */ @@ -788,46 +617,6 @@ onBeforeUnmount(() => { 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);