From 9e3f28079b65b3407c1b357dc91bb8a393e870cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 16 Nov 2026 01:17:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd):=20=E5=BB=BA=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E5=8A=A0=E4=BA=AC=E4=B8=9C=E7=B1=BB=E7=9B=AE=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E7=BA=A7=E8=81=94=EF=BC=88=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=90=8C=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=80=89=E7=B1=BB?= =?UTF-8?q?=E7=9B=AE=E5=8E=BB=E9=87=87=E9=9B=86=E5=90=8C=E6=AD=A5=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=EF=BC=89=E2=80=94=E2=80=94JdCategoryCascader.vue+jd-c?= =?UTF-8?q?ategory-tree.ts=20=E4=BB=8E=E5=90=8E=E7=AE=A1=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E6=94=B9=E5=A4=9A=E9=80=89=EF=BC=88=E7=AC=AC=E4=B8=89=E6=A0=8F?= =?UTF-8?q?=E5=B7=B2=E8=90=BD=E5=BA=93=E6=9C=AB=E7=BA=A7=E5=85=A8=E9=9B=86?= =?UTF-8?q?+=E6=90=9C=E7=B4=A2=E7=82=B9=E9=80=89=20toggle=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E7=82=B9=20checkbox=EF=BC=8C=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=3D=E6=B8=85=E7=A9=BA=3D=E5=85=A8=E5=BA=97?= =?UTF-8?q?=E9=87=87=E9=9B=86=EF=BC=9B=E8=A7=A6=E5=8F=91=E6=A1=86=E6=9A=97?= =?UTF-8?q?=E8=89=B2=E4=B8=BB=E9=A2=98=E9=80=82=E9=85=8D=EF=BC=8C=E3=80=8C?= =?UTF-8?q?=E5=B7=B2=E9=80=89=20N=20=E4=B8=AA=E7=B1=BB=E7=9B=AE=E3=80=8D?= =?UTF-8?q?=EF=BC=9B=E9=80=89=E9=A1=B9=E7=A9=BA=E6=80=81=E4=B8=8D=E9=98=BB?= =?UTF-8?q?=E5=A1=9E=E5=BB=BA=E5=8D=95=EF=BC=89=EF=BC=9BJdCollectTab=20?= =?UTF-8?q?=E5=B7=A6=E9=9D=A2=E6=9D=BF=E5=8A=A0=E3=80=8C=E9=87=87=E9=9B=86?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=EF=BC=88=E5=8F=AF=E9=80=89=EF=BC=8C=E5=A4=9A?= =?UTF-8?q?=E9=80=89=EF=BC=89=E3=80=8D=EF=BC=8CstartCollect/pushToClientQu?= =?UTF-8?q?eue/retryTaskRecord=20=E4=B8=89=E5=A4=84=E5=85=A8=E9=93=BE?= =?UTF-8?q?=E5=B8=A6=20categoryPaths=EF=BC=88=E9=87=8D=E8=AF=95=E4=BB=8E?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=A1=8C=E5=90=8C=E6=BA=90=E5=B8=A6=E5=9B=9E?= =?UTF-8?q?=EF=BC=8C=E6=8E=A8=E9=80=81=E8=BD=BD=E8=8D=B7=E4=B8=8E=E5=BB=BA?= =?UTF-8?q?=E5=8D=95=E8=AF=B7=E6=B1=82=E4=BD=93=E3=80=81=E5=85=9C=E5=BA=95?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E4=B8=89=E5=A4=84=E5=90=8C=E9=94=AE=EF=BC=89?= =?UTF-8?q?=EF=BC=9Bjd-collect.ts=20=E5=8A=A0=20fetchJdCollectCategories/c?= =?UTF-8?q?reateJdCollectTask=20=E7=AC=AC4=E5=8F=82/JdCollectHistoryItemVo?= =?UTF-8?q?.categoryPaths=EF=BC=9Bendpoints=20=E6=B3=A8=E5=86=8C=20/api/jd?= =?UTF-8?q?-collect/categories=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9Ajd-colle?= =?UTF-8?q?ct-tab.test=20+3=20=E6=BA=90=E7=A0=81=E7=BB=8A=E7=BA=BF?= =?UTF-8?q?=EF=BC=88payload=20=E5=B8=A6=20categoryPaths/=E5=BB=BA=E5=8D=95?= =?UTF-8?q?=E4=BC=A0=E5=8F=82/=E9=87=8D=E8=AF=95=E5=B8=A6=E5=9B=9E?= =?UTF-8?q?=EF=BC=89+categories=20=E7=AB=AF=E7=82=B9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=EF=BC=8Cjd-category-tree.test=20=E4=B8=8E=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E5=90=8C=E5=88=A4=E6=8D=AE=E4=B8=A4=E4=BB=BD=E6=AD=A3=E6=9C=AC?= =?UTF-8?q?=E5=90=8C=E5=BD=A2=EF=BC=9Bvue-tsc=20=E9=9B=B6=E9=94=99?= =?UTF-8?q?=E3=80=81node=20--test=2010=20=E4=BE=8B=E5=85=A8=E7=BB=BF?= =?UTF-8?q?=E3=80=82=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=AF=BB=E5=8F=82=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=8F=A6=E7=AC=94=EF=BC=88=E5=A4=9A=E4=BB=93=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/jd/JdCategoryCascader.vue | 371 ++++++++++++++++++ frontend-vue/src/pages/jd/JdCollectTab.vue | 82 +++- frontend-vue/src/pages/jd/jd-category-tree.ts | 70 ++++ frontend-vue/src/shared/api/endpoints.ts | 2 + .../shared/api/types/modules/jd-collect.ts | 31 +- frontend-vue/tests/jd-category-tree.test.ts | 19 + frontend-vue/tests/jd-collect-tab.test.ts | 42 ++ 7 files changed, 608 insertions(+), 9 deletions(-) create mode 100644 frontend-vue/src/pages/jd/JdCategoryCascader.vue create mode 100644 frontend-vue/src/pages/jd/jd-category-tree.ts create mode 100644 frontend-vue/tests/jd-category-tree.test.ts diff --git a/frontend-vue/src/pages/jd/JdCategoryCascader.vue b/frontend-vue/src/pages/jd/JdCategoryCascader.vue new file mode 100644 index 000000000..fdf63aae8 --- /dev/null +++ b/frontend-vue/src/pages/jd/JdCategoryCascader.vue @@ -0,0 +1,371 @@ + + + + + + {{ triggerText }} + × + + + + + + + + + + + {{ root }} + › + + + + + + + + {{ child }} + › + + + + + + + + 全部类目(全店采集) + + + + {{ options.length ? '未找到类目' : '暂无可选类目:先全店采集一次,落库后这里出选项' }} + + + + {{ leaf.name }} + {{ leaf.productCount }} + + + + + + + diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index 28f908ef3..0f58616d9 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -7,10 +7,12 @@ import { activateJdCollectTask, createJdCollectTask, deleteJdCollectTask, + fetchJdCollectCategories, fetchJdCollectDashboard, fetchJdCollectHistory, fetchJdCollectTaskProgressBatch, interruptJdCollectTask, + type JdCollectCategoryVo, type JdCollectHistoryItemVo, type JdListTab, } from '@/shared/api/types/modules/jd-collect' @@ -21,11 +23,14 @@ import { userNotice } from '@/shared/utils/user-notice' import { formatDateTime } from '@/shared/utils/datetime' import { useLiveTaskBoard } from '@/shared/composables/useLiveTaskBoard' import NotificationBell from '@/shared/components/NotificationBell.vue' +import JdCategoryCascader from './JdCategoryCascader.vue' /** 京东「获取店铺数据」(v1.5):一键建单 → 推送本机客户端 → 右侧任务面板实时进度。 * * 四个真源与四条边界(照 v1.4 已落地的采集契约与外观专利任务面板骨架,不另造流程): - * 1. 建单走后端 `/api/jd-collect/tasks`(通道恒 LOCAL,服务端落 PENDING); + * 1. 建单走后端 `/api/jd-collect/tasks`(通道恒 LOCAL,服务端落 PENDING);可选多选采集 + * 类目(京麦末级类目名,`categoryPaths`)——空=全店采集,选中值随建单进 request_json、 + * 随推送/兜底拉取进客户端,客户端按行 categoryPath 等值过滤(三处同键契约); * 2. 建单成功把 `jd-shop-collect-run` 载荷推进本机客户端队列——只建单不推送会让任务 * 卡在 PENDING 等兜底拉取(v1.4 Phase 6.1 P0-1 的教训);推送失败不回滚建单; * 3. 进度只读服务端:任务状态 + 合并写游标里的 itemsReceived/total。`total` 缺失时 @@ -46,6 +51,25 @@ const submitting = ref(false) const errorMessage = ref('') const successMessage = ref('') +// ---- 采集类目(可选,多选;空=全店采集)---- +/** 选项集=公共库已落库 category_path 全集(/api/jd-collect/categories 现算)。 + * 拉取失败不阻塞建单(不选类目=全店采集),只把空态文案打出来。 */ +const categoryOptions = ref([]) +const categoryOptionsLoaded = ref(false) +const selectedCategories = ref([]) + +async function loadCategoryOptions() { + if (categoryOptionsLoaded.value) return + try { + categoryOptions.value = await fetchJdCollectCategories() + } catch (err) { + // 选项是锦上添花:拉不到就保持空态文案,不把「全店采集」这条主路堵死。 + console.error('[jd-collect] 类目选项拉取失败(不选类目仍可全店采集)', err) + } finally { + categoryOptionsLoaded.value = true + } +} + function uidForStorage() { return typeof window !== 'undefined' ? window.localStorage.getItem('uid') || '0' : '0' } @@ -220,7 +244,8 @@ async function retryTaskRecord(item: JdCollectHistoryItemVo | null | undefined) const activateError = await activateTask(taskId) if (!activateError) { await pushToClientQueue(taskId, item?.shopName || DEFAULT_SHOP_NAME, - (item?.listTabs?.length ? item.listTabs : DEFAULT_TABS) as JdListTab[]) + (item?.listTabs?.length ? item.listTabs : DEFAULT_TABS) as JdListTab[], + item?.categoryPaths ?? []) } board.addPollingTask(taskId) await refreshBoard() @@ -258,11 +283,14 @@ async function activateTask(id: number): Promise { } } -/** 建单成功后推送本机队列;返回 null 表示环境无队列能力(浏览器预览),返回 string 表示失败原因。 */ +/** 建单成功后推送本机队列;返回 null 表示环境无队列能力(浏览器预览),返回 string 表示失败原因。 + * categoryPaths 是建单时选的采集类目(重试/继续从历史行同源带回)——推送载荷与建单请求体、 + * 客户端兜底拉取(request_json)三处同键,缺一处客户端就按全店采集跑。 */ async function pushToClientQueue( id: number, shop: string, tabs: JdListTab[], + categoryPaths: string[] = [], ): Promise { const api = getPywebviewApi() if (!api?.enqueue_json) { @@ -271,7 +299,7 @@ async function pushToClientQueue( const payload = { type: 'jd-shop-collect-run', ts: Date.now(), - data: { taskId: id, shopName: shop, listTabs: tabs, maxProducts: 0 }, + data: { taskId: id, shopName: shop, listTabs: tabs, maxProducts: 0, categoryPaths }, } const pushResult = await api.enqueue_json(payload) if (pushResult?.success) { @@ -293,8 +321,9 @@ async function startCollect() { submitting.value = true const shop = DEFAULT_SHOP_NAME const tabs = DEFAULT_TABS + const categories = [...selectedCategories.value] try { - const vo = await createJdCollectTask(shop, tabs, 0) + const vo = await createJdCollectTask(shop, tabs, 0, categories) board.addPollingTask(vo.taskId) let pushNote = '' const activateError = await activateTask(vo.taskId) @@ -304,7 +333,7 @@ async function startCollect() { pushNote = activateError } else { try { - const pushError = await pushToClientQueue(vo.taskId, shop, tabs) + const pushError = await pushToClientQueue(vo.taskId, shop, tabs, categories) if (pushError) pushNote = pushError } catch (pushErr) { // 推送自身异常不回滚建单:任务可由服务端兜底拉取认领。 @@ -315,7 +344,9 @@ async function startCollect() { if (pushNote) { errorMessage.value = pushNote } else { - successMessage.value = '任务已创建并推送给本机客户端,进度显示在右侧任务区' + successMessage.value = categories.length + ? `任务已创建(只采 ${categories.length} 个类目)并推送给本机客户端,进度显示在右侧任务区` + : '任务已创建并推送给本机客户端,进度显示在右侧任务区' } await Promise.all([board.loadDashboard(), board.loadHistory({ force: true })]) } catch (err) { @@ -332,6 +363,7 @@ onMounted(async () => { await Promise.all([ board.loadDashboard().catch(() => undefined), board.loadHistory().catch(() => undefined), + loadCategoryOptions(), ]) board.seedRunningTasksFromHistory() board.seedPendingFileTasksFromHistory() @@ -372,8 +404,22 @@ onUnmounted(() => {