From 4c4336448e50192828f0df6f22309239dcec2d97 Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Sat, 10 Oct 2026 15:07:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E7=AD=BE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8E=E6=89=93=E6=A0=87=E7=AD=BE=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/__tests__/api/markers.spec.ts | 34 ++++ src/__tests__/components/MarkerChips.spec.ts | 87 +++++++++ src/__tests__/components/Review.spec.ts | 58 +++++- src/__tests__/components/ReviewDetail.spec.ts | 13 +- src/api/markers.ts | 38 ++++ src/components/MarkerChips.vue | 52 ++++-- src/components/Review.vue | 165 +++++++++++++++++- 7 files changed, 424 insertions(+), 23 deletions(-) create mode 100644 src/__tests__/components/MarkerChips.spec.ts diff --git a/src/__tests__/api/markers.spec.ts b/src/__tests__/api/markers.spec.ts index 7bc6cde..61d9a00 100644 --- a/src/__tests__/api/markers.spec.ts +++ b/src/__tests__/api/markers.spec.ts @@ -12,11 +12,16 @@ vi.mock('@/utils/request', () => ({ import request from '@/utils/request' import { addUserTag, + createDictionaryTag, + deleteDictionaryTag, deleteMarker, filterByMarker, getMarkers, getMarkersBatch, getUserTagUsage, + listDictionaryTags, + listTagCandidates, + renameDictionaryTag, renameUserTag, } from '@/api/markers' @@ -79,4 +84,33 @@ describe('markers API', () => { await getUserTagUsage() expect(mockedRequest.get).toHaveBeenCalledWith('/markers/tags') }) + + it('标签字典:列出、新建、改名、删除(闭环-03)', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: [] }) + mockedRequest.post.mockResolvedValue({ code: 200, data: { id: 1, tagName: '英语' } }) + mockedRequest.put.mockResolvedValue({ code: 200, data: { id: 1, tagName: '英文' } }) + mockedRequest.del.mockResolvedValue({ code: 200 }) + + await listDictionaryTags() + expect(mockedRequest.get).toHaveBeenCalledWith('/markers/tags/dictionary') + + await createDictionaryTag('英语') + expect(mockedRequest.post).toHaveBeenCalledWith('/markers/tags/dictionary', { tagName: '英语' }) + + await renameDictionaryTag(1, '英文') + expect(mockedRequest.put).toHaveBeenCalledWith('/markers/tags/dictionary/1', { newName: '英文' }) + + await deleteDictionaryTag(1) + expect(mockedRequest.del).toHaveBeenCalledWith('/markers/tags/dictionary/1') + }) + + it('listTagCandidates 支持关键字过滤', async () => { + mockedRequest.get.mockResolvedValue({ code: 200, data: ['英语'] }) + + await listTagCandidates() + expect(mockedRequest.get).toHaveBeenCalledWith('/markers/tags/candidates', {}) + + await listTagCandidates(' 英 ') + expect(mockedRequest.get).toHaveBeenLastCalledWith('/markers/tags/candidates', { keyword: '英' }) + }) }) diff --git a/src/__tests__/components/MarkerChips.spec.ts b/src/__tests__/components/MarkerChips.spec.ts new file mode 100644 index 0000000..ef12beb --- /dev/null +++ b/src/__tests__/components/MarkerChips.spec.ts @@ -0,0 +1,87 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { flushPromises, mount } from '@vue/test-utils' +import ElementPlus from 'element-plus' +import MarkerChips from '@/components/MarkerChips.vue' +import { listTagCandidates } from '@/api/markers' + +vi.mock('@/api/markers', () => ({ + addUserTag: vi.fn(), + deleteMarker: vi.fn(), + filterByMarker: vi.fn(), + getMarkersBatch: vi.fn(), + listTagCandidates: vi.fn(), +})) + +const systemMarker = { + id: 1, + objectType: 'FRAGMENT', + objectNum: '7', + kind: 'SYSTEM', + markerName: '来源', + markerValue: '学习引导', +} +const userTag = { + id: 2, + objectType: 'FRAGMENT', + objectNum: '7', + kind: 'USER', + markerName: '英语', + markerValue: null, +} + +const mountChips = () => + mount(MarkerChips, { + props: { markers: [systemMarker, userTag] }, + global: { plugins: [ElementPlus] }, + }) + +beforeEach(() => { + vi.clearAllMocks() + vi.mocked(listTagCandidates).mockResolvedValue({ code: 200, data: ['英语', '数学'] } as never) +}) + +describe('MarkerChips 打标签搜索选择(闭环-03)', () => { + it('系统标记只读、用户标签可点筛选与删除', async () => { + const wrapper = mountChips() + + expect(wrapper.find('.marker-system').text()).toContain('来源=学习引导') + expect(wrapper.find('.marker-system').find('.marker-remove').exists()).toBe(false) + + await wrapper.find('.marker-user').trigger('click') + expect(wrapper.emitted('filter')?.[0]?.[0]).toMatchObject({ markerName: '英语' }) + + await wrapper.find('.marker-remove').trigger('click') + expect(wrapper.emitted('remove')?.[0]?.[0]).toMatchObject({ markerName: '英语' }) + + wrapper.unmount() + }) + + it('打开输入框时取回候选标签(含自动任务名标签)', async () => { + const wrapper = mountChips() + + await wrapper.find('.marker-add-toggle').trigger('click') + await flushPromises() + + expect(listTagCandidates).toHaveBeenCalled() + expect((wrapper.vm as unknown as { candidates: string[] }).candidates).toEqual(['英语', '数学']) + + wrapper.unmount() + }) + + it('可以直接输入候选里没有的新标签', async () => { + const wrapper = mountChips() + + await wrapper.find('.marker-add-toggle').trigger('click') + await flushPromises() + const vm = wrapper.vm as unknown as { draft: string } + vm.draft = '物理' + await flushPromises() + + const confirm = wrapper.find('.marker-add-confirm') + await confirm.trigger('click') + + expect(wrapper.emitted('add')?.[0]?.[0]).toBe('物理') + + wrapper.unmount() + }) +}) diff --git a/src/__tests__/components/Review.spec.ts b/src/__tests__/components/Review.spec.ts index 7910e99..862c96a 100644 --- a/src/__tests__/components/Review.spec.ts +++ b/src/__tests__/components/Review.spec.ts @@ -5,7 +5,7 @@ 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' +import { filterByMarker, getMarkersBatch, listDictionaryTags, createDictionaryTag, deleteDictionaryTag, renameDictionaryTag } from '@/api/markers' vi.mock('@/api/review', () => ({ getReviewTaskStats: vi.fn(), @@ -20,10 +20,15 @@ vi.mock('@/api/reportFragments', () => ({ vi.mock('@/api/markers', () => ({ addUserTag: vi.fn(), + createDictionaryTag: vi.fn(), + deleteDictionaryTag: vi.fn(), deleteMarker: vi.fn(), filterByMarker: vi.fn(), getMarkersBatch: vi.fn(), getUserTagUsage: vi.fn(), + listDictionaryTags: vi.fn(), + listTagCandidates: vi.fn(), + renameDictionaryTag: vi.fn(), renameUserTag: vi.fn(), })) @@ -62,6 +67,7 @@ beforeEach(() => { } 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) }) describe('Review 按标签筛选(闭环-01 跳转入口)', () => { @@ -86,3 +92,53 @@ describe('Review 按标签筛选(闭环-01 跳转入口)', () => { wrapper.unmount() }) }) + +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() + } + + it('可提前新建空标签,并展示字典项', async () => { + vi.mocked(listDictionaryTags).mockResolvedValue({ + code: 200, + data: [{ id: 1, tagName: '英语', normalizedName: '英语' }], + } as never) + vi.mocked(createDictionaryTag).mockResolvedValue({ + code: 200, + data: { id: 2, tagName: '数学', normalizedName: '数学' }, + } as never) + const { wrapper } = await mountReview() + + await openTagDialog(wrapper) + expect(wrapper.text()).toContain('英语') + + await wrapper.find('input[aria-label="新建标签名"]').setValue('数学') + const create = wrapper.findAll('button').find((b) => b.text().trim() === '新建') + await create!.trigger('click') + await flushPromises() + + expect(createDictionaryTag).toHaveBeenCalledWith('数学') + wrapper.unmount() + }) + + it('删除字典标签只影响候选,不动已打标记', async () => { + vi.mocked(listDictionaryTags).mockResolvedValue({ + code: 200, + data: [{ id: 9, tagName: '临时', normalizedName: '临时' }], + } as never) + vi.mocked(deleteDictionaryTag).mockResolvedValue({ code: 200 } as never) + const { wrapper } = await mountReview() + + await openTagDialog(wrapper) + const remove = wrapper.findAll('button').find((b) => b.text().trim() === '删除') + await remove!.trigger('click') + await flushPromises() + + expect(deleteDictionaryTag).toHaveBeenCalledWith(9) + // 字典删除不会去改动内容上的标记 + expect(renameDictionaryTag).not.toHaveBeenCalled() + wrapper.unmount() + }) +}) diff --git a/src/__tests__/components/ReviewDetail.spec.ts b/src/__tests__/components/ReviewDetail.spec.ts index fade442..461d365 100644 --- a/src/__tests__/components/ReviewDetail.spec.ts +++ b/src/__tests__/components/ReviewDetail.spec.ts @@ -3,9 +3,10 @@ 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 MarkerChips from '@/components/MarkerChips.vue' import { getFragmentDetail, getTaskReview, submitReviewFeedback } from '@/api/review' import { getSessionDetail } from '@/api/studySessions' -import { addUserTag, deleteMarker, getMarkersBatch } from '@/api/markers' +import { addUserTag, deleteMarker, getMarkersBatch, listTagCandidates } from '@/api/markers' import { startGuidance } from '@/api/guidance' import { getAiTask } from '@/api/aiTasks' @@ -28,6 +29,7 @@ vi.mock('@/api/markers', () => ({ deleteMarker: vi.fn(), filterByMarker: vi.fn(), getMarkersBatch: vi.fn(), + listTagCandidates: vi.fn(), })) vi.mock('@/api/studySessions', () => ({ @@ -94,6 +96,7 @@ beforeEach(() => { } as never) vi.mocked(getTaskReview).mockResolvedValue({ code: 200, data: [] } as never) vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: { '7': [userTag] } } as never) + vi.mocked(listTagCandidates).mockResolvedValue({ code: 200, data: ['英语'] } as never) }) describe('ReviewDetail 残片操作(闭环-01)', () => { @@ -106,9 +109,11 @@ describe('ReviewDetail 残片操作(闭环-01)', () => { 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() + const chips = wrapper.findComponent(MarkerChips) + ;(chips.vm as unknown as { draft: string }).draft = '数学' + await flushPromises() + await wrapper.find('.marker-add-confirm').trigger('click') await flushPromises() expect(addUserTag).toHaveBeenCalledWith('FRAGMENT', '7', '数学') diff --git a/src/api/markers.ts b/src/api/markers.ts index 2f14ff4..9d76a59 100644 --- a/src/api/markers.ts +++ b/src/api/markers.ts @@ -70,3 +70,41 @@ export const filterByMarker = (params: MarkerFilterParams) => { export const getUserTagUsage = () => { return request.get("/markers/tags"); }; + +// ============ 标签字典(闭环-03) ============ + +/** + * 标签字典项:打标签的候选项。与「对象上的标记」是两份数据, + * 字典的改名与删除只影响候选,不改动任何对象上已打好的标记。 + */ +export interface UserTagDictionaryItem { + id: number; + tagName: string; + normalizedName: string; +} + +/** 列出标签字典:尚未挂在任何对象上的标签也在内 */ +export const listDictionaryTags = () => { + return request.get("/markers/tags/dictionary"); +}; + +/** 往字典新建一个(空)标签;同名(去空格、大小写不敏感)已存在时幂等返回既有项 */ +export const createDictionaryTag = (tagName: string) => { + return request.post("/markers/tags/dictionary", { tagName }); +}; + +/** 字典标签改名:只影响候选,不动已打标记 */ +export const renameDictionaryTag = (id: number, newName: string) => { + return request.put(`/markers/tags/dictionary/${id}`, { newName }); +}; + +/** 删除字典标签:只影响候选,不动已打标记 */ +export const deleteDictionaryTag = (id: number) => { + return request.del(`/markers/tags/dictionary/${id}`); +}; + +/** 打标签的候选:字典标签 ∪ 已用过的用户标签(含自动任务名标签),支持关键字过滤 */ +export const listTagCandidates = (keyword?: string) => { + const trimmed = keyword?.trim(); + return request.get("/markers/tags/candidates", trimmed ? { keyword: trimmed } : {}); +}; diff --git a/src/components/MarkerChips.vue b/src/components/MarkerChips.vue index 1f2d29f..3a2b61f 100644 --- a/src/components/MarkerChips.vue +++ b/src/components/MarkerChips.vue @@ -1,10 +1,10 @@