From 7637f297c95d6d077fc2d384a7a1f06686081e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Mon, 15 Jun 2026 08:21:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20CR-26=20AR-11=20listener?= =?UTF-8?q?=20=E6=8C=89=20B-29=20=E7=AD=9B=E9=80=89=E5=A5=91=E7=BA=A6+Task?= =?UTF-8?q?s=20=E7=A9=BA=E6=80=81=E5=85=9C=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit project.ts listener task 分支改读 _activeTaskProject 闭包 var(undefined 跳过保筛选/all 全量/具体 id 按项目),加 setActiveTaskProject 暴露由 Tasks 注册,保 B-29 store.tasks 反映当前筛选契约(原无参 loadTasks 冲成全量破坏筛选);Tasks.vue 加 v-if loading/error/empty 兜底+setActiveTaskProject onMounted/watch 更新。批8,vue-tsc 0 --- src/stores/project.ts | 20 +++++++++- src/views/Tasks.vue | 93 ++++++++++++++++++++++++++++--------------- 2 files changed, 80 insertions(+), 33 deletions(-) diff --git a/src/stores/project.ts b/src/stores/project.ts index 63f9d41..7c8923a 100644 --- a/src/stores/project.ts +++ b/src/stores/project.ts @@ -26,6 +26,19 @@ function createStore() { // 后端 AI 工具(create/update/delete/restore/purge/bind_directory)执行成功后 emit // "df-data-changed" { entity, action }，前端按 entity 调对应 load 刷新列表， // 取代工具执行后需手动刷新。 + // + // CR-260615-26(R-1): task 分支不再无参 loadTasks(会把 store.tasks 冲成全量,破坏 + // B-260615-29「store.tasks 反映当前筛选」契约)。改为读 _activeTaskProject: + // - undefined: Tasks 视图未挂载/从未设过筛选 → 不触发 task load(避免破坏筛选, + // 让 B-29 watch/handle 主导;此时改动由用户下次进 Tasks 自然刷新) + // - 'all' : 全量拉取 + // - 具体 id : 按项目拉取 + // 由 Tasks.vue 经 setActiveTaskProject 在 onMounted/watch 更新本变量。 + let _activeTaskProject: string | undefined = undefined + function setActiveTaskProject(projectKey: string | undefined) { + _activeTaskProject = projectKey + } + let _dataChangedUnlisten: (() => void) | null = null async function startDataChangedListener() { @@ -36,7 +49,10 @@ function createStore() { if (entity === 'project') { void projectsStore.loadProjects() } else if (entity === 'task') { - void tasksStore.loadTasks() + // 无筛选状态(undefined)时不触发,保 B-29 筛选契约;有筛选则按当前 activeProject 拉 + if (_activeTaskProject !== undefined) { + void tasksStore.loadTasks(_activeTaskProject === 'all' ? undefined : _activeTaskProject) + } } else if (entity === 'idea') { void ideasStore.loadIdeas() } @@ -108,6 +124,8 @@ function createStore() { // AR-11（方案A）：数据变更联动刷新监听(后端工具执行后 emit df-data-changed) startDataChangedListener, stopDataChangedListener, + // CR-260615-26(R-1): Tasks 视图登记当前 activeProject 筛选,供 listener 按筛选拉取 + setActiveTaskProject, pendingApproval: computed(() => state.pendingApproval), // computed stats, diff --git a/src/views/Tasks.vue b/src/views/Tasks.vue index 7efb6c5..b0ca1b8 100644 --- a/src/views/Tasks.vue +++ b/src/views/Tasks.vue @@ -38,36 +38,42 @@
-
-
- {{ group.icon }} -

{{ group.projectName }}

- {{ $t('tasks.group.taskCount', { n: group.tasks.length }) }} -
-
-
-
-
- {{ task.title }} - {{ priorityLabel(task.priority) }} -
-
- - ⑂ - {{ task.branch_name }} - - {{ formatRelativeZh(task.created_at) }} - {{ formatRelativeZh(task.updated_at) }} -
-
- {{ $t(statusLabel(task.status)) }} + +
{{ $t('common.loading') }}
+
{{ store.error }}
+
暂无任务
+
@@ -115,6 +121,8 @@ const { t } = useI18n() const activeProject = ref('all') const activeStatus = ref('all') +// Y-2: 本视图加载态(loadTasks 不翻转全局 state.loading,故用局部 ref 精确反映任务加载) +const loading = ref(false) // ── 新建任务模态框 ── const showCreateModal = ref(false) @@ -186,7 +194,12 @@ const filteredGroups = computed(() => { // statusLabel / priorityLabel / priorityClass 由 ../constants/project 提供(与 ProjectDetail 文案统一) async function refresh() { - await store.loadTasks() + loading.value = true + try { + await store.loadTasks(activeProject.value === 'all' ? undefined : activeProject.value) + } finally { + loading.value = false + } } function openCreateModal() { @@ -212,12 +225,22 @@ async function confirmCreate() { } // B-260615-29: 切换项目筛选时按 projectId 重载(避免仅前端 filter,跨项目视图不同步) +// CR-260615-26(R-1): 同步登记当前筛选到 store,供 AR-11 listener 按筛选拉取 watch(activeProject, (key) => { - store.loadTasks(key === 'all' ? undefined : key) + store.setActiveTaskProject(key) + loading.value = true + store.loadTasks(key === 'all' ? undefined : key).finally(() => { loading.value = false }) }) onMounted(async () => { - await Promise.all([store.loadProjects(), store.loadTasks()]) + // R-1: 登记初始筛选(all=全量),让数据变更 listener 知道视图已挂载、按全量拉取 + store.setActiveTaskProject(activeProject.value) + loading.value = true + try { + await Promise.all([store.loadProjects(), store.loadTasks()]) + } finally { + loading.value = false + } }) @@ -384,6 +407,12 @@ onMounted(async () => { .status-done { background: rgba(100,255,218,0.15); color: var(--df-success); } .status-abandoned { background: rgba(255,107,107,0.2); color: var(--df-danger); } +/* ===== 空状态(Y-2: loading/error/empty 兜底,样式参考 Projects.vue) ===== */ +.empty-state { + text-align: center; padding: 60px 20px; + font-size: 14px; color: var(--df-text-dim); +} + /* ===== 模态框 ===== */ .modal-overlay { position: fixed; inset: 0; background: rgba(0,0,0,0.5); display: flex; align-items: center; justify-content: center; z-index: 100; } .modal-box { background: var(--df-bg-card); border: 0.5px solid var(--df-border); border-radius: var(--df-radius-lg); padding: 24px; min-width: 360px; max-width: 90vw; }