Compare commits
224 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ed644384cc | |||
| ee613db05b | |||
| dc3e7f3b37 | |||
| db71803430 | |||
| 848fef3b03 | |||
| 5c7a310ee7 | |||
| 764eeb2914 | |||
| 0f8b37e279 | |||
| 71b19e4f69 | |||
| aff6c88a7d | |||
| 3279b779e6 | |||
| 9d7da26c26 | |||
| 47fc0e0850 | |||
| cac5b8ae7d | |||
| 7067d5380d | |||
| 61ab844e5d | |||
| e621deea58 | |||
| 61c361222d | |||
| 8413cd335e | |||
| 5aab38cfa9 | |||
| 8c81546aa7 | |||
| 79eb7a7f16 | |||
| a5e390750b | |||
| c9ecae6e6d | |||
| 7b853a605e | |||
| 3bccc97698 | |||
| 9b6f00a2dc | |||
| 301e3c5ecb | |||
| d680a0beca | |||
| 2a4598216a | |||
| dca5d6f554 | |||
| 3cbaf06583 | |||
| 562e81df81 | |||
| 9e3f28079b | |||
| 8b4f7a3a6b | |||
| 9f869b2e81 | |||
| 46a334004a | |||
| ee3ff6fe8c | |||
| 4506253989 | |||
| 6818f9777b | |||
| d0aa93759d | |||
| e175e85973 | |||
| 91cf5dfaf7 | |||
| b9b66bcb0b | |||
| 84a4bc38b5 | |||
| dea9891e19 | |||
| 7a117187b7 | |||
| 5d5330d0c9 | |||
| 700e7c8518 | |||
| 1c3395869e | |||
| ab6e49b5e2 | |||
| 9c8926068d | |||
| edc1772683 | |||
| 45d0989ada | |||
| 55f4f17480 | |||
| 85f8ebc3c7 | |||
| 402447af70 | |||
| 8d8c88a5f3 | |||
| 47278ee425 | |||
| 36e110d27c | |||
| 05e5c35539 | |||
| 796ec2130f | |||
| edeffc26c4 | |||
| ff859d25bc | |||
| 6ce995f19e | |||
| 53e176ba7c | |||
| a429191edd | |||
| 334ed2cadd | |||
| 10d73994f5 | |||
| 64e94458c9 | |||
| f5f40cd2ea | |||
| ad33b7d54c | |||
| a940cd227f | |||
| 4d008608b1 | |||
| f7b206474d | |||
| faa08a6138 | |||
| 5390503f7a | |||
| ef78608a64 | |||
| a17d8edc9e | |||
| 691b29da7e | |||
| 7a69210967 | |||
| c00f8c6e1c | |||
| bfd8ceac52 | |||
| 3dec8d41ed | |||
| e1767faff5 | |||
| 2a2e276c32 | |||
| 3cfca462ce | |||
| f218766a55 | |||
| a5bd4011e2 | |||
| 6f85f17c58 | |||
| 9b4404d027 | |||
| cec863af89 | |||
| bd0c0a0810 | |||
| 7ce6ff64cc | |||
| 9acb221152 | |||
| 264db52b84 | |||
| 83f1ecf952 | |||
| 0512359b21 | |||
| 434e4bf037 | |||
| a94e59d434 | |||
| 7c7712e7f3 | |||
| b36c52e4d0 | |||
| 6919108043 | |||
| 61ec324b2f | |||
| 48b961f0b2 | |||
| 89a69d651e | |||
| 62e92003f2 | |||
| c461210b12 | |||
| cc22600a07 | |||
| a10aa6bda3 | |||
| eeff73d322 | |||
| 609ad396a6 | |||
| b231a67dd7 | |||
| 56b916f2fe | |||
| b321ea6f45 | |||
| 847f8a224a | |||
| 09a34a2856 | |||
| 00f45cc20f | |||
| e71fa7fa83 | |||
| c8cd75cf6c | |||
| fee4df5bf6 | |||
| b9d23d5936 | |||
| 51401de2d5 | |||
| 34f730d403 | |||
| 66621d8a16 | |||
| 43240b9a10 | |||
| 6444c17edc | |||
| a04c1f3cf6 | |||
| 13fd426133 | |||
| f43ed6f116 | |||
| 37f51df37d | |||
| 0114a5b7a7 | |||
| e26a157037 | |||
| 2cbd99ed4f | |||
| 7e64c12dd6 | |||
| 7f5437d012 | |||
| 8f206a6019 | |||
| 96b090dfd5 | |||
| 0a467793ac | |||
| 0dfd385c4c | |||
| 35ce0f0f40 | |||
| 6a9dc34713 | |||
| 3f827cc9af | |||
| faae355bcf | |||
| 91d36327f9 | |||
| a4e4456b50 | |||
| 1c179e0f2e | |||
| 7469c710d7 | |||
| 7459177bb4 | |||
| 2c2cb23943 | |||
| b13d795731 | |||
| 6fe5c8c8d0 | |||
| 5c283a79fc | |||
| ffb043c24f | |||
| d2cc7b1299 | |||
| c7b035dce9 | |||
| 1c0cc350be | |||
| 43ae12f722 | |||
| 79b04afdd9 | |||
| 457af3607f | |||
| eaab173ae9 | |||
| 4d38781005 | |||
| 39c01ada44 | |||
| 8b7d5d4a40 | |||
| 217f5eec62 | |||
| ef0bc51fa2 | |||
| 0586df2df0 | |||
| 62a1b50067 | |||
| c4fc9784e8 | |||
| 0e2af88184 | |||
| b3d90d2161 | |||
| 632efa6a8e | |||
| 46774fffed | |||
| 9df044621f | |||
| 437d75db52 | |||
| 88d737a7f0 | |||
| e08b5369d7 | |||
| 07f973d9df | |||
| f3445c21c8 | |||
| e0abd33ed4 | |||
| b8abdc1eec | |||
| 915a573439 | |||
| 2163c6b585 | |||
| 9e5529ef59 | |||
| a3f765c458 | |||
| 1d4b4decf3 | |||
| b963561043 | |||
| b5e4c45add | |||
| 688910f738 | |||
| 8323245567 | |||
| 9b2469ec33 | |||
| 23c1402a75 | |||
| e265c188f7 | |||
| fcb6b5f545 | |||
| 583dad92ec | |||
| 5928072c6a | |||
| 1dd9e66d21 | |||
| c2f429f112 | |||
| 112c61afa8 | |||
| 813bed66a3 | |||
| 445a7dfbd5 | |||
| 37919ae786 | |||
| 987b967237 | |||
| 8881f63839 | |||
| f93e7d95fc | |||
| bb4cf3cdd2 | |||
| 969f86c612 | |||
| a7682bffef | |||
| 54460bfbf2 | |||
| eb46a5abc7 | |||
| dff0658b32 | |||
| bc818eb3ea | |||
| 5f1dc3ac23 | |||
| ccb30aa99e | |||
| 5547237950 | |||
| 1743666334 | |||
| ba20f5ed42 | |||
| b94555f411 | |||
| 9c4905c94e | |||
| 052f2bd4a5 | |||
| 68ec48b573 | |||
| 4a97725e2a | |||
| 634fefbc2f | |||
| 314c283503 |
@@ -14,6 +14,8 @@ backend-java/target/
|
||||
backend-java/data/
|
||||
backend-java/*.log
|
||||
backend-java/logs/
|
||||
# 会话级诊断脚本残渣(2026-11-03 瘦身审计 BD-8:_diag_keyword_sync.py 有误提交风险)
|
||||
backend-java/tmp/
|
||||
backend-java/src/main/resources/application-local.yml
|
||||
backend-java/.idea/
|
||||
backend-java/*.iml
|
||||
|
||||
@@ -499,6 +499,32 @@ const server = createServer((req, res) => {
|
||||
},
|
||||
})
|
||||
}
|
||||
if (url === '/api/admin/user-secrets/balances') {
|
||||
// 余额侧写夹具(POST):两把密钥同渠道 ⇒ 界面折叠成一行;代理给「你的套餐」形状
|
||||
const llmCell = (moduleKey, moduleLabel, over = {}) => ({
|
||||
moduleKey, moduleLabel,
|
||||
channel: 'longtaitou', channelLabel: '龙抬头',
|
||||
available: true, balance: '88.888882', availableBalance: '85.288882', frozen: '3.6',
|
||||
unit: 'CREDIT', message: null, checkedAt: '2026-11-05T10:30:00', ...over,
|
||||
})
|
||||
return json(res, {
|
||||
success: true,
|
||||
data: {
|
||||
items: [
|
||||
{
|
||||
userId: 1,
|
||||
llm: [
|
||||
llmCell('appearance-patent', '外观专利密钥'),
|
||||
llmCell('similar-asin', '货源查询密钥'),
|
||||
],
|
||||
proxy: { available: true, surplus: '1234', balance: '56', scope: 'user', message: null },
|
||||
},
|
||||
],
|
||||
deniedUserIds: [],
|
||||
timedOutUserIds: [],
|
||||
},
|
||||
})
|
||||
}
|
||||
if (url === '/api/admin/shop-manage-groups') {
|
||||
return json(res, { success: true, data: { items: [] } })
|
||||
}
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<script setup lang="ts">
|
||||
import { RouterView } from 'vue-router'
|
||||
import zhCn from 'element-plus/es/locale/lang/zh-cn'
|
||||
import { useGlobalErrorReporting } from '@/shared/api/error-report'
|
||||
|
||||
// 浏览器级错误兜底接线(S1-F2/AC-16):脚本级崩溃与没人接的 Promise 都进同一条上报路,
|
||||
// 卸载出口由该 composable 的 onBeforeUnmount 摘掉——根组件不卸载时它就是应用级单例。
|
||||
useGlobalErrorReporting()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
@@ -0,0 +1,211 @@
|
||||
import { http, unwrap } from '@/api/http'
|
||||
|
||||
/**
|
||||
* 大档分片阈值与片大小(AC-11):后管这一侧只有这一个出口,阈值由片大小派生。
|
||||
*
|
||||
* ⚠ 同族的 8MB 数还另有两处:用户端上传出口一处、桌面客户端分片入口一处。两边是各自
|
||||
* 独立的构建根(各自的 `@` 别名与 tsconfig include),客户端是 Python 打包物 ⇒
|
||||
* 没有共享包就合不成同一个字面量(P3-5 的边界,已登记)。
|
||||
*/
|
||||
export const CHUNK_UPLOAD_PART_SIZE = 8 * 1024 * 1024
|
||||
export const CHUNK_UPLOAD_THRESHOLD = CHUNK_UPLOAD_PART_SIZE
|
||||
|
||||
/** 每片重试次数(不含首次):单片 502/超时不该让 512MB 从 0 再来。 */
|
||||
const PART_RETRY_LIMIT = 2
|
||||
|
||||
/**
|
||||
* 逐片超时(P2-8):预算只看**这一片**有多大——60s 保底 + 每 MB 30s(8MB 片=300s)。
|
||||
* 过去按整包体积算(120s + MB×15s),512MB 包里的一个 8MB 片能拿到 128 分钟,
|
||||
* 慢链路真卡死时没人知道,进度条还会一直爬。
|
||||
*/
|
||||
export function partTimeoutOf(partBytes: number): number {
|
||||
return 60_000 + Math.ceil(partBytes / (1024 * 1024)) * 30_000
|
||||
}
|
||||
|
||||
/** 会话登记/查询只发元数据,固定预算即可;失败要快快回来,别陪整包一起放大。 */
|
||||
const REQUEST_TIMEOUT_MS = 60_000
|
||||
/** 只有拼装这一步真随整包体积走:服务端要读全部分片、复算 sha256。 */
|
||||
const COMPLETE_TIMEOUT_MS = 600_000
|
||||
|
||||
function partUrl(uploadId: string, index: number): string {
|
||||
return `/api/files/chunk/${encodeURIComponent(uploadId)}/part/${index}`
|
||||
}
|
||||
|
||||
/** 分片会话跨尝试/刷新续用:同一文件身份复用 upload_id,服务端没回收就从已达片号继续(P2-7)。 */
|
||||
interface StoredChunkSession {
|
||||
uploadId: string;
|
||||
size: number;
|
||||
lastModified: number;
|
||||
}
|
||||
|
||||
const CHUNK_SESSION_PREFIX = 'shufu:admin:chunk:'
|
||||
|
||||
function lastModifiedOf(file: Blob): number {
|
||||
const value = (file as File).lastModified
|
||||
return typeof value === 'number' && Number.isFinite(value) ? value : 0
|
||||
}
|
||||
|
||||
/** 会话键:文件名+体积+修改时间,三者同一条上传才算同一个件。 */
|
||||
export function chunkSessionKeyOf(fileName: string, file: Blob): string {
|
||||
return `${CHUNK_SESSION_PREFIX}${fileName}:${file.size}:${lastModifiedOf(file)}`
|
||||
}
|
||||
|
||||
function readStoredSession(key: string, file: Blob): string {
|
||||
if (typeof localStorage === 'undefined') return ''
|
||||
try {
|
||||
const raw = localStorage.getItem(key)
|
||||
if (!raw) return ''
|
||||
const parsed = JSON.parse(raw) as StoredChunkSession
|
||||
return parsed.size === file.size && parsed.lastModified === lastModifiedOf(file) ? parsed.uploadId : ''
|
||||
} catch {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
|
||||
function writeStoredSession(key: string, file: Blob, uploadId: string): void {
|
||||
if (typeof localStorage === 'undefined') return
|
||||
try {
|
||||
localStorage.setItem(key, JSON.stringify({
|
||||
uploadId, size: file.size, lastModified: lastModifiedOf(file),
|
||||
} satisfies StoredChunkSession))
|
||||
} catch {
|
||||
// 存储不可用(隐私模式/配额满)只影响跨刷新续传,不影响本次上传
|
||||
}
|
||||
}
|
||||
|
||||
function clearStoredSession(key: string): void {
|
||||
if (typeof localStorage === 'undefined') return
|
||||
try {
|
||||
localStorage.removeItem(key)
|
||||
} catch {
|
||||
// 同上:清不掉只会让下次多问一次 status
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 服务端对「这个会话还在不在」的三种答复:还在(附带已到片号)/确实没了/问不出来。
|
||||
* 第三态是 P2-7 与 P1-11 的共同判据——过去它被当成"没会话",瞬态抖动=整包作废。
|
||||
*/
|
||||
type ProbeOutcome
|
||||
= { state: 'ok'; parts: number[] }
|
||||
| { state: 'gone' }
|
||||
| { state: 'transient' }
|
||||
|
||||
/** 后端回收会话的原文案(ChunkedUploadService.readMeta);BusinessException 不带 code ⇒ HTTP 200 出。 */
|
||||
function messageSaysSessionGone(text: unknown): boolean {
|
||||
const message = typeof text === 'string' ? text : ''
|
||||
return ['不存在', '过期'].some((marker) => message.includes(marker))
|
||||
}
|
||||
|
||||
function classifyProbe(response: unknown): ProbeOutcome {
|
||||
const status = Number((response as { status?: unknown } | null | undefined)?.status)
|
||||
if (status === 404) return { state: 'gone' }
|
||||
if (status >= 500 || status === 408 || status === 429) return { state: 'transient' }
|
||||
const body = (response as { data?: unknown } | null | undefined)?.data
|
||||
if (body && typeof body === 'object' && (body as { success?: unknown }).success === false) {
|
||||
return messageSaysSessionGone((body as { message?: unknown }).message)
|
||||
? { state: 'gone' }
|
||||
: { state: 'transient' }
|
||||
}
|
||||
const core = (unwrap<Record<string, unknown>>(body) ?? {}) as Record<string, unknown>
|
||||
const arrived = core.uploaded_parts
|
||||
return { state: 'ok', parts: Array.isArray(arrived) ? arrived.map((value) => Number(value)) : [] }
|
||||
}
|
||||
|
||||
/**
|
||||
* 探测已达片号(P2-7/与用户端 upload.ts 同一口径)。
|
||||
* validateStatus 恒真:状态码要自己判——真 404/5xx 一旦被拦截器折成 Error 就分不出原因了;
|
||||
* 能走到 catch 的就只剩网络层失败与超时,铁定瞬态。
|
||||
*/
|
||||
async function probeUploadedParts(uploadId: string): Promise<ProbeOutcome> {
|
||||
try {
|
||||
const response = await http.get(
|
||||
`/api/files/chunk/${encodeURIComponent(uploadId)}`,
|
||||
{ validateStatus: () => true },
|
||||
)
|
||||
return classifyProbe(response)
|
||||
} catch (error) {
|
||||
const status = (error as { response?: { status?: unknown } } | null | undefined)?.response?.status
|
||||
if (status === 404) return { state: 'gone' }
|
||||
if (messageSaysSessionGone((error as { message?: unknown } | null | undefined)?.message)) {
|
||||
return { state: 'gone' }
|
||||
}
|
||||
return { state: 'transient' }
|
||||
}
|
||||
}
|
||||
|
||||
/** 后管大档上传(版本包/教程包共用):会话续用 → GET 已达片号 → 逐片 POST → complete。 */
|
||||
export async function uploadFileInChunks(
|
||||
file: Blob,
|
||||
fileName: string,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<Record<string, unknown>> {
|
||||
const totalParts = Math.max(1, Math.ceil(file.size / CHUNK_UPLOAD_PART_SIZE))
|
||||
const sessionKey = chunkSessionKeyOf(fileName, file)
|
||||
let uploadId = readStoredSession(sessionKey, file)
|
||||
const arrived = new Set<number>()
|
||||
if (uploadId) {
|
||||
const probed = await probeUploadedParts(uploadId)
|
||||
if (probed.state === 'gone') {
|
||||
// 服务端确实说会话没了(404/「不存在或已过期」):清掉重开,否则这个件每次都在同一个死会话上失败。
|
||||
clearStoredSession(sessionKey)
|
||||
uploadId = ''
|
||||
} else if (probed.state === 'ok') {
|
||||
probed.parts.forEach((index) => arrived.add(index))
|
||||
}
|
||||
// transient:片号未知但会话还在 ⇒ 照原会话逐片重传(后端同片覆盖,幂等),不重开 init。
|
||||
}
|
||||
if (!uploadId) {
|
||||
const initResponse = await http.post('/api/files/chunk/init', null, {
|
||||
params: { fileName, totalParts, totalBytes: file.size },
|
||||
timeout: REQUEST_TIMEOUT_MS,
|
||||
})
|
||||
const init = (unwrap(initResponse.data) ?? {}) as Record<string, unknown>
|
||||
uploadId = String(init.upload_id ?? '')
|
||||
if (!uploadId) {
|
||||
throw new Error('后端未返回分片会话,请重试')
|
||||
}
|
||||
writeStoredSession(sessionKey, file, uploadId)
|
||||
}
|
||||
|
||||
for (let index = 0; index < totalParts; index += 1) {
|
||||
if (arrived.has(index)) {
|
||||
continue
|
||||
}
|
||||
const blob = file.slice(index * CHUNK_UPLOAD_PART_SIZE,
|
||||
Math.min(file.size, (index + 1) * CHUNK_UPLOAD_PART_SIZE))
|
||||
let lastError: unknown = null
|
||||
for (let attempt = 0; attempt <= PART_RETRY_LIMIT; attempt += 1) {
|
||||
const form = new FormData()
|
||||
form.append('file', blob, `part-${index}`)
|
||||
try {
|
||||
const partResponse = await http.post(partUrl(uploadId, index), form, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
timeout: partTimeoutOf(blob.size),
|
||||
onUploadProgress: (event) => {
|
||||
if (!onProgress) return
|
||||
const perPart = Math.round(((index + (event.loaded || 0) / Math.max(blob.size, 1)) / totalParts) * 100)
|
||||
onProgress(Math.min(perPart, 99))
|
||||
},
|
||||
})
|
||||
unwrap(partResponse.data)
|
||||
arrived.add(index)
|
||||
lastError = null
|
||||
break
|
||||
} catch (error) {
|
||||
lastError = error
|
||||
}
|
||||
}
|
||||
if (lastError) {
|
||||
// 不 DELETE(P2-7):会话连同已达片号留在服务端(后端 24h 过期回收兜底),
|
||||
// 下一次点开同一个文件就从断点接着传——这才是"续传"两个字的本义。
|
||||
throw lastError instanceof Error ? lastError : new Error('分片上传失败')
|
||||
}
|
||||
}
|
||||
|
||||
const completeResponse = await http.post(
|
||||
`/api/files/chunk/${encodeURIComponent(uploadId)}/complete`, null, { timeout: COMPLETE_TIMEOUT_MS })
|
||||
clearStoredSession(sessionKey)
|
||||
if (onProgress) onProgress(100)
|
||||
return (unwrap(completeResponse.data) ?? {}) as Record<string, unknown>
|
||||
}
|
||||
@@ -15,6 +15,8 @@ export interface CompanyItem {
|
||||
remark: string | null
|
||||
createdAt: string | null
|
||||
updatedAt: string | null
|
||||
/** 所属平台(V206):'amazon'|'jd';后端恒带值(列 NOT NULL DEFAULT 'amazon'),旧负载缺省不渲染。 */
|
||||
platform?: string
|
||||
}
|
||||
|
||||
/** 新建/改名的表单草稿。 */
|
||||
@@ -22,6 +24,8 @@ export interface CompanyDraft {
|
||||
companyName: string
|
||||
status?: number
|
||||
remark?: string | null
|
||||
/** 所属平台(V206):新建必带(页面从平台 tab 取),编辑显式下发,缺省后端不动。 */
|
||||
platform?: string
|
||||
}
|
||||
|
||||
export function text(value: unknown): string {
|
||||
@@ -48,5 +52,6 @@ export function toCompanyPayload(draft: CompanyDraft): Record<string, unknown> {
|
||||
const payload: Record<string, unknown> = { companyName: text(draft.companyName).trim() }
|
||||
if (typeof draft.status === 'number') payload.status = draft.status
|
||||
payload.remark = trimmedOrNull(draft.remark)
|
||||
if (draft.platform) payload.platform = draft.platform
|
||||
return payload
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ export function toCompanyItem(raw: unknown): CompanyItem | null {
|
||||
const r = raw as Record<string, unknown>
|
||||
const id = numberOrNull(r.id)
|
||||
if (id === null) return null
|
||||
return {
|
||||
const item: CompanyItem = {
|
||||
id,
|
||||
companyName: text(r.company_name),
|
||||
// status 列 NOT NULL,取不到就是链路异常;未知一律按停用,不把异常状态当启用。
|
||||
@@ -27,6 +27,10 @@ export function toCompanyItem(raw: unknown): CompanyItem | null {
|
||||
createdAt: trimmedOrNull(r.created_at),
|
||||
updatedAt: trimmedOrNull(r.updated_at),
|
||||
}
|
||||
// platform 后端恒带(列 NOT NULL);旧负载/测试桩缺省就不渲染该键,字段形状与 users-model 一致。
|
||||
const platform = text(r.platform)
|
||||
if (platform) item.platform = platform
|
||||
return item
|
||||
}
|
||||
|
||||
/** 解析 GET /api/admin/companies:接受 data 为数组或 {items:[...]},success=false 抛后端文案。 */
|
||||
|
||||
@@ -4,8 +4,10 @@ import { toCompanyPayload, type CompanyDraft, type CompanyItem } from './compani
|
||||
|
||||
/** 公司目录(设计文档 §2.3)。GET 的可见范围由后端收窄:超管全部、公司内 admin 只自己公司。 */
|
||||
|
||||
export async function fetchCompanies(): Promise<CompanyItem[]> {
|
||||
const { data } = await http.get('/api/admin/companies')
|
||||
export async function fetchCompanies(platform?: string): Promise<CompanyItem[]> {
|
||||
const { data } = await http.get('/api/admin/companies', {
|
||||
params: platform ? { platform } : {},
|
||||
})
|
||||
return parseCompanyList(data)
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,20 @@ import { unwrap } from './envelope'
|
||||
export interface AdminUserSecretModule {
|
||||
moduleKey: string
|
||||
moduleLabel: string
|
||||
/**
|
||||
* 货源:按模块分域,后端 `UserSecretModule.channelOrDefault` 已归一——
|
||||
* LLM 行为渠道(longtaitou/t8star),代理行为供应商(qingguo/jikip)。
|
||||
* ⚠ 界面不得用一张合表渲染这两域(代理行贴出「龙抬头」就是这么来的),
|
||||
* 走 `user-secret-model.ts` 的 `moduleSourceLabel`。
|
||||
*/
|
||||
channel?: string | null
|
||||
/** 脱敏值:代理列为 `scheme://host`,不含提取链接里的 key/pwd。 */
|
||||
masked: string
|
||||
/** 完整明文值:仅代理列有值(后端对密钥列不下发明文)。 */
|
||||
/**
|
||||
* 完整明文值:后台侧**恒为空**(2026-11-02 `SecretMasking.maskProxy` 收口,代理链接里带着账密)。
|
||||
* 字段保留只为接口兼容;界面**不得**读它、更不得拿它做"masked 空就回落原文"的兜底,
|
||||
* 也不许有任何复制/导出整条链接的旁路。
|
||||
*/
|
||||
full: string
|
||||
exists: boolean
|
||||
/** 是否由后台代填并锁定:锁定时客户端不可修改或清空。 */
|
||||
@@ -51,6 +63,53 @@ export interface GroupOption {
|
||||
groupName: string
|
||||
}
|
||||
|
||||
/**
|
||||
* LLM 一格的余额(**人民币口径**,后端取龙抬头 `credits` 块)。
|
||||
* 与 `AdminProxyBalanceCell` 是两套语义:这里的 `balance` 是钱、单位 CREDIT(=⚡=人民币),
|
||||
* 代理那边的 `surplus` 是「次」。界面不得用一张函数渲染两域(同 `channel` 那张表的教训)。
|
||||
*/
|
||||
export interface AdminLlmBalanceCell {
|
||||
moduleKey: string
|
||||
moduleLabel: string
|
||||
channel: string
|
||||
channelLabel: string
|
||||
available: boolean
|
||||
/** 上游原样小数串(未取整);available=false 时为 null。 */
|
||||
balance: string | null
|
||||
availableBalance: string | null
|
||||
frozen: string | null
|
||||
/** 恒为 CREDIT;不是这个值就按「认不出口径」处理,不猜。 */
|
||||
unit: string | null
|
||||
message: string | null
|
||||
checkedAt: string | null
|
||||
}
|
||||
|
||||
/** 代理余量一格:jikip 套餐口径(`surplus`=IP 次数、`scope`=谁的池子)。青果为 scope=none。 */
|
||||
export interface AdminProxyBalanceCell {
|
||||
available: boolean
|
||||
surplus: string | null
|
||||
balance: string | null
|
||||
/** user=该用户自己的套餐;platform=平台池子(不是这个用户的钱);none=查不了。 */
|
||||
scope: string | null
|
||||
message: string | null
|
||||
low?: boolean
|
||||
lowReason?: string | null
|
||||
}
|
||||
|
||||
export interface AdminUserSecretBalanceItem {
|
||||
userId: number
|
||||
llm: AdminLlmBalanceCell[]
|
||||
proxy: AdminProxyBalanceCell
|
||||
}
|
||||
|
||||
export interface AdminUserSecretBalances {
|
||||
items: AdminUserSecretBalanceItem[]
|
||||
/** 被数据权限剔出、本次没查的用户(不静默少给数)。 */
|
||||
deniedUserIds?: number[]
|
||||
/** 超出整请求时间预算、这轮没取到数的用户。 */
|
||||
timedOutUserIds?: number[]
|
||||
}
|
||||
|
||||
export interface UserSecretQuery {
|
||||
keyword?: string
|
||||
checkStatus?: string
|
||||
@@ -75,6 +134,23 @@ export async function fetchUserSecretList(params: UserSecretQuery): Promise<Admi
|
||||
return unwrap<AdminUserSecretPage>(data)
|
||||
}
|
||||
|
||||
/**
|
||||
* 刷新本页用户的余额侧写:POST /api/admin/user-secrets/balances。
|
||||
*
|
||||
* 实时打上游、不落库,所以服务端带三条护栏(单次 ≤20 个用户、固定并发、整请求 10s 预算),
|
||||
* 客户端的超时必须**长于**服务端预算,否则服务端还在取数、这边先报错,
|
||||
* 界面就会把「查得慢」显示成「查不到」(与铁律 10「前端超时不得短于服务端预算」同形)。
|
||||
*/
|
||||
export async function fetchAdminSecretBalances(
|
||||
userIds: number[],
|
||||
companyId?: number | null,
|
||||
): Promise<AdminUserSecretBalances> {
|
||||
const body: Record<string, unknown> = { userIds }
|
||||
if (companyId != null) body.company_id = companyId
|
||||
const { data } = await http.post('/api/admin/user-secrets/balances', body, { timeout: 30_000 })
|
||||
return unwrap<AdminUserSecretBalances>(data)
|
||||
}
|
||||
|
||||
/** 立即检测该用户全部已配置项:POST /api/admin/user-secrets/{userId}/check
|
||||
* 逐模块检测(每项最多「首查 + 传输层失败重试一次」,最坏约 31s/项),故放宽超时到 180s。 */
|
||||
export async function checkUserSecret(userId: number) {
|
||||
@@ -98,13 +174,22 @@ export async function deleteUserSecret(userId: number): Promise<void> {
|
||||
unwrap<unknown>(data)
|
||||
}
|
||||
|
||||
/** 代填并锁定该用户某模块配置(当前仅代理):PUT /api/admin/user-secrets/{userId}/modules/{moduleKey} */
|
||||
/**
|
||||
* 代填并锁定该用户某模块配置(当前仅代理):PUT /api/admin/user-secrets/{userId}/modules/{moduleKey}
|
||||
* `value` 是**一次性写载荷**(代理为现拼的提取链接,带着 key/pwd):调用方不得把它渲染回界面、
|
||||
* 不得打进日志;`channel` 是同一单的货源(代理=供应商 key),后端据此选解析分支——
|
||||
* 不给则由后端按链接域名识别,识别不出回落默认供应商,会静默换执行方,所以本面一律显式带上。
|
||||
*/
|
||||
export async function saveUserSecretModule(
|
||||
userId: number,
|
||||
moduleKey: string,
|
||||
value: string,
|
||||
channel?: string,
|
||||
): Promise<AdminUserSecretModule> {
|
||||
const { data } = await http.put(`/api/admin/user-secrets/${userId}/modules/${moduleKey}`, { value })
|
||||
const { data } = await http.put(`/api/admin/user-secrets/${userId}/modules/${moduleKey}`, {
|
||||
value,
|
||||
...(channel ? { channel } : {}),
|
||||
})
|
||||
return unwrap<AdminUserSecretModule>(data)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/** 用户管理列表/分页 DTO(任务 41):纯逻辑,无框架依赖,与 Java AdminUserController 对齐。 */
|
||||
import type { AdminUser } from '../types/admin'
|
||||
import type { PlatformTabId } from '../config/platform-scope.ts'
|
||||
|
||||
export const USER_PAGE_DEFAULT_SIZE = 10
|
||||
export const USER_PAGE_MIN_PAGE = 1
|
||||
@@ -18,6 +19,8 @@ export interface UserListParams {
|
||||
/** 公司 tab 的当前公司;由页面从 store 传入,**不住在 UserFilterState 里**
|
||||
* (normalizeUserPageParams 白名单构造会把它丢掉,取值口只认 fetchUserList 的原始入参)。 */
|
||||
companyId?: number | null
|
||||
/** 平台 tab 的当前平台(V206);同 companyId 形状:白名单构造不收,从原始入参读。 */
|
||||
platform?: PlatformTabId
|
||||
}
|
||||
|
||||
/** 序列化到 GET /api/admin/users 的查询参数(Java snake_case)。 */
|
||||
@@ -30,6 +33,7 @@ export interface UserListQuery {
|
||||
admin_id?: number
|
||||
role?: string
|
||||
company_id?: number
|
||||
platform?: string
|
||||
}
|
||||
|
||||
/** 用户列表项即 AdminUser(与 Java AdminUserItemVo 字段对齐)。 */
|
||||
|
||||
@@ -18,6 +18,10 @@ export function toAdminUserItem(raw: unknown): AdminUser | null {
|
||||
const id = numberOrNull(r.id)
|
||||
if (id === null) return null
|
||||
const item: AdminUser = { id, username: text(r.username), role: text(r.role) }
|
||||
const quota = numberOrNull(r.jd_publish_quota)
|
||||
if (quota !== null) item.jdPublishQuota = quota
|
||||
const platform = text(r.platform)
|
||||
if (platform) item.platform = platform
|
||||
if (typeof r.is_admin === 'boolean') item.isAdmin = r.is_admin
|
||||
const createdById = numberOrNull(r.created_by_id)
|
||||
if (createdById !== null) item.createdById = createdById
|
||||
|
||||
@@ -15,6 +15,8 @@ export async function fetchUserList(params: Partial<UserListParams> = {}): Promi
|
||||
// normalizeUserPageParams 是白名单构造(只点名 page/pageSize/keyword/createdById/adminId/role),
|
||||
// 公司值必须从原始 params 读:写成 normalized.companyId 会 TS 绿、运行时恒 undefined。
|
||||
if (params.companyId != null) query.company_id = params.companyId
|
||||
// 平台值(V206)同 companyId 形状:白名单构造不收,只认原始入参。
|
||||
if (params.platform) query.platform = params.platform
|
||||
const { data } = await http.get('/api/admin/users', { params: query })
|
||||
return parseUserPage(data)
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ export const COMPANY_SCOPED_PAGES: readonly CompanyScopedPage[] = [
|
||||
// 而是「本公司账号名下的店铺」:后端由 DataReadScope 把公司 → 成员账号 → biz_shop_manage.created_by_id 逐级推导,
|
||||
// 前端只负责把 activeId 当 company_id 送下去。
|
||||
{ menuKey: 'admin_shop_data_duplicate_check', apiFiles: ['src/pages/tasks/duplicate-console-api.ts'], pageFiles: ['src/pages/tasks/DuplicateCheckPage.vue'] },
|
||||
// 关键词使用记录(2026-10-25):只读留痕按行 company_id 收窄;超管切 tab 重取,非超管后端强制本公司。
|
||||
{ menuKey: 'admin_keyword_usage', apiFiles: ['src/pages/tasks/keyword-usage-api.ts'], pageFiles: ['src/pages/tasks/KeywordUsagePage.vue'] },
|
||||
{ menuKey: 'admin_shop_data_crawl_tasks', apiFiles: ['src/pages/tasks/shop-data-api.ts'], pageFiles: ['src/pages/tasks/ShopDataTasksPage.vue'] },
|
||||
// 批次 4(控制方 2026-10-05 点名「菜单权限和用户管理也要区分公司 tab 的数据」)。
|
||||
// 这一页的后端早就认 company_id(AdminUserService 只在**站点超管**身上用它筛,公司超管恒锁本公司),
|
||||
@@ -58,4 +60,12 @@ export const COMPANY_SCOPED_PAGES: readonly CompanyScopedPage[] = [
|
||||
// 「无效的菜单权限项」。写侧(编辑/删除/重排)不带参数——归属由那一行的 id 与操作者公司共同判定,
|
||||
// 跨公司写后端 403(见 docs/ops/menu-company-tree-design-2026-10-06.md §5)。
|
||||
{ menuKey: 'admin_columns', apiFiles: ['src/pages/account/menu-manage-api.ts'], pageFiles: ['src/pages/account/MenusPage.vue'] },
|
||||
// 外观专利无侵权数据(2026-11-10 v1.3):出表成功自动同步的只读明细,归属物化在行 company_id 列
|
||||
// (V189,同店铺密钥形状)⇒ 后端正门 readCompanyIdOrOwn(超管显式传才收窄,非超管强制本公司)。
|
||||
{ menuKey: 'admin_appearance_patent_clean_items', apiFiles: ['src/pages/patent/appearance-patent-clean-api.ts'], pageFiles: ['src/pages/patent/AppearancePatentCleanItemsPage.vue'] },
|
||||
// 京东数据库(2026-11-14 v1.4)已于 2026-11-16 退出注册表(用户定案「删除掉公司 tab,参考品牌
|
||||
// 数据库」=品牌库 2026-10-06 先例同形):数据全平台公共(行 company_id 只剩"哪家公司客户端
|
||||
// 同步的"来源标记),摘的不只是 tab——页面/api 的 company_id 发送口与后端读侧 company_id 谓词
|
||||
// (superAdminScopedCompanyId)同窗一起摘。反向钉在 tests/company-tab-wiring.test.ts 的
|
||||
// 「公司维度不得回流」清单里,再加回来必须先推翻这条定案。
|
||||
]
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
/** 平台 tab 口径的唯一清单(2026-11-16 用户定案「亚马逊/京东不混一起」)。
|
||||
* 仿 company-scope.ts 的形状:单独成文件而不是塞进 routes.ts——护栏用例要从这里
|
||||
* 反读清单与注册表对撞,放在一起会成环。 */
|
||||
|
||||
export type PlatformTabId = 'amazon' | 'jd'
|
||||
|
||||
export interface PlatformTabDef {
|
||||
id: PlatformTabId
|
||||
label: string
|
||||
}
|
||||
|
||||
/** 侧边栏顶部平台 tab 的固定顺序:亚马逊在前(存量主体),京东在后。 */
|
||||
export const PLATFORM_TABS: readonly PlatformTabDef[] = [
|
||||
{ id: 'amazon', label: '亚马逊' },
|
||||
{ id: 'jd', label: '京东' },
|
||||
]
|
||||
|
||||
/** 京东侧独占菜单的 menuKey 唯一清单(与 routes.ts 的 menuKey 逐字一致,用例钉住)。
|
||||
* 2026-11-17 晚:分类管理子菜单(admin_jd_category_manage,V204)随「京东分类管理并到
|
||||
* 京东数据库分类编辑里」用户口径整体下线(页/路由/菜单行 V208 删),key 从清单摘除。
|
||||
* 后续京东新页面上线把 key 加进这里即可,清单外的 key(含店铺管理/生成记录等
|
||||
* 存量页)一律归亚马逊或双侧清单。 */
|
||||
export const JD_MENU_KEYS: readonly string[] = [
|
||||
'admin_jd_database',
|
||||
]
|
||||
|
||||
/** 双侧共用菜单(2026-11-17 用户口径「这些亚马逊这边也要有」):三个账号域页面在两个
|
||||
* 平台 tab 下都显示——同一套组件、按当前 tab 给接口传 platform,各自只看/管各自平台的
|
||||
* 账号、分组、公司(后端 V206 三表加列,存量默认亚马逊,京东侧数据在编辑弹窗里翻档)。 */
|
||||
export const BOTH_PLATFORM_MENU_KEYS: readonly string[] = [
|
||||
'admin_users',
|
||||
'admin_group_manage',
|
||||
'admin_companies',
|
||||
]
|
||||
|
||||
/** menuKey → 平台归属清单(唯一判定出口):京东独占 → ['jd'];双侧清单 → ['amazon','jd'];
|
||||
* 其余(未知 key 在内)默认亚马逊。 */
|
||||
export function platformsOfMenuKey(key: string): PlatformTabId[] {
|
||||
if (JD_MENU_KEYS.includes(key)) return ['jd']
|
||||
if (BOTH_PLATFORM_MENU_KEYS.includes(key)) return ['amazon', 'jd']
|
||||
return ['amazon']
|
||||
}
|
||||
@@ -6,6 +6,10 @@ import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { joinAdminPath } from '@/config/app'
|
||||
import { pageTitleOf, topbarUserOf } from '@/layout/topbar-model'
|
||||
import { groupKeysForActive, toSidebarEntries } from '@/layout/menu-mapper'
|
||||
import { filterMenuTreeByPlatform, visiblePlatformsFor } from '@/layout/platform-menu-filter'
|
||||
import { PLATFORM_TABS, platformsOfMenuKey } from '@/config/platform-scope'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import { firstVisiblePath } from '@/router/helpers'
|
||||
import {
|
||||
EMPTY_MENU_DESCRIPTION,
|
||||
EMPTY_MENU_TITLE,
|
||||
@@ -31,7 +35,15 @@ const router = useRouter()
|
||||
const session = useAdminSessionStore()
|
||||
|
||||
const activePath = computed(() => route.path)
|
||||
const menuEntries = computed(() => toSidebarEntries(session.menuTree))
|
||||
const platformTab = usePlatformTabStore()
|
||||
// 平台 tab(亚马逊/京东,2026-11-16「不混」定案)只做显示分组:准入仍是 session.menuTree
|
||||
// (后端按权限裁剪)+路由守卫,这里只把当前用户已被授权的菜单按平台分侧展示。
|
||||
const menuEntries = computed(() =>
|
||||
toSidebarEntries(filterMenuTreeByPlatform(session.menuTree, platformTab.active)),
|
||||
)
|
||||
const visibleTabIds = computed(() => visiblePlatformsFor(session.menuTree))
|
||||
const visibleTabDefs = computed(() => PLATFORM_TABS.filter((tab) => visibleTabIds.value.includes(tab.id)))
|
||||
const showPlatformTabs = computed(() => visibleTabIds.value.length > 1)
|
||||
const openedKeys = computed(() => groupKeysForActive(menuEntries.value, route.path))
|
||||
const emptyMenu = computed(() => shouldShowEmptyMenu(menuEntries.value.length > 0, session.loading, session.initialized))
|
||||
const pageTitle = computed(() => pageTitleOf(route.meta.title))
|
||||
@@ -45,6 +57,34 @@ watch(
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
// 直达 URL/面包屑跳到另一平台的页面时,tab 指示自动跟过去(与侧边栏保持一致)。
|
||||
// 双侧清单里的页面(账号域三页)两个 tab 都算归属:当前 tab 已含它就不动。
|
||||
watch(
|
||||
() => route.meta.menuKey as string | undefined,
|
||||
(menuKey) => {
|
||||
if (!menuKey) return
|
||||
const owners = platformsOfMenuKey(menuKey)
|
||||
if (owners.includes(platformTab.active)) return
|
||||
const target = owners.find((platform) => visibleTabIds.value.includes(platform))
|
||||
if (target && target !== platformTab.active) {
|
||||
platformTab.setActive(target)
|
||||
}
|
||||
},
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
// 切到另一侧 tab 时当前页多半不在那边:跳到该侧第一个可见页;该侧为空(tab 不可见)则不动。
|
||||
// 双侧清单里的页面(账号域三页)切 tab 不跳转——页面自己按当前平台过滤数据。
|
||||
watch(
|
||||
() => platformTab.active,
|
||||
(tab) => {
|
||||
const menuKey = route.meta.menuKey as string | undefined
|
||||
if (!menuKey || platformsOfMenuKey(menuKey).includes(tab)) return
|
||||
const first = firstVisiblePath(filterMenuTreeByPlatform(session.menuTree, tab))
|
||||
if (first) void router.replace(first)
|
||||
},
|
||||
)
|
||||
|
||||
async function signOut() {
|
||||
try {
|
||||
await runLogout({
|
||||
@@ -77,6 +117,19 @@ async function signOut() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<nav v-if="showPlatformTabs" class="admin-platform-tabs" role="tablist" aria-label="按平台切换菜单">
|
||||
<button
|
||||
v-for="tab in visibleTabDefs"
|
||||
:key="tab.id"
|
||||
type="button"
|
||||
role="tab"
|
||||
class="admin-platform-tab"
|
||||
:class="{ 'is-active': tab.id === platformTab.active }"
|
||||
:aria-selected="tab.id === platformTab.active"
|
||||
@click="platformTab.setActive(tab.id)"
|
||||
>{{ tab.label }}</button>
|
||||
</nav>
|
||||
|
||||
<el-scrollbar class="admin-menu-scroll">
|
||||
<el-menu :default-active="activePath" :default-openeds="openedKeys" router class="admin-menu">
|
||||
<template v-for="entry in menuEntries" :key="entry.key">
|
||||
|
||||
@@ -7,17 +7,18 @@ import { useRoute } from 'vue-router'
|
||||
import { COMPANY_STATUS_ACTIVE } from '@/api/companies-dto'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import { companyTabAppliesTo, companyTabInitFailureMessage } from '@/layout/company-tab-model'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
|
||||
const route = useRoute()
|
||||
const tab = useCompanyTabStore()
|
||||
const session = useAdminSessionStore()
|
||||
const platformTab = usePlatformTabStore()
|
||||
const tabs = computed(() => tab.companies.filter((c) => c.status === COMPANY_STATUS_ACTIVE))
|
||||
const show = computed(() => tab.visibleForOperator && companyTabAppliesTo(route.meta.menuKey))
|
||||
|
||||
watch(() => session.isSuperAdmin, (v) => {
|
||||
if (!v) return
|
||||
function ensureLoaded() {
|
||||
// 2026-10-05 修复轮 1:改前这里是 `void tab.initialize()`,store 里也只有 try/finally ⇒
|
||||
// GET /companies 抛错时异常变成 unhandled rejection(全仓 src 无 errorHandler/unhandledrejection 兜底),
|
||||
// 现场只剩"tab 条没画出来",Task 13 人工清单第一项无从判断是权限问题还是接口挂了。
|
||||
@@ -29,7 +30,20 @@ watch(() => session.isSuperAdmin, (v) => {
|
||||
console.warn('[company-tab] 公司目录没取到,tab 条不渲染', error)
|
||||
showAdminFeedback(companyTabInitFailureMessage(error), 'warning')
|
||||
})
|
||||
}
|
||||
|
||||
watch(() => session.isSuperAdmin, (v) => {
|
||||
if (!v) return
|
||||
ensureLoaded()
|
||||
}, { immediate: true })
|
||||
|
||||
// 平台 tab 切换=公司目录换一份(V206 平台分侧;2026-11-17 用户口径「亚马逊侧别再挂京东-团队,
|
||||
// 京东侧同理」):store 按 loadedPlatform 对撞早退,切了台必然重拉。非超管目录恒空不发请求,
|
||||
// 这里同样按超管闸早退。
|
||||
watch(() => platformTab.active, () => {
|
||||
if (!session.isSuperAdmin) return
|
||||
ensureLoaded()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
@@ -68,14 +68,18 @@ export const OPERATION_GUIDES: Record<string, OperationGuideData> = {
|
||||
text: '店铺信息按分组管理。长商城名会自动缩略,悬停即可查看完整内容。',
|
||||
steps: ['选择分组', '维护店铺信息', '筛选核对结果'],
|
||||
},
|
||||
admin_brand_gating: {
|
||||
text: '维护不符合规则的品牌(品牌Gating/类目Gating)。添加后可用筛选快速回查;云端Gating库与前端排查软件同步同一份数据,排查软件命中后会自动在此入库。',
|
||||
steps: ['新增或批量导入', '筛选回查', '停用或删除'],
|
||||
},
|
||||
admin_shop_data_crawl_tasks: {
|
||||
text: '店铺数据任务按状态和时间筛选。批量操作前请核对已选任务。',
|
||||
steps: ['筛选任务', '检查状态', '执行批量操作'],
|
||||
},
|
||||
admin_brand_gating: {
|
||||
text: '维护不符合规则的品牌(品牌Gating / 类目Gating)。新增后可用下方筛选快速回查;云端 Gating 库与前端排查软件同步同一份数据,命中后会自动拦截。',
|
||||
steps: ['新增或批量导入', '筛选回查', '按需解除或删除'],
|
||||
},
|
||||
admin_keyword_usage: {
|
||||
text: '本页记录所有关键词操作,只读、不可删除、永久留痕可追溯;与桌面端互通:桌面复制、添加、删除关键词会自动写入本页,两端同源。',
|
||||
steps: ['选择公司与筛选条件', '切换使用/删除记录', '核对操作人与时间'],
|
||||
},
|
||||
// admin_shop_data_duplicate_check(店铺撞款监控)为例外页:不展示全局提示条,不参与对齐。
|
||||
admin_image_video_tasks: {
|
||||
text: '可先使用筛选缩小任务范围,再查看任务状态、结果和权限范围。',
|
||||
@@ -93,6 +97,10 @@ export const OPERATION_GUIDES: Record<string, OperationGuideData> = {
|
||||
text: '上传新的教程压缩包后即刻生效:工具台首页「立即下载教程」以下载最新上传的包为准。确认旧包不再需要后再删除。',
|
||||
steps: ['上传教程压缩包', '到工具台核对下载', '清理历史包'],
|
||||
},
|
||||
admin_workbench_client_package: {
|
||||
text: '上传新的工作台客户端 ZIP 包后即刻生效;服务端会复算 sha256 供客户端校验。确认旧包不再需要后再删除。',
|
||||
steps: ['填写版本号并上传 ZIP', '核对版本与 sha256', '清理历史包'],
|
||||
},
|
||||
digital_human_version: {
|
||||
text: '数字人版本需先上传草稿,再发布并标记最新版本。',
|
||||
steps: ['上传草稿', '确认更新日志', '发布或设为最新'],
|
||||
@@ -109,6 +117,16 @@ export const OPERATION_GUIDES: Record<string, OperationGuideData> = {
|
||||
text: '按账号、业务、状态、店铺和创建时间筛出客户端任务,点任务查看明细与分组结果;顶部汇总卡给当前在跑与疑似卡住的总量。',
|
||||
steps: ['按条件筛任务', '查看任务明细', '核对汇总卡'],
|
||||
},
|
||||
admin_appearance_patent_clean_items: {
|
||||
text: '本页只读:出表成功后「结论=无侵权」的明细自动同步到这里,按分公司隔离分页展示;支持任务号/ASIN/国家/同步日期筛选,下载原表请到任务中心取结果文件。',
|
||||
steps: ['筛选记录', '核对结论明细', '到任务中心下载原表'],
|
||||
},
|
||||
admin_jd_database: {
|
||||
// 2026-11-17 分类管理子菜单并入本页(用户口径「京东分类管理并到京东数据库分类编辑里」,
|
||||
// 原 admin_jd_category_manage 条目随之摘除):分类建/改名/删在工具栏「分类管理」。
|
||||
text: '本页只读:客户端采集的京东店铺商品自动同步到这里(同店铺同商品只保留最新一次),按分公司隔离分页展示;点行查看全部属性与图片;分类的新建/改名/删除在工具栏「分类管理」,给商品归类先勾选再「批量编辑分类」。',
|
||||
steps: ['筛选商品记录', '查看属性与图片明细', '用「分类管理」维护分类并批量归类'],
|
||||
},
|
||||
}
|
||||
|
||||
/** 全部有独立/兜底提示的后台业务菜单 key。 */
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
import type { AdminMenuNode } from '../types/admin'
|
||||
import { PLATFORM_TABS, platformsOfMenuKey } from '../config/platform-scope.ts'
|
||||
import type { PlatformTabId } from '../config/platform-scope.ts'
|
||||
import { firstVisiblePath } from '../router/helpers.ts'
|
||||
|
||||
/**
|
||||
* 按平台 tab 过滤后端菜单树(2026-11-16「亚马逊/京东不混」):**只做显示分组,不做鉴权**——
|
||||
* 准入仍由 session.menuTree(后端按权限裁剪)与路由守卫负责,这里只是把当前用户已被授权的
|
||||
* 菜单按平台分到两个 tab 下展示。
|
||||
* 规则:叶子按 platformsOfMenuKey(key) 是否包含当前平台留下(双侧清单里的账号域三页两个
|
||||
* tab 都显示);分组节点(admin_group_*)自身的 key 不参与平台判定,按「留住的子项数 > 0」
|
||||
* 决定去留——否则京东 tab 下「账号与权限」这类混合分组会被整组误剪。节点的 key/name/
|
||||
* route/children 形状原样透传(浅拷贝不改写),toSidebarEntries、groupKeysForActive 与
|
||||
* 面包屑都不受影响。
|
||||
*/
|
||||
export function filterMenuTreeByPlatform(
|
||||
nodes: AdminMenuNode[] | null | undefined,
|
||||
platform: PlatformTabId,
|
||||
): AdminMenuNode[] {
|
||||
const filtered: AdminMenuNode[] = []
|
||||
for (const node of nodes || []) {
|
||||
const children = filterMenuTreeByPlatform(node.children, platform)
|
||||
if (children.length > 0) {
|
||||
filtered.push({ ...node, children })
|
||||
continue
|
||||
}
|
||||
if ((node.children || []).length > 0) continue
|
||||
if (platformsOfMenuKey(node.key || '').includes(platform)) filtered.push({ ...node })
|
||||
}
|
||||
return filtered
|
||||
}
|
||||
|
||||
/** 当前用户在哪些平台下至少有一个可点页面(tab 显示依据);顺序固定随 PLATFORM_TABS。
|
||||
* 「可点」沿用 firstVisiblePath 这一把尺子(有 route 即可点),不另写第二处判定。 */
|
||||
export function visiblePlatformsFor(nodes: AdminMenuNode[] | null | undefined): PlatformTabId[] {
|
||||
return PLATFORM_TABS
|
||||
.filter((tab) => firstVisiblePath(filterMenuTreeByPlatform(nodes, tab.id)) !== '')
|
||||
.map((tab) => tab.id)
|
||||
}
|
||||
@@ -1,14 +1,36 @@
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import { installElement } from '@/plugins/element'
|
||||
import { reportClientError } from '@/shared/api/error-report'
|
||||
import '@/styles/main.css'
|
||||
import App from './App.vue'
|
||||
import router from './router'
|
||||
|
||||
// 全局错误兜底(S1-F2/AC-16):渲染期异常、未捕获 Promise、脚本级崩溃三类都必须
|
||||
// 可见 + 上报,否则线上白屏只剩浏览器 console,运维永远没有现场。
|
||||
// 出口分两处,各按自己的时机生效:
|
||||
// - Vue 渲染/生命周期异常:挂在这里的 app.config.errorHandler(必须早于 mount,
|
||||
// 首屏就崩也不漏);
|
||||
// - window error 与 unhandledrejection:由 App.vue setup 调 useGlobalErrorReporting()
|
||||
// 接线,卸载出口在 onBeforeUnmount 里摘监听与提示定时器(只定义不接线等于没接)。
|
||||
// 上报本体(内存环 + 脱敏 + sendBeacon)在 @/shared/api/error-report。
|
||||
function installGlobalError(app: ReturnType<typeof createApp>): void {
|
||||
app.config.errorHandler = (error, _instance, info) => {
|
||||
reportClientError({
|
||||
kind: 'vue-render',
|
||||
message: error instanceof Error ? error.message : String(error),
|
||||
stack: error instanceof Error ? error.stack ?? '' : String(error),
|
||||
route: router.currentRoute.value.fullPath,
|
||||
ts: Date.now(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Element Plus 改为按需注册(见 src/plugins/element.ts);全局中文语言包改由
|
||||
// App.vue 的 <el-config-provider :locale="zhCn"> 提供,不要再在这里 use(ElementPlus)。
|
||||
const app = createApp(App)
|
||||
app.use(createPinia())
|
||||
app.use(router)
|
||||
installElement(app)
|
||||
installGlobalError(app)
|
||||
app.mount('#app')
|
||||
|
||||
@@ -2,18 +2,25 @@
|
||||
/** 公司管理(设计文档 §2.3):列表 + 新建 + 改名/启停。
|
||||
* 可见范围由后端收窄(超管全部、公司内 admin 只自己公司);写操作仅超管,这里隐藏入口只是配合,
|
||||
* 真正的把关在 CompanyController,页面不得当作权限边界。 */
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
|
||||
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 { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
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()
|
||||
// 平台 tab(V206):公司列表按当前平台过滤,新建默认落当前平台。
|
||||
const platformTab = usePlatformTabStore()
|
||||
// 公司 tab 条(2026-11-17 起按平台过滤)共用这一份目录:公司翻档/启停后必须强制重拉,
|
||||
// 否则 18 个页面的 tab 条端着旧名单,刚翻去京东的公司还挂在亚马逊侧。
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<CompanyItem[]>([])
|
||||
@@ -38,7 +45,7 @@ async function loadCompanies() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
rows.value = await fetchCompanies()
|
||||
rows.value = await fetchCompanies(platformTab.active)
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '公司列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
@@ -57,6 +64,21 @@ function openEdit(company: CompanyItem) {
|
||||
editorVisible.value = true
|
||||
}
|
||||
|
||||
// 保存成功后:本页列表照常重拉,共享公司目录(tab 条)强制重拉一份。
|
||||
// 重拉失败不弹新提示(§12 第 5 条未批的界面暴露):tab 条保留旧名单,下一次切平台 tab / 重进页面会再试。
|
||||
async function onCompaniesSaved() {
|
||||
await loadCompanies()
|
||||
companyTab.refresh().catch((error: unknown) => {
|
||||
console.warn('[company-tab] 公司保存后目录重拉失败', error)
|
||||
})
|
||||
}
|
||||
|
||||
// 切平台 tab(V206)= 重新取数:公司归属按平台分列,两 tab 各看各的公司。
|
||||
watch(() => platformTab.active, () => {
|
||||
page.value = 1
|
||||
void loadCompanies()
|
||||
})
|
||||
|
||||
onMounted(loadCompanies)
|
||||
</script>
|
||||
|
||||
@@ -127,7 +149,7 @@ onMounted(loadCompanies)
|
||||
/>
|
||||
</section>
|
||||
|
||||
<CompanyEditorDialog v-model="editorVisible" :company="editingCompany" @saved="loadCompanies" />
|
||||
<CompanyEditorDialog v-model="editorVisible" :company="editingCompany" :platform="platformTab.active" @saved="onCompaniesSaved" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, watch } from 'vue'
|
||||
import type { PlatformTabId } from '@/config/platform-scope'
|
||||
import { createCompany, updateCompany } from '@/api/companies'
|
||||
import {
|
||||
COMPANY_NAME_MAX_LENGTH,
|
||||
@@ -12,11 +13,11 @@ import {
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { actionableErrorText } from '@/components/admin-feedback'
|
||||
|
||||
/** 新建/编辑公司(改名 + 启停 + 备注);写操作仅超管可用,权限由后端把关。 */
|
||||
const props = defineProps<{ modelValue: boolean; company: CompanyItem | null }>()
|
||||
/** 新建/编辑公司(改名 + 启停 + 备注 + 所属平台 V206);写操作仅超管可用,权限由后端把关。 */
|
||||
const props = defineProps<{ modelValue: boolean; company: CompanyItem | null; platform?: PlatformTabId }>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'saved'): void }>()
|
||||
|
||||
const form = ref<CompanyDraft>({ companyName: '', status: COMPANY_STATUS_ACTIVE, remark: '' })
|
||||
const form = ref<CompanyDraft>({ companyName: '', status: COMPANY_STATUS_ACTIVE, remark: '', platform: 'amazon' })
|
||||
const errorText = ref('')
|
||||
const busy = ref(false)
|
||||
|
||||
@@ -25,8 +26,13 @@ watch(
|
||||
(open) => {
|
||||
if (!open) return
|
||||
form.value = props.company
|
||||
? { companyName: props.company.companyName, status: props.company.status, remark: props.company.remark || '' }
|
||||
: { companyName: '', status: COMPANY_STATUS_ACTIVE, remark: '' }
|
||||
? {
|
||||
companyName: props.company.companyName,
|
||||
status: props.company.status,
|
||||
remark: props.company.remark || '',
|
||||
platform: props.company.platform === 'jd' ? 'jd' : 'amazon',
|
||||
}
|
||||
: { companyName: '', status: COMPANY_STATUS_ACTIVE, remark: '', platform: props.platform ?? 'amazon' }
|
||||
errorText.value = ''
|
||||
},
|
||||
)
|
||||
@@ -71,6 +77,12 @@ async function save() {
|
||||
placeholder="请输入公司名称(全平台唯一)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="form.platform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="form.status" style="width: 100%">
|
||||
<el-option :value="COMPANY_STATUS_ACTIVE" label="启用" />
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import type { PlatformTabId } from '@/config/platform-scope'
|
||||
import { submitCreateUser } from './user-create-adapter'
|
||||
import {
|
||||
createEmptyCreateUserForm,
|
||||
@@ -28,6 +29,8 @@ const props = defineProps<{
|
||||
operatorCompanyId?: number | null
|
||||
/** 当前公司 tab:这次建号落在哪家,就决定能建哪些角色。 */
|
||||
activeCompanyId?: number | null
|
||||
/** 当前平台 tab(V206):新号默认落当前平台,单选可改。 */
|
||||
platform?: PlatformTabId
|
||||
}>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'created'): void }>()
|
||||
|
||||
@@ -71,6 +74,8 @@ watch(
|
||||
form.expiresAt = ''
|
||||
// 预填当前 tab:跨公司时角色本来就只剩公司超管,而那一例必须带公司
|
||||
form.companyId = props.activeCompanyId ?? null
|
||||
// 预填当前平台 tab(V206):京东侧建的号默认归京东,亚马逊侧默认亚马逊。
|
||||
form.platform = props.platform ?? 'amazon'
|
||||
errors.username = undefined
|
||||
errors.password = undefined
|
||||
errors.companyId = undefined
|
||||
@@ -131,6 +136,12 @@ async function create(): Promise<void> {
|
||||
<el-option v-for="opt in roleChoices" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="form.platform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="operatorSuper && form.role === 'company_super_admin'"
|
||||
label="所属公司"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import type { AdminUser } from '@/types/admin'
|
||||
import type { PlatformTabId } from '@/config/platform-scope'
|
||||
import { mayCarryOwnExpiry } from './user-create-model'
|
||||
import { fillEditUserForm, validateEditUserForm, type EditUserForm, type EditUserFormErrors } from './user-edit-model'
|
||||
import { submitEditUser } from './user-edit-adapter'
|
||||
@@ -10,11 +11,12 @@ import { actionableErrorText } from '@/components/admin-feedback'
|
||||
import UserMenuAuthTree from './UserMenuAuthTree.vue'
|
||||
|
||||
/** companyId 由 UsersPage 把 companyTab.requestCompanyId 透传进来(本页的用户列表本来就由它筛 ⇒ 目标账号的公司
|
||||
* 就是 tab 选中的那家);弹窗自己不读 store,公司 tab 的取值口只留在页面组件那一处。 */
|
||||
const props = defineProps<{ modelValue: boolean; user: AdminUser | null; operatorSuper?: boolean; companyId?: number | null }>()
|
||||
* 就是 tab 选中的那家);弹窗自己不读 store,公司 tab 的取值口只留在页面组件那一处。
|
||||
* platform(V206)同理由页面透传:决定上架上限是否参与校验/下发(仅京东侧)。 */
|
||||
const props = defineProps<{ modelValue: boolean; user: AdminUser | null; operatorSuper?: boolean; companyId?: number | null; platform?: PlatformTabId }>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'updated'): void }>()
|
||||
|
||||
const form = reactive<EditUserForm>({ uid: 0, username: '', password: '', role: 'normal', columnIds: [], originalRole: '', expiresAt: '' })
|
||||
const form = reactive<EditUserForm>({ uid: 0, username: '', password: '', role: 'normal', columnIds: [], originalRole: '', expiresAt: '', jdPublishQuota: 5000, platform: 'amazon' })
|
||||
const errors = reactive<EditUserFormErrors>({})
|
||||
const busy = ref(false)
|
||||
const loadingAuth = ref(false)
|
||||
@@ -22,6 +24,9 @@ const loadingAuth = ref(false)
|
||||
const authReady = ref(false)
|
||||
/** 公司超管目标:角色单选隐藏(请求体也不带 role),只允许改密码/到期时间/菜单。 */
|
||||
const targetIsCompanySuperAdmin = computed(() => (props.user?.role || '').trim().toLowerCase() === 'company_super_admin')
|
||||
/** 上架上限只属京东口径(用户 2026-11-17:「只要在京东这边用户编辑里加就行,不需要在亚马逊那边」):
|
||||
* 亚马逊侧隐藏该项,且校验与下发都不带 quota——字段留后端不动。 */
|
||||
const includeQuota = computed(() => props.platform === 'jd')
|
||||
/** 公司超管目标的角色单选是隐藏的(改完仍是 company_super_admin),到期时间照旧可改;
|
||||
* 管理员改成普通账号时这一项消失,保存按「清空」下发(见 user-edit-model 的 roleAfter)。 */
|
||||
const expiryEditable = computed(() =>
|
||||
@@ -40,6 +45,9 @@ watch(
|
||||
form.columnIds = []
|
||||
form.originalRole = base.originalRole
|
||||
form.expiresAt = base.expiresAt
|
||||
form.jdPublishQuota = base.jdPublishQuota
|
||||
form.platform = base.platform
|
||||
errors.jdPublishQuota = undefined
|
||||
errors.password = undefined
|
||||
authReady.value = false
|
||||
void refreshAuth()
|
||||
@@ -71,12 +79,12 @@ async function save(): Promise<void> {
|
||||
showAdminFeedback('菜单权限尚未加载完成,请稍后重试', 'error')
|
||||
return
|
||||
}
|
||||
const { valid, errors: errs } = validateEditUserForm(form)
|
||||
const { valid, errors: errs } = validateEditUserForm(form, { includeQuota: includeQuota.value })
|
||||
Object.assign(errors, errs)
|
||||
if (!valid) return
|
||||
busy.value = true
|
||||
try {
|
||||
await submitEditUser(form)
|
||||
await submitEditUser(form, { includeQuota: includeQuota.value })
|
||||
showAdminFeedback('更新成功', 'success')
|
||||
emit('updated')
|
||||
close()
|
||||
@@ -120,6 +128,12 @@ async function save(): Promise<void> {
|
||||
<el-form-item v-if="targetIsCompanySuperAdmin" label="角色">
|
||||
<el-input model-value="公司超级管理员" readonly />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="form.platform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="expiryEditable" label="到期时间(清空 = 永不过期;到期后该账号及其名下账号将停用)">
|
||||
<el-date-picker
|
||||
v-model="form.expiresAt"
|
||||
@@ -130,6 +144,9 @@ async function save(): Promise<void> {
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="includeQuota && (targetIsCompanySuperAdmin || form.role === 'admin')" label="京东上架额度(0 表示不限)" :error="errors.jdPublishQuota">
|
||||
<el-input-number v-model="form.jdPublishQuota" :min="0" :max="2147483647" :precision="0" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="props.user && props.user.creatorUsername" label="所属管理员">
|
||||
<el-input :model-value="props.user.creatorUsername" readonly />
|
||||
</el-form-item>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import type { AdminUser } from '@/types/admin'
|
||||
import type { PlatformTabId } from '@/config/platform-scope'
|
||||
import {
|
||||
eligibleGroupMembers,
|
||||
groupMemberCandidateHint,
|
||||
@@ -13,11 +14,13 @@ import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { actionableErrorText } from '@/components/admin-feedback'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
|
||||
const props = defineProps<{ modelValue: boolean; group: ShopGroupItem | null; operatorSuper?: boolean }>()
|
||||
const props = defineProps<{ modelValue: boolean; group: ShopGroupItem | null; operatorSuper?: boolean; platform?: PlatformTabId }>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'saved'): void }>()
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const groupName = ref('')
|
||||
/** 所属平台(V206):新建默认当前平台 tab,编辑回填分组原值,单选可翻档。 */
|
||||
const groupPlatform = ref<PlatformTabId>('amazon')
|
||||
const memberIds = ref<number[]>([])
|
||||
const errorText = ref('')
|
||||
const busy = ref(false)
|
||||
@@ -48,6 +51,9 @@ watch(
|
||||
if (props.group) {
|
||||
groupName.value = props.group.name
|
||||
memberIds.value = props.group.memberUserIds ?? []
|
||||
groupPlatform.value = props.group.platform === 'jd' ? 'jd' : 'amazon'
|
||||
} else {
|
||||
groupPlatform.value = props.platform ?? 'amazon'
|
||||
}
|
||||
},
|
||||
)
|
||||
@@ -76,7 +82,7 @@ async function save(): Promise<void> {
|
||||
busy.value = true
|
||||
try {
|
||||
if (props.group) {
|
||||
await updateShopGroup(props.group.id, groupName.value, memberIds.value)
|
||||
await updateShopGroup(props.group.id, groupName.value, memberIds.value, groupPlatform.value)
|
||||
showAdminFeedback('更新成功', 'success')
|
||||
} else {
|
||||
// 对齐 admin:组长恒为当前登录用户,提交 createdBy=当前用户 id。
|
||||
@@ -85,7 +91,7 @@ async function save(): Promise<void> {
|
||||
showAdminFeedback('无法获取当前登录用户,请重新登录', 'error')
|
||||
return
|
||||
}
|
||||
await createShopGroup(groupName.value, memberIds.value, operatorId)
|
||||
await createShopGroup(groupName.value, memberIds.value, operatorId, groupPlatform.value)
|
||||
showAdminFeedback('创建成功', 'success')
|
||||
}
|
||||
emit('saved')
|
||||
@@ -113,6 +119,12 @@ onMounted(loadCandidates)
|
||||
<el-form-item label="分组名称" :error="errorText || undefined">
|
||||
<el-input v-model="groupName" placeholder="请输入分组名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="groupPlatform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="组长">
|
||||
<el-input :model-value="leaderUsername" readonly placeholder="当前登录用户" />
|
||||
</el-form-item>
|
||||
|
||||
@@ -6,6 +6,7 @@ import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { deleteShopGroup, fetchShopGroups } from './shop-group-api'
|
||||
import type { ShopGroupItem } from './shop-group-model'
|
||||
@@ -16,6 +17,8 @@ import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
// 平台 tab(V206):分组列表按当前平台过滤,新建默认落当前平台。
|
||||
const platformTab = usePlatformTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<ShopGroupItem[]>([])
|
||||
@@ -52,7 +55,7 @@ async function loadGroups() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
rows.value = await fetchShopGroups(companyTab.requestCompanyId)
|
||||
rows.value = await fetchShopGroups(companyTab.requestCompanyId, platformTab.active)
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '数据权限分组加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
@@ -64,6 +67,12 @@ async function loadGroups() {
|
||||
// 切公司 = 重新取数(G1 的 pageFiles 断言盯着这一条)。
|
||||
watch(() => companyTab.activeId, () => void loadGroups())
|
||||
|
||||
// 切平台 tab(V206)= 重新取数:分组归属按平台分列,两 tab 各看各的分组。
|
||||
watch(() => platformTab.active, () => {
|
||||
page.value = 1
|
||||
void loadGroups()
|
||||
})
|
||||
|
||||
function openCreate() {
|
||||
editingGroup.value = null
|
||||
editorVisible.value = true
|
||||
@@ -164,6 +173,7 @@ onMounted(loadGroups)
|
||||
v-model="editorVisible"
|
||||
:group="editingGroup"
|
||||
:operator-super="isSuperAdmin"
|
||||
:platform="platformTab.active"
|
||||
@saved="loadGroups"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,248 @@
|
||||
<script setup lang="ts">
|
||||
import { reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { saveUserSecretModule } from '@/api/user-secrets'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { actionableErrorText } from '@/components/admin-feedback'
|
||||
import {
|
||||
PROXY_MODULE_KEY,
|
||||
buildProxyEntryPayload,
|
||||
emptyProxyEntryDraft,
|
||||
validateProxyEntry,
|
||||
type ProxyEntryDraft,
|
||||
} from './user-secret-model.ts'
|
||||
|
||||
/**
|
||||
* 后台代填/改代理(2026-11-02 脱敏后重做的交互)。
|
||||
*
|
||||
* 旧交互是 `window.prompt` 预填 `row.proxy.full` 整条提取链接——后端把这条读路套上
|
||||
* `SecretMasking.maskProxy` 之后 `full` 恒空,预填必然是空的,照旧保存等于把空串顶上去、
|
||||
* 或让管理员去别处翻原文。现在收**账密**、链接在本机现拼现发:
|
||||
* - 青果:填 Authkey + Authpwd,`composeQingguoLink` 拼(青果产品页没有可复制的链接);
|
||||
* - 极客:填极客自己的提取链接(它有可复制的链接)。
|
||||
* 拼好的链接是一次性写载荷,只进 PUT 请求体:不回显、不回填、不进 tooltip、不给复制/导出旁路;
|
||||
* 保存成功即清空输入位,重开必然要从头再填(这是脱敏的应然后果,界面直接把它说出来)。
|
||||
*/
|
||||
const props = defineProps<{
|
||||
modelValue: boolean
|
||||
userId: number | null
|
||||
username: string
|
||||
/** 后端已登记的供应商(只是预选中的单选框,不是凭据)。 */
|
||||
provider?: string | null
|
||||
locked?: boolean
|
||||
}>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'saved'): void }>()
|
||||
|
||||
const draft = reactive<ProxyEntryDraft>(emptyProxyEntryDraft())
|
||||
const errorText = ref('')
|
||||
const busy = ref(false)
|
||||
|
||||
function resetDraft() {
|
||||
Object.assign(draft, emptyProxyEntryDraft(props.provider))
|
||||
errorText.value = ''
|
||||
}
|
||||
|
||||
// 开与关都重刷:关的时候把已经打进内存的账密/链接抹掉,不留到下一次。
|
||||
watch(() => props.modelValue, resetDraft)
|
||||
|
||||
function close() {
|
||||
emit('update:modelValue', false)
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (props.userId == null) return
|
||||
errorText.value = validateProxyEntry(draft)
|
||||
if (errorText.value) return
|
||||
const payload = buildProxyEntryPayload(draft)
|
||||
if (!payload) {
|
||||
errorText.value = '代理配置不完整,请重新填写'
|
||||
return
|
||||
}
|
||||
busy.value = true
|
||||
try {
|
||||
await saveUserSecretModule(props.userId, PROXY_MODULE_KEY, payload.value, payload.channel)
|
||||
showAdminFeedback(props.locked ? '已更新锁定代理' : '已代填并锁定代理', 'success')
|
||||
emit('saved')
|
||||
close()
|
||||
} catch (error) {
|
||||
// 文案以接口返回的 message 为准,前端不解释后端状态码
|
||||
errorText.value = actionableErrorText(error)
|
||||
showAdminFeedback(errorText.value, 'error')
|
||||
} finally {
|
||||
busy.value = false
|
||||
Object.assign(draft, { authkey: '', authpwd: '', link: '' })
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="modelValue" class="modal-mask" @click.self="close">
|
||||
<div class="modal" role="dialog" aria-modal="true" aria-labelledby="proxy-entry-title">
|
||||
<h3 id="proxy-entry-title">{{ locked ? '改代理' : '代填代理' }}</h3>
|
||||
<p class="modal-note">
|
||||
为「{{ username || '该用户' }}」写入代理。出于凭据保护,后台不再下发已存的提取链接原文,
|
||||
这里每次都重新填写;保存后界面只显示脱敏后的地址(不含 key/pwd)。
|
||||
</p>
|
||||
|
||||
<div class="form-group">
|
||||
<label>代理供应商</label>
|
||||
<div class="radio-row">
|
||||
<label class="radio-item">
|
||||
<input v-model="draft.provider" type="radio" value="qingguo" />
|
||||
<span>青果</span>
|
||||
</label>
|
||||
<label class="radio-item">
|
||||
<input v-model="draft.provider" type="radio" value="jikip" />
|
||||
<span>极客</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="draft.provider === 'qingguo'">
|
||||
<div class="form-group">
|
||||
<label>Authkey</label>
|
||||
<input v-model="draft.authkey" type="text" autocomplete="off" placeholder="青果产品页的 Authkey" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Authpwd</label>
|
||||
<input v-model="draft.authpwd" type="password" autocomplete="new-password" placeholder="青果产品页的 Authpwd" />
|
||||
<span class="field-hint">青果只填 Authkey 会被判鉴权拒绝,两把都要填。</span>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="form-group">
|
||||
<label>极客提取链接</label>
|
||||
<input
|
||||
v-model="draft.link"
|
||||
type="password"
|
||||
autocomplete="new-password"
|
||||
placeholder="https://api.jikip.com/ip-get?..."
|
||||
/>
|
||||
<span class="field-hint">极客有可复制的提取链接,整条粘贴进来即可。</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<p v-if="errorText" class="modal-error">{{ errorText }}</p>
|
||||
<div class="modal-actions">
|
||||
<button class="btn" type="button" :disabled="busy" @click="save">
|
||||
{{ busy ? '保存中…' : '保存' }}
|
||||
</button>
|
||||
<button class="btn btn-ghost" type="button" :disabled="busy" @click="close">取消</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 与密钥列表页同一视觉语言(本页不用 el-* 标签:新增 el-* 要同步改按需注册表)。 */
|
||||
.modal-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 3000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 40px 20px;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(6px);
|
||||
}
|
||||
.modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(520px, 100%);
|
||||
max-height: 84vh;
|
||||
padding: 22px 24px;
|
||||
border: 1px solid #c7d7e5;
|
||||
border-radius: 14px;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 22px 60px rgba(39, 67, 94, 0.2);
|
||||
overflow-y: auto;
|
||||
color: #24384d;
|
||||
font-family: inherit;
|
||||
}
|
||||
.modal h3 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
}
|
||||
.modal-note {
|
||||
margin: 0 0 14px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.65;
|
||||
}
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 7px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
.form-group label {
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input[type='text'],
|
||||
.form-group input[type='password'] {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
}
|
||||
.radio-row {
|
||||
display: flex;
|
||||
gap: 18px;
|
||||
}
|
||||
.radio-item {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
font-size: 13.5px;
|
||||
font-weight: 500;
|
||||
color: #24384d;
|
||||
}
|
||||
.field-hint {
|
||||
color: #7d8fa1;
|
||||
font-size: 12px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.modal-error {
|
||||
margin: 0 0 10px;
|
||||
color: #b04a5a;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.modal-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 42px;
|
||||
padding: 9px 18px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.55;
|
||||
}
|
||||
.btn-ghost {
|
||||
background: #ffffff;
|
||||
border-color: #c7d7e5;
|
||||
color: #4f78a5;
|
||||
}
|
||||
</style>
|
||||
@@ -3,16 +3,29 @@ import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import ProxyEntryDialog from './ProxyEntryDialog.vue'
|
||||
import {
|
||||
checkUserSecret,
|
||||
clearUserSecretModule,
|
||||
deleteUserSecret,
|
||||
fetchAdminSecretBalances,
|
||||
fetchUserSecretList,
|
||||
saveUserSecretModule,
|
||||
type AdminUserSecretBalanceItem,
|
||||
type AdminUserSecretModule,
|
||||
type AdminUserSecretRow,
|
||||
type GroupOption,
|
||||
} from '@/api/user-secrets'
|
||||
import {
|
||||
PROXY_MODULE_KEY,
|
||||
llmBalanceLines,
|
||||
llmSourceLabel,
|
||||
moduleStatusBand,
|
||||
proxyBalanceLine,
|
||||
proxyDisplayText,
|
||||
proxySourceLabel,
|
||||
rowDetailLines,
|
||||
rowStatusBand,
|
||||
} from './user-secret-model.ts'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
@@ -37,8 +50,18 @@ const groupFilter = ref<number | null>(null)
|
||||
const groupOptions = ref<GroupOption[]>([])
|
||||
/** 正在检测的行 userId,用于按钮 loading 态。 */
|
||||
const checkingId = ref<number | null>(null)
|
||||
/** 正在代填/解锁代理的行 userId,避免重复点击。 */
|
||||
/** 正在解锁代理的行 userId,避免重复点击(代填在弹窗里自己管 busy)。 */
|
||||
const proxyBusyId = ref<number | null>(null)
|
||||
/** 代填/改代理弹窗的目标行(脱敏后没有原文可预填,只能重填账密)。 */
|
||||
const proxyDialog = ref<{ userId: number; username: string; provider: string | null; locked: boolean } | null>(null)
|
||||
|
||||
/** 余额侧写(实时查上游、不落库):按 userId 存,列表接口本身不带这些数。 */
|
||||
const balances = ref<Record<number, AdminUserSecretBalanceItem>>({})
|
||||
const balanceLoading = ref(false)
|
||||
/** 本轮「没取到」的原因(越权剔除/上游未应答/请求失败):进工具行悬停,不弹全局打扰。 */
|
||||
const balanceNotice = ref('')
|
||||
/** 服务端单次上限 20 个用户;超出会被当场拒,所以这里按批顺取(并发留给服务端那个线程池)。 */
|
||||
const BALANCE_BATCH = 20
|
||||
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
@@ -47,58 +70,44 @@ const STATUS_OPTIONS = [
|
||||
{ value: 'passed', label: '检测通过' },
|
||||
{ value: 'failed', label: '检测失败' },
|
||||
{ value: 'incomplete', label: '未配齐' },
|
||||
{ value: 'error', label: '无法判定' },
|
||||
// 后端的行级值仍是 error:这一档现在既可能是「问不出结论」,也可能是「通道还没释放、等一会再点」,
|
||||
// 界面按码把后者补成「可重试」(见 user-secret-model.ts 的档位表),筛选项就得把两档都点名。
|
||||
{ value: 'error', label: '无法判定/可重试' },
|
||||
{ value: 'unknown', label: '未检测' },
|
||||
]
|
||||
|
||||
/** 行级状态药丸:三类都检测通过才显示「检测通过」。 */
|
||||
function rowStatusMeta(status: string) {
|
||||
switch (status) {
|
||||
case 'passed':
|
||||
return { label: '检测通过', tone: 'is-allowed' }
|
||||
case 'failed':
|
||||
return { label: '检测失败', tone: 'is-blocked' }
|
||||
case 'incomplete':
|
||||
return { label: '未配齐', tone: 'is-warn' }
|
||||
case 'error':
|
||||
return { label: '无法判定', tone: 'is-warn' }
|
||||
default:
|
||||
return { label: '未检测', tone: 'is-unknown' }
|
||||
}
|
||||
}
|
||||
/* 状态药丸的档位表在 `user-secret-model.ts`(唯一出处,页面不带第二张表):
|
||||
行级传整行而不是 `row.status`——后端把 failed/incomplete 都判掉之后就只剩一个「error」,
|
||||
这一行到底是「查不出」还是「等青果释放」只有逐格的 `check_code` 说得清。 */
|
||||
|
||||
/** 单格状态药丸:未配置时统一灰色;欠费单独标识。 */
|
||||
function moduleStatusMeta(module: AdminUserSecretModule | undefined) {
|
||||
if (!module || !module.exists) {
|
||||
return { label: '未配置', tone: 'is-unknown' }
|
||||
}
|
||||
switch (module.checkStatus) {
|
||||
case 'passed':
|
||||
return { label: '通过', tone: 'is-allowed' }
|
||||
case 'failed':
|
||||
if (module.checkCode === 'insufficient_balance') {
|
||||
return { label: '欠费', tone: 'is-warn' }
|
||||
}
|
||||
return { label: '失败', tone: 'is-blocked' }
|
||||
case 'error':
|
||||
return { label: '无法判定', tone: 'is-warn' }
|
||||
default:
|
||||
return { label: '未检测', tone: 'is-unknown' }
|
||||
}
|
||||
}
|
||||
|
||||
/** 单格悬停详情:完整值(代理为全量地址)+ 锁定说明 + 检测消息 + 检测时间 + 耗时。 */
|
||||
/**
|
||||
* 单格悬停详情:后端下发的**脱敏值** + 锁定说明 + **检测结果原文 `check_message`** + 检测时间 + 耗时。
|
||||
* 运维要判「是欠费还是被自己的采集占着」,靠的就是这句后端原文——档名只是扫一眼用的短词,
|
||||
* 前端一律不按码自己拼句子。
|
||||
* ⚠ 只读 `masked`:`full` 在后台侧恒空(2026-11-02 `SecretMasking.maskProxy` 收口),
|
||||
* 这里不做任何「masked 空就回落原文」的兜底,也不给复制整条链接的旁路。
|
||||
*/
|
||||
function moduleTooltip(module: AdminUserSecretModule | undefined) {
|
||||
if (!module || !module.exists) return '未配置'
|
||||
const parts: string[] = []
|
||||
if (module.full) parts.push(module.full)
|
||||
if (module.locked) parts.push('已由后台代填并锁定:客户端不可修改或清空')
|
||||
if (module.checkMessage) parts.push(module.checkMessage)
|
||||
const display = String(module.masked || '').trim()
|
||||
if (display) {
|
||||
parts.push(isProxyModule(module) ? `代理地址(已脱敏,不含 key/pwd):${display}` : `密钥:${display}`)
|
||||
}
|
||||
if (module.locked) parts.push('已由后台代填并锁定:客户端不可修改或清空,改代理需重新填写账密')
|
||||
// 后端的这句话就是给人看的结论,原样透出(不动一个字、不按码另拼一句)
|
||||
const message = String(module.checkMessage || '').trim()
|
||||
if (message) parts.push(message)
|
||||
if (module.checkedAt) parts.push(`检测时间:${formatDateTime(module.checkedAt)}`)
|
||||
if (module.checkLatencyMs != null) parts.push(`耗时:${module.checkLatencyMs}ms`)
|
||||
return parts.join(';') || '暂无检测记录'
|
||||
}
|
||||
|
||||
/** 该格是不是代理模块:按后端下发的 moduleKey 判,货源标签与文案都走这一条口径。 */
|
||||
function isProxyModule(module: AdminUserSecretModule) {
|
||||
return String(module.moduleKey || '').trim().toLowerCase() === PROXY_MODULE_KEY
|
||||
}
|
||||
|
||||
/** 分组列文案:优先分组名;未建分组的用户回退展示所属主管,便于判断归属。 */
|
||||
function groupTextOf(row: AdminUserSecretRow) {
|
||||
if (row.groups?.length) return row.groups.join('、')
|
||||
@@ -106,9 +115,15 @@ function groupTextOf(row: AdminUserSecretRow) {
|
||||
return '—'
|
||||
}
|
||||
|
||||
/**
|
||||
* 行级悬停详情:后端的行级摘要 + 逐格的 `check_message` 原文 + 更新时间。
|
||||
* 行级状态一旦补成「可重试」,管理员得能立刻看出是哪一格在等、后端原话怎么说;
|
||||
* 逐格那句一律取后端下发文本(`rowDetailLines` 只搬运、不改写、不另拼一句)。
|
||||
*/
|
||||
function rowStatusTooltip(row: AdminUserSecretRow) {
|
||||
const parts: string[] = []
|
||||
if (row.statusMessage) parts.push(row.statusMessage)
|
||||
parts.push(...rowDetailLines(row))
|
||||
if (row.updatedAt) parts.push(`最近更新:${formatDateTime(row.updatedAt)}`)
|
||||
return parts.join(';') || '暂无检测记录'
|
||||
}
|
||||
@@ -128,6 +143,7 @@ async function load() {
|
||||
rows.value = result?.items || []
|
||||
total.value = Number(result?.total || 0)
|
||||
groupOptions.value = result?.groupOptions || []
|
||||
void loadBalances()
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
@@ -136,6 +152,57 @@ async function load() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 取本页用户的余额:列表已经画完,这两列随后填(余额要实时打上游,不能让它在列表主数据前占位)。
|
||||
*
|
||||
* 失败只影响这两列并留一句说明——不 `showAdminFeedback`、不把整页判成加载失败:
|
||||
* 一次上游抖动就红整页,管理员会以为密钥数据本身出了问题。
|
||||
*/
|
||||
async function loadBalances() {
|
||||
const ids = rows.value.map((row) => row.userId)
|
||||
balances.value = {}
|
||||
balanceNotice.value = ''
|
||||
if (!ids.length) return
|
||||
balanceLoading.value = true
|
||||
try {
|
||||
const merged: Record<number, AdminUserSecretBalanceItem> = {}
|
||||
let denied = 0
|
||||
let timedOut = 0
|
||||
for (let start = 0; start < ids.length; start += BALANCE_BATCH) {
|
||||
const batch = ids.slice(start, start + BALANCE_BATCH)
|
||||
const result = await fetchAdminSecretBalances(batch, companyTab.requestCompanyId)
|
||||
for (const item of result?.items || []) {
|
||||
if (item && item.userId != null) merged[Number(item.userId)] = item
|
||||
}
|
||||
denied += result?.deniedUserIds?.length || 0
|
||||
timedOut += result?.timedOutUserIds?.length || 0
|
||||
}
|
||||
balances.value = merged
|
||||
const notices: string[] = []
|
||||
if (denied) notices.push(`${denied} 个用户不在当前数据权限内,本轮未查`)
|
||||
if (timedOut) notices.push(`${timedOut} 个用户本轮上游未应答(不是余额为 0)`)
|
||||
balanceNotice.value = notices.join(';')
|
||||
} catch (error) {
|
||||
balanceNotice.value = error instanceof Error ? error.message : '余额本轮没取到(不是余额为 0)'
|
||||
} finally {
|
||||
balanceLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 某行的 LLM 余额行(按渠道折叠);没取到时给一格占位而不是空白。 */
|
||||
function llmLinesOf(userId: number) {
|
||||
const lines = llmBalanceLines(balances.value[userId]?.llm, balanceLoading.value)
|
||||
return lines.length ? lines : [{ text: '—', title: balanceNotice.value || '本轮没取到数(不是余额为 0)' }]
|
||||
}
|
||||
|
||||
function proxyLineOf(userId: number) {
|
||||
const item = balances.value[userId]
|
||||
if (item?.proxy) return proxyBalanceLine(item.proxy, false)
|
||||
return balanceLoading.value
|
||||
? { text: '查询中…', title: '余额按实时查询,不落库' }
|
||||
: { text: '—', title: balanceNotice.value || '本轮没取到数(不是余量为 0)' }
|
||||
}
|
||||
|
||||
// 切公司 = 重新取数。不重取的页 = tab 在那页上是假的(G1 的 pageFiles 断言盯着这条)。
|
||||
watch(() => companyTab.activeId, () => void load())
|
||||
|
||||
@@ -165,7 +232,9 @@ async function check(row: AdminUserSecretRow) {
|
||||
if (failed.length) {
|
||||
ElMessage.warning(failed[0].checkMessage || '存在检测失败项')
|
||||
} else if (errors.length) {
|
||||
ElMessage.warning('部分配置本次无法判定')
|
||||
// 后端这句话会区分「通道被你自己占着,等约 3 分钟」与「真的问不出结论」;
|
||||
// 硬写「无法判定」等于把可重试那一族又抹回一坨(现网 uid=1 就是这个形状)。
|
||||
ElMessage.warning(errors[0].checkMessage || '部分配置本次无法判定')
|
||||
} else {
|
||||
ElMessage.success('检测通过')
|
||||
}
|
||||
@@ -190,38 +259,33 @@ async function remove(row: AdminUserSecretRow) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 代填并锁定代理:写入后客户端只能查看,修改/清空会被服务端拒绝。 */
|
||||
async function fillProxy(row: AdminUserSecretRow) {
|
||||
const who = row.username || `UID ${row.userId}`
|
||||
const value = window.prompt(
|
||||
`代填「${who}」的代理地址(保存后客户端不可修改或清空,如需变更先解锁):`,
|
||||
row.proxy?.full || '',
|
||||
)
|
||||
if (value == null) return
|
||||
const trimmed = value.trim()
|
||||
if (!trimmed) {
|
||||
ElMessage.warning('代理地址不能为空')
|
||||
return
|
||||
}
|
||||
proxyBusyId.value = row.userId
|
||||
try {
|
||||
await saveUserSecretModule(row.userId, 'proxy', trimmed)
|
||||
ElMessage.success(row.proxy?.locked ? '已更新锁定代理' : '已代填并锁定代理')
|
||||
load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '代填失败', 'error')
|
||||
} finally {
|
||||
proxyBusyId.value = null
|
||||
/**
|
||||
* 打开代填/改代理弹窗。
|
||||
* ⚠ 不预填任何已有值:后台侧 `full` 恒空(代理链接里带着 key/pwd,2026-11-02 收口后不再下发),
|
||||
* 所以这一单的语义就是「重新填账密」,界面上也没有把原文取回来的旁路。
|
||||
*/
|
||||
function openProxyDialog(row: AdminUserSecretRow) {
|
||||
proxyDialog.value = {
|
||||
userId: row.userId,
|
||||
username: row.username || `UID ${row.userId}`,
|
||||
provider: row.proxy?.channel ?? null,
|
||||
locked: Boolean(row.proxy?.locked),
|
||||
}
|
||||
}
|
||||
|
||||
/** 弹窗保存成功:关掉并重新取数(列表只拿脱敏值,不参与拼装)。 */
|
||||
function onProxySaved() {
|
||||
proxyDialog.value = null
|
||||
load()
|
||||
}
|
||||
|
||||
/** 解锁代理:清空后台代填值,该用户恢复自行配置。 */
|
||||
async function unlockProxy(row: AdminUserSecretRow) {
|
||||
const who = row.username || `UID ${row.userId}`
|
||||
if (!(await openAdminConfirm({ message: `确定解除「${who}」的代理锁定吗?解锁后当前后台代理值会被清空,客户端恢复自行配置。`, danger: true }))) return
|
||||
proxyBusyId.value = row.userId
|
||||
try {
|
||||
await clearUserSecretModule(row.userId, 'proxy')
|
||||
await clearUserSecretModule(row.userId, PROXY_MODULE_KEY)
|
||||
ElMessage.success('已解锁')
|
||||
load()
|
||||
} catch (error) {
|
||||
@@ -276,6 +340,15 @@ onMounted(load)
|
||||
<div class="filter-actions">
|
||||
<button class="btn" type="button" @click="search">查询</button>
|
||||
<button class="btn btn-ghost" type="button" @click="reset">重置</button>
|
||||
<button
|
||||
class="btn btn-ghost"
|
||||
type="button"
|
||||
:disabled="balanceLoading || !rows.length"
|
||||
:title="balanceNotice || '余额是实时查上游、不落库;这两列没取到时显示 —,不是 0'"
|
||||
@click="loadBalances"
|
||||
>
|
||||
{{ balanceLoading ? '余额查询中…' : '刷新余额' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -290,7 +363,9 @@ onMounted(load)
|
||||
<th v-if="isSuperAdmin" style="width: 130px">分组</th>
|
||||
<th style="width: 230px">货源查询密钥</th>
|
||||
<th style="width: 230px">外观专利密钥</th>
|
||||
<th style="width: 170px">LLM 余额</th>
|
||||
<th style="width: 380px">代理设置</th>
|
||||
<th style="width: 160px">代理余量</th>
|
||||
<th style="width: 130px">状态</th>
|
||||
<th style="width: 170px">创建时间</th>
|
||||
<th style="width: 170px">更新时间</th>
|
||||
@@ -311,8 +386,11 @@ onMounted(load)
|
||||
<div class="module-cell">
|
||||
<span v-if="row.similarAsin?.exists" class="mono-mask" :title="moduleTooltip(row.similarAsin)">{{ row.similarAsin.masked }}</span>
|
||||
<span v-else class="empty-value">未配置</span>
|
||||
<span class="wh-pill" :class="moduleStatusMeta(row.similarAsin).tone" :title="moduleTooltip(row.similarAsin)">
|
||||
{{ moduleStatusMeta(row.similarAsin).label }}
|
||||
<span v-if="row.similarAsin?.exists" class="wh-pill is-source" title="该用户这把密钥所属渠道">
|
||||
{{ llmSourceLabel(row.similarAsin.channel) }}
|
||||
</span>
|
||||
<span class="wh-pill" :class="moduleStatusBand(row.similarAsin).tone" :title="moduleTooltip(row.similarAsin)">
|
||||
{{ moduleStatusBand(row.similarAsin).label }}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
@@ -320,18 +398,34 @@ onMounted(load)
|
||||
<div class="module-cell">
|
||||
<span v-if="row.appearancePatent?.exists" class="mono-mask" :title="moduleTooltip(row.appearancePatent)">{{ row.appearancePatent.masked }}</span>
|
||||
<span v-else class="empty-value">未配置</span>
|
||||
<span class="wh-pill" :class="moduleStatusMeta(row.appearancePatent).tone" :title="moduleTooltip(row.appearancePatent)">
|
||||
{{ moduleStatusMeta(row.appearancePatent).label }}
|
||||
<span v-if="row.appearancePatent?.exists" class="wh-pill is-source" title="该用户这把密钥所属渠道">
|
||||
{{ llmSourceLabel(row.appearancePatent.channel) }}
|
||||
</span>
|
||||
<span class="wh-pill" :class="moduleStatusBand(row.appearancePatent).tone" :title="moduleTooltip(row.appearancePatent)">
|
||||
{{ moduleStatusBand(row.appearancePatent).label }}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="module-cell module-cell--stack">
|
||||
<span v-if="row.proxy?.exists" class="mono-mask mono-full" :title="moduleTooltip(row.proxy)">{{ row.proxy.full || row.proxy.masked }}</span>
|
||||
<span
|
||||
v-for="(line, lineIndex) in llmLinesOf(row.userId)"
|
||||
:key="`llm-${lineIndex}`"
|
||||
class="balance-line"
|
||||
:title="line.title"
|
||||
>{{ line.text }}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="module-cell module-cell--stack">
|
||||
<span v-if="row.proxy?.exists" class="mono-mask" :title="moduleTooltip(row.proxy)">{{ proxyDisplayText(row.proxy) }}</span>
|
||||
<span v-else class="empty-value">未配置</span>
|
||||
<span class="module-cell-pills">
|
||||
<span class="wh-pill" :class="moduleStatusMeta(row.proxy).tone" :title="moduleTooltip(row.proxy)">
|
||||
{{ moduleStatusMeta(row.proxy).label }}
|
||||
<span v-if="row.proxy?.exists" class="wh-pill is-source" title="该用户代理所属供应商">
|
||||
{{ proxySourceLabel(row.proxy.channel) }}
|
||||
</span>
|
||||
<span class="wh-pill" :class="moduleStatusBand(row.proxy).tone" :title="moduleTooltip(row.proxy)">
|
||||
{{ moduleStatusBand(row.proxy).label }}
|
||||
</span>
|
||||
<span
|
||||
v-if="row.proxy?.locked"
|
||||
@@ -344,8 +438,15 @@ onMounted(load)
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<span class="wh-pill" :class="rowStatusMeta(row.status).tone" :title="rowStatusTooltip(row)">
|
||||
{{ rowStatusMeta(row.status).label }}
|
||||
<div class="module-cell module-cell--stack">
|
||||
<span class="balance-line" :title="proxyLineOf(row.userId).title">
|
||||
{{ proxyLineOf(row.userId).text }}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<span class="wh-pill" :class="rowStatusBand(row).tone" :title="rowStatusTooltip(row)">
|
||||
{{ rowStatusBand(row).label }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createdAt) }}</td>
|
||||
@@ -362,8 +463,7 @@ onMounted(load)
|
||||
<button
|
||||
class="btn btn-sm btn-ghost"
|
||||
type="button"
|
||||
:disabled="proxyBusyId === row.userId"
|
||||
@click="fillProxy(row)"
|
||||
@click="openProxyDialog(row)"
|
||||
>
|
||||
{{ row.proxy?.locked ? '改代理' : '代填代理' }}
|
||||
</button>
|
||||
@@ -381,16 +481,26 @@ onMounted(load)
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td :colspan="isSuperAdmin ? 10 : 9" class="empty-tip">加载中...</td>
|
||||
<td :colspan="isSuperAdmin ? 12 : 11" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td :colspan="isSuperAdmin ? 10 : 9" class="empty-tip">{{ keyword || statusFilter || groupFilter ? '暂无匹配记录' : '暂无用户密钥记录' }}</td>
|
||||
<td :colspan="isSuperAdmin ? 12 : 11" class="empty-tip">{{ keyword || statusFilter || groupFilter ? '暂无匹配记录' : '暂无用户密钥记录' }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination :total="total" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeSize" />
|
||||
</section>
|
||||
|
||||
<ProxyEntryDialog
|
||||
:model-value="proxyDialog != null"
|
||||
:user-id="proxyDialog?.userId ?? null"
|
||||
:username="proxyDialog?.username ?? ''"
|
||||
:provider="proxyDialog?.provider ?? null"
|
||||
:locked="Boolean(proxyDialog?.locked)"
|
||||
@update:model-value="(open: boolean) => { if (!open) proxyDialog = null }"
|
||||
@saved="onProxySaved"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -576,7 +686,7 @@ h3 {
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
}
|
||||
/* 代理列:完整地址独占一行,状态药丸另起一行,避免长地址被药丸挤压折行 */
|
||||
/* 代理列:脱敏地址独占一行,状态药丸另起一行(列宽按最长药丸文案留的,不按整条链接) */
|
||||
.module-cell--stack {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
@@ -587,18 +697,9 @@ h3 {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
/* 代理列展示完整明文:允许折行显示,不截断、不省略 */
|
||||
.module-cell .mono-full {
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
overflow: visible;
|
||||
text-overflow: clip;
|
||||
white-space: normal;
|
||||
overflow-wrap: anywhere;
|
||||
line-height: 1.45;
|
||||
cursor: text;
|
||||
user-select: all;
|
||||
}
|
||||
/* 代理列只显示后端脱敏后的 scheme://host(短串,单行足够)。
|
||||
这里**不许**再出现"允许折行展示完整明文 + user-select:all"那套样式:
|
||||
它等于给整条带 key/pwd 的链接做了一键全选复制的旁路(2026-11-02 脱敏收口时一并拆掉)。 */
|
||||
.mono-mask {
|
||||
font-family: Consolas, "Cascadia Mono", monospace;
|
||||
font-size: 12.5px;
|
||||
@@ -607,6 +708,16 @@ h3 {
|
||||
.empty-value {
|
||||
color: #a7b4c1;
|
||||
}
|
||||
/* 余额列:数字按等宽数位对齐(两行叠着看差值才不用竖着对),超长进 title。 */
|
||||
.balance-line {
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-variant-numeric: tabular-nums;
|
||||
font-size: 12.5px;
|
||||
color: #2f4256;
|
||||
}
|
||||
.ops-cell {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
@@ -627,6 +738,12 @@ h3 {
|
||||
cursor: help;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.wh-pill.is-source {
|
||||
background: #eef2fb;
|
||||
border-color: #ccd8f2;
|
||||
color: #3d5a99;
|
||||
font-weight: 600;
|
||||
}
|
||||
.wh-pill.is-allowed {
|
||||
background: #e8f6ee;
|
||||
border-color: #b9e0c9;
|
||||
@@ -642,6 +759,13 @@ h3 {
|
||||
border-color: #f0dfae;
|
||||
color: #8f6d1e;
|
||||
}
|
||||
/* 「等一会再点」这一族(无可用通道/限流/超时/网络/上游):既不红(密钥没坏)
|
||||
也不黄(不是欠费)更不是灰(不是查不出),独立一档青色——三种处置一眼分开。 */
|
||||
.wh-pill.is-retry {
|
||||
background: #e6f2f7;
|
||||
border-color: #b6d8e6;
|
||||
color: #2b6b86;
|
||||
}
|
||||
.wh-pill.is-unknown {
|
||||
background: #f0f3f6;
|
||||
border-color: #d6dee6;
|
||||
|
||||
@@ -8,6 +8,7 @@ import type { AdminUser } from '@/types/admin'
|
||||
import { roleLabel } from '@/types/admin'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import { deleteUser, fetchUserList, setUserDisabled } from '@/api/users'
|
||||
import { fetchCompanies } from '@/api/companies'
|
||||
import { createUserFilterState, toUserListParams, type UserFilterState } from './users-filter'
|
||||
@@ -22,11 +23,18 @@ import EditUserDialog from './EditUserDialog.vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { createLatestRequestGate } from '@/utils/latest-request'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
// 平台 tab(V206):账号域三页两 tab 共用本组件,列表/新建/编辑都按当前平台收放。
|
||||
const platformTab = usePlatformTabStore()
|
||||
/** 京东侧标记:上架上限列与编辑入口只在京东 tab 显示(用户口径「不需要在亚马逊那边」)。 */
|
||||
const isJdSide = computed(() => platformTab.active === 'jd')
|
||||
const loading = ref(false)
|
||||
const loadError = ref('')
|
||||
// 用户列表竞态门(S1-F4):快速切公司/翻页只让最后一次响应落地
|
||||
const gate = createLatestRequestGate()
|
||||
const rows = ref<AdminUser[]>([])
|
||||
const total = ref(0)
|
||||
/** 所属管理员候选(来自列表响应的 admins),供超管筛选下拉使用。 */
|
||||
@@ -62,17 +70,26 @@ function editableOf(row: AdminUser): boolean {
|
||||
return editableBy(row.role, operatorRole.value)
|
||||
}
|
||||
|
||||
/** 列表请求参数 = 用户填的筛选态 + 当前公司。公司值每次现取、不写进 filters:
|
||||
* 它由上方 tab 决定而不是用户填的筛选项,住进 filters 就等于多出第二个取值口径(Store 之外再长一个)。 */
|
||||
/** 上架上限列文案(仅京东侧渲染该列):null=旧数据未配('-'),0=不限,其余为具体条数。 */
|
||||
function quotaCellText(row: AdminUser): string {
|
||||
if (row.jdPublishQuota == null) return '-'
|
||||
return row.jdPublishQuota === 0 ? '不限' : String(row.jdPublishQuota)
|
||||
}
|
||||
|
||||
/** 列表请求参数 = 用户填的筛选态 + 当前公司 + 当前平台。公司/平台值每次现取、不写进 filters:
|
||||
* 它们由上方 tab 决定而不是用户填的筛选项,住进 filters 就等于多出第二个取值口径(Store 之外再长一个)。 */
|
||||
function listParams() {
|
||||
return { ...toUserListParams(filters), companyId: companyTab.requestCompanyId }
|
||||
return { ...toUserListParams(filters), companyId: companyTab.requestCompanyId, platform: platformTab.active }
|
||||
}
|
||||
|
||||
async function loadUsers() {
|
||||
// S1-F4:快速切公司/翻页时旧响应可能后返回并覆盖新结果——回写前必须过竞态门
|
||||
const token = gate.begin()
|
||||
loading.value = true
|
||||
loadError.value = ''
|
||||
try {
|
||||
const page = await fetchUserList(listParams())
|
||||
if (!gate.isCurrent(token)) return
|
||||
rows.value = page.items
|
||||
total.value = page.total
|
||||
if (Array.isArray(page.admins)) admins.value = page.admins
|
||||
@@ -81,14 +98,16 @@ async function loadUsers() {
|
||||
if (last > 0 && filters.page > last) {
|
||||
filters.page = last
|
||||
const retried = await fetchUserList(listParams())
|
||||
if (!gate.isCurrent(token)) return
|
||||
rows.value = retried.items
|
||||
total.value = retried.total
|
||||
}
|
||||
} catch (error) {
|
||||
if (!gate.isCurrent(token)) return
|
||||
loadError.value = error instanceof Error ? error.message : '用户列表加载失败'
|
||||
showAdminFeedback(loadError.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
if (gate.isCurrent(token)) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -163,18 +182,32 @@ function goJump() {
|
||||
// ② 用户名全平台唯一(V143 的唯一索引),留着上一家填的关键字去筛新一家 ⇒ 必然空页,而输入框还显示着那个值。
|
||||
watch(() => companyTab.activeId, () => { filters.createdByAdminId = null; filters.keyword = ''; filters.page = 1; void loadUsers() })
|
||||
|
||||
// 切平台 tab(V206)= 同样的重取数:列表按平台过滤,候选/关键字跨平台无意义,一并清掉;
|
||||
// 建「公司超级管理员」的公司候选也按平台换一份(2026-11-17:京东 tab 下不能还选到亚马逊公司)。
|
||||
watch(() => platformTab.active, () => {
|
||||
filters.createdByAdminId = null
|
||||
filters.keyword = ''
|
||||
filters.page = 1
|
||||
void loadUsers()
|
||||
loadCompanyOptions()
|
||||
})
|
||||
|
||||
// 公司目录仅站点超管拉取(建「公司超级管理员」时选公司用);非超管不发这个请求,后端 403 兜底。
|
||||
// 按当前平台 tab 过滤(V206)——公司本身已按平台分侧,候选下拉跟着 tab 走。
|
||||
function loadCompanyOptions() {
|
||||
if (!isSuperAdmin.value) return
|
||||
void fetchCompanies(platformTab.active)
|
||||
.then((items) => {
|
||||
companyOptions.value = items.map((c) => ({ id: c.id, companyName: c.companyName }))
|
||||
})
|
||||
.catch(() => {
|
||||
companyOptions.value = []
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
void loadUsers()
|
||||
// 公司目录仅站点超管拉取(建「公司超级管理员」时选公司用);非超管不发这个请求,后端 403 兜底
|
||||
if (isSuperAdmin.value) {
|
||||
void fetchCompanies()
|
||||
.then((items) => {
|
||||
companyOptions.value = items.map((c) => ({ id: c.id, companyName: c.companyName }))
|
||||
})
|
||||
.catch(() => {
|
||||
companyOptions.value = []
|
||||
})
|
||||
}
|
||||
loadCompanyOptions()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -224,6 +257,7 @@ onMounted(() => {
|
||||
<th style="width: 140px">角色</th>
|
||||
<th style="width: 160px">所属管理员</th>
|
||||
<th style="width: 160px">到期时间</th>
|
||||
<th v-if="isJdSide" style="width: 110px">上架上限</th>
|
||||
<th style="width: 90px">状态</th>
|
||||
<th style="width: 180px">创建时间</th>
|
||||
<th style="width: 180px">更新时间</th>
|
||||
@@ -240,6 +274,7 @@ onMounted(() => {
|
||||
<td :class="{ 'expiry-cell-expired': formatExpiryCell(row).expired }">
|
||||
{{ formatExpiryCell(row).text }}
|
||||
</td>
|
||||
<td v-if="isJdSide">{{ quotaCellText(row) }}</td>
|
||||
<td class="status-cell" :class="{ 'status-cell-disabled': !!row.disabledAt }" :title="row.disabledAt ? `停用于 ${row.disabledAt}` : undefined">
|
||||
{{ disabledBadgeText(row) }}
|
||||
</td>
|
||||
@@ -277,10 +312,10 @@ onMounted(() => {
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="9" class="empty-tip">加载中...</td>
|
||||
<td :colspan="isJdSide ? 10 : 9" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="9" class="empty-tip">{{ userListEmptyHint() }}</td>
|
||||
<td :colspan="isJdSide ? 10 : 9" class="empty-tip">{{ userListEmptyHint() }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -297,9 +332,10 @@ onMounted(() => {
|
||||
:company-options="companyOptions"
|
||||
:operator-company-id="operatorCompanyId"
|
||||
:active-company-id="companyTab.requestCompanyId"
|
||||
:platform="platformTab.active"
|
||||
@created="loadUsers"
|
||||
/>
|
||||
<EditUserDialog v-model="editVisible" :user="editUser" :operator-super="isSuperAdmin" :company-id="companyTab.requestCompanyId" @updated="loadUsers" />
|
||||
<EditUserDialog v-model="editVisible" :user="editUser" :operator-super="isSuperAdmin" :company-id="companyTab.requestCompanyId" :platform="platformTab.active" @updated="loadUsers" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -11,22 +11,33 @@ import {
|
||||
|
||||
export const SHOP_GROUPS_ENDPOINT = '/api/admin/shop-manages/groups'
|
||||
|
||||
export async function fetchShopGroups(companyId?: number | null): Promise<ShopGroupItem[]> {
|
||||
const { data } = await http.get<unknown>(SHOP_GROUPS_ENDPOINT, { params: companyId != null ? { company_id: companyId } : {} })
|
||||
/** 列表:company_id 收公司口径(钉住的取值口),platform 收平台 tab 口径(V206),都缺省就不发。 */
|
||||
export async function fetchShopGroups(companyId?: number | null, platform?: string): Promise<ShopGroupItem[]> {
|
||||
const { data } = await http.get<unknown>(SHOP_GROUPS_ENDPOINT, {
|
||||
params: {
|
||||
...(companyId != null ? { company_id: companyId } : {}),
|
||||
...(platform ? { platform } : {}),
|
||||
},
|
||||
})
|
||||
return parseShopGroupList(data)
|
||||
}
|
||||
|
||||
/** 新建分组:POST /api/admin/shop-manages/groups(创建人 = 组长 = 当前操作者)。 */
|
||||
export async function createShopGroup(name: string, memberUserIds: number[], createdById: number): Promise<ShopGroupItem> {
|
||||
const { data } = await http.post<unknown>(SHOP_GROUPS_ENDPOINT, toShopGroupCreatePayload(name, memberUserIds, createdById))
|
||||
export async function createShopGroup(
|
||||
name: string,
|
||||
memberUserIds: number[],
|
||||
createdById: number,
|
||||
platform?: string,
|
||||
): Promise<ShopGroupItem> {
|
||||
const { data } = await http.post<unknown>(SHOP_GROUPS_ENDPOINT, toShopGroupCreatePayload(name, memberUserIds, createdById, platform))
|
||||
const created = parseShopGroupItem(unwrap<unknown>(data))
|
||||
if (!created) throw new Error('创建分组响应异常:缺少分组数据')
|
||||
return created
|
||||
}
|
||||
|
||||
/** 更新分组:PUT /api/admin/shop-manages/groups/{id}。 */
|
||||
export async function updateShopGroup(id: number, name: string, memberUserIds: number[]): Promise<ShopGroupItem> {
|
||||
const { data } = await http.put<unknown>(`${SHOP_GROUPS_ENDPOINT}/${id}`, toShopGroupUpdatePayload(name, memberUserIds))
|
||||
export async function updateShopGroup(id: number, name: string, memberUserIds: number[], platform?: string): Promise<ShopGroupItem> {
|
||||
const { data } = await http.put<unknown>(`${SHOP_GROUPS_ENDPOINT}/${id}`, toShopGroupUpdatePayload(name, memberUserIds, platform))
|
||||
const updated = parseShopGroupItem(unwrap<unknown>(data))
|
||||
if (!updated) throw new Error('更新分组响应异常:缺少分组数据')
|
||||
return updated
|
||||
|
||||
@@ -12,6 +12,8 @@ export interface ShopGroupItem {
|
||||
memberUserIds?: number[]
|
||||
createdAt?: string
|
||||
updatedAt?: string
|
||||
/** 所属平台(V206):'amazon'|'jd';旧负载缺省不渲染该键。 */
|
||||
platform?: string
|
||||
}
|
||||
|
||||
export interface ShopGroupFormErrors {
|
||||
@@ -53,6 +55,8 @@ export function parseShopGroupItem(raw: unknown): ShopGroupItem | null {
|
||||
if (createdAt) item.createdAt = createdAt
|
||||
const updatedAt = text(record.updatedAt ?? record.updated_at)
|
||||
if (updatedAt) item.updatedAt = updatedAt
|
||||
const platform = text(record.platform)
|
||||
if (platform) item.platform = platform
|
||||
return item
|
||||
}
|
||||
|
||||
@@ -79,18 +83,34 @@ export function validateShopGroupForm(name: string): ShopGroupFormErrors {
|
||||
return errors
|
||||
}
|
||||
|
||||
/** 创建载荷:groupName + 成员 + 创建人(= 组长,当前操作者)。 */
|
||||
/** 创建载荷:groupName + 成员 + 创建人(= 组长,当前操作者)+ 所属平台(V206,缺省不下发)。 */
|
||||
export function toShopGroupCreatePayload(
|
||||
name: string,
|
||||
memberUserIds: number[],
|
||||
createdById: number,
|
||||
): { groupName: string; memberUserIds: number[]; createdById: number } {
|
||||
return { groupName: text(name), memberUserIds: dedupeIds(memberUserIds), createdById }
|
||||
platform?: string,
|
||||
): { groupName: string; memberUserIds: number[]; createdById: number; platform?: string } {
|
||||
const payload: { groupName: string; memberUserIds: number[]; createdById: number; platform?: string } = {
|
||||
groupName: text(name),
|
||||
memberUserIds: dedupeIds(memberUserIds),
|
||||
createdById,
|
||||
}
|
||||
if (platform) payload.platform = platform
|
||||
return payload
|
||||
}
|
||||
|
||||
/** 更新载荷:groupName + 成员(组长/创建人不可改)。 */
|
||||
export function toShopGroupUpdatePayload(name: string, memberUserIds: number[]): { groupName: string; memberUserIds: number[] } {
|
||||
return { groupName: text(name), memberUserIds: dedupeIds(memberUserIds) }
|
||||
/** 更新载荷:groupName + 成员 + 所属平台(V206;组长/创建人不可改)。 */
|
||||
export function toShopGroupUpdatePayload(
|
||||
name: string,
|
||||
memberUserIds: number[],
|
||||
platform?: string,
|
||||
): { groupName: string; memberUserIds: number[]; platform?: string } {
|
||||
const payload: { groupName: string; memberUserIds: number[]; platform?: string } = {
|
||||
groupName: text(name),
|
||||
memberUserIds: dedupeIds(memberUserIds),
|
||||
}
|
||||
if (platform) payload.platform = platform
|
||||
return payload
|
||||
}
|
||||
|
||||
/** 组员候选用户(对齐 admin.js getEligibleShopManageGroupUsers 的过滤语义)。 */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/** 新建用户表单模型(任务 45):纯逻辑,镜像 Java AdminUserCreateRequest 字段与后端校验。 */
|
||||
import type { PlatformTabId } from '../../config/platform-scope.ts'
|
||||
|
||||
export const CREATE_USERNAME_MIN_LEN = 2
|
||||
export const CREATE_PASSWORD_MIN_LEN = 6
|
||||
@@ -21,6 +22,8 @@ export interface CreateUserForm {
|
||||
expiresAt: string
|
||||
/** 所属公司 id:仅 role=company_super_admin 时由站点超管必选(2026-10-05 需求)。 */
|
||||
companyId?: number | null
|
||||
/** 所属平台(V206):弹窗打开时预填当前平台 tab,单选可改。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
export interface CreateUserFormErrors {
|
||||
@@ -43,10 +46,12 @@ export interface CreateUserPayload {
|
||||
* 反向钉(company-user-create.test.ts)唯一豁免的例外:公司超管必须落指定公司,
|
||||
* 否则会静默落操作者自己的公司(公司 1),用户需求就是给别家公司开超管。 */
|
||||
companyId?: number
|
||||
/** 所属平台(V206):恒下发(弹窗单选默认当前平台 tab),缺省后端落 amazon。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
export function createEmptyCreateUserForm(): CreateUserForm {
|
||||
return { username: '', password: '', role: 'normal', columnIds: [], createdBy: null, expiresAt: '', companyId: null }
|
||||
return { username: '', password: '', role: 'normal', columnIds: [], createdBy: null, expiresAt: '', companyId: null, platform: 'amazon' }
|
||||
}
|
||||
|
||||
/** 未知/空白/超管角色归一:admin/company_super_admin/normal 白名单,其余归 normal。 */
|
||||
@@ -147,6 +152,7 @@ export function toCreateUserRequest(form: CreateUserForm): CreateUserPayload {
|
||||
password: form.password || '',
|
||||
role,
|
||||
columnIds: Array.isArray(form.columnIds) ? form.columnIds.slice() : [],
|
||||
platform: form.platform,
|
||||
}
|
||||
if (payload.role === 'normal' && form.createdBy != null) {
|
||||
payload.createdById = form.createdBy
|
||||
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
toEditUserUpdateRequest,
|
||||
validateEditUserForm,
|
||||
type EditUserForm,
|
||||
type EditUserFormOptions,
|
||||
} from './user-edit-model'
|
||||
|
||||
/** Java AdminUserController.updateUser 端点前缀。 */
|
||||
@@ -12,12 +13,13 @@ export const EDIT_USER_ENDPOINT = '/api/admin/user'
|
||||
|
||||
/**
|
||||
* 提交编辑用户:先校验(不通过抛首条错误),再序列化 PUT;http/后端失败交由调用方提示。
|
||||
* options.includeQuota=false(亚马逊侧)不下发上架上限——校验与序列化同口径。
|
||||
*/
|
||||
export async function submitEditUser(form: EditUserForm): Promise<void> {
|
||||
const { valid, errors } = validateEditUserForm(form)
|
||||
export async function submitEditUser(form: EditUserForm, options: EditUserFormOptions = {}): Promise<void> {
|
||||
const { valid, errors } = validateEditUserForm(form, options)
|
||||
if (!valid) {
|
||||
throw new Error(Object.values(errors)[0] || '编辑用户表单校验未通过')
|
||||
}
|
||||
const { data } = await http.put<unknown>(`${EDIT_USER_ENDPOINT}/${form.uid}`, toEditUserUpdateRequest(form))
|
||||
const { data } = await http.put<unknown>(`${EDIT_USER_ENDPOINT}/${form.uid}`, toEditUserUpdateRequest(form, options))
|
||||
unwrap<unknown>(data)
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
/** 编辑用户表单回填模型(任务 47):从用户行回填可编辑表单,镜像 Java AdminUserUpdateRequest。 */
|
||||
import type { AdminUser } from '../../types/admin'
|
||||
import type { PlatformTabId } from '../../config/platform-scope.ts'
|
||||
import { CREATE_PASSWORD_MIN_LEN, mayCarryOwnExpiry } from './user-create-model.ts'
|
||||
|
||||
/** 编辑可选角色:站点/公司超管不可改,未知归 normal;后端只收 admin|normal。 */
|
||||
export type EditUserRole = 'normal' | 'admin'
|
||||
|
||||
export interface EditUserForm {
|
||||
jdPublishQuota: number
|
||||
uid: number
|
||||
/** 仅展示用,后端不支持改用户名。 */
|
||||
username: string
|
||||
@@ -18,9 +20,12 @@ export interface EditUserForm {
|
||||
originalRole: string
|
||||
/** 到期时间(yyyy-MM-dd HH:mm:ss);空串 = 永不过期。null = 后端本来就无到期。 */
|
||||
expiresAt: string
|
||||
/** 所属平台(V206):单选可翻档,未知/缺省归亚马逊(存量默认)。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
export interface EditUserFormErrors {
|
||||
jdPublishQuota?: string
|
||||
password?: string
|
||||
}
|
||||
|
||||
@@ -28,10 +33,13 @@ export interface EditUserFormErrors {
|
||||
export interface EditUserUpdateRequest {
|
||||
/** 目标是公司超管时不携带(防止表单把公司超管误降级);站点超管改其密码/到期时间即可。 */
|
||||
role?: EditUserRole
|
||||
jdPublishQuota?: number
|
||||
columnIds: number[]
|
||||
password?: string
|
||||
/** 到期时间:空串=清除(恢复永不过期),有值=改期;总是下发(与后端"传了就更新"对齐)。 */
|
||||
expiresAt: string
|
||||
/** 所属平台(V206):总是下发(弹窗单选恒渲染),翻档即把记录挪到另一平台的列表。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
/** 行角色 → 可编辑角色:仅 admin 映射 admin,其余(含 unknown)归 normal。 */
|
||||
@@ -71,22 +79,38 @@ export function fillEditUserForm(user: AdminUser): EditUserForm {
|
||||
const role = typeof user.role === 'string' ? user.role.trim() : ''
|
||||
return {
|
||||
uid: user.id,
|
||||
jdPublishQuota: user.jdPublishQuota ?? 5000,
|
||||
username: user.username || '',
|
||||
password: '',
|
||||
role: editRoleOf(role),
|
||||
columnIds: [],
|
||||
originalRole: role,
|
||||
expiresAt: normalizeExpiryForPicker(user.expiresAt),
|
||||
platform: user.platform === 'jd' ? 'jd' : 'amazon',
|
||||
}
|
||||
}
|
||||
|
||||
/** 编辑表单校验选项:includeQuota=false(亚马逊侧)跳过上架上限校验——该项不下发。 */
|
||||
export interface EditUserFormOptions {
|
||||
/** 是否参与上架上限(jd_publish_quota)的校验与下发;缺省 true(京东侧)。 */
|
||||
includeQuota?: boolean
|
||||
}
|
||||
|
||||
/** 编辑表单校验:密码可留空(不改),非空时须达到最小长度。 */
|
||||
export function validateEditUserForm(form: EditUserForm): { valid: boolean; errors: EditUserFormErrors } {
|
||||
export function validateEditUserForm(
|
||||
form: EditUserForm,
|
||||
options: EditUserFormOptions = {},
|
||||
): { valid: boolean; errors: EditUserFormErrors } {
|
||||
const errors: EditUserFormErrors = {}
|
||||
const password = form.password || ''
|
||||
if (password && password.length < CREATE_PASSWORD_MIN_LEN) {
|
||||
errors.password = `密码至少${CREATE_PASSWORD_MIN_LEN}个字符,留空则不修改`
|
||||
}
|
||||
if (options.includeQuota !== false &&
|
||||
(form.role === 'admin' || form.originalRole === 'company_super_admin') &&
|
||||
(!Number.isInteger(form.jdPublishQuota) || form.jdPublishQuota < 0 || form.jdPublishQuota > 2147483647)) {
|
||||
errors.jdPublishQuota = '请输入 0 至 2147483647 的整数'
|
||||
}
|
||||
return { valid: Object.keys(errors).length === 0, errors }
|
||||
}
|
||||
|
||||
@@ -96,8 +120,11 @@ export function validateEditUserForm(form: EditUserForm): { valid: boolean; erro
|
||||
* <p>expiresAt 按「改完之后的角色」决定:目标角色不能带自己的到期时间时发空串=清空
|
||||
* (后端 400 闸门只拦「有值」,空串走既有的清除分支)。公司超管目标不带 role,
|
||||
* 它的 roleAfter 就是 company_super_admin,续费那条空串不会被误当成清空。</p>
|
||||
*
|
||||
* <p>options.includeQuota=false(亚马逊侧编辑)不下发 jdPublishQuota——上架上限是京东
|
||||
* 口径,亚马逊侧不显示也不改它(用户口径 2026-11-17);platform 恒下发(单选恒渲染)。</p>
|
||||
*/
|
||||
export function toEditUserUpdateRequest(form: EditUserForm): EditUserUpdateRequest {
|
||||
export function toEditUserUpdateRequest(form: EditUserForm, options: EditUserFormOptions = {}): EditUserUpdateRequest {
|
||||
const originalRole = (form.originalRole || '').trim().toLowerCase()
|
||||
if (originalRole === 'super_admin') {
|
||||
throw new Error('不能修改超级管理员')
|
||||
@@ -110,10 +137,14 @@ export function toEditUserUpdateRequest(form: EditUserForm): EditUserUpdateReque
|
||||
const request: EditUserUpdateRequest = {
|
||||
columnIds: Array.isArray(form.columnIds) ? form.columnIds.slice() : [],
|
||||
expiresAt: mayCarryOwnExpiry(roleAfter) ? (form.expiresAt || '').trim() : '',
|
||||
platform: form.platform,
|
||||
}
|
||||
if (keepsRole) {
|
||||
request.role = nextRole
|
||||
}
|
||||
if (options.includeQuota !== false && (roleAfter === 'admin' || roleAfter === 'company_super_admin')) {
|
||||
request.jdPublishQuota = form.jdPublishQuota
|
||||
}
|
||||
const password = form.password || ''
|
||||
if (password) request.password = password
|
||||
return request
|
||||
|
||||
@@ -0,0 +1,463 @@
|
||||
/**
|
||||
* 密钥管理页的纯逻辑模型(货源标签 + 代理重填 + 检测结果档位)。
|
||||
*
|
||||
* 四条收口都在这个文件里,页模板只调这里导出的函数,不各写各的字典:
|
||||
*
|
||||
* 1. **货源标签按模块分字典**(2026-11-02 修):原先 `UserSecretsPage.vue` 里是一整张
|
||||
* `sourceLabel()`,把 LLM 渠道(longtaitou/t8star)与代理供应商(qingguo/jikip)混在同一个
|
||||
* switch 上,于是「按值匹配」的字典会把它认识的**任何**值贴到**任何**列上——代理行因此能长出
|
||||
* 「龙抬头」这种标签。后端 VO 的 `channel` 本来就是按模块归一的(`UserSecretModule.channelOrDefault`
|
||||
* 代理走 `ProxyProvider`、密钥走 `LlmChannel`),所以错标只会来自前端这张合表。
|
||||
* 现在两张表互不相通:代理列只认供应商、密钥列只认渠道,跨域的值一律落到「—」而不是被硬认下来。
|
||||
*
|
||||
* 2. **代理列不再显示、也不再回传原文**(2026-11-02 后端 `SecretMasking.maskProxy` 收口):
|
||||
* `AdminUserSecretModuleVo.full` 后台侧恒为空,界面只读 `masked`(`scheme://host`,不含
|
||||
* key/pwd)。因此原先「代填/改代理」用 `window.prompt` 预填整条链接的交互已失效
|
||||
* (预填必然是空的,保存还会把空串顶上去)——改成重新填账密:青果填 Authkey/Authpwd、
|
||||
* 由 `composeQingguoLink` 现拼;极客按其产品口径填自家提取链接。
|
||||
* ⚠ 拼出来的链接是一次性写请求的载荷,**不得**回显、回填、进 tooltip、进剪贴板。
|
||||
*
|
||||
* 3. **检测结果按 `check_code` 分档渲染**(2026-11-02 加,见下方档位表):状态列原先只看
|
||||
* `check_status`,把后端新分出来的一族「等一会再点就行」的码(`channel_busy` 等)一律显示成
|
||||
* 「无法判定」,管理员分不清「被自己占着」「密钥坏了」「欠费」三种完全不同的处置。
|
||||
* 码表只在这一份文件里(页面不再自带第二张表),句子一律用后端的 `check_message` 原文。
|
||||
*
|
||||
* 零 `@/` 别名依赖:本文件被 `node --test` 直测(那颗 runner 不认 Vite 别名)。
|
||||
*/
|
||||
import { composeQingguoLink } from '../../shared/utils/qingguo-link.ts'
|
||||
|
||||
export type LlmChannelKey = 'longtaitou' | 't8star'
|
||||
export type ProxyProviderKey = 'qingguo' | 'jikip'
|
||||
|
||||
/** 代理模块 key(与后端 `UserSecretModule.PROXY.key()` 同值):写请求的路径段与「这一格是代理」的判据。 */
|
||||
export const PROXY_MODULE_KEY = 'proxy'
|
||||
|
||||
/* ------------------------------------------------------------------ *
|
||||
* 检测结果的渲染档位(2026-11-02 加,起因是现网 uid=1 的 proxy 行)
|
||||
*
|
||||
* 后端 `UserApiSecretCheckService` 把青果检测从「无条件假通过」改成真提取后**按供应商返回码分档**,
|
||||
* 于是 `check_code` 成了这一格到底怎么了的最细信号;而界面当时只认 `check_status` 三档
|
||||
* (passed/failed/error),`error` 一律写成「无法判定」——`channel_busy`(青果通道被自己的采集
|
||||
* 占着,等约 3 分钟就能重试)因此被显示成「查不出」,管理员既看不出「等一会就行」,
|
||||
* 也分不清它和「密钥坏了」「欠费」是三种完全不同的处置。
|
||||
*
|
||||
* 所以现在**按码建表、按状态兜底**:
|
||||
* - 认得的码 ⇒ 各有自己的档位(可重试这一族另给独立配色,既不红也不黄);
|
||||
* - 「无法判定」只留给真正没有结论的情况(空码/这表里没有的码 + `check_status=error`);
|
||||
* - `check_status=unknown`(后端 upsert 后的初值,等于「从没检测过」)仍是「未检测」,
|
||||
* 不许冒充「无法判定」——那是两件事,前者点一次检测就有答案,后者点了也还是没答案。
|
||||
*
|
||||
* ⚠ 措辞的权威在后端:给人看的那句中文在 `check_message` 里,界面只出**档名**(一个词),
|
||||
* 绝不按码自己拼句子;句子通过 `moduleTooltip`/行级 tooltip 原样透出。
|
||||
* ------------------------------------------------------------------ */
|
||||
|
||||
/** 药丸配色档位,对应 `UserSecretsPage.vue` 里 `.wh-pill.is-*` 那套样式类。 */
|
||||
export type StatusTone = 'is-allowed' | 'is-blocked' | 'is-warn' | 'is-retry' | 'is-unknown'
|
||||
|
||||
/** 一个渲染档位:档名 + 配色。档名是给管理员扫一眼用的短词,不是解释句。 */
|
||||
export interface StatusBand {
|
||||
label: string
|
||||
tone: StatusTone
|
||||
}
|
||||
|
||||
/** 单格「没配」与「没检测」是两档,但都用灰色:都不代表密钥本身有问题。 */
|
||||
export const NOT_CONFIGURED_BAND: StatusBand = { label: '未配置', tone: 'is-unknown' }
|
||||
export const NOT_CHECKED_BAND: StatusBand = { label: '未检测', tone: 'is-unknown' }
|
||||
/** 真的问不出结论(空码/未知码 + `check_status=error`)才落到这一档。 */
|
||||
export const INDETERMINATE_BAND: StatusBand = { label: '无法判定', tone: 'is-warn' }
|
||||
/** 后端 `STATUS_PASSED`(或码 `ok`):唯一可以当成「这项配好了」的一档。 */
|
||||
export const PASSED_BAND: StatusBand = { label: '通过', tone: 'is-allowed' }
|
||||
/** 后端新增了一档、前端还没登记码名时的兜底:按状态给个不撒谎的词,不当场判死。 */
|
||||
const GENERIC_FAILED_BAND: StatusBand = { label: '失败', tone: 'is-blocked' }
|
||||
|
||||
/** 后端 `UserApiSecretCheckService` 的 `CODE_*` 全集(2026-11-02 逐条对着源码登记)。 */
|
||||
const CHECK_CODE_BANDS: Record<string, StatusBand> = {
|
||||
ok: PASSED_BAND,
|
||||
/** 通道被自己的采集占着:等释放后重点一次,密钥没坏——这一档就是本次要修的错渲染。 */
|
||||
channel_busy: { label: '无可用通道', tone: 'is-retry' },
|
||||
rate_limited: { label: '限流重试', tone: 'is-retry' },
|
||||
timeout: { label: '超时重试', tone: 'is-retry' },
|
||||
/** 传输层失败:后端两个分支都给这个码(提取接口不可达=failed、探测异常=error),都可重试。 */
|
||||
network_error: { label: '网络重试', tone: 'is-retry' },
|
||||
server_error: { label: '上游重试', tone: 'is-retry' },
|
||||
/** 欠费(现网 21 行):修之前就只有 `check_status=failed` 这一条路径认得它,改后按码认、不再吊在状态上。 */
|
||||
insufficient_balance: { label: '欠费', tone: 'is-warn' },
|
||||
/** 提取成功但链接里组不出可验连的地址(没带 key/pwd):要用户重填,不是「查不出」。 */
|
||||
tunnel_unverified: { label: '链接缺账密', tone: 'is-warn' },
|
||||
invalid_key: { label: '密钥失效', tone: 'is-blocked' },
|
||||
forbidden: { label: '鉴权被拒', tone: 'is-blocked' },
|
||||
bad_request: { label: '参数被拒', tone: 'is-blocked' },
|
||||
provider_error: { label: '供应商报错', tone: 'is-blocked' },
|
||||
}
|
||||
|
||||
/** 行级档位:后端 `UserApiSecretService` 按 failed > incomplete > passed > error > unknown 聚合,界面不重排这个优先级。 */
|
||||
const ROW_STATUS_BANDS: Record<string, StatusBand> = {
|
||||
passed: { label: '检测通过', tone: 'is-allowed' },
|
||||
failed: { label: '检测失败', tone: 'is-blocked' },
|
||||
incomplete: { label: '未配齐', tone: 'is-warn' },
|
||||
error: INDETERMINATE_BAND,
|
||||
}
|
||||
/** 行级「可重试」:仅当整行的问题**只**出在可重试那一族码上时替换掉「无法判定」(后端给不了这一档,前端按格子的码补)。 */
|
||||
const ROW_RETRY_BAND: StatusBand = { label: '可重试', tone: 'is-retry' }
|
||||
|
||||
/** 单模块的可比较形状(不引 `@/api/*`:本文件要能被零别名的 `node --test` 直测)。 */
|
||||
interface CheckModuleLike {
|
||||
exists?: boolean | null
|
||||
moduleLabel?: string | null
|
||||
checkStatus?: string | null
|
||||
checkCode?: string | null
|
||||
checkMessage?: string | null
|
||||
}
|
||||
|
||||
/** 一行的可比较形状:只用到行状态 + 三个格子。 */
|
||||
interface SecretRowLike {
|
||||
status?: string | null
|
||||
similarAsin?: CheckModuleLike | null
|
||||
appearancePatent?: CheckModuleLike | null
|
||||
proxy?: CheckModuleLike | null
|
||||
}
|
||||
|
||||
/** 按归一后的键查档位表:空键与表里没有的键都返回 null(调用方兜底,绝不硬认一档)。 */
|
||||
function bandOf(table: Record<string, StatusBand>, raw: unknown): StatusBand | null {
|
||||
const key = normalizeKey(raw)
|
||||
if (!key || !Object.prototype.hasOwnProperty.call(table, key)) return null
|
||||
return table[key] ?? null
|
||||
}
|
||||
|
||||
/** 码 → 档位;空码或这表里没有的码返回 null(由调用方按状态兜底,不硬认一档)。 */
|
||||
export function checkCodeBand(code: string | null | undefined): StatusBand | null {
|
||||
return bandOf(CHECK_CODE_BANDS, code)
|
||||
}
|
||||
|
||||
/** 这一档是不是「等一等再点」那一族(可重试):配色与行级补档都读这一个判据,不散落码名。 */
|
||||
export function isRetryBand(band: StatusBand | null | undefined): boolean {
|
||||
return band?.tone === 'is-retry'
|
||||
}
|
||||
|
||||
/**
|
||||
* 单格状态药丸:先看是否已配置,再看 `check_status=passed`,然后**按 `check_code` 分档**,
|
||||
* 都不认才按状态兜底。
|
||||
*/
|
||||
export function moduleStatusBand(module: CheckModuleLike | null | undefined): StatusBand {
|
||||
if (!module || !module.exists) return NOT_CONFIGURED_BAND
|
||||
const status = normalizeKey(module.checkStatus)
|
||||
if (status === 'passed') return PASSED_BAND
|
||||
const band = checkCodeBand(module.checkCode)
|
||||
if (band) return band
|
||||
if (status === 'error') return INDETERMINATE_BAND
|
||||
if (status === 'failed') return GENERIC_FAILED_BAND
|
||||
// ''/unknown/后端下一版新增的状态值:宁可说「未检测」,也不替后端编造一个结论
|
||||
return NOT_CHECKED_BAND
|
||||
}
|
||||
|
||||
/** 行级状态药丸:后端聚合成 `error` 时,若这一行**没有结论的格子全是可重试那一族**,补成「可重试」。 */
|
||||
export function rowStatusBand(row: SecretRowLike | null | undefined): StatusBand {
|
||||
const status = normalizeKey(row?.status)
|
||||
if (status === 'error' && awaitsRetryOnly(row)) return ROW_RETRY_BAND
|
||||
// 行级 `unknown`=后端还没问过(不是「问了问不出」),留「未检测」这一档,与筛选项里那一行同词
|
||||
return bandOf(ROW_STATUS_BANDS, status) ?? NOT_CHECKED_BAND
|
||||
}
|
||||
|
||||
/**
|
||||
* 这一行是不是「点一次就有答案」:后端把 error 之上的 failed/incomplete 都判掉了才轮到 error,
|
||||
* 所以这里只需再确认剩下那些没通过的格子都落在可重试档——混进一格「链接缺账密」就不算可重试,
|
||||
* 那一格不会自己好,把整行说成「可重试」等于让管理员一直等。
|
||||
*/
|
||||
function awaitsRetryOnly(row: SecretRowLike | null | undefined): boolean {
|
||||
const pending = modulesOf(row).filter(
|
||||
(module) => Boolean(module?.exists) && normalizeKey(module?.checkStatus) !== 'passed',
|
||||
)
|
||||
return pending.length > 0 && pending.every((module) => isRetryBand(moduleStatusBand(module)))
|
||||
}
|
||||
|
||||
/**
|
||||
* 行级 tooltip 的明细:逐格把**后端原文** `check_message` 抄出来(运维判「是欠费还是被自己占着」就靠这句)。
|
||||
* 前端不拼句子、不改一个字;没检测过的格子没有这句话,自然不出现。
|
||||
*/
|
||||
export function rowDetailLines(row: SecretRowLike | null | undefined): string[] {
|
||||
return modulesOf(row)
|
||||
.filter((module) => Boolean(module?.exists))
|
||||
.map((module) => {
|
||||
const message = String(module?.checkMessage ?? '').trim()
|
||||
if (!message) return ''
|
||||
const label = String(module?.moduleLabel ?? '').trim()
|
||||
return label ? `${label}:${message}` : message
|
||||
})
|
||||
.filter(Boolean)
|
||||
}
|
||||
|
||||
function modulesOf(row: SecretRowLike | null | undefined): CheckModuleLike[] {
|
||||
return [row?.similarAsin, row?.appearancePatent, row?.proxy].filter(Boolean) as CheckModuleLike[]
|
||||
}
|
||||
|
||||
/** 后端 `ProxyProvider.DEFAULT`=极客:新建默认极客,青果手动切(2026-10-30 拍板)。 */
|
||||
export const DEFAULT_PROXY_PROVIDER: ProxyProviderKey = 'jikip'
|
||||
|
||||
/** 认不出的货源一律这个占位,不许回退成"某个具体渠道名"(那正是错标的来源)。 */
|
||||
export const UNKNOWN_SOURCE_LABEL = '—'
|
||||
|
||||
const LLM_CHANNEL_LABELS: Record<LlmChannelKey, string> = {
|
||||
longtaitou: '龙抬头',
|
||||
t8star: '贞贞',
|
||||
}
|
||||
|
||||
const PROXY_PROVIDER_LABELS: Record<ProxyProviderKey, string> = {
|
||||
qingguo: '青果',
|
||||
jikip: '极客',
|
||||
}
|
||||
|
||||
function normalizeKey(raw: unknown): string {
|
||||
return String(raw ?? '').trim().toLowerCase()
|
||||
}
|
||||
|
||||
function known<T extends string>(table: Record<T, string>, raw: unknown): string | null {
|
||||
const key = normalizeKey(raw)
|
||||
return Object.prototype.hasOwnProperty.call(table, key)
|
||||
? table[key as T]
|
||||
: null
|
||||
}
|
||||
|
||||
/** LLM 密钥列的渠道名:只查 LLM 字典,代理供应商的值在这里认不出。 */
|
||||
export function llmSourceLabel(channel: string | null | undefined): string {
|
||||
return known(LLM_CHANNEL_LABELS, channel) ?? UNKNOWN_SOURCE_LABEL
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理列的供应商名:只查供应商字典。
|
||||
* 传进 LLM 渠道值(`longtaitou`/`t8star`)必须返回占位——这条是"代理行贴龙抬头"的直接判据。
|
||||
*/
|
||||
export function proxySourceLabel(channel: string | null | undefined): string {
|
||||
return known(PROXY_PROVIDER_LABELS, channel) ?? UNKNOWN_SOURCE_LABEL
|
||||
}
|
||||
|
||||
/**
|
||||
* 归一为可选供应商;未知值不猜,返回 null 让调用方保持原选择。
|
||||
*/
|
||||
export function asProxyProvider(raw: unknown): ProxyProviderKey | null {
|
||||
const key = normalizeKey(raw)
|
||||
return key === 'qingguo' || key === 'jikip' ? key : null
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理列的唯一显示文本:后端下发的 `masked`(青果形状 `https://overseas.proxy.qg.net`)。
|
||||
* 刻意**不读** `full`,也不做任何"masked 空就回落到原文"的兜底——回落等于把脱敏前的行为留在界面里。
|
||||
*/
|
||||
export function proxyDisplayText(module: { masked?: string | null } | null | undefined): string {
|
||||
const masked = String(module?.masked ?? '').trim()
|
||||
return masked || UNKNOWN_SOURCE_LABEL
|
||||
}
|
||||
|
||||
/** 代填/改代理的表单草稿:青果用前三个字段,极客用 `link`。 */
|
||||
export interface ProxyEntryDraft {
|
||||
provider: ProxyProviderKey
|
||||
authkey: string
|
||||
authpwd: string
|
||||
link: string
|
||||
}
|
||||
|
||||
/**
|
||||
* 空草稿:`provider` 用后端已登记的那一列预置(只是选中的单选框,不是凭据),
|
||||
* 三个输入位**一律空**——脱敏后没有任何原文可回填。
|
||||
*/
|
||||
export function emptyProxyEntryDraft(currentProvider?: string | null): ProxyEntryDraft {
|
||||
return {
|
||||
provider: asProxyProvider(currentProvider) ?? DEFAULT_PROXY_PROVIDER,
|
||||
authkey: '',
|
||||
authpwd: '',
|
||||
link: '',
|
||||
}
|
||||
}
|
||||
|
||||
/** 与后端 `PROXY_FORMAT_HINT` 同一句口径:本函数只做前置提示,真判仍在服务端。 */
|
||||
const PROXY_LINK_FORMAT_HINT =
|
||||
'代理地址格式不正确,请填写 http://host:port 形式的代理地址,或代理服务商的提取链接(https://...)'
|
||||
|
||||
/** http(s) + 有主机名:镜像后端 `validateProxyValue`,不在前端扩大判死范围。 */
|
||||
function isHttpUrl(raw: string): boolean {
|
||||
try {
|
||||
const parsed = new URL(raw)
|
||||
return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && Boolean(parsed.hostname)
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验草稿,返回给界面显示的文案(空串=可以提交)。
|
||||
* 点名"缺哪把":缺 pwd 时青果回 `API_AUTH_DENY`,所以两把都得填,不能只填 key 就当配好了。
|
||||
*/
|
||||
export function validateProxyEntry(draft: ProxyEntryDraft): string {
|
||||
if (!asProxyProvider(draft.provider)) return '请选择代理供应商'
|
||||
if (draft.provider === 'qingguo') {
|
||||
if (!String(draft.authkey || '').trim()) return '请填写青果 Authkey'
|
||||
if (!String(draft.authpwd || '').trim()) return '请填写青果 Authpwd(只填 Authkey 青果会判鉴权拒绝)'
|
||||
return ''
|
||||
}
|
||||
const link = String(draft.link || '').trim()
|
||||
if (!link) return '请填写极客提取链接'
|
||||
if (!isHttpUrl(link)) return PROXY_LINK_FORMAT_HINT
|
||||
return ''
|
||||
}
|
||||
|
||||
/**
|
||||
* 组装 PUT `/api/admin/user-secrets/{userId}/modules/proxy` 的请求体。
|
||||
* 不合法返回 null(调用方不得把 null 顶上去,更不得拿旧值凑数)。
|
||||
*/
|
||||
export function buildProxyEntryPayload(
|
||||
draft: ProxyEntryDraft,
|
||||
): { value: string; channel: ProxyProviderKey } | null {
|
||||
if (validateProxyEntry(draft)) return null
|
||||
if (draft.provider === 'qingguo') {
|
||||
return { value: composeQingguoLink(draft.authkey, draft.authpwd), channel: 'qingguo' }
|
||||
}
|
||||
return { value: String(draft.link || '').trim(), channel: 'jikip' }
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ *
|
||||
* 余额侧写(2026-11-05 B83):第四处收口,仍守「两张字典互不相通」那一条。
|
||||
*
|
||||
* LLM 那格的单位是**钱**(人民币=龙抬头站内 ⚡,后端只取 `credits` 块),
|
||||
* 代理那格的 `surplus` 是**次数**、`scope` 说这份量属于谁的池子。
|
||||
* 两者都叫「余额」,混用一张函数就会读出「极客 ¥34」这种既不像钱也不像次的数——
|
||||
* 所以这里各写各的,跨域字段一个都不读,认不出来一律 `—`(同货源标签那条判据)。
|
||||
* ------------------------------------------------------------------ */
|
||||
|
||||
/** 后端 credits 块登记的单位;不是这个值就说明口径换了,宁可不显示也不猜。 */
|
||||
export const LLM_BALANCE_UNIT = 'CREDIT'
|
||||
|
||||
interface LlmBalanceLike {
|
||||
moduleKey?: string | null
|
||||
moduleLabel?: string | null
|
||||
channel?: string | null
|
||||
channelLabel?: string | null
|
||||
available?: boolean | null
|
||||
balance?: string | null
|
||||
availableBalance?: string | null
|
||||
frozen?: string | null
|
||||
unit?: string | null
|
||||
message?: string | null
|
||||
checkedAt?: string | null
|
||||
}
|
||||
|
||||
interface ProxyBalanceLike {
|
||||
available?: boolean | null
|
||||
surplus?: string | null
|
||||
balance?: string | null
|
||||
scope?: string | null
|
||||
message?: string | null
|
||||
}
|
||||
|
||||
/** 一行的显示内容:`text` 进格子,`title` 进悬停(整句原因与取数时刻都在那儿)。 */
|
||||
export interface BalanceLine {
|
||||
text: string
|
||||
title: string
|
||||
}
|
||||
|
||||
const BALANCE_PLACEHOLDER: BalanceLine = { text: UNKNOWN_SOURCE_LABEL, title: '本轮没取到数(不是余额为 0)' }
|
||||
const BALANCE_PENDING: BalanceLine = { text: '查询中…', title: '余额按实时查询,不落库' }
|
||||
|
||||
/** 人民币读数:解析不出数字时原样回显,不返回 `¥0`(一格 0 会被读成「没钱了」)。 */
|
||||
export function formatYuan(raw: string | null | undefined): string {
|
||||
const text = String(raw ?? '').trim()
|
||||
if (!text) return ''
|
||||
const value = Number(text.replace(/,/g, ''))
|
||||
if (!Number.isFinite(value)) return text
|
||||
return `¥${value.toFixed(2)}`
|
||||
}
|
||||
|
||||
function llmDetail(cell: LlmBalanceLike): string {
|
||||
const parts: string[] = []
|
||||
if (cell.moduleLabel) parts.push(String(cell.moduleLabel))
|
||||
const total = formatYuan(cell.balance)
|
||||
const usable = formatYuan(cell.availableBalance)
|
||||
const frozen = formatYuan(cell.frozen)
|
||||
if (total) parts.push(`总 ${total}`)
|
||||
if (usable) parts.push(`可用 ${usable}`)
|
||||
if (frozen) parts.push(`预冻结 ${frozen}`)
|
||||
if (cell.checkedAt) parts.push(`取数于 ${String(cell.checkedAt).replace('T', ' ').slice(0, 16)}`)
|
||||
const message = String(cell.message ?? '').trim()
|
||||
if (message) parts.push(message)
|
||||
return parts.join(';') || '暂无余额信息'
|
||||
}
|
||||
|
||||
/**
|
||||
* LLM 余额列:一把密钥一行,前缀是**渠道名**(钱挂在渠道账户上,不在模块上)。
|
||||
*
|
||||
* `pending=true` ⇒ 这一轮还在取数;取到但不合格(单位不是 CREDIT/available=false)
|
||||
* 一律走占位与后端原文,不显示金额。
|
||||
*/
|
||||
export function llmBalanceLine(cell: LlmBalanceLike | null | undefined, pending = false): BalanceLine {
|
||||
if (pending && !cell) return BALANCE_PENDING
|
||||
if (!cell) return BALANCE_PLACEHOLDER
|
||||
const label = known(LLM_CHANNEL_LABELS, cell.channel) ?? UNKNOWN_SOURCE_LABEL
|
||||
// 渠道认不出(LLM 列被喂了供应商名这类跨域值)时整格给占位:宁可什么都不显示,
|
||||
// 也不让一个不知道属于谁的数字或句子进界面(同货源标签那张表「跨域一律 —」的判据)
|
||||
if (label === UNKNOWN_SOURCE_LABEL) {
|
||||
return { text: UNKNOWN_SOURCE_LABEL, title: `${llmDetail(cell)}|渠道值认不出,未显示金额` }
|
||||
}
|
||||
if (!cell.available || String(cell.unit ?? '').trim().toUpperCase() !== LLM_BALANCE_UNIT) {
|
||||
const message = String(cell.message ?? '').trim()
|
||||
return { text: message ? `${label} 查不到` : `${label} ${UNKNOWN_SOURCE_LABEL}`, title: llmDetail(cell) }
|
||||
}
|
||||
const total = formatYuan(cell.balance)
|
||||
if (!total) return { text: `${label} ${UNKNOWN_SOURCE_LABEL}`, title: llmDetail(cell) }
|
||||
return { text: `${label} ${total}`, title: llmDetail(cell) }
|
||||
}
|
||||
|
||||
/**
|
||||
* LLM 余额列的整格内容:**按渠道折叠**,一个渠道一行。
|
||||
*
|
||||
* 钱挂在渠道账户上、不挂在模块上:两把密钥(外观专利/货源查询)都在龙抬头时,
|
||||
* 上游回的是同一个余额——排两遍会读成「这个账户有两笔钱」。折叠后 title 里仍留每一把的原文,
|
||||
* 运维要判「是哪把密钥的渠道」看得回来。
|
||||
*/
|
||||
export function llmBalanceLines(
|
||||
cells: Array<LlmBalanceLike | null | undefined> | null | undefined,
|
||||
pending = false,
|
||||
): BalanceLine[] {
|
||||
const list = (cells ?? []).filter((cell): cell is LlmBalanceLike => Boolean(cell))
|
||||
if (!list.length) return pending ? [BALANCE_PENDING] : []
|
||||
const grouped = new Map<string, BalanceLine>()
|
||||
for (const cell of list) {
|
||||
const key = normalizeKey(cell.channel) || 'unknown'
|
||||
const line = llmBalanceLine(cell, pending)
|
||||
const hit = grouped.get(key)
|
||||
grouped.set(key, hit ? { text: hit.text, title: `${hit.title}|${line.title}` } : line)
|
||||
}
|
||||
return [...grouped.values()]
|
||||
}
|
||||
|
||||
/** 代理池子的归属说法:platform 那份是**平台的钱**,绝不允许被读成这个用户的余量。 */
|
||||
const PROXY_SCOPE_LABELS: Record<string, string> = {
|
||||
user: '你的套餐',
|
||||
platform: '平台池',
|
||||
none: '查不了',
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理余量列:极客给「剩余 IP 次数」(单位是次、不是钱);青果按 scope=none 说查不了。
|
||||
* `scope` 认不出来时不硬认(回落「来源未标注」并保留原值进 title 供运维核)。
|
||||
*/
|
||||
export function proxyBalanceLine(cell: ProxyBalanceLike | null | undefined, pending = false): BalanceLine {
|
||||
if (pending && !cell) return BALANCE_PENDING
|
||||
if (!cell) return BALANCE_PLACEHOLDER
|
||||
const scopeKey = normalizeKey(cell.scope)
|
||||
const scopeLabel = Object.prototype.hasOwnProperty.call(PROXY_SCOPE_LABELS, scopeKey)
|
||||
? PROXY_SCOPE_LABELS[scopeKey]
|
||||
: '来源未标注'
|
||||
const message = String(cell.message ?? '').trim()
|
||||
const detailParts = [`${scopeLabel}`]
|
||||
const surplus = String(cell.surplus ?? '').trim()
|
||||
const amount = String(cell.balance ?? '').trim()
|
||||
if (surplus) detailParts.push(`剩余 IP ${surplus}`)
|
||||
if (amount) detailParts.push(`账户余额 ${amount}`)
|
||||
if (message) detailParts.push(message)
|
||||
const title = detailParts.join(';') || '暂无余量信息'
|
||||
if (!cell.available) {
|
||||
// 后端那句原文(「青果不提供余量查询…」「上游未在预算内应答…」)全在 title 里;
|
||||
// 格子只说「查不了」——留 `—` 会被读成「这人没配代理」,那是另一件事。
|
||||
return { text: message ? '查不了' : `${scopeLabel} ${UNKNOWN_SOURCE_LABEL}`, title }
|
||||
}
|
||||
// 次数就是次数:这里不套 ¥ 符号、不换算,读数带「次」把单位写在格子里
|
||||
return { text: `${scopeLabel} ${surplus || UNKNOWN_SOURCE_LABEL} 次`, title }
|
||||
}
|
||||
@@ -1,759 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
/** 品牌Gating库(biz_brand_gating 并入管理后台)· 自绘列表页,布局沿用 DedupeRegistryPage 的
|
||||
* panel-box + 双行筛选 + 旧式表格 + OldPagination,另加统计卡与新增/批量导入弹窗。 */
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import {
|
||||
createGating,
|
||||
deleteGating,
|
||||
fetchGatingPage,
|
||||
fetchGatingStats,
|
||||
importGatingText,
|
||||
updateGatingStatus,
|
||||
} from './gating-api.ts'
|
||||
import {
|
||||
GATING_COUNTRIES,
|
||||
GATING_DEFAULT_PAGE_SIZE,
|
||||
GATING_PAGE_SIZES,
|
||||
GATING_SOURCES,
|
||||
GATING_TYPES,
|
||||
createGatingFilterState,
|
||||
gatingStatusLabel,
|
||||
toGatingListParams,
|
||||
type GatingFilterState,
|
||||
type GatingItem,
|
||||
type GatingStats,
|
||||
} from './gating-model.ts'
|
||||
import { gatingImportOutcomeText, parseGatingImportText } from './gating-import.ts'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<GatingItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(GATING_DEFAULT_PAGE_SIZE)
|
||||
const filter = reactive(createGatingFilterState())
|
||||
|
||||
const stats = ref<GatingStats | null>(null)
|
||||
|
||||
const addVisible = ref(false)
|
||||
const addSaving = ref(false)
|
||||
const addForm = reactive({
|
||||
brand: '',
|
||||
asin: '',
|
||||
country: '全部',
|
||||
gatingType: '品牌gating',
|
||||
source: 'MANUAL',
|
||||
shopName: '',
|
||||
remark: '',
|
||||
})
|
||||
|
||||
const importVisible = ref(false)
|
||||
const importRunning = ref(false)
|
||||
const importText = ref('')
|
||||
/** 导入前行数预览:同一份解析规则桌面版/后端共用,前端只做提示,不做拦截。 */
|
||||
const importPreviewCount = computed(() => parseGatingImportText(importText.value).items.length)
|
||||
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
async function loadStats(): Promise<void> {
|
||||
try {
|
||||
stats.value = await fetchGatingStats()
|
||||
} catch {
|
||||
// 统计卡失败不拦列表:留空展示 0,列表自己的失败条会说话。
|
||||
stats.value = null
|
||||
}
|
||||
}
|
||||
|
||||
async function load(): Promise<void> {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchGatingPage(toGatingListParams(filter, page.value, pageSize.value))
|
||||
rows.value = result.rows
|
||||
total.value = result.total
|
||||
} catch (error) {
|
||||
loadFailure.value = loadFailureMessage(error, 'Gating列表加载失败')
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function apply(): void {
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
function resetFilter(): void {
|
||||
Object.assign(filter, createGatingFilterState())
|
||||
apply()
|
||||
}
|
||||
|
||||
function changePage(next: number): void {
|
||||
if (next < 1 || next > totalPages.value) return
|
||||
page.value = next
|
||||
void load()
|
||||
}
|
||||
|
||||
function changeSize(size: number): void {
|
||||
pageSize.value = size
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
function openAdd(): void {
|
||||
addForm.brand = ''
|
||||
addForm.asin = ''
|
||||
addForm.country = '全部'
|
||||
addForm.gatingType = '品牌gating'
|
||||
addForm.source = 'MANUAL'
|
||||
addForm.shopName = ''
|
||||
addForm.remark = ''
|
||||
addVisible.value = true
|
||||
}
|
||||
|
||||
async function submitAdd(): Promise<void> {
|
||||
const brand = addForm.brand.trim()
|
||||
if (!brand) {
|
||||
ElMessage.warning('请填写品牌')
|
||||
return
|
||||
}
|
||||
addSaving.value = true
|
||||
try {
|
||||
await createGating({
|
||||
brand,
|
||||
asin: addForm.asin.trim(),
|
||||
country: addForm.country,
|
||||
gatingType: addForm.gatingType,
|
||||
source: addForm.source,
|
||||
shopName: addForm.shopName.trim(),
|
||||
remark: addForm.remark.trim(),
|
||||
})
|
||||
addVisible.value = false
|
||||
ElMessage.success('新增成功')
|
||||
await Promise.all([load(), loadStats()])
|
||||
} catch (error) {
|
||||
showAdminFeedback(loadFailureMessage(error, '新增失败'), 'error')
|
||||
} finally {
|
||||
addSaving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function openImport(): void {
|
||||
importText.value = ''
|
||||
importVisible.value = true
|
||||
}
|
||||
|
||||
async function submitImport(): Promise<void> {
|
||||
const text = importText.value.trim()
|
||||
if (!text) {
|
||||
ElMessage.warning('请粘贴批量数据')
|
||||
return
|
||||
}
|
||||
importRunning.value = true
|
||||
try {
|
||||
const result = await importGatingText(text)
|
||||
importVisible.value = false
|
||||
ElMessage.success(gatingImportOutcomeText(result.added, result.skipped))
|
||||
await Promise.all([load(), loadStats()])
|
||||
} catch (error) {
|
||||
showAdminFeedback(loadFailureMessage(error, '导入失败'), 'error')
|
||||
} finally {
|
||||
importRunning.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 启用/停用切换:停用需二次确认(解除后排查不再拦截),恢复直接执行。 */
|
||||
async function toggleStatus(row: GatingItem): Promise<void> {
|
||||
const next: 0 | 1 = row.status === 1 ? 0 : 1
|
||||
if (next === 0) {
|
||||
const confirmed = await openAdminConfirm({ message: `确认停用品牌「${row.brand}」?停用后排查自动跳过该品牌,不再拦截`, danger: true })
|
||||
if (!confirmed) return
|
||||
}
|
||||
try {
|
||||
await updateGatingStatus(row.id, next)
|
||||
ElMessage.success(next === 1 ? '已恢复生效' : '已停用,排查不再拦截')
|
||||
await Promise.all([load(), loadStats()])
|
||||
} catch (error) {
|
||||
showAdminFeedback(loadFailureMessage(error, '状态更新失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
async function removeRow(row: GatingItem): Promise<void> {
|
||||
const confirmed = await openAdminConfirm({ message: `确认删除 ID=${row.id} 的Gating记录(品牌:${row.brand})?`, danger: true })
|
||||
if (!confirmed) return
|
||||
try {
|
||||
await deleteGating(row.id)
|
||||
ElMessage.success('已删除')
|
||||
await Promise.all([load(), loadStats()])
|
||||
} catch (error) {
|
||||
showAdminFeedback(loadFailureMessage(error, '删除失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
void load()
|
||||
void loadStats()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="gating-view">
|
||||
<section class="panel-box">
|
||||
<div class="gating-panel-head">
|
||||
<h3>品牌Gating库</h3>
|
||||
<div class="gating-head-actions">
|
||||
<button class="btn" type="button" @click="openAdd">新增</button>
|
||||
<button class="btn" type="button" @click="openImport">批量导入</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="gating-cards">
|
||||
<div class="stat-card">
|
||||
<div class="stat-n">{{ stats?.total ?? 0 }}</div>
|
||||
<div class="stat-t">Gating总记录</div>
|
||||
</div>
|
||||
<div class="stat-card stat-active">
|
||||
<div class="stat-n">{{ stats?.active ?? 0 }}</div>
|
||||
<div class="stat-t">生效中</div>
|
||||
</div>
|
||||
<div class="stat-card stat-disabled">
|
||||
<div class="stat-n">{{ stats?.disabled ?? 0 }}</div>
|
||||
<div class="stat-t">停用</div>
|
||||
</div>
|
||||
<div class="stat-card stat-brands">
|
||||
<div class="stat-n">{{ stats?.brands ?? 0 }}</div>
|
||||
<div class="stat-t">去重品牌数</div>
|
||||
</div>
|
||||
<div v-for="group in [
|
||||
{ title: '按Gating类型', data: stats?.byType ?? [] },
|
||||
{ title: '按国家', data: stats?.byCountry ?? [] },
|
||||
{ title: '按来源', data: stats?.bySource ?? [] },
|
||||
]" :key="group.title" class="stat-group">
|
||||
<div class="stat-group-title">{{ group.title }}</div>
|
||||
<div class="stat-group-body">
|
||||
<span v-for="entry in group.data" :key="entry.name" class="stat-chip">
|
||||
{{ entry.name }} <b>{{ entry.count }}</b>
|
||||
</span>
|
||||
<span v-if="!group.data.length" class="stat-chip stat-chip-empty">暂无</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="gating-filter-row">
|
||||
<div class="form-group">
|
||||
<label>关键词</label>
|
||||
<input v-model="filter.keyword" type="text" placeholder="品牌 / ASIN / 备注" @keyup.enter="apply" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="country in GATING_COUNTRIES" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Gating类型</label>
|
||||
<select v-model="filter.gatingType">
|
||||
<option value="">全部类型</option>
|
||||
<option v-for="gatingType in GATING_TYPES" :key="gatingType" :value="gatingType">{{ gatingType }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>状态</label>
|
||||
<select v-model="filter.status">
|
||||
<option value="">全部状态</option>
|
||||
<option value="1">生效</option>
|
||||
<option value="0">停用</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>来源</label>
|
||||
<select v-model="filter.source">
|
||||
<option value="">全部来源</option>
|
||||
<option v-for="source in GATING_SOURCES" :key="source" :value="source">{{ source }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="gating-filter-actions">
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
<button class="btn btn-secondary" type="button" @click="resetFilter">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll gating-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 60px">ID</th>
|
||||
<th>品牌</th>
|
||||
<th>ASIN</th>
|
||||
<th>国家</th>
|
||||
<th>Gating类型</th>
|
||||
<th style="width: 70px">状态</th>
|
||||
<th style="width: 80px">来源</th>
|
||||
<th>店铺</th>
|
||||
<th>备注</th>
|
||||
<th style="width: 150px">创建时间</th>
|
||||
<th style="width: 150px">更新时间</th>
|
||||
<th style="width: 150px">停用时间</th>
|
||||
<th style="width: 140px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="rows.length">
|
||||
<tr v-for="row in rows" :key="row.id">
|
||||
<td>{{ row.id }}</td>
|
||||
<td class="brand-cell">{{ row.brand }}</td>
|
||||
<td class="mono-cell">{{ row.asin || '-' }}</td>
|
||||
<td>{{ row.country }}</td>
|
||||
<td><span class="type-tag">{{ row.gatingType }}</span></td>
|
||||
<td>
|
||||
<span class="status-tag" :class="row.status === 1 ? 'status-on' : 'status-off'">
|
||||
{{ gatingStatusLabel(row.status) }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ row.source === 'AUTO' ? '自动同步' : '手动' }}</td>
|
||||
<td>{{ row.shopName || '-' }}</td>
|
||||
<td :title="row.remark">{{ row.remark || '-' }}</td>
|
||||
<td class="time-cell">{{ formatDateTime(row.createdAt) }}</td>
|
||||
<td class="time-cell">{{ formatDateTime(row.updatedAt) }}</td>
|
||||
<td class="time-cell">{{ formatDateTime(row.disabledAt) }}</td>
|
||||
<td class="ops-cell">
|
||||
<button class="btn btn-sm" type="button" @click="toggleStatus(row)">
|
||||
{{ row.status === 1 ? '停用' : '恢复' }}
|
||||
</button>
|
||||
<button class="btn btn-sm btn-danger" type="button" @click="removeRow(row)">删除</button>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="13" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="13" class="empty-tip">暂无Gating记录</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<OldPagination
|
||||
:total="total"
|
||||
:page="page"
|
||||
:page-size="pageSize"
|
||||
:sizes="[10, 20, 50]"
|
||||
@change="changePage"
|
||||
@size-change="changeSize"
|
||||
/>
|
||||
</section>
|
||||
|
||||
<div v-if="addVisible" class="modal-mask" @click.self="addVisible = false">
|
||||
<div class="modal">
|
||||
<h3>新增Gating品牌</h3>
|
||||
<div class="form-group">
|
||||
<label>品牌(必填)</label>
|
||||
<input v-model="addForm.brand" type="text" placeholder="请输入品牌" @keyup.enter="submitAdd" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="addForm.country">
|
||||
<option v-for="country in GATING_COUNTRIES" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Gating类型</label>
|
||||
<select v-model="addForm.gatingType">
|
||||
<option v-for="gatingType in GATING_TYPES" :key="gatingType" :value="gatingType">{{ gatingType }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>来源</label>
|
||||
<select v-model="addForm.source">
|
||||
<option v-for="source in GATING_SOURCES" :key="source" :value="source">{{ source }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>ASIN(可选)</label>
|
||||
<input v-model="addForm.asin" type="text" placeholder="请输入 ASIN" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>店铺(可选)</label>
|
||||
<input v-model="addForm.shopName" type="text" placeholder="请输入店铺名" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>备注(可选)</label>
|
||||
<input v-model="addForm.remark" type="text" placeholder="请输入备注" />
|
||||
</div>
|
||||
<div class="modal-actions">
|
||||
<button class="btn" type="button" :disabled="addSaving" @click="submitAdd">保存</button>
|
||||
<button class="btn btn-secondary" type="button" :disabled="addSaving" @click="addVisible = false">取消</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="importVisible" class="modal-mask" @click.self="importVisible = false">
|
||||
<div class="modal">
|
||||
<h3>批量导入</h3>
|
||||
<div class="form-group">
|
||||
<label>每行一条:品牌[,国家[,类型[,ASIN[,备注]]]],支持逗号/分号/Tab 分隔;# 开头为注释行</label>
|
||||
<textarea
|
||||
v-model="importText"
|
||||
class="import-textarea"
|
||||
rows="10"
|
||||
placeholder="示例:
|
||||
tory burch,英国,品牌gating
|
||||
jellycat,全部,品牌gating
|
||||
crocs,德国,类目gating"
|
||||
></textarea>
|
||||
</div>
|
||||
<div class="import-preview">将导入 {{ importPreviewCount }} 行(空行与注释行自动跳过)</div>
|
||||
<div class="modal-actions">
|
||||
<button class="btn" type="button" :disabled="importRunning" @click="submitImport">导入</button>
|
||||
<button class="btn btn-secondary" type="button" :disabled="importRunning" @click="importVisible = false">取消</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 布局与配色沿用去重总数据页(panel-box 蓝白末层样式)。 */
|
||||
.gating-view {
|
||||
font-family: inherit;
|
||||
color: var(--c-text, #24384d);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 18px;
|
||||
}
|
||||
.panel-box {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
padding: 20px 22px 24px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 14px;
|
||||
background: linear-gradient(145deg, #ffffff, #f9fbfd);
|
||||
box-shadow: 0 1px 2px rgba(39, 67, 94, 0.04), 0 14px 30px -24px rgba(39, 67, 94, 0.28);
|
||||
}
|
||||
h3 {
|
||||
margin: 0 0 16px;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
letter-spacing: 0.2px;
|
||||
}
|
||||
.gating-panel-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.gating-panel-head h3 {
|
||||
margin: 0;
|
||||
}
|
||||
.gating-head-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
}
|
||||
.gating-cards {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
flex-wrap: wrap;
|
||||
align-items: stretch;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.stat-card {
|
||||
flex: 0 0 132px;
|
||||
padding: 12px 14px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-top: 3px solid #2dd4bf;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.stat-card.stat-active { border-top-color: #34d399; }
|
||||
.stat-card.stat-disabled { border-top-color: #9ca3af; }
|
||||
.stat-card.stat-brands { border-top-color: #a78bfa; }
|
||||
.stat-n {
|
||||
font-size: 24px;
|
||||
font-weight: 700;
|
||||
color: #24384d;
|
||||
}
|
||||
.stat-t {
|
||||
margin-top: 2px;
|
||||
font-size: 12px;
|
||||
color: #7a8194;
|
||||
}
|
||||
.stat-group {
|
||||
flex: 1 1 200px;
|
||||
min-width: 0;
|
||||
padding: 10px 14px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.stat-group-title {
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: #5b6f83;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
.stat-group-body {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
}
|
||||
.stat-chip {
|
||||
padding: 2px 8px;
|
||||
border-radius: 6px;
|
||||
background: #edf4fa;
|
||||
color: #4e6479;
|
||||
font-size: 12px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.stat-chip b {
|
||||
color: #2f5d8b;
|
||||
}
|
||||
.stat-chip-empty {
|
||||
color: #9baaba;
|
||||
}
|
||||
.gating-filter-row {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(5, minmax(140px, 1fr)) auto;
|
||||
gap: 12px;
|
||||
align-items: end;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.gating-filter-row .form-group {
|
||||
min-width: 0;
|
||||
}
|
||||
.gating-filter-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 7px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.form-group label {
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select,
|
||||
.form-group textarea {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group textarea {
|
||||
min-height: 0;
|
||||
resize: vertical;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover,
|
||||
.form-group textarea:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus,
|
||||
.form-group textarea:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
min-height: 42px;
|
||||
padding: 9px 18px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 8px 18px -14px rgba(79, 120, 165, 0.72);
|
||||
transition: background 160ms ease, box-shadow 160ms ease, transform 120ms ease;
|
||||
}
|
||||
.btn:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #7094ba, #5d83ac);
|
||||
box-shadow: 0 11px 22px -14px rgba(79, 120, 165, 0.8);
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.6;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border-color: #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
.btn-danger {
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
border-color: #b35f6a;
|
||||
}
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
.btn-sm {
|
||||
min-height: 36px;
|
||||
padding: 7px 12px;
|
||||
}
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.table-scroll table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
.gating-table-scroll > table {
|
||||
min-width: 1360px;
|
||||
}
|
||||
.table-scroll th,
|
||||
.table-scroll td {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
font-size: 13.5px;
|
||||
line-height: 1.5;
|
||||
border-bottom: 1px solid #e0e8ef;
|
||||
vertical-align: middle;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.table-scroll th {
|
||||
background: #edf4fa;
|
||||
color: #4e6479;
|
||||
border-bottom-color: #d5e1eb;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.4px;
|
||||
}
|
||||
.table-scroll tbody tr:hover td {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.table-scroll tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.brand-cell {
|
||||
font-weight: 650;
|
||||
}
|
||||
.mono-cell {
|
||||
font-family: "Cascadia Mono", "SF Mono", Consolas, "Courier New", monospace;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.time-cell {
|
||||
color: #6b7280;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.type-tag {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 6px;
|
||||
background: #fef3c7;
|
||||
color: #b45309;
|
||||
font-size: 12px;
|
||||
}
|
||||
.status-tag {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 6px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.status-on {
|
||||
background: #d1fae5;
|
||||
color: #10b981;
|
||||
}
|
||||
.status-off {
|
||||
background: #e5e7eb;
|
||||
color: #9ca3af;
|
||||
}
|
||||
.ops-cell {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
white-space: nowrap;
|
||||
text-align: right;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 44px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.modal-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 3000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 40px 20px;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(6px);
|
||||
}
|
||||
.modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(560px, 100%);
|
||||
max-height: 84vh;
|
||||
padding: 22px 24px;
|
||||
border: 1px solid #c7d7e5;
|
||||
border-radius: 14px;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 22px 60px rgba(39, 67, 94, 0.2);
|
||||
overflow-y: auto;
|
||||
}
|
||||
.modal .form-group {
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
.modal-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-top: 16px;
|
||||
}
|
||||
.import-textarea {
|
||||
height: 180px;
|
||||
}
|
||||
.import-preview {
|
||||
font-size: 12.5px;
|
||||
color: #5b6f83;
|
||||
}
|
||||
</style>
|
||||
@@ -1,75 +0,0 @@
|
||||
/** 品牌Gating库 API 适配:GET/POST/DELETE /api/admin/brand-gating(契约路径与字段不得擅改)。 */
|
||||
import { http } from '@/api/http'
|
||||
import { unwrap } from '@/api/envelope'
|
||||
import {
|
||||
parseGatingPage,
|
||||
parseGatingStats,
|
||||
toGatingItem,
|
||||
type GatingItem,
|
||||
type GatingPageResult,
|
||||
type GatingStats,
|
||||
} from './gating-model.ts'
|
||||
|
||||
export const GATING_ENDPOINT = '/api/admin/brand-gating'
|
||||
|
||||
/** 列表:GET /api/admin/brand-gating?page&size&keyword&country&gatingType&status&source → { total, rows }。 */
|
||||
export async function fetchGatingPage(params: Record<string, string | number>): Promise<GatingPageResult> {
|
||||
const { data } = await http.get<unknown>(GATING_ENDPOINT, { params })
|
||||
return parseGatingPage(data)
|
||||
}
|
||||
|
||||
/** 统计:GET /api/admin/brand-gating/stats → { total, active, disabled, brands, byType, byCountry, bySource }。 */
|
||||
export async function fetchGatingStats(): Promise<GatingStats> {
|
||||
const { data } = await http.get<unknown>(`${GATING_ENDPOINT}/stats`)
|
||||
return parseGatingStats(data)
|
||||
}
|
||||
|
||||
/** 单条新增字段(驼峰);source/shopName 可缺省由后端落默认。 */
|
||||
export interface GatingCreatePayload {
|
||||
brand: string
|
||||
asin: string
|
||||
country: string
|
||||
gatingType: string
|
||||
source: string
|
||||
shopName: string
|
||||
remark: string
|
||||
}
|
||||
|
||||
/** 新增:POST /api/admin/brand-gating → { added }。 */
|
||||
export async function createGating(payload: GatingCreatePayload): Promise<number> {
|
||||
const { data } = await http.post<unknown>(GATING_ENDPOINT, payload)
|
||||
const core = unwrap<Record<string, unknown>>(data)
|
||||
const added = core && typeof core === 'object' ? Number((core as Record<string, unknown>).added) : NaN
|
||||
return Number.isFinite(added) ? added : 0
|
||||
}
|
||||
|
||||
/** 删除:DELETE /api/admin/brand-gating/{id} → { deleted }。 */
|
||||
export async function deleteGating(id: number): Promise<void> {
|
||||
const { data } = await http.delete<unknown>(`${GATING_ENDPOINT}/${id}`)
|
||||
unwrap<unknown>(data)
|
||||
}
|
||||
|
||||
/**
|
||||
* 启用/停用:POST /api/admin/brand-gating/{id}/status body { status } → { updated }。
|
||||
* 停用(status=0)由后端记 disabled_at=NOW(),恢复(status=1)清空 disabled_at。
|
||||
*/
|
||||
export async function updateGatingStatus(id: number, status: 0 | 1): Promise<void> {
|
||||
const { data } = await http.post<unknown>(`${GATING_ENDPOINT}/${id}/status`, { status })
|
||||
unwrap<unknown>(data)
|
||||
}
|
||||
|
||||
/** 批量导入:POST /api/admin/brand-gating/import body { text } → { added, skipped }。原始文本整段交后端解析。 */
|
||||
export async function importGatingText(text: string): Promise<{ added: number; skipped: number }> {
|
||||
const { data } = await http.post<unknown>(`${GATING_ENDPOINT}/import`, { text })
|
||||
const core = unwrap<Record<string, unknown>>(data)
|
||||
const record = (core && typeof core === 'object' ? core : {}) as Record<string, unknown>
|
||||
const added = Number(record.added)
|
||||
const skipped = Number(record.skipped)
|
||||
return {
|
||||
added: Number.isFinite(added) ? added : 0,
|
||||
skipped: Number.isFinite(skipped) ? skipped : 0,
|
||||
}
|
||||
}
|
||||
|
||||
/** 单条解析出口(供需要单取的场景复用,例如挂载测试构造数据)。 */
|
||||
export { toGatingItem, type GatingItem }
|
||||
@@ -1,66 +0,0 @@
|
||||
/** 批量导入文本解析(照抄桌面版 gating_web_admin.py parse_batch 的行格式与跳过规则)。
|
||||
* 纯逻辑、零依赖(tests/gating-import.test.ts 用 node --test 直连本文件)。
|
||||
*
|
||||
* 口径(与桌面版 L208-223 逐条对齐):
|
||||
* - 按行拆分;每行去首尾空白与 BOM(\uFEFF);
|
||||
* - 空行与以 # 开头的注释行跳过;
|
||||
* - 行内按中英文逗号/分号/制表符([,\t;,;])切分,各段去空白后丢掉空段;
|
||||
* - 字段序:品牌(必留)、国家(缺省「全部」)、Gating类型(缺省「品牌gating」)、ASIN(缺省空)、备注(缺省空);
|
||||
* 第 5 列之后的段照桌面版丢弃。
|
||||
*
|
||||
* 前端只用它做导入前的行数预览;真正提交仍把原始文本整段交给后端
|
||||
* (POST /api/admin/brand-gating/import { text },去重与入库由后端按同一份规则解析)。 */
|
||||
|
||||
export interface GatingImportItem {
|
||||
brand: string
|
||||
country: string
|
||||
gatingType: string
|
||||
asin: string
|
||||
remark: string
|
||||
}
|
||||
|
||||
export interface GatingImportParseResult {
|
||||
items: GatingImportItem[]
|
||||
/** 因空行/注释行/纯分隔符行被跳过的行数。 */
|
||||
skippedLines: number
|
||||
}
|
||||
|
||||
export const GATING_IMPORT_DEFAULT_COUNTRY = '全部'
|
||||
export const GATING_IMPORT_DEFAULT_TYPE = '品牌gating'
|
||||
/** 与桌面版一致的列分隔符:中英文逗号、中英文分号、制表符。 */
|
||||
const FIELD_SPLIT_RE = /[,\t;,;]/
|
||||
|
||||
/** 解析批量导入文本;永不抛错(坏行计入 skippedLines)。 */
|
||||
export function parseGatingImportText(text: string): GatingImportParseResult {
|
||||
const items: GatingImportItem[] = []
|
||||
let skippedLines = 0
|
||||
const lines = String(text ?? '').split(/\r?\n/)
|
||||
for (const rawLine of lines) {
|
||||
const line = rawLine.trim().replace(/^\uFEFF/, '').trim()
|
||||
if (!line || line.startsWith('#')) {
|
||||
if (rawLine.trim()) skippedLines += 1
|
||||
continue
|
||||
}
|
||||
const parts = line
|
||||
.split(FIELD_SPLIT_RE)
|
||||
.map((part) => part.trim())
|
||||
.filter((part) => part.length > 0)
|
||||
if (!parts.length) {
|
||||
skippedLines += 1
|
||||
continue
|
||||
}
|
||||
items.push({
|
||||
brand: parts[0],
|
||||
country: parts[1] ?? GATING_IMPORT_DEFAULT_COUNTRY,
|
||||
gatingType: parts[2] ?? GATING_IMPORT_DEFAULT_TYPE,
|
||||
asin: parts[3] ?? '',
|
||||
remark: parts[4] ?? '',
|
||||
})
|
||||
}
|
||||
return { items, skippedLines }
|
||||
}
|
||||
|
||||
/** 导入完成反馈文案:新增 X 条,跳过重复 Y 条。 */
|
||||
export function gatingImportOutcomeText(added: number, skipped: number): string {
|
||||
return `批量导入完成:新增 ${added} 条,跳过重复 ${skipped} 条`
|
||||
}
|
||||
@@ -1,183 +0,0 @@
|
||||
/** 品牌Gating库页面模型(biz_brand_gating 并入管理后台):类型、字典、筛选态与响应解析。
|
||||
* 纯逻辑、零依赖(tests/gating-model.test.ts 用 node --test 直连本文件,别 import 带 @ 别名/axios 的模块)。 */
|
||||
|
||||
export interface GatingItem {
|
||||
id: number
|
||||
brand: string
|
||||
asin: string
|
||||
country: string
|
||||
gatingType: string
|
||||
/** 1=生效 0=停用。 */
|
||||
status: number
|
||||
source: string
|
||||
shopName: string
|
||||
remark: string
|
||||
createdAt?: string
|
||||
updatedAt?: string
|
||||
disabledAt?: string
|
||||
}
|
||||
|
||||
export interface GatingPageResult {
|
||||
rows: GatingItem[]
|
||||
total: number
|
||||
}
|
||||
|
||||
/** 分组统计单行(GET stats 的 byType/byCountry/bySource)。 */
|
||||
export interface GatingNameCount {
|
||||
name: string
|
||||
count: number
|
||||
}
|
||||
|
||||
export interface GatingStats {
|
||||
total: number
|
||||
active: number
|
||||
disabled: number
|
||||
brands: number
|
||||
byType: GatingNameCount[]
|
||||
byCountry: GatingNameCount[]
|
||||
bySource: GatingNameCount[]
|
||||
}
|
||||
|
||||
export interface GatingFilterState {
|
||||
/** 品牌/ASIN/备注 LIKE 关键词。 */
|
||||
keyword: string
|
||||
country: string
|
||||
gatingType: string
|
||||
/** '' = 全部;'1' 生效;'0' 停用。 */
|
||||
status: string
|
||||
source: string
|
||||
}
|
||||
|
||||
/** 国家字典:与桌面版 gating_web_admin 下拉一致;'全部' 是表内真实取值(不限国家时用空串)。 */
|
||||
export const GATING_COUNTRIES = ['全部', '英国', '德国', '法国', '西班牙', '意大利'] as const
|
||||
export const GATING_TYPES = ['品牌gating', '类目gating', '账户不符合'] as const
|
||||
export const GATING_SOURCES = ['AUTO', 'MANUAL'] as const
|
||||
/** 每页条数档位(默认 10,可选 20/50)。 */
|
||||
export const GATING_PAGE_SIZES = [10, 20, 50] as const
|
||||
export const GATING_DEFAULT_PAGE_SIZE = 10
|
||||
|
||||
export function createGatingFilterState(): GatingFilterState {
|
||||
return { keyword: '', country: '', gatingType: '', status: '', source: '' }
|
||||
}
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
function intOr(value: unknown, fallback: number): number {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : fallback
|
||||
}
|
||||
|
||||
/** 解析单条记录;缺 id 视为无效。兼容 camel 与 snake 字段名。 */
|
||||
export function toGatingItem(raw: unknown): GatingItem | null {
|
||||
if (!raw || typeof raw !== 'object') return null
|
||||
const record = raw as Record<string, unknown>
|
||||
const id = intOr(record.id, 0)
|
||||
if (id <= 0) return null
|
||||
const item: GatingItem = {
|
||||
id,
|
||||
brand: text(record.brand),
|
||||
asin: text(record.asin),
|
||||
country: text(record.country),
|
||||
gatingType: text(record.gatingType ?? record.gating_type),
|
||||
status: intOr(record.status, 0),
|
||||
source: text(record.source),
|
||||
shopName: text(record.shopName ?? record.shop_name),
|
||||
remark: text(record.remark),
|
||||
}
|
||||
const createdAt = text(record.createdAt ?? record.created_at)
|
||||
const updatedAt = text(record.updatedAt ?? record.updated_at)
|
||||
const disabledAt = text(record.disabledAt ?? record.disabled_at)
|
||||
if (createdAt) item.createdAt = createdAt
|
||||
if (updatedAt) item.updatedAt = updatedAt
|
||||
if (disabledAt) item.disabledAt = disabledAt
|
||||
return item
|
||||
}
|
||||
|
||||
/** 解析列表负载({ total, rows };rows 兼容 items 别名),空负载回空页。 */
|
||||
export function parseGatingPage(payload: unknown): GatingPageResult {
|
||||
const out: GatingPageResult = { rows: [], total: 0 }
|
||||
if (!payload || typeof payload !== 'object') return out
|
||||
const record = payload as Record<string, unknown>
|
||||
const rawRows = Array.isArray(record.rows) ? record.rows : Array.isArray(record.items) ? record.items : []
|
||||
out.rows = rawRows
|
||||
.map((raw) => toGatingItem(raw))
|
||||
.filter((item): item is GatingItem => item !== null)
|
||||
out.total = intOr(record.total, out.rows.length)
|
||||
return out
|
||||
}
|
||||
|
||||
/** 分组统计单组:数组 [{name,count}] 或桌面版遗留 dict({品牌gating: 3})都收。 */
|
||||
export function parseGatingNameCountList(raw: unknown): GatingNameCount[] {
|
||||
if (Array.isArray(raw)) {
|
||||
const out: GatingNameCount[] = []
|
||||
for (const item of raw) {
|
||||
if (!item || typeof item !== 'object') continue
|
||||
const record = item as Record<string, unknown>
|
||||
const name = text(record.name)
|
||||
if (!name) continue
|
||||
out.push({ name, count: intOr(record.count, 0) })
|
||||
}
|
||||
return out
|
||||
}
|
||||
if (raw && typeof raw === 'object') {
|
||||
const out: GatingNameCount[] = []
|
||||
for (const [name, count] of Object.entries(raw as Record<string, unknown>)) {
|
||||
if (!name) continue
|
||||
out.push({ name, count: intOr(count, 0) })
|
||||
}
|
||||
return out
|
||||
}
|
||||
return []
|
||||
}
|
||||
|
||||
/** 解析统计负载;缺省字段回 0/空数组。 */
|
||||
export function parseGatingStats(payload: unknown): GatingStats {
|
||||
const out: GatingStats = {
|
||||
total: 0,
|
||||
active: 0,
|
||||
disabled: 0,
|
||||
brands: 0,
|
||||
byType: [],
|
||||
byCountry: [],
|
||||
bySource: [],
|
||||
}
|
||||
if (!payload || typeof payload !== 'object') return out
|
||||
const record = payload as Record<string, unknown>
|
||||
out.total = intOr(record.total, 0)
|
||||
out.active = intOr(record.active, 0)
|
||||
out.disabled = intOr(record.disabled, 0)
|
||||
out.brands = intOr(record.brands, 0)
|
||||
out.byType = parseGatingNameCountList(record.byType ?? record.by_type)
|
||||
out.byCountry = parseGatingNameCountList(record.byCountry ?? record.by_country)
|
||||
out.bySource = parseGatingNameCountList(record.bySource ?? record.by_source)
|
||||
return out
|
||||
}
|
||||
|
||||
/** 筛选态 + 分页 → 列表查询参数(page/size/keyword/country/gatingType/status/source);空白值不下发。 */
|
||||
export function toGatingListParams(
|
||||
state: GatingFilterState,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
): Record<string, string | number> {
|
||||
const params: Record<string, string | number> = {
|
||||
page: page >= 1 ? Math.floor(page) : 1,
|
||||
size: pageSize >= 1 ? Math.floor(pageSize) : GATING_DEFAULT_PAGE_SIZE,
|
||||
}
|
||||
const keyword = (state.keyword || '').trim()
|
||||
const country = (state.country || '').trim()
|
||||
const gatingType = (state.gatingType || '').trim()
|
||||
const status = (state.status || '').trim()
|
||||
const source = (state.source || '').trim()
|
||||
if (keyword) params.keyword = keyword
|
||||
if (country) params.country = country
|
||||
if (gatingType) params.gatingType = gatingType
|
||||
if (status === '1' || status === '0') params.status = status
|
||||
if (source) params.source = source
|
||||
return params
|
||||
}
|
||||
|
||||
/** 状态 → 展示文案;非 1 一律按停用。 */
|
||||
export function gatingStatusLabel(status: unknown): string {
|
||||
return status === 1 ? '生效' : '停用'
|
||||
}
|
||||
@@ -0,0 +1,288 @@
|
||||
<script setup lang="ts">
|
||||
/** 批量编辑分类对话框(2026-11-17 用户口径「店铺分类弹窗删了,加个批量编辑分类」):
|
||||
* 京东数据库页勾选商品(翻页累计,由页面持有勾选集)→ 本对话框选目标分类或移出分类 →
|
||||
* 一次批量归类。归属写「本组」的归属行(biz_jd_product_group_assign,V203 一组一商品一行),
|
||||
* 归类不置人工编辑锁(采集照常更新价格/库存)。本组无分类时只有提示不给提交
|
||||
* (移出对未分类行是无谓操作),引导去工具栏「分类管理」新建(2026-11-17 独立页并回本页)。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { batchAssignJdProductGroup, type JdProductGroup } from './jd-product-api.ts'
|
||||
import { requestErrorMessage } from '../../api/envelope.ts'
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
/** 当前数据权限分组(归类的落点组;V203 同一商品在其他组可另归一类)。 */
|
||||
ownerGroupId: number
|
||||
ownerGroupName: string
|
||||
/** 当前分组的分类选项(含商品数徽标;由页面在打开时刷新)。 */
|
||||
categories: JdProductGroup[]
|
||||
/** 页面持有的勾选集(跨页累计),展开成 id 数组传入。 */
|
||||
selectedIds: number[]
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{ (event: 'close'): void; (event: 'done', updated: number, targetName: string | null): void }>()
|
||||
|
||||
/** 选中的目标分类 id;0=移出分类(回到未分类)。 */
|
||||
const pickedId = ref(0)
|
||||
const assigning = ref(false)
|
||||
const errorText = ref('')
|
||||
|
||||
const picked = computed(() => props.categories.find((group) => group.id === pickedId.value) || null)
|
||||
const confirmText = computed(() => (picked.value ? `归入「${picked.value.name}」` : '移出分类'))
|
||||
/** 提交条件:有勾选、未在提交中,且选了目标分类(pickedId>0)或选了移出(pickedId=0,
|
||||
* 但本组得有分类可移——全组无分类时移出是无谓操作,整对话框只留提示)。 */
|
||||
const canSubmit = computed(() => props.selectedIds.length > 0 && !assigning.value
|
||||
&& (picked.value ? true : props.categories.length > 0))
|
||||
|
||||
watch(
|
||||
() => props.visible,
|
||||
(visible) => {
|
||||
if (visible) {
|
||||
pickedId.value = 0
|
||||
errorText.value = ''
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
async function submit(): Promise<void> {
|
||||
if (!canSubmit.value) return
|
||||
const target = picked.value
|
||||
assigning.value = true
|
||||
errorText.value = ''
|
||||
try {
|
||||
// target null=移出分类(groupId 传 null,后端只解挂本组归属行)。
|
||||
const updated = await batchAssignJdProductGroup(
|
||||
props.selectedIds,
|
||||
target ? target.id : null,
|
||||
props.ownerGroupId,
|
||||
)
|
||||
emit('done', updated, target ? target.name : null)
|
||||
emit('close')
|
||||
} catch (error) {
|
||||
errorText.value = requestErrorMessage(error) || '批量归类失败'
|
||||
} finally {
|
||||
assigning.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="visible" class="modal-mask" @click.self="emit('close')">
|
||||
<div class="batch-modal">
|
||||
<div class="modal-head">
|
||||
<h3>批量编辑分类<span v-if="ownerGroupName" class="modal-sub">· {{ ownerGroupName }}</span></h3>
|
||||
<button class="modal-close" type="button" aria-label="关闭" @click="emit('close')">×</button>
|
||||
</div>
|
||||
<p class="modal-tip">
|
||||
已勾选 {{ selectedIds.length }} 个商品(翻页累计)。选目标分类后确认;
|
||||
归类只记在分类归属上,不影响采集对价格/库存的更新。
|
||||
</p>
|
||||
<p v-if="errorText" class="group-error">{{ errorText }}</p>
|
||||
|
||||
<div v-if="!categories.length" class="batch-empty">本组暂无分类,先用工具栏「分类管理」新建一个</div>
|
||||
<ul v-else class="option-list">
|
||||
<li
|
||||
v-for="group in categories"
|
||||
:key="group.id"
|
||||
class="option-row"
|
||||
:class="{ active: pickedId === group.id }"
|
||||
@click="pickedId = group.id"
|
||||
>
|
||||
<span class="option-radio" aria-hidden="true"></span>
|
||||
<span class="option-name" :title="group.name">{{ group.name }}</span>
|
||||
<span class="option-meta">{{ group.productCount }}</span>
|
||||
</li>
|
||||
<li class="option-row option-detach" :class="{ active: pickedId === 0 }" @click="pickedId = 0">
|
||||
<span class="option-radio" aria-hidden="true"></span>
|
||||
<span class="option-name">移出分类</span>
|
||||
<span class="option-meta">回到未分类</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="modal-foot">
|
||||
<button class="btn btn-secondary" type="button" @click="emit('close')">取消</button>
|
||||
<button class="btn" type="button" :disabled="!canSubmit" @click="submit">
|
||||
{{ assigning ? '提交中...' : confirmText }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.modal-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 2800;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 40px 20px;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(6px);
|
||||
}
|
||||
.batch-modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(430px, 100%);
|
||||
max-height: 80vh;
|
||||
padding: 18px 20px 20px;
|
||||
border: 1px solid #c7d7e5;
|
||||
border-radius: 14px;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 22px 60px rgba(39, 67, 94, 0.2);
|
||||
}
|
||||
.modal-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.modal-head h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
}
|
||||
.modal-sub {
|
||||
margin-left: 6px;
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
}
|
||||
.modal-close {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 9px;
|
||||
background: none;
|
||||
color: #5b6f83;
|
||||
font-size: 20px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.modal-close:hover {
|
||||
border-color: #cbd9e6;
|
||||
background: #eef4fa;
|
||||
color: #24384d;
|
||||
}
|
||||
.modal-tip {
|
||||
margin: 8px 0 10px;
|
||||
color: #8293a5;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
.group-error {
|
||||
margin: 0 0 8px;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid #f0c9c2;
|
||||
border-radius: 10px;
|
||||
background: #fdf1ef;
|
||||
color: #a04432;
|
||||
font-size: 13px;
|
||||
}
|
||||
.batch-empty {
|
||||
padding: 26px 12px;
|
||||
border: 1px dashed #cbd9e6;
|
||||
border-radius: 10px;
|
||||
color: #8293a5;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
}
|
||||
.option-list {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
border-top: 1px solid #e7eef5;
|
||||
}
|
||||
.option-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 10px 8px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.option-row:hover {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
/* 点亮=归类目标:与旧弹窗左栏同款左缘蓝条。 */
|
||||
.option-row.active {
|
||||
background: #e8f1fa;
|
||||
box-shadow: inset 3px 0 0 #4f78a5;
|
||||
}
|
||||
.option-radio {
|
||||
flex: none;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
border: 1.6px solid #9fb7cd;
|
||||
border-radius: 50%;
|
||||
background: #ffffff;
|
||||
}
|
||||
.option-row.active .option-radio {
|
||||
border-color: #4f78a5;
|
||||
background: radial-gradient(circle, #4f78a5 0 4px, #ffffff 4.6px);
|
||||
}
|
||||
.option-name {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #24384d;
|
||||
}
|
||||
.option-detach .option-name {
|
||||
color: #a04432;
|
||||
}
|
||||
.option-meta {
|
||||
flex: none;
|
||||
min-width: 22px;
|
||||
padding: 1px 7px;
|
||||
border-radius: 9px;
|
||||
background: #eef4fa;
|
||||
color: #4e6479;
|
||||
font-size: 12px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.option-detach .option-meta {
|
||||
background: transparent;
|
||||
color: #8293a5;
|
||||
}
|
||||
.modal-foot {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 10px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 38px;
|
||||
padding: 7px 16px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.6;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border-color: #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,469 @@
|
||||
<script setup lang="ts">
|
||||
/** 京东数据库「类目」筛选的京麦同款级联面板(2026-11-16 客户口径「京麦类目是这些 我们
|
||||
* 后台的现在的不对」+「你直接爬」→ 树数据换成京麦授权类目真树,见 ./jd-category-tree.ts
|
||||
* 头注释的取证来源与边界)。
|
||||
*
|
||||
* 交互(京麦真机同款,2026-11-16 面板逐级点开取证):面板按点亮路径动态出栏——第一栏
|
||||
* 一级(3 个)、后续栏=点亮节点的 children(最深 4 栏);**非末级行点击=下钻**(推进
|
||||
* 路径)、**末级行(children 空)点击=选中**(radio 蓝,emit change→按 category_path
|
||||
* 等值过滤,后端契约零改动)。搜索框搜**树内全部末级**(名称或路径命中,行 title 带
|
||||
* 全路径);树外命中(已落库但京麦类目体系变更后的历史名)从 options 兜底段选,语义
|
||||
* 同旧版第三栏。「全部类目」行=清选;触发框已选时出 × 清除;面板外点透明遮罩关闭。
|
||||
* 零依赖自绘(radio 圆点/箭头都是 CSS),无 element 依赖。 */
|
||||
import { computed, nextTick, ref, watch } from 'vue'
|
||||
import {
|
||||
jdCategoryChildren,
|
||||
jdCategoryRoots,
|
||||
jdCategorySearchLeaves,
|
||||
type JdCategoryNode,
|
||||
} from './jd-category-tree.ts'
|
||||
import { clampPanelLeftX } from './jd-category-cascader-position.ts'
|
||||
|
||||
const props = defineProps<{
|
||||
/** 已落库末级类目全集(/categories 现算,页面传入)——只作**树外兜底**(搜索无树内
|
||||
* 命中时列出「已落库类目(树外历史)」段),不再默认铺第三栏。 */
|
||||
options?: { name: string; productCount: number }[]
|
||||
/** 当前选中末级类目名;'' = 全部类目。 */
|
||||
modelValue: string
|
||||
groups?: { id: number; name: string; productCount: number }[]
|
||||
groupId?: string
|
||||
createVersion?: number
|
||||
busy?: boolean
|
||||
treeOnly?: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(event: 'change', value: string): void
|
||||
(event: 'group', value: string): void
|
||||
(event: 'create-group', value: string): void
|
||||
(event: 'delete-group', id: number): void
|
||||
}>()
|
||||
const newGroupName = ref('')
|
||||
watch(() => props.createVersion, () => { newGroupName.value = '' })
|
||||
function createGroup(): void {
|
||||
const name = newGroupName.value.trim()
|
||||
if (name) emit('create-group', name)
|
||||
}
|
||||
function pickGroup(id: number): void {
|
||||
emit('group', String(id))
|
||||
close()
|
||||
}
|
||||
|
||||
const open = ref(false)
|
||||
/** 已下钻的节点名路径(非末级行点击推进)。 */
|
||||
const activePath = ref<string[]>([])
|
||||
const searchText = ref('')
|
||||
|
||||
/** 面板水平定位钳制(2026-11-16「超出视窗了」):触发框在筛选行中部偏右时,锚 left:0
|
||||
* 的多栏面板会伸出视窗右缘。打开与栏数/搜索态变化后用真实 rect 重算 left 偏移——
|
||||
* 右缘贴齐视口后继续下钻即向左生长,不再截掉末栏。钳制数学在
|
||||
* ./jd-category-cascader-position.ts(纯函数,tests/jd-category-cascader-position.test.ts)。 */
|
||||
const hostRef = ref<HTMLElement | null>(null)
|
||||
const panelRef = ref<HTMLElement | null>(null)
|
||||
const panelOffsetX = ref(0)
|
||||
|
||||
function reposition(): void {
|
||||
const host = hostRef.value
|
||||
const panel = panelRef.value
|
||||
if (!host || !panel) return
|
||||
panelOffsetX.value = clampPanelLeftX({
|
||||
hostLeft: host.getBoundingClientRect().left,
|
||||
panelWidth: panel.offsetWidth,
|
||||
viewportWidth: window.innerWidth,
|
||||
})
|
||||
}
|
||||
|
||||
const roots = jdCategoryRoots()
|
||||
/** 树内全部末级名集合(判定 options 哪些是「树外历史」)。 */
|
||||
const treeLeafNames = new Set(
|
||||
jdCategorySearchLeaves('').map((leaf) => leaf.name),
|
||||
)
|
||||
|
||||
/** 面板各栏内容:第 0 栏一级,第 i+1 栏=点亮路径前 i+1 个的 children(路径推进到
|
||||
* 末级时末栏是叶子所在栏,children 空不出栏——栏数随路径动态 1~4)。 */
|
||||
const columns = computed<JdCategoryNode[][]>(() => {
|
||||
const cols: JdCategoryNode[][] = [roots]
|
||||
for (let i = 0; i < activePath.value.length; i++) {
|
||||
const children = jdCategoryChildren(activePath.value.slice(0, i + 1))
|
||||
if (!children.length) break
|
||||
cols.push(children)
|
||||
}
|
||||
return cols
|
||||
})
|
||||
|
||||
/** 搜索激活=搜索词非空:面板切换成扁平末级结果列表。 */
|
||||
const searching = computed(() => searchText.value.trim().length > 0)
|
||||
|
||||
/** 树内命中末级(名称或路径段命中)。 */
|
||||
const searchLeaves = computed(() =>
|
||||
searching.value ? jdCategorySearchLeaves(searchText.value) : [],
|
||||
)
|
||||
|
||||
/** 树外兜底:options 里不在树名集的行按搜索词过滤(历史行仍可选中过滤)。 */
|
||||
const fallbackOptions = computed(() => {
|
||||
if (!searching.value) return []
|
||||
const keyword = searchText.value.trim().toLowerCase()
|
||||
return (props.options ?? [])
|
||||
.filter((option) => !treeLeafNames.has(option.name))
|
||||
.filter((option) => option.name.toLowerCase().includes(keyword))
|
||||
})
|
||||
|
||||
/** 栏数随下钻动态 1~4、搜索态切单栏 ⇒ 面板宽度变,开着就要重算偏移(下钻向左生长)。 */
|
||||
watch(
|
||||
() => [columns.value.length, searching.value] as const,
|
||||
() => {
|
||||
if (open.value) nextTick(reposition)
|
||||
},
|
||||
)
|
||||
|
||||
function toggle(): void {
|
||||
if (open.value) {
|
||||
close()
|
||||
return
|
||||
}
|
||||
activePath.value = []
|
||||
searchText.value = ''
|
||||
open.value = true
|
||||
nextTick(reposition)
|
||||
}
|
||||
|
||||
function close(): void {
|
||||
open.value = false
|
||||
activePath.value = []
|
||||
}
|
||||
|
||||
/** 非末级行点击=下钻;末级行点击=选中并收面板。 */
|
||||
function pick(node: JdCategoryNode, depth: number): void {
|
||||
if (node.children && node.children.length) {
|
||||
activePath.value = [...activePath.value.slice(0, depth), node.name]
|
||||
return
|
||||
}
|
||||
emit('change', node.name)
|
||||
close()
|
||||
}
|
||||
|
||||
function pickAll(): void {
|
||||
emit('change', '')
|
||||
close()
|
||||
}
|
||||
|
||||
/** 搜索结果行点击(树内末级或树外兜底行)=按名选中。 */
|
||||
function pickName(name: string): void {
|
||||
emit('change', name)
|
||||
close()
|
||||
}
|
||||
|
||||
function clear(): void {
|
||||
emit('change', '')
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div ref="hostRef" class="cat-cascader">
|
||||
<button
|
||||
class="cat-trigger"
|
||||
type="button"
|
||||
:class="{ open, filled: !!modelValue || !!groupId }"
|
||||
@click="toggle"
|
||||
>
|
||||
<span class="cat-trigger-text" :title="modelValue || ''">{{ groups?.find(group => String(group.id) === groupId)?.name || modelValue || '全部类目' }}</span>
|
||||
<span
|
||||
v-if="modelValue || groupId"
|
||||
class="cat-clear"
|
||||
role="button"
|
||||
aria-label="清除类目"
|
||||
@click.stop="clear"
|
||||
>×</span>
|
||||
<span class="cat-chevron" aria-hidden="true"></span>
|
||||
</button>
|
||||
|
||||
<!-- 面板外点透明遮罩关闭(零 document 监听器,无泄漏面)。 -->
|
||||
<div v-if="open" class="cat-mask" @click="close"></div>
|
||||
<div v-if="open" ref="panelRef" class="cat-panel" :style="{ left: `${panelOffsetX}px` }">
|
||||
<div v-if="!treeOnly" class="cat-custom cat-col-custom">
|
||||
<div class="cat-seg">自定义分类</div>
|
||||
<form class="cat-create" @submit.prevent="createGroup">
|
||||
<input v-model="newGroupName" class="cat-search" placeholder="新建分类" aria-label="新建分类名称" />
|
||||
<button type="submit" :disabled="busy || !newGroupName.trim()">添加</button>
|
||||
</form>
|
||||
<div v-for="group in groups || []" :key="group.id" class="cat-row" :class="{ active: groupId === String(group.id) }">
|
||||
<button type="button" class="cat-group-pick" :title="group.name" @click="pickGroup(group.id)">{{ group.name }}({{ group.productCount }})</button>
|
||||
<button type="button" :aria-label="`删除分类 ${group.name}`" @click.stop="emit('delete-group', group.id)">删除</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 搜索态:树内末级命中+树外兜底段(扁平列表,行 title 带全路径)。 -->
|
||||
<template v-if="searching">
|
||||
<div class="cat-col cat-col-search">
|
||||
<div class="cat-search-row"><input v-model="searchText" type="text" class="cat-search" placeholder="搜索类目" /></div>
|
||||
<template v-if="searchLeaves.length || fallbackOptions.length">
|
||||
<div
|
||||
v-for="leaf in searchLeaves"
|
||||
:key="`tree-${leaf.path.join('/')}`"
|
||||
class="cat-row"
|
||||
:class="{ active: modelValue === leaf.name }"
|
||||
:title="leaf.path.join(' > ')"
|
||||
@click="pickName(leaf.name)"
|
||||
>
|
||||
<span class="cat-dot" :class="{ on: modelValue === leaf.name }" aria-hidden="true"></span>
|
||||
<span class="cat-name">{{ leaf.name }}</span>
|
||||
<span class="cat-path">{{ leaf.path.slice(0, -1).join(' › ') }}</span>
|
||||
</div>
|
||||
<div v-if="fallbackOptions.length" class="cat-seg">已落库类目(树外历史)</div>
|
||||
<div
|
||||
v-for="option in fallbackOptions"
|
||||
:key="`db-${option.name}`"
|
||||
class="cat-row"
|
||||
:class="{ active: modelValue === option.name }"
|
||||
:title="option.name"
|
||||
@click="pickName(option.name)"
|
||||
>
|
||||
<span class="cat-dot" :class="{ on: modelValue === option.name }" aria-hidden="true"></span>
|
||||
<span class="cat-name">{{ option.name }}</span>
|
||||
<span class="cat-count">{{ option.productCount }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<div v-else class="cat-empty">未找到类目</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- 下钻态:逐级动态栏;首栏顶部「全部类目」行=清选。 -->
|
||||
<template v-else>
|
||||
<div
|
||||
v-for="(col, depth) in columns"
|
||||
:key="depth"
|
||||
class="cat-col"
|
||||
>
|
||||
<div v-if="depth === 0" class="cat-search-row">
|
||||
<input
|
||||
v-model="searchText"
|
||||
type="text"
|
||||
class="cat-search"
|
||||
placeholder="搜索类目"
|
||||
@click.stop
|
||||
/>
|
||||
</div>
|
||||
<div v-if="depth === 0" class="cat-row cat-row-all" :class="{ active: !modelValue }" @click="pickAll">
|
||||
<span class="cat-dot" :class="{ on: !modelValue }" aria-hidden="true"></span>
|
||||
<span class="cat-name">全部类目</span>
|
||||
</div>
|
||||
<div
|
||||
v-for="node in col"
|
||||
:key="`${depth}-${node.name}`"
|
||||
class="cat-row"
|
||||
:class="{ active: activePath[depth] === node.name || (depth === 0 && modelValue === node.name) }"
|
||||
:title="node.name"
|
||||
@click="pick(node, depth)"
|
||||
>
|
||||
<span class="cat-dot" aria-hidden="true"></span>
|
||||
<span class="cat-name">{{ node.name }}</span>
|
||||
<span v-if="node.children && node.children.length" class="cat-arrow" aria-hidden="true">›</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.cat-custom { flex: none; width: 200px; max-height: 340px; overflow-y: auto; border-right: 1px solid #e7eef5; }
|
||||
.cat-create { display: flex; gap: 4px; padding: 6px 8px; }
|
||||
.cat-create input { min-width: 0; }
|
||||
.cat-group-pick { flex: 1; min-width: 0; text-align: left; border: 0; background: transparent; color: inherit; cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.cat-cascader {
|
||||
position: relative;
|
||||
min-width: 0;
|
||||
}
|
||||
/* 触发框像素对齐页面 .form-group select(42 高/9 圆角/#cbd9e6 边框/#f8fbfd 底)。 */
|
||||
.cat-trigger {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
width: 100%;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
cursor: pointer;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.cat-trigger:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.cat-trigger.open,
|
||||
.cat-trigger:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.cat-trigger-text {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
text-align: left;
|
||||
}
|
||||
.cat-trigger:not(.filled) .cat-trigger-text {
|
||||
color: #8293a5;
|
||||
}
|
||||
.cat-clear {
|
||||
flex: none;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 50%;
|
||||
background: #e7eef5;
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
line-height: 1;
|
||||
}
|
||||
.cat-clear:hover {
|
||||
background: #dbe7f1;
|
||||
color: #24384d;
|
||||
}
|
||||
/* 下拉箭头:CSS 三角(京麦同款向下 chevron,展开翻向上)。 */
|
||||
.cat-chevron {
|
||||
flex: none;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 5px solid transparent;
|
||||
border-right: 5px solid transparent;
|
||||
border-top: 6px solid #7b8a99;
|
||||
transition: transform 160ms ease;
|
||||
}
|
||||
.cat-trigger.open .cat-chevron {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
.cat-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 2550;
|
||||
}
|
||||
.cat-panel {
|
||||
position: absolute;
|
||||
top: calc(100% + 4px);
|
||||
left: 0;
|
||||
z-index: 2560;
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
max-width: min(820px, 90vw);
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 16px 44px rgba(39, 67, 94, 0.18);
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
}
|
||||
.cat-col {
|
||||
flex: none;
|
||||
width: 200px;
|
||||
max-height: 340px;
|
||||
overflow-y: auto;
|
||||
padding: 6px 0;
|
||||
border-right: 1px solid #e7eef5;
|
||||
}
|
||||
.cat-col:last-child {
|
||||
border-right: 0;
|
||||
}
|
||||
.cat-col-search {
|
||||
width: 300px;
|
||||
}
|
||||
/* 行=京麦同款:圆点 radio + 名称 + 右箭头;hover 浅蓝底。 */
|
||||
.cat-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 8px 12px;
|
||||
font-size: 13.5px;
|
||||
color: #24384d;
|
||||
cursor: pointer;
|
||||
}
|
||||
.cat-row:hover,
|
||||
.cat-row.active {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.cat-row.active {
|
||||
color: #2f5d8b;
|
||||
font-weight: 550;
|
||||
}
|
||||
.cat-dot {
|
||||
flex: none;
|
||||
width: 13px;
|
||||
height: 13px;
|
||||
border: 1px solid #c0ccda;
|
||||
border-radius: 50%;
|
||||
background: #ffffff;
|
||||
}
|
||||
/* radio 选中=京麦同款蓝芯。 */
|
||||
.cat-dot.on {
|
||||
border-color: #3b82c4;
|
||||
background: radial-gradient(circle, #3b82c4 0 4px, #ffffff 4.6px);
|
||||
}
|
||||
.cat-name {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 搜索态行尾的路径灰字(同名跨支时定位用)。 */
|
||||
.cat-path {
|
||||
flex: none;
|
||||
max-width: 110px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #9fb0c0;
|
||||
font-size: 12px;
|
||||
}
|
||||
.cat-arrow {
|
||||
flex: none;
|
||||
color: #9fb0c0;
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
}
|
||||
.cat-count {
|
||||
flex: none;
|
||||
color: #8293a5;
|
||||
font-size: 12px;
|
||||
}
|
||||
.cat-seg {
|
||||
padding: 8px 12px 4px;
|
||||
color: #8293a5;
|
||||
font-size: 11.5px;
|
||||
border-top: 1px solid #e7eef5;
|
||||
}
|
||||
.cat-search-row {
|
||||
padding: 4px 8px 6px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
}
|
||||
.cat-search {
|
||||
display: block;
|
||||
width: 100%;
|
||||
min-height: 30px;
|
||||
padding: 4px 10px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 8px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 12.5px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
}
|
||||
.cat-search:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
}
|
||||
.cat-empty {
|
||||
padding: 16px 12px;
|
||||
color: #8293a5;
|
||||
font-size: 12.5px;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,454 @@
|
||||
<script setup lang="ts">
|
||||
/** 分类管理对话框(2026-11-17 用户口径「京东分类管理并到京东数据库分类编辑里,
|
||||
* 做一个搜索和添加 删除 编辑 分类名称即可」):原 V204 独立子菜单页(JdCategoryManagerPage)
|
||||
* 整体并入本对话框,从京东数据库页工具栏「分类管理」打开。
|
||||
* 职责不变:当前数据权限分组的分类建/改名/删除+新增的名称搜索;商品归类不在这里
|
||||
* (去「批量编辑分类」)。列表状态自管理(写操作后自刷新并 emit changed 让父页刷筛选下拉)。
|
||||
* 权限口径(V203)不变:本组管理员/公司超管/平台超管可写(editable);同组普通号
|
||||
* 只读可看(无新建行,改名/删除按钮逐行不渲染),后端同口径 403 兜底。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import {
|
||||
createJdProductGroup,
|
||||
deleteJdProductGroup,
|
||||
fetchJdProductGroups,
|
||||
updateJdProductGroup,
|
||||
type JdProductGroup,
|
||||
} from './jd-product-api.ts'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import { requestErrorMessage } from '../../api/envelope.ts'
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
/** 当前数据权限分组(分类的作用域;<=0=不属于任何分组,只留空态)。 */
|
||||
ownerGroupId: number
|
||||
ownerGroupName: string
|
||||
/** 当前分组可写(scope 的 editable):建/改名/删除控件全挂它。 */
|
||||
editable: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{ (event: 'close'): void; (event: 'changed'): void }>()
|
||||
|
||||
const loading = ref(false)
|
||||
/** 首屏取数失败(可见红条+重试);写操作失败走 errorText 红条(无重试语义)。 */
|
||||
const loadFailure = ref('')
|
||||
const errorText = ref('')
|
||||
const groups = ref<JdProductGroup[]>([])
|
||||
/** 搜索:按分类名称包含过滤(本地过滤,不另发请求)。 */
|
||||
const keyword = ref('')
|
||||
/** 新建:只收名称(排序输入 2026-11-15 客户口径下线,sortOrder 恒 0,后端契约不变)。 */
|
||||
const createName = ref('')
|
||||
const creating = ref(false)
|
||||
/** 改名:正在编辑的分类 id 与草稿名。 */
|
||||
const editingId = ref(0)
|
||||
const editingName = ref('')
|
||||
const saving = ref(false)
|
||||
|
||||
const canCreate = computed(() => props.editable && createName.value.trim().length > 0 && !creating.value && !saving.value)
|
||||
/** 搜索命中(名称包含,大小写不敏感;空关键字=全量)。 */
|
||||
const filteredGroups = computed(() => {
|
||||
const kw = keyword.value.trim().toLowerCase()
|
||||
if (!kw) return groups.value
|
||||
return groups.value.filter((group) => group.name.toLowerCase().includes(kw))
|
||||
})
|
||||
/** 空表文案分四种:不属于任何组 / 本组没分类(可管理)/ 本组没分类(只读)/ 搜索无命中。 */
|
||||
const emptyListText = computed(() => {
|
||||
if (props.ownerGroupId <= 0) return '你还不属于任何数据权限分组'
|
||||
if (!groups.value.length) {
|
||||
return props.editable ? '本组暂无分类,先新建一个' : '本组暂无分类'
|
||||
}
|
||||
return '没有匹配的分类'
|
||||
})
|
||||
|
||||
async function loadGroups(): Promise<void> {
|
||||
if (props.ownerGroupId <= 0) {
|
||||
groups.value = []
|
||||
loading.value = false
|
||||
loadFailure.value = ''
|
||||
errorText.value = ''
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
groups.value = await fetchJdProductGroups(props.ownerGroupId)
|
||||
} catch (error) {
|
||||
loadFailure.value = loadFailureMessage(error, '分类列表加载失败')
|
||||
groups.value = []
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function submitCreate(): Promise<void> {
|
||||
const name = createName.value.trim()
|
||||
if (!name || creating.value || !props.editable) return
|
||||
creating.value = true
|
||||
errorText.value = ''
|
||||
try {
|
||||
await createJdProductGroup({ name, sortOrder: 0, ownerGroupId: props.ownerGroupId })
|
||||
createName.value = ''
|
||||
keyword.value = ''
|
||||
showAdminFeedback(`已新建分类「${name}」`, 'success')
|
||||
emit('changed')
|
||||
await loadGroups()
|
||||
} catch (error) {
|
||||
errorText.value = requestErrorMessage(error) || '新建分类失败'
|
||||
} finally {
|
||||
creating.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function startRename(group: JdProductGroup): void {
|
||||
editingId.value = group.id
|
||||
editingName.value = group.name
|
||||
errorText.value = ''
|
||||
}
|
||||
|
||||
function cancelRename(): void {
|
||||
editingId.value = 0
|
||||
editingName.value = ''
|
||||
}
|
||||
|
||||
async function submitRename(group: JdProductGroup): Promise<void> {
|
||||
const name = editingName.value.trim()
|
||||
if (!name || saving.value) return
|
||||
saving.value = true
|
||||
errorText.value = ''
|
||||
try {
|
||||
await updateJdProductGroup(group.id, { name, sortOrder: group.sortOrder })
|
||||
groups.value = groups.value.map((item) => (item.id === group.id ? { ...item, name } : item))
|
||||
cancelRename()
|
||||
showAdminFeedback(`已把分类改名为「${name}」`, 'success')
|
||||
emit('changed')
|
||||
} catch (error) {
|
||||
errorText.value = requestErrorMessage(error) || '改名失败'
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 删除分类不删商品:只解挂本组归属行(商品回到未分类),后端 JdProductGroupService.delete。 */
|
||||
async function removeGroup(group: JdProductGroup): Promise<void> {
|
||||
const ok = await openAdminConfirm({ title: '删除分类', message: `确定删除分类「${group.name}」吗?删除后该分类下 ${group.productCount} 个商品回到未分类。`, confirmText: '确认删除', danger: true })
|
||||
if (!ok || saving.value) return
|
||||
saving.value = true
|
||||
errorText.value = ''
|
||||
try {
|
||||
await deleteJdProductGroup(group.id)
|
||||
showAdminFeedback(`已删除分类「${group.name}」`, 'success')
|
||||
emit('changed')
|
||||
await loadGroups()
|
||||
} catch (error) {
|
||||
errorText.value = requestErrorMessage(error) || '删除分类失败'
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.visible,
|
||||
(visible) => {
|
||||
if (visible) {
|
||||
keyword.value = ''
|
||||
errorText.value = ''
|
||||
loadFailure.value = ''
|
||||
cancelRename()
|
||||
createName.value = ''
|
||||
void loadGroups()
|
||||
}
|
||||
},
|
||||
// immediate:对话框可能以 visible=true 直接挂载(测试/复用场景),这时也要首取。
|
||||
{ immediate: true },
|
||||
)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="visible" class="modal-mask" @click.self="emit('close')">
|
||||
<div class="manage-modal">
|
||||
<div class="modal-head">
|
||||
<h3>分类管理<span v-if="ownerGroupName" class="modal-sub">· {{ ownerGroupName }}</span></h3>
|
||||
<button class="modal-close" type="button" aria-label="关闭" @click="emit('close')">×</button>
|
||||
</div>
|
||||
<p class="modal-tip">
|
||||
分类按「数据权限分组」隔离,当前组{{ editable ? '只组长/超管可维护' : '由组长/超管维护' }};
|
||||
给商品归类:关掉本框,勾选商品后点「批量编辑分类」。
|
||||
</p>
|
||||
|
||||
<div class="manage-bar">
|
||||
<input v-model="keyword" class="search-input" type="text" placeholder="搜索分类名称" aria-label="搜索分类名称" />
|
||||
<div v-if="editable" class="group-create">
|
||||
<input v-model="createName" type="text" placeholder="输入新分类名称" aria-label="新分类名称" @keyup.enter="submitCreate" />
|
||||
<button class="btn" type="button" :disabled="!canCreate" @click="submitCreate">新建</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="loadGroups" />
|
||||
<p v-if="errorText" class="group-error">{{ errorText }}</p>
|
||||
|
||||
<ul class="option-list">
|
||||
<template v-if="filteredGroups.length">
|
||||
<li v-for="group in filteredGroups" :key="group.id" class="option-row">
|
||||
<template v-if="editingId === group.id">
|
||||
<input v-model="editingName" class="rename-input" type="text" aria-label="分类新名称" @keyup.enter="submitRename(group)" />
|
||||
<span class="row-actions">
|
||||
<button class="btn btn-sm" type="button" :disabled="saving" @click="submitRename(group)">保存</button>
|
||||
<button class="btn btn-sm btn-secondary" type="button" @click="cancelRename">取消</button>
|
||||
</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<span class="option-name" :title="group.name">{{ group.name }}</span>
|
||||
<span class="option-meta" title="该分类下的商品数">{{ group.productCount }}</span>
|
||||
<span v-if="editable" class="row-actions">
|
||||
<button class="btn btn-sm btn-secondary" type="button" :disabled="saving" @click="startRename(group)">改名</button>
|
||||
<button class="btn btn-sm btn-danger" type="button" :disabled="saving" @click="removeGroup(group)">删除</button>
|
||||
</span>
|
||||
</template>
|
||||
</li>
|
||||
</template>
|
||||
<li v-else-if="loading" class="manage-empty">加载中...</li>
|
||||
<li v-else class="manage-empty">{{ emptyListText }}</li>
|
||||
</ul>
|
||||
|
||||
<div class="modal-foot">
|
||||
<button class="btn btn-secondary" type="button" @click="emit('close')">关闭</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.modal-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 2800;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 40px 20px;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(6px);
|
||||
}
|
||||
.manage-modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(480px, 100%);
|
||||
max-height: 80vh;
|
||||
padding: 18px 20px 20px;
|
||||
border: 1px solid #c7d7e5;
|
||||
border-radius: 14px;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 22px 60px rgba(39, 67, 94, 0.2);
|
||||
}
|
||||
.modal-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.modal-head h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
}
|
||||
.modal-sub {
|
||||
margin-left: 6px;
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
}
|
||||
.modal-close {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 9px;
|
||||
background: none;
|
||||
color: #5b6f83;
|
||||
font-size: 20px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.modal-close:hover {
|
||||
border-color: #cbd9e6;
|
||||
background: #eef4fa;
|
||||
color: #24384d;
|
||||
}
|
||||
.modal-tip {
|
||||
margin: 8px 0 10px;
|
||||
color: #8293a5;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
.manage-bar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.search-input,
|
||||
.group-create input {
|
||||
min-height: 36px;
|
||||
padding: 6px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.search-input:hover,
|
||||
.group-create input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.search-input:focus,
|
||||
.group-create input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.search-input {
|
||||
flex: 1;
|
||||
min-width: 140px;
|
||||
}
|
||||
.group-create {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
gap: 8px;
|
||||
min-width: 220px;
|
||||
}
|
||||
.group-create input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.group-error {
|
||||
margin: 0 0 8px;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid #f0c9c2;
|
||||
border-radius: 10px;
|
||||
background: #fdf1ef;
|
||||
color: #a04432;
|
||||
font-size: 13px;
|
||||
}
|
||||
.option-list {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
border-top: 1px solid #e7eef5;
|
||||
}
|
||||
.option-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 9px 8px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.option-row:hover {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.option-name {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #24384d;
|
||||
}
|
||||
.option-meta {
|
||||
flex: none;
|
||||
min-width: 22px;
|
||||
padding: 1px 7px;
|
||||
border-radius: 9px;
|
||||
background: #eef4fa;
|
||||
color: #4e6479;
|
||||
font-size: 12px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.row-actions {
|
||||
flex: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.manage-empty {
|
||||
padding: 30px 12px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13px;
|
||||
list-style: none;
|
||||
}
|
||||
.rename-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
min-height: 32px;
|
||||
padding: 4px 10px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 8px;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
}
|
||||
.rename-input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
}
|
||||
.modal-foot {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 10px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 36px;
|
||||
padding: 6px 14px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.55;
|
||||
}
|
||||
.btn-sm {
|
||||
min-height: 28px;
|
||||
padding: 3px 10px;
|
||||
font-size: 12.5px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
.btn-sm:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border-color: #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
/* 危险动作与全站 .btn-danger 同形(实心红渐变+白字)。 */
|
||||
.btn-danger {
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
border-color: #b35f6a;
|
||||
color: #ffffff;
|
||||
}
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,526 @@
|
||||
<script setup lang="ts">
|
||||
/** 京东公共商品库:支持分类和京麦类目组合筛选。
|
||||
* V203(2026-11-16 用户口径):分类按「数据权限分组」隔离——不同组看不到彼此的分类,
|
||||
* 能看多组的人用筛选行「分组」下拉切换当前组(只有一组时锁定显示)。
|
||||
* 2026-11-17 用户口径:店铺分类弹窗下线,本页工具栏改「批量编辑分类」——勾选商品
|
||||
* (翻页累计记忆)后选目标分类归入或移出;同日第二刀「京东分类管理并到京东数据库分类
|
||||
* 编辑里」:V204 独立子菜单页(JdCategoryManagerPage)下线,建/改名/删分类收进工具栏
|
||||
* 「分类管理」对话框(JdCategoryManageDialog,带名称搜索)。 */
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import {
|
||||
deleteJdProducts,
|
||||
fetchJdCategoryScope,
|
||||
fetchJdProductCategories,
|
||||
fetchJdProductGroups,
|
||||
fetchJdProductList,
|
||||
type JdCategoryGroupOption,
|
||||
type JdProductCategoryOption,
|
||||
type JdProductGroup,
|
||||
} from './jd-product-api.ts'
|
||||
import type { JdProductItem } from './jd-product-model.ts'
|
||||
import { jdPriceRange } from './jd-product-model.ts'
|
||||
import { createJdProductFilterState } from './jd-product-filter.ts'
|
||||
import JdProductDetailDrawer from './JdProductDetailDrawer.vue'
|
||||
import JdProductEditDrawer from './JdProductEditDrawer.vue'
|
||||
import JdCategoryCascader from './JdCategoryCascader.vue'
|
||||
import JdBatchAssignDialog from './JdBatchAssignDialog.vue'
|
||||
import JdCategoryManageDialog from './JdCategoryManageDialog.vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
|
||||
/** 写权限口径(2026-11-16 用户口径):商品行写(编辑/删除/勾选批量删)只对平台超级管理员渲染;
|
||||
* 分类写(建/改名/删除、归类)由 scope 的每组 editable 决定(本组管理员/公司超管/平台超管)。 */
|
||||
const session = useAdminSessionStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<JdProductItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(20)
|
||||
const filter = reactive(createJdProductFilterState())
|
||||
/** 分类作用域(V203):可见分组 + 每组可写标记。失败静默回空作用域(分类列全空但商品照常)。 */
|
||||
const categoryScope = ref<JdCategoryGroupOption[]>([])
|
||||
const scopeDefaultGroupId = ref(0)
|
||||
/** 当前分组(数据权限分组 id):分类列/分类筛选/分类管理的共同作用域。 */
|
||||
const ownerGroupId = ref(0)
|
||||
/** 当前分组的分类下拉选项(按 ownerGroupId 取,切组即换)。 */
|
||||
const groupOptions = ref<JdProductGroup[]>([])
|
||||
/** 类目下拉选项(京麦末级类目):与当前行集同源(公共库全量);失败静默回空。 */
|
||||
const categoryOptions = ref<JdProductCategoryOption[]>([])
|
||||
const detailItem = ref<JdProductItem | null>(null)
|
||||
const detailVisible = ref(false)
|
||||
/** 批量编辑分类对话框(2026-11-17 替代下线的店铺分类弹窗)。 */
|
||||
const batchEditVisible = ref(false)
|
||||
/** 分类管理对话框(2026-11-17 第二刀:独立子菜单页并进来,建/改名/删+搜索)。 */
|
||||
const manageVisible = ref(false)
|
||||
/** 行级编辑抽屉(2026-11-15 用户口径「每一条数据后面 需要编辑或者删除;编辑的话
|
||||
* 这里面都是可以编辑的」):删除走下面的 removeOne(同一条删除链),编辑走独立抽屉。 */
|
||||
const editItem = ref<JdProductItem | null>(null)
|
||||
const editVisible = ref(false)
|
||||
|
||||
/** 当前分组的下拉项(带 editable)——分类写入口与「店铺分类」弹窗的可管理档都读它。 */
|
||||
const currentGroupOption = computed<JdCategoryGroupOption | null>(() =>
|
||||
categoryScope.value.find((group) => group.id === ownerGroupId.value) || null)
|
||||
const currentGroupName = computed(() => currentGroupOption.value?.name || '')
|
||||
/** 分类可管理(建/改名/删除/归类):本组管理员、公司超管、平台超管(后端 scope 判)。 */
|
||||
const canManageCategories = computed(() => currentGroupOption.value?.editable === true)
|
||||
/** 勾选列服务两类写:批量删除(只超管)+批量编辑分类(本组可写分类的管理员也要勾)。
|
||||
* 2026-11-17 弹窗下线后管理员失去弹窗右栏的勾选面 ⇒ 勾选列必须对「本组可写」放开,
|
||||
* 否则本组管理员没有归类入口。商品行按钮(编辑/删除/删除勾选)仍只归平台超管。 */
|
||||
const hasSelectionColumn = computed(() => isSuperAdmin.value || canManageCategories.value)
|
||||
/** 空态行 colspan:勾选列有无决定 5/6/7 列三种形状(超管含操作列)。 */
|
||||
const emptyColspan = computed(() => (isSuperAdmin.value ? 7 : hasSelectionColumn.value ? 6 : 5))
|
||||
/** 分组下拉只在能看多组时才渲染;只有一组(含无可见组)时按锁定态展示。 */
|
||||
const canSwitchGroup = computed(() => categoryScope.value.length > 1)
|
||||
|
||||
function openEdit(item: JdProductItem): void {
|
||||
editItem.value = item
|
||||
editVisible.value = true
|
||||
}
|
||||
|
||||
function closeEdit(): void {
|
||||
editVisible.value = false
|
||||
editItem.value = null
|
||||
}
|
||||
|
||||
/** 编辑保存成功:刷新列表(该行已置人工编辑锁,标题/价格等即时可见且不再被采集覆盖)。 */
|
||||
async function onEditSaved(): Promise<void> {
|
||||
await load()
|
||||
}
|
||||
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampJdSyncedRange(): void {
|
||||
const [s, e] = orderedPair(filter.syncedFrom, filter.syncedTo)
|
||||
filter.syncedFrom = s
|
||||
filter.syncedTo = e
|
||||
}
|
||||
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
/** 作用域 → 分组列表 → 该组分类:失败一律静默降级(分类只是筛选/归类面,不拦首屏行集)。 */
|
||||
async function loadCategoryScope(): Promise<void> {
|
||||
try {
|
||||
const scope = await fetchJdCategoryScope()
|
||||
categoryScope.value = scope.groups
|
||||
scopeDefaultGroupId.value = scope.defaultGroupId ?? 0
|
||||
} catch {
|
||||
categoryScope.value = []
|
||||
scopeDefaultGroupId.value = 0
|
||||
}
|
||||
// 当前分组:保留用户已选(仍可见时),否则回默认(可见组第一项)。
|
||||
const keep = categoryScope.value.some((group) => group.id === ownerGroupId.value)
|
||||
if (!keep) ownerGroupId.value = scopeDefaultGroupId.value
|
||||
await loadGroupOptions()
|
||||
}
|
||||
|
||||
/** 当前分组的分类选项:按 ownerGroupId 取(跨组不可见);失败静默回空下拉。 */
|
||||
async function loadGroupOptions(): Promise<void> {
|
||||
try {
|
||||
groupOptions.value = await fetchJdProductGroups(ownerGroupId.value)
|
||||
} catch {
|
||||
groupOptions.value = []
|
||||
}
|
||||
}
|
||||
|
||||
/** 类目选项同分组口径:失败静默回空下拉(可见「全部类目」),不拦首屏行集。 */
|
||||
async function loadCategoryOptions(): Promise<void> {
|
||||
try {
|
||||
categoryOptions.value = await fetchJdProductCategories()
|
||||
} catch {
|
||||
categoryOptions.value = []
|
||||
}
|
||||
}
|
||||
|
||||
/** 切换「分组」下拉:分类筛选(属于上一组的分类)清空,分类选项换成本组,回第一页重取。
|
||||
* 勾选集是按商品 id 记的(跨页累计),切组不清——归类的落点组随 ownerGroupId 走,
|
||||
* 误跨组批量归类由批量对话框里的组名标注防住。 */
|
||||
async function changeOwnerGroup(next: number): Promise<void> {
|
||||
if (next === ownerGroupId.value) return
|
||||
ownerGroupId.value = next
|
||||
filter.groupId = ''
|
||||
await loadGroupOptions()
|
||||
page.value = 1
|
||||
await load()
|
||||
}
|
||||
|
||||
/** 打开批量编辑分类:先刷一遍当前组分类(商品数徽标要新鲜),再亮对话框。 */
|
||||
async function openBatchEdit(): Promise<void> {
|
||||
await loadGroupOptions()
|
||||
batchEditVisible.value = true
|
||||
}
|
||||
|
||||
/** 打开分类管理(对话框自取列表);入口对所有人渲染——同组普通号只读可看(V203),
|
||||
* 写控件由对话框按 editable 分档。 */
|
||||
function openManage(): void {
|
||||
manageVisible.value = true
|
||||
}
|
||||
|
||||
/** 分类管理里有写操作(建/改/删):刷一遍筛选下拉与商品数徽标。 */
|
||||
async function onManaged(): Promise<void> {
|
||||
await loadGroupOptions()
|
||||
}
|
||||
|
||||
/** 批量归类完成(对话框已关):清勾选+重取列表(行集 groupName 变了)。
|
||||
* 移出分类 targetName 为 null;updated 是后端实际写入/解挂的归属行数。 */
|
||||
async function onBatchAssigned(updated: number, targetName: string | null): Promise<void> {
|
||||
showAdminFeedback(
|
||||
targetName ? `已把 ${updated} 个商品归入「${targetName}」` : `已把 ${updated} 个商品移出分类`,
|
||||
'success',
|
||||
)
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
}
|
||||
|
||||
async function load(): Promise<void> {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchJdProductList({
|
||||
page: page.value,
|
||||
pageSize: pageSize.value,
|
||||
productCode: filter.productCode,
|
||||
titleKeyword: filter.titleKeyword,
|
||||
category: filter.category,
|
||||
groupId: filter.groupId,
|
||||
ownerGroupId: ownerGroupId.value,
|
||||
syncedFrom: filter.syncedFrom,
|
||||
syncedTo: filter.syncedTo,
|
||||
})
|
||||
rows.value = result.items
|
||||
total.value = result.total
|
||||
if (result.page >= 1) page.value = result.page
|
||||
// 勾选跨页记忆(2026-11-17 用户口径「支持勾选翻页也要记住」):翻页/重取/改筛选都
|
||||
// 不清勾选集——批量编辑分类与批量删除都按累计 id 提交,操作前的确认弹窗点名数量;
|
||||
// 「清除勾选」按钮同日用户口径删除,勾选只在批量操作成功后自动清。
|
||||
} catch (error) {
|
||||
loadFailure.value = loadFailureMessage(error, '京东商品列表加载失败')
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function apply(): void {
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
/** 类目级联面板点末级即查:选完立刻按该类目过滤刷新(回第一页),同分组下拉口径;
|
||||
* 点「全部类目」/触发框 × = 清选重查。 */
|
||||
function onCategoryPicked(name: string): void {
|
||||
filter.category = name
|
||||
apply()
|
||||
}
|
||||
|
||||
/** 重置:筛选面回出厂空态,回第一页重取。 */
|
||||
function reset(): void {
|
||||
Object.assign(filter, createJdProductFilterState())
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
function changePage(next: number): void {
|
||||
if (next < 1 || next > totalPages.value) return
|
||||
page.value = next
|
||||
void load()
|
||||
}
|
||||
|
||||
function changeSize(size: number) {
|
||||
pageSize.value = size
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
function openDetail(item: JdProductItem): void {
|
||||
detailItem.value = item
|
||||
detailVisible.value = true
|
||||
}
|
||||
|
||||
function closeDetail(): void {
|
||||
detailVisible.value = false
|
||||
detailItem.value = null
|
||||
}
|
||||
|
||||
/** 商品编码一键复制(京麦同款 ⧉):@click.stop 防冒泡开抽屉;剪贴板不可用(非安全上下文)时弹失败文案。 */
|
||||
async function copyText(text: string): Promise<void> {
|
||||
if (!text) return
|
||||
try {
|
||||
await navigator.clipboard.writeText(text)
|
||||
showAdminFeedback(`已复制 ${text}`, 'success')
|
||||
} catch {
|
||||
showAdminFeedback('复制失败,请手动选择复制', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- 删除(先删桶、全成功才删库行,语义在后端 JdProductDeleteService) ----------------
|
||||
|
||||
/** 勾选集(按商品 id,跨页累计记忆,2026-11-17 用户口径)。翻页/重取不清;显式出口
|
||||
* 曾是工具栏「清除勾选」,同日用户口径「清除勾选这个按钮删除」后只剩批量删除/
|
||||
* 批量归类成功后自动清。 */
|
||||
const selectedIds = ref<Set<number>>(new Set())
|
||||
const deleting = ref(false)
|
||||
|
||||
const selectedCount = computed(() => selectedIds.value.size)
|
||||
|
||||
function toggleSelect(row: JdProductItem, checked: boolean): void {
|
||||
const next = new Set(selectedIds.value)
|
||||
if (checked) next.add(row.id)
|
||||
else next.delete(row.id)
|
||||
selectedIds.value = next
|
||||
}
|
||||
|
||||
const allSelected = computed(() => rows.value.length > 0 && rows.value.every((row) => selectedIds.value.has(row.id)))
|
||||
|
||||
function toggleSelectAll(checked: boolean): void {
|
||||
const next = new Set(selectedIds.value)
|
||||
for (const row of rows.value) {
|
||||
if (checked) next.add(row.id)
|
||||
else next.delete(row.id)
|
||||
}
|
||||
selectedIds.value = next
|
||||
}
|
||||
|
||||
/** 单行删除入口(行内按钮):确认弹窗点名商品编码与「桶内图片一并删除」。 */
|
||||
async function removeOne(row: JdProductItem): Promise<void> {
|
||||
await removeMany([row.id], `确定删除商品「${row.productCode || row.title}」吗?`)
|
||||
}
|
||||
|
||||
/** 批量删除入口(工具栏按钮):按累计勾选 id 直删(跨页的行也在内),确认弹窗点名总数。 */
|
||||
async function removeSelected(): Promise<void> {
|
||||
await removeMany([...selectedIds.value], `确定删除勾选的 ${selectedIds.value.size} 个商品吗?`)
|
||||
}
|
||||
|
||||
/** 删除主流程:二次确认 → 先删桶、全成功才删库行(后端保证)→ 刷新列表并清勾选。 */
|
||||
async function removeMany(ids: number[], message: string): Promise<void> {
|
||||
if (!ids.length || deleting.value) return
|
||||
const ok = await openAdminConfirm({ title: '删除京东商品', message: `${message}删除后该商品的 SKU、图片登记与 jd-products 桶内图片文件一并删除(被其他商品共用的图片会保留);此操作不可恢复。`, confirmText: '确认删除', danger: true })
|
||||
if (!ok) return
|
||||
deleting.value = true
|
||||
try {
|
||||
const receipt = await deleteJdProducts(ids)
|
||||
showAdminFeedback(`已删除 ${receipt.deleted} 个商品,清理 ${receipt.objectsDeleted} 个图片文件` +
|
||||
(receipt.objectsKept ? `(${receipt.objectsKept} 个共用图片保留)` : ''), 'success')
|
||||
selectedIds.value = new Set()
|
||||
if (ids.length >= rows.value.length && page.value > 1) page.value -= 1
|
||||
await load()
|
||||
} catch (error) {
|
||||
const text = error instanceof Error && error.message ? error.message : '删除失败,请稍后重试'
|
||||
showAdminFeedback(text, 'error')
|
||||
} finally {
|
||||
deleting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
// 先解析作用域再取列表:首屏的 owner_group_id 必须与分类下拉同一个组(铁律 30 同形——
|
||||
// 不要先发一条不带 owner_group_id 的列表请求再补,两次请求会落在不同默认组上)。
|
||||
await loadCategoryScope()
|
||||
void loadCategoryOptions()
|
||||
await load()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="jd-database-view">
|
||||
<section class="panel-box">
|
||||
<div class="jd-panel-head">
|
||||
<h3>京东数据库</h3>
|
||||
</div>
|
||||
|
||||
<div class="jd-filter-row">
|
||||
<div class="form-group">
|
||||
<label>商品编码</label>
|
||||
<input v-model="filter.productCode" type="text" placeholder="输入商品编码" @keyup.enter="apply" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>标题关键字</label>
|
||||
<input v-model="filter.titleKeyword" type="text" placeholder="输入标题关键字" @keyup.enter="apply" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>类目</label>
|
||||
<!-- 类目(京麦末级类目)京麦同款级联面板(2026-11-16 客户口径):一/二级为静态导航
|
||||
(采集链无层级数据),第三栏已落库末级+搜索,点行选中即查(回第一页)。 -->
|
||||
<JdCategoryCascader
|
||||
:options="categoryOptions"
|
||||
:model-value="filter.category"
|
||||
tree-only
|
||||
@change="onCategoryPicked"
|
||||
/>
|
||||
</div>
|
||||
<div v-if="categoryScope.length" class="form-group">
|
||||
<label>分组</label>
|
||||
<!-- 当前分组(V203):能看多组的人(平台超管/公司超管)下拉切换;只有一组时锁定显示组名。
|
||||
2026-11-16 用户口径「做成分组」:从工具栏裸下拉上移进筛选行,做成带标签的表单控件
|
||||
(与其他筛选同壳同圆角)。分组是分类列/分类筛选/分类管理的作用域,不是筛选条件
|
||||
⇒ 放在筛选行也只是占位,「重置」不清它(挂载测试钉住)。 -->
|
||||
<select
|
||||
v-if="canSwitchGroup"
|
||||
:value="ownerGroupId"
|
||||
aria-label="当前分组"
|
||||
@change="changeOwnerGroup(Number(($event.target as HTMLSelectElement).value))"
|
||||
>
|
||||
<option v-for="group in categoryScope" :key="group.id" :value="group.id">{{ group.label }}</option>
|
||||
</select>
|
||||
<span v-else class="jd-group-locked" title="你的数据权限内只有这一个分组">{{ currentGroupName }}</span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>同步开始日期</label>
|
||||
<input v-model="filter.syncedFrom" type="date" :max="filter.syncedTo" @change="clampJdSyncedRange" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>同步结束日期</label>
|
||||
<input v-model="filter.syncedTo" type="date" :min="filter.syncedFrom" @change="clampJdSyncedRange" />
|
||||
</div>
|
||||
<div class="jd-filter-actions">
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
<button class="btn btn-secondary" type="button" @click="reset">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="jd-toolbar">
|
||||
<span class="jd-summary">共 {{ total }} 条京东商品</span>
|
||||
<!-- 批量编辑分类(2026-11-17 用户口径「店铺分类弹窗删了,加个批量编辑分类」):
|
||||
只对当前分组可写档(本组管理员/公司超管/平台超管)渲染;勾选 0 时置灰(与
|
||||
删除勾选同款常显口径),打开后按累计勾选(跨页)提交归入/移出。 -->
|
||||
<button
|
||||
v-if="canManageCategories"
|
||||
class="btn btn-secondary"
|
||||
type="button"
|
||||
:disabled="!selectedCount"
|
||||
@click="openBatchEdit"
|
||||
>批量编辑分类</button>
|
||||
<!-- 商品行写只对平台超管;分类写由当前分组 editable 决定(本组管理员/公司超管/平台超管)。
|
||||
非超管看到只读提示,分类维护入口=工具栏「分类管理」(只读可看,写控件按 editable 分档)。 -->
|
||||
<span v-if="!isSuperAdmin" class="jd-readonly-tip">只读:编辑/删除仅超级管理员可用;分类在本页「分类管理」查看与维护</span>
|
||||
<select v-model="filter.groupId" aria-label="筛选店铺分类" @change="apply">
|
||||
<option value="">全部分类</option>
|
||||
<option v-for="group in groupOptions" :key="group.id" :value="String(group.id)">{{ group.name }}</option>
|
||||
</select>
|
||||
<!-- 分类管理(2026-11-17 用户口径「京东分类管理并到京东数据库分类编辑里」):V204 独立
|
||||
子菜单页整体并入本对话框(搜索+新建+改名+删除)。入口对所有人渲染(同组普通号
|
||||
只读可看,V203),写控件由对话框按当前分组 editable 分档。 -->
|
||||
<button
|
||||
class="btn btn-secondary jd-manage-btn"
|
||||
type="button"
|
||||
@click="openManage"
|
||||
>分类管理</button>
|
||||
<!-- 批量删除 2026-11-16 客户口径「不要勾选后才显示」:常显,勾选 0 时置灰。
|
||||
同日写权限收窄到超管:非超管整颗按钮不渲染(勾选列 2026-11-17 起对本组可写
|
||||
分类管理员开放,服务批量归类)。 -->
|
||||
<button
|
||||
v-if="isSuperAdmin"
|
||||
class="btn btn-danger jd-delete-btn"
|
||||
type="button"
|
||||
:disabled="deleting || !selectedCount"
|
||||
@click="removeSelected"
|
||||
>
|
||||
{{ deleting ? '删除中...' : `删除勾选(${selectedCount})` }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="table-scroll jd-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th v-if="hasSelectionColumn" style="width: 42px"><input type="checkbox" :checked="allSelected" @change="toggleSelectAll(($event.target as HTMLInputElement).checked)" /></th>
|
||||
<th style="width: 92px">分类</th>
|
||||
<th style="width: 520px">商品信息</th>
|
||||
<th style="width: 76px">总库存</th>
|
||||
<th style="width: 120px">价格</th>
|
||||
<!-- 同步时间收尾(创建/修改两列 2026-11-16 客户口径「不要」下线,仍收详情抽屉);
|
||||
操作列 2026-11-16「操作放最后一列」口径置末;同日写权限收窄到超管 ⇒ 非超管不渲染。 -->
|
||||
<th style="width: 170px">同步时间</th>
|
||||
<th v-if="isSuperAdmin" style="width: 138px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="rows.length">
|
||||
<tr v-for="row in rows" :key="row.id" class="jd-row" @click="openDetail(row)">
|
||||
<td v-if="hasSelectionColumn" @click.stop><input type="checkbox" :checked="selectedIds.has(row.id)" @change="toggleSelect(row, ($event.target as HTMLInputElement).checked)" /></td>
|
||||
<td :title="row.groupName || ''">{{ row.groupName || '未分类' }}</td>
|
||||
<td class="jd-info-cell">
|
||||
<div class="jd-info-wrap">
|
||||
<div class="jd-info-figure">
|
||||
<img v-if="row.mainImageUrl" class="jd-thumb" :src="row.mainImageUrl" alt="" loading="lazy" />
|
||||
<span v-else class="jd-thumb jd-thumb-empty">无图</span>
|
||||
<span v-if="row.healthScore !== null" class="jd-health">信息分 {{ row.healthScore }}</span>
|
||||
</div>
|
||||
<div class="jd-info-body">
|
||||
<div class="jd-info-title" :title="row.title">{{ row.title || '-' }}</div>
|
||||
<div class="jd-info-meta">
|
||||
商品编码:<span class="jd-info-code">{{ row.productCode || '-' }}</span>
|
||||
<button v-if="row.productCode" class="jd-copy-btn" type="button" title="复制商品编码" @click.stop="copyText(row.productCode)">⧉</button>
|
||||
</div>
|
||||
<div class="jd-info-meta">货号:<span class="jd-info-code">{{ row.itemNum || '-' }}</span></div>
|
||||
<!-- 品牌·类目行:京麦列表同款(末级类目名紧随品牌),字段与顺序 2026-11-15 对齐京麦。 -->
|
||||
<div v-if="row.brand || row.categoryPath" class="jd-info-meta jd-brand-cat">
|
||||
<span class="jd-brand-name">{{ row.brand || '' }}</span> {{ row.categoryPath || '' }}
|
||||
</div>
|
||||
<div v-if="row.skuCount" class="jd-info-tags"><span class="jd-tag">{{ row.skuCount }}个SKU</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td>{{ row.stockTotal ?? '-' }}</td>
|
||||
<td>{{ jdPriceRange(row) || '-' }}</td>
|
||||
<td>{{ formatDateTime(row.syncedAt || '') }}</td>
|
||||
<!-- 操作列(2026-11-15 用户口径):编辑/删除;@click.stop 防冒泡开详情抽屉。
|
||||
2026-11-16「操作放最后一列」口径置末;「上架时间 / 商品状态」列同日整列下线;
|
||||
同日写权限收窄到超管 ⇒ 非超管不渲染该列。 -->
|
||||
<td v-if="isSuperAdmin" class="jd-ops-cell" @click.stop>
|
||||
<button class="btn btn-sm" type="button" @click="openEdit(row)">编辑</button>
|
||||
<button class="btn btn-sm btn-danger" type="button" :disabled="deleting" @click="removeOne(row)">删除</button>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td :colspan="emptyColspan" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td :colspan="emptyColspan" class="empty-tip">暂无京东商品数据</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<OldPagination :total="total" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeSize" />
|
||||
</section>
|
||||
|
||||
<JdBatchAssignDialog
|
||||
:visible="batchEditVisible"
|
||||
:owner-group-id="ownerGroupId"
|
||||
:owner-group-name="currentGroupName"
|
||||
:categories="groupOptions"
|
||||
:selected-ids="[...selectedIds]"
|
||||
@close="batchEditVisible = false"
|
||||
@done="onBatchAssigned"
|
||||
/>
|
||||
<JdCategoryManageDialog
|
||||
:visible="manageVisible"
|
||||
:owner-group-id="ownerGroupId"
|
||||
:owner-group-name="currentGroupName"
|
||||
:editable="canManageCategories"
|
||||
@close="manageVisible = false"
|
||||
@changed="onManaged"
|
||||
/>
|
||||
<JdProductDetailDrawer
|
||||
:item="detailItem"
|
||||
:visible="detailVisible"
|
||||
@close="closeDetail"
|
||||
/>
|
||||
<JdProductEditDrawer
|
||||
:item="editItem"
|
||||
:visible="editVisible"
|
||||
@close="closeEdit"
|
||||
@saved="onEditSaved"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped src="./jd-database-page.css"></style>
|
||||
@@ -0,0 +1,685 @@
|
||||
<script setup lang="ts">
|
||||
/** 京东商品详情抽屉(v1.4 Phase 5):点行打开,展示基本信息 + attrGroups 分块表格 +
|
||||
* 图片网格(MAIN/ATTR/DETAIL 三区,attr 图按 attrName 归并)。
|
||||
* 基本信息=商品全部字段(B104:列表只摆部分字段,类目/信息分/SKU 数/上架时间/京东创建/
|
||||
* 修改时间/店铺/分组都在这里看)。
|
||||
* 图片点击放大预览用自绘 modal-mask(先例:RecordsHistoryPage 的 thumb + modal-mask +
|
||||
* 原图新标签;不用 element-plus)。数据由本组件按 id 自取(公共库无公司维度),失败条内提示可重试。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { fetchJdProductDetail } from './jd-product-api.ts'
|
||||
import type {
|
||||
JdProductImage,
|
||||
JdProductItem,
|
||||
JdProductAttrGroup,
|
||||
JdProductSku,
|
||||
} from './jd-product-model.ts'
|
||||
import { jdPriceRange, jdSkuDimensions, jdSkuSummary } from './jd-product-model.ts'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { requestErrorMessage } from '../../api/envelope.ts'
|
||||
|
||||
const props = defineProps<{
|
||||
item: JdProductItem | null
|
||||
visible: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{ (event: 'close'): void }>()
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const attrGroups = ref<JdProductAttrGroup[]>([])
|
||||
const images = ref<JdProductImage[]>([])
|
||||
const skus = ref<JdProductSku[]>([])
|
||||
const attrJsonRaw = ref('')
|
||||
|
||||
/** SKU 矩阵维度(京麦「颜色 / 尺码」两列)与表头汇总。 */
|
||||
const skuDimensions = computed(() => jdSkuDimensions(skus.value))
|
||||
const skuSummary = computed(() => jdSkuSummary(skus.value))
|
||||
|
||||
function skuAttrValue(sku: JdProductSku, dimension: string): string {
|
||||
return sku.saleAttrs.find((attr) => attr.name === dimension)?.value || '-'
|
||||
}
|
||||
|
||||
/** 图片三区:MAIN / ATTR / DETAIL;未知类型归 DETAIL 之外的「其他」,不丢。 */
|
||||
const mainImages = computed(() => images.value.filter((image) => image.imageType === 'MAIN'))
|
||||
|
||||
/** 顶部画廊(2026-11-16 客户口径「详情页样式和京麦商品详情一样」=左图右信息):
|
||||
* 左侧主图大图+缩略图切换(MAIN 档),右侧关键信息。 */
|
||||
const galleryImages = computed(() => mainImages.value)
|
||||
const activeImageUrl = ref('')
|
||||
|
||||
function switchGallery(image: JdProductImage): void {
|
||||
activeImageUrl.value = image.url
|
||||
}
|
||||
const attrImageGroups = computed(() => {
|
||||
const buckets = new Map<string, JdProductImage[]>()
|
||||
for (const image of images.value) {
|
||||
if (image.imageType !== 'ATTR') continue
|
||||
const key = image.attrName || '属性图'
|
||||
const bucket = buckets.get(key)
|
||||
if (bucket) bucket.push(image)
|
||||
else buckets.set(key, [image])
|
||||
}
|
||||
return [...buckets.entries()].map(([attrName, list]) => ({ attrName, list }))
|
||||
})
|
||||
const detailImages = computed(() => images.value.filter((image) => image.imageType === 'DETAIL'))
|
||||
const otherImages = computed(() =>
|
||||
images.value.filter((image) => image.imageType !== 'MAIN' && image.imageType !== 'ATTR' && image.imageType !== 'DETAIL'),
|
||||
)
|
||||
|
||||
/** 放大预览:点缩略图弹自绘 modal-mask,原图可新标签打开。 */
|
||||
const previewVisible = ref(false)
|
||||
const previewUrl = ref('')
|
||||
|
||||
function openPreview(url: string): void {
|
||||
previewUrl.value = url
|
||||
previewVisible.value = true
|
||||
}
|
||||
|
||||
function close(): void {
|
||||
previewVisible.value = false
|
||||
emit('close')
|
||||
}
|
||||
|
||||
async function loadDetail(): Promise<void> {
|
||||
const item = props.item
|
||||
if (!item) return
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
attrGroups.value = []
|
||||
images.value = []
|
||||
skus.value = []
|
||||
attrJsonRaw.value = ''
|
||||
try {
|
||||
const detail = await fetchJdProductDetail(item.id)
|
||||
attrGroups.value = detail.attrGroups
|
||||
images.value = detail.images
|
||||
skus.value = detail.skus
|
||||
attrJsonRaw.value = detail.attrJsonRaw
|
||||
activeImageUrl.value = detail.images.find((image) => image.imageType === 'MAIN')?.url || ''
|
||||
if (!detail.attrGroups.length && detail.attrJsonRaw) {
|
||||
// 结构化解析失败但原文在:兜底展示原文,不静默吞
|
||||
loadFailure.value = ''
|
||||
}
|
||||
} catch (error) {
|
||||
loadFailure.value = requestErrorMessage(error) || '商品详情加载失败'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
() => [props.visible, props.item?.id] as const,
|
||||
([visible]) => {
|
||||
previewVisible.value = false
|
||||
previewUrl.value = ''
|
||||
activeImageUrl.value = ''
|
||||
if (visible && props.item) void loadDetail()
|
||||
},
|
||||
)
|
||||
|
||||
function dash(value: string | number | null | undefined): string {
|
||||
const text = value === null || value === undefined ? '' : String(value).trim()
|
||||
return text || '-'
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="visible" class="drawer-mask" @click.self="close">
|
||||
<aside class="drawer">
|
||||
<header class="drawer-head">
|
||||
<h3>商品详情{{ item?.productCode ? ` · ${item.productCode}` : '' }}</h3>
|
||||
<button class="drawer-close" type="button" aria-label="关闭" @click="close">×</button>
|
||||
</header>
|
||||
|
||||
<div class="drawer-body">
|
||||
<div v-if="loadFailure" class="drawer-failure">
|
||||
<span>{{ loadFailure }}</span>
|
||||
<button class="btn btn-secondary" type="button" @click="loadDetail">重试</button>
|
||||
</div>
|
||||
<p v-else-if="loading" class="drawer-tip">加载中...</p>
|
||||
|
||||
<template v-else>
|
||||
<!-- 顶部「左图右信息」(2026-11-16 客户口径「详情页的样式要和京麦商品详情一样的布局样式」):
|
||||
左侧主图大图+缩略图切换,右侧关键信息;属性/SKU/详情图等区块保持下方。 -->
|
||||
<section class="detail-block">
|
||||
<div class="detail-hero">
|
||||
<div class="hero-gallery">
|
||||
<img
|
||||
v-if="activeImageUrl"
|
||||
class="hero-main"
|
||||
:src="activeImageUrl"
|
||||
alt=""
|
||||
title="点击放大预览"
|
||||
@click="openPreview(activeImageUrl)"
|
||||
/>
|
||||
<div v-else class="hero-empty">无图</div>
|
||||
<div v-if="galleryImages.length > 1" class="hero-thumbs">
|
||||
<img
|
||||
v-for="image in galleryImages"
|
||||
:key="image.id"
|
||||
:src="image.url"
|
||||
alt=""
|
||||
loading="lazy"
|
||||
:class="{ active: image.url === activeImageUrl }"
|
||||
title="切换主图"
|
||||
@click="switchGallery(image)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<dl class="hero-info">
|
||||
<div class="info-item info-item-wide hero-title">
|
||||
<dt>标题</dt>
|
||||
<dd :title="item?.title || ''">{{ dash(item?.title) }}</dd>
|
||||
</div>
|
||||
<div class="info-item"><dt>价格区间</dt><dd>{{ dash(jdPriceRange(item ?? { priceMin: '', priceMax: '' })) }}</dd></div>
|
||||
<div class="info-item"><dt>总库存</dt><dd>{{ dash(item?.stockTotal) }}</dd></div>
|
||||
<div class="info-item"><dt>状态</dt><dd>{{ dash(item?.saleStatus) }}</dd></div>
|
||||
<div class="info-item"><dt>信息分</dt><dd>{{ dash(item?.healthScore) }}</dd></div>
|
||||
<div class="info-item"><dt>SKU 数</dt><dd>{{ dash(item?.skuCount) }}</dd></div>
|
||||
<div class="info-item"><dt>商品编码</dt><dd>{{ dash(item?.productCode) }}</dd></div>
|
||||
<div class="info-item"><dt>货号</dt><dd>{{ dash(item?.itemNum) }}</dd></div>
|
||||
<div class="info-item"><dt>SKU</dt><dd>{{ dash(item?.skuId) }}</dd></div>
|
||||
<div class="info-item"><dt>品牌</dt><dd>{{ dash(item?.brand) }}</dd></div>
|
||||
<div class="info-item"><dt>店铺</dt><dd :title="item?.shopName || ''">{{ dash(item?.shopName) }}</dd></div>
|
||||
<div class="info-item"><dt>分类</dt><dd>{{ dash(item?.groupName || '未分类') }}</dd></div>
|
||||
<div class="info-item info-item-wide"><dt>类目</dt><dd :title="item?.categoryPath || ''">{{ dash(item?.categoryPath) }}</dd></div>
|
||||
<div class="info-item"><dt>上架时间</dt><dd>{{ item?.jdOnlineAt ? formatDateTime(item.jdOnlineAt) : '-' }}</dd></div>
|
||||
<div class="info-item"><dt>同步时间</dt><dd>{{ formatDateTime(item?.syncedAt || '') }}</dd></div>
|
||||
<div class="info-item"><dt>京东创建时间</dt><dd>{{ item?.jdCreatedAt ? formatDateTime(item.jdCreatedAt) : '-' }}</dd></div>
|
||||
<div class="info-item"><dt>京东修改时间</dt><dd>{{ item?.jdUpdatedAt ? formatDateTime(item.jdUpdatedAt) : '-' }}</dd></div>
|
||||
</dl>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section v-if="attrGroups.length" class="detail-block">
|
||||
<h4>属性与设置(按京麦 Tab 分组)</h4>
|
||||
<div v-for="group in attrGroups" :key="group.groupName" class="attr-group">
|
||||
<h5>{{ group.groupName }}</h5>
|
||||
<table>
|
||||
<tbody>
|
||||
<tr v-for="(attr, index) in group.attrs" :key="`${attr.key}-${index}`">
|
||||
<th>{{ attr.label || attr.key || '-' }}</th>
|
||||
<td>{{ attr.value || '-' }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
<section v-else-if="attrJsonRaw" class="detail-block">
|
||||
<h4>属性(原始 JSON)</h4>
|
||||
<pre class="attr-raw">{{ attrJsonRaw }}</pre>
|
||||
</section>
|
||||
|
||||
<section class="detail-block">
|
||||
<h4>销售属性 / SKU 矩阵</h4>
|
||||
<template v-if="skus.length">
|
||||
<p class="sku-summary">{{ skuSummary }}</p>
|
||||
<div class="sku-table-wrap">
|
||||
<table class="sku-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th v-for="dimension in skuDimensions" :key="dimension">{{ dimension }}</th>
|
||||
<th>京东价</th>
|
||||
<th>库存</th>
|
||||
<th>SKU ID</th>
|
||||
<th>SKU 名称</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(sku, index) in skus" :key="sku.skuId">
|
||||
<td>{{ sku.skuSeq || index + 1 }}</td>
|
||||
<td v-for="dimension in skuDimensions" :key="dimension">{{ skuAttrValue(sku, dimension) }}</td>
|
||||
<td>{{ sku.price ? `¥${sku.price}` : '-' }}</td>
|
||||
<td>{{ dash(sku.stock) }}</td>
|
||||
<td class="sku-id">{{ sku.skuId }}</td>
|
||||
<td :title="sku.skuName">{{ dash(sku.skuName) }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</template>
|
||||
<p v-else class="drawer-tip">暂无 SKU 矩阵(V198 之前采集的旧行需重新采集)</p>
|
||||
</section>
|
||||
|
||||
<section class="detail-block">
|
||||
<h4>主图</h4>
|
||||
<div v-if="mainImages.length" class="image-grid">
|
||||
<img
|
||||
v-for="image in mainImages"
|
||||
:key="image.url"
|
||||
:src="image.url"
|
||||
alt=""
|
||||
title="点击放大预览"
|
||||
@click="openPreview(image.url)"
|
||||
/>
|
||||
</div>
|
||||
<p v-else class="drawer-tip">暂无主图</p>
|
||||
</section>
|
||||
|
||||
<section v-for="bucket in attrImageGroups" :key="bucket.attrName" class="detail-block">
|
||||
<h4>属性图 · {{ bucket.attrName }}</h4>
|
||||
<div class="image-grid">
|
||||
<img
|
||||
v-for="image in bucket.list"
|
||||
:key="image.url"
|
||||
:src="image.url"
|
||||
alt=""
|
||||
title="点击放大预览"
|
||||
@click="openPreview(image.url)"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="detail-block">
|
||||
<h4>详情图</h4>
|
||||
<div v-if="detailImages.length" class="image-grid">
|
||||
<img
|
||||
v-for="image in detailImages"
|
||||
:key="image.url"
|
||||
:src="image.url"
|
||||
alt=""
|
||||
title="点击放大预览"
|
||||
@click="openPreview(image.url)"
|
||||
/>
|
||||
</div>
|
||||
<p v-else class="drawer-tip">暂无详情图</p>
|
||||
</section>
|
||||
|
||||
<section v-if="otherImages.length" class="detail-block">
|
||||
<h4>其他图</h4>
|
||||
<div class="image-grid">
|
||||
<img
|
||||
v-for="image in otherImages"
|
||||
:key="image.url"
|
||||
:src="image.url"
|
||||
alt=""
|
||||
title="点击放大预览"
|
||||
@click="openPreview(image.url)"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<div v-if="previewVisible" class="modal-mask" @click.self="previewVisible = false">
|
||||
<div class="preview-modal">
|
||||
<div class="preview-head">
|
||||
<h3>图片预览</h3>
|
||||
<button class="drawer-close" type="button" aria-label="关闭" @click="previewVisible = false">×</button>
|
||||
</div>
|
||||
<img class="preview-image" :src="previewUrl" alt="" />
|
||||
<div class="preview-foot">
|
||||
<a :href="previewUrl" target="_blank" rel="noopener">新标签打开原图</a>
|
||||
<button class="btn btn-secondary" type="button" @click="previewVisible = false">关闭</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.drawer-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 2600;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(4px);
|
||||
}
|
||||
.drawer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(920px, 100%);
|
||||
height: 100%;
|
||||
background: #ffffff;
|
||||
box-shadow: -18px 0 40px rgba(39, 67, 94, 0.18);
|
||||
}
|
||||
.drawer-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 16px 20px;
|
||||
border-bottom: 1px solid #dbe5ee;
|
||||
}
|
||||
.drawer-head h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
}
|
||||
.drawer-close {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 9px;
|
||||
background: none;
|
||||
color: #5b6f83;
|
||||
font-size: 20px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.drawer-close:hover {
|
||||
border-color: #cbd9e6;
|
||||
background: #eef4fa;
|
||||
color: #24384d;
|
||||
}
|
||||
.drawer-body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
padding: 16px 20px 28px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 18px;
|
||||
}
|
||||
.drawer-tip {
|
||||
margin: 0;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.drawer-failure {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
padding: 12px 14px;
|
||||
border: 1px solid #f0c9c2;
|
||||
border-radius: 10px;
|
||||
background: #fdf1ef;
|
||||
color: #a04432;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.detail-block h4 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 13.5px;
|
||||
font-weight: 650;
|
||||
color: #4e6479;
|
||||
}
|
||||
/* 顶部「左图右信息」(京麦详情布局):左侧主图大图+缩略图切换,右侧关键信息网格。 */
|
||||
.detail-hero {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 16px;
|
||||
}
|
||||
.hero-gallery {
|
||||
flex: 0 0 300px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
}
|
||||
.hero-main {
|
||||
display: block;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 10px;
|
||||
background: #f2f7fb;
|
||||
cursor: zoom-in;
|
||||
}
|
||||
.hero-empty {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
border: 1px dashed #c7d7e5;
|
||||
border-radius: 10px;
|
||||
background: #f8fbfd;
|
||||
color: #8293a5;
|
||||
font-size: 13px;
|
||||
}
|
||||
.hero-thumbs {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
}
|
||||
.hero-thumbs img {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
opacity: 0.85;
|
||||
}
|
||||
.hero-thumbs img.active {
|
||||
outline: 2px solid #2f5d8b;
|
||||
opacity: 1;
|
||||
}
|
||||
.hero-info {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 10px 16px;
|
||||
margin: 0;
|
||||
}
|
||||
.hero-info dt {
|
||||
color: #5b6f83;
|
||||
font-size: 12px;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.hero-info dd {
|
||||
margin: 0;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.hero-title dd {
|
||||
font-size: 14.5px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
white-space: normal;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
@media (max-width: 760px) {
|
||||
.detail-hero {
|
||||
flex-direction: column;
|
||||
}
|
||||
.hero-gallery {
|
||||
flex-basis: auto;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
.info-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 10px 16px;
|
||||
margin: 0;
|
||||
}
|
||||
.info-item {
|
||||
min-width: 0;
|
||||
}
|
||||
.info-item-wide {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
.info-item dt {
|
||||
color: #5b6f83;
|
||||
font-size: 12px;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.info-item dd {
|
||||
margin: 0;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.attr-group {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.attr-group h5 {
|
||||
margin: 0 0 6px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.attr-group table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.attr-group th,
|
||||
.attr-group td {
|
||||
padding: 7px 10px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
font-size: 13px;
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
}
|
||||
.attr-group th {
|
||||
width: 180px;
|
||||
background: #f2f7fb;
|
||||
color: #4e6479;
|
||||
font-weight: 600;
|
||||
}
|
||||
.attr-group tr:last-child th,
|
||||
.attr-group tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.attr-raw {
|
||||
margin: 0;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 8px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 12px;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-all;
|
||||
max-height: 240px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.sku-summary {
|
||||
margin: 0 0 8px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.sku-table-wrap {
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.sku-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 12.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.sku-table th,
|
||||
.sku-table td {
|
||||
padding: 7px 10px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
text-align: left;
|
||||
color: #24384d;
|
||||
}
|
||||
.sku-table th {
|
||||
background: #f2f7fb;
|
||||
color: #4e6479;
|
||||
font-weight: 600;
|
||||
}
|
||||
.sku-table tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.sku-table .sku-id {
|
||||
font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
|
||||
font-size: 12px;
|
||||
color: #4e6479;
|
||||
}
|
||||
.image-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.image-grid img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 8px;
|
||||
background: #f2f7fb;
|
||||
cursor: zoom-in;
|
||||
}
|
||||
.modal-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 3000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 40px 20px;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(6px);
|
||||
}
|
||||
.preview-modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(880px, 100%);
|
||||
max-height: 88vh;
|
||||
padding: 16px 20px;
|
||||
border: 1px solid #c7d7e5;
|
||||
border-radius: 14px;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 22px 60px rgba(39, 67, 94, 0.2);
|
||||
}
|
||||
.preview-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.preview-head h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
color: #24384d;
|
||||
}
|
||||
.preview-image {
|
||||
display: block;
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
max-height: 68vh;
|
||||
margin: 12px 0;
|
||||
object-fit: contain;
|
||||
background: #f2f7fb;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.preview-foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.preview-foot a {
|
||||
color: #2f5d8b;
|
||||
font-size: 13px;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 38px;
|
||||
padding: 7px 16px;
|
||||
border-radius: 9px;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border: 1px solid #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,616 @@
|
||||
<script setup lang="ts">
|
||||
/** 京东商品编辑抽屉(2026-11-15 用户口径「每一条数据后面 需要编辑或者删除;编辑的话
|
||||
* 这里面都是可以编辑的」):详情抽屉的可编辑版——基本信息/属性与设置/SKU 矩阵(价格、
|
||||
* 库存)/图片(标删)四块。形状照 JdProductDetailDrawer(自绘 drawer + 分块 + attr-group
|
||||
* 表格 + image-grid,零 element-plus)。
|
||||
* 保存语义在后端 JdProductUpdateService(PUT /api/admin/jd-products/{id}):主字段全量提交
|
||||
* +可选块(attrGroups 重建 attr_json 的 tabs 段、skus 按 skuId 改价格库存、deleteImageIds
|
||||
* 删图——先删桶、共用对象保留)。保存即置人工编辑锁 manual_locked=1:后续采集不再覆盖该行,
|
||||
* 底部常驻提示点名这件事。
|
||||
* V203(2026-11-16):分类<b>不在本抽屉编辑</b>(分类按数据权限分组隔离,归属存
|
||||
* biz_jd_product_group_assign,归类只走「店铺分类」弹窗)——原「分类」下拉与 groupId 负载已下线,
|
||||
* 避免写遗留的 biz_jd_product.group_id 列造成「界面改了、列表分组没变」。
|
||||
* 图片区拆在 JdProductImageManager 子组件(2026-11-16:× 右上角标删+替换/新增本地图,
|
||||
* B109-01 落地;标删集合经 update:deleteIds 上抛进保存负载,上传立即生效由子组件自理)。
|
||||
* 京东时间/信息分/商品编码只读。
|
||||
* 数据自取 fetchJdProductDetail 回填,保存成功用返回的刷新详情直接回填并 emit('saved')。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import {
|
||||
fetchJdProductDetail,
|
||||
updateJdProduct,
|
||||
} from './jd-product-api.ts'
|
||||
import JdProductImageManager from './JdProductImageManager.vue'
|
||||
import type {
|
||||
JdProductAttrEntry,
|
||||
JdProductAttrGroup,
|
||||
JdProductImage,
|
||||
JdProductItem,
|
||||
JdProductSku,
|
||||
} from './jd-product-model.ts'
|
||||
import { jdSkuDimensions } from './jd-product-model.ts'
|
||||
import { requestErrorMessage } from '../../api/envelope.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
|
||||
const props = defineProps<{
|
||||
item: JdProductItem | null
|
||||
visible: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{ (event: 'close'): void; (event: 'saved'): void }>()
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const saving = ref(false)
|
||||
/** 保存失败红条(后端校验/业务文案原样展示,如价格倒挂、SKU 行不存在)。 */
|
||||
const saveError = ref('')
|
||||
|
||||
// ---------------- 草稿(基本信息 + 属性 + SKU + 删图标记) ----------------
|
||||
|
||||
interface DraftAttrGroup {
|
||||
groupName: string
|
||||
attrs: JdProductAttrEntry[]
|
||||
}
|
||||
|
||||
const form = ref({
|
||||
title: '',
|
||||
brand: '',
|
||||
categoryPath: '',
|
||||
itemNum: '',
|
||||
priceMin: '',
|
||||
priceMax: '',
|
||||
stockTotal: '' as string,
|
||||
saleStatus: '',
|
||||
})
|
||||
const draftAttrGroups = ref<DraftAttrGroup[]>([])
|
||||
const draftSkus = ref<JdProductSku[]>([])
|
||||
const images = ref<JdProductImage[]>([])
|
||||
/** 图片子组件上抛的标删行 id(保存时一次提交 deleteImageIds)。 */
|
||||
const managerDeleteIds = ref<number[]>([])
|
||||
/** attr_json 解析失败(attrJsonRaw 兜底行):属性块禁用,防保存把原文形状弄丢。 */
|
||||
const attrJsonRaw = ref('')
|
||||
|
||||
const skuDimensions = computed(() => jdSkuDimensions(draftSkus.value))
|
||||
|
||||
function skuAttrValue(sku: JdProductSku, dimension: string): string {
|
||||
return sku.saleAttrs.find((attr) => attr.name === dimension)?.value || '-'
|
||||
}
|
||||
|
||||
function removeAttrRow(group: DraftAttrGroup, index: number): void {
|
||||
group.attrs.splice(index, 1)
|
||||
}
|
||||
|
||||
// ---------------- 取数与保存 ----------------
|
||||
|
||||
async function loadDetail(): Promise<void> {
|
||||
const item = props.item
|
||||
if (!item) return
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
saveError.value = ''
|
||||
try {
|
||||
const detail = await fetchJdProductDetail(item.id)
|
||||
const row = detail.item
|
||||
form.value = {
|
||||
title: row.title,
|
||||
brand: row.brand,
|
||||
categoryPath: row.categoryPath,
|
||||
itemNum: row.itemNum,
|
||||
priceMin: row.priceMin,
|
||||
priceMax: row.priceMax,
|
||||
stockTotal: row.stockTotal === null ? '' : String(row.stockTotal),
|
||||
saleStatus: row.saleStatus,
|
||||
}
|
||||
// 深拷贝草稿:直接改副本,保存前才拼负载。
|
||||
draftAttrGroups.value = detail.attrGroups.map((group: JdProductAttrGroup) => ({
|
||||
groupName: group.groupName,
|
||||
attrs: group.attrs.map((attr) => ({ ...attr })),
|
||||
}))
|
||||
draftSkus.value = detail.skus.map((sku) => ({ ...sku }))
|
||||
images.value = detail.images
|
||||
managerDeleteIds.value = []
|
||||
attrJsonRaw.value = detail.attrJsonRaw
|
||||
} catch (error) {
|
||||
loadFailure.value = requestErrorMessage(error) || '商品详情加载失败'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function close(): void {
|
||||
emit('close')
|
||||
}
|
||||
|
||||
/** 保存:主字段全量 + 有改动的可选块。前端先拦「标题为空」(后端 @NotBlank 同判),失败红条。 */
|
||||
async function save(): Promise<void> {
|
||||
if (!props.item || saving.value) return
|
||||
saveError.value = ''
|
||||
if (!form.value.title.trim()) {
|
||||
saveError.value = '标题不能为空'
|
||||
return
|
||||
}
|
||||
saving.value = true
|
||||
try {
|
||||
const detail = await updateJdProduct(props.item.id, {
|
||||
title: form.value.title.trim(),
|
||||
brand: form.value.brand.trim() || null,
|
||||
categoryPath: form.value.categoryPath.trim() || null,
|
||||
itemNum: form.value.itemNum.trim() || null,
|
||||
priceMin: form.value.priceMin.trim() || null,
|
||||
priceMax: form.value.priceMax.trim() || null,
|
||||
stockTotal: form.value.stockTotal.trim() === '' ? null : Number(form.value.stockTotal),
|
||||
saleStatus: form.value.saleStatus.trim() || null,
|
||||
// 属性块:原文兜底行(解析失败)不提交,防保存把解析不出的原文形状弄丢。
|
||||
attrGroups: attrJsonRaw.value
|
||||
? null
|
||||
: draftAttrGroups.value.map((group) => ({
|
||||
groupName: group.groupName,
|
||||
attrs: group.attrs.map((attr) => ({
|
||||
key: attr.key,
|
||||
label: attr.label,
|
||||
value: attr.value,
|
||||
})),
|
||||
})),
|
||||
skus: draftSkus.value.length
|
||||
? draftSkus.value.map((sku) => ({
|
||||
skuId: sku.skuId,
|
||||
price: sku.price || null,
|
||||
stock: sku.stock,
|
||||
}))
|
||||
: null,
|
||||
deleteImageIds: managerDeleteIds.value.length ? [...managerDeleteIds.value] : null,
|
||||
})
|
||||
// 保存成功:用返回的刷新详情直接回填(图片行集已扣掉删掉的行、计数已刷新)。
|
||||
form.value.title = detail.item.title
|
||||
form.value.brand = detail.item.brand
|
||||
form.value.categoryPath = detail.item.categoryPath
|
||||
form.value.itemNum = detail.item.itemNum
|
||||
form.value.priceMin = detail.item.priceMin
|
||||
form.value.priceMax = detail.item.priceMax
|
||||
form.value.stockTotal = detail.item.stockTotal === null ? '' : String(detail.item.stockTotal)
|
||||
form.value.saleStatus = detail.item.saleStatus
|
||||
draftAttrGroups.value = detail.attrGroups.map((group) => ({
|
||||
groupName: group.groupName,
|
||||
attrs: group.attrs.map((attr) => ({ ...attr })),
|
||||
}))
|
||||
draftSkus.value = detail.skus.map((sku) => ({ ...sku }))
|
||||
images.value = detail.images
|
||||
managerDeleteIds.value = []
|
||||
showAdminFeedback('已保存,该商品已转为人工维护(采集不再覆盖)', 'success')
|
||||
emit('saved')
|
||||
} catch (error) {
|
||||
saveError.value = requestErrorMessage(error) || '保存失败,请稍后重试'
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
() => [props.visible, props.item?.id] as const,
|
||||
([visible]) => {
|
||||
if (visible && props.item) void loadDetail()
|
||||
},
|
||||
)
|
||||
|
||||
function dash(value: string | number | null | undefined): string {
|
||||
const text = value === null || value === undefined ? '' : String(value).trim()
|
||||
return text || '-'
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="visible" class="drawer-mask" @click.self="close">
|
||||
<aside class="drawer">
|
||||
<header class="drawer-head">
|
||||
<h3>编辑商品{{ item?.productCode ? ` · ${item.productCode}` : '' }}</h3>
|
||||
<button class="drawer-close" type="button" aria-label="关闭" @click="close">×</button>
|
||||
</header>
|
||||
|
||||
<div class="drawer-body">
|
||||
<div v-if="loadFailure" class="drawer-failure">
|
||||
<span>{{ loadFailure }}</span>
|
||||
<button class="btn btn-secondary" type="button" @click="loadDetail">重试</button>
|
||||
</div>
|
||||
<p v-else-if="loading" class="drawer-tip">加载中...</p>
|
||||
|
||||
<template v-else>
|
||||
<section class="detail-block">
|
||||
<h4>基本信息</h4>
|
||||
<div class="edit-grid">
|
||||
<div class="edit-item edit-item-wide">
|
||||
<label>标题</label>
|
||||
<input v-model="form.title" type="text" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>品牌</label>
|
||||
<input v-model="form.brand" type="text" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>类目</label>
|
||||
<input v-model="form.categoryPath" type="text" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>货号(系统生成=行号,可改)</label>
|
||||
<input v-model="form.itemNum" type="text" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>状态</label>
|
||||
<input v-model="form.saleStatus" type="text" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>价格下限</label>
|
||||
<input v-model="form.priceMin" type="text" inputmode="decimal" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>价格上限</label>
|
||||
<input v-model="form.priceMax" type="text" inputmode="decimal" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>总库存</label>
|
||||
<input v-model="form.stockTotal" type="text" inputmode="numeric" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>商品编码(只读)</label>
|
||||
<input type="text" :value="dash(item?.productCode)" readonly class="readonly" />
|
||||
</div>
|
||||
<div class="edit-item">
|
||||
<label>信息分(只读)</label>
|
||||
<input type="text" :value="dash(item?.healthScore)" readonly class="readonly" />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section v-if="draftAttrGroups.length" class="detail-block">
|
||||
<h4>属性与设置(键值可改,行可删)</h4>
|
||||
<div v-for="group in draftAttrGroups" :key="group.groupName" class="attr-group">
|
||||
<h5>{{ group.groupName }}</h5>
|
||||
<table>
|
||||
<tbody>
|
||||
<tr v-for="(attr, index) in group.attrs" :key="`${attr.key}-${index}`">
|
||||
<th>{{ attr.label || attr.key || '-' }}</th>
|
||||
<td><input v-model="attr.value" type="text" class="attr-input" /></td>
|
||||
<td class="attr-remove-cell">
|
||||
<button class="attr-remove" type="button" title="删除该属性行" @click="removeAttrRow(group, index)">删</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
<p v-else-if="attrJsonRaw" class="drawer-tip">属性原文解析失败(原始 JSON 兜底),属性区不可编辑以防丢失原文;可照常改基本信息。</p>
|
||||
<p v-else class="drawer-tip">暂无属性</p>
|
||||
|
||||
<section class="detail-block">
|
||||
<h4>SKU 矩阵(京东价 / 库存可改)</h4>
|
||||
<template v-if="draftSkus.length">
|
||||
<div class="sku-table-wrap">
|
||||
<table class="sku-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th v-for="dimension in skuDimensions" :key="dimension">{{ dimension }}</th>
|
||||
<th>京东价</th>
|
||||
<th>库存</th>
|
||||
<th>SKU ID</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="sku in draftSkus" :key="sku.skuId">
|
||||
<td v-for="dimension in skuDimensions" :key="dimension">{{ skuAttrValue(sku, dimension) }}</td>
|
||||
<td><input v-model="sku.price" type="text" inputmode="decimal" class="sku-input" /></td>
|
||||
<td>
|
||||
<input
|
||||
:value="sku.stock === null ? '' : String(sku.stock)"
|
||||
type="text"
|
||||
inputmode="numeric"
|
||||
class="sku-input"
|
||||
@input="sku.stock = ($event.target as HTMLInputElement).value === '' ? null : Number(($event.target as HTMLInputElement).value)"
|
||||
/>
|
||||
</td>
|
||||
<td class="sku-id">{{ sku.skuId }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</template>
|
||||
<p v-else class="drawer-tip">暂无 SKU 矩阵(V198 之前采集的旧行需重新采集)</p>
|
||||
</section>
|
||||
|
||||
<JdProductImageManager
|
||||
:product-id="item?.id ?? 0"
|
||||
:images="images"
|
||||
:disabled="loading"
|
||||
@update:images="images = $event"
|
||||
@update:delete-ids="managerDeleteIds = $event"
|
||||
@saved="emit('saved')"
|
||||
/>
|
||||
|
||||
<div v-if="saveError" class="drawer-failure">{{ saveError }}</div>
|
||||
<p class="save-hint">保存后该商品转为人工维护,后续采集不再覆盖它的数据(含本单重爬);删除的图片文件一并从存储桶清理(共用的保留);替换 / 新增图片立即生效并同样置锁。</p>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<footer class="drawer-foot">
|
||||
<button class="btn btn-secondary" type="button" :disabled="saving" @click="close">取消</button>
|
||||
<button class="btn" type="button" :disabled="saving || loading" @click="save">
|
||||
{{ saving ? '保存中...' : '保存' }}
|
||||
</button>
|
||||
</footer>
|
||||
</aside>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.drawer-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 2600;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
background: rgba(45, 66, 86, 0.36);
|
||||
backdrop-filter: blur(4px);
|
||||
}
|
||||
.drawer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(920px, 100%);
|
||||
height: 100%;
|
||||
background: #ffffff;
|
||||
box-shadow: -18px 0 40px rgba(39, 67, 94, 0.18);
|
||||
}
|
||||
.drawer-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 16px 20px;
|
||||
border-bottom: 1px solid #dbe5ee;
|
||||
}
|
||||
.drawer-head h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
}
|
||||
.drawer-close {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 9px;
|
||||
background: none;
|
||||
color: #5b6f83;
|
||||
font-size: 20px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.drawer-close:hover {
|
||||
border-color: #cbd9e6;
|
||||
background: #eef4fa;
|
||||
color: #24384d;
|
||||
}
|
||||
.drawer-body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
padding: 16px 20px 28px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 18px;
|
||||
}
|
||||
.drawer-foot {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 12px;
|
||||
padding: 14px 20px;
|
||||
border-top: 1px solid #dbe5ee;
|
||||
background: #f8fbfd;
|
||||
}
|
||||
.drawer-tip {
|
||||
margin: 0;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.drawer-failure {
|
||||
padding: 12px 14px;
|
||||
border: 1px solid #f0c9c2;
|
||||
border-radius: 10px;
|
||||
background: #fdf1ef;
|
||||
color: #a04432;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.detail-block h4 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 13.5px;
|
||||
font-weight: 650;
|
||||
color: #4e6479;
|
||||
}
|
||||
.edit-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 10px 16px;
|
||||
}
|
||||
.edit-item {
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
}
|
||||
.edit-item-wide {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
.edit-item label {
|
||||
color: #5b6f83;
|
||||
font-size: 12px;
|
||||
}
|
||||
.edit-item input,
|
||||
.edit-item select {
|
||||
min-width: 0;
|
||||
min-height: 36px;
|
||||
padding: 6px 10px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 8px;
|
||||
background: #ffffff;
|
||||
color: #24384d;
|
||||
font-size: 13px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
}
|
||||
.edit-item input:focus,
|
||||
.edit-item select:focus {
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.edit-item input.readonly {
|
||||
background: #f2f7fb;
|
||||
color: #5b6f83;
|
||||
}
|
||||
.attr-group {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.attr-group h5 {
|
||||
margin: 0 0 6px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.attr-group table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.attr-group th,
|
||||
.attr-group td {
|
||||
padding: 6px 10px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
font-size: 13px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.attr-group th {
|
||||
width: 180px;
|
||||
background: #f2f7fb;
|
||||
color: #4e6479;
|
||||
font-weight: 600;
|
||||
}
|
||||
.attr-group tr:last-child th,
|
||||
.attr-group tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.attr-input {
|
||||
width: 100%;
|
||||
min-height: 32px;
|
||||
padding: 5px 8px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 7px;
|
||||
background: #ffffff;
|
||||
color: #24384d;
|
||||
font-size: 13px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
}
|
||||
.attr-input:focus {
|
||||
border-color: #5f85ad;
|
||||
}
|
||||
.attr-remove-cell {
|
||||
width: 44px;
|
||||
text-align: center;
|
||||
}
|
||||
.attr-remove {
|
||||
border: 1px solid #e4b3a8;
|
||||
border-radius: 6px;
|
||||
background: #ffffff;
|
||||
color: #a04432;
|
||||
font-size: 12px;
|
||||
padding: 3px 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.attr-remove:hover {
|
||||
background: #fdf1ef;
|
||||
}
|
||||
.sku-table-wrap {
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.sku-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 12.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.sku-table th,
|
||||
.sku-table td {
|
||||
padding: 6px 10px;
|
||||
border-bottom: 1px solid #e7eef5;
|
||||
text-align: left;
|
||||
color: #24384d;
|
||||
}
|
||||
.sku-table th {
|
||||
background: #f2f7fb;
|
||||
color: #4e6479;
|
||||
font-weight: 600;
|
||||
}
|
||||
.sku-table tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.sku-input {
|
||||
width: 110px;
|
||||
min-height: 32px;
|
||||
padding: 5px 8px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 7px;
|
||||
background: #ffffff;
|
||||
color: #24384d;
|
||||
font-size: 13px;
|
||||
font-family: inherit;
|
||||
outline: none;
|
||||
}
|
||||
.sku-input:focus {
|
||||
border-color: #5f85ad;
|
||||
}
|
||||
.sku-id {
|
||||
font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
|
||||
font-size: 12px;
|
||||
color: #4e6479;
|
||||
}
|
||||
.save-hint {
|
||||
margin: 0;
|
||||
padding: 10px 14px;
|
||||
border: 1px solid #cfe3f5;
|
||||
border-radius: 10px;
|
||||
background: #eef5fc;
|
||||
color: #3b6d99;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 38px;
|
||||
padding: 7px 16px;
|
||||
border-radius: 9px;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.6;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border: 1px solid #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
.btn:not(.btn-secondary) {
|
||||
border: 1px solid #4f78a5;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
}
|
||||
.btn:not(.btn-secondary):hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #7094ba, #5d83ac);
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,300 @@
|
||||
<script setup lang="ts">
|
||||
/** 京东商品编辑抽屉「图片区」子组件(2026-11-16 从 JdProductEditDrawer 拆出:编辑抽屉
|
||||
* 856 行超后管 800 报警线,图片区自洽成件——× 右上角标删+hover 替换+新增主图,
|
||||
* B109-01 落地,2026-11-16 客户口径「删除做成打叉的 icon 放图右上角,也要支持编辑
|
||||
* 替换本地的图」)。
|
||||
*
|
||||
* 交互语义:× 标删=前端标记、随父级「保存」一并提交(deleteImageIds 上抛);替换/新增
|
||||
* =multipart 立即生效(服务端置锁+刷投影),上传成功用返回详情回填本区并上抛 saved。
|
||||
* objectKey 由服务端按上传字节 sha256 内容寻址生成(铁律 32),前端不自造 key。
|
||||
* 形状照 JdProductEditDrawer 原图片区(image-grid + image-cell,零 element-plus)。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { uploadJdProductImage } from './jd-product-api.ts'
|
||||
import type { JdProductImage } from './jd-product-model.ts'
|
||||
import { requestErrorMessage } from '../../api/envelope.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
|
||||
const props = defineProps<{
|
||||
productId: number
|
||||
images: JdProductImage[]
|
||||
/** 父级 loading 中禁上传入口。 */
|
||||
disabled: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(event: 'update:images', images: JdProductImage[]): void
|
||||
(event: 'update:deleteIds', ids: number[]): void
|
||||
(event: 'saved'): void
|
||||
}>()
|
||||
|
||||
/** 标删的图片行 id(前端只标记,父级保存时一次提交 deleteImageIds)。 */
|
||||
const deleteImageIds = ref<Set<number>>(new Set())
|
||||
|
||||
function toggleDeleteImage(image: JdProductImage): void {
|
||||
const next = new Set(deleteImageIds.value)
|
||||
if (next.has(image.id)) next.delete(image.id)
|
||||
else next.add(image.id)
|
||||
deleteImageIds.value = next
|
||||
emit('update:deleteIds', [...next])
|
||||
}
|
||||
|
||||
// ---------------- 图片上传/替换(立即生效,与标删的「保存时生效」不同) ----------------
|
||||
|
||||
/** 文件选择上下文:null=新增主图;有值=替换该登记行(档位继承原行,后端语义)。 */
|
||||
const pendingReplaceImageId = ref<number | null>(null)
|
||||
const fileInputRef = ref<HTMLInputElement | null>(null)
|
||||
/** 上传中的图行 id(0=新增上传中);上传期间防重复点。 */
|
||||
const uploadingImageId = ref<number | null>(null)
|
||||
const uploadError = ref('')
|
||||
|
||||
function pickImage(replaceImageId: number | null): void {
|
||||
if (uploadingImageId.value !== null || props.disabled) return
|
||||
uploadError.value = ''
|
||||
pendingReplaceImageId.value = replaceImageId
|
||||
// 同选一张图也要重触发 change:先清值再弹窗。
|
||||
if (fileInputRef.value) {
|
||||
fileInputRef.value.value = ''
|
||||
fileInputRef.value.click()
|
||||
}
|
||||
}
|
||||
|
||||
async function onFileChosen(event: Event): Promise<void> {
|
||||
const input = event.target as HTMLInputElement
|
||||
const file = input.files?.[0]
|
||||
if (!file || props.disabled) return
|
||||
uploadingImageId.value = pendingReplaceImageId.value ?? 0
|
||||
try {
|
||||
const detail = await uploadJdProductImage(props.productId, file, pendingReplaceImageId.value
|
||||
? { replaceImageId: pendingReplaceImageId.value }
|
||||
: { imageType: 'MAIN' })
|
||||
// 立即生效:用返回详情回填图片区(标删集合里已不存在的行 id 由 images watch 清理)。
|
||||
emit('update:images', detail.images)
|
||||
showAdminFeedback(pendingReplaceImageId.value ? '图片已替换(该商品已转为人工维护)' : '图片已新增(该商品已转为人工维护)', 'success')
|
||||
emit('saved')
|
||||
} catch (error) {
|
||||
uploadError.value = requestErrorMessage(error) || '图片上传失败,请稍后重试'
|
||||
} finally {
|
||||
uploadingImageId.value = null
|
||||
pendingReplaceImageId.value = null
|
||||
input.value = ''
|
||||
}
|
||||
}
|
||||
|
||||
/** 换商品打开时标删集合必须清零(父级 loadDetail 换 item.id)。 */
|
||||
watch(() => props.productId, () => {
|
||||
deleteImageIds.value = new Set()
|
||||
emit('update:deleteIds', [])
|
||||
})
|
||||
|
||||
/** 行集变化时清掉已不存在的标删 id(保存删行回填/上传回填两路共用;不清理的话
|
||||
* 下次保存会把已删的 id 再提交一遍=后端按「图片不存在」整笔拒绝)。 */
|
||||
watch(() => props.images, (images) => {
|
||||
const live = new Set(images.map((image) => image.id))
|
||||
const next = new Set([...deleteImageIds.value].filter((id) => live.has(id)))
|
||||
if (next.size !== deleteImageIds.value.size) {
|
||||
deleteImageIds.value = next
|
||||
emit('update:deleteIds', [...next])
|
||||
}
|
||||
})
|
||||
|
||||
const markedCount = computed(() => deleteImageIds.value.size)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="detail-block">
|
||||
<div class="image-head">
|
||||
<h4>图片(右上角 × 标记删除,保存时一并删除;替换 / 新增立即生效)</h4>
|
||||
<button class="btn-add-image" type="button" :disabled="uploadingImageId !== null || disabled" @click="pickImage(null)">
|
||||
{{ uploadingImageId === 0 ? '上传中...' : '+ 新增主图' }}
|
||||
</button>
|
||||
</div>
|
||||
<input ref="fileInputRef" type="file" accept="image/jpeg,image/png,image/webp,image/gif" hidden @change="onFileChosen" />
|
||||
<div v-if="images.length" class="image-grid">
|
||||
<div
|
||||
v-for="image in images"
|
||||
:key="`${image.id}-${image.url}`"
|
||||
class="image-cell"
|
||||
:class="{ marked: deleteImageIds.has(image.id) }"
|
||||
>
|
||||
<img
|
||||
:src="image.url"
|
||||
alt=""
|
||||
loading="lazy"
|
||||
:class="{ dimmed: deleteImageIds.has(image.id) || uploadingImageId === image.id }"
|
||||
/>
|
||||
<!-- 右上角 × 删除标记(京麦样式,2026-11-16 客户口径):点 × 标记,再点撤销。 -->
|
||||
<button
|
||||
class="image-x"
|
||||
type="button"
|
||||
:title="deleteImageIds.has(image.id) ? '撤销删除标记' : '标记删除(保存时一并删除)'"
|
||||
@click="toggleDeleteImage(image)"
|
||||
>×</button>
|
||||
<!-- 标删遮罩(整格可点撤销),未标删时 hover 底部出现「替换」条。 -->
|
||||
<button
|
||||
v-if="deleteImageIds.has(image.id)"
|
||||
class="image-marked-mask"
|
||||
type="button"
|
||||
title="点击撤销删除标记"
|
||||
@click="toggleDeleteImage(image)"
|
||||
>已标记删除 · 点击撤销</button>
|
||||
<button
|
||||
v-else
|
||||
class="image-replace"
|
||||
type="button"
|
||||
:disabled="uploadingImageId !== null"
|
||||
@click="pickImage(image.id)"
|
||||
>{{ uploadingImageId === image.id ? '上传中...' : '替换' }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<p v-else class="drawer-tip">暂无图片(可点右上「+ 新增主图」上传本地图)</p>
|
||||
<p v-if="uploadError" class="drawer-failure">{{ uploadError }}</p>
|
||||
<p v-if="markedCount" class="delete-count">已标记删除 {{ markedCount }} 张,保存后剩余 {{ images.length - markedCount }} 张</p>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.image-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
}
|
||||
.image-head h4 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 13.5px;
|
||||
font-weight: 650;
|
||||
color: #4e6479;
|
||||
}
|
||||
.btn-add-image {
|
||||
min-height: 30px;
|
||||
padding: 4px 12px;
|
||||
border: 1px solid #95b1cb;
|
||||
border-radius: 8px;
|
||||
background: #ffffff;
|
||||
color: #2f5d8b;
|
||||
font-size: 12.5px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.btn-add-image:hover {
|
||||
background: #edf5fb;
|
||||
}
|
||||
.btn-add-image:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.image-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.image-cell {
|
||||
position: relative;
|
||||
}
|
||||
.image-cell img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 8px;
|
||||
background: #f2f7fb;
|
||||
}
|
||||
.image-cell img.dimmed {
|
||||
opacity: 0.35;
|
||||
}
|
||||
.image-cell.marked img {
|
||||
outline: 2px solid #d08a7b;
|
||||
}
|
||||
/* 右上角 × 删除标记(京麦样式):hover 格子时出现;已标删常显。 */
|
||||
.image-x {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 4px;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
background: rgba(38, 50, 63, 0.72);
|
||||
color: #ffffff;
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-cell:hover .image-x,
|
||||
.image-cell.marked .image-x {
|
||||
display: flex;
|
||||
}
|
||||
.image-x:hover {
|
||||
background: #a04432;
|
||||
}
|
||||
/* 标删态:整格遮罩可点撤销。 */
|
||||
.image-marked-mask {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 6px;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
background: rgba(160, 68, 50, 0.32);
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-marked-mask:hover {
|
||||
background: rgba(160, 68, 50, 0.5);
|
||||
}
|
||||
/* hover 底部替换条(京麦替换入口);上传中常显。 */
|
||||
.image-replace {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 26px;
|
||||
border: none;
|
||||
border-radius: 0 0 8px 8px;
|
||||
background: rgba(38, 50, 63, 0.72);
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-cell:hover .image-replace {
|
||||
display: flex;
|
||||
}
|
||||
.image-cell .image-replace:disabled {
|
||||
display: flex;
|
||||
background: rgba(38, 50, 63, 0.55);
|
||||
cursor: wait;
|
||||
}
|
||||
.image-replace:hover {
|
||||
background: #2f5d8b;
|
||||
}
|
||||
.delete-count {
|
||||
margin: 10px 0 0;
|
||||
color: #a04432;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.drawer-tip {
|
||||
margin: 0;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.drawer-failure {
|
||||
margin: 10px 0 0;
|
||||
padding: 10px 14px;
|
||||
border: 1px solid #f0c9c2;
|
||||
border-radius: 10px;
|
||||
background: #fdf1ef;
|
||||
color: #a04432;
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,29 @@
|
||||
/** 类目级联面板的水平定位钳制(2026-11-16 客户截图「超出视窗了」:面板锚在触发框
|
||||
* left:0,下钻到 3~4 栏时宽 600~800px,而「类目」筛选框在 jd-filter-row 流式布局里
|
||||
* 常落在页面中部偏右 ⇒ 面板右半截伸出视窗,末栏被窗缘裁到只剩一列 radio 圆点)。
|
||||
*
|
||||
* 本文件是**纯钳制数学**(零依赖,node --test 可直测):默认锚左(偏移 0);视口右缘
|
||||
* 装不下时整体左移到右缘贴齐(留 margin),左移后越出左缘则贴左缘为止。组件侧在面板
|
||||
* 打开与栏数/搜索态变化后用真实 rect 调它(JdCategoryCascader.vue),栏数随下钻动态
|
||||
* 1~4,宽度变了要重算——右贴齐后继续下钻即向左生长,不会再伸出右缘。 */
|
||||
|
||||
export interface PanelClampInput {
|
||||
/** 触发框(.cat-cascader)的视口左缘 x。 */
|
||||
hostLeft: number
|
||||
/** 面板当前实际渲染宽(含边框;栏数不同宽度不同)。 */
|
||||
panelWidth: number
|
||||
/** 视口宽(window.innerWidth)。 */
|
||||
viewportWidth: number
|
||||
/** 视口两侧最小留白,默认 8px。 */
|
||||
margin?: number
|
||||
}
|
||||
|
||||
/** 返回面板相对触发框左缘应加的 left 偏移(px;负=左移、0=默认锚左即可、正=触发框
|
||||
* 本身已贴近视口左缘时把面板推回 margin 内,物理上只在窄窗极端值出现)。 */
|
||||
export function clampPanelLeftX(input: PanelClampInput): number {
|
||||
const margin = input.margin ?? 8
|
||||
const overflowRight = input.hostLeft + input.panelWidth - (input.viewportWidth - margin)
|
||||
if (overflowRight <= 0) return 0
|
||||
const desiredLeft = Math.max(margin, input.hostLeft - overflowRight)
|
||||
return desiredLeft - input.hostLeft
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,402 @@
|
||||
/* 像素复刻「外观专利数据库」页样式(panel-box + 自绘表格 + 旧式分页);列表只摆部分字段,全量属性在详情抽屉。 */
|
||||
.jd-database-view {
|
||||
font-family: inherit;
|
||||
color: var(--c-text, #24384d);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 18px;
|
||||
}
|
||||
.panel-box {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
padding: 20px 22px 24px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 14px;
|
||||
background: linear-gradient(145deg, #ffffff, #f9fbfd);
|
||||
box-shadow: 0 1px 2px rgba(39, 67, 94, 0.04), 0 14px 30px -24px rgba(39, 67, 94, 0.28);
|
||||
}
|
||||
h3 {
|
||||
margin: 0 0 16px;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
letter-spacing: 0.2px;
|
||||
}
|
||||
.jd-panel-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.jd-panel-head h3 {
|
||||
margin: 0;
|
||||
}
|
||||
.jd-filter-row {
|
||||
/* 可换行流式布局:固定 6 列 minmax(140px) 的网格在窄面板下最小宽超出容器,
|
||||
把查询/重置挤出面板右缘(与「管理分组」重叠)。flex-wrap 让放不下的项自然折行。 */
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 12px;
|
||||
align-items: flex-end;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.jd-filter-row .form-group {
|
||||
flex: 1 1 160px;
|
||||
min-width: 150px;
|
||||
max-width: 260px;
|
||||
}
|
||||
.jd-filter-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 7px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.form-group label {
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.form-group input[type="date"] {
|
||||
color-scheme: light;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
min-height: 42px;
|
||||
padding: 9px 18px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 8px 18px -14px rgba(79, 120, 165, 0.72);
|
||||
transition: background 160ms ease, box-shadow 160ms ease, transform 120ms ease;
|
||||
}
|
||||
.btn:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #7094ba, #5d83ac);
|
||||
box-shadow: 0 11px 22px -14px rgba(79, 120, 165, 0.8);
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.55;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border-color: #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
.jd-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
/* 工具栏里的下拉与按钮统一 42px 外壳(2026-11-16 用户口径「样式要统一」):
|
||||
这一行此前只有 .btn 有壳,原生 <select> 落成 28px 灰框、字号也不跟,
|
||||
与旁边按钮同排时高矮不齐(分组下拉同日上移进筛选行,本行只剩分类筛选一颗)。
|
||||
数值与 .form-group select / .btn 同一套(42px 高、
|
||||
9px 圆角、#cbd9e6 描边、#f8fbfd 底),箭头用内联 SVG 自绘,避免各浏览器原生
|
||||
箭头粗细不一(appearance:none 后必须补 padding-right 给箭头留位)。 */
|
||||
.jd-toolbar select {
|
||||
min-height: 42px;
|
||||
max-width: 220px;
|
||||
padding: 0 34px 0 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background-color: #f8fbfd;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1.5 6 6.5 11 1.5' fill='none' stroke='%235b6f83' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
|
||||
background-repeat: no-repeat;
|
||||
background-position: right 12px center;
|
||||
appearance: none;
|
||||
-webkit-appearance: none;
|
||||
color: #24384d;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.jd-toolbar select:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.jd-toolbar select:focus {
|
||||
background-color: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
/* 危险动作(删除勾选)推到行尾:留在「批量编辑分类/分类筛选」旁边会被读成同一组动作。 */
|
||||
.jd-delete-btn {
|
||||
margin-left: auto;
|
||||
}
|
||||
/* 分类管理(2026-11-17 独立分类管理页并入本页的对话框入口):贴着分类筛选下拉。 */
|
||||
.jd-manage-btn {
|
||||
margin-left: 6px;
|
||||
}
|
||||
/* 危险动作(删除勾选):与全站 .btn-danger 同形——实心红渐变+白字。
|
||||
旧版是白底红字描边,落在工具栏里看着像「未激活的次要按钮」,与打卡/分组等页不统一。 */
|
||||
.btn-danger {
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
border-color: #b35f6a;
|
||||
color: #ffffff;
|
||||
}
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
.jd-summary {
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 非超管只读提示(2026-11-16 写权限收窄):紧跟汇总的一句话,不冒充可点按钮。 */
|
||||
.jd-readonly-tip {
|
||||
color: #8293a5;
|
||||
font-size: 12.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 只有一个可见分组时锁定的组名(不可切):筛选行「分组」标签下的静态芯片(2026-11-16 用户口径
|
||||
「做成分组」把下拉从工具栏上移进筛选行后跟着搬),与同排 select 同高同壳(42px/9px 圆角),
|
||||
"一组锁定"和"多组下拉"两种形态占位一致;组名超宽省略号收口,不把筛选行撑破。 */
|
||||
.jd-group-locked {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 42px;
|
||||
padding: 0 12px;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 9px;
|
||||
background: #f1f6fb;
|
||||
color: #4e6479;
|
||||
font-size: 13.5px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.table-scroll table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
/* 列宽收口(2026-11-16 用户口径「列表间距有点大」):1500px 的 min-width 让宽屏下
|
||||
唯一的弹性列(商品信息)独吞剩余宽度,标题右侧留出近 800px 空白,价格/库存被推到最右。
|
||||
商品信息改固定 520px 后各列按比例分摊余量,min-width 降到 1180px 即可无横向滚动。 */
|
||||
.jd-table-scroll > table {
|
||||
min-width: 1180px;
|
||||
}
|
||||
/* 操作列(编辑/删除):双小按钮需 138px(ops-cell-must-wrap 实测口径:两字按钮 53×2+24 padding)。
|
||||
overflow 显式放开:td 全局是 overflow:hidden(611 行),压线时第二颗(删除)会被裁成
|
||||
「编辑+…」的形状——2026-11-16 用户报「删除没了」的真因,列宽 120px < 实测 138px。 */
|
||||
.jd-ops-cell {
|
||||
white-space: nowrap;
|
||||
text-overflow: clip;
|
||||
overflow: visible;
|
||||
}
|
||||
.btn-sm {
|
||||
min-height: 28px;
|
||||
padding: 3px 10px;
|
||||
font-size: 12.5px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
.btn-sm:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
.table-scroll th,
|
||||
.table-scroll td {
|
||||
/* 单元格左右内距 12→10px(同上「间距有点大」):列与列之间少 4px,行内更紧凑。 */
|
||||
padding: 10px 10px;
|
||||
text-align: left;
|
||||
font-size: 13.5px;
|
||||
line-height: 1.5;
|
||||
border-bottom: 1px solid #e0e8ef;
|
||||
vertical-align: middle;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 首列勾选格:checkbox 的 UA 默认 margin(3px 3px 3px 4px)使其 margin-box 溢出
|
||||
42px 格的内容盒(42−24 padding=18px),配合上面的 overflow:hidden,Chromium 在
|
||||
首次渲染时会把被裁的 checkbox 碎片留在裁剪边缘,看起来像格子右边多出 ".."。
|
||||
margin 归零后 margin-box 收进内容盒,首渲染即干净(playwright 三次冷加载已验)。 */
|
||||
.table-scroll th:first-child input,
|
||||
.table-scroll td:first-child input {
|
||||
margin: 0;
|
||||
}
|
||||
.table-scroll th {
|
||||
background: #edf4fa;
|
||||
color: #4e6479;
|
||||
border-bottom-color: #d5e1eb;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.4px;
|
||||
}
|
||||
.table-scroll tbody tr:hover td {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.table-scroll tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
/* 点行开详情抽屉:行级 hover 已有底色反馈,光标再点一下提示可点。 */
|
||||
.jd-row {
|
||||
cursor: pointer;
|
||||
}
|
||||
.jd-thumb {
|
||||
display: block;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 6px;
|
||||
background: #f2f7fb;
|
||||
}
|
||||
/* 商品信息列=京麦同款合并布局:td 的全局 nowrap/ellipsis 与多行内容冲突,本列放开换行,
|
||||
截断交给内部各行(标题两行 line-clamp、编码/货号单行 ellipsis)。 */
|
||||
.jd-info-cell {
|
||||
white-space: normal;
|
||||
text-overflow: clip;
|
||||
}
|
||||
.jd-info-wrap {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 10px;
|
||||
min-width: 0;
|
||||
}
|
||||
.jd-info-figure {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 3px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.jd-thumb-empty {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #8293a5;
|
||||
font-size: 12px;
|
||||
}
|
||||
.jd-health {
|
||||
color: #2e9e6b;
|
||||
font-size: 11px;
|
||||
line-height: 1.2;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.jd-info-body {
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 3px;
|
||||
}
|
||||
.jd-info-title {
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-weight: 500;
|
||||
line-height: 1.45;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
word-break: break-all;
|
||||
}
|
||||
.jd-info-meta {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
color: #7b8a99;
|
||||
font-size: 12px;
|
||||
line-height: 1.4;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
.jd-info-code {
|
||||
font-family: "Cascadia Mono", "SF Mono", Consolas, "Courier New", monospace;
|
||||
color: #4e6479;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.jd-copy-btn {
|
||||
flex-shrink: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: #8aa5bf;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
padding: 0 2px;
|
||||
line-height: 1;
|
||||
}
|
||||
.jd-copy-btn:hover {
|
||||
color: #3b82c4;
|
||||
}
|
||||
.jd-info-tags {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
margin-top: 2px;
|
||||
}
|
||||
/* 品牌·类目行(京麦列表同款深色文字):信息 meta 是灰色,这行按京麦用主文字色。 */
|
||||
.jd-brand-cat {
|
||||
color: #3d5368;
|
||||
font-weight: 550;
|
||||
}
|
||||
.jd-tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
height: 18px;
|
||||
padding: 0 6px;
|
||||
border: 1px solid #cfe3f5;
|
||||
border-radius: 3px;
|
||||
background: #eef5fc;
|
||||
color: #3b82c4;
|
||||
font-size: 11.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 44px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
@@ -0,0 +1,305 @@
|
||||
/** 京东数据库查询适配(v1.4 Phase 5):GET /api/admin/jd-products + 删除(DELETE /{id} +
|
||||
* POST /batch-delete)+ 分组端点 /api/admin/jd-product-groups。
|
||||
* 公司口径(2026-11-16 用户定案「删除掉公司 tab,参考品牌数据库」):全页零公司维度——
|
||||
* 只读列表与类目下拉的 company_id 发送口已随公司 tab 摘除(后端读侧谓词同窗撤,重上时
|
||||
* 从 git 历史找回),详情/编辑/删除/分组管理本就不带;行 company_id 列仍是同步来源标记、
|
||||
* 随详情下发。反向钉在 company-tab-wiring「公司维度不得回流」清单。
|
||||
* 导出发送口已随 2026-11-15 客户口径「导出也不用」从前端下线(后端 /export 端点保留)。 */
|
||||
import { http } from '@/api/http'
|
||||
import { errorTextOf, unwrap } from '../../api/envelope.ts'
|
||||
import {
|
||||
toJdProductListParams,
|
||||
type JdProductListParams,
|
||||
} from './jd-product-filter.ts'
|
||||
import {
|
||||
parseJdProductDetail,
|
||||
parseJdProductPage,
|
||||
type JdProductPageResult,
|
||||
} from './jd-product-model.ts'
|
||||
|
||||
export const JD_PRODUCT_ENDPOINT = '/api/admin/jd-products'
|
||||
export const JD_PRODUCT_GROUP_ENDPOINT = '/api/admin/jd-product-groups'
|
||||
|
||||
export async function fetchJdProductList(
|
||||
params: JdProductListParams,
|
||||
): Promise<JdProductPageResult> {
|
||||
const query = toJdProductListParams(
|
||||
{
|
||||
productCode: params.productCode ?? '',
|
||||
titleKeyword: params.titleKeyword ?? '',
|
||||
category: params.category ?? '',
|
||||
groupId: params.groupId ?? '',
|
||||
syncedFrom: params.syncedFrom ?? '',
|
||||
syncedTo: params.syncedTo ?? '',
|
||||
},
|
||||
params.page,
|
||||
params.pageSize,
|
||||
params.ownerGroupId ?? null,
|
||||
)
|
||||
const { data } = await http.get<unknown>(JD_PRODUCT_ENDPOINT, { params: query })
|
||||
return parseJdProductPage(data)
|
||||
}
|
||||
|
||||
/** 详情:GET /api/admin/jd-products/{id}(信封 data=主字段 + attrGroups + attrJsonRaw + images)。
|
||||
* 公共库无公司维度,按 id 直取;分类字段按「当前分组」(owner_group_id)取(V203)。 */
|
||||
export async function fetchJdProductDetail(
|
||||
id: number,
|
||||
ownerGroupId?: number | null,
|
||||
): Promise<ReturnType<typeof parseJdProductDetail>> {
|
||||
const params = typeof ownerGroupId === 'number' && ownerGroupId > 0
|
||||
? { owner_group_id: ownerGroupId }
|
||||
: undefined
|
||||
const { data } = await http.get<unknown>(`${JD_PRODUCT_ENDPOINT}/${id}`, { params })
|
||||
return parseJdProductDetail(data)
|
||||
}
|
||||
|
||||
/** 删除回执(后端 JdProductDeleteVo):三个对象计数分开报——真删的、共用的、前缀外不敢动的。 */
|
||||
export interface JdProductDeleteResult {
|
||||
deleted: number
|
||||
imagesDeleted: number
|
||||
objectsDeleted: number
|
||||
objectsKept: number
|
||||
objectsSkipped: number
|
||||
}
|
||||
|
||||
/** 删除是先删桶、全成功才删库行(后端 JdProductDeleteService);失败文案原样抛给页面。
|
||||
* 公共库写侧无公司维度(2026-11-15 用户定案)。 */
|
||||
export async function deleteJdProducts(
|
||||
ids: number[],
|
||||
): Promise<JdProductDeleteResult> {
|
||||
if (ids.length === 1) {
|
||||
const { data } = await http.delete<unknown>(`${JD_PRODUCT_ENDPOINT}/${ids[0]}`)
|
||||
return unwrap<JdProductDeleteResult>(data)
|
||||
}
|
||||
const { data } = await http.post<unknown>(`${JD_PRODUCT_ENDPOINT}/batch-delete`, { ids })
|
||||
return unwrap<JdProductDeleteResult>(data)
|
||||
}
|
||||
|
||||
/** 编辑提交负载(PUT /api/admin/jd-products/{id} body,后端 JdProductUpdateRequest):
|
||||
* 主字段全量提交;attrGroups/skus/deleteImageIds 可选——null=不修改该块
|
||||
* (后端对 null 块零触碰)。分类不在本负载里(V203:分类按数据权限分组归属存
|
||||
* biz_jd_product_group_assign,编辑面不写 group_id,归类只走列表页「批量编辑分类」)。 */
|
||||
export interface JdProductUpdatePayload {
|
||||
title: string
|
||||
brand: string | null
|
||||
categoryPath: string | null
|
||||
itemNum: string | null
|
||||
priceMin: string | null
|
||||
priceMax: string | null
|
||||
stockTotal: number | null
|
||||
saleStatus: string | null
|
||||
attrGroups: { groupName: string; attrs: { key: string; label: string; value: string }[] }[] | null
|
||||
skus: { skuId: string; price: string | null; stock: number | null }[] | null
|
||||
deleteImageIds: number[] | null
|
||||
}
|
||||
|
||||
/** 编辑保存(PUT):主字段保存即置人工编辑锁(V199 manual_locked=1,后续采集不再覆盖该行);
|
||||
* 失败文案原样抛给抽屉红条。公共库写侧无公司维度。返回刷新后的详情(与
|
||||
* fetchJdProductDetail 同一信封),抽屉用它回填。 */
|
||||
export async function updateJdProduct(
|
||||
id: number,
|
||||
payload: JdProductUpdatePayload,
|
||||
): Promise<ReturnType<typeof parseJdProductDetail>> {
|
||||
const { data } = await http.put<unknown>(`${JD_PRODUCT_ENDPOINT}/${id}`, payload)
|
||||
return parseJdProductDetail(data)
|
||||
}
|
||||
|
||||
/** 图片上传参数(POST /{id}/images multipart):replaceImageId 有值=替换该登记行
|
||||
* (后端继承原行档位,imageType/attrName 忽略);缺省=新增(imageType=MAIN/DETAIL,
|
||||
* ATTR 需带 attrName)。objectKey 由服务端按上传字节 sha256 内容寻址生成(铁律 32),
|
||||
* 前端不自造 key。返回刷新后的详情(与 fetchJdProductDetail 同一信封)。 */
|
||||
export interface JdProductImageUploadParams {
|
||||
replaceImageId?: number
|
||||
imageType?: 'MAIN' | 'ATTR' | 'DETAIL'
|
||||
attrName?: string
|
||||
}
|
||||
|
||||
/** 上传/替换商品图片(multipart 后端中转):上传/替换即生效(服务端立即落库并置
|
||||
* 人工编辑锁),与「删图保存时批量生效」不同。失败文案原样抛给抽屉。 */
|
||||
export async function uploadJdProductImage(
|
||||
id: number,
|
||||
file: File,
|
||||
params: JdProductImageUploadParams,
|
||||
): Promise<ReturnType<typeof parseJdProductDetail>> {
|
||||
const body = new FormData()
|
||||
body.append('file', file)
|
||||
if (params.replaceImageId != null) {
|
||||
body.append('replace_image_id', String(params.replaceImageId))
|
||||
}
|
||||
if (params.imageType) body.append('image_type', params.imageType)
|
||||
if (params.attrName) body.append('attr_name', params.attrName)
|
||||
const { data } = await http.post<unknown>(`${JD_PRODUCT_ENDPOINT}/${id}/images`, body, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
})
|
||||
return parseJdProductDetail(data)
|
||||
}
|
||||
|
||||
/** 分组行(GET 列表返回:[{id,name,ownerGroupId,sortOrder,productCount}])。 */
|
||||
export interface JdProductGroup {
|
||||
id: number
|
||||
name: string
|
||||
ownerGroupId: number
|
||||
sortOrder: number
|
||||
productCount: number
|
||||
}
|
||||
|
||||
/** 分组管理的写入负载(POST / PUT body:{name, sortOrder, ownerGroupId?})。 */
|
||||
export interface JdProductGroupPayload {
|
||||
name: string
|
||||
sortOrder: number
|
||||
/** 新建时归属的数据权限分组(缺省=操作者自己带的组,后端 requireWritableGroup 收敛)。 */
|
||||
ownerGroupId?: number | null
|
||||
}
|
||||
|
||||
/** 「当前分组」下拉的一项(GET /scope 的 groups[],V203):editable=本账号对该组分类可写
|
||||
* (建/改名/删除/归类)。跨公司的组名由后端拼进 label,前端不解析公司字段。 */
|
||||
export interface JdCategoryGroupOption {
|
||||
id: number
|
||||
name: string
|
||||
label: string
|
||||
editable: boolean
|
||||
}
|
||||
|
||||
/** 分类作用域回执(GET /api/admin/jd-product-groups/scope):分组下拉 + 平台超管标记。 */
|
||||
export interface JdCategoryScope {
|
||||
platformSuperAdmin: boolean
|
||||
defaultGroupId: number | null
|
||||
groups: JdCategoryGroupOption[]
|
||||
}
|
||||
|
||||
/** 分组信封是 `{code, message, data}` 三段式:code 非 0 =业务失败,message 是中文文案
|
||||
* (重名等),用 errorTextOf 取出来抛给界面展示(unwrap 只认 success=false,不认 code)。 */
|
||||
function groupDataOf<T>(payload: unknown): T {
|
||||
const record = payload && typeof payload === 'object' ? (payload as Record<string, unknown>) : null
|
||||
if (record && typeof record.code === 'number' && record.code !== 0) {
|
||||
throw new Error(errorTextOf(payload))
|
||||
}
|
||||
return unwrap<T>(payload)
|
||||
}
|
||||
|
||||
function numberOr(value: unknown, fallback: number): number {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : fallback
|
||||
}
|
||||
|
||||
/** 分组下拉/管理列表:按「当前分组」(owner_group_id)取该组的分类(V203,跨组不可见);
|
||||
* 缺省=后端按作用域默认分组取。失败由页面自己兜(分类只是筛选项,不拦首屏行集)。 */
|
||||
export async function fetchJdProductGroups(ownerGroupId?: number | null): Promise<JdProductGroup[]> {
|
||||
const params = typeof ownerGroupId === 'number' && ownerGroupId > 0
|
||||
? { owner_group_id: ownerGroupId }
|
||||
: undefined
|
||||
const { data } = await http.get<unknown>(JD_PRODUCT_GROUP_ENDPOINT, { params })
|
||||
const core = unwrap<unknown>(data)
|
||||
if (!Array.isArray(core)) return []
|
||||
const out: JdProductGroup[] = []
|
||||
for (const raw of core) {
|
||||
if (!raw || typeof raw !== 'object') continue
|
||||
const record = raw as Record<string, unknown>
|
||||
const id = numberOr(record.id, 0)
|
||||
if (id <= 0) continue
|
||||
out.push({
|
||||
id,
|
||||
name: typeof record.name === 'string' ? record.name.trim() : '',
|
||||
ownerGroupId: numberOr(record.ownerGroupId ?? record.owner_group_id, 0),
|
||||
sortOrder: numberOr(record.sortOrder ?? record.sort_order, 0),
|
||||
productCount: numberOr(record.productCount ?? record.product_count, 0),
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** 分类作用域(GET /scope):本账号可见的数据权限分组 + 每组可写标记。
|
||||
* 页面用它渲染「分组」下拉并按 editable 渲染分类写入口;失败由页面自己兜(回空作用域=
|
||||
* 分类列全空、分类管理页提示不属于任何分组,但商品列表照常可用)。 */
|
||||
export async function fetchJdCategoryScope(): Promise<JdCategoryScope> {
|
||||
const { data } = await http.get<unknown>(`${JD_PRODUCT_GROUP_ENDPOINT}/scope`)
|
||||
const core = groupDataOf<unknown>(data)
|
||||
const record = core && typeof core === 'object' ? (core as Record<string, unknown>) : {}
|
||||
const rawGroups = Array.isArray(record.groups) ? record.groups : []
|
||||
const groups: JdCategoryGroupOption[] = []
|
||||
for (const raw of rawGroups) {
|
||||
if (!raw || typeof raw !== 'object') continue
|
||||
const row = raw as Record<string, unknown>
|
||||
const id = numberOr(row.id, 0)
|
||||
if (id <= 0) continue
|
||||
const name = typeof row.name === 'string' ? row.name.trim() : ''
|
||||
groups.push({
|
||||
id,
|
||||
name,
|
||||
label: typeof row.label === 'string' && row.label.trim() ? row.label.trim() : name,
|
||||
editable: row.editable === true,
|
||||
})
|
||||
}
|
||||
return {
|
||||
platformSuperAdmin: record.platformSuperAdmin === true || record.platform_super_admin === true,
|
||||
defaultGroupId: numberOr(record.defaultGroupId ?? record.default_group_id, 0) || null,
|
||||
groups,
|
||||
}
|
||||
}
|
||||
|
||||
/** 类目下拉选项(GET /categories 返回 [{name, productCount}],name=京麦末级类目即
|
||||
* 落库的 category_path;等值过滤)。失败由页面自己兜(类目只是筛选项,不拦首屏行集)。 */
|
||||
export interface JdProductCategoryOption {
|
||||
name: string
|
||||
productCount: number
|
||||
}
|
||||
|
||||
export async function fetchJdProductCategories(): Promise<JdProductCategoryOption[]> {
|
||||
const { data } = await http.get<unknown>(`${JD_PRODUCT_ENDPOINT}/categories`)
|
||||
const core = unwrap<unknown>(data)
|
||||
if (!Array.isArray(core)) return []
|
||||
const out: JdProductCategoryOption[] = []
|
||||
for (const raw of core) {
|
||||
if (!raw || typeof raw !== 'object') continue
|
||||
const record = raw as Record<string, unknown>
|
||||
const name = typeof record.name === 'string' ? record.name.trim() : ''
|
||||
if (!name) continue
|
||||
out.push({ name, productCount: numberOr(record.productCount ?? record.product_count, 0) })
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** 新建分类(归属当前分组,V203):ownerGroupId 缺省=后端取操作者自己带的组;
|
||||
* 同一分组内重名等业务失败把后端中文文案抛回(页面直接展示)。 */
|
||||
export async function createJdProductGroup(
|
||||
payload: JdProductGroupPayload,
|
||||
): Promise<JdProductGroup | null> {
|
||||
const body: Record<string, unknown> = { name: payload.name, sortOrder: payload.sortOrder }
|
||||
if (typeof payload.ownerGroupId === 'number' && payload.ownerGroupId > 0) {
|
||||
body.ownerGroupId = payload.ownerGroupId
|
||||
}
|
||||
const { data } = await http.post<unknown>(JD_PRODUCT_GROUP_ENDPOINT, body)
|
||||
return groupDataOf<JdProductGroup | null>(data)
|
||||
}
|
||||
|
||||
/** 改名/改排序;业务失败文案同上。 */
|
||||
export async function updateJdProductGroup(
|
||||
id: number,
|
||||
payload: JdProductGroupPayload,
|
||||
): Promise<JdProductGroup | null> {
|
||||
const body: Record<string, unknown> = { name: payload.name, sortOrder: payload.sortOrder }
|
||||
const { data } = await http.put<unknown>(`${JD_PRODUCT_GROUP_ENDPOINT}/${id}`, body)
|
||||
return groupDataOf<JdProductGroup | null>(data)
|
||||
}
|
||||
|
||||
/** 删除分组;业务失败文案同上。 */
|
||||
export async function deleteJdProductGroup(id: number): Promise<void> {
|
||||
const { data } = await http.delete<unknown>(`${JD_PRODUCT_GROUP_ENDPOINT}/${id}`)
|
||||
groupDataOf<unknown>(data)
|
||||
}
|
||||
|
||||
/** 批量人工归类(2026-11-17 起唯一入口=京东数据库页工具栏「批量编辑分类」;
|
||||
* 旧「店铺分类弹窗+工具栏移除分类」已随同日口径下线):勾选商品行(跨页累计)
|
||||
* → 归入当前分组(ownerGroupId)的指定分类或移出分类(V203:归属写
|
||||
* biz_jd_product_group_assign 的 (product_id, owner_group_id) 一行,同一商品各组可各自归类)。
|
||||
* groupId 传 null=移出本组分类;返回实际写入/解挂的归属行数。
|
||||
* 归类<b>不再置人工编辑锁</b>(2026-11-16 用户拍板):分类不在商品行上,采集冲不掉它。
|
||||
* 业务失败(分类不存在/不属于当前分组)把中文文案抛回,对话框红条原样展示。 */
|
||||
export async function batchAssignJdProductGroup(
|
||||
ids: number[],
|
||||
groupId: number | null,
|
||||
ownerGroupId: number,
|
||||
): Promise<number> {
|
||||
const body: Record<string, unknown> = { ids, groupId, ownerGroupId }
|
||||
const { data } = await http.post<unknown>(`${JD_PRODUCT_ENDPOINT}/batch-assign-group`, body)
|
||||
return groupDataOf<number>(data)
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
/** 京东数据库页筛选纯函数(v1.4 Phase 5):商品编码/标题关键字/类目/分组/同步起止 + snake 分页参数。
|
||||
* 产出与后端契约 §列表 query 逐字对撞:`page`/`page_size`(默认 20、上限 100)、
|
||||
* `product_code`、`title_keyword`、`category`(京麦末级类目等值过滤,2026-11-15 增)、
|
||||
* `group_id`(当前分组下的分类 id)、`owner_group_id`(当前数据权限分组,V203)、
|
||||
* `synced_from`/`synced_to`(ISO yyyy-MM-dd;空白不下发)。
|
||||
* 商品状态筛选与导出(2026-11-15 客户口径「这两个不要/导出也不用」)已从前端下线;
|
||||
* 店铺筛选同日客户口径「店铺不需要」从前端下线(后端 shop_name 参数同窗撤,DB 列与详情不动)。
|
||||
* 后端 `sale_status` 参数与 `/export` 端点保留(无 UI 入口),重上时从 git 历史找回取值口。
|
||||
* 分页钳制(铁律 15):page < 1 归 1、上限 10_000(后端 CR-18 同值),(page-1)*page_size
|
||||
* 最大 999_900,Number.MAX_SAFE_INTEGER 也不会把乘积顶出安全整数。纯逻辑,node --test 直测。
|
||||
* 公司维已整页摘除(2026-11-16 用户定案「删除掉公司 tab,参考品牌数据库」):归一化构造器
|
||||
* 与入参类型都不认识 company_id——读侧发送口已随公司 tab 撤下(品牌库 2026-10-06 先例同形)。
|
||||
* 日期默认空字符串:同步台账是累计数据,默认当天会让首屏只剩今天同步的行
|
||||
* (date-filter-default-today 护栏 EXEMPT 口径,外观专利页同款)。 */
|
||||
import { validIsoDateOrUndefined } from '../asin/asin-filter.ts'
|
||||
|
||||
/** 每页条数默认 20(v1.4 §3.4),上限 100。 */
|
||||
export const JD_PRODUCT_PAGE_SIZE = 20
|
||||
export const JD_PRODUCT_MAX_PAGE_SIZE = 100
|
||||
/** 页码上限:与后端 MAX_PAGE(CR-18 先例,外观专利同值)对齐,两侧不漂。 */
|
||||
export const JD_PRODUCT_MAX_PAGE = 10_000
|
||||
|
||||
export interface JdProductFilterState {
|
||||
/** 商品编码,空串不限。 */
|
||||
productCode: string
|
||||
/** 标题关键字,空串不限。 */
|
||||
titleKeyword: string
|
||||
/** 类目(京麦末级类目名,等值过滤;选项来自 GET /categories),空串=全部类目。 */
|
||||
category: string
|
||||
/** 分组 id 文本(分组管理里那一行),空串=全部分组。 */
|
||||
groupId: string
|
||||
/** 同步开始日期(ISO yyyy-MM-dd;空串不限)。 */
|
||||
syncedFrom: string
|
||||
/** 同步结束日期(ISO yyyy-MM-dd;空串不限)。 */
|
||||
syncedTo: string
|
||||
}
|
||||
|
||||
export function createJdProductFilterState(): JdProductFilterState {
|
||||
return { productCode: '', titleKeyword: '', category: '', groupId: '', syncedFrom: '', syncedTo: '' }
|
||||
}
|
||||
|
||||
/** 是否有任一激活筛选条件。 */
|
||||
export function jdProductFilterActive(state: JdProductFilterState): boolean {
|
||||
if ((state.productCode || '').trim()) return true
|
||||
if ((state.titleKeyword || '').trim()) return true
|
||||
if ((state.category || '').trim()) return true
|
||||
if ((state.groupId || '').trim()) return true
|
||||
if (validIsoDateOrUndefined(state.syncedFrom) || validIsoDateOrUndefined(state.syncedTo)) return true
|
||||
return false
|
||||
}
|
||||
|
||||
/** 序列化到后端的列表查询参数(snake_case,仅下发非空字段)。 */
|
||||
export interface JdProductQuery {
|
||||
page: number
|
||||
page_size: number
|
||||
product_code?: string
|
||||
title_keyword?: string
|
||||
/** 京麦末级类目等值过滤(后端 JdProductQueryService.Filter.category)。 */
|
||||
category?: string
|
||||
/** 自定义分类 id(当前分组下的一个分类;V203 起按归属表 EXISTS 过滤)。 */
|
||||
group_id?: number
|
||||
/** 当前数据权限分组 id(分类列/分类筛选都按它取;V203「不同组不能看到跨组的分类」)。 */
|
||||
owner_group_id?: number
|
||||
synced_from?: string
|
||||
synced_to?: string
|
||||
}
|
||||
|
||||
/** api 模块的入参:筛选态 + 分页 + 当前分组(公共库无公司维度)。 */
|
||||
export interface JdProductListParams {
|
||||
page: number
|
||||
pageSize: number
|
||||
productCode?: string
|
||||
titleKeyword?: string
|
||||
category?: string
|
||||
groupId?: string
|
||||
/** 当前分组(数据权限分组 id):分类列/分类筛选的作用域,非筛选条件(重置不清它)。 */
|
||||
ownerGroupId?: number | null
|
||||
syncedFrom?: string
|
||||
syncedTo?: string
|
||||
}
|
||||
|
||||
/** 过滤态 → 过滤面参数(snake_case,仅下发非空字段)。 */
|
||||
function toJdProductFilterQuery(state: JdProductFilterState): Omit<JdProductQuery, 'page' | 'page_size'> {
|
||||
const query: Omit<JdProductQuery, 'page' | 'page_size'> = {}
|
||||
const productCode = (state.productCode || '').trim()
|
||||
if (productCode) query.product_code = productCode
|
||||
const titleKeyword = (state.titleKeyword || '').trim()
|
||||
if (titleKeyword) query.title_keyword = titleKeyword
|
||||
const category = (state.category || '').trim()
|
||||
if (category) query.category = category
|
||||
const groupId = Number.parseInt((state.groupId || '').trim(), 10)
|
||||
if (Number.isFinite(groupId) && groupId > 0) query.group_id = groupId
|
||||
const syncedFrom = validIsoDateOrUndefined(state.syncedFrom)
|
||||
if (syncedFrom) query.synced_from = syncedFrom
|
||||
const syncedTo = validIsoDateOrUndefined(state.syncedTo)
|
||||
if (syncedTo) query.synced_to = syncedTo
|
||||
return query
|
||||
}
|
||||
|
||||
/** 过滤态 + 分页 → 列表查询参数;空白/非法日期不下发,分页钳制在此单出口(不含公司维)。
|
||||
* {@code ownerGroupId} 是「当前分组」(分类列/分类筛选作用域,V203),不是筛选条件:
|
||||
* >0 时下发 `owner_group_id`,缺省/0 不下发=后端按作用域默认分组取。 */
|
||||
export function toJdProductListParams(
|
||||
state: JdProductFilterState,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
ownerGroupId?: number | null,
|
||||
): JdProductQuery {
|
||||
const safePage = Math.min(Math.max(Math.floor(page) || 1, 1), JD_PRODUCT_MAX_PAGE)
|
||||
const rawSize = Math.floor(pageSize) || JD_PRODUCT_PAGE_SIZE
|
||||
const safeSize = Math.min(Math.max(rawSize, 1), JD_PRODUCT_MAX_PAGE_SIZE)
|
||||
const query: JdProductQuery = {
|
||||
page: safePage,
|
||||
page_size: safeSize,
|
||||
...toJdProductFilterQuery(state),
|
||||
}
|
||||
if (typeof ownerGroupId === 'number' && Number.isFinite(ownerGroupId) && ownerGroupId > 0) {
|
||||
query.owner_group_id = Math.floor(ownerGroupId)
|
||||
}
|
||||
return query
|
||||
}
|
||||
@@ -0,0 +1,347 @@
|
||||
/** 京东数据库列表查询模型(v1.4 Phase 5):解析 JdProductPageVo(camel),纯逻辑零依赖。
|
||||
* camel 为正、snake 容错(与外观专利/去重页模型同形),缺 id 弃行。
|
||||
* 纯函数、无框架依赖(envelope 只借纯 unwrap),node --test 可直测。 */
|
||||
import { unwrap } from '../../api/envelope.ts'
|
||||
|
||||
/** 京东商品列表行(后端 JdProductItemVo,camel 为正)。 */
|
||||
export interface JdProductItem {
|
||||
id: number
|
||||
shopId: number | null
|
||||
shopName: string
|
||||
productCode: string
|
||||
skuId: string
|
||||
/** 货号(京麦后台「货号」列,与 SKU 不是同一个值)。 */
|
||||
itemNum: string
|
||||
/** SKU 数(京麦后台「12个SKU」列)。 */
|
||||
skuCount: number | null
|
||||
/** 信息分(京麦后台「信息分」列)。 */
|
||||
healthScore: number | null
|
||||
title: string
|
||||
brand: string
|
||||
categoryPath: string
|
||||
/** 价格区间下限(京麦 priceDetailVO.minJdPrice):后端 BigDecimal 序列化成 JSON number,
|
||||
* decimalText 数值/字符串都收——2026-11-16 实录:text() 把 number 丢成空串=生产库
|
||||
* 273/273 行 price_min 全有值而列表价格全显示「-」(用户报「价格没采集到」的真因)。 */
|
||||
priceMin: string
|
||||
/** 价格区间上限(京麦 priceDetailVO.maxJdPrice),解析口径同 priceMin。 */
|
||||
priceMax: string
|
||||
stockTotal: number | null
|
||||
/** 上架中/已下架/审核中/草稿。 */
|
||||
saleStatus: string
|
||||
listTab: string
|
||||
jdCreatedAt: string
|
||||
/** 上架时间(京麦后台「上架时间」列,与创建时间不是同一个值)。 */
|
||||
jdOnlineAt: string
|
||||
jdUpdatedAt: string
|
||||
mainImageUrl: string
|
||||
attrCount: number | null
|
||||
imageCount: number | null
|
||||
groupId: number | null
|
||||
groupName: string
|
||||
syncedAt?: string
|
||||
}
|
||||
|
||||
export interface JdProductPageResult {
|
||||
items: JdProductItem[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/** 前端首屏默认容量(与 filter 侧 JD_PRODUCT_PAGE_SIZE 同值 20)。 */
|
||||
export const JD_PRODUCT_DEFAULT_SIZE = 20
|
||||
|
||||
export function emptyJdProductPage(): JdProductPageResult {
|
||||
return { items: [], total: 0, page: 1, pageSize: JD_PRODUCT_DEFAULT_SIZE }
|
||||
}
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
function numberOrNull(value: unknown): number | null {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : null
|
||||
}
|
||||
|
||||
/** 价格区间展示:min/max 都空为 -,只空一侧给单值。输入数值/字符串都收
|
||||
* (后端 BigDecimal 序列化成 JSON number;列表行解析层之外,mount 测试 mock
|
||||
* 绕过解析层时 number 会原样进这里——对 number 直接 .trim() 抛 TypeError
|
||||
* 炸整页渲染,2026-11-16 实录),统一 decimalText 归一后再拼。 */
|
||||
export function jdPriceRange(item: Pick<JdProductItem, 'priceMin' | 'priceMax'>): string {
|
||||
const min = decimalText(item.priceMin).trim()
|
||||
const max = decimalText(item.priceMax).trim()
|
||||
if (min && max) return min === max ? min : `${min} ~ ${max}`
|
||||
return min || max || ''
|
||||
}
|
||||
|
||||
/** 解析单行;缺 id 视为无效。camel 为正、snake 容错。 */
|
||||
export function toJdProductItem(raw: unknown): JdProductItem | null {
|
||||
if (!raw || typeof raw !== 'object') return null
|
||||
const record = raw as Record<string, unknown>
|
||||
const id = numberOrNull(record.id)
|
||||
if (id === null) return null
|
||||
return {
|
||||
id,
|
||||
shopId: numberOrNull(record.shopId ?? record.shop_id),
|
||||
shopName: text(record.shopName ?? record.shop_name),
|
||||
productCode: text(record.productCode ?? record.product_code),
|
||||
skuId: text(record.skuId ?? record.sku_id),
|
||||
itemNum: text(record.itemNum ?? record.item_num),
|
||||
skuCount: numberOrNull(record.skuCount ?? record.sku_count),
|
||||
healthScore: numberOrNull(record.healthScore ?? record.health_score),
|
||||
title: text(record.title),
|
||||
brand: text(record.brand),
|
||||
categoryPath: text(record.categoryPath ?? record.category_path),
|
||||
// 价格必须走 decimalText(数值/字符串都收):后端 BigDecimal 序列化成 JSON number,
|
||||
// text() 对非字符串一律回空串=采集到的价格在解析层被丢掉(2026-11-16 生产库 273 行
|
||||
// price_min 全有值、列表全「-」实录)。与详情 SKU 价(decimalText)同一出口。
|
||||
priceMin: decimalText(record.priceMin ?? record.price_min),
|
||||
priceMax: decimalText(record.priceMax ?? record.price_max),
|
||||
stockTotal: numberOrNull(record.stockTotal ?? record.stock_total),
|
||||
saleStatus: text(record.saleStatus ?? record.sale_status),
|
||||
listTab: text(record.listTab ?? record.list_tab),
|
||||
jdCreatedAt: text(record.jdCreatedAt ?? record.jd_created_at),
|
||||
jdOnlineAt: text(record.jdOnlineAt ?? record.jd_online_at),
|
||||
jdUpdatedAt: text(record.jdUpdatedAt ?? record.jd_updated_at),
|
||||
mainImageUrl: text(record.mainImageUrl ?? record.main_image_url),
|
||||
attrCount: numberOrNull(record.attrCount ?? record.attr_count),
|
||||
imageCount: numberOrNull(record.imageCount ?? record.image_count),
|
||||
groupId: numberOrNull(record.groupId ?? record.group_id),
|
||||
groupName: text(record.groupName ?? record.group_name),
|
||||
syncedAt: text(record.syncedAt ?? record.synced_at) || undefined,
|
||||
}
|
||||
}
|
||||
|
||||
/** 归一化分页负载(信封或已解包 VO)为前端结果;缺省字段回默认。 */
|
||||
export function parseJdProductPage(payload: unknown): JdProductPageResult {
|
||||
const out = emptyJdProductPage()
|
||||
const core = unwrap<unknown>(payload)
|
||||
if (!core || typeof core !== 'object') return out
|
||||
const record = core as Record<string, unknown>
|
||||
if (Array.isArray(record.items)) {
|
||||
out.items = record.items
|
||||
.map((raw) => toJdProductItem(raw))
|
||||
.filter((item): item is JdProductItem => item !== null)
|
||||
}
|
||||
if (typeof record.total === 'number') out.total = Math.floor(record.total)
|
||||
if (typeof record.page === 'number' && record.page >= 1) out.page = Math.floor(record.page)
|
||||
const rawSize = record.pageSize ?? record.page_size
|
||||
if (typeof rawSize === 'number' && rawSize >= 1) out.pageSize = Math.floor(rawSize)
|
||||
return out
|
||||
}
|
||||
|
||||
/** 详情属性块:attrGroups[{groupName, attrs:[{key,label,value}]}]。 */
|
||||
export interface JdProductAttrEntry {
|
||||
key: string
|
||||
label: string
|
||||
value: string
|
||||
}
|
||||
|
||||
export interface JdProductAttrGroup {
|
||||
groupName: string
|
||||
attrs: JdProductAttrEntry[]
|
||||
}
|
||||
|
||||
/** 详情图片:images[{id, imageType, attrName, sortNo, url, byteSize, width, height}]
|
||||
* (id=biz_jd_product_image 行号,编辑抽屉按它提交删图;旧后端不带 id 时按缺 0 弃行口径不拦展示)。 */
|
||||
export interface JdProductImage {
|
||||
id: number
|
||||
imageType: string
|
||||
attrName: string
|
||||
sortNo: number
|
||||
url: string
|
||||
byteSize: number | null
|
||||
width: number | null
|
||||
height: number | null
|
||||
}
|
||||
|
||||
/** 销售属性组合的一项(颜色=上衣 / 尺码=S,京麦详情页「销售属性」)。 */
|
||||
export interface JdProductSkuAttr {
|
||||
name: string
|
||||
value: string
|
||||
}
|
||||
|
||||
/** 详情 SKU 行(后端 JdProductDetailVo.SkuVo,V198;京麦 12 行矩阵的一行)。 */
|
||||
export interface JdProductSku {
|
||||
skuId: string
|
||||
skuName: string
|
||||
/** 商家自定义序号(京麦 skuSeq)。 */
|
||||
skuSeq: string
|
||||
/** 京东价(后端 BigDecimal,前端按文本展示,不做金额运算)。 */
|
||||
price: string
|
||||
stock: number | null
|
||||
saleAttrs: JdProductSkuAttr[]
|
||||
sortNo: number
|
||||
}
|
||||
|
||||
export interface JdProductDetail {
|
||||
item: JdProductItem
|
||||
attrGroups: JdProductAttrGroup[]
|
||||
images: JdProductImage[]
|
||||
/** SKU 矩阵(京麦详情页「销售属性」区,V198;旧数据为空数组)。 */
|
||||
skus: JdProductSku[]
|
||||
/** attrGroups 解析失败时的原始 JSON 兜底(界面原样展示,不静默吞)。 */
|
||||
attrJsonRaw: string
|
||||
}
|
||||
|
||||
/** 归一化 attrGroups(camel/snake 同级容错),非法项跳过、块名缺省归「属性」。 */
|
||||
function toAttrGroups(raw: unknown): JdProductAttrGroup[] {
|
||||
if (!Array.isArray(raw)) return []
|
||||
const out: JdProductAttrGroup[] = []
|
||||
for (const groupRaw of raw) {
|
||||
if (!groupRaw || typeof groupRaw !== 'object') continue
|
||||
const group = groupRaw as Record<string, unknown>
|
||||
const groupName = text(group.groupName ?? group.group_name) || '属性'
|
||||
const attrsRaw = group.attrs
|
||||
if (!Array.isArray(attrsRaw)) continue
|
||||
const attrs: JdProductAttrEntry[] = []
|
||||
for (const attrRaw of attrsRaw) {
|
||||
if (!attrRaw || typeof attrRaw !== 'object') continue
|
||||
const attr = attrRaw as Record<string, unknown>
|
||||
attrs.push({
|
||||
key: text(attr.key),
|
||||
label: text(attr.label),
|
||||
value: text(attr.value),
|
||||
})
|
||||
}
|
||||
out.push({ groupName, attrs })
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** 归一化 images;缺 url 弃行(界面没有可展示/可打开的目标),sortNo 缺省 0。 */
|
||||
function toImages(raw: unknown): JdProductImage[] {
|
||||
if (!Array.isArray(raw)) return []
|
||||
const out: JdProductImage[] = []
|
||||
for (const imageRaw of raw) {
|
||||
if (!imageRaw || typeof imageRaw !== 'object') continue
|
||||
const image = imageRaw as Record<string, unknown>
|
||||
const url = text(image.url)
|
||||
if (!url) continue
|
||||
out.push({
|
||||
id: numberOrNull(image.id) ?? 0,
|
||||
imageType: text(image.imageType ?? image.image_type),
|
||||
attrName: text(image.attrName ?? image.attr_name),
|
||||
sortNo: numberOrNull(image.sortNo ?? image.sort_no) ?? 0,
|
||||
url,
|
||||
byteSize: numberOrNull(image.byteSize ?? image.byte_size),
|
||||
width: numberOrNull(image.width),
|
||||
height: numberOrNull(image.height),
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** 数值/字符串都收(后端 BigDecimal 序列化成 JSON number),去尾零后展示:
|
||||
* 京麦详情页写 `162`,不给 `162.00`;数字形状之外的原文照原样回(不吞异常值)。 */
|
||||
function decimalText(value: unknown): string {
|
||||
if (typeof value === 'number' && Number.isFinite(value)) {
|
||||
return String(Math.round(value * 100) / 100)
|
||||
}
|
||||
const raw = text(value)
|
||||
if (!/^\d+(?:\.\d+)?$/.test(raw)) return raw
|
||||
return String(Math.round(Number(raw) * 100) / 100)
|
||||
}
|
||||
|
||||
/** 归一化 SKU 矩阵(camel/snake 容错);缺 skuId 弃行(京麦每一行都以 skuId 为身份)。 */
|
||||
function toSkus(raw: unknown): JdProductSku[] {
|
||||
if (!Array.isArray(raw)) return []
|
||||
const out: JdProductSku[] = []
|
||||
for (const skuRaw of raw) {
|
||||
if (!skuRaw || typeof skuRaw !== 'object') continue
|
||||
const sku = skuRaw as Record<string, unknown>
|
||||
const skuId = text(sku.skuId ?? sku.sku_id)
|
||||
if (!skuId) continue
|
||||
const saleAttrs: JdProductSkuAttr[] = []
|
||||
const attrsRaw = sku.saleAttrs ?? sku.sale_attrs
|
||||
if (Array.isArray(attrsRaw)) {
|
||||
for (const attrRaw of attrsRaw) {
|
||||
if (!attrRaw || typeof attrRaw !== 'object') continue
|
||||
const attr = attrRaw as Record<string, unknown>
|
||||
const value = text(attr.value)
|
||||
if (!value) continue
|
||||
saleAttrs.push({ name: text(attr.name) || '属性', value })
|
||||
}
|
||||
}
|
||||
out.push({
|
||||
skuId,
|
||||
skuName: text(sku.skuName ?? sku.sku_name),
|
||||
skuSeq: text(sku.skuSeq ?? sku.sku_seq),
|
||||
price: decimalText(sku.price),
|
||||
stock: numberOrNull(sku.stock),
|
||||
saleAttrs,
|
||||
sortNo: numberOrNull(sku.sortNo ?? sku.sort_no) ?? 0,
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** 销售属性维度名(按首次出现顺序):京麦详情页「颜色 / 尺码」两列。 */
|
||||
export function jdSkuDimensions(skus: JdProductSku[]): string[] {
|
||||
const order: string[] = []
|
||||
for (const sku of skus) {
|
||||
for (const attr of sku.saleAttrs) {
|
||||
if (!order.includes(attr.name)) order.push(attr.name)
|
||||
}
|
||||
}
|
||||
return order
|
||||
}
|
||||
|
||||
/** SKU 矩阵汇总:`12 个 SKU · ¥162 ~ ¥168 · 库存 2400`(缺项不硬凑)。 */
|
||||
export function jdSkuSummary(skus: JdProductSku[]): string {
|
||||
if (!skus.length) return ''
|
||||
const prices = skus
|
||||
.map((sku) => Number(sku.price))
|
||||
.filter((value) => Number.isFinite(value) && value > 0)
|
||||
const priceText = prices.length
|
||||
? Math.min(...prices) === Math.max(...prices)
|
||||
? `¥${Math.min(...prices)}`
|
||||
: `¥${Math.min(...prices)} ~ ¥${Math.max(...prices)}`
|
||||
: ''
|
||||
const stocks = skus.map((sku) => sku.stock).filter((value): value is number => typeof value === 'number')
|
||||
const stockText = stocks.length ? `库存 ${stocks.reduce((sum, value) => sum + value, 0)}` : ''
|
||||
return [`${skus.length} 个 SKU`, priceText, stockText].filter(Boolean).join(' · ')
|
||||
}
|
||||
|
||||
/** 解析详情负载(信封或已解包 VO);attrGroups 解析不出时回 attrJsonRaw 原文兜底。 */
|
||||
export function parseJdProductDetail(payload: unknown): JdProductDetail {
|
||||
const core = unwrap<unknown>(payload)
|
||||
const record = core && typeof core === 'object' ? (core as Record<string, unknown>) : {}
|
||||
const item = toJdProductItem(record) ?? {
|
||||
id: 0,
|
||||
shopId: null,
|
||||
shopName: '',
|
||||
productCode: '',
|
||||
skuId: '',
|
||||
itemNum: '',
|
||||
skuCount: null,
|
||||
healthScore: null,
|
||||
title: '',
|
||||
brand: '',
|
||||
categoryPath: '',
|
||||
priceMin: '',
|
||||
priceMax: '',
|
||||
stockTotal: null,
|
||||
saleStatus: '',
|
||||
listTab: '',
|
||||
jdCreatedAt: '',
|
||||
jdOnlineAt: '',
|
||||
jdUpdatedAt: '',
|
||||
mainImageUrl: '',
|
||||
attrCount: null,
|
||||
imageCount: null,
|
||||
groupId: null,
|
||||
groupName: '',
|
||||
}
|
||||
const attrGroups = toAttrGroups(record.attrGroups ?? record.attr_groups)
|
||||
const attrJsonRaw = typeof record.attrJsonRaw === 'string'
|
||||
? record.attrJsonRaw
|
||||
: typeof record.attr_json_raw === 'string' ? record.attr_json_raw : ''
|
||||
return {
|
||||
item,
|
||||
attrGroups,
|
||||
images: toImages(record.images),
|
||||
skus: toSkus(record.skus),
|
||||
attrJsonRaw,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,444 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
/** 外观专利数据库 · 明细分页表(2026-11-11 晚间按客户口径恢复「昨天那个格式」:
|
||||
* 「不是这种格式 你就按照昨天那个格式」——撤掉一主管一卡视图,恢复只读明细表;
|
||||
* 「添加个管理员 跟导出数据就可以」——表上加「管理员」列(后端读侧现算:主管/公司超管=自己,
|
||||
* 普通账户=创建人,读不到为空展示 -,不猜名),筛选行加「导出」(与「去重数据库」页同款:
|
||||
* 当前过滤面+公司 tab 全量出 xlsx,不传 supervisor_user_id——传了会走按主管分支并忽略任务号/ASIN);
|
||||
* 「任务号/ASIN 两个筛选框恢复」(后端能力一直在,之前产品决定下过架,客户要「一目了然」选数据);
|
||||
* 分组(主管)下拉保留「选中即查」。数据按 ASIN 累计:同 ASIN 只保留一条(V192 唯一键,
|
||||
* 重复检测更新那条),不同 ASIN 同品牌全保留——页面只管展示,累计语义在后端同步链。
|
||||
* 主管卡片视图与卡片级删除按钮从页面下架(客户下午反馈数据疑似被误删,删除入口先撤;
|
||||
* 后端 /supervisors 两接口保留不动)。 */
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import {
|
||||
exportAppearancePatentCleanList,
|
||||
fetchAppearancePatentCleanList,
|
||||
fetchDedupeTotalGroups,
|
||||
type DedupeGroupOption,
|
||||
} from './appearance-patent-clean-api.ts'
|
||||
import type { AppearancePatentCleanItem } from './appearance-patent-clean-model.ts'
|
||||
import { cleanItemReasonTooltip } from './appearance-patent-clean-model.ts'
|
||||
import { createAppearancePatentCleanFilterState } from './appearance-patent-clean-filter.ts'
|
||||
import { ASIN_COUNTRY_CODES, asinCountryLabel } from '../asin/asin-country.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const companyTab = useCompanyTabStore()
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<AppearancePatentCleanItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(10)
|
||||
/** 导出在途锁:避免连点导出把同一份过滤面重复请求两遍。 */
|
||||
const exporting = ref(false)
|
||||
/** 同步台账是累计数据,日期初值故意留空(默认当天会让首屏只剩今天同步的行);见 date-filter-default-today 护栏的 EXEMPT。 */
|
||||
const filter = reactive(createAppearancePatentCleanFilterState())
|
||||
/** 分组(主管)下拉选项:公司 tab 切换时重取;选项失败不拦列表,只回空下拉(可见「全部分组」)。 */
|
||||
const groupOptions = ref<DedupeGroupOption[]>([])
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.startDate, filter.endDate)
|
||||
filter.startDate = s
|
||||
filter.endDate = e
|
||||
}
|
||||
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
/** 分组选项与去重页/店铺管理同源(GET /shop-manages/groups);失败静默回空——分组只是筛选项,
|
||||
* 不该让它把首屏行集一起拖死(列表失败有自己的 LoadFailureBar)。 */
|
||||
async function loadGroupOptions(): Promise<void> {
|
||||
try {
|
||||
groupOptions.value = await fetchDedupeTotalGroups(companyTab.requestCompanyId)
|
||||
} catch {
|
||||
groupOptions.value = []
|
||||
}
|
||||
}
|
||||
|
||||
async function load(): Promise<void> {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchAppearancePatentCleanList({
|
||||
page: page.value,
|
||||
pageSize: pageSize.value,
|
||||
taskId: filter.taskId,
|
||||
asin: filter.asin,
|
||||
country: filter.country,
|
||||
groupId: filter.groupId,
|
||||
startDate: filter.startDate,
|
||||
endDate: filter.endDate,
|
||||
companyId: companyTab.requestCompanyId,
|
||||
})
|
||||
rows.value = result.items
|
||||
total.value = result.total
|
||||
if (result.page >= 1) page.value = result.page
|
||||
} catch (error) {
|
||||
loadFailure.value = loadFailureMessage(error, '无侵权数据加载失败')
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 导出与页签同一过滤面(含公司 tab 与分组),服务端全量出 xlsx;成功后浏览器落盘,失败弹可读文案。
|
||||
* 不传 supervisor_user_id:按主管分支会忽略任务号/ASIN 参数,「按当前筛选导出」必须走明细分支。 */
|
||||
async function exportAll(): Promise<void> {
|
||||
if (exporting.value) return
|
||||
exporting.value = true
|
||||
try {
|
||||
const result = await exportAppearancePatentCleanList({
|
||||
taskId: filter.taskId,
|
||||
asin: filter.asin,
|
||||
country: filter.country,
|
||||
groupId: filter.groupId,
|
||||
startDate: filter.startDate,
|
||||
endDate: filter.endDate,
|
||||
companyId: companyTab.requestCompanyId,
|
||||
})
|
||||
const url = URL.createObjectURL(result.blob)
|
||||
const anchor = document.createElement('a')
|
||||
anchor.href = url
|
||||
anchor.download = result.filename
|
||||
document.body.appendChild(anchor)
|
||||
anchor.click()
|
||||
anchor.remove()
|
||||
URL.revokeObjectURL(url)
|
||||
showAdminFeedback(`已导出 ${result.filename}`, 'success')
|
||||
} catch (error) {
|
||||
const message = error instanceof Error && error.message ? error.message : '导出失败,请稍后重试'
|
||||
showAdminFeedback(message, 'error')
|
||||
} finally {
|
||||
exporting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function apply(): void {
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
/** 重置(对齐店铺数据记录页样式):筛选面回出厂空态,回第一页重取。 */
|
||||
function reset(): void {
|
||||
Object.assign(filter, createAppearancePatentCleanFilterState())
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
function changePage(next: number): void {
|
||||
if (next < 1 || next > totalPages.value) return
|
||||
page.value = next
|
||||
void load()
|
||||
}
|
||||
|
||||
function changeSize(size: number) {
|
||||
pageSize.value = size
|
||||
page.value = 1
|
||||
void load()
|
||||
}
|
||||
|
||||
// 切公司 = 重新取数:任务号/ASIN/分组是上一家选中的值,在新一家的行集里筛不出东西,必须一起清,
|
||||
// 分组选项也按新公司重取(选项集是公司隔离的)。
|
||||
watch(() => companyTab.activeId, () => { filter.taskId = ''; filter.asin = ''; filter.groupId = ''; page.value = 1; void loadGroupOptions(); void load() })
|
||||
|
||||
onMounted(() => {
|
||||
void loadGroupOptions()
|
||||
void load()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="clean-items-view">
|
||||
<section class="panel-box">
|
||||
<div class="clean-panel-head">
|
||||
<h3>外观专利数据库</h3>
|
||||
</div>
|
||||
|
||||
<div class="clean-filter-row">
|
||||
<div class="form-group">
|
||||
<label>任务号</label>
|
||||
<input v-model="filter.taskId" type="text" placeholder="输入任务号" @keyup.enter="apply" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>ASIN</label>
|
||||
<input v-model="filter.asin" type="text" placeholder="输入 ASIN" @keyup.enter="apply" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="code in ASIN_COUNTRY_CODES" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>分组</label>
|
||||
<!-- 分组(主管)选中即查:选完立刻按该主管过滤刷新(回第一页),不必再点查询。 -->
|
||||
<select v-model="filter.groupId" @change="apply">
|
||||
<option value="">全部分组</option>
|
||||
<option v-for="group in groupOptions" :key="group.id" :value="String(group.id)">{{ group.name }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>同步开始日期</label>
|
||||
<input v-model="filter.startDate" type="date" :max="filter.endDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>同步结束日期</label>
|
||||
<input v-model="filter.endDate" type="date" :min="filter.startDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="clean-filter-actions">
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
<button class="btn btn-export" type="button" :disabled="exporting" @click="exportAll">
|
||||
{{ exporting ? '导出中...' : '导出' }}
|
||||
</button>
|
||||
<button class="btn btn-secondary" type="button" @click="reset">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="clean-toolbar">
|
||||
<span class="clean-summary">共 {{ total }} 条无侵权数据</span>
|
||||
</div>
|
||||
<div class="table-scroll clean-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 90px">任务号</th>
|
||||
<th style="width: 110px">管理员</th>
|
||||
<th>ASIN</th>
|
||||
<th style="width: 64px">国家</th>
|
||||
<th>SKU</th>
|
||||
<th>品牌</th>
|
||||
<th style="width: 90px">价格</th>
|
||||
<th>标题</th>
|
||||
<th style="width: 130px">结论</th>
|
||||
<th style="width: 170px">同步时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="rows.length">
|
||||
<tr v-for="row in rows" :key="row.id">
|
||||
<td>{{ row.taskId ?? '-' }}</td>
|
||||
<td :title="row.supervisorName || ''">{{ row.supervisorName || '-' }}</td>
|
||||
<td class="mono-cell">{{ row.asin || '-' }}</td>
|
||||
<td>{{ asinCountryLabel(row.country || '') }}</td>
|
||||
<td class="mono-cell">{{ row.sku || '-' }}</td>
|
||||
<td>{{ row.brand || '-' }}</td>
|
||||
<td>{{ row.price || '-' }}</td>
|
||||
<td class="title-cell" :title="row.title">{{ row.title || '-' }}</td>
|
||||
<td class="conclusion-cell" :title="cleanItemReasonTooltip(row)">{{ row.conclusion || '-' }}</td>
|
||||
<td>{{ formatDateTime(row.syncedAt || '') }}</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="10" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="10" class="empty-tip">暂无无侵权数据</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<OldPagination :total="total" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeSize" />
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 像素复刻参照「去重数据库」页(panel-box + 自绘表格 + 旧式分页),只读无操作列。
|
||||
2026-11-11 晚间恢复明细表形态(客户「按照昨天那个格式」),表头第二列=管理员。 */
|
||||
.clean-items-view {
|
||||
font-family: inherit;
|
||||
color: var(--c-text, #24384d);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 18px;
|
||||
}
|
||||
.panel-box {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
padding: 20px 22px 24px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 14px;
|
||||
background: linear-gradient(145deg, #ffffff, #f9fbfd);
|
||||
box-shadow: 0 1px 2px rgba(39, 67, 94, 0.04), 0 14px 30px -24px rgba(39, 67, 94, 0.28);
|
||||
}
|
||||
h3 {
|
||||
margin: 0 0 16px;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
letter-spacing: 0.2px;
|
||||
}
|
||||
.clean-panel-head h3 {
|
||||
margin: 0 0 16px;
|
||||
}
|
||||
.clean-filter-row {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(6, minmax(150px, 1fr)) auto;
|
||||
gap: 12px;
|
||||
align-items: end;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.clean-filter-row .form-group {
|
||||
min-width: 0;
|
||||
}
|
||||
.clean-filter-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 7px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.form-group label {
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.form-group input[type="date"] {
|
||||
color-scheme: light;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
min-height: 42px;
|
||||
padding: 9px 18px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 8px 18px -14px rgba(79, 120, 165, 0.72);
|
||||
transition: background 160ms ease, box-shadow 160ms ease, transform 120ms ease;
|
||||
}
|
||||
.btn:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #7094ba, #5d83ac);
|
||||
box-shadow: 0 11px 22px -14px rgba(79, 120, 165, 0.8);
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.6;
|
||||
}
|
||||
.btn-secondary {
|
||||
background: #ffffff;
|
||||
color: #5b6f83;
|
||||
border-color: #c7d7e5;
|
||||
}
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
color: #2f5d8b;
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
.clean-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.clean-summary {
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.table-scroll table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
/* 同步时间列=`YYYY-MM-DD HH:mm:ss` 固定 19 字符,13.5px 下实测约 133px;全局 `* { box-sizing: border-box }`
|
||||
把 24px 左右内边距算进列宽,旧的 150px 只剩 126px 内容宽 ⇒ 末尾被 ellipsis 吃掉(客户 2026-11-12
|
||||
反馈「日期显示不全」)。170px 与店铺管理/跳过价格等页的时间列同值(内容宽 146px,留 13px 余量);
|
||||
表 min-width 同步 +20px,其余列的可用宽度与改前一致。 */
|
||||
.clean-table-scroll > table {
|
||||
min-width: 1060px;
|
||||
}
|
||||
.table-scroll th,
|
||||
.table-scroll td {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
font-size: 13.5px;
|
||||
line-height: 1.5;
|
||||
border-bottom: 1px solid #e0e8ef;
|
||||
vertical-align: middle;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.table-scroll th {
|
||||
background: #edf4fa;
|
||||
color: #4e6479;
|
||||
border-bottom-color: #d5e1eb;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.4px;
|
||||
}
|
||||
.table-scroll tbody tr:hover td {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.table-scroll tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.mono-cell {
|
||||
font-family: "Cascadia Mono", "SF Mono", Consolas, "Courier New", monospace;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.title-cell {
|
||||
max-width: 260px;
|
||||
}
|
||||
.conclusion-cell {
|
||||
max-width: 130px;
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 44px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,104 @@
|
||||
/** 外观专利无侵权数据列表查询适配(v1.3 AC-5):GET /api/admin/appearance-patent-clean-items。
|
||||
* 只读页+导出(2026-11-11 客户需求「数据得导出来」):公司 tab 的值由本发送口从原始入参自己下传
|
||||
* (白名单构造不认识 company_id),取值口形状由 company-tab-wiring 护栏钉住。
|
||||
* 2026-11-11 晚间恢复明细表:主管聚合(/supervisors)与按主管删除的前端发送口随卡片视图一并
|
||||
* 下架(客户「不是这种格式 按照昨天那个格式」+删除入口先撤);后端两接口保留,要恢复时
|
||||
* 从 git 历史(e1767faf)找回。 */
|
||||
import { http } from '@/api/http'
|
||||
import { errorTextOf, unwrap } from '../../api/envelope.ts'
|
||||
import {
|
||||
toAppearancePatentCleanExportParams,
|
||||
toAppearancePatentCleanListParams,
|
||||
type AppearancePatentCleanExportParams,
|
||||
type AppearancePatentCleanExportQuery,
|
||||
type AppearancePatentCleanListParams,
|
||||
} from './appearance-patent-clean-filter.ts'
|
||||
import {
|
||||
parseAppearancePatentCleanPage,
|
||||
type AppearancePatentCleanPageResult,
|
||||
} from './appearance-patent-clean-model.ts'
|
||||
|
||||
export const APPEARANCE_PATENT_CLEAN_ENDPOINT = '/api/admin/appearance-patent-clean-items'
|
||||
|
||||
export async function fetchAppearancePatentCleanList(
|
||||
params: AppearancePatentCleanListParams,
|
||||
): Promise<AppearancePatentCleanPageResult> {
|
||||
const query = toAppearancePatentCleanListParams(
|
||||
{
|
||||
taskId: params.taskId ?? '',
|
||||
asin: params.asin ?? '',
|
||||
country: params.country ?? '',
|
||||
groupId: params.groupId ?? '',
|
||||
startDate: params.startDate ?? '',
|
||||
endDate: params.endDate ?? '',
|
||||
},
|
||||
params.page,
|
||||
params.pageSize,
|
||||
)
|
||||
if (params.companyId != null) query.company_id = params.companyId
|
||||
const { data } = await http.get<unknown>(APPEARANCE_PATENT_CLEAN_ENDPOINT, { params: query })
|
||||
return parseAppearancePatentCleanPage(data)
|
||||
}
|
||||
|
||||
export interface AppearancePatentCleanExportResult {
|
||||
blob: Blob
|
||||
filename: string
|
||||
}
|
||||
|
||||
/** 从 Content-Disposition 取 filename*(UTF-8 轨,后端 DownloadHeaderUtil 双轨口径),取不到回退常量名。 */
|
||||
function exportFilenameOf(disposition: unknown): string {
|
||||
const raw = typeof disposition === 'string' ? disposition : ''
|
||||
const star = /filename\*=(?:UTF-8'')?([^;]+)/i.exec(raw)
|
||||
if (star?.[1]) {
|
||||
try {
|
||||
return decodeURIComponent(star[1].trim().replace(/^"|"$/g, '')) || '外观专利数据库.xlsx'
|
||||
} catch {
|
||||
// 编码坏的 filename* 当作没有,走 ASCII 轨或常量名
|
||||
}
|
||||
}
|
||||
const plain = /filename="([^"]+)"/i.exec(raw)
|
||||
return plain?.[1] || '外观专利数据库.xlsx'
|
||||
}
|
||||
|
||||
/** 导出当前过滤面全量明细:与列表共用同一过滤面取值口(含公司 tab),blob 下载交给页面触发保存。 */
|
||||
export async function exportAppearancePatentCleanList(
|
||||
params: AppearancePatentCleanExportParams,
|
||||
): Promise<AppearancePatentCleanExportResult> {
|
||||
const query: AppearancePatentCleanExportQuery = toAppearancePatentCleanExportParams({
|
||||
taskId: params.taskId ?? '',
|
||||
asin: params.asin ?? '',
|
||||
country: params.country ?? '',
|
||||
groupId: params.groupId ?? '',
|
||||
startDate: params.startDate ?? '',
|
||||
endDate: params.endDate ?? '',
|
||||
})
|
||||
if (params.companyId != null) query.company_id = params.companyId
|
||||
const response = await http.get<Blob>(`${APPEARANCE_PATENT_CLEAN_ENDPOINT}/export`, {
|
||||
params: query,
|
||||
responseType: 'blob',
|
||||
timeout: 120_000,
|
||||
})
|
||||
const disposition = response.headers?.['content-disposition']
|
||||
if (!disposition) {
|
||||
// 没有附件头=服务端回了业务错误信封(HTTP 200 + JSON),把 blob 文本解回错误文案抛给页面
|
||||
const blob = response.data
|
||||
let payload: unknown = null
|
||||
if (blob && typeof blob.text === 'function') {
|
||||
const text = await blob.text()
|
||||
try {
|
||||
payload = JSON.parse(text)
|
||||
} catch {
|
||||
payload = text
|
||||
}
|
||||
}
|
||||
throw new Error(errorTextOf(payload))
|
||||
}
|
||||
return { blob: response.data, filename: exportFilenameOf(disposition) }
|
||||
}
|
||||
|
||||
/** 分组(主管)下拉选项:复用既有 GET /shop-manages/groups(与去重页/店铺管理共用同一分组集,
|
||||
* 不下新端点)。2026-11-11 客户口径「主管就是组长,可以筛选组长来导出,就是分组」——
|
||||
* 选项是分组管理里那一行(DedupeGroupOption {id, name, leaderUserId}),选中后以 group_id
|
||||
* 走本文件 list/export 同一过滤面。 */
|
||||
export { fetchDedupeTotalGroups } from '../asin/dedupe-total-api.ts'
|
||||
export type { DedupeGroupOption } from '../asin/dedupe-total-api.ts'
|
||||
@@ -0,0 +1,138 @@
|
||||
/** 外观专利无侵权数据页筛选纯函数(v1.3 AC-5):任务号/ASIN/国家/分组/起止时间 + snake 分页参数。
|
||||
* 产出与后端 §3.2 参数归一逐字对撞:`page`/`page_size`(默认 10、上限 100)、`task_id`、
|
||||
* `asin`、`country`、`group_id`、`start_date`/`end_date`(ISO yyyy-MM-dd;空白不下发)。
|
||||
* 分页钳制(铁律 15):page < 1 归 1、上限 10_000(后端 CR-18 同值),(page-1)*page_size
|
||||
* 最大 999_900,Number.MAX_SAFE_INTEGER 也不会把乘积顶出安全整数。纯逻辑,node --test 直测。
|
||||
* 公司维不在这里:归一化构造器不认识 company_id(同 asin-filter 惯例),由 api 发送口从
|
||||
* 原始入参自己下传——取值口由 company-tab-wiring 护栏的发送行钉看守。
|
||||
* 分组语义(2026-11-11 客户口径「主管就是组长,可以筛选组长来导出,就是分组」):下拉选项是
|
||||
* 分组管理里那一行(biz_shop_manage_group),group_id 下发后服务端解析「组长本人+名下子账户」
|
||||
* 整集 SQL 下推;表上「管理员」列与它同源(组长行=自己,子账户行=创建人)。 */
|
||||
import { validIsoDateOrUndefined } from '../asin/asin-filter.ts'
|
||||
|
||||
/** 每页条数默认 10(蓝图 §3.2),上限 100。 */
|
||||
export const APPEARANCE_PATENT_CLEAN_PAGE_SIZE = 10
|
||||
export const APPEARANCE_PATENT_CLEAN_MAX_PAGE_SIZE = 100
|
||||
/** 页码上限:与后端 AppearancePatentCleanItemQueryService.MAX_PAGE(CR-18 先例)同值,两侧不漂。 */
|
||||
export const APPEARANCE_PATENT_CLEAN_MAX_PAGE = 10_000
|
||||
|
||||
export interface AppearancePatentCleanFilterState {
|
||||
/** 任务号(纯数字文本,空串不限)。 */
|
||||
taskId: string
|
||||
/** ASIN 前缀。 */
|
||||
asin: string
|
||||
/** 国家代码,空串=全部。 */
|
||||
country: string
|
||||
/** 分组 id 文本(分组管理里那一行,组长即该组主管),空串=全部分组。 */
|
||||
groupId: string
|
||||
/** 同步开始日期(ISO yyyy-MM-dd;空串不限)。 */
|
||||
startDate: string
|
||||
/** 同步结束日期(ISO yyyy-MM-dd;空串不限)。 */
|
||||
endDate: string
|
||||
}
|
||||
|
||||
export function createAppearancePatentCleanFilterState(): AppearancePatentCleanFilterState {
|
||||
return { taskId: '', asin: '', country: '', groupId: '', startDate: '', endDate: '' }
|
||||
}
|
||||
|
||||
/** 是否有任一激活筛选条件。 */
|
||||
export function appearancePatentCleanFilterActive(state: AppearancePatentCleanFilterState): boolean {
|
||||
if ((state.taskId || '').trim()) return true
|
||||
if ((state.asin || '').trim()) return true
|
||||
if ((state.country || '').trim()) return true
|
||||
if ((state.groupId || '').trim()) return true
|
||||
if (validIsoDateOrUndefined(state.startDate) || validIsoDateOrUndefined(state.endDate)) return true
|
||||
return false
|
||||
}
|
||||
|
||||
/** 序列化到后端的查询参数(snake_case,仅下发非空字段)。 */
|
||||
export interface AppearancePatentCleanQuery {
|
||||
page: number
|
||||
page_size: number
|
||||
task_id?: number
|
||||
asin?: string
|
||||
country?: string
|
||||
group_id?: number
|
||||
start_date?: string
|
||||
end_date?: string
|
||||
/** 公司 tab:白名单构造不点名它,字段只为 api 发送口的 `query.company_id = params.companyId` 存在。 */
|
||||
company_id?: number
|
||||
}
|
||||
|
||||
/** 导出查询参数:与列表同一过滤面、无分页(全量导出由服务侧 EXPORT_MAX_ROWS 上限兜住)。 */
|
||||
export interface AppearancePatentCleanExportQuery {
|
||||
task_id?: number
|
||||
asin?: string
|
||||
country?: string
|
||||
group_id?: number
|
||||
start_date?: string
|
||||
end_date?: string
|
||||
/** 公司 tab 同列表口径:白名单构造不点名,由 api 发送口下传。 */
|
||||
company_id?: number
|
||||
}
|
||||
|
||||
/** api 模块的入参:筛选态 + 分页 + 公司值(camel)。 */
|
||||
export interface AppearancePatentCleanListParams {
|
||||
page: number
|
||||
pageSize: number
|
||||
taskId?: string
|
||||
asin?: string
|
||||
country?: string
|
||||
groupId?: string
|
||||
startDate?: string
|
||||
endDate?: string
|
||||
companyId?: number | null
|
||||
}
|
||||
|
||||
/** api 导出入口的入参:筛选态 + 公司值(camel,无分页)。 */
|
||||
export interface AppearancePatentCleanExportParams {
|
||||
taskId?: string
|
||||
asin?: string
|
||||
country?: string
|
||||
groupId?: string
|
||||
startDate?: string
|
||||
endDate?: string
|
||||
companyId?: number | null
|
||||
}
|
||||
|
||||
/** 过滤态 → 过滤面参数(snake_case,仅下发非空字段);列表与导出共用这一个取值口,
|
||||
* 「导出的过滤面和页签看到的永远同源」由这条单出口保证,不出现两处各算各的。 */
|
||||
function toAppearancePatentCleanFilterQuery(state: AppearancePatentCleanFilterState): AppearancePatentCleanExportQuery {
|
||||
const query: AppearancePatentCleanExportQuery = {}
|
||||
const taskId = Number.parseInt((state.taskId || '').trim(), 10)
|
||||
if (Number.isFinite(taskId) && taskId > 0) query.task_id = taskId
|
||||
const asin = (state.asin || '').trim()
|
||||
if (asin) query.asin = asin
|
||||
const country = (state.country || '').trim()
|
||||
if (country) query.country = country
|
||||
const groupId = Number.parseInt((state.groupId || '').trim(), 10)
|
||||
if (Number.isFinite(groupId) && groupId > 0) query.group_id = groupId
|
||||
const startDate = validIsoDateOrUndefined(state.startDate)
|
||||
if (startDate) query.start_date = startDate
|
||||
const endDate = validIsoDateOrUndefined(state.endDate)
|
||||
if (endDate) query.end_date = endDate
|
||||
return query
|
||||
}
|
||||
|
||||
/** 过滤态 + 分页 → 列表查询参数;空白/非法日期不下发,分页钳制在此单出口(不含公司维)。 */
|
||||
export function toAppearancePatentCleanListParams(
|
||||
state: AppearancePatentCleanFilterState,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
): AppearancePatentCleanQuery {
|
||||
const safePage = Math.min(Math.max(Math.floor(page) || 1, 1), APPEARANCE_PATENT_CLEAN_MAX_PAGE)
|
||||
const rawSize = Math.floor(pageSize) || APPEARANCE_PATENT_CLEAN_PAGE_SIZE
|
||||
const safeSize = Math.min(Math.max(rawSize, 1), APPEARANCE_PATENT_CLEAN_MAX_PAGE_SIZE)
|
||||
return {
|
||||
page: safePage,
|
||||
page_size: safeSize,
|
||||
...toAppearancePatentCleanFilterQuery(state),
|
||||
}
|
||||
}
|
||||
|
||||
/** 过滤态 → 导出查询参数(无分页;归一规则与列表逐字同源)。 */
|
||||
export function toAppearancePatentCleanExportParams(
|
||||
state: AppearancePatentCleanFilterState,
|
||||
): AppearancePatentCleanExportQuery {
|
||||
return toAppearancePatentCleanFilterQuery(state)
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
/** 外观专利无侵权数据列表查询模型(v1.3 AC-5):解析 AppearancePatentCleanItemPageVo(camel),纯逻辑。
|
||||
* 行值是同步服务从 chunk payload 原样落的,读侧只搬运不加工(与后端 toVo 同一口径)。 */
|
||||
import { unwrap } from '../../api/envelope.ts'
|
||||
|
||||
export interface AppearancePatentCleanItem {
|
||||
id: number
|
||||
resultId: number | null
|
||||
taskId: number | null
|
||||
userId: number | null
|
||||
/** 管理员列(表头「管理员」,客户 2026-11-11 口径;后端读侧现算:主管/公司超管=自己,普通账户=创建人,读不到为空 → 界面展示 -)。 */
|
||||
supervisorName: string
|
||||
companyId: number | null
|
||||
rowNo: number | null
|
||||
asin: string
|
||||
country: string
|
||||
sku: string
|
||||
brand: string
|
||||
price: string
|
||||
title: string
|
||||
imageUrl: string
|
||||
itemUrl: string
|
||||
conclusion: string
|
||||
titleReason: string
|
||||
appearanceReason: string
|
||||
patentReason: string
|
||||
sourceFilename: string
|
||||
syncedAt?: string
|
||||
}
|
||||
|
||||
export interface AppearancePatentCleanPageResult {
|
||||
items: AppearancePatentCleanItem[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/** 前端首屏默认容量:与后端 PageDefaults.CLEAN_ITEMS_PAGE_SIZE(蓝图 §3.2 默认 10)同值。 */
|
||||
export const APPEARANCE_PATENT_CLEAN_DEFAULT_SIZE = 10
|
||||
|
||||
export function emptyAppearancePatentCleanPage(): AppearancePatentCleanPageResult {
|
||||
return { items: [], total: 0, page: 1, pageSize: APPEARANCE_PATENT_CLEAN_DEFAULT_SIZE }
|
||||
}
|
||||
|
||||
/** 结论列悬停提示=三因原文拼装(2026-11-11 随明细表恢复回归;3cfca462 曾随结论徽章一起退役)。 */
|
||||
export function cleanItemReasonTooltip(item: AppearancePatentCleanItem): string {
|
||||
const parts: string[] = []
|
||||
if (item.titleReason) parts.push(`标题:${item.titleReason}`)
|
||||
if (item.appearanceReason) parts.push(`外观:${item.appearanceReason}`)
|
||||
if (item.patentReason) parts.push(`专利:${item.patentReason}`)
|
||||
return parts.join('\n')
|
||||
}
|
||||
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
function numberOrNull(value: unknown): number | null {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : null
|
||||
}
|
||||
|
||||
/** 解析单行明细;缺 id 视为无效。camel 为正、snake 容错(与去重页模型同形)。 */
|
||||
export function toAppearancePatentCleanItem(raw: unknown): AppearancePatentCleanItem | null {
|
||||
if (!raw || typeof raw !== 'object') return null
|
||||
const record = raw as Record<string, unknown>
|
||||
const id = numberOrNull(record.id)
|
||||
if (id === null) return null
|
||||
return {
|
||||
id,
|
||||
resultId: numberOrNull(record.resultId ?? record.result_id),
|
||||
taskId: numberOrNull(record.taskId ?? record.task_id),
|
||||
userId: numberOrNull(record.userId ?? record.user_id),
|
||||
supervisorName: text(record.supervisorName ?? record.supervisor_name),
|
||||
companyId: numberOrNull(record.companyId ?? record.company_id),
|
||||
rowNo: numberOrNull(record.rowNo ?? record.row_no),
|
||||
asin: text(record.asin),
|
||||
country: text(record.country),
|
||||
sku: text(record.sku),
|
||||
brand: text(record.brand),
|
||||
price: text(record.price),
|
||||
title: text(record.title),
|
||||
imageUrl: text(record.imageUrl ?? record.image_url),
|
||||
itemUrl: text(record.itemUrl ?? record.item_url),
|
||||
conclusion: text(record.conclusion),
|
||||
titleReason: text(record.titleReason ?? record.title_reason),
|
||||
appearanceReason: text(record.appearanceReason ?? record.appearance_reason),
|
||||
patentReason: text(record.patentReason ?? record.patent_reason),
|
||||
sourceFilename: text(record.sourceFilename ?? record.source_filename),
|
||||
syncedAt: text(record.syncedAt ?? record.synced_at) || undefined,
|
||||
}
|
||||
}
|
||||
|
||||
/** 归一化分页负载(信封或已解包 VO)为前端结果;缺省字段回默认。无 keyset 游标(蓝图 Out of Scope)。 */
|
||||
export function parseAppearancePatentCleanPage(payload: unknown): AppearancePatentCleanPageResult {
|
||||
const out = emptyAppearancePatentCleanPage()
|
||||
const core = unwrap<unknown>(payload)
|
||||
if (!core || typeof core !== 'object') return out
|
||||
const record = core as Record<string, unknown>
|
||||
if (Array.isArray(record.items)) {
|
||||
out.items = record.items
|
||||
.map((raw) => toAppearancePatentCleanItem(raw))
|
||||
.filter((item): item is AppearancePatentCleanItem => item !== null)
|
||||
}
|
||||
if (typeof record.total === 'number') out.total = Math.floor(record.total)
|
||||
if (typeof record.page === 'number' && record.page >= 1) out.page = Math.floor(record.page)
|
||||
const rawSize = record.pageSize ?? record.page_size
|
||||
if (typeof rawSize === 'number' && rawSize >= 1) out.pageSize = Math.floor(rawSize)
|
||||
return out
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import { computed, nextTick, onMounted, ref, watch } from 'vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { formatDateTime, orderedPair, todayDateInput } from '@/utils/datetime'
|
||||
import { createLatestRequestGate } from '@/utils/latest-request'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { fetchHistoryUserOptions } from './history-api.ts'
|
||||
import type { HistoryUserOption } from './history-user-option.ts'
|
||||
@@ -57,6 +58,8 @@ const companyTab = useCompanyTabStore()
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
// 设备日志列表竞态门(S1-F4)
|
||||
const gate = createLatestRequestGate()
|
||||
const rows = ref<DeviceLogFileRow[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -79,6 +82,8 @@ const retentionDays = ref(7)
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
async function load() {
|
||||
// S1-F4:快速切公司/改筛选时旧响应可能晚到——回写前必须过竞态门
|
||||
const token = gate.begin()
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
@@ -91,14 +96,16 @@ async function load() {
|
||||
pageSize: pageSize.value,
|
||||
companyId: companyTab.requestCompanyId,
|
||||
})
|
||||
if (!gate.isCurrent(token)) return
|
||||
rows.value = result?.items || []
|
||||
total.value = Number(result?.total || 0)
|
||||
if (result?.retentionDays) retentionDays.value = result.retentionDays
|
||||
} catch (error) {
|
||||
if (!gate.isCurrent(token)) return
|
||||
loadFailure.value = error instanceof Error ? error.message : '日志列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
if (gate.isCurrent(token)) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import { fetchSoftwareVersions, uploadSoftwareVersion, deleteSoftwareVersions }
|
||||
import type { SoftwareVersionItem } from './version-dto.ts'
|
||||
import { isNonEmptyVersion } from './version-dto.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
@@ -62,7 +63,7 @@ async function removeSelected() {
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
showAdminFeedback(loadFailureMessage(error, '删除失败'), 'error')
|
||||
}
|
||||
}
|
||||
async function removeOne(row: SoftwareVersionItem) {
|
||||
@@ -73,7 +74,7 @@ async function removeOne(row: SoftwareVersionItem) {
|
||||
selectedIds.value = new Set([...selectedIds.value].filter((id) => id !== row.id))
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
showAdminFeedback(loadFailureMessage(error, '删除失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +93,7 @@ async function load() {
|
||||
try {
|
||||
items.value = (await fetchSoftwareVersions()).items
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '版本列表加载失败'
|
||||
loadFailure.value = loadFailureMessage(error, '版本列表加载失败')
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
@@ -146,7 +147,8 @@ async function submitUpload() {
|
||||
uploadPercent.value = 0
|
||||
load()
|
||||
} catch (error) {
|
||||
uploadMsg.value = error instanceof Error ? error.message : '上传失败'
|
||||
// P2-10:api/http 拦截器不 sanitize,error.message 可能是英文异常原文——界面只吃中文出口,原文进 console。
|
||||
uploadMsg.value = loadFailureMessage(error, '上传失败')
|
||||
} finally {
|
||||
uploading.value = false
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import { fetchTutorialPackages, uploadTutorialPackage, deleteTutorialPackages }
|
||||
import { formatFileSize } from './tutorial-model.ts'
|
||||
import type { TutorialPackageItem } from './tutorial-dto.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
@@ -119,7 +120,7 @@ async function removeSelected() {
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
showAdminFeedback(loadFailureMessage(error, '删除失败'), 'error')
|
||||
}
|
||||
}
|
||||
async function removeOne(row: TutorialPackageItem) {
|
||||
@@ -130,7 +131,7 @@ async function removeOne(row: TutorialPackageItem) {
|
||||
selectedIds.value = new Set([...selectedIds.value].filter((id) => id !== row.id))
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
showAdminFeedback(loadFailureMessage(error, '删除失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -149,7 +150,7 @@ async function load() {
|
||||
try {
|
||||
items.value = (await fetchTutorialPackages()).items
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '教程包列表加载失败'
|
||||
loadFailure.value = loadFailureMessage(error, '教程包列表加载失败')
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
@@ -198,7 +199,8 @@ async function submitUpload() {
|
||||
uploadPercent.value = 0
|
||||
load()
|
||||
} catch (error) {
|
||||
uploadMsg.value = error instanceof Error ? error.message : '上传失败'
|
||||
// P2-10:api/http 拦截器不 sanitize,error.message 可能是英文异常原文——界面只吃中文出口,原文进 console。
|
||||
uploadMsg.value = loadFailureMessage(error, '上传失败')
|
||||
} finally {
|
||||
uploading.value = false
|
||||
}
|
||||
|
||||
@@ -0,0 +1,502 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
/** 数富AI工作台客户端包管理页:上传 ZIP → 直传 MinIO → 服务端复算 sha256 落库。
|
||||
* 列表默认按上传时间倒序,第一条即当前生效版本;删除最新包后自动回落到上一版。 */
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import {
|
||||
deleteWorkbenchClientPackages,
|
||||
fetchWorkbenchClientPackages,
|
||||
uploadWorkbenchClientPackage,
|
||||
} from './workbench-client-api.ts'
|
||||
import { formatFileSize, isValidWorkbenchClientVersion, WORKBENCH_CLIENT_VERSION_MAX_LENGTH } from './workbench-client-model.ts'
|
||||
import type { WorkbenchClientPackageItem } from './workbench-client-dto.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const items = ref<WorkbenchClientPackageItem[]>([])
|
||||
/** 版本号/文件名搜索(客户端过滤)。 */
|
||||
const keyword = ref('')
|
||||
const filteredItems = computed(() => {
|
||||
const kw = (keyword.value || '').trim().toLowerCase()
|
||||
if (!kw) return items.value
|
||||
return items.value.filter((item) =>
|
||||
`${item.version}`.toLowerCase().includes(kw) || item.fileName.toLowerCase().includes(kw),
|
||||
)
|
||||
})
|
||||
/** 全站分页统一:客户端分页(10/20/50/100)。 */
|
||||
const page = ref(1)
|
||||
const pageSize = ref(10)
|
||||
const pagedItems = computed(() => filteredItems.value.slice((page.value - 1) * pageSize.value, page.value * pageSize.value))
|
||||
function changePage(p: number) { page.value = p }
|
||||
function changeSize(size: number) { pageSize.value = size; page.value = 1 }
|
||||
// 搜索导致数据收缩时回钳页码,避免停在空页。
|
||||
watch(filteredItems, () => {
|
||||
page.value = Math.min(page.value, Math.max(1, Math.ceil(filteredItems.value.length / pageSize.value)))
|
||||
})
|
||||
|
||||
/** 当前生效版本 = 列表第一条(客户端更新接口下发的就是它)。 */
|
||||
const activeId = computed(() => items.value[0]?.id ?? null)
|
||||
|
||||
// 勾选删除:选中跨页累计;表头复选只作用于当前页,避免误选整表。
|
||||
const selectedIds = ref<Set<number>>(new Set())
|
||||
const selectedCount = computed(() => selectedIds.value.size)
|
||||
function toggleSelect(id: number) {
|
||||
const next = new Set(selectedIds.value)
|
||||
if (next.has(id)) next.delete(id)
|
||||
else next.add(id)
|
||||
selectedIds.value = next
|
||||
}
|
||||
function toggleSelectAllPage() {
|
||||
const pageRows = pagedItems.value
|
||||
const allOn = pageRows.length > 0 && pageRows.every((row) => selectedIds.value.has(row.id))
|
||||
const next = new Set(selectedIds.value)
|
||||
if (allOn) pageRows.forEach((row) => next.delete(row.id))
|
||||
else pageRows.forEach((row) => next.add(row.id))
|
||||
selectedIds.value = next
|
||||
}
|
||||
async function removeSelected() {
|
||||
if (!selectedCount.value) return
|
||||
const rows = items.value.filter((row) => selectedIds.value.has(row.id))
|
||||
const sample = rows.slice(0, 3).map((row) => row.version).join('、')
|
||||
const summary = rows.length > 3 ? `${sample} 等 ${rows.length} 个` : sample
|
||||
if (!(await openAdminConfirm({ message: `确认删除选中的 ${rows.length} 个客户端包(${summary})?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteWorkbenchClientPackages(Array.from(selectedIds.value))
|
||||
ElMessage.success(`已删除 ${rows.length} 个客户端包`)
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
async function removeOne(row: WorkbenchClientPackageItem) {
|
||||
if (!(await openAdminConfirm({ message: `确认删除客户端包 ${row.version}(${row.fileName})?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteWorkbenchClientPackages([row.id])
|
||||
ElMessage.success('删除成功')
|
||||
selectedIds.value = new Set([...selectedIds.value].filter((id) => id !== row.id))
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
const uploadVisible = ref(false)
|
||||
const uploading = ref(false)
|
||||
const uploadPercent = ref(0)
|
||||
const newVersion = ref('')
|
||||
const pickedFile = ref<File | null>(null)
|
||||
const uploadMsg = ref('')
|
||||
const uploadMsgOk = ref(false)
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
items.value = (await fetchWorkbenchClientPackages()).items
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '客户端包列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function onFileChange(file: File) {
|
||||
pickedFile.value = file
|
||||
}
|
||||
|
||||
function openUpload() {
|
||||
uploadMsg.value = ''
|
||||
uploadMsgOk.value = false
|
||||
newVersion.value = ''
|
||||
pickedFile.value = null
|
||||
uploadVisible.value = true
|
||||
}
|
||||
|
||||
async function submitUpload() {
|
||||
uploadMsg.value = ''
|
||||
uploadMsgOk.value = false
|
||||
uploadPercent.value = 0
|
||||
if (!newVersion.value.trim()) {
|
||||
uploadMsg.value = '请填写版本号'
|
||||
return
|
||||
}
|
||||
if (!isValidWorkbenchClientVersion(newVersion.value)) {
|
||||
uploadMsg.value = '版本号必须是纯数字 x.y.z 格式(如 1.0.113),不能带 v 前缀或其他后缀'
|
||||
return
|
||||
}
|
||||
if (!pickedFile.value) {
|
||||
uploadMsg.value = '请选择 zip 压缩包'
|
||||
return
|
||||
}
|
||||
if (!/\.zip$/i.test(pickedFile.value.name)) {
|
||||
uploadMsg.value = '仅支持 .zip 格式'
|
||||
return
|
||||
}
|
||||
if (pickedFile.value.size > 512 * 1024 * 1024) {
|
||||
uploadMsg.value = '文件超过允许的大小限制'
|
||||
return
|
||||
}
|
||||
uploading.value = true
|
||||
try {
|
||||
await uploadWorkbenchClientPackage(pickedFile.value, pickedFile.value.name, newVersion.value.trim(), (p) => {
|
||||
uploadPercent.value = p
|
||||
uploadMsg.value = p >= 100 ? '上传完成,正在复算 sha256 并登记...' : `正在上传:${p}%`
|
||||
})
|
||||
uploadMsg.value = '上传成功,客户端已可检测到新版本'
|
||||
uploadMsgOk.value = true
|
||||
newVersion.value = ''
|
||||
pickedFile.value = null
|
||||
uploadPercent.value = 0
|
||||
load()
|
||||
} catch (error) {
|
||||
uploadMsg.value = error instanceof Error ? error.message : '上传失败'
|
||||
} finally {
|
||||
uploading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="workbench-view">
|
||||
<section class="panel-box">
|
||||
<div class="workbench-head">
|
||||
<h3>客户端包列表</h3>
|
||||
<div class="workbench-head-tools">
|
||||
<input v-model="keyword" type="text" placeholder="搜索版本号或文件名" class="workbench-keyword" />
|
||||
<button class="btn btn-danger" type="button" :disabled="!selectedCount" @click="removeSelected">删除选中{{ selectedCount ? `(${selectedCount})` : '' }}</button>
|
||||
<button class="btn" type="button" @click="openUpload">上传客户端包</button>
|
||||
</div>
|
||||
</div>
|
||||
<p class="page-hint">最新上传的一条即当前生效版本。</p>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll workbench-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 40px" class="th-select">
|
||||
<input type="checkbox" :checked="pagedItems.length > 0 && pagedItems.every((r) => selectedIds.has(r.id))" @change="toggleSelectAllPage" :disabled="!pagedItems.length" />
|
||||
</th>
|
||||
<th style="width: 120px">版本号</th>
|
||||
<th style="width: 220px">文件名</th>
|
||||
<th style="width: 100px">大小</th>
|
||||
<th style="width: 220px">SHA-256</th>
|
||||
<th style="width: 150px">上传时间</th>
|
||||
<th>下载链接</th>
|
||||
<th style="width: 170px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="filteredItems.length">
|
||||
<tr v-for="row in pagedItems" :key="row.id" :class="{ 'row-selected': selectedIds.has(row.id) }">
|
||||
<td class="td-select">
|
||||
<input type="checkbox" :checked="selectedIds.has(row.id)" @change="toggleSelect(row.id)" />
|
||||
</td>
|
||||
<td>
|
||||
<span class="version-cell" :title="row.version">{{ row.version }}</span>
|
||||
<span v-if="row.id === activeId" class="tag-active">当前生效</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="file-name" :title="row.fileName">{{ row.fileName }}</span>
|
||||
</td>
|
||||
<td>{{ formatFileSize(row.fileSize) }}</td>
|
||||
<td>
|
||||
<span v-if="row.sha256" class="sha-cell" :title="row.sha256">{{ row.sha256 }}</span>
|
||||
<span v-else class="dim">—</span>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createdAt) }}</td>
|
||||
<td>
|
||||
<a v-if="row.fileUrl" class="link-cell" :href="row.fileUrl" target="_blank" rel="noopener" :title="row.fileUrl">{{ row.fileUrl }}</a>
|
||||
<span v-else class="dim">—</span>
|
||||
</td>
|
||||
<td class="ops-cell">
|
||||
<a v-if="row.fileUrl" class="btn btn-sm dl-btn" :href="row.fileUrl" download>下载</a>
|
||||
<span v-else class="dim">—</span>
|
||||
<button class="btn btn-sm btn-danger" type="button" @click="removeOne(row)">删除</button>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="8" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="8" class="empty-tip">{{ keyword ? '暂无匹配客户端包' : '暂无客户端包记录' }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination v-if="filteredItems.length > 0" :total="filteredItems.length" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeSize" />
|
||||
</section>
|
||||
|
||||
<el-dialog v-model="uploadVisible" title="上传客户端包" width="540px">
|
||||
<p class="upload-desc">上传数富AI工作台客户端 ZIP 包后,客户端会从公开版本接口自动检测到新版本并升级;服务端会复算 sha256 供客户端校验。</p>
|
||||
<el-form label-width="110px">
|
||||
<el-form-item label="版本号" required>
|
||||
<el-input v-model="newVersion" :placeholder="`例如:1.0.113(纯数字 x.y.z,最长 ${WORKBENCH_CLIENT_VERSION_MAX_LENGTH} 字符)`" :maxlength="WORKBENCH_CLIENT_VERSION_MAX_LENGTH" />
|
||||
<p class="zip-hint">客户端按版本号判断是否需要升级,必填;不要带 v 前缀</p>
|
||||
</el-form-item>
|
||||
<el-form-item label="ZIP 压缩包" required>
|
||||
<el-upload :auto-upload="false" :limit="1" accept=".zip" :on-change="(file: any) => onFileChange(file.raw)" :on-remove="() => (pickedFile = null)">
|
||||
<el-button>选择文件</el-button>
|
||||
</el-upload>
|
||||
<p class="zip-hint">仅支持 .zip 格式,最大 512MB</p>
|
||||
<div v-if="pickedFile" class="dim">{{ pickedFile.name }}({{ formatFileSize(pickedFile.size) }})</div>
|
||||
</el-form-item>
|
||||
<el-progress v-if="uploading && uploadPercent > 0" :percentage="uploadPercent" :stroke-width="10" :status="uploadPercent >= 100 ? 'success' : undefined" class="upload-progress" />
|
||||
<el-alert v-if="uploadMsg" :title="uploadMsg" :type="uploadMsgOk ? 'success' : 'error'" :closable="false" show-icon class="upload-msg" />
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="uploadVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="uploading" @click="submitUpload">上传客户端包</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 沿用软件版本/教程管理页(旧版 admin.html panel-version)的样式语言。 */
|
||||
.workbench-view {
|
||||
font-family: inherit;
|
||||
color: #24384d;
|
||||
}
|
||||
.panel-box {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
padding: 20px 22px 24px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 14px;
|
||||
background: linear-gradient(145deg, #ffffff, #f9fbfd);
|
||||
box-shadow: 0 1px 2px rgba(39, 67, 94, 0.04), 0 14px 30px -24px rgba(39, 67, 94, 0.28);
|
||||
}
|
||||
h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
letter-spacing: 0.2px;
|
||||
}
|
||||
.workbench-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.workbench-head-tools {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
.workbench-keyword {
|
||||
width: 220px;
|
||||
min-height: 42px;
|
||||
padding: 6px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.workbench-keyword:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.workbench-keyword:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.page-hint {
|
||||
margin: -6px 0 14px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.page-hint code {
|
||||
padding: 1px 6px;
|
||||
border-radius: 5px;
|
||||
background: #edf4fa;
|
||||
color: #2f5d8b;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||
font-size: 12px;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
min-height: 42px;
|
||||
padding: 9px 18px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 8px 18px -14px rgba(79, 120, 165, 0.72);
|
||||
transition: background 160ms ease, box-shadow 160ms ease, transform 120ms ease;
|
||||
}
|
||||
.btn:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #7094ba, #5d83ac);
|
||||
box-shadow: 0 11px 22px -14px rgba(79, 120, 165, 0.8);
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.55;
|
||||
}
|
||||
.btn-sm {
|
||||
min-height: 36px;
|
||||
padding: 7px 12px;
|
||||
}
|
||||
.btn-danger {
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
border-color: #b35f6a;
|
||||
}
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.table-scroll table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
.workbench-table-scroll > table {
|
||||
min-width: 1200px;
|
||||
}
|
||||
.table-scroll th,
|
||||
.table-scroll td {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
font-size: 13.5px;
|
||||
line-height: 1.5;
|
||||
border-bottom: 1px solid #e0e8ef;
|
||||
vertical-align: middle;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.table-scroll th {
|
||||
background: #edf4fa;
|
||||
color: #4e6479;
|
||||
border-bottom-color: #d5e1eb;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.4px;
|
||||
}
|
||||
.table-scroll tbody tr:hover td {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.table-scroll tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.file-name,
|
||||
.version-cell {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.tag-active {
|
||||
display: inline-block;
|
||||
margin-left: 6px;
|
||||
padding: 1px 7px;
|
||||
border: 1px solid #4f9a72;
|
||||
border-radius: 999px;
|
||||
background: #eaf6ef;
|
||||
color: #2f7a55;
|
||||
font-size: 11.5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.sha-cell {
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
color: #5b6f83;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||
font-size: 12px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.link-cell {
|
||||
display: block;
|
||||
color: #2f5d8b;
|
||||
text-decoration: none;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.link-cell:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.dl-btn {
|
||||
text-decoration: none;
|
||||
}
|
||||
.dim {
|
||||
color: #8293a5;
|
||||
font-size: 12px;
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 44px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.upload-desc {
|
||||
margin: 0 0 12px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.zip-hint {
|
||||
margin: 4px 0 0;
|
||||
color: #5b6f83;
|
||||
font-size: 12px;
|
||||
}
|
||||
.ops-cell {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
}
|
||||
.row-selected td {
|
||||
background: #fdf0ee;
|
||||
}
|
||||
.th-select,
|
||||
.td-select {
|
||||
text-align: center;
|
||||
padding-left: 4px !important;
|
||||
padding-right: 4px !important;
|
||||
}
|
||||
.th-select input,
|
||||
.td-select input {
|
||||
cursor: pointer;
|
||||
accent-color: #b33a2e;
|
||||
}
|
||||
.upload-progress {
|
||||
margin: 2px 0 10px;
|
||||
}
|
||||
.upload-msg {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.upload-msg :deep(.el-alert__title) {
|
||||
word-break: break-all;
|
||||
}
|
||||
</style>
|
||||
@@ -1,6 +1,7 @@
|
||||
/** 教程包接口适配(教程管理页):列表 / 直传预签名 / 确认 / 删除。 */
|
||||
import axios from 'axios'
|
||||
import { http, unwrap } from '@/api/http'
|
||||
import { CHUNK_UPLOAD_THRESHOLD, uploadFileInChunks } from '@/api/chunk-upload'
|
||||
import { parseTutorialPackageList, parseTutorialPackageUpload } from './tutorial-model.ts'
|
||||
import type { TutorialPackageItem, TutorialPackageList } from './tutorial-dto.ts'
|
||||
|
||||
@@ -43,10 +44,15 @@ export async function requestTutorialPresign(fileName: string, version = ''): Pr
|
||||
}
|
||||
|
||||
/** 第三步:直传完成后通知后端校验对象并写入记录(data.item 为新记录行)。 */
|
||||
export async function confirmTutorialPackage(objectKey: string, fileName: string, version = ''): Promise<TutorialPackageItem | null> {
|
||||
const { data } = await http.post<unknown>(TUTORIAL_CONFIRM_ENDPOINT, null, {
|
||||
params: { object_key: objectKey, file_name: fileName, version },
|
||||
})
|
||||
export async function confirmTutorialPackage(
|
||||
objectKey: string,
|
||||
fileName: string,
|
||||
version = '',
|
||||
fileKey = '',
|
||||
): Promise<TutorialPackageItem | null> {
|
||||
const params: Record<string, string> = { object_key: objectKey, file_name: fileName, version }
|
||||
if (fileKey) params.file_key = fileKey
|
||||
const { data } = await http.post<unknown>(TUTORIAL_CONFIRM_ENDPOINT, null, { params })
|
||||
return parseTutorialPackageUpload(data)
|
||||
}
|
||||
|
||||
@@ -68,6 +74,11 @@ export async function uploadTutorialPackage(
|
||||
version = '',
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<TutorialPackageItem | null> {
|
||||
if (file.size > CHUNK_UPLOAD_THRESHOLD) {
|
||||
const uploaded = await uploadFileInChunks(file, fileName, onProgress)
|
||||
const fileKey = String(uploaded.fileKey ?? uploaded.file_key ?? '')
|
||||
return confirmTutorialPackage(String(uploaded.objectKey ?? ''), fileName, version, fileKey)
|
||||
}
|
||||
const target = await requestTutorialPresign(fileName, version)
|
||||
await directPut.put(target.uploadUrl, file, {
|
||||
headers: { 'Content-Type': 'application/octet-stream' },
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/** 软件版本列表加载适配(任务 127):GET /api/admin/versions。 */
|
||||
import axios from 'axios'
|
||||
import { http, unwrap } from '@/api/http'
|
||||
import { CHUNK_UPLOAD_THRESHOLD, uploadFileInChunks } from '@/api/chunk-upload'
|
||||
import { parseSoftwareVersionList, parseSoftwareVersionUpload } from './version-model.ts'
|
||||
import type { SoftwareVersionItem, SoftwareVersionList } from './version-dto.ts'
|
||||
|
||||
@@ -45,9 +46,14 @@ export async function requestSoftwareVersionPresign(version: string): Promise<So
|
||||
}
|
||||
}
|
||||
|
||||
/** 第三步:直传完成后通知后端校验对象并写入版本记录(data.item 为新版本行)。 */
|
||||
export async function confirmSoftwareVersion(version: string): Promise<SoftwareVersionItem | null> {
|
||||
const { data } = await http.post<unknown>(SOFTWARE_VERSION_CONFIRM_ENDPOINT, null, { params: { version } })
|
||||
/**
|
||||
* 第三步:上传完成后通知后端校验并写入版本记录(data.item 为新版本行)。
|
||||
* 分片通道把拼装件留在 Java 临时目录,服务端按 file_key 搬进 client 桶后再落库。
|
||||
*/
|
||||
export async function confirmSoftwareVersion(version: string, fileKey = ''): Promise<SoftwareVersionItem | null> {
|
||||
const params: Record<string, string> = { version }
|
||||
if (fileKey) params.file_key = fileKey
|
||||
const { data } = await http.post<unknown>(SOFTWARE_VERSION_CONFIRM_ENDPOINT, null, { params })
|
||||
return parseSoftwareVersionUpload(data)
|
||||
}
|
||||
|
||||
@@ -69,6 +75,12 @@ export async function uploadSoftwareVersion(
|
||||
_filename = '',
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<SoftwareVersionUploadResult> {
|
||||
if (file.size > CHUNK_UPLOAD_THRESHOLD) {
|
||||
const uploaded = await uploadFileInChunks(file, `${version}.zip`, onProgress)
|
||||
const fileKey = String(uploaded.fileKey ?? uploaded.file_key ?? '')
|
||||
const item = await confirmSoftwareVersion(version, fileKey)
|
||||
return { version, fileUrl: item?.fileUrl || String(uploaded.url ?? ''), item }
|
||||
}
|
||||
const target = await requestSoftwareVersionPresign(version)
|
||||
await directPut.put(target.uploadUrl, file, {
|
||||
headers: { 'Content-Type': 'application/octet-stream' },
|
||||
|
||||
@@ -0,0 +1,247 @@
|
||||
/** 工作台客户端包接口适配:列表 / 直传预签名 / 分片上传 / 确认 / 删除。 */
|
||||
import axios from 'axios'
|
||||
import { http, unwrap } from '@/api/http'
|
||||
import {
|
||||
parseWorkbenchClientPackageList,
|
||||
parseWorkbenchClientPackageUpload,
|
||||
} from './workbench-client-model.ts'
|
||||
import type { WorkbenchClientPackageItem, WorkbenchClientPackageList } from './workbench-client-dto.ts'
|
||||
|
||||
export const WORKBENCH_CLIENT_PACKAGES_ENDPOINT = '/api/admin/workbench-client/packages'
|
||||
export const WORKBENCH_CLIENT_PACKAGE_ENDPOINT = '/api/admin/workbench-client/package'
|
||||
export const WORKBENCH_CLIENT_PRESIGN_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/presign`
|
||||
export const WORKBENCH_CLIENT_CONFIRM_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/confirm`
|
||||
export const WORKBENCH_CLIENT_DELETE_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/delete`
|
||||
/** 分片通道(S1-F3/AC-17):init/complete/abort 在工作台端点,分片体走通用 /api/files/chunk。 */
|
||||
export const WORKBENCH_CLIENT_CHUNK_INIT_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/chunk/init`
|
||||
export const WORKBENCH_CLIENT_CHUNK_COMPLETE_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/chunk/complete`
|
||||
export const WORKBENCH_CLIENT_CHUNK_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/chunk`
|
||||
/** confirm 失败的补偿清理:只删"已转存未登记"的对象(已登记后端拒绝)。 */
|
||||
export const WORKBENCH_CLIENT_UNCONFIRMED_OBJECT_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/object`
|
||||
export const FILES_CHUNK_ENDPOINT = '/api/files/chunk'
|
||||
|
||||
/** MinIO 直传专用实例:不带 cookie、不挂 401 跳登录拦截器;大 zip 给足超时。 */
|
||||
const directPut = axios.create({ timeout: 600_000, withCredentials: false })
|
||||
|
||||
/** 单片大小:8MB——93MB 包 ≈ 12 片,一片失败只重传 8MB,不再从 0 重来。 */
|
||||
export const UPLOAD_PART_SIZE = 8 * 1024 * 1024
|
||||
|
||||
/** ≤64MB 仍走单次预签名直传(链路最短);再大改分片(S1-F3)。 */
|
||||
export const DIRECT_PUT_MAX_BYTES = 64 * 1024 * 1024
|
||||
|
||||
/** 每片重试次数(不含首次):弱网下一片抖一下不必整单作废。 */
|
||||
const PART_RETRY_LIMIT = 2
|
||||
|
||||
export async function fetchWorkbenchClientPackages(): Promise<WorkbenchClientPackageList> {
|
||||
const { data } = await http.get<unknown>(WORKBENCH_CLIENT_PACKAGES_ENDPOINT)
|
||||
return parseWorkbenchClientPackageList(data)
|
||||
}
|
||||
|
||||
export interface WorkbenchClientUploadTarget {
|
||||
objectKey: string
|
||||
uploadUrl: string
|
||||
fileUrl: string
|
||||
version: string
|
||||
fileName: string
|
||||
}
|
||||
|
||||
/** 第一步:向后端申请直传 PUT 预签名地址(登录会话签发,默认 1 小时有效)。 */
|
||||
export async function requestWorkbenchClientPresign(
|
||||
fileName: string,
|
||||
version: string,
|
||||
): Promise<WorkbenchClientUploadTarget> {
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_PRESIGN_ENDPOINT, null, {
|
||||
params: { file_name: fileName, version },
|
||||
})
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
const uploadUrl = typeof core.upload_url === 'string' ? core.upload_url : ''
|
||||
const objectKey = typeof core.object_key === 'string' ? core.object_key : ''
|
||||
if (!uploadUrl || !objectKey) {
|
||||
throw new Error('后端未返回直传地址,请重试')
|
||||
}
|
||||
return {
|
||||
objectKey,
|
||||
uploadUrl,
|
||||
fileUrl: typeof core.file_url === 'string' ? core.file_url : '',
|
||||
version: typeof core.version === 'string' ? core.version : version.trim(),
|
||||
fileName: typeof core.file_name === 'string' ? core.file_name : fileName,
|
||||
}
|
||||
}
|
||||
|
||||
/** 第三步:直传完成后通知后端核对对象、复算 sha256 并落库(data.item 为新记录行)。 */
|
||||
export async function confirmWorkbenchClientPackage(
|
||||
objectKey: string,
|
||||
fileName: string,
|
||||
version: string,
|
||||
): Promise<WorkbenchClientPackageItem | null> {
|
||||
// confirm 要服务端流式复算最多 512MB 的 sha256;默认 30s 会在慢 MinIO/跨地域回源时
|
||||
// 先超时,而服务端可能已经落库——管理员重试会得到「已登记」的错位(CR-08)。
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_CONFIRM_ENDPOINT, null, {
|
||||
params: { object_key: objectKey, file_name: fileName, version },
|
||||
timeout: 600_000,
|
||||
})
|
||||
return parseWorkbenchClientPackageUpload(data)
|
||||
}
|
||||
|
||||
/**
|
||||
* confirm 失败后的补偿清理:删除"已转存但未登记"的对象。
|
||||
* 后端对已登记对象会拒绝清理(防止误删线上正在用的包),失败不覆盖原始错误。
|
||||
* 返回是否确实清理成功——调用方据此决定报错文案是"可重传"还是"先刷新核对"。
|
||||
*/
|
||||
async function deleteUnconfirmedPackageObject(objectKey: string): Promise<boolean> {
|
||||
try {
|
||||
await http.delete(WORKBENCH_CLIENT_UNCONFIRMED_OBJECT_ENDPOINT, {
|
||||
params: { object_key: objectKey },
|
||||
})
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* confirm 失败后的补偿清理(分片链):删会话 + 尽力删未登记对象。
|
||||
*/
|
||||
async function cleanupUnconfirmedPackage(uploadId: string, objectKey: string): Promise<void> {
|
||||
try {
|
||||
await http.delete(`${WORKBENCH_CLIENT_CHUNK_ENDPOINT}/${encodeURIComponent(uploadId)}`, {
|
||||
params: objectKey ? { object_key: objectKey } : {},
|
||||
})
|
||||
} catch {
|
||||
// 尽力而为:清理失败只说明残留等人工处置,不能替原始错误改口
|
||||
}
|
||||
}
|
||||
|
||||
/** 按 id 批量删除客户端包(后端会顺带清理无引用对象的 MinIO 包体);返回实际删除行数。 */
|
||||
export async function deleteWorkbenchClientPackages(ids: number[]): Promise<number> {
|
||||
if (!ids.length) return 0
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_DELETE_ENDPOINT, ids)
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
return typeof core.deleted === 'number' ? core.deleted : ids.length
|
||||
}
|
||||
|
||||
/** 单次预签名 PUT 直传(≤DIRECT_PUT_MAX_BYTES 的短链路)。 */
|
||||
async function directPutUpload(
|
||||
file: Blob,
|
||||
target: WorkbenchClientUploadTarget,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<void> {
|
||||
await directPut.put(target.uploadUrl, file, {
|
||||
headers: { 'Content-Type': 'application/octet-stream' },
|
||||
onUploadProgress: (event) => {
|
||||
if (!onProgress) return
|
||||
const total = event.total || 0
|
||||
onProgress(total > 0 ? Math.min(Math.round((event.loaded / total) * 100), 100) : 0)
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片上传(S1-F3/AC-17):整包切成 partSize 片逐片 POST,每片独立重试;
|
||||
* 开传前先查已到片号——上一次断掉的会话可以直接续传(后端保留 24h)。
|
||||
* 这一问失败不静默按「全缺」重传:93MB 的包问不到续传点就说明链路已经不对了,
|
||||
* 当场报错让人重来,也比闷头把整包再传一遍便宜。
|
||||
*/
|
||||
async function chunkedUpload(
|
||||
file: Blob,
|
||||
uploadId: string,
|
||||
totalParts: number,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<void> {
|
||||
const { data } = await http.get<unknown>(`${FILES_CHUNK_ENDPOINT}/${encodeURIComponent(uploadId)}`)
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
const done = new Set<number>(
|
||||
(Array.isArray(core.uploaded_parts) ? core.uploaded_parts : []).map((index) => Number(index)),
|
||||
)
|
||||
const report = (partial: number) => {
|
||||
if (!onProgress) return
|
||||
const loaded = done.size * UPLOAD_PART_SIZE + partial
|
||||
onProgress(Math.min(Math.round((loaded / file.size) * 100), 99))
|
||||
}
|
||||
for (let index = 0; index < totalParts; index += 1) {
|
||||
if (done.has(index)) {
|
||||
report(0)
|
||||
continue
|
||||
}
|
||||
const blob = file.slice(index * UPLOAD_PART_SIZE, Math.min(file.size, (index + 1) * UPLOAD_PART_SIZE))
|
||||
let lastError: unknown = null
|
||||
for (let attempt = 0; attempt <= PART_RETRY_LIMIT; attempt += 1) {
|
||||
const form = new FormData()
|
||||
form.append('file', blob, `part-${index}`)
|
||||
try {
|
||||
await http.post(`${FILES_CHUNK_ENDPOINT}/${encodeURIComponent(uploadId)}/part/${index}`, form, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
timeout: 300_000,
|
||||
onUploadProgress: (event) => report(Math.min(event.loaded || 0, blob.size)),
|
||||
})
|
||||
done.add(index)
|
||||
lastError = null
|
||||
break
|
||||
} catch (error) {
|
||||
lastError = error
|
||||
}
|
||||
}
|
||||
if (lastError) {
|
||||
throw lastError instanceof Error ? lastError : new Error(`第 ${index} 片上传失败`)
|
||||
}
|
||||
}
|
||||
if (onProgress) onProgress(100)
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传客户端包:≤64MB 走浏览器直传预签名 PUT;大包走后端分片通道(每片可重试/续传,
|
||||
* 服务端拼装后转存 client 桶)。两条链最后都收敛到 confirm:服务端复算 sha256、
|
||||
* 凭据扫描、版本唯一性登记。confirm 失败清理未登记对象,不留孤儿。
|
||||
*/
|
||||
export async function uploadWorkbenchClientPackage(
|
||||
file: Blob,
|
||||
fileName: string,
|
||||
version: string,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<WorkbenchClientPackageItem | null> {
|
||||
if (file.size <= DIRECT_PUT_MAX_BYTES) {
|
||||
const target = await requestWorkbenchClientPresign(fileName, version)
|
||||
await directPutUpload(file, target, onProgress)
|
||||
try {
|
||||
return await confirmWorkbenchClientPackage(target.objectKey, target.fileName, target.version)
|
||||
} catch (error) {
|
||||
// confirm 失败先 cleanup 未登记对象再报错;服务端若已登记会拒绝清理(CR-08 幂等窗口),
|
||||
// 那种情况保留原错误文案引导"先刷新列表",不冒充已处置。
|
||||
const cleaned = await deleteUnconfirmedPackageObject(target.objectKey)
|
||||
const reason = error instanceof Error ? error.message : String(error)
|
||||
if (cleaned) {
|
||||
throw new Error(`安装包已上传但登记未完成(${reason})。未登记对象已清理,可直接重新上传。`)
|
||||
}
|
||||
throw new Error(`安装包已上传,但确认未完成(${reason})。请先刷新列表确认,不要立即重复上传。`)
|
||||
}
|
||||
}
|
||||
const totalParts = Math.max(1, Math.ceil(file.size / UPLOAD_PART_SIZE))
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_CHUNK_INIT_ENDPOINT, null, {
|
||||
params: { file_name: fileName, version, total_parts: totalParts, total_bytes: file.size },
|
||||
})
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
const uploadId = typeof core.upload_id === 'string' ? core.upload_id : ''
|
||||
const objectKey = typeof core.object_key === 'string' ? core.object_key : ''
|
||||
if (!uploadId || !objectKey) {
|
||||
throw new Error('后端未返回分片会话,请重试')
|
||||
}
|
||||
const confirmedName = typeof core.file_name === 'string' ? core.file_name : fileName
|
||||
const confirmedVersion = typeof core.version === 'string' ? core.version : version
|
||||
let assembled = false
|
||||
try {
|
||||
await chunkedUpload(file, uploadId, totalParts, onProgress)
|
||||
await http.post(WORKBENCH_CLIENT_CHUNK_COMPLETE_ENDPOINT, null, {
|
||||
params: { upload_id: uploadId, object_key: objectKey, file_name: confirmedName, version: confirmedVersion },
|
||||
timeout: 600_000,
|
||||
})
|
||||
assembled = true
|
||||
return await confirmWorkbenchClientPackage(objectKey, confirmedName, confirmedVersion)
|
||||
} catch (error) {
|
||||
await cleanupUnconfirmedPackage(uploadId, objectKey)
|
||||
const reason = error instanceof Error ? error.message : String(error)
|
||||
if (assembled) {
|
||||
throw new Error(`安装包已转存但登记未完成(${reason})。未登记对象已清理,可直接重新上传。`)
|
||||
}
|
||||
throw error
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
/** 工作台客户端包 DTO(后管「数富AI工作台客户端包管理」页)。纯类型。 */
|
||||
|
||||
/** 客户端包行(GET /api/admin/workbench-client/packages data.items,Java snake)。 */
|
||||
export interface WorkbenchClientPackageItem {
|
||||
id: number
|
||||
version: string
|
||||
fileName: string
|
||||
objectKey: string
|
||||
fileSize: number
|
||||
/** 更新包 sha256(hex 小写),客户端下载后的完整性锚点 */
|
||||
sha256: string
|
||||
fileUrl: string
|
||||
createdAt: string
|
||||
}
|
||||
|
||||
export interface WorkbenchClientPackageList {
|
||||
items: WorkbenchClientPackageItem[]
|
||||
}
|
||||
|
||||
export function emptyWorkbenchClientPackageList(): WorkbenchClientPackageList {
|
||||
return { items: [] }
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
/** 工作台客户端包列表加载模型:解析 snake/camel、格式化大小与版本号校验;纯逻辑。 */
|
||||
import { unwrap } from '../../api/envelope.ts'
|
||||
import { type WorkbenchClientPackageItem, type WorkbenchClientPackageList } from './workbench-client-dto.ts'
|
||||
|
||||
/** 与后端 biz_workbench_client_package.version VARCHAR(64) 对齐。 */
|
||||
export const WORKBENCH_CLIENT_VERSION_MAX_LENGTH = 64
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
function numberOrNull(value: unknown): number | null {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : null
|
||||
}
|
||||
|
||||
/** 解析单条客户端包行;缺 id 视为无效。 */
|
||||
export function toWorkbenchClientPackageItem(raw: unknown): WorkbenchClientPackageItem | null {
|
||||
if (!raw || typeof raw !== 'object') return null
|
||||
const r = raw as Record<string, unknown>
|
||||
const id = numberOrNull(r.id)
|
||||
if (id === null) return null
|
||||
return {
|
||||
id,
|
||||
version: text(r.version),
|
||||
fileName: text(r.file_name ?? r.fileName),
|
||||
objectKey: text(r.object_key ?? r.objectKey),
|
||||
fileSize: numberOrNull(r.file_size ?? r.fileSize) ?? 0,
|
||||
sha256: text(r.sha256),
|
||||
fileUrl: text(r.file_url ?? r.fileUrl),
|
||||
createdAt: text(r.created_at ?? r.createdAt),
|
||||
}
|
||||
}
|
||||
|
||||
/** 归一化客户端包列表负载为前端结果;缺省回空列表。 */
|
||||
export function parseWorkbenchClientPackageList(payload: unknown): WorkbenchClientPackageList {
|
||||
const data = unwrap<unknown>(payload)
|
||||
const record = data && typeof data === 'object' ? (data as Record<string, unknown>) : {}
|
||||
const items = Array.isArray(record.items)
|
||||
? record.items
|
||||
.map((raw) => toWorkbenchClientPackageItem(raw))
|
||||
.filter((item): item is WorkbenchClientPackageItem => item !== null)
|
||||
: []
|
||||
return { items }
|
||||
}
|
||||
|
||||
/** 上传成功后返回的新记录行(data.item);无 item 回 null。 */
|
||||
export function parseWorkbenchClientPackageUpload(payload: unknown): WorkbenchClientPackageItem | null {
|
||||
const data = unwrap<unknown>(payload)
|
||||
if (!data || typeof data !== 'object') return null
|
||||
const item = (data as Record<string, unknown>).item
|
||||
return item ? toWorkbenchClientPackageItem(item) : null
|
||||
}
|
||||
|
||||
/**
|
||||
* 版本号必填、纯数字 x.y.z、且不超过后端列宽。
|
||||
* 客户端按数字逐段比较,v 前缀/两段/后缀会让严格解析器判非法 ⇒ 检查更新永远回「已是最新」。
|
||||
*/
|
||||
export function isValidWorkbenchClientVersion(value: string): boolean {
|
||||
const normalized = typeof value === 'string' ? value.trim() : ''
|
||||
return normalized.length > 0
|
||||
&& normalized.length <= WORKBENCH_CLIENT_VERSION_MAX_LENGTH
|
||||
&& /^\d+\.\d+\.\d+$/.test(normalized)
|
||||
}
|
||||
|
||||
/** 字节数展示:0=未知展示为 -,其余按 KB/MB/GB 人性化。 */
|
||||
export function formatFileSize(bytes: number): string {
|
||||
if (!Number.isFinite(bytes) || bytes <= 0) return '—'
|
||||
if (bytes < 1024) return `${bytes} B`
|
||||
const units = ['KB', 'MB', 'GB']
|
||||
let value = bytes / 1024
|
||||
let unitIndex = 0
|
||||
while (value >= 1024 && unitIndex < units.length - 1) {
|
||||
value /= 1024
|
||||
unitIndex += 1
|
||||
}
|
||||
return `${value >= 100 ? value.toFixed(0) : value.toFixed(1)} ${units[unitIndex]}`
|
||||
}
|
||||
@@ -7,11 +7,12 @@ import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { userNotice } from '@/api/user-notice'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import TaskCenterTaskTable from './TaskCenterTaskTable.vue'
|
||||
import TaskCenterVariantTable from './TaskCenterVariantTable.vue'
|
||||
import {
|
||||
fetchTaskCenterOverview,
|
||||
fetchTaskCenterShopOptions,
|
||||
@@ -30,19 +31,14 @@ import {
|
||||
VARIANT_STATUS_OPTIONS,
|
||||
buildTaskQuery,
|
||||
buildVariantQuery,
|
||||
countryLabel,
|
||||
createTaskFilter,
|
||||
createVariantFilter,
|
||||
deviceDisplayName,
|
||||
progressPercent,
|
||||
progressText,
|
||||
shopDisplayName,
|
||||
tabCount,
|
||||
taskStatusLabel,
|
||||
taskStatusType,
|
||||
variantAccountText,
|
||||
variantStatusLabel,
|
||||
variantStatusType,
|
||||
type TaskCenterTaskFilter,
|
||||
type TaskCenterVariantFilter,
|
||||
} from './task-center-model'
|
||||
@@ -216,6 +212,10 @@ function resetFilter() {
|
||||
void loadTasks()
|
||||
}
|
||||
|
||||
function retryTasks() {
|
||||
void loadTasks()
|
||||
}
|
||||
|
||||
function changeTaskPage(next: number) {
|
||||
if (next < 1 || next > taskTotalPages.value) return
|
||||
taskPage.value = next
|
||||
@@ -423,78 +423,16 @@ onUnmounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="tasksFailure" :message="tasksFailure" @retry="loadTasks" />
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 120px">账号</th>
|
||||
<th style="width: 160px">店铺</th>
|
||||
<th style="width: 90px">国家</th>
|
||||
<th style="width: 120px">业务</th>
|
||||
<th style="width: 120px">状态</th>
|
||||
<th style="width: 170px">任务ID</th>
|
||||
<th style="width: 165px">开始时间</th>
|
||||
<th style="width: 165px">最近上报</th>
|
||||
<th style="width: 165px">结束时间</th>
|
||||
<th style="width: 190px">进度</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="tasks.length">
|
||||
<tr v-for="row in tasks" :key="row.taskNo">
|
||||
<td>
|
||||
<span class="strong">{{ accountOf(row) }}</span>
|
||||
</td>
|
||||
<td>{{ shopDisplayName(row.shopName, row.shopCount) }}</td>
|
||||
<td>{{ countryLabel(row.country) }}</td>
|
||||
<td>{{ row.moduleLabel || row.moduleType }}</td>
|
||||
<td>
|
||||
<span class="st-pill" :class="`is-${taskStatusType(row.status)}`">{{ taskStatusLabel(row.status) }}</span>
|
||||
<span v-if="row.stuck" class="badge warn">疑似卡住</span>
|
||||
</td>
|
||||
<td>
|
||||
<button class="cell-link mono" type="button" @click="openDetail(row)">{{ row.id }}</button>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createdAt) }}</td>
|
||||
<td>
|
||||
<span :class="{ 'is-warn-text': row.stuck }">
|
||||
{{ row.lastReportAt ? formatDateTime(row.lastReportAt) : '—' }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ row.finishedAt ? formatDateTime(row.finishedAt) : '—' }}</td>
|
||||
<td>
|
||||
<template v-if="taskStatusType(row.status) === 'failed'">
|
||||
<span v-if="row.progressFailed > 0" class="badge danger">失败 {{ row.progressFailed }}</span>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="progress-line">
|
||||
<span>{{ progressText(row) }}</span>
|
||||
<span v-if="row.progressFailed > 0" class="badge danger">失败 {{ row.progressFailed }}</span>
|
||||
</div>
|
||||
<div class="p-track" v-if="row.progressTotal > 0">
|
||||
<div class="p-fill" :style="{ width: progressPercent(row) + '%' }"></div>
|
||||
</div>
|
||||
</template>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="tasksLoading">
|
||||
<td colspan="10" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="10" class="empty-tip">暂无符合条件的任务</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination
|
||||
<LoadFailureBar v-if="tasksFailure" :message="tasksFailure" @retry="retryTasks" />
|
||||
<TaskCenterTaskTable
|
||||
:rows="tasks"
|
||||
:loading="tasksLoading"
|
||||
:total="taskTotal"
|
||||
:page="taskPage"
|
||||
:page-size="taskPageSize"
|
||||
@change="changeTaskPage"
|
||||
@size-change="changeTaskSize"
|
||||
@page="changeTaskPage"
|
||||
@size="changeTaskSize"
|
||||
@open="openDetail"
|
||||
/>
|
||||
</section>
|
||||
</template>
|
||||
@@ -522,55 +460,14 @@ onUnmounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 150px">账号</th>
|
||||
<th style="width: 200px">任务号</th>
|
||||
<th style="width: 110px">状态</th>
|
||||
<th style="width: 165px">开始时间</th>
|
||||
<th style="width: 165px">更新时间</th>
|
||||
<th>结果信息</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="variantRows.length">
|
||||
<tr v-for="row in variantRows" :key="row.taskId">
|
||||
<td>
|
||||
<span class="strong">{{ variantAccountText(row) }}</span>
|
||||
<span v-if="!row.username && row.uid" class="sub" :title="row.uid">{{ row.uid }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="mono">{{ row.taskId }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="st-pill" :class="`is-${variantStatusType(row.status)}`">
|
||||
{{ row.statusLabel || variantStatusLabel(row.status) }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createTime) }}</td>
|
||||
<td>{{ formatDateTime(row.updateTime) }}</td>
|
||||
<td>
|
||||
<span class="res-mes" :title="row.resMes || ''">{{ row.resMes || '—' }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="variantLoading">
|
||||
<td colspan="6" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="6" class="empty-tip">暂无变体采集任务</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination
|
||||
<TaskCenterVariantTable
|
||||
:rows="variantRows"
|
||||
:loading="variantLoading"
|
||||
:total="variantTotal ?? 0"
|
||||
:page="variantPage"
|
||||
:page-size="variantPageSize"
|
||||
@change="changeVariantPage"
|
||||
@size-change="changeVariantSize"
|
||||
@page="changeVariantPage"
|
||||
@size="changeVariantSize"
|
||||
/>
|
||||
</section>
|
||||
</template>
|
||||
@@ -763,10 +660,6 @@ h3 {
|
||||
color: #8598ab;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.is-warn-text {
|
||||
color: #b3803a;
|
||||
font-weight: 650;
|
||||
}
|
||||
.shop-filter {
|
||||
position: relative;
|
||||
}
|
||||
@@ -854,60 +747,6 @@ h3 {
|
||||
border-color: #95b1cb;
|
||||
color: #2f5d8b;
|
||||
}
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
overflow-x: auto;
|
||||
}
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
}
|
||||
th {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
color: #5b6f83;
|
||||
font-weight: 650;
|
||||
font-size: 12.5px;
|
||||
border-bottom: 1px solid #dbe6f0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
td {
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid #eaf1f7;
|
||||
vertical-align: top;
|
||||
}
|
||||
.strong {
|
||||
display: block;
|
||||
font-weight: 600;
|
||||
word-break: break-all;
|
||||
}
|
||||
.sub {
|
||||
display: block;
|
||||
color: #8598ab;
|
||||
font-size: 11.5px;
|
||||
word-break: break-all;
|
||||
}
|
||||
.mono {
|
||||
font-family: Consolas, 'Courier New', monospace;
|
||||
font-size: 12px;
|
||||
word-break: break-all;
|
||||
}
|
||||
/* 任务 ID 单元格:「操作」列删除后,它是详情抽屉唯一的入口。 */
|
||||
.cell-link {
|
||||
padding: 0;
|
||||
border: none;
|
||||
background: none;
|
||||
color: #2f5d8b;
|
||||
cursor: pointer;
|
||||
}
|
||||
.cell-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.res-mes {
|
||||
display: block;
|
||||
word-break: break-all;
|
||||
}
|
||||
.st-pill {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -959,24 +798,6 @@ td {
|
||||
background: #f8ebeb;
|
||||
color: #91474f;
|
||||
}
|
||||
.progress-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.p-track {
|
||||
height: 6px;
|
||||
border-radius: 999px;
|
||||
background: #eaf1f7;
|
||||
overflow: hidden;
|
||||
}
|
||||
.p-fill {
|
||||
height: 100%;
|
||||
border-radius: 999px;
|
||||
background: linear-gradient(90deg, #6f97bd, #4f78a5);
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 30px 24px;
|
||||
text-align: center;
|
||||
|
||||
@@ -0,0 +1,223 @@
|
||||
<script setup lang="ts">
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import type { TaskCenterTaskRow } from '@/api/task-center'
|
||||
import {
|
||||
countryLabel,
|
||||
progressPercent,
|
||||
progressText,
|
||||
shopDisplayName,
|
||||
taskStatusLabel,
|
||||
taskStatusType,
|
||||
} from './task-center-model'
|
||||
|
||||
defineProps<{
|
||||
rows: TaskCenterTaskRow[]
|
||||
loading: boolean
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
page: [number]
|
||||
size: [number]
|
||||
open: [TaskCenterTaskRow]
|
||||
}>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 120px">账号</th>
|
||||
<th style="width: 160px">店铺</th>
|
||||
<th style="width: 90px">国家</th>
|
||||
<th style="width: 120px">业务</th>
|
||||
<th style="width: 120px">状态</th>
|
||||
<th style="width: 170px">任务ID</th>
|
||||
<th style="width: 165px">开始时间</th>
|
||||
<th style="width: 165px">最近上报</th>
|
||||
<th style="width: 165px">结束时间</th>
|
||||
<th style="width: 190px">进度</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="rows.length">
|
||||
<tr v-for="row in rows" :key="row.taskNo">
|
||||
<td>
|
||||
<span class="strong">{{ row.username || (row.userId != null ? `UID ${row.userId}` : '—') }}</span>
|
||||
</td>
|
||||
<td>{{ shopDisplayName(row.shopName, row.shopCount) }}</td>
|
||||
<td>{{ countryLabel(row.country) }}</td>
|
||||
<td>{{ row.moduleLabel || row.moduleType }}</td>
|
||||
<td>
|
||||
<span class="st-pill" :class="`is-${taskStatusType(row.status)}`">{{ taskStatusLabel(row.status) }}</span>
|
||||
<span v-if="row.stuck" class="badge warn">疑似卡住</span>
|
||||
</td>
|
||||
<td>
|
||||
<button class="cell-link mono" type="button" @click="emit('open', row)">{{ row.id }}</button>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createdAt) }}</td>
|
||||
<td>
|
||||
<span :class="{ 'is-warn-text': row.stuck }">
|
||||
{{ row.lastReportAt ? formatDateTime(row.lastReportAt) : '—' }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ row.finishedAt ? formatDateTime(row.finishedAt) : '—' }}</td>
|
||||
<td>
|
||||
<template v-if="taskStatusType(row.status) === 'failed'">
|
||||
<span v-if="row.progressFailed > 0" class="badge danger">失败 {{ row.progressFailed }}</span>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="progress-line">
|
||||
<span>{{ progressText(row) }}</span>
|
||||
<span v-if="row.progressFailed > 0" class="badge danger">失败 {{ row.progressFailed }}</span>
|
||||
</div>
|
||||
<div class="p-track" v-if="row.progressTotal > 0">
|
||||
<div class="p-fill" :style="{ width: progressPercent(row) + '%' }"></div>
|
||||
</div>
|
||||
</template>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="10" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="10" class="empty-tip">暂无符合条件的任务</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination
|
||||
:total="total"
|
||||
:page="page"
|
||||
:page-size="pageSize"
|
||||
@change="emit('page', $event)"
|
||||
@size-change="emit('size', $event)"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
overflow-x: auto;
|
||||
}
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
}
|
||||
th {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
color: #5b6f83;
|
||||
font-weight: 650;
|
||||
font-size: 12.5px;
|
||||
border-bottom: 1px solid #dbe6f0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
td {
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid #eaf1f7;
|
||||
vertical-align: top;
|
||||
}
|
||||
.strong {
|
||||
display: block;
|
||||
font-weight: 600;
|
||||
word-break: break-all;
|
||||
}
|
||||
.mono {
|
||||
font-family: Consolas, 'Courier New', monospace;
|
||||
font-size: 12px;
|
||||
word-break: break-all;
|
||||
}
|
||||
.cell-link {
|
||||
padding: 0;
|
||||
border: none;
|
||||
background: none;
|
||||
color: #2f5d8b;
|
||||
cursor: pointer;
|
||||
}
|
||||
.cell-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.is-warn-text {
|
||||
color: #b3803a;
|
||||
font-weight: 650;
|
||||
}
|
||||
.st-pill {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 2px 10px;
|
||||
border-radius: 999px;
|
||||
font-size: 12px;
|
||||
line-height: 1.7;
|
||||
border: 1px solid transparent;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.st-pill.is-success {
|
||||
color: #3d7158;
|
||||
background: #e8f2eb;
|
||||
border-color: #bdd7c5;
|
||||
}
|
||||
.st-pill.is-failed {
|
||||
color: #91474f;
|
||||
background: #f8ebeb;
|
||||
border-color: #e4c2c5;
|
||||
}
|
||||
.st-pill.is-pending {
|
||||
color: #8a6d3b;
|
||||
background: #fbf4ea;
|
||||
border-color: #e7d3ae;
|
||||
}
|
||||
.st-pill.is-running {
|
||||
color: #37618f;
|
||||
background: #e8f1fb;
|
||||
border-color: #c3d8ef;
|
||||
}
|
||||
.badge {
|
||||
display: inline-block;
|
||||
margin-left: 6px;
|
||||
padding: 1px 7px;
|
||||
border-radius: 999px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.badge.danger {
|
||||
background: #f8ebeb;
|
||||
color: #91474f;
|
||||
}
|
||||
.badge.warn {
|
||||
background: #fbf4ea;
|
||||
color: #8a6d3b;
|
||||
}
|
||||
.progress-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.p-track {
|
||||
height: 6px;
|
||||
border-radius: 999px;
|
||||
background: #eaf1f7;
|
||||
overflow: hidden;
|
||||
}
|
||||
.p-fill {
|
||||
height: 100%;
|
||||
border-radius: 999px;
|
||||
background: linear-gradient(90deg, #6f97bd, #4f78a5);
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 30px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,158 @@
|
||||
<script setup lang="ts">
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import type { TaskCenterVariantTaskRow } from '@/api/task-center'
|
||||
import {
|
||||
variantAccountText,
|
||||
variantStatusLabel,
|
||||
variantStatusType,
|
||||
} from './task-center-model'
|
||||
|
||||
defineProps<{
|
||||
rows: TaskCenterVariantTaskRow[]
|
||||
loading: boolean
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
page: [number]
|
||||
size: [number]
|
||||
}>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 150px">账号</th>
|
||||
<th style="width: 200px">任务号</th>
|
||||
<th style="width: 110px">状态</th>
|
||||
<th style="width: 165px">开始时间</th>
|
||||
<th style="width: 165px">更新时间</th>
|
||||
<th>结果信息</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="rows.length">
|
||||
<tr v-for="row in rows" :key="row.taskId">
|
||||
<td>
|
||||
<span class="strong">{{ variantAccountText(row) }}</span>
|
||||
<span v-if="!row.username && row.uid" class="sub" :title="row.uid">{{ row.uid }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="mono">{{ row.taskId }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="st-pill" :class="`is-${variantStatusType(row.status)}`">
|
||||
{{ row.statusLabel || variantStatusLabel(row.status) }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createTime) }}</td>
|
||||
<td>{{ formatDateTime(row.updateTime) }}</td>
|
||||
<td>
|
||||
<span class="res-mes" :title="row.resMes || ''">{{ row.resMes || '—' }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="6" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="6" class="empty-tip">暂无变体采集任务</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination
|
||||
:total="total"
|
||||
:page="page"
|
||||
:page-size="pageSize"
|
||||
@change="emit('page', $event)"
|
||||
@size-change="emit('size', $event)"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
overflow-x: auto;
|
||||
}
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
}
|
||||
th {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
color: #5b6f83;
|
||||
font-weight: 650;
|
||||
font-size: 12.5px;
|
||||
border-bottom: 1px solid #dbe6f0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
td {
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid #eaf1f7;
|
||||
vertical-align: top;
|
||||
}
|
||||
.strong {
|
||||
display: block;
|
||||
font-weight: 600;
|
||||
word-break: break-all;
|
||||
}
|
||||
.sub {
|
||||
display: block;
|
||||
color: #8598ab;
|
||||
font-size: 11.5px;
|
||||
word-break: break-all;
|
||||
}
|
||||
.mono {
|
||||
font-family: Consolas, 'Courier New', monospace;
|
||||
font-size: 12px;
|
||||
word-break: break-all;
|
||||
}
|
||||
.res-mes {
|
||||
display: block;
|
||||
word-break: break-all;
|
||||
}
|
||||
.st-pill {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 2px 10px;
|
||||
border-radius: 999px;
|
||||
font-size: 12px;
|
||||
line-height: 1.7;
|
||||
border: 1px solid transparent;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.st-pill.is-success {
|
||||
color: #3d7158;
|
||||
background: #e8f2eb;
|
||||
border-color: #bdd7c5;
|
||||
}
|
||||
.st-pill.is-failed {
|
||||
color: #91474f;
|
||||
background: #f8ebeb;
|
||||
border-color: #e4c2c5;
|
||||
}
|
||||
.st-pill.is-pending {
|
||||
color: #8a6d3b;
|
||||
background: #fbf4ea;
|
||||
border-color: #e7d3ae;
|
||||
}
|
||||
.st-pill.is-running {
|
||||
color: #37618f;
|
||||
background: #e8f1fb;
|
||||
border-color: #c3d8ef;
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 30px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,756 @@
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 品牌Gating库管理页(独立菜单 admin_brand_gating,V174 恢复)。
|
||||
* 数据源 /api/admin/brand-gating(biz_brand_gating,全平台共享,不随公司 Tab 收窄)。
|
||||
*/
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { actionableErrorText, type AdminFeedbackKind } from '@/components/admin-feedback'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import { createLatestRequestGate } from '@/utils/latest-request'
|
||||
import {
|
||||
GATING_COUNTRIES,
|
||||
GATING_SOURCES,
|
||||
GATING_TYPES,
|
||||
createBrandGatingFilter,
|
||||
createBrandGatingForm,
|
||||
validateBrandGatingForm,
|
||||
type BrandGatingFilter,
|
||||
type BrandGatingForm,
|
||||
type BrandGatingRow,
|
||||
type BrandGatingStats,
|
||||
} from './brand-gating-model.ts'
|
||||
import {
|
||||
deleteBrandGating,
|
||||
fetchBrandGatingPage,
|
||||
fetchBrandGatingStats,
|
||||
importBrandGatingText,
|
||||
submitBrandGating,
|
||||
updateBrandGatingStatus,
|
||||
} from './brand-gating-api.ts'
|
||||
|
||||
const filter = reactive<BrandGatingFilter>(createBrandGatingFilter())
|
||||
const page = ref(1)
|
||||
const pageSize = ref(10)
|
||||
const rows = ref<BrandGatingRow[]>([])
|
||||
const total = ref(0)
|
||||
const pageLoading = ref(false)
|
||||
const loadError = ref('')
|
||||
const loaded = ref(false)
|
||||
|
||||
const stats = ref<BrandGatingStats | null>(null)
|
||||
const statsLoading = ref(false)
|
||||
const statsError = ref('')
|
||||
|
||||
const form = reactive<BrandGatingForm>(createBrandGatingForm())
|
||||
const addBusy = ref(false)
|
||||
const batchText = ref('')
|
||||
const importBusy = ref(false)
|
||||
const busyRowId = ref(0)
|
||||
|
||||
// 快速改筛选/翻页时先发的请求可能后返回;列表与统计各一个序号闸(CR-27)
|
||||
const pageGate = createLatestRequestGate()
|
||||
const statsGate = createLatestRequestGate()
|
||||
|
||||
const countryOptions = GATING_COUNTRIES.filter((country) => country !== '全部')
|
||||
const typeOptions = GATING_TYPES
|
||||
|
||||
const statsCards = computed(() => {
|
||||
const current = stats.value
|
||||
const byType = new Map((current?.byType ?? []).map((item) => [item.name, item.count]))
|
||||
return [
|
||||
{ label: 'Gating总记录', value: current?.total ?? 0, tone: '' },
|
||||
{ label: '生效中', value: current?.active ?? 0, tone: 'ok' },
|
||||
{ label: '已解除', value: current?.disabled ?? 0, tone: 'muted' },
|
||||
{ label: '去重品牌数', value: current?.brands ?? 0, tone: '' },
|
||||
{ label: '品牌gating', value: byType.get('品牌gating') ?? 0, tone: 'primary' },
|
||||
{ label: '类目gating', value: byType.get('类目gating') ?? 0, tone: 'warn' },
|
||||
{ label: '账户不符合', value: byType.get('账户不符合') ?? 0, tone: 'danger' },
|
||||
]
|
||||
})
|
||||
|
||||
function feedback(message: string, kind: AdminFeedbackKind): void {
|
||||
showAdminFeedback(message, kind)
|
||||
}
|
||||
|
||||
async function loadStats(): Promise<void> {
|
||||
const token = statsGate.begin()
|
||||
statsLoading.value = true
|
||||
statsError.value = ''
|
||||
try {
|
||||
const result = await fetchBrandGatingStats()
|
||||
if (!statsGate.isCurrent(token)) return
|
||||
stats.value = result
|
||||
} catch (error) {
|
||||
if (!statsGate.isCurrent(token)) return
|
||||
statsError.value = actionableErrorText(error)
|
||||
} finally {
|
||||
if (statsGate.isCurrent(token)) statsLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadPage(nextPage = page.value): Promise<void> {
|
||||
const token = pageGate.begin()
|
||||
pageLoading.value = true
|
||||
loadError.value = ''
|
||||
try {
|
||||
const result = await fetchBrandGatingPage(filter, nextPage, pageSize.value)
|
||||
if (!pageGate.isCurrent(token)) return
|
||||
rows.value = result.rows
|
||||
total.value = result.total
|
||||
page.value = nextPage
|
||||
loaded.value = true
|
||||
} catch (error) {
|
||||
if (!pageGate.isCurrent(token)) return
|
||||
loadError.value = actionableErrorText(error)
|
||||
} finally {
|
||||
if (pageGate.isCurrent(token)) pageLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function query(): void {
|
||||
loadPage(1)
|
||||
}
|
||||
|
||||
function resetFilter(): void {
|
||||
Object.assign(filter, createBrandGatingFilter())
|
||||
loadPage(1)
|
||||
}
|
||||
|
||||
function changePageSize(size: number): void {
|
||||
pageSize.value = size
|
||||
loadPage(1)
|
||||
}
|
||||
|
||||
async function addOne(): Promise<void> {
|
||||
const error = validateBrandGatingForm(form)
|
||||
if (error) {
|
||||
feedback(error, 'warning')
|
||||
return
|
||||
}
|
||||
addBusy.value = true
|
||||
try {
|
||||
const added = await submitBrandGating(form)
|
||||
if (added) {
|
||||
feedback('新增成功', 'success')
|
||||
form.brand = ''
|
||||
form.asin = ''
|
||||
form.remark = ''
|
||||
} else {
|
||||
feedback('该品牌 + 国家已存在,未重复添加', 'warning')
|
||||
}
|
||||
await Promise.all([loadPage(added ? 1 : page.value), loadStats()])
|
||||
} catch (error) {
|
||||
feedback(actionableErrorText(error), 'error')
|
||||
} finally {
|
||||
addBusy.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function batchAdd(): Promise<void> {
|
||||
const text = batchText.value.trim()
|
||||
if (!text) {
|
||||
feedback('请粘贴批量数据', 'warning')
|
||||
return
|
||||
}
|
||||
importBusy.value = true
|
||||
try {
|
||||
const result = await importBrandGatingText(text)
|
||||
feedback(`批量导入完成:新增 ${result.added} 条,跳过重复 ${result.skipped} 条`, 'success')
|
||||
batchText.value = ''
|
||||
await Promise.all([loadPage(1), loadStats()])
|
||||
} catch (error) {
|
||||
feedback(actionableErrorText(error), 'error')
|
||||
} finally {
|
||||
importBusy.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function toggleStatus(row: BrandGatingRow): Promise<void> {
|
||||
const enabling = row.status !== 1
|
||||
if (!enabling) {
|
||||
const confirmed = await openAdminConfirm({ danger: false,
|
||||
title: '解除Gating',
|
||||
message: `确认解除「${row.brand}」的Gating记录?解除后排查会跳过该品牌。`,
|
||||
confirmText: '确认解除',
|
||||
})
|
||||
if (!confirmed) return
|
||||
}
|
||||
busyRowId.value = row.id
|
||||
try {
|
||||
await updateBrandGatingStatus(row.id, enabling ? 1 : 0)
|
||||
feedback(enabling ? '已恢复生效' : '已解除,排查不再拦截', 'success')
|
||||
await Promise.all([loadPage(), loadStats()])
|
||||
} catch (error) {
|
||||
feedback(actionableErrorText(error), 'error')
|
||||
} finally {
|
||||
busyRowId.value = 0
|
||||
}
|
||||
}
|
||||
|
||||
async function removeRow(row: BrandGatingRow): Promise<void> {
|
||||
const confirmed = await openAdminConfirm({ danger: true,
|
||||
targetName: row.brand,
|
||||
message: `确认删除 ID=${row.id} 的「${row.brand}」Gating记录?此操作可能影响已有数据。`,
|
||||
})
|
||||
if (!confirmed) return
|
||||
busyRowId.value = row.id
|
||||
try {
|
||||
await deleteBrandGating(row.id)
|
||||
feedback('已删除', 'success')
|
||||
const nextPage = rows.value.length === 1 && page.value > 1 ? page.value - 1 : page.value
|
||||
await Promise.all([loadPage(nextPage), loadStats()])
|
||||
} catch (error) {
|
||||
feedback(actionableErrorText(error), 'error')
|
||||
} finally {
|
||||
busyRowId.value = 0
|
||||
}
|
||||
}
|
||||
|
||||
function typeClass(type: string): string {
|
||||
if (type.includes('账户')) return 'g-tag-acc'
|
||||
if (type.includes('类目')) return 'g-tag-cat'
|
||||
return 'g-tag-brand'
|
||||
}
|
||||
|
||||
function sourceText(source: string): string {
|
||||
if (source === 'AUTO') return '自动同步'
|
||||
if (source === 'MANUAL') return '手动'
|
||||
return source || '—'
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadStats()
|
||||
loadPage(1)
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="gating-panel">
|
||||
<div v-if="statsError" class="g-stats-error">
|
||||
<span>统计加载失败:{{ statsError }}</span>
|
||||
<button type="button" @click="loadStats">重试</button>
|
||||
</div>
|
||||
|
||||
<section class="g-cards" v-loading="statsLoading">
|
||||
<div v-for="card in statsCards" :key="card.label" class="g-card" :class="card.tone">
|
||||
<div class="g-n">{{ card.value.toLocaleString() }}</div>
|
||||
<div class="g-t">{{ card.label }}</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="g-forms">
|
||||
<section class="g-panel">
|
||||
<div class="g-panel-head">新增 Gating 品牌</div>
|
||||
<div class="g-panel-body">
|
||||
<div class="g-fields">
|
||||
<label class="g-field">
|
||||
<span>品牌 *</span>
|
||||
<input v-model="form.brand" placeholder="品牌(必填)" @keyup.enter="addOne" />
|
||||
</label>
|
||||
<label class="g-field">
|
||||
<span>国家</span>
|
||||
<select v-model="form.country">
|
||||
<option v-for="country in GATING_COUNTRIES" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="g-field">
|
||||
<span>类型</span>
|
||||
<select v-model="form.gatingType">
|
||||
<option v-for="type in typeOptions" :key="type" :value="type">{{ type }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="g-field">
|
||||
<span>ASIN</span>
|
||||
<input v-model="form.asin" placeholder="ASIN(可选)" @keyup.enter="addOne" />
|
||||
</label>
|
||||
<label class="g-field g-field-wide">
|
||||
<span>备注</span>
|
||||
<input v-model="form.remark" placeholder="备注(可选)" @keyup.enter="addOne" />
|
||||
</label>
|
||||
</div>
|
||||
<div class="g-form-actions">
|
||||
<button class="g-btn g-btn-primary" type="button" :disabled="addBusy" @click="addOne">
|
||||
{{ addBusy ? '新增中…' : '新增' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="g-panel">
|
||||
<div class="g-panel-head">批量导入 Gating 品牌</div>
|
||||
<div class="g-panel-body">
|
||||
<textarea
|
||||
v-model="batchText"
|
||||
class="g-textarea"
|
||||
placeholder="每行一个,格式:品牌,国家,类型,ASIN,备注(后四列可省略) 示例: tory burch,英国,品牌gating jellycat,全部,品牌gating crocs,德国,类目gating"
|
||||
></textarea>
|
||||
<div class="g-form-actions">
|
||||
<button class="g-btn g-btn-violet" type="button" :disabled="importBusy" @click="batchAdd">
|
||||
{{ importBusy ? '导入中…' : '批量导入' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<section class="g-panel">
|
||||
<div class="g-panel-head">Gating 品牌列表</div>
|
||||
<div class="g-panel-body">
|
||||
<div class="g-filters">
|
||||
<input v-model="filter.keyword" placeholder="搜索品牌 / ASIN" @keyup.enter="query" />
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="country in countryOptions" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
<select v-model="filter.gatingType">
|
||||
<option value="">全部类型</option>
|
||||
<option v-for="type in typeOptions" :key="type" :value="type">{{ type }}</option>
|
||||
</select>
|
||||
<select v-model="filter.status">
|
||||
<option value="">全部状态</option>
|
||||
<option value="1">生效</option>
|
||||
<option value="0">已解除</option>
|
||||
</select>
|
||||
<select v-model="filter.source">
|
||||
<option value="">全部来源</option>
|
||||
<option v-for="source in GATING_SOURCES" :key="source" :value="source">{{ sourceText(source) }}</option>
|
||||
</select>
|
||||
<button class="g-btn g-btn-primary" type="button" @click="query">查询</button>
|
||||
<button class="g-btn g-btn-ghost" type="button" @click="resetFilter">重置</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadError" :message="loadError" @retry="loadPage()" />
|
||||
|
||||
<div class="g-table-wrap" v-loading="pageLoading">
|
||||
<table v-if="rows.length" class="g-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 64px">ID</th>
|
||||
<th>品牌</th>
|
||||
<th>ASIN</th>
|
||||
<th style="width: 82px">国家</th>
|
||||
<th style="width: 112px">类型</th>
|
||||
<th style="width: 82px">状态</th>
|
||||
<th style="width: 100px">来源</th>
|
||||
<th>店铺</th>
|
||||
<th>备注</th>
|
||||
<th style="width: 156px">创建时间</th>
|
||||
<th style="width: 118px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="row in rows" :key="row.id">
|
||||
<td class="g-dim">{{ row.id }}</td>
|
||||
<td class="g-strong">{{ row.brand }}</td>
|
||||
<td class="g-mono">{{ row.asin || '—' }}</td>
|
||||
<td>{{ row.country || '—' }}</td>
|
||||
<td><span class="g-tag" :class="typeClass(row.gatingType)">{{ row.gatingType || '—' }}</span></td>
|
||||
<td>
|
||||
<span class="g-tag" :class="row.status === 1 ? 'g-tag-on' : 'g-tag-off'">
|
||||
{{ row.status === 1 ? '生效' : '已解除' }}
|
||||
</span>
|
||||
</td>
|
||||
<td :class="row.source === 'AUTO' ? 'g-source-auto' : 'g-source-manual'">{{ sourceText(row.source) }}</td>
|
||||
<td>{{ row.shopName || '—' }}</td>
|
||||
<td class="g-remark" :title="row.remark">{{ row.remark || '—' }}</td>
|
||||
<td class="g-time">{{ formatDateTime(row.createdAt) }}</td>
|
||||
<td>
|
||||
<div class="g-ops">
|
||||
<button
|
||||
class="g-btn g-btn-sm"
|
||||
:class="row.status === 1 ? 'g-btn-ghost' : 'g-btn-green'"
|
||||
type="button"
|
||||
:disabled="busyRowId === row.id"
|
||||
@click="toggleStatus(row)"
|
||||
>
|
||||
{{ row.status === 1 ? '解除' : '恢复' }}
|
||||
</button>
|
||||
<button
|
||||
class="g-btn g-btn-sm g-btn-danger"
|
||||
type="button"
|
||||
:disabled="busyRowId === row.id"
|
||||
@click="removeRow(row)"
|
||||
>
|
||||
删除
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div v-else-if="!pageLoading && loaded" class="g-empty">暂无数据,请先在上方新增或使用前端排查软件同步</div>
|
||||
</div>
|
||||
|
||||
<OldPagination
|
||||
v-if="total"
|
||||
:total="total"
|
||||
:page="page"
|
||||
:page-size="pageSize"
|
||||
@change="loadPage"
|
||||
@size-change="changePageSize"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.gating-panel {
|
||||
--g-border: #e5e9f0;
|
||||
--g-text: #1c2230;
|
||||
--g-text2: #5a6474;
|
||||
--g-text3: #98a1b1;
|
||||
--g-primary: #2e5be6;
|
||||
--g-danger: #d63a4a;
|
||||
--g-green: #1f9d62;
|
||||
--g-amber: #d9912b;
|
||||
--g-violet: #7c5cd6;
|
||||
--g-surface: #ffffff;
|
||||
--g-mono: "Cascadia Mono", "SF Mono", Consolas, "Courier New", monospace;
|
||||
--g-shadow: 0 1px 2px rgba(20, 30, 60, 0.05), 0 4px 18px rgba(20, 30, 60, 0.06);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 14px;
|
||||
}
|
||||
|
||||
.g-stats-error {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 9px 14px;
|
||||
border-radius: 9px;
|
||||
border: 1px solid #f3c6cc;
|
||||
background: #fdebed;
|
||||
color: var(--g-danger);
|
||||
font-size: 12px;
|
||||
}
|
||||
.g-stats-error button {
|
||||
border: none;
|
||||
background: none;
|
||||
color: var(--g-danger);
|
||||
font-family: inherit;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.g-cards {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(132px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.g-card {
|
||||
background: var(--g-surface);
|
||||
border: 1px solid var(--g-border);
|
||||
border-top: 3px solid #9ca3af;
|
||||
border-radius: 10px;
|
||||
box-shadow: var(--g-shadow);
|
||||
padding: 12px 14px;
|
||||
}
|
||||
.g-card.ok { border-top-color: var(--g-green); }
|
||||
.g-card.muted { border-top-color: #b8c0ce; }
|
||||
.g-card.primary { border-top-color: var(--g-primary); }
|
||||
.g-card.warn { border-top-color: var(--g-amber); }
|
||||
.g-card.danger { border-top-color: var(--g-danger); }
|
||||
.g-card .g-n {
|
||||
font-size: 24px;
|
||||
font-weight: 700;
|
||||
color: var(--g-text);
|
||||
font-variant-numeric: tabular-nums;
|
||||
line-height: 1.2;
|
||||
}
|
||||
.g-card .g-t {
|
||||
margin-top: 3px;
|
||||
font-size: 11.5px;
|
||||
color: var(--g-text3);
|
||||
}
|
||||
|
||||
.g-forms {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(340px, 1fr));
|
||||
gap: 14px;
|
||||
}
|
||||
.g-panel {
|
||||
background: var(--g-surface);
|
||||
border: 1px solid var(--g-border);
|
||||
border-radius: 10px;
|
||||
box-shadow: var(--g-shadow);
|
||||
overflow: hidden;
|
||||
}
|
||||
.g-panel-head {
|
||||
padding: 11px 15px;
|
||||
background: #fafbfd;
|
||||
border-bottom: 1px solid #e9edf3;
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
color: var(--g-text);
|
||||
}
|
||||
.g-panel-head::before {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
border-radius: 2px;
|
||||
background: #2dd4bf;
|
||||
margin-right: 8px;
|
||||
vertical-align: 1px;
|
||||
}
|
||||
.g-panel-body {
|
||||
padding: 14px 15px;
|
||||
}
|
||||
|
||||
.g-fields {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
|
||||
gap: 10px 12px;
|
||||
}
|
||||
.g-field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
min-width: 0;
|
||||
}
|
||||
.g-field > span {
|
||||
font-size: 12px;
|
||||
color: var(--g-text2);
|
||||
}
|
||||
.g-field-wide {
|
||||
grid-column: span 2;
|
||||
}
|
||||
.g-field input,
|
||||
.g-field select,
|
||||
.g-filters input,
|
||||
.g-filters select {
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid #d7dce5;
|
||||
border-radius: 7px;
|
||||
background: #fbfcfe;
|
||||
color: var(--g-text);
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
outline: none;
|
||||
}
|
||||
.g-field input:focus,
|
||||
.g-field select:focus,
|
||||
.g-filters input:focus,
|
||||
.g-filters select:focus {
|
||||
border-color: var(--g-primary);
|
||||
box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
background: #fff;
|
||||
}
|
||||
.g-form-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.g-textarea {
|
||||
width: 100%;
|
||||
height: 126px;
|
||||
padding: 9px 10px;
|
||||
border: 1px solid #d7dce5;
|
||||
border-radius: 7px;
|
||||
background: #fbfcfe;
|
||||
color: var(--g-text);
|
||||
font-family: inherit;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.6;
|
||||
resize: vertical;
|
||||
outline: none;
|
||||
}
|
||||
.g-textarea:focus {
|
||||
border-color: var(--g-primary);
|
||||
box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.g-filters {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.g-filters input {
|
||||
width: 190px;
|
||||
}
|
||||
.g-filters select {
|
||||
width: 132px;
|
||||
}
|
||||
|
||||
.g-btn {
|
||||
height: 34px;
|
||||
padding: 0 15px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 7px;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s, border-color 0.15s, color 0.15s;
|
||||
}
|
||||
.g-btn:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.g-btn-sm {
|
||||
height: 28px;
|
||||
padding: 0 10px;
|
||||
font-size: 12px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
.g-btn-primary {
|
||||
background: var(--g-primary);
|
||||
border-color: var(--g-primary);
|
||||
color: #fff;
|
||||
}
|
||||
.g-btn-primary:hover:not(:disabled) {
|
||||
background: #1e4bd8;
|
||||
border-color: #1e4bd8;
|
||||
}
|
||||
.g-btn-violet {
|
||||
background: var(--g-violet);
|
||||
border-color: var(--g-violet);
|
||||
color: #fff;
|
||||
}
|
||||
.g-btn-violet:hover:not(:disabled) {
|
||||
background: #6b4bc4;
|
||||
border-color: #6b4bc4;
|
||||
}
|
||||
.g-btn-green {
|
||||
background: #e7f7ef;
|
||||
border-color: #bce7d2;
|
||||
color: var(--g-green);
|
||||
}
|
||||
.g-btn-green:hover:not(:disabled) {
|
||||
background: #d9f2e5;
|
||||
}
|
||||
.g-btn-danger {
|
||||
background: #fdebed;
|
||||
border-color: #f3c6cc;
|
||||
color: var(--g-danger);
|
||||
}
|
||||
.g-btn-danger:hover:not(:disabled) {
|
||||
background: #fbdde1;
|
||||
}
|
||||
.g-btn-ghost {
|
||||
background: #fff;
|
||||
border-color: #d7dce5;
|
||||
color: var(--g-text2);
|
||||
}
|
||||
.g-btn-ghost:hover:not(:disabled) {
|
||||
border-color: var(--g-primary);
|
||||
color: var(--g-primary);
|
||||
}
|
||||
|
||||
.g-table-wrap {
|
||||
overflow-x: auto;
|
||||
border: 1px solid var(--g-border);
|
||||
border-radius: 9px;
|
||||
min-height: 90px;
|
||||
}
|
||||
.g-table {
|
||||
width: 100%;
|
||||
border-collapse: separate;
|
||||
border-spacing: 0;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.g-table th {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
padding: 10px;
|
||||
background: #f7f9fc;
|
||||
border-bottom: 1px solid var(--g-border);
|
||||
color: var(--g-text2);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.g-table td {
|
||||
padding: 9px 10px;
|
||||
border-bottom: 1px solid #eff2f7;
|
||||
color: var(--g-text);
|
||||
white-space: nowrap;
|
||||
}
|
||||
.g-table tbody tr:hover td {
|
||||
background: #f7faff;
|
||||
}
|
||||
.g-table tbody tr:last-child td {
|
||||
border-bottom: none;
|
||||
}
|
||||
.g-strong {
|
||||
font-weight: 600;
|
||||
}
|
||||
.g-dim {
|
||||
color: var(--g-text3);
|
||||
}
|
||||
.g-mono {
|
||||
font-family: var(--g-mono);
|
||||
}
|
||||
.g-time {
|
||||
color: var(--g-text2);
|
||||
font-size: 11.5px;
|
||||
}
|
||||
.g-remark {
|
||||
max-width: 190px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
color: var(--g-text2);
|
||||
}
|
||||
.g-source-auto {
|
||||
color: var(--g-violet);
|
||||
}
|
||||
.g-source-manual {
|
||||
color: #0d9488;
|
||||
}
|
||||
|
||||
.g-tag {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 6px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.g-tag-brand {
|
||||
background: #eff6ff;
|
||||
color: #2563eb;
|
||||
}
|
||||
.g-tag-cat {
|
||||
background: #fef3c7;
|
||||
color: #b45309;
|
||||
}
|
||||
.g-tag-acc {
|
||||
background: #fee2e2;
|
||||
color: #dc2626;
|
||||
}
|
||||
.g-tag-on {
|
||||
background: #d1fae5;
|
||||
color: #10b981;
|
||||
}
|
||||
.g-tag-off {
|
||||
background: #e5e7eb;
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
.g-ops {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.g-empty {
|
||||
padding: 42px 16px;
|
||||
text-align: center;
|
||||
color: var(--g-text3);
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
@@ -9,7 +9,16 @@ import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import type { DuplicateItem, DuplicateOccurrence, DuplicateMetrics, DuplicateShop } from './duplicate-model.ts'
|
||||
import { fetchDuplicateConsole, fetchDuplicateLedger, requestDuplicateExportBlob, type LedgerSortKey } from './duplicate-console-api.ts'
|
||||
import { aggregateDrawerRows, drawerSummaryOf, dupWithinGroup, indexShopGroups, type DrawerAggRow, type DrawerSummary, type ShopGroups } from './duplicate-console-logic.ts'
|
||||
import {
|
||||
aggregateDrawerRows,
|
||||
drawerSummaryOf,
|
||||
indexShopGroups,
|
||||
itemBrandOf,
|
||||
type DrawerAggRow,
|
||||
type DrawerSummary,
|
||||
type ShopGroups,
|
||||
} from './duplicate-console-logic.ts'
|
||||
import { useDuplicateMatrix } from './duplicate-matrix-window.ts'
|
||||
import type { DuplicateConsole, LedgerRow } from './duplicate-console-model.ts'
|
||||
import { ASIN_COUNTRY_CODES, asinCountryLabel } from '../asin/asin-country.ts'
|
||||
import { orderedPair } from '@/utils/datetime'
|
||||
@@ -73,7 +82,8 @@ function toast(msg: string) {
|
||||
const overview = computed(() => consoleData.value?.overview ?? null)
|
||||
const summary = computed<DuplicateMetrics | null>(() => overview.value?.summary ?? null)
|
||||
const shops = computed(() => overview.value?.shops ?? [])
|
||||
const dupItems = computed(() => consoleData.value?.dup ?? [])
|
||||
/** 当前撞款行窗口:服务端按 page/page_size(+dup_group) 切好的一窗(B60),页面不再自切全集。 */
|
||||
const dupItems = computed<DuplicateItem[]>(() => consoleData.value?.dup ?? [])
|
||||
const groupStats = computed(() => consoleData.value?.groups ?? [])
|
||||
|
||||
const countryOptions = computed<string[]>(() => {
|
||||
@@ -118,26 +128,32 @@ function selectedGroupMembers(): string[] {
|
||||
|
||||
const groupChips = computed(() => groupStats.value.filter((group) => group.shopCount >= 2))
|
||||
|
||||
/** 当前撞款行集:全局=撞款全集;分组=组内成员撞款子集;均按 ASIN 升序(reference 台账顺序)。 */
|
||||
const dupRows = computed<DuplicateItem[]>(() => {
|
||||
const rows = scope.value === 'global' ? dupItems.value : dupWithinGroup(dupItems.value, selectedGroupMembers())
|
||||
return [...rows].sort((a, b) => a.asin.localeCompare(b.asin))
|
||||
})
|
||||
|
||||
/** 矩阵列:分组范围=该组成员店;全店=全部可见店铺(按上架量降序)。 */
|
||||
const matrixShops = computed<string[]>(() => {
|
||||
if (scope.value === 'group') return selectedGroupMembers()
|
||||
return orderedShops.value.map((shop) => shop.shopName)
|
||||
})
|
||||
|
||||
const activeGroupStat = computed(() => groupStats.value.find((group) => group.name === selectedGroup.value) || null)
|
||||
/** 撞款 Tab 计数:全店范围取后端权威 total_dup(防后端截断计数偏小);分组范围取组内子集长度。 */
|
||||
const totalDupCount = computed(() => (scope.value === 'global' ? (consoleData.value?.totalDup ?? dupRows.value.length) : dupRows.value.length))
|
||||
/** 撞款行总数:服务端在本页 + 本范围(全局或所选分组)内未分页的计数,翻页控件与 KPI 共用。 */
|
||||
const totalDupCount = computed(() => consoleData.value?.totalDup ?? 0)
|
||||
|
||||
function itemBrand(item: DuplicateItem): string {
|
||||
for (const occ of item.occurrences || []) if (occ.brand) return occ.brand
|
||||
return ''
|
||||
}
|
||||
/** 撞款矩阵的行窗 + 列窗 + 格子视图(B60):状态与算法在 `duplicate-matrix-window.ts`,翻页动作交回这里。 */
|
||||
const {
|
||||
matrixPage,
|
||||
matrixPageSize,
|
||||
columnPage,
|
||||
columnWindowTotal,
|
||||
matrixAllColumns,
|
||||
matrixShops,
|
||||
matrixView,
|
||||
matrixHint,
|
||||
goMatrixPage,
|
||||
changeMatrixSize,
|
||||
goColumnPage,
|
||||
resetMatrixWindows,
|
||||
} = useDuplicateMatrix({
|
||||
rows: dupItems,
|
||||
groupMembers: computed(() => selectedGroupMembers()),
|
||||
groupScoped: computed(() => scope.value === 'group'),
|
||||
selectedGroup,
|
||||
reload: () => void loadConsole(),
|
||||
dataVersion: consoleData,
|
||||
})
|
||||
|
||||
|
||||
// ---- 撞款视图分页(分布/矩阵/撞款详情/抽屉明细;10/20/50/100 可选) ----
|
||||
@@ -147,16 +163,7 @@ const distPageSize = ref(10)
|
||||
const pagedDistBars = computed(() =>
|
||||
storeDistribution.value.list.slice((distPage.value - 1) * distPageSize.value, distPage.value * distPageSize.value),
|
||||
)
|
||||
const matrixPage = ref(1)
|
||||
const matrixPageSize = ref(10)
|
||||
const matrixRows = computed(() =>
|
||||
dupRows.value.slice((matrixPage.value - 1) * matrixPageSize.value, matrixPage.value * matrixPageSize.value),
|
||||
)
|
||||
const dupCardPage = ref(1)
|
||||
const dupCardPageSize = ref(10)
|
||||
const dupCardRows = computed(() =>
|
||||
dupRows.value.slice((dupCardPage.value - 1) * dupCardPageSize.value, dupCardPage.value * dupCardPageSize.value),
|
||||
)
|
||||
|
||||
const drawerPage = ref(1)
|
||||
const drawerPageSize = ref(10)
|
||||
const drawerRows = computed(() =>
|
||||
@@ -168,46 +175,15 @@ const groupStatsPageSize = ref(10)
|
||||
const pagedGroupStats = computed(() =>
|
||||
groupStats.value.slice((groupStatsPage.value - 1) * groupStatsPageSize.value, groupStatsPage.value * groupStatsPageSize.value),
|
||||
)
|
||||
watch([dupRows, drawerOccurrences, groupStats], () => {
|
||||
matrixPage.value = Math.min(matrixPage.value, Math.max(1, Math.ceil(dupRows.value.length / matrixPageSize.value)))
|
||||
dupCardPage.value = Math.min(dupCardPage.value, Math.max(1, Math.ceil(dupRows.value.length / dupCardPageSize.value)))
|
||||
watch([drawerOccurrences, groupStats], () => {
|
||||
drawerPage.value = 1
|
||||
groupStatsPage.value = Math.min(groupStatsPage.value, Math.max(1, Math.ceil(groupStats.value.length / groupStatsPageSize.value)))
|
||||
})
|
||||
|
||||
const matrixHint = computed(() =>
|
||||
scope.value === 'global'
|
||||
? '行 = 全店撞款ASIN,列 = 全部店铺;有数字表示该店在售此 ASIN,点击行可看上架时间明细'
|
||||
: selectedGroup.value
|
||||
? `行 = 分组「${selectedGroup.value}」内的撞款ASIN,列 = 该分组店铺;有数字表示组内该店在售此 ASIN`
|
||||
: '行 = 分组内撞款ASIN,列 = 该分组店铺;有数字表示组内该店在售此 ASIN',
|
||||
)
|
||||
|
||||
/* ----- 矩阵单元格辅助 ----- */
|
||||
function shopKey(name: string): string {
|
||||
return (name || '').trim().toLowerCase()
|
||||
}
|
||||
function cellOccurrences(item: DuplicateItem, shop: string): DuplicateOccurrence[] {
|
||||
const key = shopKey(shop)
|
||||
return (item.occurrences || []).filter((occ) => shopKey(occ.shopName) === key)
|
||||
}
|
||||
function cellCount(item: DuplicateItem, shop: string): number {
|
||||
return cellOccurrences(item, shop).length
|
||||
}
|
||||
function cellCountryDots(item: DuplicateItem, shop: string): string[] {
|
||||
const codes = new Set<string>()
|
||||
for (const occ of cellOccurrences(item, shop)) if (occ.country) codes.add(occ.country.toUpperCase())
|
||||
return [...codes]
|
||||
}
|
||||
function cellCountryCount(item: DuplicateItem, shop: string, code: string): number {
|
||||
return cellOccurrences(item, shop).filter((occ) => (occ.country || '').toUpperCase() === code).length
|
||||
}
|
||||
function cellTitle(item: DuplicateItem, shop: string): string {
|
||||
const count = cellCount(item, shop)
|
||||
if (!count) return `${shop} 无此 ASIN`
|
||||
const sites = cellCountryDots(item, shop).map((code) => `${asinCountryLabel(code)} ${cellCountryCount(item, shop, code)}条`).join('、')
|
||||
return `${shop} 在售 ${count} 条 · ${sites}`
|
||||
}
|
||||
|
||||
function activeFilterParams() {
|
||||
return { asin: filter.asin.trim(), shopName: filter.shop.trim(), group: filter.group.trim(), country: filter.country, site: '', dateFrom: filter.dateFrom, dateTo: filter.dateTo }
|
||||
@@ -217,7 +193,13 @@ async function loadConsole() {
|
||||
loading.value = true
|
||||
loadError.value = ''
|
||||
try {
|
||||
consoleData.value = await fetchDuplicateConsole({ view: '', ...activeFilterParams() }, companyTab.requestCompanyId)
|
||||
consoleData.value = await fetchDuplicateConsole(
|
||||
{ view: '', ...activeFilterParams() },
|
||||
companyTab.requestCompanyId,
|
||||
matrixPage.value,
|
||||
matrixPageSize.value,
|
||||
scope.value === 'group' ? selectedGroup.value : '',
|
||||
)
|
||||
shopGroups.value = indexShopGroups(orderedShops.value)
|
||||
if (groupStats.value.length && !groupStats.value.some((group) => group.name === selectedGroup.value)) {
|
||||
selectedGroup.value = groupChips.value[0] ? groupChips.value[0].name : ''
|
||||
@@ -270,6 +252,7 @@ function resetQuery() {
|
||||
scope.value = 'global'
|
||||
selectedGroup.value = ''
|
||||
activeTab.value = 'dup'
|
||||
resetMatrixWindows()
|
||||
applyQuery()
|
||||
toast('筛选已重置')
|
||||
}
|
||||
@@ -280,8 +263,21 @@ function switchTab(tab: Tab) {
|
||||
}
|
||||
|
||||
function switchScope(next: Scope) {
|
||||
if (scope.value === next) return
|
||||
scope.value = next
|
||||
if (next === 'group' && !selectedGroup.value && groupChips.value.length) selectedGroup.value = groupChips.value[0].name
|
||||
// 行范围换了(全局 ↔ 组内),服务端裁出来的那一窗也就换了 ⇒ 重新请一窗。
|
||||
resetMatrixWindows()
|
||||
void loadConsole()
|
||||
}
|
||||
|
||||
/** 分组 chip:选中即换行范围,与 switchScope 同一条出口(不再在客户端重裁一遍全集)。 */
|
||||
function selectGroup(name: string) {
|
||||
if (selectedGroup.value === name && scope.value === 'group') return
|
||||
scope.value = 'group'
|
||||
selectedGroup.value = name
|
||||
resetMatrixWindows()
|
||||
void loadConsole()
|
||||
}
|
||||
|
||||
async function reAnalyze() {
|
||||
@@ -338,7 +334,7 @@ function openDrawer(asin: string, brand: string, dupFlag: boolean, occurrences:
|
||||
}
|
||||
|
||||
function openDupDrawer(item: DuplicateItem) {
|
||||
openDrawer(item.asin, itemBrand(item), item.shopCount >= 2, item.occurrences)
|
||||
openDrawer(item.asin, itemBrandOf(item), item.shopCount >= 2, item.occurrences)
|
||||
}
|
||||
|
||||
function openLedgerDrawer(row: LedgerRow) {
|
||||
@@ -441,7 +437,7 @@ onMounted(() => {
|
||||
<button class="btn btn-ghost btn-sm" type="button" @click="loadError = ''">知道了</button>
|
||||
</div>
|
||||
|
||||
<!-- 筛选条件 -->
|
||||
<!-- 筛选条件(撞款/台账专用) -->
|
||||
<section class="card filter">
|
||||
<div class="filter-title">筛选条件</div>
|
||||
<div class="filter-row">
|
||||
@@ -493,9 +489,8 @@ onMounted(() => {
|
||||
</section>
|
||||
|
||||
<div v-loading="loading" class="dup-body-wrap">
|
||||
<template v-if="consoleData">
|
||||
<!-- KPI 统计 -->
|
||||
<section class="kpis">
|
||||
<section v-if="consoleData" class="kpis">
|
||||
<div v-for="kpi in kpis" :key="kpi.label" class="kpi" :class="kpi.tone">
|
||||
<div class="k-label"><span class="k-dot"></span>{{ kpi.label }}</div>
|
||||
<div class="k-value">{{ kpi.value }}</div>
|
||||
@@ -504,7 +499,7 @@ onMounted(() => {
|
||||
</section>
|
||||
|
||||
<!-- 店铺上架分布 -->
|
||||
<section class="card store-strip">
|
||||
<section v-if="consoleData" class="card store-strip">
|
||||
<div class="strip-head">
|
||||
<span class="strip-title">店铺上架分布</span>
|
||||
<span class="strip-note">各店铺在本批站点中的上架记录量(含重复扫描)</span>
|
||||
@@ -546,7 +541,7 @@ onMounted(() => {
|
||||
</div>
|
||||
|
||||
<!-- ============ 撞款监控 ============ -->
|
||||
<template v-if="activeTab === 'dup'">
|
||||
<template v-if="consoleData && activeTab === 'dup'">
|
||||
<div v-if="isSuper" class="scope-bar">
|
||||
<div class="seg">
|
||||
<button class="seg-btn" :class="{ active: scope === 'global' }" type="button" @click="switchScope('global')">全店撞款</button>
|
||||
@@ -554,7 +549,7 @@ onMounted(() => {
|
||||
</div>
|
||||
<div v-if="scope === 'group'" class="group-chips">
|
||||
<template v-if="groupChips.length">
|
||||
<button v-for="group in groupChips" :key="group.name" type="button" class="g-chip" :class="{ active: selectedGroup === group.name, dup: group.dupCount > 0 }" @click="selectedGroup = group.name">
|
||||
<button v-for="group in groupChips" :key="group.name" type="button" class="g-chip" :class="{ active: selectedGroup === group.name, dup: group.dupCount > 0 }" @click="selectGroup(group.name)">
|
||||
{{ group.name }} <span class="g-count">{{ group.shopCount }}店 · {{ group.dupCount }}撞款</span>
|
||||
</button>
|
||||
</template>
|
||||
@@ -569,9 +564,16 @@ onMounted(() => {
|
||||
<div class="gs-item" :class="{ warn: activeGroupStat.dupCount > 0 }"><div class="gs-v">{{ activeGroupStat.dupCount }}</div><div class="gs-l">组内撞款ASIN</div></div>
|
||||
</div>
|
||||
|
||||
<div class="section-title">撞款覆盖矩阵 <span class="hint">{{ matrixHint }}</span></div>
|
||||
<div class="section-title">
|
||||
撞款覆盖矩阵 <span class="hint">{{ matrixHint }}</span>
|
||||
<span v-if="columnWindowTotal > 1" class="col-window">
|
||||
<button type="button" class="link-btn" :disabled="columnPage <= 1" @click="goColumnPage(-1)">‹ 上一窗列</button>
|
||||
列 {{ columnPage }}/{{ columnWindowTotal }}(共 {{ matrixAllColumns.length }} 列)
|
||||
<button type="button" class="link-btn" :disabled="columnPage >= columnWindowTotal" @click="goColumnPage(1)">下一窗列 ›</button>
|
||||
</span>
|
||||
</div>
|
||||
<div class="matrix-wrap">
|
||||
<table v-if="dupRows.length" class="matrix">
|
||||
<table v-if="dupItems.length" class="matrix">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ASIN</th>
|
||||
@@ -580,13 +582,13 @@ onMounted(() => {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="item in matrixRows" :key="item.asin" @click="openDupDrawer(item)">
|
||||
<td><span class="asin-code">{{ item.asin }}</span></td>
|
||||
<td><span class="m-brand">{{ itemBrand(item) || '—' }}</span></td>
|
||||
<td v-for="shop in matrixShops" :key="shop" style="text-align:center">
|
||||
<div class="m-cell" :class="{ empty: cellCount(item, shop) === 0 }" :title="cellTitle(item, shop)">
|
||||
{{ cellCount(item, shop) || '' }}
|
||||
<span class="dots"><span v-for="code in cellCountryDots(item, shop)" :key="code" class="m-dot" :style="{ background: siteColor(code) }"></span></span>
|
||||
<tr v-for="row in matrixView" :key="row.asin" @click="openDupDrawer(row.item)">
|
||||
<td><span class="asin-code">{{ row.asin }}</span></td>
|
||||
<td><span class="m-brand">{{ row.brand }}</span></td>
|
||||
<td v-for="(cell, index) in row.cells" :key="matrixShops[index]" style="text-align:center">
|
||||
<div class="m-cell" :class="{ empty: cell.count === 0 }" :title="cell.title">
|
||||
{{ cell.count || '' }}
|
||||
<span class="dots"><span v-for="code in cell.dots" :key="code" class="m-dot" :style="{ background: siteColor(code) }"></span></span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -597,15 +599,15 @@ onMounted(() => {
|
||||
调整筛选条件或切换到其他分组查看
|
||||
</div>
|
||||
</div>
|
||||
<OldPagination :total="dupRows.length" :page="matrixPage" :page-size="matrixPageSize" @change="matrixPage = $event" @size-change="(s: number) => { matrixPageSize = s; matrixPage = 1 }" />
|
||||
<OldPagination :total="totalDupCount" :page="matrixPage" :page-size="matrixPageSize" @change="goMatrixPage" @size-change="changeMatrixSize" />
|
||||
|
||||
<div class="section-title" style="margin-top:24px">撞款详情 <span class="hint">同一 ASIN 在多家店铺的上架时间明细</span></div>
|
||||
<div v-if="dupRows.length" class="dup-grid">
|
||||
<div v-for="item in dupCardRows" :key="item.asin" class="dup-card">
|
||||
<div v-if="dupItems.length" class="dup-grid">
|
||||
<div v-for="item in dupItems" :key="item.asin" class="dup-card">
|
||||
<div class="dup-head">
|
||||
<span class="asin-code">{{ item.asin }}</span>
|
||||
<span class="badge dup">{{ item.shopCount }}店在售</span>
|
||||
<span class="d-brand">{{ itemBrand(item) || '未知品牌' }}</span>
|
||||
<span class="d-brand">{{ itemBrandOf(item) || '未知品牌' }}</span>
|
||||
<button class="link-btn" type="button" @click="openDupDrawer(item)">查看明细</button>
|
||||
</div>
|
||||
<div class="dup-body">
|
||||
@@ -621,12 +623,12 @@ onMounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="dup-empty">当前范围下没有撞款ASIN</div>
|
||||
<OldPagination :total="dupRows.length" :page="dupCardPage" :page-size="dupCardPageSize" @change="dupCardPage = $event" @size-change="(s: number) => { dupCardPageSize = s; dupCardPage = 1 }" />
|
||||
<div class="dup-total">共 <b>{{ dupRows.length }}</b> 条{{ scope === 'group' && selectedGroup ? `分组「${selectedGroup}」组内撞款ASIN` : '全店撞款ASIN' }}</div>
|
||||
<OldPagination :total="totalDupCount" :page="matrixPage" :page-size="matrixPageSize" @change="goMatrixPage" @size-change="changeMatrixSize" />
|
||||
<div class="dup-total">共 <b>{{ dupItems.length }}</b> 条{{ scope === 'group' && selectedGroup ? `分组「${selectedGroup}」组内撞款ASIN` : '全店撞款ASIN' }}</div>
|
||||
</template>
|
||||
|
||||
<!-- ============ 全部ASIN台账 ============ -->
|
||||
<template v-else>
|
||||
<template v-else-if="consoleData">
|
||||
<div class="table-wrap" v-loading="ledgerLoading">
|
||||
<table v-if="ledgerItems.length" class="ledger">
|
||||
<thead>
|
||||
@@ -661,9 +663,8 @@ onMounted(() => {
|
||||
</div>
|
||||
<OldPagination v-if="ledgerTotal" :total="ledgerTotal" :page="ledgerPage" :page-size="ledgerPageSize" @change="goPage" @size-change="changeLedgerSize" />
|
||||
</template>
|
||||
</template>
|
||||
|
||||
<div v-else-if="!loadError" class="card empty-state">
|
||||
<div v-if="!consoleData && !loadError" class="card empty-state">
|
||||
<div class="e-title">暂无扫描结果</div>
|
||||
请点击右上角「重新分析」触发撞款扫描
|
||||
</div>
|
||||
@@ -887,6 +888,9 @@ onMounted(() => {
|
||||
.dup-ref .section-title { font-size: 14px; font-weight: 700; display: flex; align-items: baseline; gap: 8px; margin-bottom: 12px; }
|
||||
.dup-ref .section-title .hint { font-size: 11px; font-weight: 400; color: var(--text3); }
|
||||
.dup-ref .matrix-wrap { overflow-x: auto; overflow-y: auto; border-radius: var(--radius); background: var(--surface); border: 1px solid var(--border); max-height: 480px; }
|
||||
/* 列窗口控件:与 section-title 同行,只在看得到第二窗列时出现。 */
|
||||
.dup-ref .col-window { margin-left: 12px; display: inline-flex; align-items: center; gap: 8px; font-size: 12px; color: var(--text2); }
|
||||
.dup-ref .col-window .link-btn:disabled { color: var(--text3); cursor: not-allowed; }
|
||||
.dup-ref table.matrix { border-collapse: separate; border-spacing: 0; width: 100%; background: var(--surface); }
|
||||
.dup-ref table.matrix th {
|
||||
background: #F7F9FC; color: var(--text2); font-size: 12px; font-weight: 600; padding: 10px 12px;
|
||||
|
||||
@@ -0,0 +1,545 @@
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 关键词使用记录(独立菜单 admin_keyword_usage):只读展示 keyword_usage / keyword_add_log /
|
||||
* keyword_delete_log,按公司 tab 取数。口径对齐独立小网页后台 v1.2.6g。
|
||||
*/
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { actionableErrorText } from '@/components/admin-feedback'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import { createLatestRequestGate } from '@/utils/latest-request'
|
||||
import {
|
||||
KEYWORD_USAGE_PAGE_SIZE,
|
||||
KEYWORD_USAGE_SCENES,
|
||||
createKeywordUsageFilter,
|
||||
keywordUsageCountsText,
|
||||
keywordUsageSceneLabel,
|
||||
type KeywordUsageCounts,
|
||||
type KeywordUsageFilter,
|
||||
type KeywordUsageOverview,
|
||||
type KeywordUsageRow,
|
||||
} from './keyword-usage-model.ts'
|
||||
import {
|
||||
fetchKeywordUsage,
|
||||
fetchKeywordUsageDeletes,
|
||||
fetchKeywordUsageOverview,
|
||||
} from './keyword-usage-api.ts'
|
||||
|
||||
const companyTab = useCompanyTabStore()
|
||||
const session = useAdminSessionStore()
|
||||
const me = computed(() => session.user?.username || '')
|
||||
|
||||
const filter = reactive<KeywordUsageFilter>(createKeywordUsageFilter())
|
||||
const activeTab = ref<'usage' | 'deletes'>('usage')
|
||||
const loadError = ref('')
|
||||
|
||||
const overview = ref<KeywordUsageOverview | null>(null)
|
||||
const overviewLoading = ref(false)
|
||||
|
||||
const usageRows = ref<KeywordUsageRow[]>([])
|
||||
const usageTotal = ref(0)
|
||||
const usagePage = ref(1)
|
||||
const usagePageSize = ref(KEYWORD_USAGE_PAGE_SIZE)
|
||||
const usageCounts = ref<KeywordUsageCounts>({ copy: 0, copyExisting: 0, copyDeleted: 0, add: 0 })
|
||||
const usageLoading = ref(false)
|
||||
|
||||
const deleteRows = ref<KeywordUsageRow[]>([])
|
||||
const deleteTotal = ref(0)
|
||||
const deletePage = ref(1)
|
||||
const deletePageSize = ref(KEYWORD_USAGE_PAGE_SIZE)
|
||||
const deleteLoading = ref(false)
|
||||
|
||||
// 切公司/快速改筛选时,先发的请求可能后返回;每个加载口径各一个序号闸(CR-27)
|
||||
const overviewGate = createLatestRequestGate()
|
||||
const usageGate = createLatestRequestGate()
|
||||
const deleteGate = createLatestRequestGate()
|
||||
|
||||
const statsCards = computed(() => {
|
||||
const stats = overview.value?.stats
|
||||
return [
|
||||
{ label: '复制关键词', value: stats?.used ?? 0, tone: 'primary' },
|
||||
{ label: '现存词', value: stats?.exist ?? 0, tone: 'ok' },
|
||||
{ label: '已删除词留痕', value: stats?.deletedKw ?? 0, tone: 'danger' },
|
||||
{ label: '添加关键词', value: stats?.added ?? 0, tone: 'info' },
|
||||
{ label: '使用记录合计', value: stats?.totalUse ?? 0, tone: '' },
|
||||
{ label: '删除记录', value: stats?.deletes ?? 0, tone: 'violet' },
|
||||
]
|
||||
})
|
||||
const userOptions = computed(() => overview.value?.users ?? [])
|
||||
const countryOptions = computed(() => overview.value?.countries ?? [])
|
||||
const usageSummary = computed(() => keywordUsageCountsText(usageCounts.value, usageTotal.value))
|
||||
|
||||
function queryParams() {
|
||||
return {
|
||||
companyId: companyTab.requestCompanyId,
|
||||
user: filter.user,
|
||||
country: filter.country,
|
||||
keyword: filter.keyword.trim(),
|
||||
scene: filter.scene,
|
||||
}
|
||||
}
|
||||
|
||||
async function loadOverview(): Promise<void> {
|
||||
const token = overviewGate.begin()
|
||||
overviewLoading.value = true
|
||||
try {
|
||||
const result = await fetchKeywordUsageOverview({ companyId: companyTab.requestCompanyId })
|
||||
if (!overviewGate.isCurrent(token)) return
|
||||
overview.value = result
|
||||
} catch (error) {
|
||||
if (!overviewGate.isCurrent(token)) return
|
||||
loadError.value = actionableErrorText(error)
|
||||
} finally {
|
||||
if (overviewGate.isCurrent(token)) overviewLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadUsage(page = usagePage.value): Promise<void> {
|
||||
const token = usageGate.begin()
|
||||
usageLoading.value = true
|
||||
try {
|
||||
const result = await fetchKeywordUsage({ ...queryParams(), page, pageSize: usagePageSize.value })
|
||||
if (!usageGate.isCurrent(token)) return
|
||||
usageRows.value = result.rows
|
||||
usageTotal.value = result.total
|
||||
usageCounts.value = result.counts
|
||||
usagePage.value = page
|
||||
} catch (error) {
|
||||
if (!usageGate.isCurrent(token)) return
|
||||
loadError.value = actionableErrorText(error)
|
||||
} finally {
|
||||
if (usageGate.isCurrent(token)) usageLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadDeletes(page = deletePage.value): Promise<void> {
|
||||
const token = deleteGate.begin()
|
||||
deleteLoading.value = true
|
||||
try {
|
||||
const result = await fetchKeywordUsageDeletes({ ...queryParams(), page, pageSize: deletePageSize.value })
|
||||
if (!deleteGate.isCurrent(token)) return
|
||||
deleteRows.value = result.rows
|
||||
deleteTotal.value = result.total
|
||||
deletePage.value = page
|
||||
} catch (error) {
|
||||
if (!deleteGate.isCurrent(token)) return
|
||||
loadError.value = actionableErrorText(error)
|
||||
} finally {
|
||||
if (deleteGate.isCurrent(token)) deleteLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function reload(): Promise<void> {
|
||||
loadError.value = ''
|
||||
await Promise.all([loadOverview(), loadUsage(1), loadDeletes(1)])
|
||||
}
|
||||
|
||||
function query(): void {
|
||||
loadError.value = ''
|
||||
void Promise.all([loadUsage(1), loadDeletes(1)])
|
||||
}
|
||||
|
||||
function reset(): void {
|
||||
Object.assign(filter, createKeywordUsageFilter())
|
||||
query()
|
||||
}
|
||||
|
||||
function changeUsagePageSize(size: number): void {
|
||||
usagePageSize.value = size
|
||||
void loadUsage(1)
|
||||
}
|
||||
|
||||
function changeDeletePageSize(size: number): void {
|
||||
deletePageSize.value = size
|
||||
void loadDeletes(1)
|
||||
}
|
||||
|
||||
watch(() => companyTab.activeId, () => {
|
||||
filter.user = ''
|
||||
filter.country = ''
|
||||
usagePage.value = 1
|
||||
deletePage.value = 1
|
||||
void reload()
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
void reload()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="kw-page">
|
||||
<LoadFailureBar v-if="loadError" :message="loadError" @retry="reload" />
|
||||
|
||||
<section class="kw-cards" v-loading="overviewLoading">
|
||||
<div v-for="card in statsCards" :key="card.label" class="kw-card" :class="card.tone">
|
||||
<div class="kw-n">{{ card.value.toLocaleString() }}</div>
|
||||
<div class="kw-t">{{ card.label }}</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="kw-panel">
|
||||
<div class="kw-panel-head">筛选条件</div>
|
||||
<div class="kw-panel-body">
|
||||
<div class="kw-filters">
|
||||
<label class="kw-field">
|
||||
<span>使用者</span>
|
||||
<select v-model="filter.user">
|
||||
<option value="">全部使用者</option>
|
||||
<option v-for="user in userOptions" :key="user" :value="user">{{ user }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="kw-field">
|
||||
<span>国家</span>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="country in countryOptions" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="kw-field kw-field-wide">
|
||||
<span>关键词</span>
|
||||
<input v-model="filter.keyword" placeholder="搜索关键词" @keyup.enter="query" />
|
||||
</label>
|
||||
<label class="kw-field">
|
||||
<span>场景</span>
|
||||
<select v-model="filter.scene">
|
||||
<option value="">全部场景</option>
|
||||
<option v-for="scene in KEYWORD_USAGE_SCENES" :key="scene" :value="scene">{{ scene }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<div class="kw-actions">
|
||||
<button class="kw-btn kw-btn-primary" type="button" @click="query">查询</button>
|
||||
<button class="kw-btn kw-btn-ghost" type="button" @click="reset">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="kw-tabs">
|
||||
<button class="kw-tab" :class="{ active: activeTab === 'usage' }" type="button" @click="activeTab = 'usage'">使用记录</button>
|
||||
<button class="kw-tab" :class="{ active: activeTab === 'deletes' }" type="button" @click="activeTab = 'deletes'">删除记录</button>
|
||||
</div>
|
||||
|
||||
<section v-show="activeTab === 'usage'" class="kw-panel">
|
||||
<div class="kw-panel-head">
|
||||
使用记录
|
||||
<span class="kw-sub">复制关键词 + 添加关键词,按时间倒序;绿色为本人的记录</span>
|
||||
</div>
|
||||
<div class="kw-panel-body">
|
||||
<div class="kw-table-wrap" v-loading="usageLoading">
|
||||
<table v-if="usageRows.length" class="kw-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 130px">使用者</th>
|
||||
<th style="width: 90px">国家</th>
|
||||
<th>关键词</th>
|
||||
<th style="width: 140px">使用场景</th>
|
||||
<th style="width: 170px">使用时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(row, index) in usageRows" :key="`usage-${row.time}-${index}`" :class="{ mine: row.userName === me }">
|
||||
<td class="kw-user">{{ row.userName || '—' }}</td>
|
||||
<td>{{ row.country || '—' }}</td>
|
||||
<td class="kw-keyword">{{ row.keyword || '—' }}</td>
|
||||
<td>
|
||||
<span class="kw-tag" :class="row.scene === '添加关键词' ? 'add' : 'copy'">
|
||||
{{ keywordUsageSceneLabel(row.scene) }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="kw-time">{{ formatDateTime(row.time) }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div v-else-if="!usageLoading" class="kw-empty">暂无使用记录</div>
|
||||
</div>
|
||||
<div class="kw-footer">
|
||||
<span class="kw-summary">{{ usageSummary }}</span>
|
||||
<OldPagination
|
||||
v-if="usageTotal"
|
||||
:total="usageTotal"
|
||||
:page="usagePage"
|
||||
:page-size="usagePageSize"
|
||||
@change="loadUsage"
|
||||
@size-change="changeUsagePageSize"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section v-show="activeTab === 'deletes'" class="kw-panel">
|
||||
<div class="kw-panel-head">
|
||||
删除记录
|
||||
<span class="kw-sub">只读、不可删除、永久留痕可追溯;红色为本人的记录</span>
|
||||
</div>
|
||||
<div class="kw-panel-body">
|
||||
<div class="kw-table-wrap" v-loading="deleteLoading">
|
||||
<table v-if="deleteRows.length" class="kw-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 130px">删除者</th>
|
||||
<th style="width: 90px">国家</th>
|
||||
<th>关键词</th>
|
||||
<th style="width: 170px">删除时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(row, index) in deleteRows" :key="`delete-${row.time}-${index}`" :class="{ mine: row.userName === me }">
|
||||
<td class="kw-user">{{ row.userName || '—' }}</td>
|
||||
<td>{{ row.country || '—' }}</td>
|
||||
<td class="kw-keyword">{{ row.keyword || '—' }}</td>
|
||||
<td class="kw-time">{{ formatDateTime(row.time) }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div v-else-if="!deleteLoading" class="kw-empty">暂无删除记录</div>
|
||||
</div>
|
||||
<div class="kw-footer">
|
||||
<span class="kw-summary">共 {{ deleteTotal }} 条删除记录 · 只读留痕</span>
|
||||
<OldPagination
|
||||
v-if="deleteTotal"
|
||||
:total="deleteTotal"
|
||||
:page="deletePage"
|
||||
:page-size="deletePageSize"
|
||||
@change="loadDeletes"
|
||||
@size-change="changeDeletePageSize"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.kw-page {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 14px;
|
||||
}
|
||||
|
||||
.kw-cards {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.kw-card {
|
||||
background: #fff;
|
||||
border: 1px solid #e5e9f0;
|
||||
border-top: 3px solid #9ca3af;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 1px 2px rgba(20, 30, 60, 0.05), 0 4px 18px rgba(20, 30, 60, 0.06);
|
||||
padding: 12px 14px;
|
||||
}
|
||||
.kw-card.primary { border-top-color: #2e5be6; }
|
||||
.kw-card.ok { border-top-color: #1f9d62; }
|
||||
.kw-card.danger { border-top-color: #d63a4a; }
|
||||
.kw-card.info { border-top-color: #0d9488; }
|
||||
.kw-card.violet { border-top-color: #7c5cd6; }
|
||||
.kw-card .kw-n {
|
||||
font-size: 24px;
|
||||
font-weight: 700;
|
||||
color: #1c2230;
|
||||
font-variant-numeric: tabular-nums;
|
||||
line-height: 1.2;
|
||||
}
|
||||
.kw-card .kw-t {
|
||||
margin-top: 3px;
|
||||
font-size: 11.5px;
|
||||
color: #98a1b1;
|
||||
}
|
||||
|
||||
.kw-panel {
|
||||
background: #fff;
|
||||
border: 1px solid #e5e9f0;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 1px 2px rgba(20, 30, 60, 0.05), 0 4px 18px rgba(20, 30, 60, 0.06);
|
||||
overflow: hidden;
|
||||
}
|
||||
.kw-panel-head {
|
||||
padding: 11px 15px;
|
||||
background: #fafbfd;
|
||||
border-bottom: 1px solid #e9edf3;
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
color: #1c2230;
|
||||
}
|
||||
.kw-panel-head::before {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
border-radius: 2px;
|
||||
background: #2dd4bf;
|
||||
margin-right: 8px;
|
||||
vertical-align: 1px;
|
||||
}
|
||||
.kw-sub {
|
||||
margin-left: 8px;
|
||||
font-size: 11.5px;
|
||||
font-weight: 400;
|
||||
color: #98a1b1;
|
||||
}
|
||||
.kw-panel-body {
|
||||
padding: 14px 15px;
|
||||
}
|
||||
|
||||
.kw-filters {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-end;
|
||||
gap: 10px 12px;
|
||||
}
|
||||
.kw-field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
min-width: 150px;
|
||||
}
|
||||
.kw-field-wide {
|
||||
min-width: 220px;
|
||||
}
|
||||
.kw-field > span {
|
||||
font-size: 12px;
|
||||
color: #5a6474;
|
||||
}
|
||||
.kw-field input,
|
||||
.kw-field select {
|
||||
height: 34px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid #d7dce5;
|
||||
border-radius: 7px;
|
||||
background: #fbfcfe;
|
||||
color: #1c2230;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
outline: none;
|
||||
}
|
||||
.kw-field input:focus,
|
||||
.kw-field select:focus {
|
||||
border-color: #2e5be6;
|
||||
box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
background: #fff;
|
||||
}
|
||||
.kw-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.kw-btn {
|
||||
height: 34px;
|
||||
padding: 0 15px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 7px;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
.kw-btn-primary {
|
||||
background: #2e5be6;
|
||||
border-color: #2e5be6;
|
||||
color: #fff;
|
||||
}
|
||||
.kw-btn-primary:hover { background: #1e4bd8; border-color: #1e4bd8; }
|
||||
.kw-btn-ghost {
|
||||
background: #fff;
|
||||
border-color: #d7dce5;
|
||||
color: #5a6474;
|
||||
}
|
||||
.kw-btn-ghost:hover { border-color: #2e5be6; color: #2e5be6; }
|
||||
|
||||
.kw-tabs {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
background: #fff;
|
||||
border: 1px solid #e5e9f0;
|
||||
border-radius: 9px;
|
||||
padding: 4px;
|
||||
align-self: flex-start;
|
||||
}
|
||||
.kw-tab {
|
||||
padding: 7px 18px;
|
||||
border: none;
|
||||
border-radius: 7px;
|
||||
background: none;
|
||||
color: #5a6474;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
.kw-tab:hover { color: #2e5be6; }
|
||||
.kw-tab.active { background: #2e5be6; color: #fff; }
|
||||
|
||||
.kw-table-wrap {
|
||||
overflow-x: auto;
|
||||
border: 1px solid #e5e9f0;
|
||||
border-radius: 9px;
|
||||
min-height: 90px;
|
||||
}
|
||||
.kw-table {
|
||||
width: 100%;
|
||||
border-collapse: separate;
|
||||
border-spacing: 0;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.kw-table th {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
padding: 10px;
|
||||
background: #f7f9fc;
|
||||
border-bottom: 1px solid #e5e9f0;
|
||||
color: #5a6474;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.kw-table td {
|
||||
padding: 9px 10px;
|
||||
border-bottom: 1px solid #eff2f7;
|
||||
color: #1c2230;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.kw-table tbody tr:hover td { background: #f7faff; }
|
||||
.kw-table tbody tr:last-child td { border-bottom: none; }
|
||||
.kw-table tr.mine td { color: #0f9d58; font-weight: 600; }
|
||||
.kw-user { font-weight: 500; }
|
||||
.kw-keyword { max-width: 320px; overflow: hidden; text-overflow: ellipsis; }
|
||||
.kw-time { color: #5a6474; font-size: 11.5px; }
|
||||
|
||||
.kw-tag {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 6px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.kw-tag.copy { background: #e8f7f4; color: #0d9488; }
|
||||
.kw-tag.add { background: #eff6ff; color: #2563eb; }
|
||||
|
||||
.kw-empty {
|
||||
padding: 42px 16px;
|
||||
text-align: center;
|
||||
color: #98a1b1;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.kw-footer {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 10px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.kw-summary {
|
||||
font-size: 11.5px;
|
||||
color: #98a1b1;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,60 @@
|
||||
/** 品牌Gating库接口适配:/api/admin/brand-gating 的列表/统计/新增/启停/删除/批量导入。 */
|
||||
import { http } from '@/api/http'
|
||||
import { unwrap } from '@/api/envelope'
|
||||
import {
|
||||
parseBrandGatingAddResult,
|
||||
parseBrandGatingImportResult,
|
||||
parseBrandGatingPage,
|
||||
parseBrandGatingStats,
|
||||
toBrandGatingQuery,
|
||||
type BrandGatingFilter,
|
||||
type BrandGatingForm,
|
||||
type BrandGatingImportResult,
|
||||
type BrandGatingPage,
|
||||
type BrandGatingStats,
|
||||
} from './brand-gating-model.ts'
|
||||
|
||||
export const BRAND_GATING_ENDPOINT = '/api/admin/brand-gating'
|
||||
|
||||
export async function fetchBrandGatingPage(
|
||||
filter: BrandGatingFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
): Promise<BrandGatingPage> {
|
||||
const { data } = await http.get<unknown>(BRAND_GATING_ENDPOINT, {
|
||||
params: toBrandGatingQuery(filter, page, pageSize),
|
||||
})
|
||||
return parseBrandGatingPage(unwrap<unknown>(data))
|
||||
}
|
||||
|
||||
export async function fetchBrandGatingStats(): Promise<BrandGatingStats> {
|
||||
const { data } = await http.get<unknown>(`${BRAND_GATING_ENDPOINT}/stats`)
|
||||
return parseBrandGatingStats(unwrap<unknown>(data))
|
||||
}
|
||||
|
||||
/** 单条新增:true=新增成功,false=品牌+国家已存在(后端撞唯一键返回 added=0)。 */
|
||||
export async function submitBrandGating(form: BrandGatingForm): Promise<boolean> {
|
||||
const { data } = await http.post<unknown>(BRAND_GATING_ENDPOINT, {
|
||||
brand: form.brand.trim(),
|
||||
country: form.country,
|
||||
gatingType: form.gatingType,
|
||||
asin: form.asin.trim(),
|
||||
remark: form.remark.trim(),
|
||||
})
|
||||
return parseBrandGatingAddResult(unwrap<unknown>(data))
|
||||
}
|
||||
|
||||
export async function updateBrandGatingStatus(id: number, status: 0 | 1): Promise<void> {
|
||||
const { data } = await http.post<unknown>(`${BRAND_GATING_ENDPOINT}/${id}/status`, { status })
|
||||
unwrap<unknown>(data)
|
||||
}
|
||||
|
||||
export async function deleteBrandGating(id: number): Promise<void> {
|
||||
const { data } = await http.delete<unknown>(`${BRAND_GATING_ENDPOINT}/${id}`)
|
||||
unwrap<unknown>(data)
|
||||
}
|
||||
|
||||
export async function importBrandGatingText(text: string): Promise<BrandGatingImportResult> {
|
||||
const { data } = await http.post<unknown>(`${BRAND_GATING_ENDPOINT}/import`, { text })
|
||||
return parseBrandGatingImportResult(unwrap<unknown>(data))
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
/** 品牌Gating库模型(独立菜单页):与 /api/admin/brand-gating 的 camel 契约对齐,纯逻辑。 */
|
||||
|
||||
export const GATING_COUNTRIES = ['全部', '英国', '德国', '法国', '西班牙', '意大利'] as const
|
||||
export const GATING_TYPES = ['品牌gating', '类目gating', '账户不符合'] as const
|
||||
export const GATING_SOURCES = ['AUTO', 'MANUAL'] as const
|
||||
|
||||
export type GatingStatusFilter = '' | '1' | '0'
|
||||
|
||||
export interface BrandGatingFilter {
|
||||
keyword: string
|
||||
country: string
|
||||
gatingType: string
|
||||
status: GatingStatusFilter
|
||||
source: string
|
||||
}
|
||||
|
||||
export interface BrandGatingForm {
|
||||
brand: string
|
||||
country: string
|
||||
gatingType: string
|
||||
asin: string
|
||||
remark: string
|
||||
}
|
||||
|
||||
export interface BrandGatingRow {
|
||||
id: number
|
||||
brand: string
|
||||
asin: string
|
||||
country: string
|
||||
gatingType: string
|
||||
/** 1=生效 0=已解除。 */
|
||||
status: number
|
||||
source: string
|
||||
shopName: string
|
||||
remark: string
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
disabledAt: string
|
||||
}
|
||||
|
||||
export interface BrandGatingNameCount {
|
||||
name: string
|
||||
count: number
|
||||
}
|
||||
|
||||
export interface BrandGatingStats {
|
||||
total: number
|
||||
active: number
|
||||
disabled: number
|
||||
brands: number
|
||||
byType: BrandGatingNameCount[]
|
||||
byCountry: BrandGatingNameCount[]
|
||||
bySource: BrandGatingNameCount[]
|
||||
}
|
||||
|
||||
export interface BrandGatingPage {
|
||||
total: number
|
||||
rows: BrandGatingRow[]
|
||||
}
|
||||
|
||||
export interface BrandGatingImportResult {
|
||||
added: number
|
||||
skipped: number
|
||||
}
|
||||
|
||||
export function createBrandGatingFilter(): BrandGatingFilter {
|
||||
return { keyword: '', country: '', gatingType: '', status: '', source: '' }
|
||||
}
|
||||
|
||||
export function createBrandGatingForm(): BrandGatingForm {
|
||||
return { brand: '', country: '全部', gatingType: '品牌gating', asin: '', remark: '' }
|
||||
}
|
||||
|
||||
/** 列表查询参数:空值与「全部」哨兵不下发,其余原样交给后端(与桌面版 list_gating 同口径)。 */
|
||||
export function toBrandGatingQuery(
|
||||
filter: BrandGatingFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
): Record<string, string | number> {
|
||||
const query: Record<string, string | number> = {
|
||||
page: Math.max(1, Math.trunc(page) || 1),
|
||||
size: Math.max(1, Math.trunc(pageSize) || 10),
|
||||
}
|
||||
const keyword = filter.keyword.trim()
|
||||
if (keyword) query.keyword = keyword
|
||||
if (filter.country && filter.country !== '全部') query.country = filter.country
|
||||
if (filter.gatingType && filter.gatingType !== '全部') query.gatingType = filter.gatingType
|
||||
if (filter.status === '1' || filter.status === '0') query.status = filter.status
|
||||
if (filter.source && filter.source !== '全部') query.source = filter.source
|
||||
return query
|
||||
}
|
||||
|
||||
/** 单条新增前置校验:只拦空品牌,其余字段由后端落桌面版同款默认值。 */
|
||||
export function validateBrandGatingForm(form: BrandGatingForm): string {
|
||||
if (!form.brand.trim()) return '请填写品牌'
|
||||
return ''
|
||||
}
|
||||
|
||||
function asRecord(value: unknown): Record<string, unknown> | null {
|
||||
return value && typeof value === 'object' ? (value as Record<string, unknown>) : null
|
||||
}
|
||||
|
||||
function textOf(value: unknown): string {
|
||||
return value == null ? '' : String(value).trim()
|
||||
}
|
||||
|
||||
function countOf(value: unknown): number {
|
||||
const count = Number(value)
|
||||
return Number.isFinite(count) ? Math.max(0, Math.trunc(count)) : 0
|
||||
}
|
||||
|
||||
function nameCountsOf(value: unknown): BrandGatingNameCount[] {
|
||||
if (!Array.isArray(value)) return []
|
||||
return value
|
||||
.map((item) => {
|
||||
const record = asRecord(item)
|
||||
if (!record) return null
|
||||
const name = textOf(record.name)
|
||||
return name ? { name, count: countOf(record.count) } : null
|
||||
})
|
||||
.filter((item): item is BrandGatingNameCount => item !== null)
|
||||
}
|
||||
|
||||
export function parseBrandGatingRow(raw: unknown): BrandGatingRow | null {
|
||||
const record = asRecord(raw)
|
||||
if (!record) return null
|
||||
const id = Number(record.id)
|
||||
if (!Number.isFinite(id)) return null
|
||||
return {
|
||||
id,
|
||||
brand: textOf(record.brand),
|
||||
asin: textOf(record.asin),
|
||||
country: textOf(record.country),
|
||||
gatingType: textOf(record.gatingType),
|
||||
status: countOf(record.status) === 1 ? 1 : 0,
|
||||
source: textOf(record.source),
|
||||
shopName: textOf(record.shopName),
|
||||
remark: textOf(record.remark),
|
||||
createdAt: textOf(record.createdAt),
|
||||
updatedAt: textOf(record.updatedAt),
|
||||
disabledAt: textOf(record.disabledAt),
|
||||
}
|
||||
}
|
||||
|
||||
export function parseBrandGatingPage(raw: unknown): BrandGatingPage {
|
||||
const record = asRecord(raw)
|
||||
if (!record) return { total: 0, rows: [] }
|
||||
const rows = Array.isArray(record.rows)
|
||||
? record.rows
|
||||
.map(parseBrandGatingRow)
|
||||
.filter((row): row is BrandGatingRow => row !== null)
|
||||
: []
|
||||
return { total: countOf(record.total), rows }
|
||||
}
|
||||
|
||||
export function parseBrandGatingStats(raw: unknown): BrandGatingStats {
|
||||
const record = asRecord(raw)
|
||||
return {
|
||||
total: countOf(record?.total),
|
||||
active: countOf(record?.active),
|
||||
disabled: countOf(record?.disabled),
|
||||
brands: countOf(record?.brands),
|
||||
byType: nameCountsOf(record?.byType),
|
||||
byCountry: nameCountsOf(record?.byCountry),
|
||||
bySource: nameCountsOf(record?.bySource),
|
||||
}
|
||||
}
|
||||
|
||||
/** 单条新增回包:added=1 新增成功,0 表示撞唯一键(品牌+国家已存在)。 */
|
||||
export function parseBrandGatingAddResult(raw: unknown): boolean {
|
||||
return countOf(asRecord(raw)?.added) > 0
|
||||
}
|
||||
|
||||
export function parseBrandGatingImportResult(raw: unknown): BrandGatingImportResult {
|
||||
const record = asRecord(raw)
|
||||
return { added: countOf(record?.added), skipped: countOf(record?.skipped) }
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
|
||||
export const DUPLICATE_CHECK_ENDPOINT = '/api/admin/shop-data-crawl'
|
||||
|
||||
/** console 端点吃 asin/shop_name/group/country/site/date_from/date_to;多余分页参数后端忽略。 */
|
||||
/** console 端点吃 asin/shop_name/group/country/site/date_from/date_to(行窗口的 page/page_size/dup_group 由调用方另传)。 */
|
||||
function toConsoleQuery(filter: DuplicateFilter): Record<string, string> {
|
||||
const query: Record<string, string> = {}
|
||||
const asin = (filter.asin || '').trim()
|
||||
@@ -32,14 +32,25 @@ function toConsoleQuery(filter: DuplicateFilter): Record<string, string> {
|
||||
|
||||
export type LedgerSortKey = 'asin' | 'brand' | 'store_count' | 'record_count' | 'earliest' | 'latest'
|
||||
|
||||
/** 加载撞款控制台快照:GET /duplicate-check-console。 */
|
||||
/**
|
||||
* 加载撞款控制台快照:GET /duplicate-check-console。
|
||||
*
|
||||
* 行窗口(B60):`page`/`pageSize` 决定返回的 `dup` 是这一窗,`dupGroup` 非空时行集先按
|
||||
* 该分组成员裁剪(组内 ≥2 店才算撞款)。三者都是**服务端**口径——矩阵与详情卡片共用同一窗口,
|
||||
* 页面不再自己从全集里切片(那需要后端把整份撞款数组发回来,正是 B60 要收掉的那件事)。
|
||||
*/
|
||||
export async function fetchDuplicateConsole(
|
||||
filter: DuplicateFilter,
|
||||
companyId?: number | null,
|
||||
page = 1,
|
||||
pageSize = 100,
|
||||
dupGroup = '',
|
||||
): Promise<DuplicateConsole> {
|
||||
// toConsoleQuery 是白名单构造(只点名 asin/shop_name/group/country/site/date_*),
|
||||
// 公司值只许落在本函数自己的 companyId 形参上。
|
||||
const query: Record<string, string | number> = toConsoleQuery(filter)
|
||||
const query: Record<string, string | number> = { ...toConsoleQuery(filter), page, page_size: pageSize }
|
||||
const group = (dupGroup || '').trim()
|
||||
if (group) query.dup_group = group
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get<unknown>(`${DUPLICATE_CHECK_ENDPOINT}/duplicate-check-console`, { params: query })
|
||||
return parseDuplicateConsole(data)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/** 撞款控制台视图派生(分组索引 / 组内撞款子集 / 店铺列并集):纯逻辑。 */
|
||||
/** 撞款控制台视图派生(分组索引 / 店铺列并集 / 矩阵格子预聚合):纯逻辑。 */
|
||||
import type { DuplicateItem, DuplicateOccurrence, DuplicateShop } from './duplicate-model.ts'
|
||||
|
||||
export interface ShopGroups {
|
||||
@@ -41,27 +41,6 @@ export function indexShopGroups(shops: DuplicateShop[]): ShopGroups {
|
||||
return { members, shopGroupNames }
|
||||
}
|
||||
|
||||
/** 仅在指定成员店铺(展示名)内保留 occurrences;重算 shop_count,返回 ≥2 店的撞款子集。 */
|
||||
export function dupWithinGroup(items: DuplicateItem[], memberShops: string[]): DuplicateItem[] {
|
||||
const memberKeys = new Set<string>()
|
||||
for (const shop of memberShops || []) memberKeys.add(shopKey(shop))
|
||||
const result: DuplicateItem[] = []
|
||||
for (const item of items || []) {
|
||||
const kept: DuplicateOccurrence[] = []
|
||||
const shops = new Set<string>()
|
||||
for (const occ of item.occurrences || []) {
|
||||
if (memberKeys.has(shopKey(occ.shopName))) {
|
||||
kept.push(occ)
|
||||
shops.add(occ.shopName || '')
|
||||
}
|
||||
}
|
||||
if (kept.length > 0 && shops.size >= 2) {
|
||||
result.push({ asin: item.asin, shopCount: shops.size, recordCount: kept.length, occurrences: kept })
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
/** 撞款行涉及店铺的并集列(出现顺序去重);memberShops 非空时仅取交集成员的子集顺序。 */
|
||||
export function storeColumnsOf(items: DuplicateItem[], memberShops: string[] = []): string[] {
|
||||
const restricted = new Set(memberShops.map((shop) => shopKey(shop)))
|
||||
@@ -90,6 +69,74 @@ export function storeColumnsOf(items: DuplicateItem[], memberShops: string[] = [
|
||||
return order
|
||||
}
|
||||
|
||||
/** 矩阵一格:该店在售此 ASIN 的条数 + 站点(国家)分布。 */
|
||||
export interface MatrixCell {
|
||||
count: number
|
||||
sites: { code: string; count: number }[]
|
||||
}
|
||||
|
||||
/** 空格的单份实例:模板每格都要拿一个,不能每格 new 一个对象。 */
|
||||
export const EMPTY_MATRIX_CELL: MatrixCell = { count: 0, sites: [] }
|
||||
|
||||
function cellKey(asin: string, shop: string): string {
|
||||
// 用 \u0000 拼键:ASIN 与店铺名都可打印,任何可见分隔符都可能出现在店铺名里(那样就会串格)。
|
||||
return `${(asin || '').trim()}\u0000${shopKey(shop)}`
|
||||
}
|
||||
|
||||
/**
|
||||
* 撞款矩阵的格子集合:把 rows×columns 一次算完(B60 的「预聚合」)。
|
||||
*
|
||||
* <p>原形状是每格现算:`cellCount`/`cellCountryDots`/`cellTitle` 各自把该行 occurrences 全 filter
|
||||
* 一遍,一格 4~6 次、50 行 × 200 列就是每帧上万次整行扫描,勾选/翻页都要重付。这里每行只按
|
||||
* 店铺分桶一次(O(occurrences)),之后一格一次 Map 取值。
|
||||
*
|
||||
* 只给 `columns` 里点名的列建格:不在列集内的 occurrence 直接不装桶,列窗口收窄时开销跟着降。
|
||||
*/
|
||||
export function buildMatrixCells(items: DuplicateItem[], columns: string[]): Map<string, MatrixCell> {
|
||||
const cells = new Map<string, MatrixCell>()
|
||||
const wanted = new Set<string>()
|
||||
for (const column of columns || []) wanted.add(shopKey(column))
|
||||
if (!wanted.size) return cells
|
||||
for (const item of items || []) {
|
||||
const buckets = new Map<string, DuplicateOccurrence[]>()
|
||||
const siteCounts = new Map<string, Map<string, number>>()
|
||||
for (const occ of item.occurrences || []) {
|
||||
const key = shopKey(occ.shopName)
|
||||
if (!wanted.has(key)) continue
|
||||
const bucket = buckets.get(key)
|
||||
if (bucket) bucket.push(occ)
|
||||
else buckets.set(key, [occ])
|
||||
const code = (occ.country || '').trim().toUpperCase()
|
||||
if (!code) continue
|
||||
let counts = siteCounts.get(key)
|
||||
if (!counts) {
|
||||
counts = new Map<string, number>()
|
||||
siteCounts.set(key, counts)
|
||||
}
|
||||
counts.set(code, (counts.get(code) || 0) + 1)
|
||||
}
|
||||
for (const [key, occurrences] of buckets) {
|
||||
const codes = siteCounts.get(key)
|
||||
cells.set(cellKey(item.asin, key), {
|
||||
count: occurrences.length,
|
||||
sites: codes ? [...codes].map(([code, count]) => ({ code, count })) : [],
|
||||
})
|
||||
}
|
||||
}
|
||||
return cells
|
||||
}
|
||||
|
||||
/** 取一格;没有格子时返回同一份空对象(模板里 `cellOf(...).count` 要能直接读)。 */
|
||||
export function matrixCellOf(cells: Map<string, MatrixCell>, asin: string, shop: string): MatrixCell {
|
||||
return cells.get(cellKey(asin, shop)) || EMPTY_MATRIX_CELL
|
||||
}
|
||||
|
||||
/** 一个撞款 ASIN 的品牌:取第一条带品牌的上架记录,全空就是"未知品牌"(页面自己决定怎么显示)。 */
|
||||
export function itemBrandOf(item: DuplicateItem): string {
|
||||
for (const occ of item.occurrences || []) if (occ.brand) return occ.brand
|
||||
return ''
|
||||
}
|
||||
|
||||
/** 明细抽屉聚合行:店铺×站点聚合(对齐 reference 抽屉的 店铺/分组/站点/上架时间(升序堆叠)/次数)。 */
|
||||
export interface DrawerAggRow {
|
||||
shopName: string
|
||||
|
||||
@@ -18,12 +18,19 @@ export interface ConsoleGroupStat {
|
||||
dupCount: number
|
||||
}
|
||||
|
||||
/** 撞款控制台单次快照:总览(指标/店铺分布) + 撞款全集 + 分组统计。 */
|
||||
/**
|
||||
* 撞款控制台单次快照:总览(指标/店铺分布) + 撞款**行窗口** + 分组统计。
|
||||
*
|
||||
* `dup` 是服务端按 page/pageSize 切出来的一窗(B60),`totalDup` 是该范围内未分页的总数;
|
||||
* 两者不是同一个口径,页面分页器读 totalDup、列表读 dup。
|
||||
*/
|
||||
export interface DuplicateConsole {
|
||||
overview: DuplicateOverview
|
||||
dup: DuplicateItem[]
|
||||
groups: ConsoleGroupStat[]
|
||||
totalDup: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/** 台账单行(含 occurrences,供明细抽屉还原每店上架时间线)。 */
|
||||
@@ -87,7 +94,14 @@ export function parseDuplicateConsole(payload: unknown): DuplicateConsole {
|
||||
const groups = Array.isArray(record.groups)
|
||||
? record.groups.map((raw) => parseConsoleGroup(raw)).filter((group): group is ConsoleGroupStat => group !== null)
|
||||
: []
|
||||
return { overview, dup, groups, totalDup: count(record.total_dup ?? record.totalDup) }
|
||||
return {
|
||||
overview,
|
||||
dup,
|
||||
groups,
|
||||
totalDup: count(record.total_dup ?? record.totalDup),
|
||||
page: count(record.page) || 1,
|
||||
pageSize: count(record.page_size ?? record.pageSize),
|
||||
}
|
||||
}
|
||||
|
||||
/** 解析单条台账行。 */
|
||||
|
||||
@@ -0,0 +1,169 @@
|
||||
/**
|
||||
* 撞款覆盖矩阵的「行窗 + 列窗」组合式(B60 从 DuplicateCheckPage.vue 拆出)。
|
||||
*
|
||||
* 为什么单独立一支:那一屏矩阵原本是每格现算——`cellCount / cellCountryDots / cellTitle`
|
||||
* 各自把该行 occurrences 全 filter 一遍(一格 4~6 次),而且整份撞款全集一次性铺成
|
||||
* 「全部行 × 全部列」的 DOM。收口后行由服务端切窗、列在本模块切窗,格子的文案与
|
||||
* 国家点一次算完、空格按列共享同一份视图。这些状态(列游标、行游标、三份 computed)
|
||||
* 是一件事,留在页面里会把本页推到可读性基线之外,也更难单测。
|
||||
*
|
||||
* 纯逻辑部分(分桶、取列)在 `duplicate-console-logic.ts`,本文件只做"窗口"这一层,
|
||||
* 数据从页面注入,不认识 store。
|
||||
*/
|
||||
import { computed, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
import { buildMatrixCells, itemBrandOf, matrixCellOf, storeColumnsOf } from './duplicate-console-logic.ts'
|
||||
import { asinCountryLabel } from '../asin/asin-country.ts'
|
||||
import type { DuplicateItem } from './duplicate-model.ts'
|
||||
|
||||
/**
|
||||
* 列窗口上限(B60「限制列数」)。一窗 40 列 × 最多 100 行=单帧最多 4,000 格;
|
||||
* 不封顶时 200 列 × 100 行=2 万格 DOM,任何一次勾选/翻页都要重排。
|
||||
* 列没被裁掉,只是切成窗口(`goColumnPage`),所以信息一条不丢。
|
||||
*/
|
||||
export const MATRIX_COLUMN_WINDOW = 40
|
||||
|
||||
/** 模板只读这一份:数字、国家点、悬浮说明都在这里算完。 */
|
||||
export interface MatrixCellView {
|
||||
count: number
|
||||
dots: string[]
|
||||
title: string
|
||||
}
|
||||
|
||||
/** 一行矩阵视图:行对象本身(点开抽屉要用)+ 品牌 + 本窗每一格。 */
|
||||
export interface MatrixRowView {
|
||||
item: DuplicateItem
|
||||
asin: string
|
||||
brand: string
|
||||
cells: MatrixCellView[]
|
||||
}
|
||||
|
||||
export interface MatrixWindowSource {
|
||||
/** 当前行窗(服务端切好的那一窗)。 */
|
||||
rows: ComputedRef<DuplicateItem[]>
|
||||
/** 列范围的第二正本=分组页签选中的组员(非分组范围给空数组)。 */
|
||||
groupMembers: ComputedRef<string[]>
|
||||
/** 分组范围与否:决定列要不要与组员取交集。 */
|
||||
groupScoped: Ref<boolean> | ComputedRef<boolean>
|
||||
/** 选中的分组名(只用于矩阵那行说明文案,让"看到的是什么范围"写在屏上)。 */
|
||||
selectedGroup: Ref<string> | ComputedRef<string>
|
||||
/** 行窗换页/换档都要重新请一窗(服务端切,页面不再从全集里自切)。 */
|
||||
reload: () => void
|
||||
/** 数据到达的版本号(一般是 consoleData 本身):新数据 ⇒ 旧游标已指向不存在的位置。 */
|
||||
dataVersion: Ref<unknown>
|
||||
}
|
||||
|
||||
/** 空格共用同一份 dots(模板只读不写,共享数组不会被改)。 */
|
||||
const NO_DOTS: string[] = []
|
||||
|
||||
export function useDuplicateMatrix(source: MatrixWindowSource) {
|
||||
const matrixPage = ref(1)
|
||||
const matrixPageSize = ref(10)
|
||||
const columnPage = ref(1)
|
||||
|
||||
/** 本页行里真出现过的店铺=矩阵该配的列(分组范围再与组员取交集)。 */
|
||||
const matrixAllColumns = computed<string[]>(() =>
|
||||
storeColumnsOf(source.rows.value, source.groupScoped.value ? source.groupMembers.value : []),
|
||||
)
|
||||
|
||||
const columnWindowTotal = computed(() =>
|
||||
Math.max(1, Math.ceil(matrixAllColumns.value.length / MATRIX_COLUMN_WINDOW)),
|
||||
)
|
||||
|
||||
/** 矩阵列:按窗口切(超出部分用列窗口控件翻)。 */
|
||||
const matrixShops = computed<string[]>(() => {
|
||||
const start = Math.max(0, (columnPage.value - 1) * MATRIX_COLUMN_WINDOW)
|
||||
return matrixAllColumns.value.slice(start, start + MATRIX_COLUMN_WINDOW)
|
||||
})
|
||||
|
||||
/** 一次把「本窗行 × 本窗列」全部算完,模板只读不算。 */
|
||||
const matrixCells = computed(() => buildMatrixCells(source.rows.value, matrixShops.value))
|
||||
|
||||
function cellView(shop: string, cell: ReturnType<typeof matrixCellOf>): MatrixCellView {
|
||||
const sites = cell.sites.map((site) => `${asinCountryLabel(site.code)} ${site.count}条`).join('、')
|
||||
return {
|
||||
count: cell.count,
|
||||
dots: cell.sites.map((site) => site.code),
|
||||
title: sites ? `${shop} 在售 ${cell.count} 条 · ${sites}` : `${shop} 在售 ${cell.count} 条`,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 每列一份「本格为空」的视图,整列复用同一对象。
|
||||
*
|
||||
* <p>矩阵里绝大多数格是空的(一个 ASIN 只在几家店在售,列却是几十上百家店)。原先一格
|
||||
* 一条 `无此 ASIN` 文案,50 行 × 200 列=1 万条字符串;按列准备一次之后行数再多也不
|
||||
* 乘上去——这条才是"每格现算"剩下的那半开销。
|
||||
*/
|
||||
const emptyColumnViews = computed<MatrixCellView[]>(() =>
|
||||
matrixShops.value.map((shop) => ({ count: 0, dots: NO_DOTS, title: `${shop} 无此 ASIN` })),
|
||||
)
|
||||
|
||||
const matrixView = computed<MatrixRowView[]>(() => {
|
||||
const cells = matrixCells.value
|
||||
const blanks = emptyColumnViews.value
|
||||
return source.rows.value.map((item) => ({
|
||||
item,
|
||||
asin: item.asin,
|
||||
brand: itemBrandOf(item) || '—',
|
||||
cells: matrixShops.value.map((shop, index) => {
|
||||
const cell = matrixCellOf(cells, item.asin, shop)
|
||||
return cell.count ? cellView(shop, cell) : blanks[index]
|
||||
}),
|
||||
}))
|
||||
})
|
||||
|
||||
/** 屏上那行说明:把"行/列各是什么范围"写清楚,尤其分组范围是服务端裁过行的那一窗。 */
|
||||
const matrixHint = computed(() =>
|
||||
source.groupScoped.value
|
||||
? source.selectedGroup.value
|
||||
? `行 = 分组「${source.selectedGroup.value}」内的撞款ASIN(服务端裁行+分页),列 = 组内在售店铺;有数字表示组内该店在售此 ASIN`
|
||||
: '行 = 分组内撞款ASIN,列 = 该分组店铺;有数字表示组内该店在售此 ASIN'
|
||||
: '行 = 本页撞款ASIN(服务端分页),列 = 本页撞款涉及店铺;有数字表示该店在售此 ASIN,点击行可看上架时间明细',
|
||||
)
|
||||
|
||||
/** 行窗口翻页:同一页重复点不重新请(翻页控件的当前页也会触发 change)。 */
|
||||
function goMatrixPage(page: number): void {
|
||||
if (page === matrixPage.value) return
|
||||
matrixPage.value = page
|
||||
source.reload()
|
||||
}
|
||||
|
||||
function changeMatrixSize(size: number): void {
|
||||
matrixPageSize.value = size
|
||||
matrixPage.value = 1
|
||||
source.reload()
|
||||
}
|
||||
|
||||
/** 列窗口翻页:行不动,只把看得见的店铺换一窗。 */
|
||||
function goColumnPage(step: number): void {
|
||||
const next = columnPage.value + step
|
||||
if (next < 1 || next > columnWindowTotal.value) return
|
||||
columnPage.value = next
|
||||
}
|
||||
|
||||
/** 换了行范围(全局 ↔ 组内、换分组、重置筛选):两个游标都回到第一窗。 */
|
||||
function resetMatrixWindows(): void {
|
||||
matrixPage.value = 1
|
||||
columnPage.value = 1
|
||||
}
|
||||
|
||||
watch(source.dataVersion, () => {
|
||||
columnPage.value = Math.min(columnPage.value, columnWindowTotal.value)
|
||||
})
|
||||
|
||||
return {
|
||||
MATRIX_COLUMN_WINDOW,
|
||||
matrixPage,
|
||||
matrixPageSize,
|
||||
columnPage,
|
||||
columnWindowTotal,
|
||||
matrixAllColumns,
|
||||
matrixShops,
|
||||
matrixView,
|
||||
matrixHint,
|
||||
goMatrixPage,
|
||||
changeMatrixSize,
|
||||
goColumnPage,
|
||||
resetMatrixWindows,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
/** 关键词使用记录接口适配:/api/admin/keyword-usage 的使用记录、删除记录与概览。 */
|
||||
import { http } from '@/api/http'
|
||||
import { unwrap } from '@/api/envelope'
|
||||
import {
|
||||
parseKeywordUsageOverview,
|
||||
parseKeywordUsagePage,
|
||||
type KeywordUsageOverview,
|
||||
type KeywordUsagePage,
|
||||
type KeywordUsageQuery,
|
||||
} from './keyword-usage-model.ts'
|
||||
|
||||
export const KEYWORD_USAGE_ENDPOINT = '/api/admin/keyword-usage'
|
||||
|
||||
function toQuery(params: KeywordUsageQuery): Record<string, unknown> {
|
||||
const query: Record<string, unknown> = {}
|
||||
if (params.companyId != null) query.company_id = params.companyId
|
||||
if (params.user) query.user = params.user
|
||||
if (params.country) query.country = params.country
|
||||
if (params.keyword) query.keyword = params.keyword
|
||||
if (params.scene) query.scene = params.scene
|
||||
if (params.page != null) query.page = params.page
|
||||
if (params.pageSize != null) query.page_size = params.pageSize
|
||||
return query
|
||||
}
|
||||
|
||||
export async function fetchKeywordUsage(params: KeywordUsageQuery): Promise<KeywordUsagePage> {
|
||||
const { data } = await http.get<unknown>(KEYWORD_USAGE_ENDPOINT, { params: toQuery(params) })
|
||||
return parseKeywordUsagePage(unwrap<unknown>(data))
|
||||
}
|
||||
|
||||
export async function fetchKeywordUsageDeletes(params: KeywordUsageQuery): Promise<KeywordUsagePage> {
|
||||
const { data } = await http.get<unknown>(`${KEYWORD_USAGE_ENDPOINT}/deletes`, { params: toQuery(params) })
|
||||
return parseKeywordUsagePage(unwrap<unknown>(data))
|
||||
}
|
||||
|
||||
export async function fetchKeywordUsageOverview(params: KeywordUsageQuery): Promise<KeywordUsageOverview> {
|
||||
const { data } = await http.get<unknown>(`${KEYWORD_USAGE_ENDPOINT}/overview`, { params: toQuery(params) })
|
||||
return parseKeywordUsageOverview(unwrap<unknown>(data))
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
/** 关键词使用记录(独立菜单 admin_keyword_usage):与 /api/admin/keyword-usage 的 camel 契约对齐,纯逻辑。 */
|
||||
|
||||
export interface KeywordUsageQuery {
|
||||
companyId?: number | null
|
||||
user?: string
|
||||
country?: string
|
||||
keyword?: string
|
||||
scene?: string
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}
|
||||
|
||||
export interface KeywordUsageFilter {
|
||||
user: string
|
||||
country: string
|
||||
keyword: string
|
||||
scene: string
|
||||
}
|
||||
|
||||
export interface KeywordUsageRow {
|
||||
userName: string
|
||||
country: string
|
||||
keyword: string
|
||||
scene: string
|
||||
time: string
|
||||
}
|
||||
|
||||
export interface KeywordUsageCounts {
|
||||
copy: number
|
||||
copyExisting: number
|
||||
copyDeleted: number
|
||||
add: number
|
||||
}
|
||||
|
||||
export interface KeywordUsagePage {
|
||||
total: number
|
||||
rows: KeywordUsageRow[]
|
||||
counts: KeywordUsageCounts
|
||||
}
|
||||
|
||||
export interface KeywordUsageStats {
|
||||
used: number
|
||||
exist: number
|
||||
deletedKw: number
|
||||
added: number
|
||||
totalUse: number
|
||||
deletes: number
|
||||
}
|
||||
|
||||
export interface KeywordUsageOverview {
|
||||
stats: KeywordUsageStats
|
||||
users: string[]
|
||||
countries: string[]
|
||||
}
|
||||
|
||||
export const KEYWORD_USAGE_SCENES = ['已使用', '添加关键词'] as const
|
||||
|
||||
/** 初始每页条数:必须落在 OldPagination 的档位(10/20/50/100)里(CR-26)。 */
|
||||
export const KEYWORD_USAGE_PAGE_SIZE = 10
|
||||
|
||||
export function createKeywordUsageFilter(): KeywordUsageFilter {
|
||||
return { user: '', country: '', keyword: '', scene: '' }
|
||||
}
|
||||
|
||||
function asRecord(value: unknown): Record<string, unknown> | null {
|
||||
return value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : null
|
||||
}
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value : value == null ? '' : String(value)
|
||||
}
|
||||
|
||||
function count(value: unknown): number {
|
||||
const n = Number(value)
|
||||
return Number.isFinite(n) && n >= 0 ? n : 0
|
||||
}
|
||||
|
||||
function textList(value: unknown): string[] {
|
||||
return Array.isArray(value) ? value.map(text).filter((item) => item !== '') : []
|
||||
}
|
||||
|
||||
export function parseKeywordUsageRow(value: unknown): KeywordUsageRow | null {
|
||||
const row = asRecord(value)
|
||||
if (!row) return null
|
||||
return {
|
||||
userName: text(row.userName),
|
||||
country: text(row.country),
|
||||
keyword: text(row.keyword),
|
||||
scene: text(row.scene),
|
||||
time: text(row.time),
|
||||
}
|
||||
}
|
||||
|
||||
export function parseKeywordUsagePage(value: unknown): KeywordUsagePage {
|
||||
const page = asRecord(value)
|
||||
const counts = asRecord(page?.counts)
|
||||
const rows = Array.isArray(page?.rows)
|
||||
? page.rows.map(parseKeywordUsageRow).filter((row): row is KeywordUsageRow => row !== null)
|
||||
: []
|
||||
return {
|
||||
total: count(page?.total),
|
||||
rows,
|
||||
counts: {
|
||||
copy: count(counts?.copy),
|
||||
copyExisting: count(counts?.copyExisting),
|
||||
copyDeleted: count(counts?.copyDeleted),
|
||||
add: count(counts?.add),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export function parseKeywordUsageOverview(value: unknown): KeywordUsageOverview {
|
||||
const overview = asRecord(value)
|
||||
const stats = asRecord(overview?.stats)
|
||||
return {
|
||||
stats: {
|
||||
used: count(stats?.used),
|
||||
exist: count(stats?.exist),
|
||||
deletedKw: count(stats?.deletedKw),
|
||||
added: count(stats?.added),
|
||||
totalUse: count(stats?.totalUse),
|
||||
deletes: count(stats?.deletes),
|
||||
},
|
||||
users: textList(overview?.users),
|
||||
countries: textList(overview?.countries),
|
||||
}
|
||||
}
|
||||
|
||||
export function keywordUsageSceneLabel(scene: string): string {
|
||||
if (scene === '复制关键词') return '已使用(复制)'
|
||||
if (scene === '添加关键词') return '添加关键词'
|
||||
if (scene === '删除关键词') return '删除关键词'
|
||||
return scene || '—'
|
||||
}
|
||||
|
||||
/** 使用记录口径:复制 = 现存词 + 已删除词留痕;添加单列。 */
|
||||
export function keywordUsageCountsText(counts: KeywordUsageCounts, total: number): string {
|
||||
return `复制关键词 ${counts.copy} = 现存词 ${counts.copyExisting} + 已删除词 ${counts.copyDeleted}`
|
||||
+ ` · 添加关键词 ${counts.add} · 合计 ${total} 条`
|
||||
}
|
||||
@@ -25,11 +25,14 @@ export const adminPages: AdminPageDef[] = [
|
||||
{ path: 'account/user-secret-usage', menuKey: 'admin_user_secret_usage', title: '密钥用量统计', companyScoped: true, load: () => import('@/pages/account/UserSecretUsagePage.vue') },
|
||||
{ path: 'account/companies', menuKey: 'admin_companies', title: '公司管理', superAdminOnly: true, load: () => import('@/pages/account/CompaniesPage.vue') },
|
||||
{ path: 'shop-center/duplicate-check', menuKey: 'admin_shop_data_duplicate_check', title: '店铺撞款监控', companyScoped: true, load: () => import('@/pages/tasks/DuplicateCheckPage.vue') },
|
||||
{ path: 'shop-center/brand-gating', menuKey: 'admin_brand_gating', title: '品牌Gating库', companyScoped: false, load: () => import('@/pages/tasks/BrandGatingPanel.vue') },
|
||||
{ path: 'shop-center/keyword-usage', menuKey: 'admin_keyword_usage', title: '关键词使用记录', companyScoped: true, load: () => import('@/pages/tasks/KeywordUsagePage.vue') },
|
||||
{ path: 'shop-center/keys', menuKey: 'admin_shop_keys', title: '店铺密钥管理', companyScoped: true, load: () => import('@/pages/shop/ShopKeysPage.vue') },
|
||||
{ path: 'shop-center/shops', menuKey: 'admin_shop_manage', title: '店铺管理', companyScoped: true, load: () => import('@/pages/shop/ShopManagePage.vue') },
|
||||
{ path: 'records/history', menuKey: 'admin_history', title: '生成记录', companyScoped: true, load: () => import('@/pages/records/RecordsHistoryPage.vue') },
|
||||
{ path: 'records/software-version', menuKey: 'admin_version', title: '软件版本管理', companyScoped: false, load: () => import('@/pages/records/RecordsSoftwareVersionPage.vue') },
|
||||
{ path: 'records/tutorial', menuKey: 'admin_tutorial', title: '教程管理', companyScoped: false, load: () => import('@/pages/records/RecordsTutorialPage.vue') },
|
||||
{ path: 'records/workbench-client-package', menuKey: 'admin_workbench_client_package', title: '数富AI工作台客户端包管理', companyScoped: false, load: () => import('@/pages/records/WorkbenchClientPackagePage.vue') },
|
||||
{ path: 'records/device-logs', menuKey: 'admin_device_logs', title: '日志管理', companyScoped: true, load: () => import('@/pages/records/DeviceLogsPage.vue') },
|
||||
{ path: 'task-center/board', menuKey: 'admin_task_center', title: '客户端任务管理', companyScoped: true, load: () => import('@/pages/task-center/TaskCenterBoardPage.vue') },
|
||||
{ path: 'records/digital-human-version', menuKey: 'digital_human_version', title: '数字人版本管理', load: () => import('@/pages/records/RecordsDigitalHumanVersionPage.vue') },
|
||||
@@ -40,8 +43,12 @@ export const adminPages: AdminPageDef[] = [
|
||||
{ path: 'asin-center/query', menuKey: 'admin_query_asin', title: '查询ASIN', companyScoped: true, load: () => import('@/pages/asin/QueryAsinPage.vue') },
|
||||
{ path: 'asin-center/categories', menuKey: 'admin_product_categories', title: '商品类目', companyScoped: false, load: () => import('@/pages/asin/ProductCategoryPage.vue') },
|
||||
{ path: 'asin-center/skip-price', menuKey: 'admin_skip_price_asin', title: '最低价ASIN', companyScoped: true, load: () => import('@/pages/asin/SkipPricePage.vue') },
|
||||
// 品牌Gating库(biz_brand_gating):全平台共享表(桌面版 gating_web_admin 同源数据),不参与公司 tab。
|
||||
{ path: 'asin-center/gating', menuKey: 'admin_brand_gating', title: '品牌Gating库', companyScoped: false, load: () => import('@/pages/gating/GatingPage.vue') },
|
||||
{ path: 'patent-center/clean-items', menuKey: 'admin_appearance_patent_clean_items', title: '外观专利数据库', companyScoped: true, load: () => import('@/pages/patent/AppearancePatentCleanItemsPage.vue') },
|
||||
// 京东数据库 2026-11-16 退出公司 tab(参考品牌数据库先例):数据全平台公共,不按公司取数。
|
||||
// 2026-11-17 第二刀:V204 独立「京东分类管理」子菜单页(jd-center/categories)整体并入
|
||||
// 本页工具栏「分类管理」对话框(JdCategoryManageDialog),路由与菜单行(V208 删 V204 行)
|
||||
// 一并下线——用户口径「京东分类管理并到京东数据库分类编辑里」。
|
||||
{ path: 'jd-center/database', menuKey: 'admin_jd_database', title: '京东数据库', companyScoped: false, load: () => import('@/pages/jd/JdDatabasePage.vue') },
|
||||
]
|
||||
|
||||
export function routeOf(page: AdminPageDef): RouteRecordRaw {
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
/**
|
||||
* 后管浏览器错误上报(S1-F2/AC-16)。
|
||||
*
|
||||
* 之前渲染崩溃/未捕获 Promise 只进 console,线上白屏没有现场。这里做三件事:
|
||||
* 1. 屏上可见:右下角弹一条纯 DOM 提示(不依赖 element-plus,错误可能正是它引起的);
|
||||
* 2. 内存环:最近 20 条留痕(同用户端口径),便于现场排查;
|
||||
* 3. sendBeacon 上报服务端 `/api/admin/client-errors`(WARN 落日志)。
|
||||
*
|
||||
* 三类错误各有出口:Vue 渲染期异常由 `main.ts` 的 `app.config.errorHandler` 接(挂载前就要生效),
|
||||
* `window error` 与未捕获 Promise 由 `useGlobalErrorReporting()` 接——它必须在根组件 setup 里调用,
|
||||
* 卸载出口挂在 `onBeforeUnmount`:入口级注册点只定义不接线等于没接。
|
||||
*
|
||||
* 凭据零容忍:payload 只有 kind/message/stack/route/ts,**绝不**读取或携带本地登录令牌
|
||||
* 或任何请求头凭据原文(AC-1 同一把尺;预签名 URL 也当一次性凭据对待,不进上报)。
|
||||
*/
|
||||
import { onBeforeUnmount } from 'vue'
|
||||
|
||||
const REPORT_ENDPOINT = '/api/admin/client-errors'
|
||||
const RING_LIMIT = 20
|
||||
/** 风暴保护:同一原因 30s 内只弹一次屏、上报次数也设上限,日志不许被一种错误刷爆。 */
|
||||
const DEDUPE_WINDOW_MS = 30_000
|
||||
const MAX_STACK_CHARS = 2000
|
||||
|
||||
export interface ClientErrorPayload {
|
||||
kind: string
|
||||
message: string
|
||||
stack?: string
|
||||
route?: string
|
||||
ts?: number
|
||||
}
|
||||
|
||||
const ring: ClientErrorPayload[] = []
|
||||
const recent = new Map<string, number>()
|
||||
/** 屏上提示的一次性摘除定时器:全部登记,卸载时逐个 clearTimeout,不留没人收的尾巴。 */
|
||||
const toastTimers = new Set<number>()
|
||||
|
||||
function sanitize(text: string): string {
|
||||
// 兜底脱敏:堆栈/消息里若混进凭据一律打码——Bearer 值、JWT 三段式(登录令牌的形状),
|
||||
// 以及 query 里疑似 token/key/secret 的取值。上报通道绝不外带任何凭据原文。
|
||||
return text
|
||||
.replace(/(Bearer\s+)[A-Za-z0-9\-._~+/=]{8,}/gi, '$1***')
|
||||
.replace(/[A-Za-z0-9\-_]{10,}\.[A-Za-z0-9\-_]{10,}\.[A-Za-z0-9\-_]{8,}/g, '***')
|
||||
.replace(/([?&](?:token|key|secret|signature|expires)=)[^&\s"']+/gi, '$1***')
|
||||
}
|
||||
|
||||
function fingerprint(payload: ClientErrorPayload): string {
|
||||
return `${payload.kind}|${(payload.message || '').slice(0, 120)}`
|
||||
}
|
||||
|
||||
function showOnce(payload: ClientErrorPayload): void {
|
||||
if (typeof document === 'undefined') return
|
||||
const now = Date.now()
|
||||
const last = recent.get(fingerprint(payload)) ?? 0
|
||||
if (now - last < DEDUPE_WINDOW_MS) return
|
||||
recent.set(fingerprint(payload), now)
|
||||
const toast = document.createElement('div')
|
||||
toast.setAttribute('role', 'alert')
|
||||
toast.textContent = `页面出错了:${(payload.message || '未知错误').slice(0, 120)}(已记录,刷新可恢复;反复出现请联系支持)`
|
||||
toast.setAttribute(
|
||||
'style',
|
||||
'position:fixed;right:16px;bottom:16px;z-index:99999;max-width:420px;padding:10px 14px;'
|
||||
+ 'background:#b3261e;color:#fff;border-radius:8px;font-size:13px;box-shadow:0 4px 16px rgba(0,0,0,.3)',
|
||||
)
|
||||
document.body.appendChild(toast)
|
||||
const timer = window.setTimeout(() => {
|
||||
toast.remove()
|
||||
toastTimers.delete(timer)
|
||||
}, 8000)
|
||||
toastTimers.add(timer)
|
||||
}
|
||||
|
||||
export function reportClientError(payload: ClientErrorPayload): void {
|
||||
const entry: ClientErrorPayload = {
|
||||
kind: payload.kind || 'unknown',
|
||||
message: sanitize(String(payload.message ?? '')).slice(0, MAX_STACK_CHARS),
|
||||
stack: sanitize(String(payload.stack ?? '')).slice(0, MAX_STACK_CHARS),
|
||||
route: payload.route ?? (typeof location !== 'undefined' ? location.pathname : ''),
|
||||
ts: payload.ts ?? Date.now(),
|
||||
}
|
||||
ring.push(entry)
|
||||
if (ring.length > RING_LIMIT) ring.shift()
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('[client-error]', entry)
|
||||
showOnce(entry)
|
||||
try {
|
||||
if (typeof navigator !== 'undefined' && typeof navigator.sendBeacon === 'function') {
|
||||
navigator.sendBeacon(REPORT_ENDPOINT, new Blob([JSON.stringify(entry)], { type: 'application/json' }))
|
||||
}
|
||||
} catch {
|
||||
// 上报失败只丢现场,不许把错误处理本身炸掉
|
||||
}
|
||||
}
|
||||
|
||||
/** 最近 N 条内存环(只读快照,排查用)。 */
|
||||
export function recentClientErrors(): ClientErrorPayload[] {
|
||||
return ring.slice()
|
||||
}
|
||||
|
||||
function handleWindowRejection(event: PromiseRejectionEvent): void {
|
||||
reportClientError({
|
||||
kind: 'unhandled-rejection',
|
||||
message: String(event.reason ?? ''),
|
||||
stack: event.reason instanceof Error ? event.reason.stack ?? '' : '',
|
||||
route: typeof location === 'undefined' ? '' : location.pathname,
|
||||
ts: Date.now(),
|
||||
})
|
||||
}
|
||||
|
||||
function handleWindowError(event: ErrorEvent): void {
|
||||
reportClientError({
|
||||
kind: 'window-error',
|
||||
message: event.message || (event.error instanceof Error ? event.error.message : ''),
|
||||
stack: event.error instanceof Error ? event.error.stack ?? '' : '',
|
||||
route: typeof location === 'undefined' ? '' : location.pathname,
|
||||
ts: Date.now(),
|
||||
})
|
||||
}
|
||||
|
||||
let browserEventsInstalled = false
|
||||
|
||||
/** 卸载出口:摘掉两个 window 监听 + 清掉所有还在倒计时的提示定时器。 */
|
||||
export function disposeGlobalErrorReporting(): void {
|
||||
if (typeof window === 'undefined') return
|
||||
window.removeEventListener('unhandledrejection', handleWindowRejection)
|
||||
window.removeEventListener('error', handleWindowError)
|
||||
for (const timer of toastTimers) window.clearTimeout(timer)
|
||||
toastTimers.clear()
|
||||
browserEventsInstalled = false
|
||||
}
|
||||
|
||||
/**
|
||||
* 浏览器级兜底接线(必须由根组件 setup 调用一次):脚本级崩溃与没人接的 Promise
|
||||
* 都收进同一条上报路;卸载配对走 onBeforeUnmount,与用户端 App.vue 的 dispose 口径一致。
|
||||
*/
|
||||
export function useGlobalErrorReporting(): void {
|
||||
if (typeof window === 'undefined' || browserEventsInstalled) return
|
||||
browserEventsInstalled = true
|
||||
window.addEventListener('unhandledrejection', handleWindowRejection)
|
||||
window.addEventListener('error', handleWindowError)
|
||||
onBeforeUnmount(disposeGlobalErrorReporting)
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
/**
|
||||
* 青果提取链接的拼装(后管侧镜像)。
|
||||
*
|
||||
* 正本在**用户端那棵前端树**的同名文件 `src/shared/utils/qingguo-link.ts`。两棵前端树各自独立构建
|
||||
* (各自的 vite root 与 tsconfig include),跨树 import 会把用户端拖进后管的产物图(本仓
|
||||
* `src/config/workspace.ts` 的边界尺子也判这种耦合为违规),所以这里按**同名同形**镜像一份,
|
||||
* 而不是另起一套新逻辑:口径只有一条
|
||||
* `https://overseas.proxy.qg.net/get?key=<Authkey>&pwd=<Authpwd>`
|
||||
* 改这一条 URL 时必须两边同改(用户端那份有 `node --test` 判据钉着)。
|
||||
*
|
||||
* 业务背景(2026-10-31 用户口径、2026-11-02 后台脱敏收口):青果**没有**可填的提取链接,
|
||||
* 产品页只给 Authkey / Authpwd 两个值;后台「代填/改代理」因此改成收这两个值、在这里拼,
|
||||
* 界面上任何时候都不再把拼好的链接回显或留档(链接里带着 pwd)。
|
||||
*
|
||||
* ⚠ 本文件保持**零依赖**:`node --test` 不认 Vite 的 `@/` 别名,带别名的模块进不了
|
||||
* `tests/*.test.ts`,这条拼装规则就没法被用例钉住。
|
||||
*/
|
||||
export const QINGGUO_EXTRACT_URL = 'https://overseas.proxy.qg.net/get'
|
||||
|
||||
export function composeQingguoLink(account: string, password: string): string {
|
||||
const key = (account || '').trim()
|
||||
if (!key) return ''
|
||||
const pwd = (password || '').trim()
|
||||
const query = `key=${encodeURIComponent(key)}` + (pwd ? `&pwd=${encodeURIComponent(pwd)}` : '')
|
||||
return `${QINGGUO_EXTRACT_URL}?${query}`
|
||||
}
|
||||
@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
|
||||
import { fetchCompanies } from '@/api/companies'
|
||||
import type { CompanyItem } from '@/api/companies-dto'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import type { PlatformTabId } from '@/config/platform-scope'
|
||||
import { firstSelectableCompanyId, companyIdForRequest } from '@/layout/company-tab-model'
|
||||
|
||||
/** 公司 tab 的状态。成员 user ids **不在这里缓存**——每次请求交后端解析,
|
||||
@@ -12,6 +14,11 @@ export const useCompanyTabStore = defineStore('company-tab', {
|
||||
activeId: null as number | null,
|
||||
loading: false,
|
||||
loaded: false,
|
||||
/** 当前这份目录是按哪个平台 tab 拉的(V206 平台分侧,2026-11-17 用户口径「公司 tab
|
||||
* 条也按平台分侧,两边各看各的公司」)。空串=还没按平台拉过。早退闸拿它对撞当前
|
||||
* tab:一致才免拉,平台切了就重拉一份;`fetchCompanies` 失败时不翻转它,旧清单
|
||||
* (可能过时)继续顶着,下一次切台/重进页面会再试。 */
|
||||
loadedPlatform: '' as PlatformTabId | '',
|
||||
/** GET /companies 失败时的原因。**只住 store 与 console,不在模板里渲染**——
|
||||
* §12 第 5 条没批任何新的用户可见提示,接口暴露禁令高于"失败可见"。
|
||||
* 取不到目录时 loaded 保持 false ⇒ visibleForOperator 为 false ⇒ tab 条整体不画(fail-closed,观感与改前一致)。 */
|
||||
@@ -35,15 +42,27 @@ export const useCompanyTabStore = defineStore('company-tab', {
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
async initialize() {
|
||||
/** 拉公司目录(按当前平台 tab 过滤,后端 GET /api/admin/companies?platform=…)。
|
||||
* `force`=绕开「该平台已拉过」的早退闸(公司编辑弹窗翻档/启停后的 refresh 用),
|
||||
* 旧清单保留到成功那刻再整份替换,取数期间 tab 条不闪空。 */
|
||||
async initialize(options?: { force?: boolean }) {
|
||||
const session = useAdminSessionStore()
|
||||
if (this.loaded || this.loading || !session.isSuperAdmin) return
|
||||
const platform = usePlatformTabStore().active
|
||||
const alreadyLoadedForThisPlatform = this.loaded && this.loadedPlatform === platform
|
||||
if ((!options?.force && alreadyLoadedForThisPlatform) || this.loading || !session.isSuperAdmin) return
|
||||
this.loading = true
|
||||
// 失败后 loaded 仍是 false ⇒ 下一次 watch 命中超管会重试;重试前先清掉旧原因,免得留着一条已经翻篇的错误。
|
||||
this.error = ''
|
||||
try {
|
||||
this.companies = await fetchCompanies()
|
||||
this.activeId = firstSelectableCompanyId(this.companies)
|
||||
const companies = await fetchCompanies(platform)
|
||||
this.companies = companies
|
||||
this.loadedPlatform = platform
|
||||
// 换台重拉后旧选中未必还在新清单里(跨平台公司不重叠):还在就保住(别的页可能正按它取数),
|
||||
// 不在就回落「id 最小的启用公司」。force 重拉同平台时,选中公司仍在 ⇒ 选中不跳。
|
||||
const stillListed = this.activeId !== null && companies.some((c) => c.id === this.activeId)
|
||||
if (!stillListed) {
|
||||
this.activeId = firstSelectableCompanyId(companies)
|
||||
}
|
||||
this.loaded = true
|
||||
} catch (error) {
|
||||
// 2026-10-05 修复轮 1:改前只有 try/finally ⇒ GET /companies 抛错时零痕迹(loaded 永远 false、
|
||||
@@ -57,6 +76,11 @@ export const useCompanyTabStore = defineStore('company-tab', {
|
||||
this.loading = false
|
||||
}
|
||||
},
|
||||
/** 公司目录被编辑(公司管理翻档/启停/改名)后的强制重拉:不受 loadedPlatform 早退闸
|
||||
* 限制。失败语义与 initialize 同口径(error + rethrow),调用方自行决定要不要提示。 */
|
||||
async refresh() {
|
||||
await this.initialize({ force: true })
|
||||
},
|
||||
setActiveId(id: number) {
|
||||
this.activeId = id
|
||||
},
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import { defineStore } from 'pinia'
|
||||
import { PLATFORM_TABS } from '@/config/platform-scope'
|
||||
import type { PlatformTabId } from '@/config/platform-scope'
|
||||
|
||||
const STORAGE_KEY = 'admin-platform-tab'
|
||||
const DEFAULT_TAB: PlatformTabId = 'amazon'
|
||||
|
||||
function isKnownTab(id: unknown): id is PlatformTabId {
|
||||
return PLATFORM_TABS.some((tab) => tab.id === id)
|
||||
}
|
||||
|
||||
/** 读取持久化偏好;无存储/值非法/存储不可用一律回落亚马逊(隐私模式不阻断交互)。 */
|
||||
function readStoredTab(): PlatformTabId {
|
||||
try {
|
||||
const raw = typeof localStorage === 'undefined' ? null : localStorage.getItem(STORAGE_KEY)
|
||||
return isKnownTab(raw) ? raw : DEFAULT_TAB
|
||||
} catch {
|
||||
return DEFAULT_TAB
|
||||
}
|
||||
}
|
||||
|
||||
function writeStoredTab(id: PlatformTabId): void {
|
||||
try {
|
||||
if (typeof localStorage !== 'undefined') localStorage.setItem(STORAGE_KEY, id)
|
||||
} catch {
|
||||
// localStorage 不可用(隐私模式等)时忽略
|
||||
}
|
||||
}
|
||||
|
||||
/** 侧边栏平台 tab(亚马逊/京东)状态:纯显示分组不参与鉴权(2026-11-16 用户定案)。
|
||||
* 菜单可见性仍由 session.menuTree(后端按权限裁剪)决定,这里只记「当前看哪一侧」。 */
|
||||
export const usePlatformTabStore = defineStore('platform-tab', {
|
||||
state: () => ({
|
||||
active: readStoredTab(),
|
||||
}),
|
||||
actions: {
|
||||
setActive(id: PlatformTabId) {
|
||||
this.active = id
|
||||
writeStoredTab(id)
|
||||
},
|
||||
},
|
||||
})
|
||||
@@ -65,6 +65,22 @@ button, input, textarea, select { font: inherit; }
|
||||
.admin-brand-copy strong { color: var(--admin-text); font-size: 15px; font-weight: 600; letter-spacing: .5px; white-space: nowrap; }
|
||||
.admin-brand-copy span { color: #77899b; font-size: 11px; white-space: nowrap; }
|
||||
|
||||
/* 侧边栏顶部平台 tab(亚马逊/京东,2026-11-16「不混」定案):纯显示分组,只对当前用户
|
||||
* 已授权菜单分侧展示;单侧无可见菜单时整条隐藏(AdminLayout showPlatformTabs)。 */
|
||||
.admin-platform-tabs { display: flex; gap: 6px; padding: 10px 12px 0; }
|
||||
.admin-platform-tab {
|
||||
flex: 1; height: 34px; text-align: center; font-size: 13px; font-weight: 600;
|
||||
color: var(--admin-sidebar-text); background: transparent;
|
||||
border: 1px solid var(--admin-border); border-radius: 9px; cursor: pointer;
|
||||
}
|
||||
.admin-platform-tab:hover { color: #1e3b57; background: rgba(47, 93, 139, 0.16); }
|
||||
.admin-platform-tab.is-active {
|
||||
color: var(--admin-primary-strong);
|
||||
background: linear-gradient(180deg, #dce9f5, #edf4fa);
|
||||
border-color: #b6cbe0;
|
||||
box-shadow: inset 0 2px 0 #5f85ad;
|
||||
}
|
||||
|
||||
.admin-menu-scroll { flex: 1; padding: 12px 10px; }
|
||||
.admin-menu { border-right: 0; background: transparent; }
|
||||
.admin-menu .el-sub-menu__title,
|
||||
|
||||
@@ -4,9 +4,12 @@
|
||||
export type AdminRole = 'super_admin' | 'company_super_admin' | 'admin' | 'normal'
|
||||
|
||||
export interface AdminUser {
|
||||
jdPublishQuota?: number
|
||||
id: number
|
||||
username: string
|
||||
role: string
|
||||
/** 所属平台(V206):'amazon'|'jd',存量默认亚马逊;账号域三页按当前平台 tab 过滤/归类。 */
|
||||
platform?: string
|
||||
/** 1 为管理员标志位;role 为空时可据此推断角色。 */
|
||||
isAdmin?: boolean
|
||||
createdById?: number | null
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
/**
|
||||
* 只让最后一次请求落地(CR-27)。
|
||||
*
|
||||
* 快速切公司/筛选时,先发的请求可能后返回;如果直接写 ref,旧响应会覆盖新结果。
|
||||
* 每个加载函数在发请求前 `begin()` 拿一个 token,回写前 `isCurrent(token)` 验一次;
|
||||
* 新请求一发出,旧 token 立即作废(不需要 AbortController 也能丢掉晚到的响应)。
|
||||
*/
|
||||
export interface LatestRequestGate {
|
||||
/** 开一次新请求并作废之前所有 token(含未返回的那些)。 */
|
||||
begin(): number
|
||||
/** 这个 token 是否仍是最后一次 `begin()` 发出的。 */
|
||||
isCurrent(token: number): boolean
|
||||
}
|
||||
|
||||
export function createLatestRequestGate(): LatestRequestGate {
|
||||
let latest = 0
|
||||
return {
|
||||
begin(): number {
|
||||
latest += 1
|
||||
return latest
|
||||
},
|
||||
isCurrent(token: number): boolean {
|
||||
// token 只由 begin() 发出(从 1 起);0 不是合法 token,避免未发请求时误判为当前
|
||||
return token > 0 && token === latest
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -52,15 +52,46 @@ test('align_dup_console_pagination_all_lists', () => {
|
||||
// 且分布/矩阵/详情常显(不足一页也显示分页器,反馈:数据少时看不到分页)。
|
||||
const page = readSource('src/pages/tasks/DuplicateCheckPage.vue')
|
||||
assert.match(page, /:total="distCount"/, '店铺上架分布有分页器(常显)')
|
||||
assert.match(page, /:total="dupRows\.length"/, '撞款覆盖矩阵有分页器(常显)')
|
||||
assert.match(page, /v-for="item in dupCardRows"/, '撞款详情卡片绑定分页切片')
|
||||
assert.match(page, /:total="dupRows\.length"[\s\S]*dupCardPageSize/, '撞款详情卡片有分页器(常显)')
|
||||
// B60:撞款行改由服务端切窗口,矩阵与详情卡片读同一窗 ⇒ 两个分页器必须共用同一个游标
|
||||
// (各自独立翻页在"一窗"的形状下已经不可表示,留着就是界面说一套、请求发另一套)。
|
||||
assert.match(page, /:total="totalDupCount"[\s\S]*:page="matrixPage"/, '撞款覆盖矩阵分页器绑服务端总数与行窗口游标')
|
||||
assert.match(page, /v-for="item in dupItems"/, '撞款详情卡片绑这一窗行集')
|
||||
assert.match(page, /:total="totalDupCount"[\s\S]*:page-size="matrixPageSize"/, '撞款详情卡片分页器与矩阵同游标')
|
||||
assert.doesNotMatch(page, /dupCardPage/, '卡片不再自持一个分页游标(同窗就是同游标)')
|
||||
assert.doesNotMatch(page, /matrixRows/, '矩阵不再客户端切片(行窗口是服务端切的)')
|
||||
assert.match(page, /<OldPagination[^>]*:total="distCount"/, '分布分页器无 v-if 条件')
|
||||
assert.match(page, /<OldPagination[^>]*:total="dupRows\.length"/, '矩阵/详情分页器无 v-if 条件')
|
||||
assert.match(page, /<OldPagination[^>]*:total="totalDupCount"/, '矩阵/详情分页器无 v-if 条件')
|
||||
assert.match(page, /v-for="group in pagedGroupStats"/, '分组说明抽屉表绑定分页切片')
|
||||
assert.match(page, /:total="groupStats\.length"/, '分组说明抽屉表有分页器')
|
||||
})
|
||||
|
||||
/**
|
||||
* B60 的前后两处出口:行窗口三键要真发出去,矩阵格子要一次算完。
|
||||
* 反向自证:把 api 改回不带 page/page_size、或把模板改回逐格 filter,即红。
|
||||
*/
|
||||
test('align_dup_console_b60_row_window_and_precomputed_cells', () => {
|
||||
const api = readSource('src/pages/tasks/duplicate-console-api.ts')
|
||||
assert.match(api, /page, page_size: pageSize/, 'console 请求带行窗口参数')
|
||||
assert.match(api, /query\.dup_group = group/, 'console 请求带分组裁行参数')
|
||||
assert.doesNotMatch(api, /多余分页参数后端忽略/, '旧注释说分页参数被后端忽略,现在后端认了')
|
||||
|
||||
const page = readSource('src/pages/tasks/DuplicateCheckPage.vue')
|
||||
// 矩阵窗口那一层已从页面拆进 `duplicate-matrix-window.ts`(B60 之后本页顶在可读性基线的
|
||||
// 超长文件名单上,只许减)。绊线跟着搬,判据一字不松:改回逐格 filter 照样红。
|
||||
const matrix = readSource('src/pages/tasks/duplicate-matrix-window.ts')
|
||||
assert.match(page, /useDuplicateMatrix\(/, '页面接的是矩阵窗口组合式')
|
||||
assert.match(matrix, /buildMatrixCells\(/, '矩阵格子一次预聚合')
|
||||
assert.match(matrix, /MATRIX_COLUMN_WINDOW = 40/, '列数有窗口上限(按列切窗)')
|
||||
assert.match(page, /v-for="\(cell, index\) in row\.cells"/, '模板只读预聚合好的格子')
|
||||
assert.doesNotMatch(page, /function cellCount\(/, '逐格 filter 那套函数已收掉')
|
||||
assert.doesNotMatch(matrix, /function cellCount\(/, '窗口组合式里也不许再长出逐格 filter')
|
||||
|
||||
const service = readSource('../backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckQueryService.java')
|
||||
assert.match(service, /consoleData\(DuplicateScanView view, Set<String> visibleKeys, Filters filters,\s*\n?\s*int page, int pageSize, String dupGroup\)/,
|
||||
'服务端 console 收行窗口与分组参数')
|
||||
assert.match(service, /"total_dup", total,/, 'total_dup 是未分页总数,不是本页行数')
|
||||
})
|
||||
|
||||
test('align_dup_console_ledger_total_preload', () => {
|
||||
const page = readSource('src/pages/tasks/DuplicateCheckPage.vue')
|
||||
assert.match(page, /onMounted\(\(\) => \{\s*loadConsole\(\).*loadLedger\(1\)/s, '挂载即预取台账计数')
|
||||
|
||||
@@ -45,7 +45,8 @@ test('align_tutorial_api_contract', () => {
|
||||
assert.match(api, /\$\{TUTORIAL_UPLOAD_ENDPOINT\}\/confirm/, '确认端点')
|
||||
assert.match(api, /\$\{TUTORIAL_UPLOAD_ENDPOINT\}\/delete/, '删除端点')
|
||||
assert.match(api, /params: \{ file_name: fileName, version \}/, '预签名回传文件名与版本号')
|
||||
assert.match(api, /params: \{ object_key: objectKey, file_name: fileName, version \}/, '确认回传对象 key、文件名与版本号')
|
||||
assert.match(api, /params: Record<string, string> = \{ object_key: objectKey, file_name: fileName, version \}/, '确认回传对象 key、文件名与版本号')
|
||||
assert.match(api, /if \(fileKey\) params\.file_key = fileKey/, '分片拼装件的 file_key 必须随确认一起回传')
|
||||
assert.match(api, /withCredentials: false/, '直传实例不挂会话拦截器')
|
||||
})
|
||||
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
import { adminPages } from '../src/router/routes.ts'
|
||||
import { OPERATION_GUIDES } from '../src/layout/operation-guides.ts'
|
||||
|
||||
/** 工作台客户端包管理页:独立渠道、上传直传、服务端 sha256。 */
|
||||
|
||||
test('align_workbench_client_page_registered', () => {
|
||||
const page = adminPages.find((p) => p.path === 'records/workbench-client-package')
|
||||
assert.ok(page, '路由注册表应包含 records/workbench-client-package')
|
||||
assert.equal(page.menuKey, 'admin_workbench_client_package')
|
||||
assert.equal(page.title, '数富AI工作台客户端包管理')
|
||||
assert.equal(page.companyScoped, false, '客户端包是全平台共享资源,不按公司隔离')
|
||||
})
|
||||
|
||||
test('align_workbench_client_page_wiring', () => {
|
||||
const page = readSource('src/pages/records/WorkbenchClientPackagePage.vue')
|
||||
// 上传:版本号必填 → zip → 直传(进度条)→ 成功提示留驻弹窗。
|
||||
assert.match(page, /上传客户端包/, '存在上传入口按钮')
|
||||
assert.match(page, /uploadWorkbenchClientPackage/, '上传走工作台客户端包直传链路')
|
||||
assert.match(page, /label="版本号" required/, '上传弹窗要求填写版本号')
|
||||
assert.match(page, /请填写版本号/, '未填版本号时提示')
|
||||
assert.match(page, /不能带 v 前缀/, '版本号格式校验提示与上传接口契约一致')
|
||||
assert.match(page, /仅支持 \.zip 格式/, '格式校验提示')
|
||||
assert.match(page, /上传成功,客户端已可检测到新版本/, '成功提示说明客户端已能检测更新')
|
||||
// 列表:当前生效标记、sha256、下载、删除、空态。
|
||||
assert.match(page, /当前生效/, '最新上传的包标记当前生效')
|
||||
assert.match(page, /sha256/, '展示服务端复算的摘要')
|
||||
assert.match(page, /formatFileSize/, '展示包体大小')
|
||||
assert.match(page, /确认删除选中的/, '批量删除二次确认')
|
||||
assert.match(page, /暂无客户端包记录/, '空态文案')
|
||||
})
|
||||
|
||||
test('align_workbench_client_api_contract', () => {
|
||||
const api = readSource('src/pages/records/workbench-client-api.ts')
|
||||
assert.match(api, /\/api\/admin\/workbench-client\/packages/, '列表端点')
|
||||
assert.match(api, /WORKBENCH_CLIENT_PACKAGE_ENDPOINT = '\/api\/admin\/workbench-client\/package'/, '上传端点前缀')
|
||||
assert.match(api, /\$\{WORKBENCH_CLIENT_PACKAGE_ENDPOINT\}\/presign/, '直传预签名端点')
|
||||
assert.match(api, /\$\{WORKBENCH_CLIENT_PACKAGE_ENDPOINT\}\/confirm/, '确认端点')
|
||||
assert.match(api, /\$\{WORKBENCH_CLIENT_PACKAGE_ENDPOINT\}\/delete/, '删除端点')
|
||||
assert.match(api, /params: \{ file_name: fileName, version \}/, '预签名回传文件名与版本号')
|
||||
assert.match(api, /params: \{ object_key: objectKey, file_name: fileName, version \}/, '确认回传对象 key、文件名与版本号')
|
||||
assert.match(api, /withCredentials: false/, '直传实例不挂会话拦截器')
|
||||
})
|
||||
|
||||
test('align_workbench_client_model_parsers', () => {
|
||||
const model = readSource('src/pages/records/workbench-client-model.ts')
|
||||
assert.match(model, /r\.file_name \?\? r\.fileName/, '兼容 snake/camel 文件名')
|
||||
assert.match(model, /r\.file_url \?\? r\.fileUrl/, '兼容 snake/camel 下载链接')
|
||||
assert.match(model, /r\.file_size \?\? r\.fileSize/, '兼容 snake/camel 文件大小')
|
||||
assert.match(model, /r\.object_key \?\? r\.objectKey/, '兼容 snake/camel 对象 key')
|
||||
assert.match(model, /r\.sha256/, '解析 sha256')
|
||||
assert.match(model, /isValidWorkbenchClientVersion/, '版本号必填校验')
|
||||
assert.match(model, /\^\\d\+\\\.\\d\+\\\.\\d\+\$/, '版本号仅接受纯数字 x.y.z')
|
||||
})
|
||||
|
||||
test('align_workbench_client_guide_registered', () => {
|
||||
const guide = OPERATION_GUIDES.admin_workbench_client_package
|
||||
assert.ok(guide, '每个菜单页都必须有操作提示')
|
||||
assert.match(guide.text, /sha256/, '提示说明服务端会复算摘要')
|
||||
})
|
||||
@@ -0,0 +1,99 @@
|
||||
/**
|
||||
* 外观专利无侵权数据页筛选纯函数(v1.3 AC-5)—— Phase 3 激活。
|
||||
*
|
||||
* 1. **snake 参数形状**:toAppearancePatentCleanListParams({...}) 产出
|
||||
* `page`/`page_size`(默认 10、上限 100)、`task_id`、`asin`、`country`、
|
||||
* `start_date`/`end_date`(ISO yyyy-MM-dd;空白不下发)——与后端 §3.2 参数归一逐字对撞;
|
||||
* 2. **分页钳制**(铁律 15):page < 1 归 1;page_size 上限 100;
|
||||
* `(page-1)*page_size` 溢出边界样本(page 极大值不得把乘积顶成负数/溢出)。
|
||||
*
|
||||
* 跑法:`node --test tests/appearance-patent-clean-filter.test.ts`(node --test 只收顶层
|
||||
* `tests/*.test.ts`,不递归;纯函数零依赖可直测)
|
||||
*/
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
|
||||
import {
|
||||
APPEARANCE_PATENT_CLEAN_MAX_PAGE,
|
||||
createAppearancePatentCleanFilterState,
|
||||
toAppearancePatentCleanExportParams,
|
||||
toAppearancePatentCleanListParams,
|
||||
} from '../src/pages/patent/appearance-patent-clean-filter.ts'
|
||||
|
||||
test('AC-5 筛选参数——snake page/page_size/task_id/asin/country/group_id/start_date/end_date 形状', () => {
|
||||
const full = toAppearancePatentCleanListParams(
|
||||
{ taskId: '33179', asin: ' B0AB8CDEF9 ', country: 'DE', groupId: ' 7 ', startDate: '2026-11-01', endDate: '2026-11-09' },
|
||||
2,
|
||||
20,
|
||||
)
|
||||
// snake 逐字对撞后端 §3.2;ASIN 前后空白被构造器剥掉(后端服务侧再 trim 一次是双保险)。
|
||||
// 分组(主管=组长,2026-11-11 客户口径「就是分组」):group_id 下发,选中行是分组管理里那一行。
|
||||
assert.deepEqual(full, {
|
||||
page: 2,
|
||||
page_size: 20,
|
||||
task_id: 33179,
|
||||
asin: 'B0AB8CDEF9',
|
||||
country: 'DE',
|
||||
group_id: 7,
|
||||
start_date: '2026-11-01',
|
||||
end_date: '2026-11-09',
|
||||
})
|
||||
|
||||
// 空白/非法值不下发:全空态只有分页两项;非法日期与空串同罪。
|
||||
const blank = toAppearancePatentCleanListParams(createAppearancePatentCleanFilterState(), 1, 10)
|
||||
assert.deepEqual(blank, { page: 1, page_size: 10 })
|
||||
const dirty = toAppearancePatentCleanListParams(
|
||||
{ taskId: 'abc', asin: ' ', country: '', groupId: 'abc', startDate: '2026/11/01', endDate: 'not-a-date' },
|
||||
1,
|
||||
10,
|
||||
)
|
||||
assert.deepEqual(dirty, { page: 1, page_size: 10 })
|
||||
assert.equal('task_id' in dirty, false, '非数字任务号不下发')
|
||||
assert.equal('group_id' in dirty, false, '非数字分组 id 不下发')
|
||||
assert.equal('start_date' in dirty, false, '非法日期不下发')
|
||||
})
|
||||
|
||||
test('AC-5 筛选参数——page 钳制防 (page-1)*page_size 溢出(铁律 15)', () => {
|
||||
// page < 1 归 1;page_size 下限 1、默认 10、上限 100。
|
||||
const low = toAppearancePatentCleanListParams(createAppearancePatentCleanFilterState(), 0, 0)
|
||||
assert.equal(low.page, 1, 'page<1 归 1')
|
||||
assert.equal(low.page_size, 10, 'page_size 非法回默认 10')
|
||||
const big = toAppearancePatentCleanListParams(createAppearancePatentCleanFilterState(), 3, 500)
|
||||
assert.equal(big.page_size, 100, 'page_size 上限 100')
|
||||
|
||||
// 溢出边界:page 极大值钳到 10_000(与后端 MAX_PAGE 同值),乘积 999_900 必须还是安全整数——
|
||||
// 不钳的话 (Number.MAX_SAFE_INTEGER-1)*100 直接顶出安全整数域,翻页偏移就不再可靠。
|
||||
const extreme = toAppearancePatentCleanListParams(createAppearancePatentCleanFilterState(), Number.MAX_SAFE_INTEGER, 100)
|
||||
assert.equal(extreme.page, APPEARANCE_PATENT_CLEAN_MAX_PAGE)
|
||||
const offset = (extreme.page - 1) * extreme.page_size
|
||||
assert.equal(Number.isSafeInteger(offset), true, `(page-1)*page_size=${offset} 必须留在安全整数域`)
|
||||
assert.equal(offset, 999_900)
|
||||
})
|
||||
|
||||
test('导出参数——与列表同一过滤面单出口(无分页,空白/非法值不下发)', () => {
|
||||
// 同一过滤态下导出与列表的过滤面字段逐字同源(防「页签筛了公司、导出全量」的两处各算各的)。
|
||||
const state = { taskId: '33179', asin: ' B0AB8CDEF9 ', country: 'de', groupId: '7', startDate: '2026-11-01', endDate: '' }
|
||||
const list = toAppearancePatentCleanListParams(state, 3, 20)
|
||||
const exp = toAppearancePatentCleanExportParams(state)
|
||||
for (const key of Object.keys(exp) as Array<keyof typeof exp>) {
|
||||
assert.equal((list as Record<string, unknown>)[key], exp[key], `导出与列表的 ${key} 必须同源`)
|
||||
}
|
||||
assert.equal('page' in exp, false, '导出参数无分页(全量导出由服务侧上限兜住)')
|
||||
assert.deepEqual(exp, {
|
||||
task_id: 33179,
|
||||
asin: 'B0AB8CDEF9',
|
||||
country: 'de',
|
||||
group_id: 7,
|
||||
start_date: '2026-11-01',
|
||||
})
|
||||
|
||||
// 全空态零字段;非法日期与非数字任务号/分组同列表口径不下发。
|
||||
assert.deepEqual(toAppearancePatentCleanExportParams(createAppearancePatentCleanFilterState()), {})
|
||||
assert.deepEqual(
|
||||
toAppearancePatentCleanExportParams(
|
||||
{ taskId: 'abc', asin: ' ', country: '', groupId: 'abc', startDate: '2026/11/01', endDate: 'not-a-date' },
|
||||
),
|
||||
{},
|
||||
'脏值不下发,与列表参数归一规则逐字同源',
|
||||
)
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,117 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import {
|
||||
createBrandGatingFilter,
|
||||
createBrandGatingForm,
|
||||
parseBrandGatingAddResult,
|
||||
parseBrandGatingImportResult,
|
||||
parseBrandGatingPage,
|
||||
parseBrandGatingStats,
|
||||
toBrandGatingQuery,
|
||||
validateBrandGatingForm,
|
||||
} from '../src/pages/tasks/brand-gating-model.ts'
|
||||
|
||||
test('brand_gating_form_defaults_match_desktop', () => {
|
||||
const form = createBrandGatingForm()
|
||||
assert.equal(form.country, '全部')
|
||||
assert.equal(form.gatingType, '品牌gating')
|
||||
assert.equal(form.brand, '')
|
||||
assert.equal(validateBrandGatingForm(form), '请填写品牌')
|
||||
assert.equal(validateBrandGatingForm({ ...form, brand: ' tory burch ' }), '')
|
||||
})
|
||||
|
||||
test('brand_gating_query_omits_empty_and_all_sentinel', () => {
|
||||
const filter = createBrandGatingFilter()
|
||||
assert.deepEqual(toBrandGatingQuery(filter, 1, 10), { page: 1, size: 10 })
|
||||
|
||||
filter.country = '全部'
|
||||
filter.gatingType = '全部'
|
||||
filter.source = '全部'
|
||||
assert.deepEqual(toBrandGatingQuery(filter, 2, 20), { page: 2, size: 20 })
|
||||
|
||||
filter.keyword = ' tory '
|
||||
filter.country = '英国'
|
||||
filter.gatingType = '类目gating'
|
||||
filter.status = '1'
|
||||
filter.source = 'AUTO'
|
||||
assert.deepEqual(toBrandGatingQuery(filter, 3, 50), {
|
||||
page: 3,
|
||||
size: 50,
|
||||
keyword: 'tory',
|
||||
country: '英国',
|
||||
gatingType: '类目gating',
|
||||
status: '1',
|
||||
source: 'AUTO',
|
||||
})
|
||||
})
|
||||
|
||||
test('brand_gating_page_parses_camel_rows_and_skips_invalid', () => {
|
||||
const page = parseBrandGatingPage({
|
||||
total: 2,
|
||||
rows: [
|
||||
{
|
||||
id: 7,
|
||||
brand: 'tory burch',
|
||||
asin: 'B000000001',
|
||||
country: '英国',
|
||||
gatingType: '品牌gating',
|
||||
status: 1,
|
||||
source: 'MANUAL',
|
||||
shopName: 'ShopA',
|
||||
remark: '排查同步',
|
||||
createdAt: '2026-10-24 10:00:00',
|
||||
updatedAt: '2026-10-24 10:00:00',
|
||||
disabledAt: null,
|
||||
},
|
||||
{ brand: '缺 id' },
|
||||
],
|
||||
})
|
||||
assert.equal(page.total, 2)
|
||||
assert.equal(page.rows.length, 1)
|
||||
const row = page.rows[0]
|
||||
assert.equal(row.id, 7)
|
||||
assert.equal(row.gatingType, '品牌gating')
|
||||
assert.equal(row.status, 1)
|
||||
assert.equal(row.disabledAt, '')
|
||||
assert.equal(row.createdAt, '2026-10-24 10:00:00')
|
||||
})
|
||||
|
||||
test('brand_gating_stats_parses_groups_and_missing_fields', () => {
|
||||
const stats = parseBrandGatingStats({
|
||||
total: 9,
|
||||
active: 6,
|
||||
disabled: 3,
|
||||
brands: 5,
|
||||
byType: [
|
||||
{ name: '品牌gating', count: 4 },
|
||||
{ name: '', count: 99 },
|
||||
{ count: 1 },
|
||||
],
|
||||
byCountry: [{ name: '英国', count: 3 }],
|
||||
})
|
||||
assert.equal(stats.total, 9)
|
||||
assert.equal(stats.active, 6)
|
||||
assert.equal(stats.brands, 5)
|
||||
assert.deepEqual(stats.byType, [{ name: '品牌gating', count: 4 }])
|
||||
assert.deepEqual(stats.byCountry, [{ name: '英国', count: 3 }])
|
||||
assert.deepEqual(stats.bySource, [])
|
||||
|
||||
const empty = parseBrandGatingStats(null)
|
||||
assert.deepEqual(empty, {
|
||||
total: 0,
|
||||
active: 0,
|
||||
disabled: 0,
|
||||
brands: 0,
|
||||
byType: [],
|
||||
byCountry: [],
|
||||
bySource: [],
|
||||
})
|
||||
})
|
||||
|
||||
test('brand_gating_add_and_import_results', () => {
|
||||
assert.equal(parseBrandGatingAddResult({ added: 1 }), true)
|
||||
assert.equal(parseBrandGatingAddResult({ added: 0 }), false)
|
||||
assert.equal(parseBrandGatingAddResult(null), false)
|
||||
assert.deepEqual(parseBrandGatingImportResult({ added: 3, skipped: 2 }), { added: 3, skipped: 2 })
|
||||
assert.deepEqual(parseBrandGatingImportResult(null), { added: 0, skipped: 0 })
|
||||
})
|
||||
@@ -11,6 +11,16 @@ import { adminPages } from '../src/router/routes.ts'
|
||||
|
||||
const MIGRATION = join(process.cwd(), '..', 'backend-java', 'src', 'main', 'resources', 'db',
|
||||
'V143__company_and_users_company_id.sql')
|
||||
const BRAND_GATING_MIGRATION = join(process.cwd(), '..', 'backend-java', 'src', 'main', 'resources', 'db',
|
||||
'V174__restore_admin_brand_gating_menu.sql')
|
||||
const KEYWORD_USAGE_MIGRATION = join(process.cwd(), '..', 'backend-java', 'src', 'main', 'resources', 'db',
|
||||
'V175__move_gating_and_add_keyword_usage_menu.sql')
|
||||
const JD_DATABASE_MIGRATION = join(process.cwd(), '..', 'backend-java', 'src', 'main', 'resources', 'db',
|
||||
'V196__jd_database_menu.sql')
|
||||
/** V204 插入的「京东分类管理」菜单行已随 2026-11-17 用户口径「京东分类管理并到京东数据库
|
||||
* 分类编辑里」由 V208 删除(页面并入 JdDatabasePage 工具栏「分类管理」对话框)。 */
|
||||
const JD_CATEGORY_MANAGE_DROP_MIGRATION = join(process.cwd(), '..', 'backend-java', 'src', 'main', 'resources', 'db',
|
||||
'V208__drop_jd_category_manage_menu.sql')
|
||||
|
||||
interface MigrationMenu {
|
||||
name: string
|
||||
@@ -57,3 +67,74 @@ test('V143 的「公司管理」菜单落到已注册的公司管理页', () =>
|
||||
assert.equal(page.path, companies.routePath, '库里的 route_path 应与注册表路径一致')
|
||||
assert.equal(page.title, companies.name, '页面标题应与菜单名一致')
|
||||
})
|
||||
|
||||
test('V174 恢复的「品牌Gating库」菜单 key 必须在路由注册表登记', () => {
|
||||
const sql = readFileSync(BRAND_GATING_MIGRATION, 'utf8')
|
||||
const menus = menusInsertedBy(sql)
|
||||
const insertCount = (sql.match(/INSERT INTO `columns`/g) || []).length
|
||||
assert.ok(menus.length > 0, 'V174 应当插入后台菜单,一条都没解析出来说明正则失效')
|
||||
assert.equal(menus.length, insertCount, `解析到 ${menus.length} 条,但迁移有 ${insertCount} 条 INSERT INTO columns`)
|
||||
|
||||
const gating = menus.find((menu) => menu.columnKey === 'admin_brand_gating')
|
||||
assert.ok(gating, 'V174 必须插入 admin_brand_gating 菜单')
|
||||
const page = adminPages.find((item) => item.menuKey === 'admin_brand_gating')
|
||||
assert.ok(page, 'routes.ts 必须有 admin_brand_gating 页面,否则菜单点进去 404')
|
||||
assert.equal(page.title, gating.name, '页面标题应与菜单名一致')
|
||||
assert.equal(page.companyScoped, false, 'Gating 库全平台共享,不参与公司 tab')
|
||||
})
|
||||
|
||||
test('V175 新增的关键词使用记录菜单 key 必须在路由注册表登记', () => {
|
||||
const sql = readFileSync(KEYWORD_USAGE_MIGRATION, 'utf8')
|
||||
const menus = menusInsertedBy(sql)
|
||||
const insertCount = (sql.match(/INSERT INTO `columns`/g) || []).length
|
||||
assert.ok(menus.length > 0, 'V175 应当插入后台菜单,一条都没解析出来说明正则失效')
|
||||
assert.equal(menus.length, insertCount, `解析到 ${menus.length} 条,但迁移有 ${insertCount} 条 INSERT INTO columns`)
|
||||
|
||||
const menu = menus.find((item) => item.columnKey === 'admin_keyword_usage')
|
||||
assert.ok(menu, 'V175 必须插入 admin_keyword_usage 菜单')
|
||||
const page = adminPages.find((item) => item.menuKey === 'admin_keyword_usage')
|
||||
assert.ok(page, 'routes.ts 必须有 admin_keyword_usage 页面,否则菜单点进去 404')
|
||||
assert.equal(page.title, menu.name, '页面标题应与菜单名一致')
|
||||
assert.equal(page.companyScoped, true, '关键词记录按公司 tab 取数')
|
||||
|
||||
// 品牌Gating库由数据管理组迁到店铺管理组,排序 85;关键词记录 86,紧随其后。
|
||||
assert.ok(sql.includes('SET col.`parent_id` = grp.`id`'), 'V175 必须把品牌Gating库迁到店铺管理组')
|
||||
assert.ok(sql.includes('col.`sort_order` = 85'), '品牌Gating库排序应为 85')
|
||||
})
|
||||
|
||||
test('V196 新增的京东数据库菜单 key 必须在路由注册表登记', () => {
|
||||
const sql = readFileSync(JD_DATABASE_MIGRATION, 'utf8')
|
||||
const menus = menusInsertedBy(sql)
|
||||
const insertCount = (sql.match(/INSERT INTO `columns`/g) || []).length
|
||||
assert.ok(menus.length > 0, 'V196 应当插入后台菜单,一条都没解析出来说明正则失效')
|
||||
assert.equal(menus.length, insertCount, `解析到 ${menus.length} 条,但迁移有 ${insertCount} 条 INSERT INTO columns`)
|
||||
|
||||
const menu = menus.find((item) => item.columnKey === 'admin_jd_database')
|
||||
assert.ok(menu, 'V196 必须插入 admin_jd_database 菜单')
|
||||
const page = adminPages.find((item) => item.menuKey === 'admin_jd_database')
|
||||
assert.ok(page, 'routes.ts 必须有 admin_jd_database 页面,否则菜单点进去 404')
|
||||
assert.equal(page.path, menu.routePath, '库里的 route_path 应与注册表路径一致')
|
||||
assert.equal(page.title, menu.name, '页面标题应与菜单名一致')
|
||||
// 2026-11-16 用户定案「删除掉公司 tab,参考品牌数据库」:数据全平台公共(行 company_id
|
||||
// 只剩同步来源标记),页面退出公司 tab 注册表、取数口不带 company_id ⇒ meta 必须 false
|
||||
// (true 会画出 tab 而取数不带参=点了没反应;同品牌数据库 admin_invalid_asin_data 的形状)。
|
||||
assert.equal(page.companyScoped, false, '京东数据库全平台公共,不画公司 tab(V196 当时的按公司隔离口径已被推翻)')
|
||||
|
||||
// 每公司一套树(公司 1 模板行 + 其余公司复制),挂数据管理组、排序 68(V190 外观专利占 67)。
|
||||
assert.ok(sql.includes("grp.`column_key` = 'admin_group_data'"), 'V196 必须把京东数据库挂到数据管理组')
|
||||
assert.ok(/'京东数据库', 'admin_jd_database', 'admin', 'jd-center\/database', 68/.test(sql), '京东数据库排序应为 68')
|
||||
assert.ok(!sql.includes('user_column_permission'), 'V196 不得预插授权行(默认仅超管可见)')
|
||||
})
|
||||
|
||||
test('V208 删掉 V204 的京东分类管理菜单行,且注册表不再认这个 key(2026-11-17 分类管理并入京东数据库页)', () => {
|
||||
// V204 本体已应用不可回改(铁律 10,文件原样保留作历史取证);下线动作由 V208 出 DELETE,
|
||||
// 页面并入京东数据库页工具栏「分类管理」对话框。
|
||||
const sql = readFileSync(JD_CATEGORY_MANAGE_DROP_MIGRATION, 'utf8')
|
||||
assert.ok(sql.includes("DELETE FROM `columns` WHERE `column_key` = 'admin_jd_category_manage'"),
|
||||
'V208 必须 DELETE admin_jd_category_manage 菜单行(授权行随外键 CASCADE)')
|
||||
|
||||
const registered = adminPages.find((item) => item.menuKey === 'admin_jd_category_manage')
|
||||
assert.ok(!registered, 'routes.ts 不得再登记 admin_jd_category_manage(页面已并入京东数据库页,残留=404 入口)')
|
||||
const jdRouteGone = !adminPages.some((item) => item.path === 'jd-center/categories')
|
||||
assert.ok(jdRouteGone, 'jd-center/categories 路由必须下线')
|
||||
})
|
||||
|
||||
@@ -70,12 +70,14 @@ function escapeRegExp(text: string): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* 全部 21 个字面发送口:批次 1 的任务看板 5 处 + 批次 2(控制方 2026-10-05 点名「切 tab 数据还一样」那五页)7 处
|
||||
* 全部 25 个字面发送口:批次 1 的任务看板 5 处 + 批次 2(控制方 2026-10-05 点名「切 tab 数据还一样」那五页)7 处
|
||||
* + 批次 3(控制方 2026-10-05 点名「店铺撞款监控 店铺数据也要做隔离」那两页)4 处
|
||||
* + 批次 4(控制方 2026-10-05 点名「菜单权限和用户管理也要区分公司 tab 的数据」里的用户管理)1 处
|
||||
* + 批次 5(控制方 2026-10-06 点名「店铺密钥管理的数据按照公司区分」)1 处
|
||||
* + 批次 6(控制方 2026-10-06 点名「菜单权限也加字段来区分」)3 处:菜单目录 / 新建菜单 / 用户管理里的授权树。
|
||||
* + 批次 6(控制方 2026-10-06 点名「菜单权限也加字段来区分」)3 处:菜单目录 / 新建菜单 / 用户管理里的授权树
|
||||
* + 批次 7(2026-11-10 v1.3 外观专利无侵权数据)2 处:只读列表 + 导出(2026-11-11 客户需求「数据得导出来」)。
|
||||
* 批次 2 原 12 处里的品牌库 1 处 + 商品类目 4 处,随 2026-10-06「这两页退回全平台共享」一并摘掉。
|
||||
* 批次 8 原 2 处(京东数据库列表/类目)随 2026-11-16「删除掉公司 tab,参考品牌数据库」一并摘掉。
|
||||
*
|
||||
* <p>`window` 的取法:本轮实扫的 own(到自己那行的距离)+ ≥150 余量,且当同文件还有下一个同名发送口时必须
|
||||
* `window < next`。own/next 不写死在这里——下面「窗口与真文件对平」那条用例逐处从真文件重算,
|
||||
@@ -122,6 +124,18 @@ const SEND_POINTS: ReadonlyArray<SendPoint> = [
|
||||
{ menuKey: 'admin_columns', file: 'src/pages/account/menu-manage-api.ts', fn: 'fetchMenuManageNodes', line: TASK_CENTER_SEND_LINE, window: 300, title: 'GET /permission-menus 目录(超管不带就把两家的同名行混成一排下发)' },
|
||||
{ menuKey: 'admin_columns', file: 'src/pages/account/menu-manage-api.ts', fn: 'createMenu', line: TASK_CENTER_SEND_LINE, window: 300, title: 'POST /permission-menus 新建:归属由端点参数决定,前端不从树里猜' },
|
||||
{ menuKey: 'admin_users', file: 'src/pages/account/user-menu-auth-api.ts', fn: 'fetchGrantableMenus', line: TASK_CENTER_SEND_LINE, window: 300, title: 'GET /permission-menus?grantableOnly 授权树:一家一套树后取错公司=已授权勾不上、提交必判无效' },
|
||||
// ↓ 批次 7(2026-11-10 v1.3 外观专利无侵权数据):出表成功自动同步的只读明细,归属物化在行
|
||||
// company_id 列(V189,同店铺密钥形状)⇒ 后端正门 readCompanyIdOrOwn;2026-11-11 客户需求
|
||||
// 「数据得导出来」补导出发送口(与列表共用同一过滤面与正门)。这一页共两个发送口
|
||||
// (同日曾加的 /supervisors 取数与按主管删除两口,随当晚「恢复昨天那个明细表格式」一并
|
||||
// 下架——后端接口保留,前端发送口撤,重上时从 e1767faf 历史找回再登记)。
|
||||
// 窗口 500:own 实测 416(groupId 行加入后),同文件两条塞键行的间距 1585 ⇒
|
||||
// 500 够得着自己、够不到隔壁(对平用例逐处从真文件重算,注释过期即红)。
|
||||
{ menuKey: 'admin_appearance_patent_clean_items', file: 'src/pages/patent/appearance-patent-clean-api.ts', fn: 'fetchAppearancePatentCleanList', line: 'if (params.companyId != null) query.company_id = params.companyId', window: 500, title: 'GET /appearance-patent-clean-items 无侵权只读列表' },
|
||||
{ menuKey: 'admin_appearance_patent_clean_items', file: 'src/pages/patent/appearance-patent-clean-api.ts', fn: 'exportAppearancePatentCleanList', line: 'if (params.companyId != null) query.company_id = params.companyId', window: 500, title: 'GET /appearance-patent-clean-items/export 导出(2026-11-11 客户需求「数据得导出来」,与列表共用同一过滤面)' },
|
||||
// 批次 8(2026-11-14 v1.4 京东数据库)的两条发送口(列表/类目下拉)已于 2026-11-16 随
|
||||
// 「删除掉公司 tab,参考品牌数据库」整批摘下(后端读侧谓词同窗撤,重上时从 git 历史找回);
|
||||
// 「不得回流」由文件末尾「公司维度不得回流」清单看守(admin_jd_database 已入列)。
|
||||
]
|
||||
|
||||
/** 任务看板那 5 处(1b ④ 那条用例按文件筛它们,沿用旧名字不漂;表只有一份,不会漂出两个口径)。 */
|
||||
@@ -227,6 +241,14 @@ const COMPANY_ID_SOURCE_PINS: Readonly<Record<string, readonly CompanyIdPin[]>>
|
||||
// 批次 3 的两页同样由 SEND_POINTS 现算(撞款控制台三处发送口 = 三条钉)。
|
||||
admin_shop_data_duplicate_check: pinsFor('admin_shop_data_duplicate_check'),
|
||||
admin_shop_data_crawl_tasks: pinsFor('admin_shop_data_crawl_tasks'),
|
||||
// 2026-10-25 关键词使用记录:三个 GET 共用 toQuery,company_id 只许取函数自己的 params.companyId。
|
||||
admin_keyword_usage: [
|
||||
{
|
||||
file: 'src/pages/tasks/keyword-usage-api.ts',
|
||||
shape: /company_id\s*=\s*params\.companyId\b/,
|
||||
note: 'toQuery 是白名单构造,公司值只能来自调用方传入的 params.companyId(页面从 companyTab.requestCompanyId 取)',
|
||||
},
|
||||
],
|
||||
admin_users: pinsFor('admin_users'),
|
||||
// 批次 5(店铺密钥)同样由 SEND_POINTS 现算:这一页只有一个发送口(列表),
|
||||
// 新增/编辑/删除/白名单检测四支都不带公司参数——归属由后端从操作者会话推导(writeCompanyId 闸门)。
|
||||
@@ -235,6 +257,10 @@ const COMPANY_ID_SOURCE_PINS: Readonly<Record<string, readonly CompanyIdPin[]>>
|
||||
// 编辑/删除/重排三支**故意不带**参数——归属由那一行的 id 与操作者公司共同判定,跨公司写后端 403
|
||||
// (见 docs/ops/menu-company-tree-design-2026-10-06.md §5),给它们发 company_id 反而是第三处口径。
|
||||
admin_columns: pinsFor('admin_columns'),
|
||||
// 批次 7(v1.3 无侵权只读页):同样由 SEND_POINTS 现算——只有一个发送口(列表)。
|
||||
admin_appearance_patent_clean_items: pinsFor('admin_appearance_patent_clean_items'),
|
||||
// 批次 8(v1.4 京东数据库)2026-11-16 随「删除掉公司 tab」整页摘除:登记表条目一并撤下,
|
||||
// 「不得回流」改由文件末尾「公司维度不得回流」清单看守(同品牌库/商品类目的先例形状)。
|
||||
}
|
||||
|
||||
/** 严格判据的分母由本轮实扫得出(修完不许恒绿也不许恒红):求值了几条 shape、其中几条通过。 */
|
||||
@@ -333,8 +359,13 @@ test('正向:声明 companyScoped 的页,其 api 文件必须真的带 company
|
||||
// ⚠ 分母是本轮实扫的表条数(批次 1 的 5 + 批次 2 的 7 + 批次 3 的 4 + 批次 4 的 1 + 批次 5 的 1 + 批次 6 的 3;
|
||||
// 批次 2 原 12 条里的品牌库 1 条 + 商品类目 4 条随 2026-10-06「这两页退回全平台共享」摘掉)。
|
||||
// 这条只防"整表被摘空/被改窄",逐处脱管由下面两条(对平闸门 + 窗口对平)负责。
|
||||
assert.ok(SEND_POINTS.length >= 21,
|
||||
`发送口表只剩 ${SEND_POINTS.length} 条(批次 1+2+3+4+5+6 实扫 21 条)⇒ 有人把钉从表里摘了,取值口看守成空`)
|
||||
// 2026-11-15 京东数据库公共化(用户定案「不区分公司、属于公共的」):批次 8 的详情/删除/
|
||||
// 分组列表/删分组/编辑 5 条 company_id 发送口随公司谓词整批撤下(后端写侧同窗摘),批次 8
|
||||
// 只剩列表/类目两条 ⇒ 32 → 27。
|
||||
// 2026-11-16 京东数据库摘公司 tab(用户定案「删除掉公司 tab,参考品牌数据库」):最后两条
|
||||
// 发送口(列表/类目下拉)与后端读侧谓词同窗摘掉,页面退出注册表 ⇒ 27 → 25。
|
||||
assert.ok(SEND_POINTS.length >= 25,
|
||||
`发送口表只剩 ${SEND_POINTS.length} 条(批次 1+2+3+4+5+6 实扫 21 条 + 批次 7 v1.3 无侵权列表/导出 2 条 + 主管聚合 1 条 + 按主管删除 1 条 = 25 条;京东数据库两条 2026-11-16 随「删除掉公司 tab」摘、导出口 2026-11-15 随客户口径摘)⇒ 有人把钉从表里摘了,取值口看守成空`)
|
||||
for (const p of SEND_POINTS) {
|
||||
const shape = pointShape(p)
|
||||
const compliant = pointCompliant(p)
|
||||
@@ -366,8 +397,8 @@ test('正向:声明 companyScoped 的页,其 api 文件必须真的带 company
|
||||
if (hit) hit.pinned += 1
|
||||
else grouped.set(key, { file: p.file, line: p.line, pinned: 1 })
|
||||
}
|
||||
assert.equal(grouped.size, 18,
|
||||
`发送口表按 (文件, 整行) 应聚成 18 组(22 处发送口),现在却有 ${grouped.size} 组 —— 表被改形状了,对平判据失去分母`)
|
||||
assert.equal(grouped.size, 19,
|
||||
`发送口表按 (文件, 整行) 应聚成 19 组(25 处发送口,批次 7 的列表/导出/主管聚合/按主管删除逐字同行各走同一组;京东数据库两组 2026-11-16 随「删除掉公司 tab」摘),现在却有 ${grouped.size} 组 —— 表被改形状了,对平判据失去分母`)
|
||||
for (const g of grouped.values()) {
|
||||
const actual = occurrences(stripComments(read(g.file)), g.line)
|
||||
assert.equal(g.pinned, actual,
|
||||
@@ -709,6 +740,23 @@ const WATCH_BODY_PINS: ReadonlyArray<{
|
||||
{ file: 'src/pages/account/menu-manage-api.ts', shapes: [/company_id\s*=\s*companyId\b/] },
|
||||
],
|
||||
},
|
||||
// ↓ 批次 7(2026-11-10 v1.3 无侵权只读页):任务号/ASIN 是自由文本筛选,上一家填的值在新一家的
|
||||
// 行集里筛不出东西 ⇒ 首屏「暂无无侵权数据」而输入框里还显示着那个值;页码回 1 同理。
|
||||
// 2026-11-11 分组筛选(主管=组长,就是分组)落地:分组选项集是公司隔离的(GET /shop-manages/groups
|
||||
// 带 company_id),上一家选的 groupId 在新一家的选项集里不存在 ⇒ 同罪必清,选项也按新公司重取。
|
||||
{
|
||||
file: 'src/pages/patent/AppearancePatentCleanItemsPage.vue',
|
||||
token: "filter.taskId = ''; filter.asin = ''; filter.groupId = ''; page.value = 1; void loadGroupOptions(); void load()",
|
||||
why: '任务号/ASIN 是按行集筛的自由文本,上一家的值在新一家的行里不存在 ⇒ 切 tab 后首屏被筛成「暂无无侵权数据」,'
|
||||
+ '而输入框还显示着上一家填的值;分组(主管)选项集是公司隔离的,上一家选的 groupId 在新一家的选项里不存在,'
|
||||
+ '同罪必清且选项重取;页码回 1 是因为新一家的行数更少,末尾的 void load() 才让切 tab 真的换数据',
|
||||
premise: [
|
||||
{ file: 'src/pages/patent/appearance-patent-clean-api.ts', shapes: [/company_id\s*=\s*params\.companyId\b/] },
|
||||
],
|
||||
},
|
||||
// 批次 8(2026-11-14 v1.4 京东数据库页)那条 watch 看守已于 2026-11-16 随「删除掉公司 tab,
|
||||
// 参考品牌数据库」一并摘下——页面不再 watch companyTab.activeId、不再消费公司 tab store,
|
||||
// 「不得回流」改由文件末尾「公司维度不得回流」清单看守。
|
||||
]
|
||||
|
||||
/** 取「`watch(() => companyTab.activeId, () => { … })`」这一条语句的原文;匹配不出返回 null(由调用方判探针失效)。 */
|
||||
@@ -717,9 +765,9 @@ function watchStatement(source: string): string | null {
|
||||
return m ? m[0] : null
|
||||
}
|
||||
|
||||
test('切公司的 watch 体:每对 (file, token) 都要在该页 watch 体内出现(批次 1 两页 + 批次 2 三页 + 批次 3 两页 + 批次 4 一页 + 批次 5 一页 + 批次 6 一页)', () => {
|
||||
assert.ok(WATCH_BODY_PINS.length >= 10,
|
||||
`watch 体看守只剩 ${WATCH_BODY_PINS.length} 对(批次 1 的店铺管理/任务看板 + 批次 2 的去重库/查询ASIN/最低价ASIN + 批次 3 的撞款监控/店铺数据记录 + 批次 4 的用户管理 + 批次 5 的店铺密钥 + 批次 6 的菜单管理共 10 对)`
|
||||
test('切公司的 watch 体:每对 (file, token) 都要在该页 watch 体内出现(批次 1 两页 + 批次 2 三页 + 批次 3 两页 + 批次 4 一页 + 批次 5 一页 + 批次 6 一页 + 批次 7 一页)', () => {
|
||||
assert.ok(WATCH_BODY_PINS.length >= 11,
|
||||
`watch 体看守只剩 ${WATCH_BODY_PINS.length} 对(批次 1 的店铺管理/任务看板 + 批次 2 的去重库/查询ASIN/最低价ASIN + 批次 3 的撞款监控/店铺数据记录 + 批次 4 的用户管理 + 批次 5 的店铺密钥 + 批次 6 的菜单管理 + 批次 7 v1.3 无侵权只读页共 11 对;批次 8 京东数据库页那条 2026-11-16 随「删除掉公司 tab」摘下)`
|
||||
+ '⇒ 这一族又退回"只钉少数几页",被摘掉那一页的"切公司不清筛选项"再次没人看守')
|
||||
const pinnedFiles = new Set(WATCH_BODY_PINS.map((pin) => pin.file))
|
||||
for (const pin of WATCH_BODY_PINS) {
|
||||
@@ -921,26 +969,30 @@ test('渲染范围:tab 条只画在按公司取数的页上,公司管理那
|
||||
})
|
||||
|
||||
/**
|
||||
* 2026-10-06 控制方定案:品牌数据库、商品类目「做成所有公司共享的,不区分」。
|
||||
* 控制方/用户定案的「全平台共享、不区分公司」页清单:
|
||||
* - 品牌数据库、商品类目(2026-10-06 控制方定案「做成所有公司共享的,不区分」);
|
||||
* - 京东数据库(2026-11-16 用户定案「删除掉公司 tab,参考品牌数据库」)。
|
||||
*
|
||||
* <p>上面那几条正向判据全是从 {@code COMPANY_SCOPED_PAGES} 派生的,页一退出注册表就自动不再求值 ⇒
|
||||
* 「退出」这件事本身没有看守:谁把 {@code company_id} 重新塞回这三个取数口,全仓用例一支都不会红,
|
||||
* 而后端唯一键已经退回全局(V151),带公司参数的读会把共享库筛窄成「只看这一家」,
|
||||
* 「退出」这件事本身没有看守:谁把 {@code company_id} 重新塞回这些取数口,全仓用例一支都不会红,
|
||||
* 而后端唯一键已经退回全局(V151)/读侧谓词已摘(京东),带公司参数的读会把共享库筛窄成「只看这一家」,
|
||||
* 写侧则把一张全平台共享的表按家拆开——两边都是静默改口径,不是报错。所以这一支必须存在。</p>
|
||||
*
|
||||
* <p>判据只认「剥完注释的代码」:这三份文件现在各自留有一句说明共享口径的注释,
|
||||
* 注释里的 {@code company_id} 三个字面字符不是接线(全局约束 6)。正样本用摘掉之前那三行原文,
|
||||
* <p>判据只认「剥完注释的代码」:这些文件各自留有一句说明共享口径的注释,
|
||||
* 注释里的 {@code company_id} 三个字面字符不是接线(全局约束 6)。正样本用摘掉之前那些行原文,
|
||||
* 所以下面的 false 是测出来的,不是「正则本来就抓不到」。</p>
|
||||
*/
|
||||
const SHARED_PAGE_KEYS = ['admin_invalid_asin_data', 'admin_product_categories'] as const
|
||||
const SHARED_PAGE_KEYS = ['admin_invalid_asin_data', 'admin_product_categories', 'admin_jd_database'] as const
|
||||
const SHARED_API_FILES = [
|
||||
'src/pages/invalidasin/invalid-asin-api.ts',
|
||||
'src/pages/asin/product-category-api.ts',
|
||||
'src/pages/asin/product-category-export.ts',
|
||||
'src/pages/jd/jd-product-api.ts',
|
||||
] as const
|
||||
const SHARED_PAGE_FILES = [
|
||||
'src/pages/asin/AsinInvalidPage.vue',
|
||||
'src/pages/asin/ProductCategoryPage.vue',
|
||||
'src/pages/jd/JdDatabasePage.vue',
|
||||
] as const
|
||||
|
||||
/** 公司参数的两种写法:下传用的 snake、形参/字段用的 camel。 */
|
||||
@@ -953,7 +1005,7 @@ const FORMER_SEND_LINES = [
|
||||
'if (companyId != null) params.push(`company_id=${companyId}`)',
|
||||
]
|
||||
|
||||
test('公司维度不得回流:品牌库与商品类目已定案全平台共享,取数口与页面都不许再带公司参数', () => {
|
||||
test('公司维度不得回流:品牌库/商品类目/京东数据库已定案全平台共享,取数口与页面都不许再带公司参数', () => {
|
||||
// 判据自证(全局约束 15:反向钉不许独自成立)——改动前那三行必须抓得到,否则下面的 false 是空判据。
|
||||
for (const line of FORMER_SEND_LINES) {
|
||||
assert.ok(COMPANY_PARAM_TOKEN.test(line), `反向钉判据连原来的发送口「${line}」都匹配不出 ⇒ 这一族恒绿`)
|
||||
@@ -968,7 +1020,7 @@ test('公司维度不得回流:品牌库与商品类目已定案全平台共
|
||||
|
||||
for (const key of SHARED_PAGE_KEYS) {
|
||||
assert.equal(COMPANY_SCOPED_PAGES.some((p) => p.menuKey === key), false,
|
||||
`${key} 又回到 COMPANY_SCOPED_PAGES:2026-10-06 已定案这两页全平台共享,不区分公司`)
|
||||
`${key} 又回到 COMPANY_SCOPED_PAGES:已定案全平台共享、不区分公司(品牌库/商品类目 2026-10-06、京东数据库 2026-11-16)`)
|
||||
const page = adminPages.find((p) => p.menuKey === key)
|
||||
assert.ok(page, `${key} 在路由注册表里找不到:菜单名改了,反向钉对不上页`)
|
||||
assert.equal(page.companyScoped, false,
|
||||
|
||||
@@ -24,13 +24,13 @@ function form(overrides: Record<string, unknown> = {}) {
|
||||
return { ...createEmptyCreateUserForm(), username: 'zhangsan', password: 'secret123', ...overrides }
|
||||
}
|
||||
|
||||
test('空表单默认没有公司、没有到期时间', () => {
|
||||
test('空表单默认没有公司、没有到期时间(平台默认亚马逊 = 存量口径,V206)', () => {
|
||||
const blank = createEmptyCreateUserForm()
|
||||
assert.equal(blank.companyId ?? null, null, 'companyId 默认 null(仅公司超管角色使用)')
|
||||
assert.equal(blank.expiresAt, '', '到期时间默认空 = 永不过期')
|
||||
assert.deepEqual(
|
||||
{ ...blank, companyId: null, expiresAt: '' },
|
||||
{ username: '', password: '', role: 'normal', columnIds: [], createdBy: null, companyId: null, expiresAt: '' },
|
||||
{ username: '', password: '', role: 'normal', columnIds: [], createdBy: null, companyId: null, expiresAt: '', platform: 'amazon' },
|
||||
)
|
||||
})
|
||||
|
||||
@@ -51,6 +51,8 @@ test('请求体:admin/normal 一律不带 companyId;公司超管必须带且
|
||||
password: 'secret123',
|
||||
role: 'normal',
|
||||
columnIds: [3, 1],
|
||||
// V206:所属平台恒下发(弹窗单选默认当前平台 tab,空表单缺省亚马逊)。
|
||||
platform: 'amazon',
|
||||
})
|
||||
// 所属管理员仍按原语义携带(仅 normal 角色)
|
||||
assert.equal(toCreateUserRequest(form({ role: 'normal', createdBy: 5 })).createdById, 5)
|
||||
|
||||
@@ -88,11 +88,13 @@ test('账号页与顶栏的源码里公司维度已摘干净', () => {
|
||||
'拉公司目录必须按站点超管门控,非超管不发这个请求(后端 403 兜底)')
|
||||
|
||||
// 「删了列忘了改占位行 colspan」是这类改动最常留下的残行:按表头列数交叉核对
|
||||
// (`<th` 是 `<thead` 的前缀,必须带上后随字符才数得准)
|
||||
// (`<th` 是 `<thead` 的前缀,必须带上后随字符才数得准)。
|
||||
// 2026-11-17 V206:上架上限列 v-if="isJdSide" 按平台动态渲染 ⇒ 表头数 10(含源码里的 v-if th),
|
||||
// 占位行走 :colspan 动态绑定;字面量 colspan 在动态列下必然错位一半的 tab,反向钉死。
|
||||
const headers = (page.match(/<th[\s>]/g) || []).length
|
||||
const spans = [...page.matchAll(/colspan="(\d+)"/g)].map((m) => Number(m[1]))
|
||||
assert.ok(spans.length >= 1, '列表 tbody 没有 colspan 占位行')
|
||||
for (const span of spans) assert.equal(span, headers, `占位行 colspan=${span} 与表头列数 ${headers} 不符`)
|
||||
assert.equal(headers, 10, `用户列表表头应为 10 列(9 列存量 + 京东侧上架上限 v-if 列),实际 ${headers}`)
|
||||
assert.match(page, /:colspan="isJdSide \? 10 : 9"/, '空态占位行必须按平台动态切 colspan(静态值与动态列数错位一半 tab)')
|
||||
assert.equal(/colspan="\d+"/.test(page), false, '动态列下不许再留字面量 colspan(必有一侧 tab 列数对不上)')
|
||||
|
||||
const dialog = readSource('src/pages/account/CreateUserDialog.vue')
|
||||
assert.match(dialog, /operatorSuper && form\.role === 'company_super_admin'/,
|
||||
|
||||
@@ -34,6 +34,12 @@ const EXEMPT = new Set([
|
||||
'src/pages/tasks/ShopDataTasksPage.vue',
|
||||
'src/pages/tasks/ImageVideoTasksPage.vue',
|
||||
'src/pages/records/RecordsHistoryPage.vue',
|
||||
// 2026-11-10(v1.3):外观专利无侵权数据页与去重库同形状——出表成功自动同步的累计台账,
|
||||
// 默认当天会让首屏只剩今天同步的行,历史同步行整批"消失"。
|
||||
'src/pages/patent/AppearancePatentCleanItemsPage.vue',
|
||||
// 2026-11-14(v1.4 Phase 5):京东数据库页与外观专利页同形状——京东商品同步落库的累计台账,
|
||||
// 默认当天会让首屏只剩今天同步的行(页面注释与 filter 工厂同口径留空)。
|
||||
'src/pages/jd/JdDatabasePage.vue',
|
||||
// 2026-10-05(V146):两处是「到期时间」表单字段而非列表筛选——留空 = 永不过期,
|
||||
// 是有业务语义的默认值,绝不能默认当天(默认当天等于建号即过期)。
|
||||
'src/pages/account/CreateUserDialog.vue',
|
||||
|
||||
@@ -231,11 +231,11 @@ test('orderedPair 只在两端都有值且倒挂时交换', () => {
|
||||
})
|
||||
|
||||
test('分母硬钉:四面控件实例数与成对数(扫描失明即红)', () => {
|
||||
assert.equal(adminCtrls.length, 19, '后管实例数变了,先复算普查再改这里')
|
||||
assert.equal(adminCtrls.length, 23, '后管实例数变了,先复算普查再改这里(v1.4 京东数据库页同步时间起止再落一对=2 实例)')
|
||||
assert.equal(userCtrls.length, 2, '用户端实例数变了')
|
||||
assert.equal(finCtrls.length, 30, '财务系统实例数变了')
|
||||
assert.equal(mxCtrls.length, 4, '麦象实例数变了')
|
||||
assert.equal(pairCount(adminCtrls), 8, '后管成对区间应为 8')
|
||||
assert.equal(pairCount(adminCtrls), 10, '后管成对区间应为 10(v1.4 京东数据库页同步时间起止再落一对)')
|
||||
assert.equal(pairCount(finCtrls), 11, '财务系统成对区间应为 11')
|
||||
assert.equal(pairCount(mxCtrls), 2, '麦象成对区间应为 2')
|
||||
assert.equal(pairCount(userCtrls), 0, '用户端出现成对区间说明新加了两个单只控件')
|
||||
|
||||
@@ -0,0 +1,183 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { buildMatrixCells, matrixCellOf, storeColumnsOf } from '../src/pages/tasks/duplicate-console-logic.ts'
|
||||
import type { DuplicateItem, DuplicateOccurrence } from '../src/pages/tasks/duplicate-model.ts'
|
||||
|
||||
/**
|
||||
* B60 撞款矩阵:预聚合的等价性与前后读数。
|
||||
*
|
||||
* 审计指的那件事是「每格多次全量 filter」——模板一格要付 cellCount ×2 + cellTitle(内部再
|
||||
* cellCount + cellCountryDots + 每站点一次 cellCountryCount),每次都是把该行 occurrences 整份
|
||||
* filter 一遍,而且**每格都新建一条文案字符串**。下面 `legacyCell` 就是页面原来那几行函数的
|
||||
* 原样搬运,当"前";与新一次算完的 `buildMatrixCells`(空格按列共用一份视图)对撞:
|
||||
* 先证明结果逐字相同(预聚合不是靠少算蒙过去的),再同尺量时间。
|
||||
*/
|
||||
function occ(asin: string, shopName: string, country: string): DuplicateOccurrence {
|
||||
return {
|
||||
asin,
|
||||
date: '2026-09-01',
|
||||
price: '',
|
||||
brand: 'B',
|
||||
shopName,
|
||||
groupName: '',
|
||||
countryCodes: [country],
|
||||
country,
|
||||
}
|
||||
}
|
||||
|
||||
const shopKey = (name: string): string => (name || '').trim().toLowerCase()
|
||||
|
||||
interface CellView {
|
||||
count: number
|
||||
dots: string[]
|
||||
title: string
|
||||
}
|
||||
|
||||
/** 原页面的逐格算法(一格扫整行 occurrences 若干次,并且每格造一条文案)。 */
|
||||
function legacyCellOccurrences(item: DuplicateItem, shop: string): DuplicateOccurrence[] {
|
||||
const key = shopKey(shop)
|
||||
return (item.occurrences || []).filter((entry) => shopKey(entry.shopName) === key)
|
||||
}
|
||||
|
||||
function legacyCell(item: DuplicateItem, shop: string): CellView {
|
||||
const count = legacyCellOccurrences(item, shop).length
|
||||
const codes = new Set<string>()
|
||||
for (const entry of legacyCellOccurrences(item, shop)) if (entry.country) codes.add(entry.country.toUpperCase())
|
||||
const dots = [...codes]
|
||||
const sites = dots.map((code) => `${code} ${legacyCellOccurrences(item, shop).filter((entry) => (entry.country || '').toUpperCase() === code).length}条`)
|
||||
return {
|
||||
count,
|
||||
dots,
|
||||
title: count ? `${shop} 在售 ${count} 条 · ${sites.join('、')}` : `${shop} 无此 ASIN`,
|
||||
}
|
||||
}
|
||||
|
||||
/** 页面现在的读法:一次取值;空格取该列那一份共用视图(不再造文案)。 */
|
||||
function fastCell(cells: ReturnType<typeof buildMatrixCells>, item: DuplicateItem, shop: string, blank: CellView): CellView {
|
||||
const cell = matrixCellOf(cells, item.asin, shop)
|
||||
if (!cell.count) return blank
|
||||
const sites = cell.sites.map((site) => `${site.code} ${site.count}条`)
|
||||
return {
|
||||
count: cell.count,
|
||||
dots: cell.sites.map((site) => site.code),
|
||||
title: sites.length ? `${shop} 在售 ${cell.count} 条 · ${sites.join('、')}` : `${shop} 在售 ${cell.count} 条`,
|
||||
}
|
||||
}
|
||||
|
||||
function fixtureItem(asin: string, shops: [string, string][]): DuplicateItem {
|
||||
const occurrences = shops.map(([shop, country]) => occ(asin, shop, country))
|
||||
return {
|
||||
asin,
|
||||
shopCount: new Set(occurrences.map((entry) => shopKey(entry.shopName))).size,
|
||||
recordCount: occurrences.length,
|
||||
occurrences,
|
||||
}
|
||||
}
|
||||
|
||||
function blankViews(columns: string[]): CellView[] {
|
||||
return columns.map((shop) => ({ count: 0, dots: [] as string[], title: `${shop} 无此 ASIN` }))
|
||||
}
|
||||
|
||||
/**
|
||||
* 200 列 × 50 行的矩阵夹具。`shopsPerRow` 决定密度:现实中一个撞款 ASIN 落在几家到几十家店,
|
||||
* 而逐格 filter 的代价正是按「行内 occurrences × 列数」乘出来的——密度越高旧算法越吃亏,
|
||||
* 所以两种密度都取读数,不挑对自己有利的那一档。
|
||||
*/
|
||||
function matrixFixture(columns: string[], shopsPerRow: number): DuplicateItem[] {
|
||||
return Array.from({ length: 50 }, (_, index) => {
|
||||
const pairs: [string, string][] = []
|
||||
for (let offset = 0; offset < shopsPerRow; offset++) {
|
||||
const shop = columns[(index * 7 + offset * 61) % columns.length]
|
||||
pairs.push([shop, 'UK'], [shop, 'DE'])
|
||||
}
|
||||
return fixtureItem(`B${String(index).padStart(4, '0')}`, pairs)
|
||||
})
|
||||
}
|
||||
|
||||
test('矩阵预聚合与逐格 filter 结果逐字相同', () => {
|
||||
const rows = [
|
||||
fixtureItem('A1', [['Shop a', 'UK'], ['Shop a', 'uk'], ['ShopB', ''], ['ShopB', 'DE']]),
|
||||
fixtureItem('A2', [['ShopC', 'FR']]),
|
||||
]
|
||||
const columns = storeColumnsOf(rows)
|
||||
const cells = buildMatrixCells(rows, columns)
|
||||
const blanks = blankViews(columns)
|
||||
columns.forEach((column, index) => {
|
||||
for (const item of rows) {
|
||||
assert.deepEqual(fastCell(cells, item, column, blanks[index]), legacyCell(item, column), `${item.asin}/${column}`)
|
||||
}
|
||||
})
|
||||
// 每行只给「本行真涉及」的列建格:A1 涉及 2 店(大小写/空格归一后同店)+ A2 涉及 1 店。
|
||||
assert.equal(cells.size, 3)
|
||||
})
|
||||
|
||||
test('列集或行集为空时不建任何格', () => {
|
||||
const rows = [fixtureItem('A1', [['ShopA', 'UK']])]
|
||||
assert.equal(buildMatrixCells(rows, []).size, 0)
|
||||
assert.equal(buildMatrixCells([], ['ShopA']).size, 0)
|
||||
})
|
||||
|
||||
/** 列窗口:只给本窗点名的列建格(120 列的夹具切 40 列窗口,格子数就按 40 乘)。 */
|
||||
test('列窗口切窗后每行最多铺满窗口宽度的格', () => {
|
||||
const window = 40
|
||||
const rows = Array.from({ length: 50 }, (_, index) =>
|
||||
fixtureItem(`A${index}`, Array.from({ length: window * 3 }, (_, shop) => [`Shop${shop}`, 'UK'])))
|
||||
const all = storeColumnsOf(rows)
|
||||
assert.equal(all.length, window * 3, '夹具本身就有 120 列(不设上限时的形状)')
|
||||
|
||||
const columns = all.slice(0, window)
|
||||
const cells = buildMatrixCells(rows, columns)
|
||||
assert.equal(columns.length, window, '本窗只铺 40 列')
|
||||
assert.equal(cells.size, rows.length * window, '窗口外的 80 列一格都不建')
|
||||
})
|
||||
|
||||
/**
|
||||
* B60 判据的读数:200 列 × 50 行,同一把尺前后各跑一遍(5 轮取最好一次——本机同时有别的路在跑,
|
||||
* 单次读数能被调度噪声放大好几倍)。
|
||||
*
|
||||
* 度量对象是「矩阵格集合的 JS 计算」,审计点名的就是这条。**浏览器首屏/交互耗时本机拿不到**
|
||||
* (没有真实店铺数据、也没有浏览器现场),按准出括注登记为现网复量项,不许拿这条当"首屏已实测"读。
|
||||
*/
|
||||
test('200列×50行:预聚合与按列切窗都必须快过逐格 filter', () => {
|
||||
const columns = Array.from({ length: 200 }, (_, index) => `Shop${index}`)
|
||||
const blanks = blankViews(columns)
|
||||
const windowColumns = columns.slice(0, 40)
|
||||
const windowBlanks = blanks.slice(0, 40)
|
||||
const best = (run: () => unknown): number => {
|
||||
let ms = Number.POSITIVE_INFINITY
|
||||
for (let attempt = 0; attempt < 5; attempt++) {
|
||||
const start = performance.now()
|
||||
run()
|
||||
ms = Math.min(ms, performance.now() - start)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
|
||||
const readings: string[] = []
|
||||
for (const shopsPerRow of [3, 40]) {
|
||||
const rows = matrixFixture(columns, shopsPerRow)
|
||||
const legacySweep = () => {
|
||||
const out: CellView[] = []
|
||||
for (const item of rows) for (const column of columns) out.push(legacyCell(item, column))
|
||||
return out
|
||||
}
|
||||
const precomputedSweep = (cols: string[], cellBlanks: CellView[]) => {
|
||||
const cells = buildMatrixCells(rows, cols)
|
||||
const out: CellView[] = []
|
||||
for (const item of rows) {
|
||||
cols.forEach((column, index) => out.push(fastCell(cells, item, column, cellBlanks[index])))
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
assert.deepEqual(precomputedSweep(columns, blanks), legacySweep(), '前后必须同一份格子(快不是靠少算)')
|
||||
|
||||
const beforeMs = best(legacySweep)
|
||||
const precomputeMs = best(() => precomputedSweep(columns, blanks))
|
||||
const shippedMs = best(() => precomputedSweep(windowColumns, windowBlanks))
|
||||
readings.push(`每行${shopsPerRow}店:逐格filter=${beforeMs.toFixed(1)}ms → 预聚合=${precomputeMs.toFixed(1)}ms(${(beforeMs / precomputeMs).toFixed(1)}×) → 预聚合+切窗40列=${shippedMs.toFixed(1)}ms(${(beforeMs / shippedMs).toFixed(1)}×)`)
|
||||
assert.ok(precomputeMs < beforeMs, `预聚合没省下来(每行${shopsPerRow}店):${beforeMs.toFixed(1)}ms → ${precomputeMs.toFixed(1)}ms`)
|
||||
assert.ok(shippedMs * 2 < beforeMs, `切窗后仍不够快(每行${shopsPerRow}店):${beforeMs.toFixed(1)}ms → ${shippedMs.toFixed(1)}ms`)
|
||||
}
|
||||
console.log(`[B60 读数] 200列×50行 ${readings.join(' | ')}`)
|
||||
})
|
||||
@@ -2,8 +2,9 @@ import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { parseDuplicateConsole, parseLedgerPage, parseConsoleGroup, parseLedgerRow } from '../src/pages/tasks/duplicate-console-model.ts'
|
||||
import {
|
||||
buildMatrixCells,
|
||||
indexShopGroups,
|
||||
dupWithinGroup,
|
||||
matrixCellOf,
|
||||
storeColumnsOf,
|
||||
} from '../src/pages/tasks/duplicate-console-logic.ts'
|
||||
|
||||
@@ -49,6 +50,21 @@ test('test_dup_console_model_parses_overview_dup_and_groups', () => {
|
||||
assert.deepEqual(group, { name: 'GroupA', shopCount: 2, asinUnique: 4, recordCount: 6, dupCount: 2 })
|
||||
})
|
||||
|
||||
/** B60:console 多了行窗口三键;缺字段要退得回安全默认(page 至少 1,pageSize 缺省 0=调用方自持)。 */
|
||||
test('test_dup_console_model_parses_row_window', () => {
|
||||
const windowed = parseDuplicateConsole({
|
||||
success: true,
|
||||
data: { pending: false, dup: [], groups: [], total_dup: 2650, page: 3, page_size: 50 },
|
||||
})
|
||||
assert.equal(windowed.totalDup, 2650, 'total_dup 是该范围未分页总数,不是本页行数')
|
||||
assert.equal(windowed.page, 3)
|
||||
assert.equal(windowed.pageSize, 50)
|
||||
|
||||
const legacy = parseDuplicateConsole({ success: true, data: { pending: false, dup: [], groups: [] } })
|
||||
assert.equal(legacy.page, 1, '没有 page 字段时读成第一页,别让分页控件显示第 0 页')
|
||||
assert.equal(legacy.pageSize, 0)
|
||||
})
|
||||
|
||||
test('test_dup_console_parse_group_ignores_missing_name', () => {
|
||||
assert.equal(parseConsoleGroup({ shop_count: 1 }), null)
|
||||
assert.ok(parseConsoleGroup({ name: 'G', shop_count: 2 }))
|
||||
@@ -71,15 +87,9 @@ test('test_dup_console_group_derivation_restricts_to_members', () => {
|
||||
])
|
||||
assert.deepEqual(groups.members.GroupA, ['ShopA', 'ShopB'])
|
||||
assert.deepEqual(groups.shopGroupNames.ShopC, ['GroupC'])
|
||||
|
||||
const inGroupA = dupWithinGroup([dupA, dupE], groups.members.GroupA)
|
||||
assert.equal(inGroupA.length, 2)
|
||||
// E 组内只剩 ShopA/ShopB 两条记录。
|
||||
const e = inGroupA.find((item) => item.asin === 'E')
|
||||
assert.equal(e?.shopCount, 2)
|
||||
assert.equal(e?.recordCount, 2)
|
||||
// 单店成员组内不会命中(ShopD 不在数据里)。
|
||||
assert.deepEqual(dupWithinGroup([dupA, dupE], ['ShopD']), [])
|
||||
assert.deepEqual(storeColumnsOf([dupA, dupE], groups.members.GroupA), ['ShopA', 'ShopB'])
|
||||
// 「组内 ≥2 店才算撞款」的裁行只剩服务端一处正本(console 的 dup_group)——
|
||||
// 页面原先在客户端用 dupWithinGroup 再裁一遍,那是同一规则的第二个正本,B60 收掉它。
|
||||
})
|
||||
|
||||
test('test_dup_console_store_columns_order_and_restriction', () => {
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { gatingImportOutcomeText, parseGatingImportText } from '../src/pages/gating/gating-import.ts'
|
||||
|
||||
test('gating_import_single_field_defaults', () => {
|
||||
// 桌面版口径:只给品牌 → 国家=全部、类型=品牌gating、ASIN/备注空。
|
||||
const result = parseGatingImportText('jellycat')
|
||||
assert.equal(result.items.length, 1)
|
||||
assert.deepEqual(result.items[0], { brand: 'jellycat', country: '全部', gatingType: '品牌gating', asin: '', remark: '' })
|
||||
assert.equal(result.skippedLines, 0)
|
||||
})
|
||||
|
||||
test('gating_import_full_five_fields', () => {
|
||||
const result = parseGatingImportText('tory burch,英国,品牌gating,B0ABC123,人为录入')
|
||||
assert.deepEqual(result.items[0], { brand: 'tory burch', country: '英国', gatingType: '品牌gating', asin: 'B0ABC123', remark: '人为录入' })
|
||||
})
|
||||
|
||||
test('gating_import_mixed_separators_and_extra_fields_dropped', () => {
|
||||
// 桌面版分隔符集合 [,\t;,;];第 5 列之后的段丢弃。
|
||||
const result = parseGatingImportText('crocs,德国;类目gating\tB0X\t备注\t多余段')
|
||||
assert.deepEqual(result.items[0], { brand: 'crocs', country: '德国', gatingType: '类目gating', asin: 'B0X', remark: '备注' })
|
||||
})
|
||||
|
||||
test('gating_import_skip_blank_comment_and_separator_only_lines', () => {
|
||||
const text = [
|
||||
'',
|
||||
' ',
|
||||
'# 这是注释行',
|
||||
';;,', // 纯分隔符行 → 空段全被丢,整行跳过
|
||||
'jellycat',
|
||||
].join('\n')
|
||||
const result = parseGatingImportText(text)
|
||||
assert.equal(result.items.length, 1)
|
||||
assert.equal(result.items[0]?.brand, 'jellycat')
|
||||
assert.equal(result.skippedLines, 2) // 注释行 + 纯分隔符行;纯空白行不计数
|
||||
})
|
||||
|
||||
test('gating_import_bom_and_crlf_and_empty_parts', () => {
|
||||
const result = parseGatingImportText('\uFEFFcrocs,德国,,B0X\r\n,头部空段被丢')
|
||||
assert.equal(result.items.length, 2)
|
||||
assert.equal(result.items[0]?.brand, 'crocs')
|
||||
assert.equal(result.items[0]?.country, '德国')
|
||||
// 桌面版口径:空段在切分后就被丢弃,后续字段整体左移(B0X 落到类型位)——照抄不修正。
|
||||
assert.equal(result.items[0]?.gatingType, 'B0X')
|
||||
assert.equal(result.items[0]?.asin, '')
|
||||
assert.equal(result.items[1]?.brand, '头部空段被丢')
|
||||
assert.equal(result.items[1]?.country, '全部')
|
||||
})
|
||||
|
||||
test('gating_import_empty_input_never_throws', () => {
|
||||
assert.deepEqual(parseGatingImportText(''), { items: [], skippedLines: 0 })
|
||||
// @ts-expect-error 纯函数要扛住脏输入(运行时防呆)。
|
||||
assert.deepEqual(parseGatingImportText(null), { items: [], skippedLines: 0 })
|
||||
})
|
||||
|
||||
test('gating_import_outcome_text', () => {
|
||||
assert.equal(gatingImportOutcomeText(3, 2), '批量导入完成:新增 3 条,跳过重复 2 条')
|
||||
})
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user