fix(界面文案): 前端两棵树加 userNotice 闸——非中文提示语一律换成中文句

后端仍有出口把底层异常原文写进 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。
This commit is contained in:
2026-10-09 19:34:54 +08:00
parent 2a4d15b801
commit 282ad7be9f
34 changed files with 396 additions and 78 deletions
+5 -4
View File
@@ -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, unknown>): 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<T>(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<string, unknown>)
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
}
+32
View File
@@ -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
}
@@ -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(() => {
</template>
</el-descriptions-item>
<el-descriptions-item label="当前处理">{{ currentScopeOf(detail) }}</el-descriptions-item>
<el-descriptions-item label="错误信息" :span="2">{{ detail.errorMessage || detail.message || '—' }}</el-descriptions-item>
<el-descriptions-item label="错误信息" :span="2">{{ userNotice(detail.errorMessage || detail.message, '—') }}</el-descriptions-item>
</el-descriptions>
<h4 class="detail-title">分组明细({{ (detail.shops || []).length }} 组)</h4>
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { formatDateTime } from '@/utils/datetime'
import { userNotice } from '@/api/user-notice'
/** 视频任务记录页 · 像素复刻旧版 admin.html panel-image-video-tasks(自绘:form-box 筛选[用户名/提交起止+查询/重置] + panel-box toolbar[全选/批量下载/权限配置/汇总] + 任务卡片网格 + 旧式分页)。
* script 逻辑沿用现有 Vue 实现(批量打包/明细抽屉/权限授权)。 */
import { computed, onMounted, reactive, ref, watch } from 'vue'
@@ -394,7 +395,7 @@ onMounted(load)
<el-descriptions-item label="提交时间">{{ formatDateTime(detail.submittedAt) }}</el-descriptions-item>
<el-descriptions-item label="生成时间">{{ formatDateTime(imageVideoGeneratedAt(detail)) }}</el-descriptions-item>
<el-descriptions-item label="执行ID">{{ detail.cozeExecuteId || '—' }}</el-descriptions-item>
<el-descriptions-item label="错误">{{ detail.errorMessage || '—' }}</el-descriptions-item>
<el-descriptions-item label="错误">{{ userNotice(detail.errorMessage, '—') }}</el-descriptions-item>
</el-descriptions>
</template>
</div>
@@ -1,10 +1,10 @@
{
"note": "readSource 钉子逐文件基线。两把尺子:pins=落在用例体内的读盘,reads=全文读点总数(含模块级夹具与 helper)。都只许减;pins 下降而 reads 没同步下降=把读盘挪出体内,不算改进。由 tests/source-pin-ratchet.test.ts 生成。",
"totals": {
"files": 237,
"cases": 1703,
"files": 238,
"cases": 1707,
"pins": 436,
"reads": 620
"reads": 621
},
"files": {
"admin-scaffold.test.ts": {
@@ -1191,6 +1191,11 @@
"cases": 7,
"pins": 2,
"reads": 2
},
"user-notice-chinese-only.test.ts": {
"cases": 4,
"pins": 0,
"reads": 1
}
}
}
+5 -2
View File
@@ -48,7 +48,9 @@ test('test_task_022_envelope_rules_boundary_limit_or_missing_field', () => {
// 边界上限/缺字段:success=false 且 message 缺失回落到通用失败。
assert.throws(() => unwrap({ success: false }), /请求失败/)
assert.equal(errorTextOf({ error: '权限不足' }), '权限不足')
assert.equal(errorTextOf({ message: '', error: 'X' }), 'X')
assert.equal(errorTextOf({ message: '', error: '参数不对' }), '参数不对')
// 英文原文不透出:同一条空 message + 英文 error 只会给到中文兜底句
assert.equal(errorTextOf({ message: '', error: 'Invalid export date range' }), '操作未能完成,请稍后重试')
})
test('test_task_022_envelope_rules_invalid_input_rejected', () => {
@@ -58,7 +60,8 @@ test('test_task_022_envelope_rules_invalid_input_rejected', () => {
assert.equal(isUnauthorized({ statusCode: 401 }), true)
assert.equal(isUnauthorized({ code: 403 }), false)
assert.equal(isUnauthorized(null), false)
assert.equal(requestErrorMessage(new Error('Network Error')), 'Network Error')
assert.equal(requestErrorMessage(new Error('网络连接不上')), '网络连接不上')
assert.equal(requestErrorMessage(new Error('Network Error')), '网络异常,请稍后重试')
})
test('test_task_022_envelope_rules_dependency_failure_returns_actionable_message', () => {
@@ -0,0 +1,62 @@
import { test } from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import { fileURLToPath } from 'node:url'
import { resolve, dirname } from 'node:path'
import { errorTextOf, requestErrorMessage, unwrap } from '../src/api/envelope.ts'
import { userNotice, NOTICE_FALLBACK } from '../src/api/user-notice.ts'
/**
* 后台中文文案尺子(2026-10-09)。
*
* 起因:去重库导出失败时后台弹的是 `invalid export date range`,客服照着这句话没法回答用户,
* 也没法判断是不是自己的操作问题。写侧已把这几句改成中文,这里钉两件事:
* ① 解包出口(textOf / errorTextOf)不许再把非中文原文透出;② 模板里直接渲染 errorMessage
* 的两处必须过 userNotice。
*/
const here = dirname(fileURLToPath(import.meta.url))
function read(rel: string): string {
return readFileSync(resolve(here, '../src', rel), 'utf-8')
}
test('userNotice 放行中文、替换英文', () => {
assert.equal(userNotice('导出的日期范围不对'), '导出的日期范围不对')
assert.equal(userNotice('export dedupe total data failed'), NOTICE_FALLBACK)
assert.equal(userNotice('', '默认句'), '默认句')
// 库里存的是"中文主干: 底层英文原文",界面上只留主干
assert.equal(userNotice('去重结果打包失败: Broken pipe'), '去重结果打包失败')
})
test('响应体里的英文原文不会从解包出口透出', () => {
assert.equal(requestErrorMessage({ response: { data: { message: 'Invalid export date range' } } }), NOTICE_FALLBACK)
const fromError = requestErrorMessage(new Error('Internal Server Error'))
assert.ok(!/^[A-Za-z]/.test(fromError), `axios/Error 原文仍被透出: ${fromError}`)
assert.ok(/[㐀-䶿一-鿿]/.test(fromError), `兜底句必须是中文: ${fromError}`)
assert.equal(requestErrorMessage({ response: { data: { error: 'MinIO 连接被拒绝' } } }), 'MinIO 连接被拒绝')
})
test('unwrap 抛出的错误也是中文', () => {
assert.throws(() => unwrap({ success: false, message: 'Coze workflow finished with status FAILED' }),
(err: unknown) => {
assert.ok(err instanceof Error)
assert.ok(!/^[A-Za-z]/.test(err.message), `抛给界面的还是英文: ${err.message}`)
return true
})
assert.doesNotThrow(() => unwrap({ success: true, data: 1 }))
})
test('直接渲染错误字段的模板已过闸', () => {
const sites: Array<[string, string]> = [
['pages/task-center/TaskCenterBoardPage.vue', 'detail.errorMessage || detail.message'],
['pages/tasks/ImageVideoTasksPage.vue', 'detail.errorMessage'],
]
for (const [file, needle] of sites) {
const source = read(file)
const line = source.split(/\r?\n/).find((l) => l.includes(needle) && l.includes('{{'))
assert.ok(line, `${file} 里找不到渲染 ${needle} 的那一行——改动没落地或字段名变了`)
assert.ok(line.includes('userNotice('), `${file}: ${needle} 仍被直接渲染进界面`)
assert.ok(source.includes('user-notice'), `${file} 缺 userNotice 的 import`)
}
})
@@ -69,6 +69,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage, ElMessageBox } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -234,7 +235,7 @@ function toPatentTaskView(item: AppearancePatentHistoryItem): TaskItemView {
extraLines: [
...(item.rowCount != null ? [`行数:${item.rowCount}`] : []),
...(item.resultFilename && !showProgress ? [item.resultFilename] : []),
...(item.error ? [`错误:${item.error}`] : []),
...(item.error ? [`错误:${userNotice(item.error)}`] : []),
],
progress: showProgress
? {
@@ -290,7 +291,7 @@ function isResultBuildFailed(item: AppearancePatentHistoryItem) {
function pendingResultHint(item: AppearancePatentHistoryItem) {
if (isResultBuildFailed(item)) {
return item.fileError || '结果文件生成失败,请稍后重试或检查后端日志'
return userNotice(item.fileError, '结果文件生成失败,请稍后重试或检查后端日志')
}
if (board.showFileProgress(item)) {
return ''
@@ -96,6 +96,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage, ElMessageBox } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue'
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -335,7 +336,7 @@ function toBrandTaskView(item: BrandTaskItem): TaskItemView {
const extraLines = [
...(item.file_paths?.length ? [`文件:${item.file_paths.length} 个`] : []),
...(lp && lineTotal > 0 ? [`已处理 ${lineCurrent} 行 / 共 ${lineTotal} 行(含查询失败)`] : []),
...(errorMessage(item) ? [`错误:${errorMessage(item)}`] : []),
...(errorMessage(item) ? [`错误:${userNotice(errorMessage(item))}`] : []),
]
// 行级进度优先:完成数 = 已处理品牌行(成功或查询失败都计入),进度 = 完成数 / 总数 * 100
let progress: TaskItemView['progress'] = null
@@ -462,7 +463,7 @@ async function downloadResult(item: BrandTaskItem) {
if (res.success) {
ElMessage.success(`已保存:${res.path || filename}`)
} else if (res.error && res.error !== '用户取消') {
ElMessage.error(res.error)
ElMessage.error(userNotice(res.error))
}
return
} catch (error) {
@@ -489,7 +490,7 @@ async function downloadTemplate(kind: 'xlsx' | 'zip') {
if (res?.success) {
ElMessage.success(`模板已保存至:${res.path}`)
} else if (res?.error) {
ElMessage.warning(res.error)
ElMessage.warning(userNotice(res.error))
} else {
ElMessage.warning('当前环境不支持模板下载,请在本机客户端中打开')
}
@@ -136,6 +136,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, reactive, ref, shallowRef, triggerRef } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -566,7 +567,7 @@ async function downloadResult(item: CollectDataHistoryItem) {
if (result.success) {
ElMessage.success(`已保存: ${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -692,7 +693,7 @@ function toCollectTaskView(item: CollectDataHistoryItem): TaskItemView {
`不符合 ASIN 过滤:${item.invalidFilteredCount ?? 0}`,
...(item.resultFilename ? [item.resultFilename] : []),
...(taskFilterSummary(item) ? [`筛选统计:${taskFilterSummary(item)}`] : []),
...(item.error ? [`错误:${item.error}`] : []),
...(item.error ? [`错误:${userNotice(item.error)}`] : []),
]
return {
key: `collect-${item.taskId ?? item.resultId ?? item.sourceFilename}`,
@@ -105,6 +105,7 @@
<script setup lang="ts">
import { computed, onMounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -207,7 +208,7 @@ function toConvertTaskView(item: ConvertResultItem): TaskItemView {
statusClass: convertTaskStatusClass(item),
extraLines: [
...(item.outputFilename ? [`压缩包文件:${item.outputFilename}`] : []),
...(item.error ? [`错误信息:${item.error}`] : []),
...(item.error ? [`错误信息:${userNotice(item.error)}`] : []),
],
source: item,
}
@@ -318,7 +319,7 @@ async function downloadConvertResult(item: ConvertResultItem) {
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -122,6 +122,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -231,7 +232,7 @@ function toDedupeTaskView(item: DedupeResultItem): TaskItemView {
statusClass: item.success ? 'success' : 'failed',
extraLines: [
...(item.outputFilename ? [`输出文件:${item.outputFilename}`] : []),
...(item.error ? [`错误信息:${item.error}`] : []),
...(item.error ? [`错误信息:${userNotice(item.error)}`] : []),
],
source: item,
}
@@ -413,7 +414,7 @@ async function downloadCleanResult(item: DedupeResultItem) {
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -101,6 +101,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -360,7 +361,7 @@ function toDeleteBrandTaskView(item: DeleteBrandResultItem): TaskItemView {
...(item.totalRows !== undefined && item.matched ? [`去重后 ${item.totalRows} 条`] : []),
...(showProgress && formatProgress(item) ? [formatProgress(item)] : []),
...(item.previewRows?.length ? [formatPreview(item.previewRows)] : []),
...(getDisplayError(item) ? [`错误信息:${getDisplayError(item)}`] : []),
...(getDisplayError(item) ? [`错误信息:${userNotice(getDisplayError(item))}`] : []),
]
return {
key: `delete-brand-${item.taskId ?? ''}-${item.resultId ?? item.fileKey ?? item.sourceFilename}`,
@@ -1101,7 +1102,7 @@ async function downloadTaskResult(item: DeleteBrandResultItem) {
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -249,6 +249,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref, watch } from "vue";
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from "element-plus";
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import TaskCenterPanel from "@/shared/components/tasks/TaskCenterPanel.vue";
@@ -394,7 +395,7 @@ function toPatrolTaskView(item: PatrolDeleteHistoryItem): TaskItemView {
...(formatTaskGroupShopIds(item) ? [`店铺 ID: ${formatTaskGroupShopIds(item)}`] : []),
...(item.platform ? [`平台: ${item.platform}`] : []),
`模板: ${formatTemplateSummary(item)}`,
...(formatTaskGroupErrors(item) ? [`错误: ${formatTaskGroupErrors(item)}`] : []),
...(formatTaskGroupErrors(item) ? [`错误: ${userNotice(formatTaskGroupErrors(item))}`] : []),
],
source: item,
}
@@ -1239,7 +1240,7 @@ async function downloadResult(item: PatrolDeleteHistoryItem) {
if (result.success) {
ElMessage.success(`已保存: ${result.path || filename}`);
} else if (result.error && result.error !== "用户取消") {
ElMessage.error(result.error);
ElMessage.error(userNotice(result.error));
}
}
@@ -220,6 +220,7 @@
<script setup lang="ts">
import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef, triggerRef, watch } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import type { TableInstance } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
@@ -1074,7 +1075,7 @@ async function enqueueCreatedTask(api: PywebviewApi, taskId: number, queuePayloa
try {
pushResult = await api.enqueue_json(queuePayload)
} catch (error) {
reason = `任务队列调用异常:${error instanceof Error ? error.message : String(error || '未知错误')}`
reason = `任务队列调用异常:${userNotice(error instanceof Error ? error.message : String(error || '未知错误'))}`
await compensateDispatchFailure(taskId, reason)
throw new Error(reason)
}
@@ -1571,7 +1572,7 @@ function toPriceTrackTaskView(item: PriceTrackHistoryItem): TaskItemView {
...(item.roundIndex ? [`轮次:第 ${item.roundIndex} 轮`] : []),
...(item.platform ? [`平台:${item.platform}`] : []),
...(item.outputFilename ? [`文件:${item.outputFilename}`] : []),
...(item.error ? [`错误:${item.error}`] : []),
...(item.error ? [`错误:${userNotice(item.error)}`] : []),
],
source: item,
}
@@ -1621,7 +1622,7 @@ async function downloadResult(item: PriceTrackHistoryItem) {
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -151,6 +151,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref, shallowRef, triggerRef } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
@@ -721,7 +722,7 @@ function toRiskTaskView(item: ProductRiskHistoryItem): TaskItemView {
extraLines: [
...(item.platform ? [`平台:${item.platform}`] : []),
...(item.outputFilename ? [`文件:${item.outputFilename}`] : []),
...(item.error ? [`错误:${item.error}`] : []),
...(item.error ? [`错误:${userNotice(item.error)}`] : []),
],
source: item,
}
@@ -1059,7 +1060,7 @@ async function downloadResult(item: ProductRiskHistoryItem) {
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -174,6 +174,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, ref, shallowRef, triggerRef, watch } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage, ElMessageBox } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
@@ -445,7 +446,7 @@ function toPublishTaskView(detail: PublishTaskDetailVo): TaskItemView {
const percent = Number.isFinite(rawPercent) ? Math.max(0, Math.min(100, Math.round(rawPercent))) : 0
const errorMessage = task?.errorMessage || ''
const extraLines: string[] = []
if (errorMessage) extraLines.push(`错误:${errorMessage}`)
if (errorMessage) extraLines.push(`错误:${userNotice(errorMessage)}`)
return {
key: `publish-${task?.id ?? 'unknown'}`,
title: `上架任务 #${task?.id ?? '-'}`,
@@ -1008,11 +1009,13 @@ function statusClass(status?: string | null) {
function matchText(file: PublishFileItem) {
if (isMatchedFile(file)) return file.shopId ? `已匹配 ${file.shopId}` : '已匹配'
return file.matchMessage || file.matchStatus || '未匹配'
const rawMatch = file.matchMessage || file.matchStatus
return rawMatch ? userNotice(rawMatch, '未匹配') : '未匹配'
}
function fileErrorText(file: PublishFileItem) {
return file.errorMessage || file.error || ''
const rawError = file.errorMessage || file.error
return rawError ? userNotice(rawError) : ''
}
function shouldShowFileProgress(file: PublishFileItem) {
@@ -210,6 +210,7 @@
<script setup lang="ts">
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from "element-plus";
import type { TableInstance } from "element-plus";
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
@@ -352,7 +353,7 @@ function toQueryAsinTaskView(item: QueryAsinHistoryItem): TaskItemView {
...(item.platform ? [`平台: ${item.platform}`] : []),
...(startedRaw && item.createdAt && startedRaw !== item.createdAt ? [`创建时间: ${formatDateTime(item.createdAt)}`] : []),
`ASIN结构: ${formatTemplateSummary(item)}`,
...(item.error ? [`错误: ${item.error}`] : []),
...(item.error ? [`错误: ${userNotice(item.error)}`] : []),
],
source: item,
};
@@ -1164,7 +1165,7 @@ async function downloadResult(item: QueryAsinHistoryItem) {
if (result.success) {
ElMessage.success(`已保存: ${result.path || filename}`);
} else if (result.error && result.error !== "用户取消") {
ElMessage.error(result.error);
ElMessage.error(userNotice(result.error));
}
}
@@ -106,10 +106,10 @@
/>
</template>
<template #item-extra="{ item }">
<div v-if="itemSource(item).error" class="files error-text">错误:{{ itemSource(item).error }}</div>
<div v-if="itemSource(item).error" class="files error-text">错误:{{ userNotice(itemSource(item).error) }}</div>
</template>
<template #history-item-extra="{ item }">
<div v-if="itemSource(item).error" class="files error-text">错误:{{ itemSource(item).error }}</div>
<div v-if="itemSource(item).error" class="files error-text">错误:{{ userNotice(itemSource(item).error) }}</div>
</template>
<template #item-actions="{ item }">
<button v-if="canDownload(itemSource(item))" type="button" class="download"
@@ -130,6 +130,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref, shallowRef, triggerRef } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
@@ -594,7 +595,7 @@ async function downloadResult(item: ShopDataCrawlHistoryItem) {
const filename = item.outputFilename || `${item.shopName || 'shop-data'}.xlsx`
const result = await saveUrlWithProgress(getShopDataCrawlResultDownloadUrl(item.resultId), filename, `shop-data-crawl:${item.resultId}`)
if (result.success) ElMessage.success(`已保存:${result.path || filename}`)
else if (result.error && result.error !== '用户取消') ElMessage.error(result.error)
else if (result.error && result.error !== '用户取消') ElMessage.error(userNotice(result.error))
}
async function deleteTaskRecord(item: ShopDataCrawlHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
@@ -120,6 +120,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref, shallowRef, triggerRef } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
@@ -233,7 +234,7 @@ function toShopMatchTaskView(item: ShopMatchHistoryItem): TaskItemView {
extraLines: [
...(item.platform ? [`平台: ${item.platform}`] : []),
...(item.outputFilename ? [`文件: ${item.outputFilename}`] : []),
...(item.error ? [`错误: ${item.error}`] : []),
...(item.error ? [`错误: ${userNotice(item.error)}`] : []),
],
source: item,
}
@@ -609,7 +610,7 @@ function statusText(item: ShopMatchHistoryItem) { const status = resolvedTaskSta
function statusClass(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return taskStatusClass(status, { classMap: { SCHEDULED: 'running', CANCELLED: 'running' }, classFallback: 'running' }) }
// 失败任务也可能有已跑出来的部分结果文件(后端按已收分片组装),有文件就允许下载
function canDownload(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return !!item.resultId && (!!item.fileReady || !!item.downloadUrl) && (status === 'SUCCESS' || status === 'COMPLETED' || status === 'FAILED') }
async function downloadResult(item: ShopMatchHistoryItem) { if (!item.resultId) return; const url = getShopMatchResultDownloadUrl(item.resultId); const filename = item.outputFilename || `${item.shopName || 'result'}.xlsx`; const result = await saveUrlWithProgress(url, filename, `shop-match:${item.resultId}`); if (result.success) ElMessage.success(`已保存: ${result.path || filename}`); else if (result.error && result.error !== '用户取消') ElMessage.error(result.error) }
async function downloadResult(item: ShopMatchHistoryItem) { if (!item.resultId) return; const url = getShopMatchResultDownloadUrl(item.resultId); const filename = item.outputFilename || `${item.shopName || 'result'}.xlsx`; const result = await saveUrlWithProgress(url, filename, `shop-match:${item.resultId}`); if (result.success) ElMessage.success(`已保存: ${result.path || filename}`); else if (result.error && result.error !== '用户取消') ElMessage.error(userNotice(result.error)) }
async function deleteTaskRecord(item: ShopMatchHistoryItem) {
if (!(await confirmTaskDeletion(item))) return
const taskId = normalizeTaskId(item.taskId)
@@ -646,7 +647,7 @@ function formatMatchStatus(status?: string) { const value = (status || '').trim(
function formatMatchRemark(row: ShopMatchShopQueueItem) { const message = (row.matchMessage || '').trim(); if (message) return message; if (row.matched && row.matchStatus === 'MATCHED') return '已匹配成功,可启动任务'; if (row.matched) return '已关联店铺,请查看状态确认'; if (row.matchStatus === 'CONFLICT') return '存在多个同名店铺,请人工确认'; if (row.matchStatus === 'PENDING') return '店铺尚未匹配完成,请稍后查看'; return '未匹配成功,请检查店铺名' }
async function pushToPythonQueue() { autoQueueEnabled.value = true; await processMatchedQueue() }
function nextMatchedQueueItem() { return matchedItems.value.find((item) => item.matched) }
async function processMatchedQueue() { if (disposed || queueWorkerRunning.value) return; const api = getPywebviewApi(); if (!api?.enqueue_json) { ElMessage.error('当前客户端未提供 enqueue_json'); return } const matched = matchedItems.value.filter((item) => item.matched); if (!matched.length) { ElMessage.warning('请先匹配可用店铺'); return } if (!orderedCountryCodes.value.length) { ElMessage.warning('请至少勾选一个国家'); return } let scheduleValues: string[] | undefined; try { scheduleValues = parseScheduleValues() } catch (error) { ElMessage.error(error instanceof Error ? error.message : '定时配置无效'); return } queueWorkerRunning.value = true; pushing.value = true; queuePayloadText.value = ''; let successCount = 0; let failedCount = 0; let index = 0; try { while (!disposed && autoQueueEnabled.value) { const item = nextMatchedQueueItem(); if (!item) break; index += 1; try { const created = await withTransientRetry(() => createShopMatchTask([buildTaskCreateItem(item)], orderedCountryCodes.value, scheduleValues), (attempt, maxAttempts) => { queuePushResult.value = `服务暂时不可用,正在重试创建任务(${attempt}/${maxAttempts})...` }); const taskId = created.taskId; const initialStatus = scheduleValues?.length ? 'SCHEDULED' : 'RUNNING'; const snapshot: ShopMatchTaskDetailVo = { task: { id: taskId, status: initialStatus, scheduledAt: scheduleValues?.[0], countryCodes: [...orderedCountryCodes.value], currentStageIndex: scheduleValues?.length ? 0 : undefined, activeStageIndex: undefined, scheduleStages: (scheduleValues || []).map((value, stageIndex) => ({ stageIndex, scheduledAt: value, status: stageIndex === 0 ? 'SCHEDULED' : 'PENDING' })) }, items: created.items }; taskSnapshots.value = { ...taskSnapshots.value, [taskId]: snapshot }; triggerRef(taskSnapshots); taskDetails.value = { ...taskDetails.value, [taskId]: initialStatus }; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); const createdItem = created.items?.[0]; if (!createdItem) { removeMatchedRowsLocally([item]); continue } if (scheduleValues?.length) { successCount += 1; restoreScheduledDispatches(); queuePushResult.value = `任务 ${taskId} 已创建,共 ${scheduleValues.length} 个执行时间点`; removeMatchedRowsLocally([item]); continue } const payload = buildQueuePayload(taskId, item, orderedCountryCodes.value); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) { failedCount += 1; queuePushResult.value = `任务 ${taskId} 启动失败,已自动继续下一条:${result?.error || '未知错误'}`; ElMessage.error(queuePushResult.value); removeMatchedRowsLocally([item]); continue } addPollingTask(taskId); ensurePolling(true); removeMatchedRowsLocally([item]); queuePushResult.value = `任务 ${taskId} 已提交,等待执行完成`; const finalStatus = await waitForTaskTerminal(taskId); if (finalStatus !== 'SUCCESS') { failedCount += 1; queuePushResult.value = `任务 ${taskId} 执行失败,已自动继续下一条`; ElMessage.error(queuePushResult.value); continue } successCount += 1; queuePushResult.value = `任务 ${taskId} 已完成` } catch (error) { if (disposed) break; failedCount += 1; queuePushResult.value = `第 ${index} 条任务处理失败,已自动继续下一条:${error instanceof Error ? error.message : '未知错误'}`; ElMessage.error(queuePushResult.value); removeMatchedRowsLocally([item]); continue } } restoreScheduledDispatches(); if (!scheduleValues?.length) ensurePolling(true); if (!disposed && (successCount > 0 || failedCount > 0)) ElMessage.success(scheduleValues?.length ? `定时任务已创建:成功 ${successCount} 条,失败 ${failedCount} 条` : `店铺启动已完成:成功 ${successCount} 条,失败 ${failedCount} 条`) } catch (error) { if (disposed) return; const message = error instanceof Error ? error.message : '启动失败'; queuePushResult.value = message; ElMessage.error(message) } finally { queueWorkerRunning.value = false; pushing.value = false } }
async function processMatchedQueue() { if (disposed || queueWorkerRunning.value) return; const api = getPywebviewApi(); if (!api?.enqueue_json) { ElMessage.error('当前客户端未提供 enqueue_json'); return } const matched = matchedItems.value.filter((item) => item.matched); if (!matched.length) { ElMessage.warning('请先匹配可用店铺'); return } if (!orderedCountryCodes.value.length) { ElMessage.warning('请至少勾选一个国家'); return } let scheduleValues: string[] | undefined; try { scheduleValues = parseScheduleValues() } catch (error) { ElMessage.error(error instanceof Error ? error.message : '定时配置无效'); return } queueWorkerRunning.value = true; pushing.value = true; queuePayloadText.value = ''; let successCount = 0; let failedCount = 0; let index = 0; try { while (!disposed && autoQueueEnabled.value) { const item = nextMatchedQueueItem(); if (!item) break; index += 1; try { const created = await withTransientRetry(() => createShopMatchTask([buildTaskCreateItem(item)], orderedCountryCodes.value, scheduleValues), (attempt, maxAttempts) => { queuePushResult.value = `服务暂时不可用,正在重试创建任务(${attempt}/${maxAttempts})...` }); const taskId = created.taskId; const initialStatus = scheduleValues?.length ? 'SCHEDULED' : 'RUNNING'; const snapshot: ShopMatchTaskDetailVo = { task: { id: taskId, status: initialStatus, scheduledAt: scheduleValues?.[0], countryCodes: [...orderedCountryCodes.value], currentStageIndex: scheduleValues?.length ? 0 : undefined, activeStageIndex: undefined, scheduleStages: (scheduleValues || []).map((value, stageIndex) => ({ stageIndex, scheduledAt: value, status: stageIndex === 0 ? 'SCHEDULED' : 'PENDING' })) }, items: created.items }; taskSnapshots.value = { ...taskSnapshots.value, [taskId]: snapshot }; triggerRef(taskSnapshots); taskDetails.value = { ...taskDetails.value, [taskId]: initialStatus }; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); const createdItem = created.items?.[0]; if (!createdItem) { removeMatchedRowsLocally([item]); continue } if (scheduleValues?.length) { successCount += 1; restoreScheduledDispatches(); queuePushResult.value = `任务 ${taskId} 已创建,共 ${scheduleValues.length} 个执行时间点`; removeMatchedRowsLocally([item]); continue } const payload = buildQueuePayload(taskId, item, orderedCountryCodes.value); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) { failedCount += 1; queuePushResult.value = `任务 ${taskId} 启动失败,已自动继续下一条:${userNotice(result?.error || '未知错误')}`; ElMessage.error(queuePushResult.value); removeMatchedRowsLocally([item]); continue } addPollingTask(taskId); ensurePolling(true); removeMatchedRowsLocally([item]); queuePushResult.value = `任务 ${taskId} 已提交,等待执行完成`; const finalStatus = await waitForTaskTerminal(taskId); if (finalStatus !== 'SUCCESS') { failedCount += 1; queuePushResult.value = `任务 ${taskId} 执行失败,已自动继续下一条`; ElMessage.error(queuePushResult.value); continue } successCount += 1; queuePushResult.value = `任务 ${taskId} 已完成` } catch (error) { if (disposed) break; failedCount += 1; queuePushResult.value = `第 ${index} 条任务处理失败,已自动继续下一条:${userNotice(error instanceof Error ? error.message : '未知错误')}`; ElMessage.error(queuePushResult.value); removeMatchedRowsLocally([item]); continue } } restoreScheduledDispatches(); if (!scheduleValues?.length) ensurePolling(true); if (!disposed && (successCount > 0 || failedCount > 0)) ElMessage.success(scheduleValues?.length ? `定时任务已创建:成功 ${successCount} 条,失败 ${failedCount} 条` : `店铺启动已完成:成功 ${successCount} 条,失败 ${failedCount} 条`) } catch (error) { if (disposed) return; const message = error instanceof Error ? error.message : '启动失败'; queuePushResult.value = message; ElMessage.error(message) } finally { queueWorkerRunning.value = false; pushing.value = false } }
onMounted(async () => { loadPollingIdsFromStorage(); loadTaskDetailsFromStorage(); loadTaskSnapshotsFromStorage(); loadMatchedItemsFromStorage(); schedulePickerValues.value = sanitizeSchedulePickerValues(schedulePickerValues.value, scheduleEnabled.value); syncPollingIdsWithTaskState(); await Promise.allSettled([loadCandidates(), loadCountryPreference(), loadHistory(), loadDashboard()]); window.addEventListener('focus', handleScheduleRecovery); document.addEventListener('visibilitychange', handleScheduleRecovery); restoreScheduledDispatches(); if (pollingTaskIds.value.length) ensurePolling(true) })
onUnmounted(() => { disposed = true; stopPolling(); stopScheduleHeartbeat(); clearSleepTimers(); window.removeEventListener('focus', handleScheduleRecovery); document.removeEventListener('visibilitychange', handleScheduleRecovery); if (countryPrefSaveTimer) timers.clearTimer('preference-save', countryPrefSaveTimer); for (const timer of dispatchTimers.values()) timers.clearTimer('scheduled-dispatch', timer); dispatchTimers.clear(); timers.clearScope() })
@@ -110,6 +110,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -287,7 +288,7 @@ function toAsinTaskView(item: SimilarAsinHistoryItem): TaskItemView {
extraLines: [
...(item.rowCount != null ? [`行数:${item.rowCount}`] : []),
...(item.resultFilename && !showProgress ? [item.resultFilename] : []),
...(item.error ? [`错误:${item.error}`] : []),
...(item.error ? [`错误:${userNotice(item.error)}`] : []),
],
progress: showProgress
? {
@@ -341,7 +342,7 @@ function isResultBuildFailed(item: SimilarAsinHistoryItem) {
function pendingResultHint(item: SimilarAsinHistoryItem) {
if (isResultBuildFailed(item)) {
return item.fileError || '结果文件生成失败,请稍后重试或检查后端日志'
return userNotice(item.fileError, '结果文件生成失败,请稍后重试或检查后端日志')
}
if (board.showFileProgress(item)) {
return ''
@@ -587,7 +588,7 @@ async function pushToPythonQueue() {
}
const result = await api.enqueue_json(payload)
if (!result?.success) {
ElMessage.error(result?.error || '启动失败')
ElMessage.error(userNotice(result?.error, '启动失败'))
return
}
queuedTaskSummary.value = toTaskSummary(currentParseResult)
@@ -130,6 +130,7 @@
<script setup lang="ts">
import { computed, onMounted, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import FileUploadZone from '@/shared/components/FileUploadZone.vue'
@@ -230,7 +231,7 @@ function toSplitTaskView(item: SplitResultItem): TaskItemView {
...(item.rowCount !== undefined ? [`压缩包共包含 ${item.rowCount} 条数据`] : []),
...(item.entryCount && item.entryCount > 0 ? [`压缩包内共 ${item.entryCount} 个拆分文件`] : []),
...(item.entries && item.entries.length ? [`压缩包内容:${formatSplitEntries(item.entries)}`] : []),
...(item.error ? [`错误信息:${item.error}`] : []),
...(item.error ? [`错误信息:${userNotice(item.error)}`] : []),
],
source: item,
}
@@ -342,7 +343,7 @@ async function downloadSplitResult(item: SplitResultItem) {
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -160,6 +160,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage, ElMessageBox } from 'element-plus'
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue'
import {
@@ -446,7 +447,7 @@ async function refreshTask(item: VariantTaskListItem) {
try {
const res = await bridge.vc_query_task(item.task_id)
if (!res?.success) {
ElMessage.error(res?.error || '查询失败')
ElMessage.error(userNotice(res?.error, '查询失败'))
return
}
const entry = tasks[item.task_id] || { task_id: item.task_id, meta: {} }
@@ -565,7 +566,7 @@ async function downloadSource(item: VariantTaskListItem) {
if (result.success) {
ElMessage.success(`源文件已保存:${result.path || name}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
@@ -620,7 +621,7 @@ async function reexportTask(item: VariantTaskListItem) {
}
void loadTasks(currentPage.value || 1)
} else if (result && Number(result.status) === 3) {
ElMessage.error(result.error || '后台导出失败')
ElMessage.error(userNotice(result.error, '后台导出失败'))
} else {
ElMessage.warning('导出超时或状态未知,请稍后重试')
}
@@ -238,6 +238,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref } from "vue";
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from "element-plus";
import AmazonToolPageShell from '@/pages/amazon/components/AmazonToolPageShell.vue';
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
@@ -384,7 +385,7 @@ function toWithdrawTaskView(item: WithdrawTaskGroupItem): TaskItemView {
finishedAt: formatDateTime(item.finishedAt),
statusText: statusText(item.taskStatus),
statusClass: statusClass(item.taskStatus),
extraLines: item.error ? [`错误:${item.error}`] : [],
extraLines: item.error ? [`错误:${userNotice(item.error)}`] : [],
source: item,
};
}
@@ -1187,7 +1188,7 @@ async function downloadResult(item: WithdrawTaskGroupItem) {
if (result.success) {
ElMessage.success(`已保存: ${result.path || filename}`);
} else if (result.error && result.error !== "用户取消") {
ElMessage.error(result.error);
ElMessage.error(userNotice(result.error));
}
}
@@ -66,6 +66,7 @@
<script setup lang="ts">
import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { useRoute, useRouter } from 'vue-router'
import PageShell from '@/components/layout/PageShell.vue'
@@ -237,7 +238,7 @@ async function launchDesktop() {
message: result?.error || '启动失败',
percent: 0,
}
showStatus(result?.error || '启动失败', 'error')
showStatus(userNotice(result?.error, '启动失败'), 'error')
} catch (error) {
const message = error instanceof Error ? error.message : String(error)
launchProgress.value = {
@@ -494,6 +494,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage, ElMessageBox } from 'element-plus'
import AiAssetDropzone from '@/shared/components/ai-workflow/AiAssetDropzone.vue'
@@ -1233,7 +1234,7 @@ async function downloadAssemblyVideo() {
if (result.success) {
ElMessage.success(`已保存: ${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
} finally {
assembly.downloading = false
+8 -5
View File
@@ -6,6 +6,9 @@ import axios, {
type InternalAxiosRequestConfig,
} from 'axios'
import { authReasonOf, handleKicked, handleSessionExpired, isKickedPayload, isUnauthorizedPayload } from '../auth/kick-handler.ts'
import { userNotice } from '../utils/user-notice.ts'
const REQUEST_FALLBACK = '请求未能完成,请稍后重试'
export interface LegacyApiSuccess<T> {
success: true
@@ -35,20 +38,20 @@ export function extractErrorMessage(error: unknown) {
if (field in data && typeof (data as Record<string, unknown>)[field] === 'string') {
const value = ((data as Record<string, string>)[field]).trim()
if (value) {
return value
return userNotice(value, REQUEST_FALLBACK)
}
}
}
}
if (typeof data === 'string' && data.trim()) {
return data
return userNotice(data, REQUEST_FALLBACK)
}
return error.message || '请求失败'
return userNotice(error.message, '请求失败')
}
return error instanceof Error ? error.message : '请求失败'
return error instanceof Error ? userNotice(error.message, '请求失败') : '请求失败'
}
/** 从 axios 错误对象里取响应体(兼容真实 AxiosError 与测试桩)。 */
@@ -166,7 +169,7 @@ export const requestDeleteJson = del
export async function unwrapJavaResponse<T>(promise: Promise<JavaApiResponse<T>>) {
const response = await promise
if (!response.success) {
throw new Error(response.message || '请求失败')
throw new Error(userNotice(response.message, '请求失败'))
}
return response.data as T
}
@@ -20,6 +20,7 @@
<script setup lang="ts">
import { ref } from 'vue'
import { userNotice } from '@/shared/utils/user-notice'
import { ElMessage } from 'element-plus'
import {
@@ -67,7 +68,7 @@ async function downloadTemplate() {
if (result.success) {
ElMessage.success(`已保存:${result.path || props.filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
} catch (error) {
ElMessage.error(error instanceof Error ? error.message : '模板下载失败')
@@ -1,4 +1,5 @@
import { computed, ref, type ComputedRef, type Ref } from 'vue'
import { userNotice } from '../utils/user-notice.ts'
import { ElMessage } from 'element-plus'
import { getTaskPollIntervalMs } from '../task-progress-config.ts'
import { createCategorizedTimers } from '../utils/categorized-timers.ts'
@@ -638,7 +639,7 @@ export function useLiveTaskBoard<T extends LiveTaskHistoryItem>(
if (result.success) {
ElMessage.success(`已保存: ${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
ElMessage.error(userNotice(result.error))
}
}
+2 -1
View File
@@ -18,6 +18,7 @@
* 纯 TS 无副作用模块:不引入 Vue / Element Plus,输入对象永不修改,任何输入
* 都返回 GuardResult 而不抛错(弹窗文案由 dispatch-guard-ui 负责渲染)。
*/
import { userNotice } from './utils/user-notice.ts'
/** block:必须修数据,禁止继续;confirm:可疑但可继续,需用户确认 */
export type GuardSeverity = 'block' | 'confirm'
@@ -348,7 +349,7 @@ export function checkParseResult(
severity: 'block',
message:
'以下文件解析未通过,没有可执行的数据行:\n' +
shown.map((item) => `· ${item}`).join('\n') +
shown.map((item) => `· ${userNotice(item)}`).join('\n') +
(fileErrors.length > shown.length
? `\n· 另有 ${fileErrors.length - shown.length} 条不同原因`
: '') +
@@ -0,0 +1,33 @@
/**
* 用户可见提示语把关(2026-10-09 收口)。
*
* 后端仍有大量出口把底层异常原文写进 error_message / fileError / 匹配原因等字段,
* 逐条翻译跟不上新增速度。这里按"只把中文给用户看"收口:原文含中文照原样透出,
* 纯英文(Java 栈名、Coze/MinIO 报错、`Network Error` 这类 axios 文案)一律换成中文兜底句,
* 原文只进 console,供支持同学对着后端日志核对。
*/
const CJK = /[㐀-䶿一-鿿]/
const DEFAULT_FALLBACK = '操作未能完成,请稍后重试'
export function userNotice(text?: string | null, fallback: string = DEFAULT_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
}
@@ -43,21 +43,21 @@ test('legacy success shape keeps msg-compatible fields', () => {
test('extractErrorMessage reads error field first', () => {
const err = new AxiosError('http', undefined, undefined, undefined,
{ status: 500, data: { error: 'E1', message: 'M', msg: 'm' } } as never)
assert.equal(extractErrorMessage(err), 'E1')
{ status: 500, data: { error: '错误一', message: '消息一', msg: '兜底一' } } as never)
assert.equal(extractErrorMessage(err), '错误一')
})
test('extractErrorMessage falls back to message/msg/string/generic', () => {
const withMessage = new AxiosError('http', undefined, undefined, undefined,
{ status: 500, data: { message: 'M', msg: 'm' } } as never)
assert.equal(extractErrorMessage(withMessage), 'M')
{ status: 500, data: { message: '消息一', msg: '兜底一' } } as never)
assert.equal(extractErrorMessage(withMessage), '消息一')
const withMsg = new AxiosError('http', undefined, undefined, undefined,
{ status: 500, data: { msg: 'm' } } as never)
assert.equal(extractErrorMessage(withMsg), 'm')
{ status: 500, data: { msg: '兜底一' } } as never)
assert.equal(extractErrorMessage(withMsg), '兜底一')
const stringBody = new AxiosError('http', undefined, undefined, undefined,
{ status: 500, data: 'plain-body' } as never)
assert.equal(extractErrorMessage(stringBody), 'plain-body')
const messageOnly = new AxiosError('boom')
assert.equal(extractErrorMessage(messageOnly), 'boom')
{ status: 500, data: '纯文本响应体' } as never)
assert.equal(extractErrorMessage(stringBody), '纯文本响应体')
const messageOnly = new AxiosError('网络请求失败')
assert.equal(extractErrorMessage(messageOnly), '网络请求失败')
assert.equal(extractErrorMessage(null), '请求失败')
})
+20 -6
View File
@@ -29,21 +29,35 @@ test('test_extract_msg_field', () => {
})
test('test_extract_error_precedence', () => {
const error = makeAxiosError(400, { error: 'e1', message: 'm1', msg: 'm2' })
assert.equal(extractErrorMessage(error), 'e1', 'error 应优先')
const error = makeAxiosError(400, { error: '错误字段优先', message: '消息字段', msg: 'msg 字段' })
assert.equal(extractErrorMessage(error), '错误字段优先', 'error 应优先')
const noError = makeAxiosError(400, { message: 'm1', msg: 'm2' })
assert.equal(extractErrorMessage(noError), 'm1', '无 error 时 message 优先于 msg')
const noError = makeAxiosError(400, { message: '消息字段', msg: 'msg 字段' })
assert.equal(extractErrorMessage(noError), '消息字段', '无 error 时 message 优先于 msg')
})
test('test_extract_string_body', () => {
const error = makeAxiosError(502, 'Bad Gateway 网关错误')
assert.equal(extractErrorMessage(error), 'Bad Gateway 网关错误')
assert.equal(extractErrorMessage(error), 'Bad Gateway 网关错误', '带中文的响应体照原样透出')
})
test('test_extract_fallback_message', () => {
const error = makeAxiosError(500, {})
assert.equal(extractErrorMessage(error), 'Request failed with status code 500')
assert.equal(extractErrorMessage(error), '请求失败',
'axios 自带的英文原文不许给用户看,回退到中文默认句')
})
test('test_extract_english_payload_is_replaced_by_chinese', () => {
const cases = [
makeAxiosError(400, { error: 'Similar ASIN result rows are empty' }),
makeAxiosError(500, { message: 'transient storage is not configured' }),
makeAxiosError(500, 'Internal Server Error'),
]
for (const error of cases) {
const shown = extractErrorMessage(error)
assert.ok(!/^[A-Za-z]/.test(shown), '英文提示语不该出现在界面上: ' + shown)
assert.ok(/[一-鿿]/.test(shown), '兜底必须是中文: ' + shown)
}
})
test('test_extract_axios_non_error', () => {
@@ -0,0 +1,139 @@
import { test } from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync, readdirSync } from 'node:fs'
import { fileURLToPath } from 'node:url'
import { resolve, dirname, join } from 'node:path'
import { userNotice } from '../src/shared/utils/user-notice.ts'
/**
* 全项目中文文案尺子(用户端):界面拿到的提示语必须是中文。
*
* 起因是 2026-10-09 那张货源查询截图,卡片上出现
* `Similar ASIN result rows are empty; please retry result generation`——那不是写错的文案,
* 而是后端把底层异常原文存进了 error_message,前端不加转换地渲染。后端逐条翻译追不上新增,
* 所以这条规矩做进界面出口:`userNotice()` 只放行含中文的串,英文一律换成中文兜底句,原文进 console。
*
* 三把尺子:① 行为钉子;② 任务卡 `错误:${...}` 与 payload 展示必须走 userNotice;
* ③ http.ts 的每条返回路径都要过闸。分母硬钉,防止扫描器失明后"零违规"是假的。
*/
const here = dirname(fileURLToPath(import.meta.url))
const SRC = resolve(here, '../src')
function sourceFiles(dir: string): string[] {
const out: string[] = []
for (const entry of readdirSync(dir, { withFileTypes: true })) {
if (entry.name === 'node_modules' || entry.name === 'dist') continue
const full = join(dir, entry.name)
if (entry.isDirectory()) {
out.push(...sourceFiles(full))
} else if (entry.name.endsWith('.vue') || entry.name.endsWith('.ts')) {
out.push(full)
}
}
return out
}
const CALL = /(ElMessage\.(?:error|warning)\(|showStatus\()/
const ARG = /^((?:res|result|payload|data|resp|response)\??\.(?:error|message))/
function read(path: string): string {
return readFileSync(path, 'utf-8')
}
test('userNotice 放行中文、替换英文、空串交回调用方默认句', () => {
assert.equal(userNotice('这份文件没有解析到可导出的行'), '这份文件没有解析到可导出的行')
assert.equal(userNotice('Similar ASIN result rows are empty'), '操作未能完成,请稍后重试')
assert.equal(userNotice('network timeout', '任务没能跑完,请稍后重试'), '任务没能跑完,请稍后重试')
assert.equal(userNotice(' ', '没填'), '没填')
assert.equal(userNotice(null, '没填'), '没填')
// 全角标点不算中文,否则 ":()" 这类残句会被当成可读文案透出
assert.equal(userNotice(':()', '兜底'), '兜底')
})
test('中文主干后面的英文尾巴只进 console,不上界面', () => {
// 后端历史写法:new BusinessException("转换结果打包失败: " + ex.getMessage())
assert.equal(userNotice('转换结果打包失败: No space left on device'), '转换结果打包失败')
assert.equal(userNotice('生成跟价 Excel 失败:Cannot parse column'), '生成跟价 Excel 失败')
// 带中文尾巴的要留着,那是给用户看的证据
assert.equal(userNotice('仅完成 102/112 行,其余 10 行未采到数据(未检测)'),
'仅完成 102/112 行,其余 10 行未采到数据(未检测)')
assert.equal(userNotice('Coze 工作流已结束,状态 FAILED'), 'Coze 工作流已结束,状态 FAILED')
})
test('任务卡与看板上的错误行一律经 userNotice 把关', () => {
const FIELDISH = /(error|Error|message|Message)/
const INTERP = /\$\{([^{}]+)\}|\{\{\s*([^{}]+?)\s*\}\}/g
const offenders: string[] = []
let sites = 0
for (const file of sourceFiles(SRC)) {
const rel = file.slice(SRC.length + 1).replace(/\\/g, '/')
const lines = read(file).split(/\r?\n/)
for (const line of lines) {
if (!line.includes('错误')) continue
for (const m of line.matchAll(INTERP)) {
const expr = m[1] ?? m[2] ?? ''
if (!FIELDISH.test(expr)) continue
sites++
if (!expr.includes('userNotice(')) {
offenders.push(`${rel}: ${line.trim().slice(0, 120)}`)
}
}
}
}
assert.ok(sites >= 15, `只扫到 ${sites} 处错误行插值(下限 15)——扫描器或目录树坏了,此刻的"零违规"不作数`)
assert.deepEqual(offenders, [], '这些错误行把后端原文直接拼进了界面')
})
/** 一行 payload 错误展示 → { 是否算一处出口, 是否已把关 };判据与自证共用同一个函数。 */
function payloadDisplay(line: string): { site: boolean; guarded: boolean } {
const m = line.match(CALL)
if (!m || m.index === undefined) return { site: false, guarded: true }
const raw = line.slice(m.index + m[0].length)
const guarded = raw.startsWith('userNotice(')
const rest = guarded ? raw.slice('userNotice('.length) : raw
return { site: ARG.test(rest), guarded }
}
test('payload 上的 error/message 展示一律经 userNotice 把关', () => {
const offenders: string[] = []
let sites = 0
for (const file of sourceFiles(SRC)) {
const rel = file.slice(SRC.length + 1).replace(/\\/g, '/')
for (const line of read(file).split(/\r?\n/)) {
if (!CALL.test(line)) continue
const found = payloadDisplay(line)
if (!found.site) continue
sites++
if (!found.guarded) {
offenders.push(`${rel}: ${line.trim().slice(0, 120)}`)
}
}
}
assert.ok(sites >= 20, `只扫到 ${sites} 处 payload 错误展示(下限 20)——分母缩水说明抽取器失明`)
assert.deepEqual(offenders, [], '这些提示语把响应体原文交给了界面')
})
test('http.ts 的每条取文案路径都过闸', () => {
const http = read(resolve(SRC, 'shared/api/http.ts'))
const guarded = (http.match(/userNotice\(/g) ?? []).length
assert.ok(guarded >= 5, `http.ts 里只有 ${guarded} 处 userNotice 把关(下限 5)——兜底路径漏了`)
// 反向钉:extractErrorMessage 不许再裸返回响应体字段或 axios 原文
const body = http.slice(http.indexOf('export function extractErrorMessage'), http.indexOf('/** 从 axios 错误对象里取响应体'))
assert.ok(!/\breturn data\b/.test(body), '响应体字符串不该原样透出')
assert.ok(!/return error\.message \|\|/.test(body), 'axios 英文原文不该原样透出')
})
test('判据抓得住自己造的违例', () => {
const planted = ' ...(item.error ? [`错误:${item.error}`] : []),'
assert.ok(planted.includes('错误'), '样本行该带错误标记')
assert.ok(/\$\{item\.error\}/.test(planted) && !planted.includes('userNotice('), '违例样本必须被判成未把关')
const guardedLine = ' ...(item.error ? [`错误:${userNotice(item.error)}`] : []),'
assert.ok(guardedLine.includes('userNotice('), '把关写法不能被误判成违例')
// payload 抽取器:摘壳前后都要认得出是一处出口,否则分母会静默缩水成 0
assert.deepEqual(payloadDisplay(' ElMessage.error(result.error)'), { site: true, guarded: false })
assert.deepEqual(payloadDisplay(' ElMessage.error(userNotice(result.error))'), { site: true, guarded: true })
// 常量文案不是这型出口,不计进分母
assert.deepEqual(payloadDisplay(' ElMessage.error(\'请先登录\')'), { site: false, guarded: false })
})