feat(jd-collect): 建单页采集状态多选(售卖中/已下架)
原实现写死 tabs=['ONSALE'],已下架商品(京麦「已下架」页签,productState=10)根本进不了任务体。改为按状态勾选:
This commit is contained in:
@@ -44,12 +44,42 @@ import NotificationBell from '@/shared/components/NotificationBell.vue'
|
||||
* profile 现拉 getShopCategoryList(执行体 amazon/jd/shop_categories.py)。
|
||||
* 店内分类是商家在京麦后台自维护的,选项集永远等于「本机已登录那家店」的现值;
|
||||
* 老客户端没有该桥方法 ⇒ 按钮置灰并提示升级。
|
||||
*
|
||||
* 2026-11-20 客户口径「加个状态勾选,采集售卖中或已下架的,多选」:采集状态从写死的
|
||||
* DEFAULT_TABS 改为页面勾选(默认两项都勾=与旧行为一致),选中值成为建单 listTabs 与
|
||||
* 推送载荷的同一真源;空选不建单(服务端 JdCollectTaskService 同样要求至少一个 Tab)。
|
||||
* DEFAULT_TABS 只保留给历史行缺 listTabs 时的重试/继续兜底。
|
||||
*/
|
||||
|
||||
/** 页面不再让用户填店铺名:店铺名称由客户端从京麦后台读,建单先按此占位记录。 */
|
||||
const DEFAULT_SHOP_NAME = '京麦后台'
|
||||
/** 兜底词表:历史行没带 listTabs 时,重试/继续重建推送载荷按两项都采处理。 */
|
||||
const DEFAULT_TABS: JdListTab[] = ['ONSALE', 'OFFSALE']
|
||||
|
||||
/** 采集状态多选(2026-11-20 客户口径「加个状态勾选,采集售卖中或已下架的,多选」):
|
||||
* 默认两项都勾=与旧行为一致;只勾一项就只采那一档;空选不允许建单(服务端同样要求
|
||||
* 至少一个 Tab)。词表与京麦列表页签同源:ONSALE 售卖中 / OFFSALE 已下架。 */
|
||||
const TAB_OPTIONS: ReadonlyArray<{ value: JdListTab; label: string }> = [
|
||||
{ value: 'ONSALE', label: '售卖中' },
|
||||
{ value: 'OFFSALE', label: '已下架' },
|
||||
]
|
||||
const selectedTabs = ref<JdListTab[]>([...DEFAULT_TABS])
|
||||
const noTabSelected = computed(() => selectedTabs.value.length === 0)
|
||||
const selectedTabLabels = computed(() =>
|
||||
TAB_OPTIONS.filter((option) => selectedTabs.value.includes(option.value)).map((option) => option.label),
|
||||
)
|
||||
const tabHint = computed(() => (
|
||||
selectedTabLabels.value.length
|
||||
? `本次采集「${selectedTabLabels.value.join('、')}」的商品。`
|
||||
: '至少勾选一个采集状态才能开始采集。'
|
||||
))
|
||||
/** 勾选/取消一个状态:默认两项都选是旧行为,用户可只留一项(例如店里只剩已下架商品)。 */
|
||||
function toggleTab(tab: JdListTab) {
|
||||
selectedTabs.value = selectedTabs.value.includes(tab)
|
||||
? selectedTabs.value.filter((item) => item !== tab)
|
||||
: [...selectedTabs.value, tab]
|
||||
}
|
||||
|
||||
const homeHref = resolvePageHref('/new_web_source/home.html')
|
||||
const backHref = resolvePageHref('/new_web_source/jd-console.html')
|
||||
|
||||
@@ -292,6 +322,11 @@ function itemSource(item: TaskItemView) {
|
||||
return item.source as JdCollectHistoryItemVo
|
||||
}
|
||||
|
||||
/** 历史行 Tab 词 → 界面词;旧行没有 listTabs 时整行不显示,不拿兜底两项冒充事实。 */
|
||||
function tabLabel(tab: string) {
|
||||
return TAB_OPTIONS.find((option) => option.value === tab)?.label ?? tab
|
||||
}
|
||||
|
||||
function toJdTaskView(item: JdCollectHistoryItemVo): TaskItemView {
|
||||
const showProgress = isActiveTask(item)
|
||||
return {
|
||||
@@ -303,6 +338,7 @@ function toJdTaskView(item: JdCollectHistoryItemVo): TaskItemView {
|
||||
statusText: statusText(item),
|
||||
statusClass: statusClass(item),
|
||||
extraLines: [
|
||||
...(item.listTabs?.length ? [`采集状态:${item.listTabs.map(tabLabel).join('、')}`] : []),
|
||||
...(item.rowCount != null ? [`已采集 ${item.rowCount} 个商品`] : []),
|
||||
...(showProgress && typeof item.page === 'number' && item.page > 0
|
||||
? [`断点游标:第 ${item.page} 页 · 已回传 ${item.batches ?? 0} 批`]
|
||||
@@ -513,9 +549,16 @@ async function startCollect() {
|
||||
errorMessage.value = ''
|
||||
successMessage.value = ''
|
||||
noticeMessage.value = ''
|
||||
// 只认勾选的状态、按固定顺序(ONSALE→OFFSALE)下发:用户点选的先后不影响请求体。
|
||||
const tabs = TAB_OPTIONS
|
||||
.map((option) => option.value)
|
||||
.filter((tab) => selectedTabs.value.includes(tab))
|
||||
if (!tabs.length) {
|
||||
errorMessage.value = '请至少勾选一个采集状态(售卖中 / 已下架)'
|
||||
return
|
||||
}
|
||||
submitting.value = true
|
||||
const shop = DEFAULT_SHOP_NAME
|
||||
const tabs = DEFAULT_TABS
|
||||
const shopNames = [...selectedShopCategoryNames.value]
|
||||
const shopIds = [...selectedShopCategoryIds.value]
|
||||
try {
|
||||
@@ -539,9 +582,15 @@ async function startCollect() {
|
||||
}
|
||||
}
|
||||
if (!errorMessage.value && !noticeMessage.value) {
|
||||
successMessage.value = shopNames.length
|
||||
? `任务已创建(只采 ${shopNames.length} 个分类)并推送给本机客户端,进度显示在右侧任务区`
|
||||
: '任务已创建并推送给本机客户端,进度显示在右侧任务区'
|
||||
const tabLabels = TAB_OPTIONS
|
||||
.filter((option) => tabs.includes(option.value))
|
||||
.map((option) => option.label)
|
||||
.join('、')
|
||||
const scopeNote = [
|
||||
`采集 ${tabLabels}`,
|
||||
...(shopNames.length ? [`只采 ${shopNames.length} 个分类`] : []),
|
||||
].join(',')
|
||||
successMessage.value = `任务已创建(${scopeNote})并推送给本机客户端,进度显示在右侧任务区`
|
||||
}
|
||||
await Promise.all([board.loadDashboard(), board.loadHistory({ force: true })])
|
||||
} catch (err) {
|
||||
@@ -604,6 +653,18 @@ onUnmounted(() => {
|
||||
|
||||
<main class="jd-body">
|
||||
<aside class="left-panel">
|
||||
<div class="category-block">
|
||||
<span class="category-label">采集状态(多选)</span>
|
||||
<div class="tab-checks">
|
||||
<label v-for="option in TAB_OPTIONS" :key="option.value" class="tab-check">
|
||||
<input type="checkbox" :value="option.value"
|
||||
:checked="selectedTabs.includes(option.value)" @change="toggleTab(option.value)" />
|
||||
<span>{{ option.label }}</span>
|
||||
</label>
|
||||
</div>
|
||||
<p class="category-hint">{{ tabHint }}</p>
|
||||
</div>
|
||||
|
||||
<div class="category-block">
|
||||
<div class="category-head">
|
||||
<span class="category-label">采集分类(可选,多选)</span>
|
||||
@@ -628,8 +689,8 @@ onUnmounted(() => {
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<button class="collect-btn" type="button" :disabled="isRunning" @click="startCollect">
|
||||
{{ isRunning ? '获取中…' : (selectedShopCategories.length ? `获取选中分类数据` : '一键获取店铺数据') }}
|
||||
<button class="collect-btn" type="button" :disabled="isRunning || noTabSelected" @click="startCollect">
|
||||
{{ isRunning ? '获取中…' : (noTabSelected ? '请先勾选采集状态' : (selectedShopCategories.length ? `获取选中分类数据` : '一键获取店铺数据')) }}
|
||||
</button>
|
||||
|
||||
<p class="collect-hint">
|
||||
@@ -864,6 +925,31 @@ onUnmounted(() => {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* 采集状态勾选(2026-11-20):只两档,直接平铺两个复选框,不用下拉。 */
|
||||
.tab-checks {
|
||||
display: flex;
|
||||
gap: 20px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.tab-check {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
color: #c8d2e2;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.tab-check input {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
margin: 0;
|
||||
accent-color: #e1251b;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.shop-cat-sync {
|
||||
flex-shrink: 0;
|
||||
padding: 4px 12px;
|
||||
|
||||
@@ -255,3 +255,31 @@ test('推送失败的兜底提示走 notice 通道,不占红色 error', () =>
|
||||
assert.ok(!page.includes('推送本机队列失败,任务将由'), '旧「推送失败」横幅文案必须下线')
|
||||
assert.ok(page.includes('约 1 分钟内自动领取'), '兜底提示必须给出预期时长(约 1 分钟内自动领取)')
|
||||
})
|
||||
|
||||
/** 2026-11-20 客户口径「加个状态勾选,采集售卖中或已下架的,多选」:建单页原本写死
|
||||
* DEFAULT_TABS 两项全采(店里只剩已下架商品时那一档白扫)。改为页面勾选多选,默认
|
||||
* 两项都勾=旧行为;选中值必须成为建单 listTabs 与推送载荷的同一真源,空选不建单
|
||||
* (服务端 JdCollectTaskService 同样要求至少一个 Tab,前端空选会被后端点名拒)。 */
|
||||
test('采集状态多选:售卖中/已下架可勾选,空选禁止建单', () => {
|
||||
const page = readIfExists(
|
||||
join(process.cwd(), 'src', 'pages', 'jd', 'JdCollectTab.vue'),
|
||||
'JdCollectTab.vue',
|
||||
)
|
||||
assert.ok(page.includes('采集状态(多选)'), '建单页必须有「采集状态(多选)」块')
|
||||
assert.ok(page.includes("label: '售卖中'") && page.includes("label: '已下架'"),
|
||||
'两个状态必须叫售卖中/已下架(与京麦列表页签同词表)')
|
||||
assert.ok(page.includes('const selectedTabs = ref<JdListTab[]>([...DEFAULT_TABS])'),
|
||||
'默认两项都勾(与旧行为一致,不得悄悄变成只采一档)')
|
||||
assert.ok(page.includes(':disabled="isRunning || noTabSelected"'),
|
||||
'空选必须禁用「获取」按钮(第一道)')
|
||||
|
||||
const startAt = page.indexOf('async function startCollect')
|
||||
assert.ok(startAt > 0, 'JdCollectTab.vue 缺 startCollect')
|
||||
const body = page.slice(startAt, page.indexOf('onMounted(async'))
|
||||
assert.ok(body.includes('selectedTabs.value.includes(tab)'),
|
||||
'startCollect 的 tabs 必须来自勾选状态(不得再写死 DEFAULT_TABS)')
|
||||
assert.ok(!body.includes('const tabs = DEFAULT_TABS'),
|
||||
'startCollect 不得再写死 DEFAULT_TABS(状态多选就失效了)')
|
||||
assert.ok(body.includes('请至少勾选一个采集状态'),
|
||||
'空选必须给「至少勾选一个」提示(按钮禁用之外的第二道)')
|
||||
})
|
||||
|
||||
@@ -155,7 +155,11 @@ function syncedResult(over: Record<string, unknown> = {}) {
|
||||
}
|
||||
|
||||
async function syncCategories(w: VueWrapper) {
|
||||
await w.find('.shop-cat-sync').trigger('click')
|
||||
// 2026-11-20 起同一样式类下有两个按钮:「登录京麦」在前、「同步分类」在后;
|
||||
// 按文案取,别再拿 find('.shop-cat-sync') 点第一个(点到登录按钮=同步根本没跑)。
|
||||
const syncBtn = w.findAll('.shop-cat-sync').find((btn) => btn.text().includes('同步分类'))
|
||||
if (!syncBtn) throw new Error('页面缺「同步分类」按钮')
|
||||
await syncBtn.trigger('click')
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
@@ -437,9 +441,10 @@ describe('获取店铺数据:一键采集 + 任务面板', () => {
|
||||
expect(block!.text()).toContain('已同步店铺「花屿巷旗舰店」:3 个分类')
|
||||
expect(block!.text()).not.toContain('未同步')
|
||||
// 按钮回到可再同步态(店铺侧改了分类可随时重拉)
|
||||
const syncBtn = w.find('.shop-cat-sync')
|
||||
expect(syncBtn.text()).toBe('同步分类')
|
||||
expect(syncBtn.attributes('disabled')).toBeUndefined()
|
||||
const syncBtn = w.findAll('.shop-cat-sync').find((btn) => btn.text().includes('同步分类'))
|
||||
expect(syncBtn, '页面缺「同步分类」按钮').toBeTruthy()
|
||||
expect(syncBtn!.text()).toBe('同步分类')
|
||||
expect(syncBtn!.attributes('disabled')).toBeUndefined()
|
||||
})
|
||||
|
||||
it('同步失败 jd_busy:京东任务在跑是设计内等待,走 amber notice 不占红色 error', async () => {
|
||||
@@ -476,11 +481,11 @@ describe('获取店铺数据:一键采集 + 任务面板', () => {
|
||||
const w = await mountPage(true)
|
||||
await flushPromises()
|
||||
|
||||
const syncBtn = w.find('.shop-cat-sync')
|
||||
expect(syncBtn.exists()).toBe(true)
|
||||
const syncBtn = w.findAll('.shop-cat-sync').find((btn) => btn.text().includes('同步分类'))
|
||||
expect(syncBtn, '页面缺「同步分类」按钮').toBeTruthy()
|
||||
// 桥上没有 get_jd_shop_categories(老客户端/浏览器打开)⇒ 按钮置灰,
|
||||
// 用户根本点不到(无桥提示 SYNC_UNAVAILABLE_NOTE 的形状由 jd-collect-tab 纯测试钉住)
|
||||
expect(syncBtn.attributes('disabled')).toBeDefined()
|
||||
expect(syncBtn!.attributes('disabled')).toBeDefined()
|
||||
expect(w.findAllComponents(ElOption).length).toBe(0)
|
||||
// 全店采集主链路不依赖分类:建单双键空数组照常
|
||||
await startCollect(w)
|
||||
@@ -517,4 +522,42 @@ describe('获取店铺数据:一键采集 + 任务面板', () => {
|
||||
expect(payload.data.shopCategoryIds).toEqual([])
|
||||
expect(payload.data.shopCategoryNames).toEqual([])
|
||||
})
|
||||
|
||||
/** 2026-11-20 客户口径「加个状态勾选,采集售卖中或已下架的,多选」:状态从写死两项
|
||||
* 改为页面勾选;勾选结果必须同时进建单 listTabs 与推送载荷(两处不同源=界面勾了、
|
||||
* 客户端照旧跑两档)。 */
|
||||
it('采集状态多选:只勾「已下架」时建单与推送载荷都只带 OFFSALE', async () => {
|
||||
const w = await mountPage()
|
||||
const checks = w.findAll('.tab-check input')
|
||||
expect(checks.length, '必须有售卖中/已下架两个勾选框').toBe(2)
|
||||
// 默认两项都勾=旧行为(不悄悄变成只采一档)
|
||||
expect((checks[0].element as HTMLInputElement).checked).toBe(true)
|
||||
expect((checks[1].element as HTMLInputElement).checked).toBe(true)
|
||||
|
||||
await checks[0].trigger('change') // 取消「售卖中」
|
||||
await flushPromises()
|
||||
expect((checks[0].element as HTMLInputElement).checked).toBe(false)
|
||||
|
||||
await startCollect(w)
|
||||
expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['OFFSALE'], 0, [], [], [])
|
||||
expect(api.enqueue.mock.calls[0][0].data.listTabs).toEqual(['OFFSALE'])
|
||||
})
|
||||
|
||||
it('采集状态多选:两项都不勾时按钮禁用并说明原因,点了也不建单', async () => {
|
||||
const w = await mountPage()
|
||||
const checks = w.findAll('.tab-check input')
|
||||
await checks[0].trigger('change')
|
||||
await checks[1].trigger('change')
|
||||
await flushPromises()
|
||||
|
||||
const btn = w.find('.collect-btn')
|
||||
expect(btn.attributes('disabled')).toBeDefined()
|
||||
expect(btn.text()).toBe('请先勾选采集状态')
|
||||
await btn.trigger('click')
|
||||
await flushPromises()
|
||||
// 第二道:即便事件穿透到处理函数,空选也拦在建单之前
|
||||
expect(api.createJdCollectTask).not.toHaveBeenCalled()
|
||||
// 提示文案随勾选状态实时说明原因(按钮禁用是第一道)
|
||||
expect(w.findAll('.category-block')[0].text()).toContain('至少勾选一个采集状态')
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user