From 89d8b1f8b34d875db9d7f8bcd7e1e2b1ce481e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 22 Nov 2026 22:48:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(web):=20=E6=9C=AA=E5=AE=8C=E6=88=90/?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BB=BB=E5=8A=A1=E8=BF=9B=E3=80=8C=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E4=BB=BB=E5=8A=A1=E3=80=8D=E5=8C=BA=EF=BC=8C=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E5=8F=AA=E7=95=99=E5=AE=8C=E6=88=90=E6=80=81=EF=BC=8B?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E9=87=87=E9=9B=86=E5=A4=B4=E9=83=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=97=B4=E8=B7=9D=E6=94=B6=E7=B4=A7=EF=BC=882026-11-2?= =?UTF-8?q?2=20=E7=94=A8=E6=88=B7=E6=8B=8D=E6=9D=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - useLiveTaskBoard 新增 CURRENT_AREA_STATUSES(RUNNING/PENDING/SCHEDULED/FAILED/CANCELLED/CANCELED,两种取消拼写都认,未知态仍归历史):已中断/失败的任务常驻当前任务区带「继续/重试」按钮,不再埋进历史抽屉——中断 toast 说「之后可点继续」,按钮此前却藏在抽屉里自相矛盾;历史任务从此只留完成态 - 四个骨架页签(京东采集/京东上架/货源查询/外观专利)计数卡对齐:「已结束任务(成功+失败)」与「成功任务」合并为「已完成任务」(successTaskCount)——失败挂当前区后旧卡同屏自相矛盾 - 京东采集「登录京麦/同步分类」两按钮收进右侧一组 .category-head-actions(原 space-between 三子项把中间按钮悬空,用户点名间距收小) - 判据:tests/task-board-current-area.test.ts 4 支(词表两种取消拼写齐/旧分区写法反钉/页签不得自建分区/计数卡口径);用户端整量 node --test 1105 passed+vitest 132 passed+vue-tsc rc=0 --- .../components/BrandAppearancePatentTab.vue | 3 +- .../brand/components/BrandSimilarAsinTab.vue | 3 +- frontend-vue/src/pages/jd/JdCollectTab.vue | 32 ++++--- frontend-vue/src/pages/jd/JdPublishTab.vue | 3 +- .../shared/composables/useLiveTaskBoard.ts | 23 +++-- .../tests/task-board-current-area.test.ts | 87 +++++++++++++++++++ 6 files changed, 127 insertions(+), 24 deletions(-) create mode 100644 frontend-vue/tests/task-board-current-area.test.ts diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue index 1175cdbc4..55b414d3f 100644 --- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue @@ -339,8 +339,7 @@ const pendingParseItem = computed(() => { const patentCards = computed(() => [ { label: '运行中任务', value: board.dashboard.value.pendingTaskCount }, - { label: '已结束任务', value: board.dashboard.value.processedTaskCount }, - { label: '成功任务', value: board.dashboard.value.successTaskCount }, + { label: '已完成任务', value: board.dashboard.value.successTaskCount }, { label: '失败任务', value: board.dashboard.value.failedTaskCount }, ]) diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue index 45e21f23b..4ced28d17 100644 --- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue @@ -300,8 +300,7 @@ const pendingParseItem = computed(() => { const asinCards = computed(() => [ { label: '运行中任务', value: board.dashboard.value.pendingTaskCount }, - { label: '已结束任务', value: board.dashboard.value.processedTaskCount }, - { label: '成功任务', value: board.dashboard.value.successTaskCount }, + { label: '已完成任务', value: board.dashboard.value.successTaskCount }, { label: '失败任务', value: board.dashboard.value.failedTaskCount }, ]) diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index 049137a51..f9238ea09 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -309,8 +309,7 @@ const { batchDeleteHistory, deleteTaskRecord } = board const jdCards = computed(() => [ { label: '运行中任务', value: board.dashboard.value.pendingTaskCount }, - { label: '已结束任务', value: board.dashboard.value.processedTaskCount }, - { label: '成功任务', value: board.dashboard.value.successTaskCount }, + { label: '已完成任务', value: board.dashboard.value.successTaskCount }, { label: '失败任务', value: board.dashboard.value.failedTaskCount }, ]) @@ -695,15 +694,17 @@ onUnmounted(() => {
采集分类(可选,多选) - - +
+ + +
@@ -945,6 +946,15 @@ onUnmounted(() => { margin-bottom: 8px; } +/* 两个操作按钮收进右侧一组:原来三个子项直接 space-between,中等的那个被推到 + 中间悬空,「登录京麦」和「同步分类」之间隔了一大段(2026-11-22 用户点名)。 */ +.category-head-actions { + display: flex; + align-items: center; + flex-shrink: 0; + gap: 6px; +} + .category-label { display: block; color: #c8d2e2; diff --git a/frontend-vue/src/pages/jd/JdPublishTab.vue b/frontend-vue/src/pages/jd/JdPublishTab.vue index 2dbb66ec2..2ef302b8a 100644 --- a/frontend-vue/src/pages/jd/JdPublishTab.vue +++ b/frontend-vue/src/pages/jd/JdPublishTab.vue @@ -265,8 +265,7 @@ const { batchDeleteHistory, deleteTaskRecord } = board const jdCards = computed(() => [ { label: '运行中任务', value: board.dashboard.value.pendingTaskCount }, - { label: '已结束任务', value: board.dashboard.value.processedTaskCount }, - { label: '成功任务', value: board.dashboard.value.successTaskCount }, + { label: '已完成任务', value: board.dashboard.value.successTaskCount }, { label: '失败任务', value: board.dashboard.value.failedTaskCount }, ]) diff --git a/frontend-vue/src/shared/composables/useLiveTaskBoard.ts b/frontend-vue/src/shared/composables/useLiveTaskBoard.ts index febcff4bf..41b2dd485 100644 --- a/frontend-vue/src/shared/composables/useLiveTaskBoard.ts +++ b/frontend-vue/src/shared/composables/useLiveTaskBoard.ts @@ -148,9 +148,9 @@ export interface UseLiveTaskBoardReturn { historyItems: Ref /** 统计卡片数据 */ dashboard: Ref - /** 当前任务区条目(轮询/进行中 + live 兜底 + 解析占位) */ + /** 当前任务区条目(在跑/待跑/已中断/失败 + live 兜底 + 解析占位;失败态是待办不是历史) */ currentItems: ComputedRef - /** 纯历史条目(排除 RUNNING/PENDING) */ + /** 纯历史条目(只留完成态;排除 CURRENT_AREA_STATUSES) */ historyOnlyItems: ComputedRef /** 从 localStorage 恢复轮询 ID */ @@ -220,6 +220,18 @@ export function defaultCanDownload(item: LiveTaskHistoryItem) { return Boolean(item.resultId && (item.fileReady || item.downloadUrl)) } +/** + * 「当前任务区」状态词表(2026-11-22 用户拍板:历史任务只留完成态)。 + * + * 在跑/待跑之外,「已中断」「失败」也是待办——服务端留着断点游标与原任务重试出口 + * (铁律 26:失败在原任务上复位;B184-01:重试后直推载荷带回本机队列),埋进历史抽屉 + * 用户就找不到了:中断 toast 说「之后可点继续接着跑」,继续按钮却藏在抽屉里。 + * 取消态两种拼写并存(Java 侧 CANCELLED 与 CANCELED 都发得出,见 task-status-text.ts 的 + * CANCELLED_STATUS_WORDS),词表漏一个老行就掉回历史区。未知/空状态不在表内 ⇒ 仍归历史, + * 别把认不出的行装进当前区冒充在跑。 + */ +const CURRENT_AREA_STATUSES: readonly string[] = ['RUNNING', 'PENDING', 'SCHEDULED', 'FAILED', 'CANCELLED', 'CANCELED'] + const HISTORY_CACHE_TTL_MS = 3000 export function useLiveTaskBoard( @@ -259,7 +271,7 @@ export function useLiveTaskBoard( const activeItems = historyItems.value .filter((item) => { const status = normalizeTaskStatus(item) - return item.taskId != null && (activeIds.has(item.taskId) || status === 'RUNNING' || status === 'PENDING') + return item.taskId != null && (activeIds.has(item.taskId) || CURRENT_AREA_STATUSES.includes(status)) }) .map((item) => mergeCurrentTaskItem(item)) // 兜底:history 暂未返回该任务,但实时缓存里仍在跑,保留它在当前任务区 @@ -279,10 +291,7 @@ export function useLiveTaskBoard( }) const historyOnlyItems = computed(() => - historyItems.value.filter((i) => { - const status = normalizeTaskStatus(i) - return status !== 'RUNNING' && status !== 'PENDING' - }), + historyItems.value.filter((i) => !CURRENT_AREA_STATUSES.includes(normalizeTaskStatus(i))), ) // ---- 轮询 ID 持久化(两 Tab 逐字相同,仅 key 不同)---- diff --git a/frontend-vue/tests/task-board-current-area.test.ts b/frontend-vue/tests/task-board-current-area.test.ts new file mode 100644 index 000000000..5e432aeeb --- /dev/null +++ b/frontend-vue/tests/task-board-current-area.test.ts @@ -0,0 +1,87 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { fileURLToPath } from 'node:url' +import { dirname, join } from 'node:path' + +/** + * 任务分区守卫(2026-11-22 用户拍板:历史任务只留完成态)。 + * + * 现状事故形状:已中断(CANCELLED)与失败(FAILED)的任务被旧分区规则 + * 「非 RUNNING/PENDING 一律进历史」卷进历史抽屉——中断 toast 说「之后可点 + * 「继续」接着跑」,继续按钮却埋在抽屉里;当前任务区空着,半成品过两天 + * 就被忘掉。拍板后:未完成态(在跑/待跑/已中断/失败)全部留在当前任务区, + * 历史只留真正拿到完成态的行。 + * + * 钉三层:①共享骨架的分区词表与两个过滤出口;②四个接入页签不得各自 + * 再写一套会漏的分区;③计数卡与新分区口径对齐(「已结束任务」数的是 + * 成功+失败,失败挂进当前区后这张卡就成了同屏自相矛盾)。 + */ +const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..') + +function sourceOf(rel: string) { + return readFileSync(join(ROOT, rel), 'utf8') +} + +const BOARD = 'src/shared/composables/useLiveTaskBoard.ts' +const SKELETON_TABS = [ + 'src/pages/jd/JdCollectTab.vue', + 'src/pages/jd/JdPublishTab.vue', + 'src/pages/brand/components/BrandSimilarAsinTab.vue', + 'src/pages/brand/components/BrandAppearancePatentTab.vue', +] + +test('共享骨架的当前区词表必须覆盖在跑/待跑/已中断/失败,取消态两种拼写都在', () => { + const board = sourceOf(BOARD) + for (const status of ['RUNNING', 'PENDING', 'SCHEDULED', 'FAILED', 'CANCELLED', 'CANCELED']) { + assert.match( + board, + new RegExp(`CURRENT_AREA_STATUSES[^\\n]*['"]${status}['"]`), + `CURRENT_AREA_STATUSES 缺 ${status}:漏了它这一态的行就掉回历史区` + (status === 'CANCELED' || status === 'CANCELLED' ? '(Java 侧两种取消拼写都发得出,漏一个老行就找不到了)' : ''), + ) + } +}) + +test('historyOnlyItems 只能按当前区词表取反过滤,不得回到「非 RUNNING/PENDING 即历史」', () => { + const board = sourceOf(BOARD) + assert.ok( + board.includes('historyItems.value.filter((i) => !CURRENT_AREA_STATUSES.includes(normalizeTaskStatus(i)))'), + 'historyOnlyItems 必须是 CURRENT_AREA_STATUSES 的取反过滤(历史只留完成态)', + ) + assert.ok( + !board.includes("status !== 'RUNNING' && status !== 'PENDING'"), + '旧分区写法(status !== RUNNING && status !== PENDING)不得回流:它把已中断/失败全卷进历史', + ) + assert.match( + board, + /CURRENT_AREA_STATUSES\.includes\(status\)/, + 'currentItems 的状态过滤必须走 CURRENT_AREA_STATUSES(activeIds 之外的兜底分支)', + ) +}) + +test('四个骨架页签不得各自再写一套当前/历史分区(分区只许出自共享骨架)', () => { + for (const rel of SKELETON_TABS) { + const source = sourceOf(rel) + assert.ok( + source.includes('board.historyOnlyItems.value') && source.includes('board.currentItems.value'), + `${rel} 必须消费共享骨架的 currentItems/historyOnlyItems,不得自建分区`, + ) + // 页签内自建的 isActiveTask 只管进度条显隐,不允许被当成历史/当前分区用 + assert.ok( + !/historyItems\.value\.filter\(\(item\)\s*=>\s*!isActiveTask/.test(source) && + !/historyItems\.value\.filter\(\(item\)\s*=>\s*isActiveTask/.test(source), + `${rel} 出现了用 isActiveTask 过滤历史列表的自建分区`, + ) + } +}) + +test('计数卡与新分区口径对齐:不得再出现「已结束任务」,完成态卡用 successTaskCount', () => { + for (const rel of SKELETON_TABS) { + const source = sourceOf(rel) + assert.ok(!source.includes("label: '已结束任务'"), + `${rel} 的「已结束任务」卡(成功+失败)与失败挂当前区自相矛盾,改「已完成任务」`) + assert.match(source, /label: '已完成任务', value: board\.dashboard\.value\.successTaskCount/, + `${rel} 缺「已完成任务」卡(successTaskCount)`) + assert.match(source, /label: '失败任务'/, `${rel} 缺「失败任务」卡`) + } +})