From ca89b74de1c1d9c938052b1b471dca917eee3cb3 Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Thu, 22 Oct 2026 22:01:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E4=B9=A0=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E3=80=81=E5=85=A8=E5=B1=80=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E4=B8=8E=E6=8C=89=E6=A0=87=E7=AD=BE=E5=A4=8D=E4=B9=A0=20Tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- e2e/review.spec.ts | 124 ++- src/__tests__/api/review.spec.ts | 17 +- src/__tests__/api/tagMindMap.spec.ts | 11 +- src/__tests__/components/Review.spec.ts | 110 ++- src/__tests__/components/Welcome.spec.ts | 11 +- .../composables/useDelayedVisible.spec.ts | 101 +++ .../integration/review-export-flow.spec.ts | 24 +- .../integration/review-overview-flow.spec.ts | 278 +++++- src/__tests__/support/page.ts | 13 + src/api/review.ts | 32 +- src/api/tagMindMap.ts | 27 + src/api/tasks.ts | 15 + src/assets/main.css | 83 ++ src/components/Review.vue | 799 +++++++++++++----- src/components/TagMindMapList.vue | 241 ++++++ src/components/Welcome.vue | 11 +- .../composables/useDelayedVisible.ts | 74 ++ src/utils/format.ts | 23 + src/utils/request.ts | 13 + 19 files changed, 1727 insertions(+), 280 deletions(-) create mode 100644 src/__tests__/composables/useDelayedVisible.spec.ts create mode 100644 src/__tests__/support/page.ts create mode 100644 src/components/TagMindMapList.vue create mode 100644 src/components/composables/useDelayedVisible.ts diff --git a/e2e/review.spec.ts b/e2e/review.spec.ts index 17f9c61..939c3c8 100644 --- a/e2e/review.spec.ts +++ b/e2e/review.spec.ts @@ -1,8 +1,18 @@ import { test, expect } from '@playwright/test'; +/** 后端分页形状:列表接口都返回 { records, total, ... } */ +const pageOf = (records: unknown[], total = records.length) => ({ + records, + total, + size: records.length || 20, + current: 1, + pages: total === 0 ? 0 : 1, +}); + const mockTasksData = { code: 200, - data: [ + data: pageOf( + [ { taskNum: 'T001', taskName: '学习 Vue3', @@ -17,10 +27,19 @@ const mockTasksData = { fragmentCount: 2, effectiveTime: 4500, }, - ], + ], + 45, + ), }; -const mockTasksEmpty = { code: 200, data: [] }; +const mockTasksEmpty = { code: 200, data: pageOf([]) }; const mockFeed = { code: 200, data: [] }; +const mockTagMaps = { code: 200, data: pageOf([]) }; +const mockEmptyList = { code: 200, data: [] }; +const mockEmptyMap = { code: 200, data: {} }; +const mockSortPreference = { + code: 200, + data: { preset: 'TIME_FIRST', description: '久未接触的更容易出现' }, +}; test.describe('Review page', () => { test.beforeEach(async ({ page }) => { @@ -34,6 +53,34 @@ test.describe('Review page', () => { await page.route('**/api/review/feed**', (route) => route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(mockFeed) }), ); + await page.route('**/api/review/tag-mind-map/list**', (route) => + route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(mockTagMaps) }), + ); + // 总览还会取排序偏好、任务标记与待归类;不拦住这些请求就会打到真实后端并 401, + // 401 处理会清掉登录标记并跳回 /login,用例与真实后端状态耦合。 + await page.route('**/api/review/sort-preference**', (route) => + route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(mockSortPreference) }), + ); + await page.route('**/api/markers/batch**', (route) => + route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(mockEmptyMap) }), + ); + await page.route('**/api/report-fragments/pending-ownership**', (route) => + route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(mockEmptyList) }), + ); + await page.route('**/api/review/summary**', (route) => + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify({ code: 200, data: { taskTotal: 45, reportTotal: 4, fragmentTotal: 7 } }), + }), + ); + await page.route('**/api/tasks/options**', (route) => + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify({ code: 200, data: [{ taskNum: 'T001', taskName: '学习 Vue3' }] }), + }), + ); await page.goto('/login'); await page.evaluate(() => localStorage.setItem('isLoggedIn', 'true')); @@ -42,16 +89,76 @@ test.describe('Review page', () => { }); test('displays summary metrics and task list', async ({ page }) => { - await expect(page.locator('.metric-card')).toHaveCount(3); - // Check metric values - await expect(page.locator('.metric-card').first().locator('strong')).toContainText('2'); + // 指标收成一行紧凑统计条,不再占三张卡片 + // 汇总走独立接口:数字是全量口径(45 个任务),不是分页后本页的 2 条 + const stats = page.locator('.page-stats'); + await expect(stats).toContainText('任务 45'); + await expect(stats).toContainText('学习报告 4'); + await expect(stats).toContainText('学习残片 7'); + // 两个模块同位置分 Tab,Tab 上带条数 + await expect(page.getByRole('tab')).toHaveCount(2) + await expect(page.getByRole('tab', { name: /按任务复习/ })).toContainText('45') + await expect(page.getByRole('tab', { name: /按标签复习/ })).toBeVisible() // 任务以卡片列表展示(不再是 el-table) await expect(page.locator('.task-card')).toHaveCount(2); await expect(page.getByText('学习 Vue3')).toBeVisible(); await expect(page.getByRole('button', { name: '回忆复习' })).toHaveCount(2); }); + test('切到按标签复习:写入 URL 并懒加载该 Tab 的内容', async ({ page }) => { + await page.getByRole('tab', { name: /按标签复习/ }).click() + await expect(page).toHaveURL(/tab=tag/) + await expect(page.getByText('已生成的标签导图')).toBeVisible() + + // 刷新后仍落在标签 Tab(URL 即状态) + await page.reload() + await expect(page.getByText('已生成的标签导图')).toBeVisible() + }); + + test('任务超过一页时出现分页,翻页会带上页号', async ({ page }) => { + const requested: string[] = [] + await page.route('**/api/review/tasks**', (route) => { + requested.push(route.request().url()) + const isSecondPage = route.request().url().includes('pageNum=2') + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify({ + code: 200, + data: { ...pageOf(mockTasksData.data.records as unknown[], 45), current: isSecondPage ? 2 : 1 }, + }), + }) + }) + + await page.goto('/review') + await page.waitForSelector('.task-card') + const pagination = page.locator('.list-pagination') + await expect(pagination).toBeVisible() + + await pagination.locator('.btn-next').click() + await expect.poll(() => requested.some((url) => url.includes('pageNum=2'))).toBe(true) + }); + + test('低频操作收进「更多」菜单', async ({ page }) => { + await expect(page.getByRole('button', { name: '更多操作' })).toBeVisible(); + // 刷新已移除;导出与标签管理不在页面上平铺 + await expect(page.getByRole('button', { name: '刷新' })).toHaveCount(0); + await expect(page.getByRole('button', { name: '导出数据' })).toHaveCount(0); + + await page.getByRole('button', { name: '更多操作' }).click(); + await expect(page.getByRole('menuitem', { name: '导出学习数据' })).toBeVisible(); + await expect(page.getByRole('menuitem', { name: '标签管理' })).toBeVisible(); + await expect(page.getByRole('menuitem', { name: '智能排序偏好' })).toBeVisible(); + }); + test('shows empty state when no tasks', async ({ page }) => { + await page.route('**/api/review/summary**', (route) => + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify({ code: 200, data: { taskTotal: 0, reportTotal: 0, fragmentTotal: 0 } }), + }), + ); await page.route('**/api/review/tasks**', (route) => route.fulfill({ status: 200, @@ -62,8 +169,11 @@ test.describe('Review page', () => { await page.goto('/review'); await page.waitForSelector('.review-page', { timeout: 10_000 }); - await expect(page.locator('.metric-card').first().locator('strong')).toContainText('0'); + // 三个 0 不承载信息:统计条收起,而不是显示「任务 0」 + await expect(page.locator('.page-stats')).toHaveCount(0); await expect(page.getByText('暂无复习任务')).toBeVisible(); + // 空态必须有下一步动作 + await expect(page.getByRole('button', { name: '新建学习任务' })).toBeVisible(); }); test('接口失败时提示加载失败而不是显示空列表', async ({ page }) => { diff --git a/src/__tests__/api/review.spec.ts b/src/__tests__/api/review.spec.ts index c6da061..f6b6d6b 100644 --- a/src/__tests__/api/review.spec.ts +++ b/src/__tests__/api/review.spec.ts @@ -51,10 +51,21 @@ describe('review API', () => { expect(mockedRequest.get).toHaveBeenCalledWith('/review/feed', { limit: 50, mode: 'random' }) }) - it('getReviewTaskStats calls GET /review/tasks', async () => { - mockedRequest.get.mockResolvedValue({ code: 200, data: [] }) + it('getReviewTaskStats 分页请求 /review/tasks,并支持带标签筛选', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: { records: [], total: 0 } }) + await getReviewTaskStats(2, 20, '英语') + // 筛选下推到服务端,否则客户端只能筛当前页、总数也不对 + expect(mockedRequest.get).toHaveBeenCalledWith('/review/tasks', { + pageNum: 2, + pageSize: 20, + markerName: '英语', + }) + }) + + it('getReviewTaskStats 默认第一页、不带筛选参数', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: { records: [], total: 0 } }) await getReviewTaskStats() - expect(mockedRequest.get).toHaveBeenCalledWith('/review/tasks') + expect(mockedRequest.get).toHaveBeenCalledWith('/review/tasks', { pageNum: 1, pageSize: 20 }) }) it('getReviewTaskStatsByTask calls GET /review/tasks/:taskNum', async () => { diff --git a/src/__tests__/api/tagMindMap.spec.ts b/src/__tests__/api/tagMindMap.spec.ts index ab464b8..6e2c79c 100644 --- a/src/__tests__/api/tagMindMap.spec.ts +++ b/src/__tests__/api/tagMindMap.spec.ts @@ -10,7 +10,7 @@ vi.mock('@/utils/request', () => ({ })) import request from '@/utils/request' -import { listTagRecallRecords, queryTagMindMap, updateTagMindMap } from '@/api/tagMindMap' +import { listTagMindMaps, listTagRecallRecords, queryTagMindMap, updateTagMindMap } from '@/api/tagMindMap' const mockedRequest = vi.mocked(request) @@ -38,6 +38,15 @@ describe('tagMindMap API(闭环-04)', () => { }) }) + it('listTagMindMaps 分页拉取已有导图列表', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: { records: [], total: 0 } }) + await listTagMindMaps(3, 20) + expect(mockedRequest.get).toHaveBeenCalledWith('/review/tag-mind-map/list', { + pageNum: 3, + pageSize: 20, + }) + }) + it('listTagRecallRecords 按范围取回忆记录', async () => { mockedRequest.post.mockResolvedValue({ code: 200, data: [] }) await listTagRecallRecords(['英语'], 'UNION') diff --git a/src/__tests__/components/Review.spec.ts b/src/__tests__/components/Review.spec.ts index 862c96a..04509e7 100644 --- a/src/__tests__/components/Review.spec.ts +++ b/src/__tests__/components/Review.spec.ts @@ -3,12 +3,16 @@ 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 { getReviewSummary, getReviewTaskStats } from '@/api/review' import { getPendingOwnershipFragments } from '@/api/reportFragments' -import { filterByMarker, getMarkersBatch, listDictionaryTags, createDictionaryTag, deleteDictionaryTag, renameDictionaryTag } from '@/api/markers' +import { listTagMindMaps } from '@/api/tagMindMap' +import { listTaskOptions } from '@/api/tasks' +import { pageOf } from '../support/page' +import { getMarkersBatch, listDictionaryTags, createDictionaryTag, deleteDictionaryTag, renameDictionaryTag } from '@/api/markers' vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), + getReviewSummary: vi.fn(), getSortPreference: vi.fn(), saveSortPreference: vi.fn(), })) @@ -36,6 +40,14 @@ vi.mock('@/api/export', () => ({ exportRange: vi.fn(), })) +vi.mock('@/api/tagMindMap', () => ({ + listTagMindMaps: vi.fn(), +})) + +vi.mock('@/api/tasks', () => ({ + listTaskOptions: vi.fn(), +})) + const task = (taskNum: string, taskName: string) => ({ taskNum, taskName, @@ -48,7 +60,10 @@ const task = (taskNum: string, taskName: string) => ({ const mountReview = async (query: Record = {}) => { const testRouter = createRouter({ history: createMemoryHistory(), - routes: [{ path: '/review', component: Review }], + routes: [ + { path: '/review', component: Review }, + { path: '/review/by-tag', component: { template: '
' } }, + ], }) await testRouter.push({ path: '/review', query }) await testRouter.isReady() @@ -63,22 +78,95 @@ beforeEach(() => { vi.clearAllMocks() vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, - data: [task('T1', '英语任务'), task('T2', '数学任务')], + data: pageOf([task('T1', '英语任务'), task('T2', '数学任务')]), + } as never) + // 汇总走独立接口:全量口径,不由分页后的列表相加 + vi.mocked(getReviewSummary).mockResolvedValue({ + code: 200, + data: { taskTotal: 2, reportTotal: 2, fragmentTotal: 4 }, } as never) vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never) vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: {} } as never) vi.mocked(listDictionaryTags).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(listTagMindMaps).mockResolvedValue({ code: 200, data: pageOf([]) } as never) + vi.mocked(listTaskOptions).mockResolvedValue({ code: 200, data: [] } as never) +}) + +/** + * 「更多」是 el-dropdown:菜单渲染在 Teleport 的 popper 里,jsdom 下 VTU 拿不到 + * (与 el-tag 同类的 EP 2.8 兼容问题),因此直接触发组件的 command 事件, + * 这仍然走 handleMoreCommand 的真实分支。 + */ +const clickMoreItem = async (wrapper: any, command: string) => { + const dropdown = wrapper.findComponent({ name: 'ElDropdown' }) + expect(dropdown.exists()).toBe(true) + dropdown.vm.$emit('command', command) + await flushPromises() +} + +describe('Review 页面结构:按任务 / 按标签两个 Tab', () => { + it('两个模块同位置分 Tab,低频操作收进「更多」,不再有刷新按钮', async () => { + const { wrapper } = await mountReview() + + const tabs = wrapper.findAll('[role="tab"]') + expect(tabs).toHaveLength(2) + expect(tabs[0].text()).toContain('按任务复习') + expect(tabs[1].text()).toContain('按标签复习') + // 刷新已移除:进入页面即加载,重载由空/错态的重试承担 + expect(wrapper.findAll('button').some((b) => b.text().trim() === '刷新')).toBe(false) + // 导出与标签管理不再平铺在工具栏 + expect(wrapper.findAll('button').some((b) => b.text().trim() === '导出数据')).toBe(false) + expect(wrapper.findAll('button').some((b) => b.text().includes('更多'))).toBe(true) + + wrapper.unmount() + }) + + it('按标签复习 Tab 列出已生成的导图,点行进入该范围的复习(URL 即状态)', async () => { + vi.mocked(listTagMindMaps).mockResolvedValue({ + code: 200, + data: pageOf([ + { + id: 1, + scopeKey: 'S1', + tags: ['英语', '时态'], + mode: 'INTERSECT', + title: '英语时态', + generator: 'AI', + sourceFragmentCount: 4, + needsUpdate: true, + generatedTime: '2026-10-10T10:00:00', + }, + ]), + } as never) + const { wrapper, testRouter } = await mountReview() + + // 切到标签 Tab 才会加载它的列表 + const tagTab = wrapper.findAll('[role="tab"]').find((t) => t.text().includes('按标签复习')) + await tagTab!.trigger('click') + await flushPromises() + + expect(wrapper.text()).toContain('英语时态') + expect(wrapper.text()).toContain('有新碎片待整理') + + await wrapper.find('.map-row').trigger('click') + await flushPromises() + + expect(testRouter.currentRoute.value.path).toBe('/review/by-tag') + expect(testRouter.currentRoute.value.query).toMatchObject({ tag: ['英语', '时态'], mode: 'INTERSECT' }) + + wrapper.unmount() + }) }) describe('Review 按标签筛选(闭环-01 跳转入口)', () => { - it('带 markerName 进入时按该标签筛选任务', async () => { - vi.mocked(filterByMarker).mockResolvedValue({ code: 200, data: ['T1'] } as never) + it('带 markerName 进入时把筛选下推给服务端', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf([task('T1', '英语任务')]) } as never) const { wrapper } = await mountReview({ markerName: '英语' }) - expect(filterByMarker).toHaveBeenCalledWith({ objectType: 'TASK', markerName: '英语', kind: 'USER' }) + // 筛选在服务端做(否则只能筛当前页、total 也不对) + expect(getReviewTaskStats).toHaveBeenCalledWith(1, 20, '英语') expect(wrapper.text()).toContain('正在按标签「英语」筛选任务') expect(wrapper.text()).toContain('英语任务') - expect(wrapper.text()).not.toContain('数学任务') wrapper.unmount() }) @@ -86,7 +174,7 @@ describe('Review 按标签筛选(闭环-01 跳转入口)', () => { it('不带 markerName 进入时不筛选', async () => { const { wrapper } = await mountReview() - expect(filterByMarker).not.toHaveBeenCalled() + expect(getReviewTaskStats).toHaveBeenCalledWith(1, 20, undefined) expect(wrapper.text()).toContain('数学任务') wrapper.unmount() @@ -95,9 +183,7 @@ describe('Review 按标签筛选(闭环-01 跳转入口)', () => { describe('Review 标签管理:字典(闭环-03)', () => { const openTagDialog = async (wrapper: any) => { - const button = wrapper.findAll('button').find((b: { text: () => string }) => b.text().includes('标签管理')) - await button!.trigger('click') - await flushPromises() + await clickMoreItem(wrapper, 'tags') } it('可提前新建空标签,并展示字典项', async () => { diff --git a/src/__tests__/components/Welcome.spec.ts b/src/__tests__/components/Welcome.spec.ts index 65185f1..d188f4b 100644 --- a/src/__tests__/components/Welcome.spec.ts +++ b/src/__tests__/components/Welcome.spec.ts @@ -3,7 +3,8 @@ 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, submitReviewFeedback, touchReviewFragment } from '@/api/review' +import { getReviewFeed, submitReviewFeedback, touchReviewFragment } from '@/api/review' +import { listTaskOptions } from '@/api/tasks' import { getMarkersBatch } from '@/api/markers' import { updateFragmentOwnership } from '@/api/reportFragments' import appRouter from '@/router' @@ -17,6 +18,10 @@ vi.mock('@/api/review', () => ({ touchReviewFragment: vi.fn(), })) +vi.mock('@/api/tasks', () => ({ + listTaskOptions: vi.fn(), +})) + vi.mock('@/api/markers', () => ({ getMarkersBatch: vi.fn(), addUserTag: vi.fn(), @@ -276,7 +281,7 @@ describe('Welcome Feed 待归类内容', () => { beforeEach(() => { vi.clearAllMocks() stubLayout(4000, 1000) - vi.mocked(getReviewTaskStats).mockResolvedValue({ + vi.mocked(listTaskOptions).mockResolvedValue({ code: 200, data: [ { taskNum: 'T002', taskName: 'TypeScript 类型体操' }, @@ -307,7 +312,7 @@ describe('Welcome Feed 待归类内容', () => { await flushPromises() expect(wrapper.text()).toContain('归类这条学习残片') - expect(getReviewTaskStats).toHaveBeenCalled() + expect(listTaskOptions).toHaveBeenCalled() wrapper.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'T002') await flushPromises() diff --git a/src/__tests__/composables/useDelayedVisible.spec.ts b/src/__tests__/composables/useDelayedVisible.spec.ts new file mode 100644 index 0000000..0edfce8 --- /dev/null +++ b/src/__tests__/composables/useDelayedVisible.spec.ts @@ -0,0 +1,101 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest' +import { defineComponent, h, ref, type Ref } from 'vue' +import { mount } from '@vue/test-utils' +import { useDelayedVisible } from '@/components/composables/useDelayedVisible' + +/** 挂一个空组件,让 composable 有组件实例可挂 onUnmounted */ +const mountProbe = (loading: Ref, options?: { delayMs?: number; minVisibleMs?: number }) => { + const result: { visible: Ref | null } = { visible: null } + const wrapper = mount( + defineComponent({ + setup() { + result.visible = useDelayedVisible(loading, options) + return () => h('div') + }, + }), + ) + return { wrapper, visible: result.visible as unknown as Ref } +} + +describe('useDelayedVisible(骨架延迟显示 + 最短可见)', () => { + beforeEach(() => { + vi.useFakeTimers() + }) + + afterEach(() => { + vi.useRealTimers() + }) + + it('快响应(未到延迟)不显示,避免一闪而过', async () => { + const loading = ref(false) + const { wrapper, visible } = mountProbe(loading, { delayMs: 200, minVisibleMs: 400 }) + + loading.value = true + await vi.advanceTimersByTimeAsync(100) + loading.value = false + await vi.advanceTimersByTimeAsync(1000) + + expect(visible.value).toBe(false) + wrapper.unmount() + }) + + it('加载超过延迟才显示', async () => { + const loading = ref(false) + const { wrapper, visible } = mountProbe(loading, { delayMs: 200, minVisibleMs: 400 }) + + loading.value = true + await vi.advanceTimersByTimeAsync(150) + expect(visible.value).toBe(false) + + await vi.advanceTimersByTimeAsync(100) + expect(visible.value).toBe(true) + + loading.value = false + await vi.advanceTimersByTimeAsync(400) + wrapper.unmount() + }) + + it('显示后哪怕马上下载完,也至少留够最短可见时间', async () => { + const loading = ref(false) + const { wrapper, visible } = mountProbe(loading, { delayMs: 200, minVisibleMs: 400 }) + + loading.value = true + await vi.advanceTimersByTimeAsync(250) + expect(visible.value).toBe(true) + + // 刚显示 100ms 就结束:仍要保持显示 + loading.value = false + await vi.advanceTimersByTimeAsync(100) + expect(visible.value).toBe(true) + + await vi.advanceTimersByTimeAsync(400) + expect(visible.value).toBe(false) + wrapper.unmount() + }) + + it('最短可见期间又开始加载:保持显示,不重排', async () => { + const loading = ref(false) + const { wrapper, visible } = mountProbe(loading, { delayMs: 200, minVisibleMs: 400 }) + + loading.value = true + await vi.advanceTimersByTimeAsync(250) + loading.value = false + await vi.advanceTimersByTimeAsync(100) + loading.value = true + await vi.advanceTimersByTimeAsync(1000) + + expect(visible.value).toBe(true) + wrapper.unmount() + }) + + it('卸载时清理定时器,不再改动状态', async () => { + const loading = ref(false) + const { wrapper, visible } = mountProbe(loading, { delayMs: 200, minVisibleMs: 400 }) + + loading.value = true + wrapper.unmount() + await vi.advanceTimersByTimeAsync(1000) + + expect(visible.value).toBe(false) + }) +}) diff --git a/src/__tests__/integration/review-export-flow.spec.ts b/src/__tests__/integration/review-export-flow.spec.ts index f4d25dc..f99a09f 100644 --- a/src/__tests__/integration/review-export-flow.spec.ts +++ b/src/__tests__/integration/review-export-flow.spec.ts @@ -3,14 +3,17 @@ import { flushPromises, mount } from '@vue/test-utils' 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 { getReviewSummary, getReviewTaskStats } from '@/api/review' import { getMarkersBatch } from '@/api/markers' import { getPendingOwnershipFragments } from '@/api/reportFragments' +import { listTagMindMaps } from '@/api/tagMindMap' +import { pageOf } from '../support/page' import { exportRange } from '@/api/export' import { downloadTextFile } from '@/utils/download' vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), + getReviewSummary: vi.fn(), getReviewFeed: vi.fn(), getTaskReview: vi.fn(), getSortPreference: vi.fn(), @@ -31,6 +34,10 @@ vi.mock('@/api/reportFragments', () => ({ updateFragmentOwnership: vi.fn(), })) +vi.mock('@/api/tagMindMap', () => ({ + listTagMindMaps: vi.fn(), +})) + vi.mock('@/api/export', () => ({ exportTask: vi.fn(), exportRange: vi.fn(), @@ -68,6 +75,11 @@ describe('Review 导出流程(集成)', () => { 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) + vi.mocked(listTagMindMaps).mockResolvedValue({ code: 200, data: pageOf([]) } as never) + vi.mocked(getReviewSummary).mockResolvedValue({ + code: 200, + data: { taskTotal: 1, reportTotal: 3, fragmentTotal: 5 }, + } as never) }) const mountReview = async () => { @@ -93,10 +105,14 @@ describe('Review 导出流程(集成)', () => { return { wrapper } } + /** + * 导出已收进页面右上角的「更多」菜单。菜单渲染在 Teleport 的 popper 里, + * jsdom 下 VTU 拿不到(与 el-tag 同类的 EP 2.8 兼容问题),因此直接触发 command 事件。 + */ const openExportDialog = async (wrapper: ReturnType) => { - const openButton = wrapper.findAll('button').find((b) => b.text().trim() === '导出数据') - expect(openButton).toBeTruthy() - await openButton!.trigger('click') + const dropdown = wrapper.findComponent({ name: 'ElDropdown' }) + expect(dropdown.exists()).toBe(true) + dropdown.vm.$emit('command', 'export') await flushPromises() return wrapper.find('.export-confirm-button') } diff --git a/src/__tests__/integration/review-overview-flow.spec.ts b/src/__tests__/integration/review-overview-flow.spec.ts index fc45d7b..d38c533 100644 --- a/src/__tests__/integration/review-overview-flow.spec.ts +++ b/src/__tests__/integration/review-overview-flow.spec.ts @@ -3,12 +3,16 @@ 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, getSortPreference, saveSortPreference } from '@/api/review' -import { filterByMarker, getMarkersBatch, getUserTagUsage, renameUserTag } from '@/api/markers' +import { getReviewSummary, getReviewTaskStats, getSortPreference, saveSortPreference } from '@/api/review' +import { getMarkersBatch, getUserTagUsage, renameUserTag } from '@/api/markers' import { getPendingOwnershipFragments, updateFragmentOwnership } from '@/api/reportFragments' +import { listTagMindMaps } from '@/api/tagMindMap' +import { listTaskOptions } from '@/api/tasks' +import { pageOf } from '../support/page' vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), + getReviewSummary: vi.fn(), getReviewFeed: vi.fn(), getTaskReview: vi.fn(), getSortPreference: vi.fn(), @@ -29,6 +33,14 @@ vi.mock('@/api/reportFragments', () => ({ updateFragmentOwnership: vi.fn(), })) +vi.mock('@/api/tagMindMap', () => ({ + listTagMindMaps: vi.fn(), +})) + +vi.mock('@/api/tasks', () => ({ + listTaskOptions: vi.fn(), +})) + const tasks = [ { taskNum: 'T001', @@ -61,18 +73,33 @@ describe('Review 交互流程(集成)', () => { code: 200, data: { preset: 'TIME_FIRST', description: '久未接触的更容易出现' }, } as never) + vi.mocked(listTagMindMaps).mockResolvedValue({ code: 200, data: pageOf([]) } as never) + vi.mocked(listTaskOptions).mockResolvedValue({ code: 200, data: [] } as never) + vi.mocked(getReviewSummary).mockResolvedValue({ + code: 200, + data: { taskTotal: 2, reportTotal: 4, fragmentTotal: 7 }, + } as never) }) - const mountReview = async () => { + /** 切 Tab:ElTabs 的 tab-change 由头部点击触发 */ + const switchTab = async (wrapper: any, label: string) => { + const tab = wrapper.findAll('[role="tab"]').find((t: any) => t.text().includes(label)) + expect(tab).toBeTruthy() + await tab!.trigger('click') + await flushPromises() + } + + const mountReview = async (query: Record = {}) => { const router = createRouter({ history: createMemoryHistory(), routes: [ { path: '/review', name: 'review', component: Review }, + { path: '/review/by-tag', name: 'review-by-tag', component: { template: '
' } }, { path: '/review/detail/task/:taskNum', name: 'review-detail', component: { template: '
' } }, { path: '/review/recall/:taskNum', name: 'review-recall', component: { template: '
' } }, ], }) - await router.push('/review') + await router.push({ path: '/review', query }) await router.isReady() const wrapper = mount(Review, { @@ -86,8 +113,138 @@ describe('Review 交互流程(集成)', () => { return { wrapper, router } } + /** + * 「更多」是 el-dropdown:菜单渲染在 Teleport 的 popper 里,jsdom 下 VTU 拿不到 + * (与 el-tag 同类的 EP 2.8 兼容问题),因此直接触发组件的 command 事件, + * 这仍然走 handleMoreCommand 的真实分支。 + */ + const clickMoreItem = async (wrapper: any, command: string) => { + const dropdown = wrapper.findComponent({ name: 'ElDropdown' }) + expect(dropdown.exists()).toBe(true) + dropdown.vm.$emit('command', command) + await flushPromises() + } + + it('首次加载超过延迟时先给同形状骨架,数据到达后替换为真实任务行', async () => { + // 用手动控制的 promise 模拟慢响应 + let resolveTasks: (value: unknown) => void = () => {} + vi.mocked(getReviewTaskStats).mockReturnValue( + new Promise((resolve) => { + resolveTasks = resolve + }) as never, + ) + // 汇总接口同样拖慢:统计条骨架也是延迟显示的 + let resolveSummary: (value: unknown) => void = () => {} + vi.mocked(getReviewSummary).mockReturnValue( + new Promise((resolve) => { + resolveSummary = resolve + }) as never, + ) + const { wrapper } = await mountReview() + + // 延迟(200ms)未到:不显示骨架,避免本地快响应时闪一下 + expect(wrapper.findAll('.task-card-skeleton')).toHaveLength(0) + expect(wrapper.find('.page-stats .skeleton-line').exists()).toBe(false) + + // 超过延迟仍未返回:骨架出现,形状与任务行一致(3 行) + await new Promise((resolve) => setTimeout(resolve, 260)) + expect(wrapper.findAll('.task-card-skeleton')).toHaveLength(3) + // 统计条也走骨架,避免数据到达后内容下移 + expect(wrapper.findAll('.page-stats .skeleton-line')).toHaveLength(3) + + resolveTasks({ code: 200, data: pageOf(tasks) }) + resolveSummary({ code: 200, data: { taskTotal: 2, reportTotal: 4, fragmentTotal: 7 } }) + await flushPromises() + + expect(wrapper.findAll('.task-card-skeleton')).toHaveLength(0) + expect(wrapper.findAll('.task-card')).toHaveLength(2) + wrapper.unmount() + }) + + it('加载完成后才显示统计条真实数值,不再有「先无后有」的空白', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) + const { wrapper } = await mountReview() + + const stats = wrapper.find('.page-stats') + expect(stats.text()).toContain('任务 2') + expect(stats.find('.skeleton-line').exists()).toBe(false) + wrapper.unmount() + }) + + it('两个模块同位置分 Tab,首屏只渲染当前 Tab 的列表', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) + const { wrapper } = await mountReview() + + const tabs = wrapper.findAll('[role="tab"]') + expect(tabs).toHaveLength(2) + expect(tabs[0].text()).toContain('按任务复习') + expect(tabs[0].text()).toContain('2') + expect(tabs[1].text()).toContain('按标签复习') + // 任务列表在当前 Tab 里 + expect(wrapper.findAll('.task-card')).toHaveLength(2) + // 另一个 Tab 只探一个条数,不把它的整页也拉下来 + expect(listTagMindMaps).toHaveBeenCalledWith(1, 1) + wrapper.unmount() + }) + + it('任务列表分页:翻页只取该页,并带上页号', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ + code: 200, + data: { records: tasks, total: 45, size: 20, current: 1, pages: 3 }, + }) + const { wrapper } = await mountReview() + + expect(getReviewTaskStats).toHaveBeenCalledWith(1, 20, undefined) + await wrapper.find('.list-pagination .btn-next').trigger('click') + await flushPromises() + expect(getReviewTaskStats).toHaveBeenLastCalledWith(2, 20, undefined) + wrapper.unmount() + }) + + it('URL 带 tab=tag 时首屏直接落在按标签复习', async () => { + vi.mocked(listTagMindMaps).mockResolvedValue({ code: 200, data: pageOf([]) }) + const { wrapper } = await mountReview({ tab: 'tag' }) + + expect(wrapper.find('[role="tab"][aria-selected="true"]').text()).toContain('按标签复习') + // 任务侧只探一个 size=1 的条数,不拉它的列表页 + expect(getReviewTaskStats).toHaveBeenCalledTimes(1) + expect(getReviewTaskStats).toHaveBeenCalledWith(1, 1) + expect(wrapper.findAll('.task-card')).toHaveLength(0) + wrapper.unmount() + }) + + it('切到按标签复习 Tab 才加载导图列表,点行带范围跳进按标签复习页', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) + vi.mocked(listTagMindMaps).mockResolvedValue({ + code: 200, + data: pageOf([ + { + id: 7, + scopeKey: 'S1', + tags: ['英语'], + mode: 'UNION', + title: '英语导图', + generator: 'AI', + sourceFragmentCount: 3, + needsUpdate: false, + generatedTime: '2026-10-10T10:00:00', + }, + ]), + } as never) + const { wrapper, router } = await mountReview() + + await switchTab(wrapper, '按标签复习') + expect(wrapper.text()).toContain('英语导图') + await wrapper.find('.map-row').trigger('click') + await flushPromises() + + expect(router.currentRoute.value.path).toBe('/review/by-tag') + expect(router.currentRoute.value.query).toMatchObject({ tag: ['英语'], mode: 'UNION' }) + wrapper.unmount() + }) + it('点击卡片空白处进入该任务的复习详情', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper, router } = await mountReview() expect(wrapper.findAll('.task-card')).toHaveLength(2) @@ -98,7 +255,7 @@ describe('Review 交互流程(集成)', () => { }) it('键盘 Enter 与 Space 也能进入详情', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper, router } = await mountReview() await wrapper.findAll('.task-card')[0].trigger('keydown', { key: 'Enter' }) @@ -113,7 +270,7 @@ describe('Review 交互流程(集成)', () => { }) it('点击「回忆复习」进入回忆页,且不被卡片点击覆盖', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper, router } = await mountReview() await wrapper.find('.recall-button').trigger('click') @@ -123,7 +280,7 @@ describe('Review 交互流程(集成)', () => { }) it('卡片暴露 role 与 aria-label,具备可访问语义', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper } = await mountReview() const card = wrapper.findAll('.task-card')[0] @@ -133,7 +290,7 @@ describe('Review 交互流程(集成)', () => { }) it('卡片并列展示累计有效学习时长与累计复习耗时', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper } = await mountReview() const text = wrapper.findAll('.task-card')[0].text() @@ -150,10 +307,30 @@ describe('Review 交互流程(集成)', () => { expect(wrapper.find('button').exists()).toBe(true) }) + it('已有导图加载失败时给出重试,不与空数据混淆', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) + vi.mocked(listTagMindMaps).mockRejectedValue({ code: 500, message: '服务异常' }) + const { wrapper } = await mountReview() + + await switchTab(wrapper, '按标签复习') + expect(wrapper.text()).toContain('已有导图加载失败') + expect(wrapper.text()).not.toContain('还没有标签导图') + + vi.mocked(listTagMindMaps).mockResolvedValue({ code: 200, data: pageOf([]) } as never) + const retry = wrapper.findAll('button').find((b) => b.text().includes('重新加载')) + await retry!.trigger('click') + await flushPromises() + // 探条数 + 切 Tab 加载 + 重试 + expect(listTagMindMaps).toHaveBeenCalledTimes(3) + expect(listTagMindMaps).toHaveBeenLastCalledWith(1, 20) + expect(wrapper.text()).toContain('还没有标签导图') + wrapper.unmount() + }) + it('重试按钮会重新请求接口,成功后展示卡片列表', async () => { vi.mocked(getReviewTaskStats) .mockRejectedValueOnce({ code: 500, message: '服务异常' }) - .mockResolvedValueOnce({ code: 200, data: tasks }) + .mockResolvedValueOnce({ code: 200, data: pageOf(tasks) }) const { wrapper } = await mountReview() expect(wrapper.text()).toContain('复习数据加载失败,请稍后重试') @@ -169,7 +346,7 @@ describe('Review 交互流程(集成)', () => { }) it('无任务时展示空列表文案,不显示失败提示', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: [] }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf([]) }) const { wrapper } = await mountReview() expect(wrapper.text()).toContain('暂无复习任务') @@ -177,7 +354,7 @@ describe('Review 交互流程(集成)', () => { }) it('有待归类碎片时展示独立区块并标出条数', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [ @@ -187,19 +364,20 @@ describe('Review 交互流程(集成)', () => { } as never) const { wrapper } = await mountReview() - expect(wrapper.text()).toContain('待归类内容(2 条)') + expect(wrapper.find('.pending-head h3').text()).toBe('待归类内容') + expect(wrapper.find('.pending-count').text()).toBe('2 条') expect(wrapper.text()).toContain('待归类内容 A') }) it('无待归类碎片时不展示该区块', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper } = await mountReview() expect(wrapper.text()).not.toContain('待归类内容') }) it('在总览待归类区块里选任务就地归类,成功后重新拉取待归类列表', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) vi.mocked(getPendingOwnershipFragments) .mockResolvedValueOnce({ code: 200, @@ -209,7 +387,7 @@ describe('Review 交互流程(集成)', () => { vi.mocked(updateFragmentOwnership).mockResolvedValue({ code: 200, data: null } as never) const { wrapper } = await mountReview() - expect(wrapper.text()).toContain('待归类内容(1 条)') + expect(wrapper.find('.pending-count').text()).toBe('1 条') wrapper.findAllComponents({ name: 'ElSelect' })[0].vm.$emit('update:modelValue', 'T002') await flushPromises() @@ -221,11 +399,39 @@ describe('Review 交互流程(集成)', () => { expect(updateFragmentOwnership).toHaveBeenCalledWith(11, 'T002') expect(getPendingOwnershipFragments).toHaveBeenCalledTimes(2) - expect(wrapper.text()).not.toContain('待归类内容(1 条)') + // 归类会改变任务的学习残片数量与顶部统计:任务列表也要重取, + // 否则数字与刚消失的这条待归类对不上(页面已不再提供手动刷新) + expect(getReviewTaskStats).toHaveBeenCalledTimes(2) + expect(wrapper.find('.pending-count').exists()).toBe(false) + }) + + it('归类后顶部统计与任务卡片数字重新拉取,保持自洽', async () => { + vi.mocked(getReviewTaskStats) + .mockResolvedValueOnce({ code: 200, data: pageOf(tasks) }) + .mockResolvedValueOnce({ + code: 200, + data: pageOf([{ ...tasks[0], fragmentCount: 6 }, tasks[1]]), + } as never) + vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ + code: 200, + data: [{ id: 11, contextNum: 'S001', contextType: 'SESSION', ownerTaskNum: null, content: '待归类内容 A' }], + } as never) + vi.mocked(updateFragmentOwnership).mockResolvedValue({ code: 200, data: null } as never) + const { wrapper } = await mountReview() + + expect(wrapper.find('.task-card').text()).toContain('学习残片数量:5') + + wrapper.findAllComponents({ name: 'ElSelect' })[0].vm.$emit('update:modelValue', 'T001') + await flushPromises() + await wrapper.findAll('button').find((b) => b.text().trim() === '归类')!.trigger('click') + await flushPromises() + + // 归类后碎片数从 5 变为 6,页面上的数字跟着更新 + expect(wrapper.find('.task-card').text()).toContain('学习残片数量:6') }) it('「升格为新任务」跳转到已有的新建任务流程并带上碎片编号', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [{ id: 11, contextNum: 'S001', contextType: 'SESSION', ownerTaskNum: null, content: '待归类内容 A' }], @@ -241,32 +447,40 @@ describe('Review 交互流程(集成)', () => { pushSpy.mockRestore() }) - it('任务卡片展示标记,点用户标签按单一标记筛选并可清除', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + it('点用户标签按单一标记筛选任务(筛选下推到服务端)', async () => { + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(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('重点') + + // 筛选后服务端只回带该标签的任务 + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf([tasks[0]]) }) await wrapper.find('.marker-user').trigger('click') await flushPromises() - expect(filterByMarker).toHaveBeenCalledWith({ objectType: 'TASK', markerName: '重点', kind: 'USER' }) + // 回到第 1 页并带上 markerName;不再在客户端过滤当前页 + expect(getReviewTaskStats).toHaveBeenLastCalledWith(1, 20, '重点') expect(wrapper.text()).toContain('正在按标签「重点」筛选任务') - expect(wrapper.text()).not.toContain('TypeScript 类型体操') + // 只有服务端回的那一条了 + expect(wrapper.findAll('.task-card')).toHaveLength(1) + expect(wrapper.text()).toContain('学习 Vue3 组合式 API') + + // 清除筛选回到无筛选的第 1 页 + await wrapper.findAll('button').find((b) => b.text().includes('清除筛选'))!.trigger('click') + await flushPromises() + expect(getReviewTaskStats).toHaveBeenLastCalledWith(1, 20, undefined) }) it('打开智能排序偏好,展示三档语义选项与当前档位说明', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) const { wrapper } = await mountReview() expect(getSortPreference).toHaveBeenCalled() - const open = wrapper.findAll('button').find((b) => b.text().trim() === '智能排序偏好') - await open!.trigger('click') - await flushPromises() + await clickMoreItem(wrapper, 'sort') expect(wrapper.text()).toContain('时间为主') expect(wrapper.text()).toContain('均衡') @@ -275,15 +489,14 @@ describe('Review 交互流程(集成)', () => { }) it('选择档位并保存时调用保存接口', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(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() + await clickMoreItem(wrapper, 'sort') const radioGroup = wrapper.findAllComponents({ name: 'ElRadioGroup' })[0] radioGroup.vm.$emit('update:modelValue', 'MASTERY_FIRST') @@ -296,7 +509,7 @@ describe('Review 交互流程(集成)', () => { }) it('标签管理列出标签与用量,并支持重命名', async () => { - vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: tasks }) + vi.mocked(getReviewTaskStats).mockResolvedValue({ code: 200, data: pageOf(tasks) }) vi.mocked(getUserTagUsage).mockResolvedValue({ code: 200, data: [{ markerName: '英语', markerCount: 3, objectCount: 2 }], @@ -304,8 +517,7 @@ describe('Review 交互流程(集成)', () => { 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() + await clickMoreItem(wrapper, 'tags') expect(wrapper.text()).toContain('英语') expect(wrapper.text()).toContain('2 个内容 · 3 次使用') diff --git a/src/__tests__/support/page.ts b/src/__tests__/support/page.ts new file mode 100644 index 0000000..bbb9d4c --- /dev/null +++ b/src/__tests__/support/page.ts @@ -0,0 +1,13 @@ +import type { PageResult } from "@/utils/request"; + +/** + * 把数组包成后端分页形状(MyBatis-Plus Page 的序列化结果),供组件测试 mock 使用。 + * 列表接口都改成 `{ records, total, ... }` 之后,直接 mock 数组会让组件读到空列表。 + */ +export const pageOf = (records: T[], total = records.length): PageResult => ({ + records, + total, + size: records.length || 20, + current: 1, + pages: total === 0 ? 0 : 1, +}); diff --git a/src/api/review.ts b/src/api/review.ts index fe01d98..07841ab 100644 --- a/src/api/review.ts +++ b/src/api/review.ts @@ -1,4 +1,5 @@ import request from "@/utils/request"; +import type { PageResult } from "@/utils/request"; import type { ReportFragment } from "./reportFragments"; /** @@ -127,8 +128,35 @@ export const saveSortPreference = (preset: ReviewSortPreset) => { return request.put("/review/sort-preference", { preset }); }; -export const getReviewTaskStats = () => { - return request.get("/review/tasks"); +/** 复习总览的全局汇总(全量口径,不受列表分页影响) */ +export interface ReviewSummary { + taskTotal: number; + reportTotal: number; + fragmentTotal: number; +} + +/** + * 取复习总览汇总。 + * + * 不能用分页后的每页任务数字相加:那样得到的是「本页合计」而不是总数, + * 页面上会与 Tab 上的真实总数矛盾。 + */ +export const getReviewSummary = () => { + return request.get("/review/summary"); +}; + +/** + * 分页取任务维度的复习统计。 + * + * @param markerName 可选:只返回带该用户标签的任务(单个标记筛选)。 + * 筛选在服务端做,否则客户端只能筛当前页、总数也不对。 + */ +export const getReviewTaskStats = (pageNum = 1, pageSize = 20, markerName?: string) => { + return request.get>("/review/tasks", { + pageNum, + pageSize, + ...(markerName ? { markerName } : {}), + }); }; export const getReviewTaskStatsByTask = (taskNum: string) => { diff --git a/src/api/tagMindMap.ts b/src/api/tagMindMap.ts index f7ba677..d0f4afc 100644 --- a/src/api/tagMindMap.ts +++ b/src/api/tagMindMap.ts @@ -1,5 +1,6 @@ // src/api/tagMindMap.ts import request from "@/utils/request"; +import type { PageResult } from "@/utils/request"; /** 取数模式:UNION=并集(默认)/ INTERSECT=交集 */ export type TagCombineMode = "UNION" | "INTERSECT"; @@ -56,6 +57,32 @@ export interface TagMindMapView { latestRecallRecord: TagRecallRecord | null; } +/** + * 已有标签导图的摘要:「已生成的标签导图」列表用。 + * 列表是按标签复习的主入口,导图生成后标签集合一般不再变化,因此这里直接给出 + * 可复用的 tags + mode,前端拿它们就能复习或把新碎片补充进去。 + */ +export interface TagMindMapSummary { + id: number; + scopeKey: string; + tags: string[]; + mode: TagCombineMode; + title: string; + generator: TagMindMap["generator"]; + sourceFragmentCount?: number; + /** 有新碎片待整理(素材变化后置位),补充由用户手动触发 */ + needsUpdate?: boolean; + generatedTime?: string; +} + +/** 列出已经生成过导图的标签范围(待更新优先,其次按生成时间倒序) */ +export const listTagMindMaps = (pageNum = 1, pageSize = 20) => { + return request.get>("/review/tag-mind-map/list", { + pageNum, + pageSize, + }); +}; + /** 读取该范围的状态(不触发生成) */ export const queryTagMindMap = (tags: string[], mode: TagCombineMode) => { return request.post("/review/tag-mind-map/query", { tags, mode }); diff --git a/src/api/tasks.ts b/src/api/tasks.ts index 12aa400..d0d5711 100644 --- a/src/api/tasks.ts +++ b/src/api/tasks.ts @@ -43,6 +43,21 @@ export const deleteTaskApplication = (id: number) => { return request.del(`/tasks/applications/${id}`); }; +/** 任务下拉选项(全部任务的最小列表),用于「归类到已有任务」等选择场景 */ +export interface TaskOption { + taskNum: string; + taskName: string; +} + +/** + * 全部任务的最小选项。 + * 不能拿 /review/tasks 当选项源:那条会做复习统计聚合且已分页; + * 也不能拿分页的 /tasks,否则任务多起来下拉会悄悄只显示第一页。 + */ +export const listTaskOptions = () => { + return request.get("/tasks/options"); +}; + // ============ 任务删除影响范围 ============ /** 删除任务前的预览:哪些会一并删除、哪些会保留并进入待归类 */ diff --git a/src/assets/main.css b/src/assets/main.css index c4c73fe..9743381 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -128,6 +128,89 @@ a:hover { box-shadow: var(--shadow-soft); } +/* 「点进去会去哪」的常显提示:不能只在 hover 出现,触屏没有 hover。 + 任务行与导图行共用(列表行右侧提示)。 */ +.detail-hint { + font-size: 12px; + color: var(--text-secondary); +} + +/* ------------------------------------------------------------------ + * 骨架占位 + * + * 口径(ui-review-checklist):骨架形状要与最终内容一致,且加载指示延迟 + * ~200ms 才显示、显示后至少留 ~400ms(见 useDelayedVisible),避免快响应 + * 时闪一下。用 token 上色,不要写死灰。 + * ------------------------------------------------------------------ */ +.skeleton-line { + display: block; + height: 12px; + border-radius: 4px; + background: linear-gradient( + 90deg, + var(--green-100) 25%, + var(--surface) 37%, + var(--green-100) 63% + ); + background-size: 400% 100%; + animation: skeleton-shimmer 1.4s ease infinite; +} + +/* ------------------------------------------------------------------ + * 列表分页 + * + * 口径(design-system):列表超过一页就分页,页大小 20。 + * EP 出厂的背景分页是灰底 + 2px 圆角 + #606266 文字,与本站 token 无关; + * 统一换成白底 1px 描边 + 4px 圆角、选中用主色。 + * ------------------------------------------------------------------ */ +.list-pagination { + justify-content: center; + margin-top: 12px; +} + +/* 选择器要与 EP 的 `.el-pagination.is-background .el-pager li:not(.is-disabled)` + 同级或更高,否则压不住它(main.css 在 element-plus 之后导入,同级时我们胜)。 */ +.list-pagination.is-background .el-pager li:not(.is-disabled), +.list-pagination.is-background .btn-prev:not(:disabled), +.list-pagination.is-background .btn-next:not(:disabled) { + background-color: var(--surface-strong); + border: 1px solid var(--border-soft); + border-radius: 4px; + color: var(--text-secondary); +} + +.list-pagination.is-background .el-pager li:not(.is-disabled):hover { + color: var(--green-700); + border-color: var(--green-500); +} + +.list-pagination.is-background .el-pager li.is-active { + background-color: var(--green-700); + border-color: var(--green-700); + color: var(--text-on-accent); +} + +.list-pagination.is-background .btn-prev:disabled, +.list-pagination.is-background .btn-next:disabled { + background-color: var(--surface); + color: var(--text-placeholder); +} + +@keyframes skeleton-shimmer { + from { + background-position: 100% 50%; + } + to { + background-position: 0 50%; + } +} + +@media (prefers-reduced-motion: reduce) { + .skeleton-line { + animation: none; + } +} + /* ------------------------------------------------------------------ * 按钮尺寸收敛 * diff --git a/src/components/Review.vue b/src/components/Review.vue index 6bc3bcd..acc9656 100644 --- a/src/components/Review.vue +++ b/src/components/Review.vue @@ -1,8 +1,9 @@