From d99a65f034baf11642cb48192e54cbb8c2cab3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com>
Date: Thu, 2 Jul 2026 13:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5watcher+=E8=AE=BE=E7=BD=AE=E9=A1=B5=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97=E5=A4=8D=E7=94=A8+=E8=BF=9B?=
 =?UTF-8?q?=E5=B1=95=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Tasks.vue: 补全 page/pageSize watcher,翻页触发后端查询(原翻页只改前端切片)

- Settings.vue: 自建确认弹窗替换为 ConfirmDialog 组件,删除重复 CSS

- PROGRESS.md: 更新项目速览(多Agent架构+40+工具+人设系统)
---
 PROGRESS.md            |  8 ++++----
 src/views/Settings.vue | 39 +++------------------------------------
 src/views/Tasks.vue    |  9 +++++++++
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/PROGRESS.md b/PROGRESS.md
index a1862d7..db42174 100644
--- a/PROGRESS.md
+++ b/PROGRESS.md
@@ -1,6 +1,6 @@
 # DevFlow — 项目进展与工作交接
 
-> 创建: 2026-06-10 | 最后更新: 2026-06-18 | 当前阶段: PROGRESS Sprint 日志截至 Sprint 24(2026-06-15 · P0 generating 状态机加固 + 独立项批量)；2026-06-16 起多会话进展(B-03 路由解耦 / 工具结果渲染 / 吞错降级 / 模型能力维度治理等)见 [docs/todo.md](docs/todo.md) + [docs/待审查.md](docs/待审查.md)
+> 创建: 2026-06-10 | 最后更新: 2026-07-02 | 当前阶段: 多 Agent 并行执行架构落地完成（Plan DAG + worktree 隔离 + JoinSet 并行 + Reviewer 仲裁 + 模板系统 + 全节点补齐），详见 [Batch.md](Batch.md)
 
 ---
 
@@ -11,9 +11,9 @@
 | 定位 | AI 原生创作流程驾驶舱，从想法到创作成果的全流程管理 |
 | 技术栈 | Tauri v2 + Vue 3 + TypeScript + Pinia / Rust Workspace (8 crate) / SQLite |
 | 路径 | `E:/wk-lab/devflow/` |
-| 架构文档 | `ARCHITECTURE.md` (22,745 字) |
-| Git 状态 | 已纳入版本控制(完整 commit 历史，当前分支 feat/batch-260615-workflow-unlock) |
-| AI 能力 | df-ai OpenAI/Anthropic 双协议 Provider + 12 工具 + Agentic Loop |
+| 架构文档 | `ARCHITECTURE.md` + `docs/02-架构设计/` (含多 Agent 设计文档) |
+| Git 状态 | 已纳入版本控制(main 分支) |
+| AI 能力 | OpenAI/Anthropic 双协议 + 40+ 工具 + Agentic Loop + 多 Agent 并行 + 人设系统 |
 
 ---
 
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 0d03ef9..6241c21 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -3,17 +3,7 @@
     <Transition name="toast">
       <div v-if="toast.visible" class="toast" :class="'toast-' + toast.type">{{ toast.msg }}</div>
     </Transition>
-    <Transition name="confirm">
-      <div v-if="confirmState.visible" class="confirm-mask" @click.self="answerConfirm(false)">
-        <div class="confirm-box">
-          <div class="confirm-msg">{{ confirmState.msg }}</div>
-          <div class="confirm-actions">
-            <button class="btn btn-ghost btn-sm" @click="answerConfirm(false)">{{ $t('common.cancel') }}</button>
-            <button class="btn btn-danger btn-sm" @click="answerConfirm(true)">{{ $t('common.delete') }}</button>
-          </div>
-        </div>
-      </div>
-    </Transition>
+    <ConfirmDialog :visible="confirmState.visible" :msg="confirmState.msg" :danger-label="$t('common.delete')" @result="answerConfirm" />
     <!-- 页面头部 -->
     <header class="page-header">
       <h1>{{ $t('settings.title') }}</h1>
@@ -79,6 +69,7 @@
 <script setup lang="ts">
 import { computed, reactive, ref, shallowRef, onMounted, onUnmounted, nextTick } from 'vue'
 import { useConfirm } from '@/composables/useConfirm'
+import ConfirmDialog from '@/components/ConfirmDialog.vue'
 import SettingsNav, { type SettingsCategory } from '@/components/settings/SettingsNav.vue'
 import ProviderPanel from '@/components/settings/ProviderPanel.vue'
 import ConnectionPanel from '@/components/settings/ConnectionPanel.vue'
@@ -246,31 +237,7 @@ onUnmounted(() => {
 .toast-enter-active, .toast-leave-active { transition: opacity 0.2s, transform 0.2s; }
 .toast-enter-from, .toast-leave-to { opacity: 0; transform: translate(-50%, -8px); }
 
-/* ===== 确认弹层 ===== */
-.confirm-mask {
-  position: fixed;
-  inset: 0;
-  z-index: 1100;
-  background: rgba(0,0,0,0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.confirm-box {
-  background: var(--df-bg-card);
-  border: 0.5px solid var(--df-border);
-  border-radius: var(--df-radius-lg);
-  padding: 20px;
-  min-width: 280px;
-  max-width: 360px;
-  box-shadow: 0 8px 32px rgba(0,0,0,0.4);
-}
-.confirm-msg { font-size: 13px; color: var(--df-text); line-height: 1.5; margin-bottom: 16px; }
-.confirm-actions { display: flex; justify-content: flex-end; gap: 8px; }
-.btn-danger { background: var(--df-danger); color: #fff; }
-.btn-danger:hover { filter: brightness(1.1); }
-.confirm-enter-active, .confirm-leave-active { transition: opacity 0.15s; }
-.confirm-enter-from, .confirm-leave-to { opacity: 0; }
+/* 确认弹层已替换为 ConfirmDialog 组件(不再需要自建 CSS) */
 
 .page-header {
   display: flex;
diff --git a/src/views/Tasks.vue b/src/views/Tasks.vue
index 8b0a23d..b371a3f 100644
--- a/src/views/Tasks.vue
+++ b/src/views/Tasks.vue
@@ -406,6 +406,15 @@ watch(sortBy, () => {
   ]).finally(() => { loading.value = false })
 })
 
+// 分页翻页/改每页条数:重新查询后端
+watch([page, pageSize], () => {
+  loading.value = true
+  Promise.all([
+    store.loadTasks(buildTaskQuery()),
+    taskApi.count(buildTaskQuery()).then(n => totalTasks.value = n),
+  ]).finally(() => { loading.value = false })
+})
+
 // Ctrl+N 新建 / Ctrl+F 搜索(桌面快捷键)
 function onKeydown(e: KeyboardEvent) {
   if ((e.ctrlKey || e.metaKey) && e.key === 'n') {