From bbadc445af7b758b1f3bc81e16726c13da7680eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Sat, 21 Nov 2026 20:22:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(jd-database):=20=E5=8D=A1=E7=89=87?=
=?UTF-8?q?=E5=9B=BE=E5=BA=95=E6=9D=A1=E5=BA=97=E9=93=BA=E5=90=8D=E2=86=92?=
=?UTF-8?q?=E5=BD=92=E5=B1=9E=E5=88=86=E7=B1=BB=E5=90=8D=EF=BC=882026-11-2?=
=?UTF-8?q?1=20=E5=AE=A2=E6=88=B7=E5=8F=A3=E5=BE=84=E3=80=8C=E8=BF=99?=
=?UTF-8?q?=E8=BE=B9=E6=94=B9=E6=88=90=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=20=E8=87=AA=E5=B7=B1=E5=88=86?=
=?UTF-8?q?=E7=B1=BB=E7=9A=84=E9=82=A3=E4=B8=AA=E5=90=8D=E7=A7=B0=E5=B0=B1?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E3=80=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
JdProductCard 图底条从店铺名(shopName)改显 groupName(后端 fillGroupNames 按当前分组补,
前端 jd-product-model 既有解析零改),空时显「未分类」且条常驻渲染(原 v-if="shopName"
过滤退役);店铺名不再上卡(详情弹窗仍可看)。类名 .jd-card-shop→.jd-card-category(语义
归位);jd-product-api.ts 的 label 注释同步组长口径。
判据:jd-product-card.mount.test.ts 10 支(分类条/未分类例/.jd-card-shop 退役反钉)+
jd-database-page.mount.test.ts 卡片字段映射例同改;门禁 vue-tsc rc0/node --test 1955/
vitest 27 文件 244(+1 未分类例)/npm run build rc0。
⏳ 发版:随分组下拉组长前缀(后端 jar)同窗发后管。
---
admin-frontend-vue/src/pages/jd/JdProductCard.vue | 8 ++++++--
admin-frontend-vue/src/pages/jd/jd-product-api.ts | 3 ++-
.../tests/mount/jd-database-page.mount.test.ts | 6 ++++--
.../tests/mount/jd-product-card.mount.test.ts | 13 +++++++++++--
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/admin-frontend-vue/src/pages/jd/JdProductCard.vue b/admin-frontend-vue/src/pages/jd/JdProductCard.vue
index 42aedce91..55adb03a8 100644
--- a/admin-frontend-vue/src/pages/jd/JdProductCard.vue
+++ b/admin-frontend-vue/src/pages/jd/JdProductCard.vue
@@ -7,6 +7,10 @@
* 图片 hover 出「点击选择/点击取消」提示胶囊、右上角「已下载」角标(CSV 导出成功后
* 页面记 downloadedIds,徽标与信息分同槽竖排堆叠)。
*
+ * 2026-11-21 用户口径「这边改成分类名称就可以 自己分类的那个名称就可以」:图底条从
+ * 店铺名改显归属分类名(groupName,后端 fillGroupNames 按当前分组补)——没归入分类的
+ * 出「未分类」,条常驻渲染;店铺名不再上卡(详情弹窗仍可看)。
+ *
* 纯展示组件:入参=item+选中态+可勾选档+已下载态;出事件=切换勾选、打开详情、
* 复制编码。卡片整体点击=开详情;勾选与复制 @click.stop 防冒泡(与现表格行
* @click.stop 同形)。healthScore 徽标随图渲染(现表格同款「信息分」),null 不渲染。 */
@@ -68,7 +72,7 @@ function onFigureClick(event: MouseEvent): void {
{{ props.selected ? '点击取消' : '点击选择' }}
- {{ props.item.shopName }}
+ {{ props.item.groupName || '未分类' }}
{{ props.item.title || '-' }}
@@ -200,7 +204,7 @@ function onFigureClick(event: MouseEvent): void {
opacity: 1;
}
-.jd-card-shop {
+.jd-card-category {
position: absolute;
bottom: 0;
left: 0;
diff --git a/admin-frontend-vue/src/pages/jd/jd-product-api.ts b/admin-frontend-vue/src/pages/jd/jd-product-api.ts
index 42919ca9c..5047a3f16 100644
--- a/admin-frontend-vue/src/pages/jd/jd-product-api.ts
+++ b/admin-frontend-vue/src/pages/jd/jd-product-api.ts
@@ -165,7 +165,8 @@ export interface JdProductGroupPayload {
}
/** 「当前分组」下拉的一项(GET /scope 的 groups[],V203):editable=本账号对该组分类可写
- * (建/改名/删除/归类)。跨公司的组名由后端拼进 label,前端不解析公司字段。 */
+ * (建/改名/删除/归类)。跨组长的组名由后端拼进 label(2026-11-21 用户口径「不是选公司
+ * 是选超管/管理员」:前缀=组长账号名),前端不解析公司/组长字段。 */
export interface JdCategoryGroupOption {
id: number
name: string
diff --git a/admin-frontend-vue/tests/mount/jd-database-page.mount.test.ts b/admin-frontend-vue/tests/mount/jd-database-page.mount.test.ts
index 9f214d0dd..e22a0cea2 100644
--- a/admin-frontend-vue/tests/mount/jd-database-page.mount.test.ts
+++ b/admin-frontend-vue/tests/mount/jd-database-page.mount.test.ts
@@ -270,13 +270,15 @@ describe('京东数据库页(v1.6 装配:侧栏+卡片网格)', () => {
wrapper.unmount()
})
- it('卡片字段映射(商城款式):主图/店铺徽标/标题/价格区间/编码/采集日期/信息分', async () => {
+ it('卡片字段映射(商城款式):主图/分类条/标题/价格区间/编码/采集日期/信息分', async () => {
const wrapper = await mountWith({ items: [item(1), item(2, { mainImageUrl: '', healthScore: null })], total: 2, page: 1, pageSize: 50 })
const cards = wrapper.findAll('.jd-card')
expect(cards).toHaveLength(2)
const first = cards[0]
expect(first.find('img.jd-card-thumb').exists()).toBe(true, '有自有桶 URL 的卡片出真图')
- expect(first.get('.jd-card-shop').text()).toBe('旗舰自营店', '店铺徽标浮在图底')
+ // 2026-11-21 用户口径「这边改成分类名称就可以」:图底条显归属分类名,店铺名不上卡。
+ expect(first.get('.jd-card-category').text()).toBe('甲组', '分类条浮在图底')
+ expect(first.find('.jd-card-shop').exists()).toBe(false, '店铺名条退役')
expect(first.get('.jd-card-title').text()).toContain('304不锈钢保温杯大容量便携')
expect(first.get('.jd-card-price').text()).toBe('12.9 ~ 15.9', '价格走 jdPriceRange(number 形状不显示 -)')
expect(first.get('.jd-card-code').text()).toContain('JD-1001')
diff --git a/admin-frontend-vue/tests/mount/jd-product-card.mount.test.ts b/admin-frontend-vue/tests/mount/jd-product-card.mount.test.ts
index f0bf0d5cc..367dfc183 100644
--- a/admin-frontend-vue/tests/mount/jd-product-card.mount.test.ts
+++ b/admin-frontend-vue/tests/mount/jd-product-card.mount.test.ts
@@ -47,11 +47,14 @@ function item(over: Partial
= {}): JdProductItem {
}
describe('卡片字段渲染(与现表格「商品信息」列同源)', () => {
- it('主图/店铺徽标/标题/价格区间/商品编码/采集日期逐字段上卡', () => {
+ it('主图/分类条/标题/价格区间/商品编码/采集日期逐字段上卡', () => {
const wrapper = mount(JdProductCard, { props: { item: item(), selected: false, selectable: true } })
const img = wrapper.get('img.jd-card-thumb')
expect(img.attributes('src')).toBe('https://img.example/main-1.jpg')
- expect(wrapper.get('.jd-card-shop').text()).toBe('旗舰自营店')
+ // 2026-11-21 用户口径「这边改成分类名称就可以」:图底条显归属分类名(groupName),
+ // 店铺名不再上卡(详情弹窗仍可看)。
+ expect(wrapper.get('.jd-card-category').text()).toBe('甲组')
+ expect(wrapper.find('.jd-card-shop').exists()).toBe(false, '店铺名条退役')
expect(wrapper.get('.jd-card-title').text()).toBe('304不锈钢保温杯大容量便携')
expect(wrapper.get('.jd-card-price').text()).toBe('12.9 ~ 15.9', '价格走 jdPriceRange(number/字符串都收、去尾零)')
expect(wrapper.get('.jd-card-code').text()).toContain('JD-10086')
@@ -60,6 +63,12 @@ describe('卡片字段渲染(与现表格「商品信息」列同源)', () =
wrapper.unmount()
})
+ it('未归类商品分类条常驻出「未分类」( groupName 空不过滤条,与归属三档口径同词)', () => {
+ const wrapper = mount(JdProductCard, { props: { item: item({ groupName: '', groupId: null }) } })
+ expect(wrapper.get('.jd-card-category').text()).toBe('未分类')
+ wrapper.unmount()
+ })
+
it('无图占位:缺 mainImageUrl 出「无图」占位不出 img 元素;缺价与缺码按占位符兜底', () => {
const wrapper = mount(JdProductCard, {
props: { item: item({ mainImageUrl: '', priceMin: '', priceMax: '', productCode: '', syncedAt: '', healthScore: null }) },