diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue index 9742af22d..d746ddcab 100644 --- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue @@ -135,7 +135,13 @@ import { checkParseResult, checkQueuePayload } from '@/shared/dispatch-guard' import { passGuard } from '@/shared/dispatch-guard-ui' import { formatDateTime } from '@/shared/utils/datetime' import { resultBuildFailed, taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' -import { ensureBrandCheckProxy, getStoredApiSecret } from '@/shared/utils/api-secret-store' +import { + ensureBrandCheckProxy, + getApiSecretGateState, + getStoredApiSecret, + getStoredApiSecretSnapshot, + listApiSecretModules, +} from '@/shared/utils/api-secret-store' // ---- 文件选择 / 上传(公共组合式函数)---- const { @@ -536,15 +542,42 @@ async function ensureBrandCheckProxyReady(): Promise { return false } +/** 模块名取服务端下发的 label,前端不再另起一份叫法;默认清单里必有本模块,兜底句只为满足类型。 */ +function llmKeyModuleLabel(): string { + return listApiSecretModules().find((info) => info.moduleKey === 'appearance-patent')?.moduleLabel || '对应模块密钥' +} + +/** + * 创建任务前确认这个模块的 LLM 密钥已配置:服务端建单口(UserApiSecretService#requireSubmitSecret) + * 也会拒,但那时 Excel 已上传、单已建一半,用户白等一趟,所以把同一句话提到提交前说。 + * 门禁状态 unknown(从未成功拉到服务端数据)不拦——网络抖动不等于未配置,与 ensureBrandCheckProxy 同口径。 + */ +async function ensureLlmApiKeyReady(): Promise { + if (getApiSecretGateState() === 'unknown') return true + const snapshot = getStoredApiSecretSnapshot('appearance-patent') + // exists + 检测通过才算配好;error(上游无法判定)按放行,与 computeApiSecretsComplete 同一判据 + const configured = (snapshot.exists && (snapshot.checkStatus === 'passed' || snapshot.checkStatus === 'error')) + || Boolean(effectiveLlmApiKey()) + if (configured) return true + await ElMessageBox.alert( + `该账号还没有配置${llmKeyModuleLabel()}:这一单要用它跑 LLM 检测,` + + '缺了只会得到一张没有检测结论的结果表。请先在「密钥设置」里填好并保存。', + '未配置密钥,无法创建任务', + { type: 'warning', confirmButtonText: '知道了' }, + ).then( + // 关闭弹窗会以 reject 收尾,属正常交互而不是错误,不新增 catch 块 + () => undefined, + () => undefined, + ) + return false +} + async function parseFiles() { if (!uploadedFiles.value.length) { ElMessage.warning('请先选择 Excel') return } - if (!effectiveLlmApiKey()) { - // 本地无明文不再阻断:密钥已服务端化,任务执行按用户 uid 兜底读取 - console.log('[appearance-patent] 本地无密钥明文,提交时由服务端按用户密钥兜底') - } + if (!(await ensureLlmApiKeyReady())) return parsing.value = true try { if (!(await ensureBrandCheckProxyReady())) { diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue index 89e3133b3..ba8e5be3c 100644 --- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue @@ -132,7 +132,7 @@