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(() => {