From 8776a9bf1e2cb4a7bcd77ce20988d60495e4822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 9 Oct 2026 23:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1(=E5=9B=9B=E9=9D=A29=E5=88=86?= =?UTF-8?q?=E6=89=B9=E6=AC=A1):=20=E8=A3=B8=E6=8F=90=E7=A4=BA=2092?= =?UTF-8?q?=E2=86=920=E3=80=81=E8=A3=B8=20confirm=2024=E2=86=920=20?= =?UTF-8?q?=E4=B8=94=E9=80=90=E5=A4=84=20await=E3=80=81=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=80=81=E5=8F=AF=E8=A7=81=E5=B9=B6=E7=9C=9F=E8=83=BD=E9=87=8D?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ElMessage.error 全收进 showAdminFeedback(例外清单 CAP=0,唯一保留的裸调用是出口本体); window.confirm 24 处全部改成 await 的 openAdminConfirm(逐处核过所在函数本就 async, 不存在"点了确认不执行"的异步断层)。 - 新增 load-failure-model + LoadFailureBar:22/23 个取数页有失败态与真重试 (只有"知道了"清条不算过),例外仅登录页。 - DedupeRegistryPage / DuplicateCheckPage 补 onUnmounted,并加全树定时器/监听配对判据。 - 去重页那处"能点但后端 403":读侧认 wholeCompany、写侧只认 groupIds/userIds 的不对称 本轮没动后端(前端拿不到与写侧同集合的 groupIds,按它置灰会误伤同事名下真能改的行=静默删功能); 先修更实在的一半——403 的中文原因此前整段丢失,现在走统一文案到界面。 - 验收:node --test 1,818 例 0 红、npx vue-tsc --noEmit rc=0;5 支新判据 26 例。 --- .../src/components/CopyText.vue | 3 +- .../src/components/LoadFailureBar.vue | 53 +++++ .../src/components/NotificationBell.vue | 2 +- .../src/components/load-failure-model.ts | 49 +++++ admin-frontend-vue/src/layout/AdminLayout.vue | 5 +- .../src/pages/account/CompaniesPage.vue | 10 +- .../src/pages/account/GroupsPage.vue | 10 +- .../src/pages/account/MenusPage.vue | 17 +- .../src/pages/account/UserSecretUsagePage.vue | 10 +- .../src/pages/account/UserSecretsPage.vue | 21 +- .../src/pages/account/UsersPage.vue | 12 +- .../src/pages/asin/AsinInvalidPage.vue | 15 +- .../src/pages/asin/DedupeRegistryPage.vue | 35 ++- .../src/pages/asin/ProductCategoryPage.vue | 19 +- .../src/pages/asin/QueryAsinPage.vue | 23 +- .../src/pages/asin/SkipPricePage.vue | 21 +- .../src/pages/records/DeviceLogsPage.vue | 25 ++- .../RecordsDigitalHumanVersionPage.vue | 25 ++- .../records/RecordsSoftwareVersionPage.vue | 17 +- .../src/pages/records/RecordsTutorialPage.vue | 17 +- .../src/pages/shop/ShopKeysPage.vue | 19 +- .../src/pages/shop/ShopManagePage.vue | 21 +- .../pages/task-center/TaskCenterBoardPage.vue | 16 +- .../src/pages/tasks/DuplicateCheckPage.vue | 8 +- .../src/pages/tasks/ImageVideoTasksPage.vue | 18 +- .../src/pages/tasks/ShopDataTasksPage.vue | 21 +- .../tests/align-account-row-buttons.test.ts | 4 +- .../tests/align-asin-row-buttons.test.ts | 4 +- .../align-shop-records-row-buttons.test.ts | 4 +- .../tests/baselines/source-pin-ledger.json | 44 +++- .../tests/confirm-exit-ledger.test.ts | 125 +++++++++++ .../dedupe-write-forbidden-reason.test.ts | 118 +++++++++++ .../tests/error-feedback-exit-ledger.test.ts | 143 +++++++++++++ .../tests/load-failure-visibility.test.ts | 178 ++++++++++++++++ admin-frontend-vue/tests/task-3.test.ts | 4 +- .../tests/task-center-board.test.ts | 2 +- .../tests/timer-cleanup-pairing.test.ts | 199 ++++++++++++++++++ 37 files changed, 1181 insertions(+), 136 deletions(-) create mode 100644 admin-frontend-vue/src/components/LoadFailureBar.vue create mode 100644 admin-frontend-vue/src/components/load-failure-model.ts create mode 100644 admin-frontend-vue/tests/confirm-exit-ledger.test.ts create mode 100644 admin-frontend-vue/tests/dedupe-write-forbidden-reason.test.ts create mode 100644 admin-frontend-vue/tests/error-feedback-exit-ledger.test.ts create mode 100644 admin-frontend-vue/tests/load-failure-visibility.test.ts create mode 100644 admin-frontend-vue/tests/timer-cleanup-pairing.test.ts diff --git a/admin-frontend-vue/src/components/CopyText.vue b/admin-frontend-vue/src/components/CopyText.vue index a07415f3e..0180002d9 100644 --- a/admin-frontend-vue/src/components/CopyText.vue +++ b/admin-frontend-vue/src/components/CopyText.vue @@ -1,6 +1,7 @@ diff --git a/admin-frontend-vue/src/components/LoadFailureBar.vue b/admin-frontend-vue/src/components/LoadFailureBar.vue new file mode 100644 index 000000000..bf151970a --- /dev/null +++ b/admin-frontend-vue/src/components/LoadFailureBar.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/admin-frontend-vue/src/components/NotificationBell.vue b/admin-frontend-vue/src/components/NotificationBell.vue index 15b1a92a2..7288cec91 100644 --- a/admin-frontend-vue/src/components/NotificationBell.vue +++ b/admin-frontend-vue/src/components/NotificationBell.vue @@ -341,7 +341,7 @@ async function readAll() { unreadCount.value = 0 } catch (error) { console.warn('[admin-notification] 全部已读失败:', error) - ElMessage.error(error instanceof Error ? error.message : '操作失败') + showAdminFeedback(error instanceof Error ? error.message : '操作失败', 'error') } finally { markingAll.value = false } diff --git a/admin-frontend-vue/src/components/load-failure-model.ts b/admin-frontend-vue/src/components/load-failure-model.ts new file mode 100644 index 000000000..7404149bf --- /dev/null +++ b/admin-frontend-vue/src/components/load-failure-model.ts @@ -0,0 +1,49 @@ +/** + * 列表加载失败态模型(四面9分口径 · 后管「模板内失败态只有 4/24 页」): + * 把「请求失败了」归一成一条可读中文,配 LoadFailureBar.vue 的那个真能重跑的按钮用。 + * + * 纯逻辑、不依赖 Vue 也不依赖 Element,`node --test` 直接 import 跑行为断言。 + * 文案把关复用 api/user-notice:后端把底层异常原文拼进 message 时,界面只留中文主干。 + */ +import { userNotice } from '../api/user-notice.ts' + +/** 失败条上那个按钮的字样:必须是「重试」而不是一句「知道了」——撤入口同时得是出口。 */ +export const LOAD_FAILURE_RETRY_LABEL = '重试' + +/** 从 axios 错误 / Error / 字符串里取后端给的原因;取不到、或原文不是中文时返回空串。 */ +export function failureDetail(error: unknown): string { + const data = (error as { response?: { data?: unknown } } | undefined)?.response?.data + if (data && typeof data === 'object') { + const record = data as Record + for (const key of ['message', 'error', 'msg']) { + const value = record[key] + if (typeof value === 'string' && value.trim()) return userNotice(value, '') + } + } + if (error instanceof Error && error.message.trim()) return userNotice(error.message, '') + if (typeof error === 'string' && error.trim()) return userNotice(error, '') + return '' +} + +/** + * 后端按范围拒掉的句子(`无权操作该总数据`、`缺少归属公司…`)补一句人话: + * 这类失败不是页面坏了,重试一百次也是同一个结果,得把出路说清楚。 + */ +export const SCOPE_REFUSAL_NOTE = '这一行不在你当前可操作的分组/公司范围内,需要由平台超级管理员处理' +const SCOPE_REFUSAL = /无权|缺少归属公司/ + +/** 命中范围拒绝时返回补充说明,否则空串。 */ +export function scopeRefusalNote(detail: string): string { + return SCOPE_REFUSAL.test(detail || '') ? SCOPE_REFUSAL_NOTE : '' +} + +/** 「本页兜底文案:后端原因」;没有可读原因时只留兜底文案,不拼出「加载失败:」这种半截句。 */ +export function loadFailureMessage(error: unknown, fallback: string): string { + const head = (fallback || '').trim() + const detail = failureDetail(error) + if (!detail) return head + const note = scopeRefusalNote(detail) + const reason = note ? `${detail}(${note})` : detail + if (!head || head.includes(detail)) return head || reason + return `${head}:${reason}` +} diff --git a/admin-frontend-vue/src/layout/AdminLayout.vue b/admin-frontend-vue/src/layout/AdminLayout.vue index eeeb16299..f0f2d371c 100644 --- a/admin-frontend-vue/src/layout/AdminLayout.vue +++ b/admin-frontend-vue/src/layout/AdminLayout.vue @@ -1,7 +1,7 @@ diff --git a/admin-frontend-vue/src/pages/account/CompaniesPage.vue b/admin-frontend-vue/src/pages/account/CompaniesPage.vue index 7ccc51b2c..778aa4642 100644 --- a/admin-frontend-vue/src/pages/account/CompaniesPage.vue +++ b/admin-frontend-vue/src/pages/account/CompaniesPage.vue @@ -3,16 +3,19 @@ * 可见范围由后端收窄(超管全部、公司内 admin 只自己公司);写操作仅超管,这里隐藏入口只是配合, * 真正的把关在 CompanyController,页面不得当作权限边界。 */ import { computed, onMounted, ref } from 'vue' -import { ElMessage } from 'element-plus' + import { formatDateTime } from '@/utils/datetime' import { fetchCompanies } from '@/api/companies' import { COMPANY_STATUS_ACTIVE, type CompanyItem } from '@/api/companies-dto' import { useAdminSessionStore } from '@/stores/admin-session' import OldPagination from '@/components/OldPagination.vue' import CompanyEditorDialog from './CompanyEditorDialog.vue' +import { showAdminFeedback } from '@/components/admin-feedback-ui' +import LoadFailureBar from '@/components/LoadFailureBar.vue' const session = useAdminSessionStore() const loading = ref(false) +const loadFailure = ref('') const rows = ref([]) const editorVisible = ref(false) const editingCompany = ref(null) @@ -33,10 +36,12 @@ function changeSize(size: number) { pageSize.value = size; page.value = 1 } async function loadCompanies() { loading.value = true + loadFailure.value = '' try { rows.value = await fetchCompanies() } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '公司列表加载失败') + loadFailure.value = error instanceof Error ? error.message : '公司列表加载失败' + showAdminFeedback(loadFailure.value, 'error') } finally { loading.value = false } @@ -70,6 +75,7 @@ onMounted(loadCompanies) +
diff --git a/admin-frontend-vue/src/pages/account/GroupsPage.vue b/admin-frontend-vue/src/pages/account/GroupsPage.vue index 47d5e3954..2720f975c 100644 --- a/admin-frontend-vue/src/pages/account/GroupsPage.vue +++ b/admin-frontend-vue/src/pages/account/GroupsPage.vue @@ -11,10 +11,13 @@ import { deleteShopGroup, fetchShopGroups } from './shop-group-api' import type { ShopGroupItem } from './shop-group-model' import GroupEditorDialog from './GroupEditorDialog.vue' import OldPagination from '@/components/OldPagination.vue' +import { showAdminFeedback } from '@/components/admin-feedback-ui' +import LoadFailureBar from '@/components/LoadFailureBar.vue' const session = useAdminSessionStore() const companyTab = useCompanyTabStore() const loading = ref(false) +const loadFailure = ref('') const rows = ref([]) const editorVisible = ref(false) const editingGroup = ref(null) @@ -47,10 +50,12 @@ function canEditOf(group: ShopGroupItem): boolean { async function loadGroups() { loading.value = true + loadFailure.value = '' try { rows.value = await fetchShopGroups(companyTab.requestCompanyId) } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '数据权限分组加载失败') + loadFailure.value = error instanceof Error ? error.message : '数据权限分组加载失败' + showAdminFeedback(loadFailure.value, 'error') } finally { loading.value = false } @@ -78,7 +83,7 @@ async function removeGroup(group: ShopGroupItem) { ElMessage.success('删除成功') await loadGroups() } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '删除失败') + showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error') } } @@ -104,6 +109,7 @@ onMounted(loadGroups) +
diff --git a/admin-frontend-vue/src/pages/account/MenusPage.vue b/admin-frontend-vue/src/pages/account/MenusPage.vue index 4942d35ce..e42c5a552 100644 --- a/admin-frontend-vue/src/pages/account/MenusPage.vue +++ b/admin-frontend-vue/src/pages/account/MenusPage.vue @@ -7,6 +7,9 @@ import { ElMessage, ElMessageBox } from 'element-plus' import OldPagination from '@/components/OldPagination.vue' import { useCompanyTabStore } from '@/stores/company-tab' import { createMenu, deleteMenu, loadMenuManageTree, reorderMenus, updateMenu } from './menu-manage-api' +import { showAdminFeedback } from '@/components/admin-feedback-ui' +import { openAdminConfirm } from '@/components/admin-confirm' +import LoadFailureBar from '@/components/LoadFailureBar.vue' import { MENU_TYPE_OPTIONS, createMenuForm, @@ -31,6 +34,7 @@ interface MenuRow extends MenuManageNode { const companyTab = useCompanyTabStore() const loading = ref(false) +const loadFailure = ref('') const rows = ref([]) /** 筛选:菜单名称/类型(用户要求账户域子菜单补筛选条件)。 */ const filterName = ref('') @@ -85,10 +89,12 @@ function parentNameOf(node: MenuManageNode): string { async function loadMenus() { loading.value = true + loadFailure.value = '' try { rows.value = await loadMenuManageTree(companyTab.requestCompanyId) } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '菜单列表加载失败') + loadFailure.value = error instanceof Error ? error.message : '菜单列表加载失败' + showAdminFeedback(loadFailure.value, 'error') } finally { loading.value = false } @@ -154,7 +160,7 @@ async function onDrop(event: DragEvent, target: MenuManageNode): Promise { ElMessage.success('排序已保存') await loadMenus() } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '排序保存失败') + showAdminFeedback(error instanceof Error ? error.message : '排序保存失败', 'error') } } @@ -183,7 +189,7 @@ async function saveMenu() { createVisible.value = false await loadMenus() } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '保存失败') + showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error') } finally { saving.value = false } @@ -196,13 +202,13 @@ async function removeMenu(node: MenuManageNode) { return } // 对齐旧版:原生 confirm。 - if (!window.confirm(`确定删除菜单“${node.name}”吗?`)) return + if (!(await openAdminConfirm({ message: `确定删除菜单“${node.name}”吗?`, danger: true }))) return try { await deleteMenu(node.id) ElMessage.success('删除成功') await loadMenus() } catch (error) { - ElMessage.error(error instanceof Error ? error.message : '删除失败') + showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error') } } @@ -238,6 +244,7 @@ onMounted(loadMenus) +
diff --git a/admin-frontend-vue/src/pages/account/UserSecretUsagePage.vue b/admin-frontend-vue/src/pages/account/UserSecretUsagePage.vue index 3e34ea436..540807dcc 100644 --- a/admin-frontend-vue/src/pages/account/UserSecretUsagePage.vue +++ b/admin-frontend-vue/src/pages/account/UserSecretUsagePage.vue @@ -1,6 +1,6 @@