feat: 标签字典管理与打标签搜索选择
This commit is contained in:
@@ -12,11 +12,16 @@ vi.mock('@/utils/request', () => ({
|
|||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
import {
|
import {
|
||||||
addUserTag,
|
addUserTag,
|
||||||
|
createDictionaryTag,
|
||||||
|
deleteDictionaryTag,
|
||||||
deleteMarker,
|
deleteMarker,
|
||||||
filterByMarker,
|
filterByMarker,
|
||||||
getMarkers,
|
getMarkers,
|
||||||
getMarkersBatch,
|
getMarkersBatch,
|
||||||
getUserTagUsage,
|
getUserTagUsage,
|
||||||
|
listDictionaryTags,
|
||||||
|
listTagCandidates,
|
||||||
|
renameDictionaryTag,
|
||||||
renameUserTag,
|
renameUserTag,
|
||||||
} from '@/api/markers'
|
} from '@/api/markers'
|
||||||
|
|
||||||
@@ -79,4 +84,33 @@ describe('markers API', () => {
|
|||||||
await getUserTagUsage()
|
await getUserTagUsage()
|
||||||
expect(mockedRequest.get).toHaveBeenCalledWith('/markers/tags')
|
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: '英' })
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -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()
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -5,7 +5,7 @@ import { createMemoryHistory, createRouter } from 'vue-router'
|
|||||||
import Review from '@/components/Review.vue'
|
import Review from '@/components/Review.vue'
|
||||||
import { getReviewTaskStats } from '@/api/review'
|
import { getReviewTaskStats } from '@/api/review'
|
||||||
import { getPendingOwnershipFragments } from '@/api/reportFragments'
|
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', () => ({
|
vi.mock('@/api/review', () => ({
|
||||||
getReviewTaskStats: vi.fn(),
|
getReviewTaskStats: vi.fn(),
|
||||||
@@ -20,10 +20,15 @@ vi.mock('@/api/reportFragments', () => ({
|
|||||||
|
|
||||||
vi.mock('@/api/markers', () => ({
|
vi.mock('@/api/markers', () => ({
|
||||||
addUserTag: vi.fn(),
|
addUserTag: vi.fn(),
|
||||||
|
createDictionaryTag: vi.fn(),
|
||||||
|
deleteDictionaryTag: vi.fn(),
|
||||||
deleteMarker: vi.fn(),
|
deleteMarker: vi.fn(),
|
||||||
filterByMarker: vi.fn(),
|
filterByMarker: vi.fn(),
|
||||||
getMarkersBatch: vi.fn(),
|
getMarkersBatch: vi.fn(),
|
||||||
getUserTagUsage: vi.fn(),
|
getUserTagUsage: vi.fn(),
|
||||||
|
listDictionaryTags: vi.fn(),
|
||||||
|
listTagCandidates: vi.fn(),
|
||||||
|
renameDictionaryTag: vi.fn(),
|
||||||
renameUserTag: vi.fn(),
|
renameUserTag: vi.fn(),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -62,6 +67,7 @@ beforeEach(() => {
|
|||||||
} as never)
|
} as never)
|
||||||
vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never)
|
vi.mocked(getPendingOwnershipFragments).mockResolvedValue({ code: 200, data: [] } as never)
|
||||||
vi.mocked(getMarkersBatch).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 跳转入口)', () => {
|
describe('Review 按标签筛选(闭环-01 跳转入口)', () => {
|
||||||
@@ -86,3 +92,53 @@ describe('Review 按标签筛选(闭环-01 跳转入口)', () => {
|
|||||||
wrapper.unmount()
|
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()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
@@ -3,9 +3,10 @@ import { flushPromises, mount } from '@vue/test-utils'
|
|||||||
import ElementPlus from 'element-plus'
|
import ElementPlus from 'element-plus'
|
||||||
import { createMemoryHistory, createRouter } from 'vue-router'
|
import { createMemoryHistory, createRouter } from 'vue-router'
|
||||||
import ReviewDetail from '@/components/ReviewDetail.vue'
|
import ReviewDetail from '@/components/ReviewDetail.vue'
|
||||||
|
import MarkerChips from '@/components/MarkerChips.vue'
|
||||||
import { getFragmentDetail, getTaskReview, submitReviewFeedback } from '@/api/review'
|
import { getFragmentDetail, getTaskReview, submitReviewFeedback } from '@/api/review'
|
||||||
import { getSessionDetail } from '@/api/studySessions'
|
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 { startGuidance } from '@/api/guidance'
|
||||||
import { getAiTask } from '@/api/aiTasks'
|
import { getAiTask } from '@/api/aiTasks'
|
||||||
|
|
||||||
@@ -28,6 +29,7 @@ vi.mock('@/api/markers', () => ({
|
|||||||
deleteMarker: vi.fn(),
|
deleteMarker: vi.fn(),
|
||||||
filterByMarker: vi.fn(),
|
filterByMarker: vi.fn(),
|
||||||
getMarkersBatch: vi.fn(),
|
getMarkersBatch: vi.fn(),
|
||||||
|
listTagCandidates: vi.fn(),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
vi.mock('@/api/studySessions', () => ({
|
vi.mock('@/api/studySessions', () => ({
|
||||||
@@ -94,6 +96,7 @@ beforeEach(() => {
|
|||||||
} as never)
|
} as never)
|
||||||
vi.mocked(getTaskReview).mockResolvedValue({ code: 200, data: [] } as never)
|
vi.mocked(getTaskReview).mockResolvedValue({ code: 200, data: [] } as never)
|
||||||
vi.mocked(getMarkersBatch).mockResolvedValue({ code: 200, data: { '7': [userTag] } } 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)', () => {
|
describe('ReviewDetail 残片操作(闭环-01)', () => {
|
||||||
@@ -106,9 +109,11 @@ describe('ReviewDetail 残片操作(闭环-01)', () => {
|
|||||||
expect(wrapper.find('.marker-user').text()).toContain('英语')
|
expect(wrapper.find('.marker-user').text()).toContain('英语')
|
||||||
|
|
||||||
await wrapper.find('.marker-add-toggle').trigger('click')
|
await wrapper.find('.marker-add-toggle').trigger('click')
|
||||||
const input = wrapper.find('.marker-add-input')
|
await flushPromises()
|
||||||
await input.setValue('数学')
|
const chips = wrapper.findComponent(MarkerChips)
|
||||||
await input.trigger('keydown.enter')
|
;(chips.vm as unknown as { draft: string }).draft = '数学'
|
||||||
|
await flushPromises()
|
||||||
|
await wrapper.find('.marker-add-confirm').trigger('click')
|
||||||
await flushPromises()
|
await flushPromises()
|
||||||
|
|
||||||
expect(addUserTag).toHaveBeenCalledWith('FRAGMENT', '7', '数学')
|
expect(addUserTag).toHaveBeenCalledWith('FRAGMENT', '7', '数学')
|
||||||
|
|||||||
@@ -70,3 +70,41 @@ export const filterByMarker = (params: MarkerFilterParams) => {
|
|||||||
export const getUserTagUsage = () => {
|
export const getUserTagUsage = () => {
|
||||||
return request.get<MarkerUsage[]>("/markers/tags");
|
return request.get<MarkerUsage[]>("/markers/tags");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// ============ 标签字典(闭环-03) ============
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 标签字典项:打标签的候选项。与「对象上的标记」是两份数据,
|
||||||
|
* 字典的改名与删除只影响候选,不改动任何对象上已打好的标记。
|
||||||
|
*/
|
||||||
|
export interface UserTagDictionaryItem {
|
||||||
|
id: number;
|
||||||
|
tagName: string;
|
||||||
|
normalizedName: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 列出标签字典:尚未挂在任何对象上的标签也在内 */
|
||||||
|
export const listDictionaryTags = () => {
|
||||||
|
return request.get<UserTagDictionaryItem[]>("/markers/tags/dictionary");
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 往字典新建一个(空)标签;同名(去空格、大小写不敏感)已存在时幂等返回既有项 */
|
||||||
|
export const createDictionaryTag = (tagName: string) => {
|
||||||
|
return request.post<UserTagDictionaryItem>("/markers/tags/dictionary", { tagName });
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 字典标签改名:只影响候选,不动已打标记 */
|
||||||
|
export const renameDictionaryTag = (id: number, newName: string) => {
|
||||||
|
return request.put<UserTagDictionaryItem>(`/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<string[]>("/markers/tags/candidates", trimmed ? { keyword: trimmed } : {});
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
import type { Marker } from "@/api/markers";
|
import { listTagCandidates, type Marker } from "@/api/markers";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 标记展示:系统标记灰底只读(成对显示为「名=值」),用户标签可点击筛选、可删除。
|
* 标记展示:系统标记灰底只读(成对显示为「名=值」),用户标签可点击筛选、可删除。
|
||||||
* 编辑态下可自由输入新标签;父组件负责真正调接口。
|
* 编辑态下从字典/用过的标签里搜索选择,也允许直接输入新标签;父组件负责真正调接口。
|
||||||
*/
|
*/
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
@@ -23,10 +23,27 @@ const emit = defineEmits<{
|
|||||||
|
|
||||||
const adding = ref(false);
|
const adding = ref(false);
|
||||||
const draft = ref("");
|
const draft = ref("");
|
||||||
|
// 打标签的候选:字典标签 ∪ 用过的用户标签(含自动任务名标签),打开输入框时取一次
|
||||||
|
const candidates = ref<string[]>([]);
|
||||||
|
const candidatesLoading = ref(false);
|
||||||
|
|
||||||
|
const loadCandidates = async () => {
|
||||||
|
candidatesLoading.value = true;
|
||||||
|
try {
|
||||||
|
const res = await listTagCandidates();
|
||||||
|
candidates.value = res?.data || [];
|
||||||
|
} catch {
|
||||||
|
// 候选拉取失败不阻塞打标签,仍可直接输入新标签
|
||||||
|
candidates.value = [];
|
||||||
|
} finally {
|
||||||
|
candidatesLoading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const startAdding = () => {
|
const startAdding = () => {
|
||||||
draft.value = "";
|
draft.value = "";
|
||||||
adding.value = true;
|
adding.value = true;
|
||||||
|
void loadCandidates();
|
||||||
};
|
};
|
||||||
|
|
||||||
const submitAdd = () => {
|
const submitAdd = () => {
|
||||||
@@ -81,14 +98,22 @@ const cancelAdd = () => {
|
|||||||
@click.stop="startAdding"
|
@click.stop="startAdding"
|
||||||
>+ 标签</button>
|
>+ 标签</button>
|
||||||
<span v-else class="marker-add-form">
|
<span v-else class="marker-add-form">
|
||||||
<input
|
<el-select
|
||||||
v-model="draft"
|
v-model="draft"
|
||||||
class="marker-add-input"
|
class="marker-add-select"
|
||||||
|
size="small"
|
||||||
|
filterable
|
||||||
|
allow-create
|
||||||
|
default-first-option
|
||||||
|
:reserve-keyword="false"
|
||||||
|
:loading="candidatesLoading"
|
||||||
placeholder="标签名"
|
placeholder="标签名"
|
||||||
aria-label="新标签名"
|
aria-label="新标签名"
|
||||||
@keydown.enter.prevent="submitAdd"
|
@keydown.enter.prevent="submitAdd"
|
||||||
@keydown.esc.prevent="cancelAdd"
|
@keydown.esc.prevent="cancelAdd"
|
||||||
/>
|
>
|
||||||
|
<el-option v-for="name in candidates" :key="name" :label="name" :value="name" />
|
||||||
|
</el-select>
|
||||||
<button type="button" class="marker-add-confirm" @click.stop="submitAdd">确定</button>
|
<button type="button" class="marker-add-confirm" @click.stop="submitAdd">确定</button>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -182,19 +207,14 @@ const cancelAdd = () => {
|
|||||||
gap: 4px;
|
gap: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.marker-add-input {
|
.marker-add-select {
|
||||||
width: 90px;
|
width: 150px;
|
||||||
font-size: 12px;
|
|
||||||
padding: 1px 6px;
|
|
||||||
border: 1px solid var(--border-soft);
|
|
||||||
border-radius: 6px;
|
|
||||||
color: var(--text-primary);
|
|
||||||
background: var(--surface-strong);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.marker-add-input:focus {
|
.marker-add-select :deep(.el-select__wrapper) {
|
||||||
outline: none;
|
min-height: 24px;
|
||||||
border-color: var(--green-600);
|
font-size: 12px;
|
||||||
|
padding: 0 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.marker-add-confirm {
|
.marker-add-confirm {
|
||||||
|
|||||||
+163
-2
@@ -15,7 +15,18 @@ import {
|
|||||||
updateFragmentOwnership,
|
updateFragmentOwnership,
|
||||||
type ReportFragment,
|
type ReportFragment,
|
||||||
} from "@/api/reportFragments";
|
} from "@/api/reportFragments";
|
||||||
import { filterByMarker, getUserTagUsage, renameUserTag, type Marker, type MarkerUsage } from "@/api/markers";
|
import {
|
||||||
|
createDictionaryTag,
|
||||||
|
deleteDictionaryTag,
|
||||||
|
filterByMarker,
|
||||||
|
getUserTagUsage,
|
||||||
|
listDictionaryTags,
|
||||||
|
renameDictionaryTag,
|
||||||
|
renameUserTag,
|
||||||
|
type Marker,
|
||||||
|
type MarkerUsage,
|
||||||
|
type UserTagDictionaryItem,
|
||||||
|
} from "@/api/markers";
|
||||||
import { deleteUserTagEverywhere, useMarkers } from "@/components/composables/useMarkers";
|
import { deleteUserTagEverywhere, useMarkers } from "@/components/composables/useMarkers";
|
||||||
import MarkerChips from "@/components/MarkerChips.vue";
|
import MarkerChips from "@/components/MarkerChips.vue";
|
||||||
import { exportRange, type ExportFormat } from "@/api/export";
|
import { exportRange, type ExportFormat } from "@/api/export";
|
||||||
@@ -218,8 +229,102 @@ const confirmSort = async () => {
|
|||||||
|
|
||||||
const openTagDialog = () => {
|
const openTagDialog = () => {
|
||||||
renamingTag.value = null;
|
renamingTag.value = null;
|
||||||
|
renamingDictionaryId.value = null;
|
||||||
|
newTagName.value = "";
|
||||||
tagDialogVisible.value = true;
|
tagDialogVisible.value = true;
|
||||||
void loadTags();
|
void loadTags();
|
||||||
|
void loadDictionaryTags();
|
||||||
|
};
|
||||||
|
|
||||||
|
// ============ 标签字典(闭环-03):字典只是候选项,不影响已打标记 ============
|
||||||
|
|
||||||
|
const dictionaryTags = ref<UserTagDictionaryItem[]>([]);
|
||||||
|
const dictionaryLoading = ref(false);
|
||||||
|
const dictionaryBusy = ref(false);
|
||||||
|
const newTagName = ref("");
|
||||||
|
const renamingDictionaryId = ref<number | null>(null);
|
||||||
|
const dictionaryRenameDraft = ref("");
|
||||||
|
|
||||||
|
const loadDictionaryTags = async () => {
|
||||||
|
dictionaryLoading.value = true;
|
||||||
|
try {
|
||||||
|
const res = await listDictionaryTags();
|
||||||
|
dictionaryTags.value = res?.data || [];
|
||||||
|
} catch {
|
||||||
|
dictionaryTags.value = [];
|
||||||
|
} finally {
|
||||||
|
dictionaryLoading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const createTag = async () => {
|
||||||
|
const name = newTagName.value.trim();
|
||||||
|
if (!name || dictionaryBusy.value) return;
|
||||||
|
dictionaryBusy.value = true;
|
||||||
|
try {
|
||||||
|
await createDictionaryTag(name);
|
||||||
|
newTagName.value = "";
|
||||||
|
ElMessage.success("标签已加入字典");
|
||||||
|
await loadDictionaryTags();
|
||||||
|
} catch {
|
||||||
|
// 请求层已提示具体错误
|
||||||
|
} finally {
|
||||||
|
dictionaryBusy.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const startRenameDictionaryTag = (tag: UserTagDictionaryItem) => {
|
||||||
|
renamingDictionaryId.value = tag.id;
|
||||||
|
dictionaryRenameDraft.value = tag.tagName;
|
||||||
|
};
|
||||||
|
|
||||||
|
const cancelRenameDictionaryTag = () => {
|
||||||
|
renamingDictionaryId.value = null;
|
||||||
|
dictionaryRenameDraft.value = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
const confirmRenameDictionaryTag = async () => {
|
||||||
|
const id = renamingDictionaryId.value;
|
||||||
|
const newName = dictionaryRenameDraft.value.trim();
|
||||||
|
if (id === null || dictionaryBusy.value) return;
|
||||||
|
if (!newName) {
|
||||||
|
cancelRenameDictionaryTag();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
dictionaryBusy.value = true;
|
||||||
|
try {
|
||||||
|
await renameDictionaryTag(id, newName);
|
||||||
|
ElMessage.success("字典标签已重命名");
|
||||||
|
cancelRenameDictionaryTag();
|
||||||
|
await loadDictionaryTags();
|
||||||
|
} catch {
|
||||||
|
// 请求层已提示具体错误
|
||||||
|
} finally {
|
||||||
|
dictionaryBusy.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const removeDictionaryTag = async (tag: UserTagDictionaryItem) => {
|
||||||
|
try {
|
||||||
|
await ElMessageBox.confirm(
|
||||||
|
`从字典里删除「${tag.tagName}」后,它不再出现在打标签的候选里;已经打在内容上的这个标签不会变。`,
|
||||||
|
"确认删除",
|
||||||
|
{ confirmButtonText: "确定删除", cancelButtonText: "取消", type: "warning" },
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (dictionaryBusy.value) return;
|
||||||
|
dictionaryBusy.value = true;
|
||||||
|
try {
|
||||||
|
await deleteDictionaryTag(tag.id);
|
||||||
|
ElMessage.success("字典标签已删除");
|
||||||
|
await loadDictionaryTags();
|
||||||
|
} catch {
|
||||||
|
// 请求层已提示具体错误
|
||||||
|
} finally {
|
||||||
|
dictionaryBusy.value = false;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadTags = async () => {
|
const loadTags = async () => {
|
||||||
@@ -521,7 +626,50 @@ onMounted(async () => {
|
|||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog v-model="tagDialogVisible" title="标签管理" width="520px">
|
<el-dialog v-model="tagDialogVisible" title="标签管理" width="520px">
|
||||||
<p class="tag-hint">这些是你给学习内容打的标签。重命名会影响所有带该标签的内容。</p>
|
<p class="tag-hint">标签字典是打标签时的候选项。改写或删除字典项不会动内容上已经打好的标签。</p>
|
||||||
|
<div class="tag-create">
|
||||||
|
<el-input
|
||||||
|
v-model="newTagName"
|
||||||
|
size="small"
|
||||||
|
placeholder="新建一个空标签"
|
||||||
|
aria-label="新建标签名"
|
||||||
|
@keydown.enter="createTag"
|
||||||
|
/>
|
||||||
|
<el-button size="small" type="success" :loading="dictionaryBusy" @click="createTag">新建</el-button>
|
||||||
|
</div>
|
||||||
|
<div v-loading="dictionaryLoading" class="tag-list dictionary-list">
|
||||||
|
<div v-for="tag in dictionaryTags" :key="tag.id" class="tag-item">
|
||||||
|
<template v-if="renamingDictionaryId === tag.id">
|
||||||
|
<input
|
||||||
|
v-model="dictionaryRenameDraft"
|
||||||
|
class="tag-rename-input"
|
||||||
|
aria-label="新字典标签名"
|
||||||
|
@keydown.enter.prevent="confirmRenameDictionaryTag"
|
||||||
|
/>
|
||||||
|
<div class="tag-actions">
|
||||||
|
<el-button size="small" :disabled="dictionaryBusy" @click="cancelRenameDictionaryTag">取消</el-button>
|
||||||
|
<el-button type="success" size="small" :loading="dictionaryBusy" @click="confirmRenameDictionaryTag">保存</el-button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<div class="tag-info">
|
||||||
|
<span class="tag-name">{{ tag.tagName }}</span>
|
||||||
|
<span class="tag-usage">候选</span>
|
||||||
|
</div>
|
||||||
|
<div class="tag-actions">
|
||||||
|
<el-button size="small" @click="startRenameDictionaryTag(tag)">重命名</el-button>
|
||||||
|
<el-button type="danger" plain size="small" :disabled="dictionaryBusy" @click="removeDictionaryTag(tag)">删除</el-button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
<el-empty
|
||||||
|
v-if="!dictionaryLoading && dictionaryTags.length === 0"
|
||||||
|
description="字典里还没有标签"
|
||||||
|
:image-size="48"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p class="tag-hint">这些是你给学习内容打过的标签。重命名会影响所有带该标签的内容。</p>
|
||||||
<div v-loading="tagsLoading" class="tag-list">
|
<div v-loading="tagsLoading" class="tag-list">
|
||||||
<div v-for="usage in tagUsages" :key="usage.markerName" class="tag-item">
|
<div v-for="usage in tagUsages" :key="usage.markerName" class="tag-item">
|
||||||
<template v-if="renamingTag === usage.markerName">
|
<template v-if="renamingTag === usage.markerName">
|
||||||
@@ -818,6 +966,19 @@ onMounted(async () => {
|
|||||||
min-height: 60px;
|
min-height: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tag-create {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dictionary-list {
|
||||||
|
max-height: 40vh;
|
||||||
|
overflow-y: auto;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
.tag-item {
|
.tag-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user