修复: 页面反馈真实性与竞态守卫八处

- 知识创建失败不再误关弹窗弹成功提示(补返回值检查)
- AuditLog 翻页补请求序号守卫防慢响应覆盖新页
- TaskDrawer 切任务慢响应校验 taskId 才写入
- GitChanges 竞态序号+moduleId 双校验,三处静默失败补错误提示
- 回收站恢复/彻底删除操作中禁用防双击重复提交
- 灵感状态切换失败补错误反馈(原 unhandled rejection)
- FileExplorer 三处失败仅 console 补 Message 提示
- Dashboard 消费 store.error 故障不再伪装空数据
This commit is contained in:
lxy
2026-09-29 14:58:35 +08:00
parent 1d1111ebe7
commit 864a03d2e1
8 changed files with 92 additions and 24 deletions
+4
View File
@@ -211,6 +211,7 @@
*/ */
import { ref, computed, watch, reactive, onMounted, onUnmounted, onActivated, onDeactivated } from 'vue' import { ref, computed, watch, reactive, onMounted, onUnmounted, onActivated, onDeactivated } from 'vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { Message } from '@arco-design/web-vue'
import { listen, type UnlistenFn } from '@tauri-apps/api/event' import { listen, type UnlistenFn } from '@tauri-apps/api/event'
import { moduleApi, type ProjectModuleRecord, type FileTreeEntry, type GitStatusResult } from '@/api/module' import { moduleApi, type ProjectModuleRecord, type FileTreeEntry, type GitStatusResult } from '@/api/module'
import FileTree from './FileTree.vue' import FileTree from './FileTree.vue'
@@ -461,6 +462,7 @@ async function onScanSubmodules() {
console.log('[FileExplorer] 扫描到新工程:', n) console.log('[FileExplorer] 扫描到新工程:', n)
} }
} catch (e) { } catch (e) {
Message.error(t('common.unknownError'))
console.error('[FileExplorer] 扫描子仓库失败:', e) console.error('[FileExplorer] 扫描子仓库失败:', e)
} }
} }
@@ -526,6 +528,7 @@ async function onSaveModule() {
showModuleModal.value = false showModuleModal.value = false
await loadModules() await loadModules()
} catch (e) { } catch (e) {
Message.error(t('common.unknownError'))
console.error('[FileExplorer] 保存工程失败:', e) console.error('[FileExplorer] 保存工程失败:', e)
} finally { } finally {
savingModule.value = false savingModule.value = false
@@ -542,6 +545,7 @@ async function onRemoveModule() {
currentModuleId.value = '' currentModuleId.value = ''
await loadModules() await loadModules()
} catch (e) { } catch (e) {
Message.error(t('common.unknownError'))
console.error('[FileExplorer] 删除工程失败:', e) console.error('[FileExplorer] 删除工程失败:', e)
} finally { } finally {
removingModule.value = false removingModule.value = false
+40 -10
View File
@@ -34,10 +34,16 @@
<div class="gc-branch-picker-hint">{{ $t('gitChanges.branchSwitchHint') }}</div> <div class="gc-branch-picker-hint">{{ $t('gitChanges.branchSwitchHint') }}</div>
</div> </div>
<!-- 行内错误提示(loadMore/selectFile 失败,不挤掉列表) -->
<div v-if="actionError" class="gc-error-strip">⚠ {{ actionError }}</div>
<div v-if="loading && !gitStatus" class="gc-skeleton"> <div v-if="loading && !gitStatus" class="gc-skeleton">
<div class="gc-skeleton-row" v-for="i in 6" :key="i"></div> <div class="gc-skeleton-row" v-for="i in 6" :key="i"></div>
</div> </div>
<!-- 加载失败(gitStatus 为空,不再伪装空白) -->
<div v-else-if="loadError" class="gc-empty gc-error">⚠ {{ loadError }}</div>
<!-- 非 Git 仓库 --> <!-- 非 Git 仓库 -->
<div v-else-if="gitStatus && !gitStatus.is_git_repo" class="gc-empty"> <div v-else-if="gitStatus && !gitStatus.is_git_repo" class="gc-empty">
{{ $t('gitChanges.notGitRepo') }} {{ $t('gitChanges.notGitRepo') }}
@@ -180,6 +186,12 @@ const showHistory = ref(false)
const selectedFile = ref('') const selectedFile = ref('')
const diffContent = ref('') const diffContent = ref('')
const diffLoading = ref(false) const diffLoading = ref(false)
// 行内错误提示:loadError 主区展示(loadStatus 失败),actionError 分支条下方展示(loadMore/selectFile 失败)
const loadError = ref('')
const actionError = ref('')
// 请求序号守卫:moduleId 切换与 refreshKey 刷新双触发源并发时,旧响应晚到不覆盖新模块数据
// (对齐 ProjectDetail taskReqSeq 模式)
let statusReqSeq = 0
/** 单条提交记录形状(对齐 getModuleCommits / GitRecentCommit)。 */ /** 单条提交记录形状(对齐 getModuleCommits / GitRecentCommit)。 */
interface CommitItem { interface CommitItem {
@@ -346,13 +358,20 @@ function pathEqualsAnySide(parsed: string, targetPath: string): boolean {
} }
async function loadStatus() { async function loadStatus() {
if (!props.moduleId) return const mid = props.moduleId
if (!mid) return
const seq = ++statusReqSeq
loading.value = true loading.value = true
loadError.value = ''
actionError.value = ''
try { try {
gitStatus.value = await moduleApi.getModuleGitStatus(props.moduleId) const res = await moduleApi.getModuleGitStatus(mid)
// 序号 + moduleId 双校验:响应回来时仍是最新请求且模块未切换才写入
if (seq !== statusReqSeq || mid !== props.moduleId) return
gitStatus.value = res
// 复用 getModuleGitStatus 内部已返回的 recent_commits(避免再发一次 getModuleCommits // 复用 getModuleGitStatus 内部已返回的 recent_commits(避免再发一次 getModuleCommits
// 造成首次 git log -50 重复请求 + recent_commits 被丢弃)。 // 造成首次 git log -50 重复请求 + recent_commits 被丢弃)。
const recent = gitStatus.value?.recent_commits ?? [] const recent = res?.recent_commits ?? []
commits.value = recent.map((c) => ({ commits.value = recent.map((c) => ({
hash: c.hash, hash: c.hash,
subject: c.subject, subject: c.subject,
@@ -360,7 +379,7 @@ async function loadStatus() {
author: c.author, author: c.author,
})) }))
// 全量提交数读后端 total_commits(git rev-list --count HEAD),非 commits.length(后者受分页限制)。 // 全量提交数读后端 total_commits(git rev-list --count HEAD),非 commits.length(后者受分页限制)。
const backendTotal = gitStatus.value?.total_commits ?? 0 const backendTotal = res?.total_commits ?? 0
totalCommits.value = backendTotal totalCommits.value = backendTotal
commitSkip.value = commits.value.length commitSkip.value = commits.value.length
// has_more:后端无 total 时(commits 仍可能未全载)用页大小推断;有 total 时按已载 < total 判定。 // has_more:后端无 total 时(commits 仍可能未全载)用页大小推断;有 total 时按已载 < total 判定。
@@ -368,11 +387,13 @@ async function loadStatus() {
backendTotal > 0 backendTotal > 0
? commits.value.length < backendTotal ? commits.value.length < backendTotal
: commits.value.length >= COMMIT_PAGE_SIZE : commits.value.length >= COMMIT_PAGE_SIZE
} catch { } catch (e) {
if (seq !== statusReqSeq || mid !== props.moduleId) return // 旧请求的失败不污染当前视图
gitStatus.value = null gitStatus.value = null
commits.value = [] commits.value = []
loadError.value = String(e)
} finally { } finally {
loading.value = false if (seq === statusReqSeq) loading.value = false
} }
} }
@@ -407,6 +428,7 @@ function closeBranchPicker() {
async function loadMoreCommits() { async function loadMoreCommits() {
if (loadingMore.value || !hasMoreCommits.value) return if (loadingMore.value || !hasMoreCommits.value) return
loadingMore.value = true loadingMore.value = true
actionError.value = ''
try { try {
const res = await moduleApi.getModuleCommits(props.moduleId, commitSkip.value, COMMIT_PAGE_SIZE) const res = await moduleApi.getModuleCommits(props.moduleId, commitSkip.value, COMMIT_PAGE_SIZE)
// 按哈希去重(防止分页边界与 recent_commits 重叠) // 按哈希去重(防止分页边界与 recent_commits 重叠)
@@ -418,8 +440,8 @@ async function loadMoreCommits() {
commitSkip.value += res.commits.length commitSkip.value += res.commits.length
// 全量提交数读后端 total(git rev-list --count HEAD),非 commits.length(后者受分页限制)。 // 全量提交数读后端 total(git rev-list --count HEAD),非 commits.length(后者受分页限制)。
totalCommits.value = res.total totalCommits.value = res.total
} catch { } catch (e) {
// 静默失败 actionError.value = String(e)
} finally { } finally {
loadingMore.value = false loadingMore.value = false
} }
@@ -435,12 +457,14 @@ async function selectFile(path: string) {
// 先切预览到该文件(内容视图),diff 拉到后回填,点文件即展示变化 // 先切预览到该文件(内容视图),diff 拉到后回填,点文件即展示变化
emit('select-file', path) emit('select-file', path)
diffContent.value = '' diffContent.value = ''
actionError.value = ''
diffLoading.value = true diffLoading.value = true
try { try {
const res = await moduleApi.getModuleFileDiff(props.moduleId, path) const res = await moduleApi.getModuleFileDiff(props.moduleId, path)
diffContent.value = res.diff || '' diffContent.value = res.diff || ''
} catch { } catch (e) {
diffContent.value = '' diffContent.value = ''
actionError.value = String(e)
} finally { } finally {
diffLoading.value = false diffLoading.value = false
} }
@@ -668,7 +692,7 @@ watch(() => props.refreshKey, () => {
.gc-st-modified { color: var(--df-git-modified); } .gc-st-modified { color: var(--df-git-modified); }
.gc-st-added { color: var(--df-git-added); } .gc-st-added { color: var(--df-git-added); }
.gc-st-deleted { color: var(--df-git-deleted); } .gc-st-deleted { color: var(--df-git-deleted); }
.gc-st-untracked { color: #999; } .gc-st-untracked { color: var(--df-git-untracked); }
.gc-file-path { .gc-file-path {
flex: 1; min-width: 0; flex: 1; min-width: 0;
overflow: hidden; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
@@ -768,6 +792,12 @@ watch(() => props.refreshKey, () => {
padding: 40px 0; color: var(--df-text-dim); font-size: 13px; padding: 40px 0; color: var(--df-text-dim); font-size: 13px;
} }
.gc-empty-inline { padding: 24px 0; } .gc-empty-inline { padding: 24px 0; }
.gc-error { color: var(--df-danger); }
.gc-error-strip {
padding: 6px 14px; font-size: 12px; color: var(--df-danger);
background: var(--df-danger-bg); border-bottom: 0.5px solid var(--df-border);
flex-shrink: 0; word-break: break-all;
}
.spinner { .spinner {
width: 16px; height: 16px; width: 16px; height: 16px;
border: 2px solid var(--df-border); border-top-color: var(--df-accent); border: 2px solid var(--df-border); border-top-color: var(--df-accent);
+6 -3
View File
@@ -244,24 +244,27 @@ const wfSnap = computed(() => {
// 加载 // 加载
async function load() { async function load() {
if (!props.taskId) return const tid = props.taskId // 捕获发起时 taskId,响应回来校验未变才写入(防慢响应覆盖新任务)
if (!tid) return
loading.value = true loading.value = true
errorMsg.value = '' errorMsg.value = ''
try { try {
const [t, ps, ideasList] = await Promise.all([ const [t, ps, ideasList] = await Promise.all([
taskApi.get(props.taskId), taskApi.get(tid),
projectApi.list(), projectApi.list(),
ideaApi.list(), ideaApi.list(),
]) ])
if (tid !== props.taskId) return // taskId 已切换,旧任务响应丢弃
task.value = t task.value = t
projects.value = ps projects.value = ps
ideas.value = ideasList ideas.value = ideasList
await loadChildren() await loadChildren()
await loadParentTitle() await loadParentTitle()
} catch (e: any) { } catch (e: any) {
if (tid !== props.taskId) return // 旧任务请求的失败不污染当前视图
errorMsg.value = e?.toString() ?? t('common.unknownError') errorMsg.value = e?.toString() ?? t('common.unknownError')
} finally { } finally {
loading.value = false if (tid === props.taskId) loading.value = false // 新一轮 load 已接管 loading 态
} }
} }
+10 -1
View File
@@ -282,21 +282,28 @@ function buildQuery() {
return q return q
} }
// 请求序号守卫(对齐 project/tasks store 的 _tasksSeq 模式):快速切筛选/翻页时
// 旧响应晚到不覆盖新结果,旧请求的失败也不污染当前视图
let _loadSeq = 0
async function load() { async function load() {
const seq = ++_loadSeq
loading.value = true loading.value = true
errorMsg.value = '' errorMsg.value = ''
try { try {
const result = await invoke<ToolExecutionPage>('list_tool_executions', { const result = await invoke<ToolExecutionPage>('list_tool_executions', {
query: buildQuery(), query: buildQuery(),
}) })
if (seq !== _loadSeq) return // 旧响应丢弃,只取最新
records.value = result.items records.value = result.items
total.value = result.total total.value = result.total
hasMore.value = result.has_more hasMore.value = result.has_more
// 后端 total 已正确,空结果即真无数据(不再像旧"满页推断"需回退) // 后端 total 已正确,空结果即真无数据(不再像旧"满页推断"需回退)
} catch (e) { } catch (e) {
if (seq !== _loadSeq) return // 旧请求的失败不污染当前视图
errorMsg.value = String(e) errorMsg.value = String(e)
} finally { } finally {
loading.value = false if (seq === _loadSeq) loading.value = false
} }
} }
@@ -378,12 +385,14 @@ function reloadAudit() {
void load() void load()
} }
function prevPage() { function prevPage() {
if (loading.value) return // 加载中禁止翻页,防并发请求互踩
if (offset.value === 0) return if (offset.value === 0) return
offset.value = Math.max(0, offset.value - PAGE_SIZE) offset.value = Math.max(0, offset.value - PAGE_SIZE)
expandedId.value = null expandedId.value = null
void load() void load()
} }
function nextPage() { function nextPage() {
if (loading.value) return // 加载中禁止翻页,防并发请求互踩
if (!hasMore.value) return if (!hasMore.value) return
offset.value += PAGE_SIZE offset.value += PAGE_SIZE
expandedId.value = null expandedId.value = null
+5 -4
View File
@@ -14,10 +14,11 @@
</div> </div>
</header> </header>
<!-- ═══ 错误条:refresh/onMounted 加载失败对用户可见(样式全局 .error-banner) ═══ --> <!-- ═══ 错误条:消费 store.error(loadProjects/loadIdeas 吞错写 state.error,不再伪装空态)
<div v-if="errorMsg" class="error-banner" style="margin-bottom: 14px"> + 本地加载异常 errorMsg(样式全局 .error-banner) ═══ -->
<span class="error-text">{{ errorMsg }}</span> <div v-if="store.error || errorMsg" class="error-banner" style="margin-bottom: 14px">
<button class="error-dismiss" @click="errorMsg = ''">✕</button> <span class="error-text">{{ store.error || errorMsg }}</span>
<button class="error-dismiss" @click="store.clearError(); errorMsg = ''">✕</button>
</div> </div>
<!-- ═══ Main Grid ═══ --> <!-- ═══ Main Grid ═══ -->
+6 -1
View File
@@ -449,7 +449,12 @@ async function onStatusChange(newStatus: IdeaStatus) {
}) })
if (!await confirmDialog(msg, t('common.confirm'))) return if (!await confirmDialog(msg, t('common.confirm'))) return
} }
await store.updateIdea(currentIdea.value.id, 'status', newStatus) try {
await store.updateIdea(currentIdea.value.id, 'status', newStatus)
} catch (e: any) {
// 失败 toast(对齐 onUpdateDesc 先例),不吞成 unhandled rejection
Message.error(e?.toString() ?? t('common.unknownError'))
}
} }
// 接收 IdeaDetail 子组件 emit 的 'update-desc'(描述编辑保存) // 接收 IdeaDetail 子组件 emit 的 'update-desc'(描述编辑保存)
+2 -1
View File
@@ -381,13 +381,14 @@ async function submitCreate() {
submitting.value = true submitting.value = true
try { try {
const tags = form.value.tagsInput.split(',').map(t => t.trim()).filter(Boolean) const tags = form.value.tagsInput.split(',').map(t => t.trim()).filter(Boolean)
await store.create({ const r = await store.create({
kind: form.value.kind, kind: form.value.kind,
title: form.value.title.trim(), title: form.value.title.trim(),
content: form.value.content.trim(), content: form.value.content.trim(),
tags: JSON.stringify(tags), tags: JSON.stringify(tags),
confidence: form.value.confidence || undefined, confidence: form.value.confidence || undefined,
}) })
if (!r) return // 失败保持弹窗不关(错误走 error-banner)
showCreateModal.value = false showCreateModal.value = false
switchTopTab('inbox') switchTopTab('inbox')
showToast(t('knowledge.createdToast'), 'success') showToast(t('knowledge.createdToast'), 'success')
+19 -4
View File
@@ -80,8 +80,8 @@
<span class="trash-date">{{ formatDate(p.updated_at) }} {{ $t('projects.movedIn') }}</span> <span class="trash-date">{{ formatDate(p.updated_at) }} {{ $t('projects.movedIn') }}</span>
</div> </div>
<div class="trash-actions"> <div class="trash-actions">
<button class="btn btn-ghost btn-sm" @click="handleRestore(p.id)">{{ $t('projects.restore') }}</button> <button class="btn btn-ghost btn-sm" :disabled="!!restoringId || !!purgingId" @click="handleRestore(p.id)">{{ $t('projects.restore') }}</button>
<button class="btn btn-danger btn-sm" @click="handlePurge(p)">{{ $t('projects.purge') }}</button> <button class="btn btn-danger btn-sm" :disabled="!!restoringId || !!purgingId" @click="handlePurge(p)">{{ $t('projects.purge') }}</button>
</div> </div>
</div> </div>
</div> </div>
@@ -313,6 +313,9 @@ async function submitCreate() {
// ── 删除 / 回收站 ── // ── 删除 / 回收站 ──
const showTrashModal = ref(false) const showTrashModal = ref(false)
// 回收站操作 pending 守卫:操作中禁用按钮,防双击重复提交/并发互踩
const restoringId = ref<string | null>(null)
const purgingId = ref<string | null>(null)
async function handleDelete(project: ProjectRecord) { async function handleDelete(project: ProjectRecord) {
if (!await confirmDialog(t('projects.confirmDelete', { name: project.name }))) return if (!await confirmDialog(t('projects.confirmDelete', { name: project.name }))) return
@@ -325,12 +328,24 @@ async function openTrash() {
} }
async function handleRestore(id: string) { async function handleRestore(id: string) {
await store.restoreProject(id) if (restoringId.value || purgingId.value) return
restoringId.value = id
try {
await store.restoreProject(id)
} finally {
restoringId.value = null
}
} }
async function handlePurge(project: ProjectRecord) { async function handlePurge(project: ProjectRecord) {
if (!await confirmDialog(t('projects.confirmPurge', { name: project.name }))) return if (!await confirmDialog(t('projects.confirmPurge', { name: project.name }))) return
await store.purgeProject(project.id) if (restoringId.value || purgingId.value) return
purgingId.value = project.id
try {
await store.purgeProject(project.id)
} finally {
purgingId.value = null
}
} }
// ── 加载 ── // ── 加载 ──