新增内容,新增拉起软件层

This commit is contained in:
super
2026-06-08 09:19:15 +08:00
parent 8ab647c419
commit c85e5b278f
67 changed files with 1552 additions and 189 deletions

View File

@@ -202,6 +202,9 @@ const dashboard = ref<SimilarAsinDashboardVo>({
failedTaskCount: 0,
})
const historyItems = ref<SimilarAsinHistoryItem[]>([])
// 前端实时进度态:保存最近一次 progress/batch 接口拿到的进度,作为 history 接口的兜底,
// 避免历史接口暂时返回不到该任务、或字段不全时,当前任务区出现进度回退/丢失。
const liveProgressItems = ref<Record<number, SimilarAsinHistoryItem>>({})
const visibleTaskSummary = computed(() => parseResult.value || queuedTaskSummary.value)
const pendingParseItem = computed<SimilarAsinHistoryItem | null>(() => {
@@ -219,10 +222,22 @@ const pendingParseItem = computed<SimilarAsinHistoryItem | null>(() => {
})
const currentItems = computed(() => {
const activeIds = new Set([...pollingTaskIds.value, ...pendingFileTaskIds.value])
const activeItems = historyItems.value.filter((item) => {
const status = normalizeTaskStatus(item)
return item.taskId != null && (activeIds.has(item.taskId) || status === 'RUNNING' || status === 'PENDING')
})
const activeItems = historyItems.value
.filter((item) => {
const status = normalizeTaskStatus(item)
return item.taskId != null && (activeIds.has(item.taskId) || status === 'RUNNING' || status === 'PENDING')
})
.map((item) => mergeCurrentTaskItem(item))
// 兜底history 暂未返回该任务,但实时缓存里仍在跑,保留它在当前任务区
for (const [taskIdText, liveItem] of Object.entries(liveProgressItems.value)) {
const taskId = Number(taskIdText)
if (!Number.isFinite(taskId) || taskId <= 0) continue
if (!activeIds.has(taskId) && normalizeTaskStatus(liveItem) !== 'RUNNING' && normalizeTaskStatus(liveItem) !== 'PENDING') {
continue
}
if (activeItems.some((item) => item.taskId === taskId)) continue
activeItems.push(mergeCurrentTaskItem(liveItem))
}
if (!pendingParseItem.value) return activeItems
const exists = activeItems.some((item) => item.taskId === pendingParseItem.value?.taskId)
return exists ? activeItems : [pendingParseItem.value, ...activeItems]
@@ -234,6 +249,20 @@ const historyOnlyItems = computed(() =>
}),
)
function mergeCurrentTaskItem(item: SimilarAsinHistoryItem) {
if (item.taskId == null) return item
const liveItem = liveProgressItems.value[item.taskId]
if (!liveItem) return item
return {
...item,
...liveItem,
sourceFilename: liveItem.sourceFilename || item.sourceFilename,
resultFilename: liveItem.resultFilename || item.resultFilename,
rowCount: liveItem.rowCount ?? item.rowCount,
createdAt: liveItem.createdAt || item.createdAt,
}
}
function effectiveCozeApiKey() {
return getStoredApiSecret('similar-asin').trim()
}
@@ -463,6 +492,11 @@ function addPollingTask(taskId: number) {
function removePollingTask(taskId: number) {
pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId)
if (!pendingFileTaskIds.value.includes(taskId)) {
const next = { ...liveProgressItems.value }
delete next[taskId]
liveProgressItems.value = next
}
savePollingIds()
}
@@ -476,9 +510,32 @@ function addPendingFileTask(taskId: number) {
function removePendingFileTask(taskId: number) {
pendingFileTaskIds.value = pendingFileTaskIds.value.filter((id) => id !== taskId)
if (!pollingTaskIds.value.includes(taskId)) {
const next = { ...liveProgressItems.value }
delete next[taskId]
liveProgressItems.value = next
}
savePollingIds()
}
function removeTaskFromLocalState(taskId?: number) {
if (!taskId) return
removePollingTask(taskId)
removePendingFileTask(taskId)
if (parseResult.value?.taskId === taskId) {
clearParsedTask()
}
if (queuedTaskSummary.value?.taskId === taskId) {
queuedTaskSummary.value = null
}
historyItems.value = historyItems.value.filter((row) => row.taskId !== taskId)
if (liveProgressItems.value[taskId]) {
const next = { ...liveProgressItems.value }
delete next[taskId]
liveProgressItems.value = next
}
}
function ensurePolling() {
if (disposed) return
if (pollTimer.value != null) return
@@ -528,7 +585,14 @@ async function refreshTaskProgress() {
const task = detail.task
if (!task?.id) continue
const item = detail.items?.[0]
if (item) mergeHistoryItem(item)
if (item) {
// 实时缓存:以最新一次 progress 为准,避免 history 接口字段缺失/延迟时丢失进度
liveProgressItems.value = {
...liveProgressItems.value,
[task.id]: item,
}
mergeHistoryItem(item)
}
if (task.status === 'SUCCESS' || task.status === 'FAILED') {
removePollingTask(task.id)
shouldRefreshDashboard = true
@@ -848,11 +912,17 @@ async function downloadResult(item: SimilarAsinHistoryItem) {
async function deleteTaskRecord(item: SimilarAsinHistoryItem) {
try {
if (item.taskStatus === 'RUNNING' && item.taskId) {
await deleteSimilarAsinTask(item.taskId)
removePollingTask(item.taskId)
const status = normalizeTaskStatus(item)
const taskId = item.taskId
const shouldDeleteTask = taskId != null && (status === 'RUNNING' || status === 'PENDING' || !item.resultId)
if (shouldDeleteTask) {
await deleteSimilarAsinTask(taskId)
removeTaskFromLocalState(taskId)
} else if (item.resultId) {
await deleteSimilarAsinHistory(item.resultId)
if (item.taskId) {
historyItems.value = historyItems.value.filter((row) => row.taskId !== item.taskId)
}
}
await loadDashboard()
await loadHistory({ force: true })