From 282ad7be9fee4ff28e3fd130c1ad8e171692f927 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 19:34:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=95=8C=E9=9D=A2=E6=96=87=E6=A1=88):=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=B8=A4=E6=A3=B5=E6=A0=91=E5=8A=A0=20userNo?= =?UTF-8?q?tice=20=E9=97=B8=E2=80=94=E2=80=94=E9=9D=9E=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=80=E5=BE=8B=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 后端仍有出口把底层异常原文写进 error_message / fileError / 匹配原因 / 响应 message,逐条翻译 跟不上新增;用户 2026-10-09 要求整个项目的提示语都用中文,所以把规矩做进界面出口。 规则:原文含中文照原样透出;整条无中文换成中文兜底句;**含中文但冒号后是纯英文尾巴的剥掉尾巴** ("转换结果打包失败: No space left on device" 只留主干)。被隐去的原文进 console 供核对日志。 闸口:用户端 http.ts 的 extractErrorMessage 五条返回路径与 unwrapJavaResponse、后台 envelope 的 textOf/errorTextOf、13 处任务卡 `错误:${item.error}`、2 处 fileError 兜底句、发布页文件错误与 匹配原因函数、dispatch-guard 的解析失败原因清单、22 处 ElMessage.error(result.error) 型展示、 后台看板与数字人详情页两处模板。 尺子:frontend-vue/tests/user-notice-chinese-only-guard.test.ts、admin-frontend-vue/tests/user-notice-chinese-only.test.ts (分母硬钉+内存造违例自证+摘壳写法仍计入分母);source-pin 台账只登记本轮新增那一个文件, 别人的在飞格子没重算。node --test 用户端 782/782、后台 1782/1782,两棵树 vue-tsc 均 rc=0。 --- admin-frontend-vue/src/api/envelope.ts | 9 +- admin-frontend-vue/src/api/user-notice.ts | 32 ++++ .../pages/task-center/TaskCenterBoardPage.vue | 3 +- .../src/pages/tasks/ImageVideoTasksPage.vue | 3 +- .../tests/baselines/source-pin-ledger.json | 11 +- admin-frontend-vue/tests/task-22.test.ts | 7 +- .../tests/user-notice-chinese-only.test.ts | 62 ++++++++ .../components/BrandAppearancePatentTab.vue | 5 +- .../pages/brand/components/BrandBrandTab.vue | 7 +- .../brand/components/BrandCollectDataTab.vue | 5 +- .../brand/components/BrandConvertTab.vue | 5 +- .../pages/brand/components/BrandDedupeTab.vue | 5 +- .../brand/components/BrandDeleteBrandTab.vue | 5 +- .../brand/components/BrandPatrolDeleteTab.vue | 5 +- .../brand/components/BrandPriceTrackTab.vue | 7 +- .../brand/components/BrandProductRiskTab.vue | 5 +- .../brand/components/BrandPublishTab.vue | 9 +- .../brand/components/BrandQueryAsinTab.vue | 5 +- .../components/BrandShopDataCrawlTab.vue | 7 +- .../brand/components/BrandShopMatchTab.vue | 7 +- .../brand/components/BrandSimilarAsinTab.vue | 7 +- .../pages/brand/components/BrandSplitTab.vue | 5 +- .../brand/components/BrandVariantTab.vue | 7 +- .../brand/components/BrandWithdrawTab.vue | 5 +- .../src/pages/image-video/ImageVideoPage.vue | 3 +- .../components/DeliveryVideoWorkspace.vue | 3 +- frontend-vue/src/shared/api/http.ts | 13 +- .../components/ModuleTemplateDownload.vue | 3 +- .../shared/composables/useLiveTaskBoard.ts | 3 +- frontend-vue/src/shared/dispatch-guard.ts | 3 +- frontend-vue/src/shared/utils/user-notice.ts | 33 +++++ .../tests/contract-java-response.test.ts | 20 +-- frontend-vue/tests/extract-error.test.ts | 26 +++- .../user-notice-chinese-only-guard.test.ts | 139 ++++++++++++++++++ 34 files changed, 396 insertions(+), 78 deletions(-) create mode 100644 admin-frontend-vue/src/api/user-notice.ts create mode 100644 admin-frontend-vue/tests/user-notice-chinese-only.test.ts create mode 100644 frontend-vue/src/shared/utils/user-notice.ts create mode 100644 frontend-vue/tests/user-notice-chinese-only-guard.test.ts diff --git a/admin-frontend-vue/src/api/envelope.ts b/admin-frontend-vue/src/api/envelope.ts index 72f3bef28..f9f6b5338 100644 --- a/admin-frontend-vue/src/api/envelope.ts +++ b/admin-frontend-vue/src/api/envelope.ts @@ -1,4 +1,5 @@ /** API 响应解包与错误归一化(任务 22):纯函数,无框架依赖(只借 config/app 的 base 常量)。 */ +import { userNotice } from './user-notice.ts' import { joinAdminPath } from '../config/app.ts' export const REQUEST_FALLBACK_MESSAGE = '网络异常,请稍后重试' @@ -6,8 +7,8 @@ export const REQUEST_FALLBACK_MESSAGE = '网络异常,请稍后重试' function textOf(value: Record): string { const message = value.message const error = value.error - if (typeof message === 'string' && message.trim()) return message.trim() - if (typeof error === 'string' && error.trim()) return error.trim() + if (typeof message === 'string' && message.trim()) return userNotice(message) + if (typeof error === 'string' && error.trim()) return userNotice(error) return '' } @@ -31,12 +32,12 @@ export function unwrap(payload: unknown): T { /** 从任意负载取错误文案;缺省回退。 */ export function errorTextOf(payload: unknown): string { - if (payload instanceof Error) return payload.message.trim() || REQUEST_FALLBACK_MESSAGE + if (payload instanceof Error) return userNotice(payload.message, REQUEST_FALLBACK_MESSAGE) if (payload && typeof payload === 'object') { const text = textOf(payload as Record) if (text) return text } - if (typeof payload === 'string' && payload.trim()) return payload.trim() + if (typeof payload === 'string' && payload.trim()) return payload return REQUEST_FALLBACK_MESSAGE } diff --git a/admin-frontend-vue/src/api/user-notice.ts b/admin-frontend-vue/src/api/user-notice.ts new file mode 100644 index 000000000..6e7a53096 --- /dev/null +++ b/admin-frontend-vue/src/api/user-notice.ts @@ -0,0 +1,32 @@ +/** + * 后台提示语把关(2026-10-09):只把中文给用户看。 + * + * Java 侧仍有出口把底层异常原文写进 message/errorMessage,后台同学看到 + * `Invalid export date range` 这类句子既看不懂也没法转述给用户。这里统一换成中文兜底句, + * 原文进 console 供对着日志核对。 + */ + +const CJK = /[\u3400-\u4dbf\u4e00-\u9fff]/ + +export const NOTICE_FALLBACK = '操作未能完成,请稍后重试' + +export function userNotice(text?: string | null, fallback: string = NOTICE_FALLBACK): string { + const raw = typeof text === 'string' ? text.trim() : '' + if (!raw) { + return fallback + } + if (!CJK.test(raw)) { + console.warn('[user-notice] 提示语原文不是中文,已换成中文兜底句,原文:', raw) + return fallback + } + // 中文主干 + 英文尾巴(后端把底层异常原文拼在冒号后):留主干,尾巴只进 console + const at = Math.max(raw.lastIndexOf(':'), raw.lastIndexOf(':')) + if (at > 0 && !CJK.test(raw.slice(at + 1))) { + const head = raw.slice(0, at).trim() + if (CJK.test(head)) { + console.warn('[user-notice] 提示语尾巴是英文,已隐去,原文:', raw) + return head + } + } + return raw +} diff --git a/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue b/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue index 78137d915..23da8a7d6 100644 --- a/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue +++ b/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue @@ -4,6 +4,7 @@ * 页签二「变体采集」= 麦象批量任务(variant-collection),数据口径与列不同故独立页签。 * 30s 轮询:页面隐藏暂停、回前台立即刷新、卸载清理;另有手动刷新。 */ import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue' +import { userNotice } from '@/api/user-notice' import { ElMessage } from 'element-plus' import OldPagination from '@/components/OldPagination.vue' import { useCompanyTabStore } from '@/stores/company-tab' @@ -579,7 +580,7 @@ onUnmounted(() => { {{ currentScopeOf(detail) }} - {{ detail.errorMessage || detail.message || '—' }} + {{ userNotice(detail.errorMessage || detail.message, '—') }}

分组明细({{ (detail.shops || []).length }} 组)

diff --git a/admin-frontend-vue/src/pages/tasks/ImageVideoTasksPage.vue b/admin-frontend-vue/src/pages/tasks/ImageVideoTasksPage.vue index 56ab5b46a..ae2dc9236 100644 --- a/admin-frontend-vue/src/pages/tasks/ImageVideoTasksPage.vue +++ b/admin-frontend-vue/src/pages/tasks/ImageVideoTasksPage.vue @@ -1,5 +1,6 @@