From 8757fb21ad4bfba1794e9b9c603299237d7808f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Thu, 19 Nov 2026 17:39:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd-admin):=20=E7=B1=BB=E7=9B=AE=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E5=9C=86=E7=82=B9=E5=A1=AB=E8=8A=AF=E6=94=B9=E6=95=B4?= =?UTF-8?q?=E6=9D=A1=E9=80=89=E4=B8=AD=E9=93=BE=EF=BC=882026-11-19=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=8C=E6=80=8E=E4=B9=88=E5=B0=B1=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E6=89=8D=E5=AE=9E=E5=BF=83=E5=9C=86?= =?UTF-8?q?=E7=82=B9=E9=98=BF=E3=80=8D=EF=BC=89=E2=80=94=E2=80=94=E6=97=A7?= =?UTF-8?q?=E5=BD=A2=E7=8A=B6=20isSelected=20=E8=A6=81=E5=85=A8=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=80=90=E6=AE=B5=E7=9B=B8=E7=AD=89=E6=89=8D=E4=BA=AE?= =?UTF-8?q?=E8=93=9D=E8=8A=AF=EF=BC=8C=E9=80=89=E4=B8=AD=E6=9C=AB=E7=BA=A7?= =?UTF-8?q?=E6=97=B6=E8=B7=AF=E5=BE=84=E4=B8=8A=E7=9A=84=E6=AF=8D=E5=A9=B4?= =?UTF-8?q?/=E7=AB=A5=E8=A3=85/=E5=AE=B6=E5=B1=85=E6=9C=8D=E5=85=A8?= =?UTF-8?q?=E6=98=AF=E7=A9=BA=E5=BF=83=E3=80=81=E5=8F=AA=E6=9C=89=E6=9C=AB?= =?UTF-8?q?=E7=BA=A7=E5=AE=9E=E5=BF=83=EF=BC=9B=E6=96=B0=E5=A2=9E=20isOnSe?= =?UTF-8?q?lectedPath=EF=BC=88=E8=B7=AF=E5=BE=84=E6=98=AF=20selectedPath?= =?UTF-8?q?=20=E5=89=8D=E7=BC=80=E5=8D=B3=E5=A1=AB=E8=8A=AF=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E9=92=BB=E6=80=81=E4=B8=8E=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=80=81=E5=9C=86=E7=82=B9=E5=90=8C=E5=88=A4=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=93=BE=E5=90=84=E7=BA=A7=E4=B8=80=E7=9C=BC?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=EF=BC=9B=E8=A1=8C=E4=BD=93=E8=93=9D=E5=AD=97?= =?UTF-8?q?=20active=20=E4=B8=8D=E5=8A=A8=EF=BC=88=E4=BB=8D=E5=8F=AA?= =?UTF-8?q?=E6=A0=87=E7=9C=9F=E6=AD=A3=E9=80=89=E4=B8=AD=E7=9A=84=E9=82=A3?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=8B=E4=B8=8B=E9=92=BB=E7=82=B9=E4=BA=AE?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=EF=BC=89=EF=BC=8C=E4=B8=A4=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E6=B7=B7=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9A=E6=96=B0=20mount?= =?UTF-8?q?=20=E5=A5=91=E7=BA=A6=20tests/mount/jd-category-cascader.mount.?= =?UTF-8?q?test.ts=204/4=EF=BC=88=E8=B7=AF=E5=BE=84=E5=85=A8=E4=BA=AE?= =?UTF-8?q?=EF=BC=8B=E5=85=84=E5=BC=9F/=E5=8F=94=E5=8F=94=E7=A9=BA?= =?UTF-8?q?=E5=BF=83=EF=BC=8B=E9=80=89=E4=B8=AD=E7=88=B6=E7=BA=A7=E5=85=B6?= =?UTF-8?q?=E5=AD=90=E7=BA=A7=E4=B8=8D=E4=BA=AE=EF=BC=8B=E6=9C=AA=E9=80=89?= =?UTF-8?q?=E5=8F=AA=E4=BA=AE=E6=B8=85=E9=80=89=E8=A1=8C=EF=BC=8B=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=80=81=E5=90=8C=E5=88=A4=E6=8D=AE=EF=BC=9B=E5=8F=8D?= =?UTF-8?q?=E5=90=91=E9=AA=8C=E8=AF=81=E6=94=B9=E5=9B=9E=20isSelected=20?= =?UTF-8?q?=E5=8D=B3=202=20=E6=94=AF=E7=BA=A2=EF=BC=89=EF=BC=8B=E6=97=A2?= =?UTF-8?q?=E6=9C=89=20jd-database-page.mount=2044/44=EF=BC=8Bvue-tsc=20rc?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/jd/JdCategoryCascader.vue | 15 +++- .../mount/jd-category-cascader.mount.test.ts | 82 +++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 admin-frontend-vue/tests/mount/jd-category-cascader.mount.test.ts diff --git a/admin-frontend-vue/src/pages/jd/JdCategoryCascader.vue b/admin-frontend-vue/src/pages/jd/JdCategoryCascader.vue index b530166f6..f43206507 100644 --- a/admin-frontend-vue/src/pages/jd/JdCategoryCascader.vue +++ b/admin-frontend-vue/src/pages/jd/JdCategoryCascader.vue @@ -9,7 +9,8 @@ * 选来搜索」:**非末级行的圆点点击=选中该节点**(emit change 带名称路径,页面按子树 * 展开类目名集合下发,后端 IN 过滤;行体/箭头仍下钻)。搜索框搜**树内全部层级** * (一级/二级/末级都可选,名称或路径命中,行 title 带全路径);树外命中(已落库但京麦 - * 类目体系变更后的历史名)从 options 兜底段选,语义同旧版第三栏。「全部类目」行=清选; + * 类目体系变更后的历史名)从 options 兜底段选,语义同旧版第三栏。圆点填芯=整条选中链 + * (选中节点+祖先,2026-11-19 用户口径「怎么就最后一个才实心圆点阿」);「全部类目」行=清选; * 触发框已选时出 × 清除;面板外点透明遮罩关闭。 * 零依赖自绘(radio 圆点/箭头都是 CSS),无 element 依赖。 */ import { computed, nextTick, ref, watch } from 'vue' @@ -155,6 +156,14 @@ function isSelected(path: string[]): boolean { return current.length === path.length && current.every((segment, i) => segment === path[i]) } +/** 圆点填芯=整条选中链(2026-11-19 用户口径「怎么就最后一个才实心圆点阿」): + * 选中节点本身+它的全部祖先(路径是 selectedPath 的前缀)都亮蓝芯,一眼看出 + * 选中链路。行体蓝字 active 仍只标「真正选中的那一个+下钻点亮的路」,两态不混。 */ +function isOnSelectedPath(path: string[]): boolean { + const current = props.selectedPath ?? [] + return path.length > 0 && path.length <= current.length && path.every((segment, i) => segment === current[i]) +} + /** 非末级行体/箭头点击=下钻;末级行点击=选中(带路径)。 */ function pick(node: JdCategoryNode, depth: number): void { if (node.children && node.children.length) { @@ -233,7 +242,7 @@ function clear(): void { :title="node.leaf ? node.path.join(' > ') : `${node.path.join(' > ')}(含下级,选中按整棵子树筛选)`" @click="pickName(node.name, node.path)" > - + {{ node.name }} {{ node.path.slice(0, -1).join(' › ') }} @@ -286,7 +295,7 @@ function clear(): void { > 童装 > 家居服 > 家居服套装。 */ +const LEAF_PATH = ['母婴', '童装', '家居服', '家居服套装'] + +type Wrapper = VueWrapper + +function mountCascader(props: { modelValue: string; selectedPath: string[] }): Wrapper { + return mount(JdCategoryCascader, { props: { ...props, options: [] } }) +} + +/** 按 .cat-name 精确文本找行,返回其圆点是否填芯;行不存在返回 null。 */ +function dotOn(wrapper: Wrapper, name: string): boolean | null { + const row = wrapper.findAll('.cat-row').find((item) => item.find('.cat-name').text() === name) + if (!row) return null + return row.find('.cat-dot').classes().includes('on') +} + +async function openPanel(wrapper: Wrapper): Promise { + await wrapper.find('.cat-trigger').trigger('click') +} + +describe('下钻态:选中末级 ⇒ 整条路径填芯', () => { + it('路径各级圆点全亮,兄弟/叔叔行空心', async () => { + const wrapper = mountCascader({ modelValue: '家居服套装', selectedPath: LEAF_PATH }) + // 重开面板自动按 selectedPath 铺栏(toggle 既有行为),路径四级同屏可见。 + await openPanel(wrapper) + for (const name of LEAF_PATH) { + expect(dotOn(wrapper, name), `路径行 ${name} 应填芯`).toBe(true) + } + // 非路径行:一级栏的兄弟(服饰内衣/运动户外)、童装栏的兄弟(礼服/演出服)、 + // 家居服栏的兄弟(家居服上装)都不得亮;清选行的「全部类目」在已选时也不亮。 + for (const name of ['服饰内衣', '运动户外', '礼服/演出服', '家居服上装', '全部类目']) { + expect(dotOn(wrapper, name), `非路径行 ${name} 应保持空心`).toBe(false) + } + }) + + it('选中父级 ⇒ 该级与祖先填芯,其子级空心', async () => { + const wrapper = mountCascader({ modelValue: '家居服', selectedPath: ['母婴', '童装', '家居服'] }) + await openPanel(wrapper) + for (const name of ['母婴', '童装', '家居服']) { + expect(dotOn(wrapper, name), `路径行 ${name} 应填芯`).toBe(true) + } + // activePath 只铺到童装,家居服套装不在屏上——栏算到选中级即止。 + expect(dotOn(wrapper, '家居服套装')).toBeNull() + expect(dotOn(wrapper, '儿童汉服/旗袍/唐装')).toBe(false) + }) + + it('未选(全部类目)⇒ 只有清选行填芯', async () => { + const wrapper = mountCascader({ modelValue: '', selectedPath: [] }) + await openPanel(wrapper) + expect(dotOn(wrapper, '全部类目')).toBe(true) + expect(dotOn(wrapper, '母婴')).toBe(false) + }) +}) + +describe('搜索态:扁平结果同一判据', () => { + it('关键词命中时,选中链(前缀行+末级行)填芯,其余空心', async () => { + const wrapper = mountCascader({ modelValue: '家居服套装', selectedPath: LEAF_PATH }) + await openPanel(wrapper) + await wrapper.find('input[placeholder="搜索类目"]').setValue('家居服') + // 家居服=路径前缀、家居服套装=全路径命中 ⇒ 都填芯。 + expect(dotOn(wrapper, '家居服')).toBe(true) + expect(dotOn(wrapper, '家居服套装')).toBe(true) + // 家居服上装=同关键词命中但不在选中链上;睡衣/家居服=服饰内衣支的同名近亲 ⇒ 空心。 + expect(dotOn(wrapper, '家居服上装')).toBe(false) + expect(dotOn(wrapper, '睡衣/家居服')).toBe(false) + }) +})