feat: 首页只读并把残片操作移入详情页
This commit is contained in:
@@ -7,13 +7,6 @@
|
||||
- 提交信息必须简短且使用中文,不要使用英文长句。
|
||||
- 格式:`类型: 简述`,例如 `feat: 新增学习会话页面`、`fix: 修复路由守卫401跳转`、`docs: 补充组件说明`。
|
||||
|
||||
## 并行与委派
|
||||
|
||||
- **默认并行**:互不依赖的多个任务必须同时推进,不要逐个串行。
|
||||
- 同一仓库/工作目录同时只允许一个写入者(第二个写入者要么等,要么用 worktree 隔离)。
|
||||
- 只有存在真实依赖(后一步要用前一步的产出)时才串行,并在派发说明里写明依赖点。
|
||||
- 子代理不要改 meta 仓库的 `OPTIMIZATION_BACKLOG.md`,完成情况由主代理统一记录。
|
||||
|
||||
## 技术栈
|
||||
|
||||
- 框架:Vue 3 + TypeScript + Vite 5
|
||||
|
||||
@@ -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<string, string> = {}) => {
|
||||
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()
|
||||
})
|
||||
})
|
||||
@@ -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<typeof import('@/api/aiTasks')>()
|
||||
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: '<div />' } },
|
||||
{ path: '/review', component: { template: '<div />' } },
|
||||
{ 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()
|
||||
})
|
||||
})
|
||||
@@ -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()
|
||||
})
|
||||
})
|
||||
|
||||
+24
-10
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from "vue";
|
||||
import { useRouter } from "vue-router";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import {
|
||||
getReviewTaskStats,
|
||||
@@ -15,13 +15,14 @@ import {
|
||||
updateFragmentOwnership,
|
||||
type ReportFragment,
|
||||
} from "@/api/reportFragments";
|
||||
import { getUserTagUsage, renameUserTag, type Marker, type MarkerUsage } from "@/api/markers";
|
||||
import { filterByMarker, getUserTagUsage, renameUserTag, type Marker, type MarkerUsage } from "@/api/markers";
|
||||
import { deleteUserTagEverywhere, useMarkers } from "@/components/composables/useMarkers";
|
||||
import MarkerChips from "@/components/MarkerChips.vue";
|
||||
import { exportRange, type ExportFormat } from "@/api/export";
|
||||
import { downloadTextFile } from "@/utils/download";
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
|
||||
const loading = ref(false);
|
||||
const loadFailed = ref(false);
|
||||
@@ -147,11 +148,20 @@ const openExportDialog = () => {
|
||||
|
||||
// ============ 标记:筛选与卡片上直接加标签 ============
|
||||
|
||||
/** 点标签即筛选(单一标记,不做组合) */
|
||||
/** 点标签即筛选(单一标记,不做组合);详情页也会带 query 跳回来 */
|
||||
const applyMarkerFilterByName = async (markerName: string) => {
|
||||
if (!markerName) return;
|
||||
try {
|
||||
const res = await filterByMarker({ objectType: "TASK", markerName, kind: "USER" });
|
||||
filteredTaskNums.value = new Set(res?.data || []);
|
||||
markerFilter.value = { markerName };
|
||||
} catch {
|
||||
// 请求层已提示具体错误,筛选失败不阻塞总览
|
||||
}
|
||||
};
|
||||
|
||||
const applyMarkerFilter = async (marker: Marker) => {
|
||||
const nums = await taskMarkers.filterByTag(marker);
|
||||
filteredTaskNums.value = nums;
|
||||
markerFilter.value = { markerName: marker.markerName };
|
||||
await applyMarkerFilterByName(marker.markerName);
|
||||
};
|
||||
|
||||
const clearMarkerFilter = () => {
|
||||
@@ -310,10 +320,14 @@ const confirmExport = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
loadTasks();
|
||||
loadPendingOwnership();
|
||||
loadSortPreference();
|
||||
onMounted(async () => {
|
||||
await loadTasks();
|
||||
const markerName = route.query.markerName;
|
||||
if (typeof markerName === "string" && markerName) {
|
||||
await applyMarkerFilterByName(markerName);
|
||||
}
|
||||
void loadPendingOwnership();
|
||||
void loadSortPreference();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -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<SessionDetail | null>(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(
|
||||
<span>效率:{{ formatRatio(sessionInfo.effectivenessRatio) }}</span>
|
||||
</div>
|
||||
|
||||
<!-- 闭环-01:残片的操作都在详情页,Feed 卡片只负责展示与导航 -->
|
||||
<div v-if="contentType === 'fragment'" class="fragment-controls">
|
||||
<MarkerChips
|
||||
:markers="fragmentTagList"
|
||||
@add="addFragmentTag"
|
||||
@remove="removeFragmentTag"
|
||||
@filter="goToMarkerFilteredReview"
|
||||
/>
|
||||
<span class="fragment-controls-actions">
|
||||
<el-button
|
||||
size="small"
|
||||
plain
|
||||
:type="feedback.mastered ? 'success' : 'default'"
|
||||
:loading="feedbackBusy"
|
||||
@click="toggleFeedback('mastered')"
|
||||
>已掌握</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
plain
|
||||
:type="feedback.revisit ? 'success' : 'default'"
|
||||
:loading="feedbackBusy"
|
||||
@click="toggleFeedback('revisit')"
|
||||
>稍后再看</el-button>
|
||||
<el-button
|
||||
v-if="taskNum"
|
||||
size="small"
|
||||
type="success"
|
||||
plain
|
||||
@click="openGuidance"
|
||||
>学习引导</el-button>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- 报告三段编辑 -->
|
||||
<div v-if="contentType === 'report' && isEditingReport" class="edit-area">
|
||||
<div class="edit-field">
|
||||
@@ -627,6 +720,13 @@ watch(
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<GuidanceDialog
|
||||
v-model="guidanceVisible"
|
||||
:task-num="guidanceTaskNum"
|
||||
:concept="guidanceConcept"
|
||||
@created="loadDetail"
|
||||
/>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
@@ -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;
|
||||
|
||||
+11
-222
@@ -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<Set<string> | null>(null);
|
||||
|
||||
// 反馈动作的本地回显:刷新后回到未选中,这是有意行为,不做任何状态展示
|
||||
const feedbackState = ref<Record<number, { mastered: boolean; revisit: boolean }>>({});
|
||||
const feedbackBusy = ref<Record<number, boolean>>({});
|
||||
|
||||
// 学习引导入口
|
||||
const guidance = ref<{ visible: boolean; taskNum: string; concept: string }>({
|
||||
visible: false,
|
||||
taskNum: "",
|
||||
concept: "",
|
||||
});
|
||||
// 闭环-01:首页只读,打标签、反馈(已掌握/稍后再看)与学习引导都在残片详情页完成
|
||||
|
||||
// 滚动条只展示学习残片,每条残片单独作为 chip
|
||||
const fragmentChips = computed<FragmentChip[]>(() =>
|
||||
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(() => {
|
||||
<div>
|
||||
<section class="welcome-page">
|
||||
<div class="review-scroll-section surface-card">
|
||||
<div class="review-scroll-header">
|
||||
<div v-if="markerFilter" class="marker-filter-bar">
|
||||
<span>正在按标签「{{ markerFilter.markerName }}」筛选</span>
|
||||
<el-button size="small" text type="success" @click="clearMarkerFilter">清除筛选</el-button>
|
||||
</div>
|
||||
<el-tooltip
|
||||
effect="dark"
|
||||
placement="left"
|
||||
:show-after="200"
|
||||
content="学习残片(知识碎片)是学习过程中随手记下的不完整内容,不要求是完整总结,只记录刚学到、想到或需要记住的内容。它是学习记录的主要单元,后续由你或 AI 汇总为学习报告与思维导图。"
|
||||
>
|
||||
<span class="color-legend" tabindex="0">
|
||||
<span class="dot dot-fragment"></span> 学习残片
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<div
|
||||
ref="trackRef"
|
||||
class="review-scroll-track"
|
||||
@@ -493,37 +396,6 @@ onBeforeUnmount(() => {
|
||||
<span v-if="chip.pendingOwnership" class="chip-pending">待归类</span>
|
||||
<span class="chip-content">{{ chip.content }}</span>
|
||||
</span>
|
||||
<span class="chip-markers" @click.stop>
|
||||
<MarkerChips
|
||||
:markers="fragmentMarkers.markersOf(String(chip.id))"
|
||||
@add="name => addChipTag(chip, name)"
|
||||
@remove="marker => removeChipTag(chip, marker)"
|
||||
@filter="marker => applyMarkerFilter(marker)"
|
||||
/>
|
||||
</span>
|
||||
<span class="chip-actions" @click.stop>
|
||||
<button
|
||||
type="button"
|
||||
class="chip-action"
|
||||
:class="{ 'is-active': feedbackOf(chip).mastered }"
|
||||
:disabled="feedbackBusy[chip.id]"
|
||||
@click="toggleFeedback(chip, 'mastered')"
|
||||
>已掌握</button>
|
||||
<button
|
||||
type="button"
|
||||
class="chip-action"
|
||||
:class="{ 'is-active': feedbackOf(chip).revisit }"
|
||||
:disabled="feedbackBusy[chip.id]"
|
||||
@click="toggleFeedback(chip, 'revisit')"
|
||||
>稍后再看</button>
|
||||
<button
|
||||
v-if="chip.taskNum"
|
||||
type="button"
|
||||
class="chip-action chip-action-guidance"
|
||||
title="和 AI 一起把这个概念聊透"
|
||||
@click="openGuidance(chip)"
|
||||
>学习引导</button>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -649,15 +521,15 @@ onBeforeUnmount(() => {
|
||||
<el-button type="success" @click="goToRecallFromCard">前往回忆复习</el-button>
|
||||
<el-button @click="recallCard.visible = false">关闭</el-button>
|
||||
</template>
|
||||
<el-button
|
||||
v-if="recallCard.fragment"
|
||||
text
|
||||
type="primary"
|
||||
@click="goToFragmentDetail(recallCard.fragment)"
|
||||
>查看详情</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<GuidanceDialog
|
||||
v-model="guidance.visible"
|
||||
:task-num="guidance.taskNum"
|
||||
:concept="guidance.concept"
|
||||
@created="loadReviewFeed"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user