Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 885fa813db | |||
| ea9dca3faf | |||
| 7f76a96264 | |||
| 0c4354fc1e | |||
| 8b0cde4a51 | |||
| c15f0ce229 | |||
| 6ccf7f2bb3 | |||
| ae250ea182 | |||
| d850c46f46 | |||
| 2a0cc86572 | |||
| 164b9b83fa | |||
| 0f375dcd04 | |||
| b59663ebdb | |||
| 6dc33ea725 | |||
| b4e97823f4 | |||
| d25c91f6da | |||
| 20ee73349e | |||
| d28461d3d3 | |||
| 56fe32e8e9 | |||
| 283921df0c | |||
| 2078e9efde | |||
| 7299166e96 | |||
| 80060912ca |
@@ -2,6 +2,11 @@
|
||||
/** 旧版风格分页(像素复刻 admin.html .pagination)+ 每页条数下拉(10/20/50/100)。
|
||||
* props: total / page / pageSize / sizes(默认 10/20/50/100) / showTotal(默认 true) / jump(默认 true)。 */
|
||||
import { computed, ref } from 'vue'
|
||||
// 每页条数下拉 2026-11-17 用户口径「和亚马逊不统一」:原生 <select> 的弹层是浏览器直角
|
||||
// 原生物,全站分页条都有这一处 ⇒ 换 el-select(EP 圆角面板)。组件内局部导入,不与全局
|
||||
// 注册表耦合:任何挂载测试单独 mount 本组件都能正确渲染(不依赖外部 app.use)。
|
||||
// 样式已在 plugins/element.ts 里按组件全局引过,这里不重复引。
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
@@ -34,8 +39,7 @@ function goJump() {
|
||||
go(Math.min(Math.max(n, 1), totalPages.value))
|
||||
}
|
||||
|
||||
function onSizeChange(event: Event) {
|
||||
const value = Number((event.target as HTMLSelectElement).value)
|
||||
function onSizeChange(value: number) {
|
||||
if (Number.isFinite(value) && value > 0) emit('size-change', value)
|
||||
}
|
||||
</script>
|
||||
@@ -43,9 +47,16 @@ function onSizeChange(event: Event) {
|
||||
<template>
|
||||
<div class="old-pagination">
|
||||
<span v-if="showTotal" class="page-total">共 {{ total }} 条</span>
|
||||
<select class="page-size-select" :value="pageSize" @change="onSizeChange">
|
||||
<option v-for="size in sizes" :key="size" :value="size">{{ size }}条/页</option>
|
||||
</select>
|
||||
<!-- el-select 出厂宽度 100%(--el-select-width),进 flex 行会横涨 ⇒ 类里钉位宽。 -->
|
||||
<el-select
|
||||
class="page-size-select"
|
||||
:model-value="pageSize"
|
||||
size="small"
|
||||
aria-label="每页条数"
|
||||
@change="onSizeChange"
|
||||
>
|
||||
<el-option v-for="size in sizes" :key="size" :value="size" :label="`${size}条/页`" />
|
||||
</el-select>
|
||||
<button type="button" :disabled="page <= 1" @click="go(page - 1)">上一页</button>
|
||||
<span class="page-cur">第 {{ page }} / {{ totalPages }} 页</span>
|
||||
<button type="button" :disabled="page >= totalPages" @click="go(page + 1)">下一页</button>
|
||||
@@ -92,15 +103,22 @@ function onSizeChange(event: Event) {
|
||||
.page-total {
|
||||
margin-right: 4px;
|
||||
}
|
||||
/* 每页条数下拉:与原分页条同尺寸(30px 高、8px 圆角、#cbd9e6 描边、#f8fbfd 浅底)。
|
||||
外形走 .el-select__wrapper(EP 的结构类,scoped 需 :deep 穿透)。 */
|
||||
.page-size-select {
|
||||
width: 104px;
|
||||
}
|
||||
.page-size-select :deep(.el-select__wrapper) {
|
||||
min-height: 30px;
|
||||
padding: 3px 8px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 8px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
box-shadow: 0 0 0 1px #cbd9e6 inset;
|
||||
font-size: 13px;
|
||||
font-family: inherit;
|
||||
line-height: 22px;
|
||||
}
|
||||
.page-size-select :deep(.el-select__wrapper:hover) {
|
||||
box-shadow: 0 0 0 1px #9fb7cd inset;
|
||||
}
|
||||
.page-jump {
|
||||
display: inline-flex;
|
||||
|
||||
@@ -19,11 +19,24 @@ export const PLATFORM_TABS: readonly PlatformTabDef[] = [
|
||||
* 2026-11-17 晚:分类管理子菜单(admin_jd_category_manage,V204)随「京东分类管理并到
|
||||
* 京东数据库分类编辑里」用户口径整体下线(页/路由/菜单行 V208 删),key 从清单摘除。
|
||||
* 后续京东新页面上线把 key 加进这里即可,清单外的 key(含店铺管理/生成记录等
|
||||
* 存量页)一律归亚马逊或双侧清单。 */
|
||||
* 存量页)一律归亚马逊或双侧清单。
|
||||
* ⚠ 本清单只收后台(admin)侧 key——护栏用例要求每条都在 routes.ts 登记 menuKey;
|
||||
* 桌面端(app)京东菜单走 {@link JD_APP_MENU_KEYS}(无 admin 路由,不进侧边栏)。 */
|
||||
export const JD_MENU_KEYS: readonly string[] = [
|
||||
'admin_jd_database',
|
||||
]
|
||||
|
||||
/** 桌面端(app)京东菜单的 column_key 清单(V209,2026-11-17 用户口径「前台的京东少了」):
|
||||
* 组行 jd_tools(京东工具台)+两工具子行 jd-collect(京东店铺数据采集)/jd-publish(京东商品上架),
|
||||
* 与用户端 permissionKeys 逐字一致。app 菜单不进后管侧边栏与 routes.ts 路由表,故与
|
||||
* {@link JD_MENU_KEYS} 分列——判定出口 {@link platformsOfMenuKey} 两份同认。
|
||||
* 后续用户端京东新工具上线把 column_key 加进这里即可。 */
|
||||
export const JD_APP_MENU_KEYS: readonly string[] = [
|
||||
'jd_tools',
|
||||
'jd-collect',
|
||||
'jd-publish',
|
||||
]
|
||||
|
||||
/** 双侧共用菜单(2026-11-17 用户口径「这些亚马逊这边也要有」):三个账号域页面在两个
|
||||
* 平台 tab 下都显示——同一套组件、按当前 tab 给接口传 platform,各自只看/管各自平台的
|
||||
* 账号、分组、公司(后端 V206 三表加列,存量默认亚马逊,京东侧数据在编辑弹窗里翻档)。 */
|
||||
@@ -33,10 +46,34 @@ export const BOTH_PLATFORM_MENU_KEYS: readonly string[] = [
|
||||
'admin_companies',
|
||||
]
|
||||
|
||||
/** menuKey → 平台归属清单(唯一判定出口):京东独占 → ['jd'];双侧清单 → ['amazon','jd'];
|
||||
* 其余(未知 key 在内)默认亚马逊。 */
|
||||
/** menuKey → 平台归属清单(唯一判定出口):京东独占(后台或桌面端清单)→ ['jd'];
|
||||
* 双侧清单 → ['amazon','jd'];其余(未知 key 在内)默认亚马逊。 */
|
||||
export function platformsOfMenuKey(key: string): PlatformTabId[] {
|
||||
if (JD_MENU_KEYS.includes(key)) return ['jd']
|
||||
if (JD_MENU_KEYS.includes(key) || JD_APP_MENU_KEYS.includes(key)) return ['jd']
|
||||
if (BOTH_PLATFORM_MENU_KEYS.includes(key)) return ['amazon', 'jd']
|
||||
return ['amazon']
|
||||
}
|
||||
|
||||
/**
|
||||
* 通用「按平台过滤菜单树」(唯一算法出口,2026-11-17 用户口径「授权树也按平台收」):
|
||||
* 叶子按 {@link platformsOfMenuKey} 是否包含当前平台留下;分组节点自身的 key 不参与
|
||||
* 平台判定,按「有存活的子项」决定去留——否则京东侧「账号与权限」这类混合分组会被整组误剪。
|
||||
* 两个消费方必须同形:侧边栏(platform-menu-filter.ts)与账号弹窗的授权树
|
||||
* (UserMenuAuthTree.vue),改判定规则只改这一处。
|
||||
*/
|
||||
export function filterMenuTreeNodesByPlatform<T extends { key?: string; children?: T[] }>(
|
||||
nodes: readonly T[] | null | undefined,
|
||||
platform: PlatformTabId,
|
||||
): T[] {
|
||||
const filtered: T[] = []
|
||||
for (const node of nodes || []) {
|
||||
const children = filterMenuTreeNodesByPlatform(node.children, platform)
|
||||
if (children.length > 0) {
|
||||
filtered.push({ ...node, children })
|
||||
continue
|
||||
}
|
||||
if ((node.children || []).length > 0) continue
|
||||
if (platformsOfMenuKey(node.key || '').includes(platform)) filtered.push({ ...node })
|
||||
}
|
||||
return filtered
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, watch } from 'vue'
|
||||
import { computed, nextTick, ref, watch } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessageBox } from 'element-plus'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { joinAdminPath } from '@/config/app'
|
||||
import { pageTitleOf, topbarUserOf } from '@/layout/topbar-model'
|
||||
import { groupKeysForActive, toSidebarEntries } from '@/layout/menu-mapper'
|
||||
import { allGroupKeys, toSidebarEntries } from '@/layout/menu-mapper'
|
||||
import { filterMenuTreeByPlatform, visiblePlatformsFor } from '@/layout/platform-menu-filter'
|
||||
import { PLATFORM_TABS, platformsOfMenuKey } from '@/config/platform-scope'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
@@ -44,7 +44,21 @@ const menuEntries = computed(() =>
|
||||
const visibleTabIds = computed(() => visiblePlatformsFor(session.menuTree))
|
||||
const visibleTabDefs = computed(() => PLATFORM_TABS.filter((tab) => visibleTabIds.value.includes(tab.id)))
|
||||
const showPlatformTabs = computed(() => visibleTabIds.value.length > 1)
|
||||
const openedKeys = computed(() => groupKeysForActive(menuEntries.value, route.path))
|
||||
// 父菜单默认全展开(2026-11-17 用户口径「父菜单不要默认折叠」)。el-menu 的 default-openeds
|
||||
// 只在挂载时读一次,平台 tab 切换/菜单树刷新导致 entries 变化后新分组不会自动展开,
|
||||
// 这里在 entries 变更渲染完成后按当下值命令式补开;用户手动收起的组在 entries 不变期间
|
||||
// 保持收起(watch 不重触发)。读当下 computed 而非触发时快照:快速连切 tab 时不补开已
|
||||
// 离开渲染树的旧分组(el-menu 的 open 对未注册 index 会抛)。
|
||||
const menuRef = ref<{ open: (index: string) => void } | null>(null)
|
||||
const openedKeys = computed(() => allGroupKeys(menuEntries.value))
|
||||
watch(openedKeys, async () => {
|
||||
await nextTick()
|
||||
const menu = menuRef.value
|
||||
if (!menu) return
|
||||
for (const key of openedKeys.value) {
|
||||
menu.open(key)
|
||||
}
|
||||
}, { immediate: true })
|
||||
const emptyMenu = computed(() => shouldShowEmptyMenu(menuEntries.value.length > 0, session.loading, session.initialized))
|
||||
const pageTitle = computed(() => pageTitleOf(route.meta.title))
|
||||
const userVm = computed(() => topbarUserOf(session.user))
|
||||
@@ -131,7 +145,7 @@ async function signOut() {
|
||||
</nav>
|
||||
|
||||
<el-scrollbar class="admin-menu-scroll">
|
||||
<el-menu :default-active="activePath" :default-openeds="openedKeys" router class="admin-menu">
|
||||
<el-menu ref="menuRef" :default-active="activePath" :default-openeds="openedKeys" router class="admin-menu">
|
||||
<template v-for="entry in menuEntries" :key="entry.key">
|
||||
<el-sub-menu v-if="entry.kind === 'group'" :index="entry.key">
|
||||
<template #title>
|
||||
|
||||
@@ -34,11 +34,11 @@ export function toSidebarEntries(nodes: AdminMenuNode[] | null | undefined): Sid
|
||||
return entries
|
||||
}
|
||||
|
||||
/** 计算需默认展开的分组 key:分组下含当前激活路由子项时返回该分组 key。 */
|
||||
export function groupKeysForActive(entries: SidebarEntry[], activeRoute: string): string[] {
|
||||
/** 计算需默认展开的分组 key:父菜单默认全展开(2026-11-17 用户口径「父菜单不要默认折叠」)。 */
|
||||
export function allGroupKeys(entries: SidebarEntry[]): string[] {
|
||||
const keys: string[] = []
|
||||
for (const entry of entries) {
|
||||
if (entry.kind === 'group' && entry.children.some((child) => child.route === activeRoute)) {
|
||||
if (entry.kind === 'group') {
|
||||
keys.push(entry.key)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { AdminMenuNode } from '../types/admin'
|
||||
import { PLATFORM_TABS, platformsOfMenuKey } from '../config/platform-scope.ts'
|
||||
import { PLATFORM_TABS, filterMenuTreeNodesByPlatform } from '../config/platform-scope.ts'
|
||||
import type { PlatformTabId } from '../config/platform-scope.ts'
|
||||
import { firstVisiblePath } from '../router/helpers.ts'
|
||||
|
||||
@@ -7,27 +7,15 @@ import { firstVisiblePath } from '../router/helpers.ts'
|
||||
* 按平台 tab 过滤后端菜单树(2026-11-16「亚马逊/京东不混」):**只做显示分组,不做鉴权**——
|
||||
* 准入仍由 session.menuTree(后端按权限裁剪)与路由守卫负责,这里只是把当前用户已被授权的
|
||||
* 菜单按平台分到两个 tab 下展示。
|
||||
* 规则:叶子按 platformsOfMenuKey(key) 是否包含当前平台留下(双侧清单里的账号域三页两个
|
||||
* tab 都显示);分组节点(admin_group_*)自身的 key 不参与平台判定,按「留住的子项数 > 0」
|
||||
* 决定去留——否则京东 tab 下「账号与权限」这类混合分组会被整组误剪。节点的 key/name/
|
||||
* route/children 形状原样透传(浅拷贝不改写),toSidebarEntries、groupKeysForActive 与
|
||||
* 面包屑都不受影响。
|
||||
* 规则与算法在 {@link filterMenuTreeNodesByPlatform}(2026-11-17 起唯一出口,账号弹窗授权树
|
||||
* 同用一份);本壳只钉侧边栏专属的两条:节点的 key/name/route/children 形状原样透传(浅拷贝
|
||||
* 不改写),toSidebarEntries、groupKeysForActive 与面包屑都不受影响。
|
||||
*/
|
||||
export function filterMenuTreeByPlatform(
|
||||
nodes: AdminMenuNode[] | null | undefined,
|
||||
platform: PlatformTabId,
|
||||
): AdminMenuNode[] {
|
||||
const filtered: AdminMenuNode[] = []
|
||||
for (const node of nodes || []) {
|
||||
const children = filterMenuTreeByPlatform(node.children, platform)
|
||||
if (children.length > 0) {
|
||||
filtered.push({ ...node, children })
|
||||
continue
|
||||
}
|
||||
if ((node.children || []).length > 0) continue
|
||||
if (platformsOfMenuKey(node.key || '').includes(platform)) filtered.push({ ...node })
|
||||
}
|
||||
return filtered
|
||||
return filterMenuTreeNodesByPlatform(nodes, platform)
|
||||
}
|
||||
|
||||
/** 当前用户在哪些平台下至少有一个可点页面(tab 显示依据);顺序固定随 PLATFORM_TABS。
|
||||
|
||||
@@ -8,7 +8,7 @@ import { formatDateTime } from '@/utils/datetime'
|
||||
import { fetchCompanies } from '@/api/companies'
|
||||
import { COMPANY_STATUS_ACTIVE, type CompanyItem } from '@/api/companies-dto'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { refreshCompanyDirectory } from '@/stores/company-tab'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import CompanyEditorDialog from './CompanyEditorDialog.vue'
|
||||
@@ -18,9 +18,6 @@ import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
const session = useAdminSessionStore()
|
||||
// 平台 tab(V206):公司列表按当前平台过滤,新建默认落当前平台。
|
||||
const platformTab = usePlatformTabStore()
|
||||
// 公司 tab 条(2026-11-17 起按平台过滤)共用这一份目录:公司翻档/启停后必须强制重拉,
|
||||
// 否则 18 个页面的 tab 条端着旧名单,刚翻去京东的公司还挂在亚马逊侧。
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<CompanyItem[]>([])
|
||||
@@ -65,10 +62,13 @@ function openEdit(company: CompanyItem) {
|
||||
}
|
||||
|
||||
// 保存成功后:本页列表照常重拉,共享公司目录(tab 条)强制重拉一份。
|
||||
// 本页不参与公司隔离(控制方 2026-10-06「公司管理不要有 tab」)⇒ 走 store 的具名出口
|
||||
// refreshCompanyDirectory,而不是自己持一份 company-tab store(后者形状与「给这页上了 tab」
|
||||
// 分不开,company-config-entry-super-only 的 pageFiles 分母会当场红)。
|
||||
// 重拉失败不弹新提示(§12 第 5 条未批的界面暴露):tab 条保留旧名单,下一次切平台 tab / 重进页面会再试。
|
||||
async function onCompaniesSaved() {
|
||||
await loadCompanies()
|
||||
companyTab.refresh().catch((error: unknown) => {
|
||||
refreshCompanyDirectory().catch((error: unknown) => {
|
||||
console.warn('[company-tab] 公司保存后目录重拉失败', error)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -13,7 +13,9 @@ import {
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { actionableErrorText } from '@/components/admin-feedback'
|
||||
|
||||
/** 新建/编辑公司(改名 + 启停 + 备注 + 所属平台 V206);写操作仅超管可用,权限由后端把关。 */
|
||||
/** 新建/编辑公司(改名 + 启停 + 备注);写操作仅超管可用,权限由后端把关。
|
||||
* 所属平台不设手选(2026-11-17 用户口径「有京东就不需要亚马逊了,亚马逊那边也是」):
|
||||
* 平台跟随当前平台 tab——新建取当前 tab(props.platform),编辑保持行值原样下发。 */
|
||||
const props = defineProps<{ modelValue: boolean; company: CompanyItem | null; platform?: PlatformTabId }>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'saved'): void }>()
|
||||
|
||||
@@ -77,12 +79,6 @@ async function save() {
|
||||
placeholder="请输入公司名称(全平台唯一)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="form.platform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="form.status" style="width: 100%">
|
||||
<el-option :value="COMPANY_STATUS_ACTIVE" label="启用" />
|
||||
|
||||
@@ -29,7 +29,7 @@ const props = defineProps<{
|
||||
operatorCompanyId?: number | null
|
||||
/** 当前公司 tab:这次建号落在哪家,就决定能建哪些角色。 */
|
||||
activeCompanyId?: number | null
|
||||
/** 当前平台 tab(V206):新号默认落当前平台,单选可改。 */
|
||||
/** 当前平台 tab(V206):新号落当前平台(跟随所在 tab,弹窗不再手选——2026-11-17 用户口径)。 */
|
||||
platform?: PlatformTabId
|
||||
}>()
|
||||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'created'): void }>()
|
||||
@@ -136,12 +136,6 @@ async function create(): Promise<void> {
|
||||
<el-option v-for="opt in roleChoices" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="form.platform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="operatorSuper && form.role === 'company_super_admin'"
|
||||
label="所属公司"
|
||||
@@ -184,7 +178,9 @@ async function create(): Promise<void> {
|
||||
</el-form-item>
|
||||
<el-form-item label="菜单权限(勾选上级菜单会继承全部子菜单)">
|
||||
<div class="auth-tree-box">
|
||||
<UserMenuAuthTree v-model:checked="form.columnIds" :company-id="form.companyId" />
|
||||
<!-- 授权树按账号平台收(2026-11-17 用户口径):京东 tab 只给京东侧菜单。
|
||||
平台不再手选(跟随当前 tab),树收窄的判定出口不变。 -->
|
||||
<UserMenuAuthTree v-model:checked="form.columnIds" :company-id="form.companyId" :platform="form.platform" />
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
@@ -128,12 +128,6 @@ async function save(): Promise<void> {
|
||||
<el-form-item v-if="targetIsCompanySuperAdmin" label="角色">
|
||||
<el-input model-value="公司超级管理员" readonly />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="form.platform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="expiryEditable" label="到期时间(清空 = 永不过期;到期后该账号及其名下账号将停用)">
|
||||
<el-date-picker
|
||||
v-model="form.expiresAt"
|
||||
@@ -152,7 +146,9 @@ async function save(): Promise<void> {
|
||||
</el-form-item>
|
||||
<el-form-item label="菜单权限(勾选上级菜单会继承全部子菜单)">
|
||||
<div class="auth-tree-box">
|
||||
<UserMenuAuthTree v-model:checked="form.columnIds" :company-id="props.companyId" />
|
||||
<!-- 授权树按账号平台收(2026-11-17 用户口径):京东档账号不再整树混发亚马逊菜单。
|
||||
平台不再手选(跟随当前平台 tab,编辑取行值),树收窄的判定出口不变。 -->
|
||||
<UserMenuAuthTree v-model:checked="form.columnIds" :company-id="props.companyId" :platform="form.platform" />
|
||||
<div v-if="loadingAuth" class="auth-loading">菜单权限加载中…</div>
|
||||
<div v-else-if="!authReady" class="auth-loading auth-loading-error">
|
||||
菜单权限加载失败,保存已禁用;请关闭后重试
|
||||
|
||||
@@ -19,7 +19,8 @@ const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'save
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const groupName = ref('')
|
||||
/** 所属平台(V206):新建默认当前平台 tab,编辑回填分组原值,单选可翻档。 */
|
||||
/** 所属平台(V206):不设手选(2026-11-17 用户口径「有京东就不需要亚马逊了,亚马逊那边也是」)——
|
||||
* 新建取当前平台 tab(props.platform),编辑保持分组原值,值仍随保存下发。 */
|
||||
const groupPlatform = ref<PlatformTabId>('amazon')
|
||||
const memberIds = ref<number[]>([])
|
||||
const errorText = ref('')
|
||||
@@ -119,12 +120,6 @@ onMounted(loadCandidates)
|
||||
<el-form-item label="分组名称" :error="errorText || undefined">
|
||||
<el-input v-model="groupName" placeholder="请输入分组名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属平台">
|
||||
<el-radio-group v-model="groupPlatform">
|
||||
<el-radio-button value="amazon">亚马逊</el-radio-button>
|
||||
<el-radio-button value="jd">京东</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="组长">
|
||||
<el-input :model-value="leaderUsername" readonly placeholder="当前登录用户" />
|
||||
</el-form-item>
|
||||
|
||||
@@ -228,8 +228,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -243,12 +242,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -236,11 +236,15 @@ onMounted(loadMenus)
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 160px">
|
||||
<label>菜单类型</label>
|
||||
<select v-model="filterType">
|
||||
<option value="">全部</option>
|
||||
<option value="admin">后台</option>
|
||||
<option value="app">软件</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 的弹层是浏览器直角原生物
|
||||
⇒ 换 el-select(admin-filter 同壳 42px/9px 圆角,弹层是 EP 圆角面板)。
|
||||
「全部」保留为空值首行=空串不按类型筛(与旧原生下拉同语义);model 是空串时
|
||||
EP 不显示 label 而走 placeholder,所以 placeholder 同文案,观感与改前一致。 -->
|
||||
<el-select v-model="filterType" class="admin-filter" placeholder="全部" aria-label="筛选菜单类型">
|
||||
<el-option label="全部" value="" />
|
||||
<el-option label="后台" value="admin" />
|
||||
<el-option label="软件" value="app" />
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -398,8 +402,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -413,12 +416,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, nextTick, onMounted, ref, watch } from 'vue'
|
||||
import { filterMenuTreeNodesByPlatform } from '../../config/platform-scope.ts'
|
||||
import type { PlatformTabId } from '../../config/platform-scope.ts'
|
||||
import type { MenuOptionNode } from './user-menu-auth'
|
||||
import { compactDirectGrantIds } from './user-menu-auth'
|
||||
import { compactDirectGrantIds, pruneCheckedIdsToTree } from './user-menu-auth'
|
||||
import { fetchGrantableMenus } from './user-menu-auth-api'
|
||||
|
||||
const props = defineProps<{ checked?: number[]; companyId?: number | null }>()
|
||||
const props = defineProps<{ checked?: number[]; companyId?: number | null; platform?: PlatformTabId }>()
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:checked', ids: number[]): void
|
||||
(e: 'load', ok: boolean): void
|
||||
@@ -17,9 +19,16 @@ const appTree = ref<{ setCheckedKeys(keys: unknown[]): void; getCheckedKeys(): u
|
||||
const data = ref<MenuOptionNode[]>([])
|
||||
const loaded = ref(false)
|
||||
|
||||
/**
|
||||
* 按平台过滤后的可见树(2026-11-17 用户口径「授权树也按平台收,选京东就去掉亚马逊的」):
|
||||
* 平台缺省按亚马逊(历史调用形状)。过滤算法与侧边栏同源(platform-scope 唯一出口),
|
||||
* 叶子按 menuKey 判定——京东侧=「京东数据库+双侧账号域三件+桌面端京东工具台三件」。
|
||||
*/
|
||||
const visibleData = computed(() => filterMenuTreeNodesByPlatform(data.value, props.platform ?? 'amazon'))
|
||||
|
||||
/** 两种一级分类…(与 API menuType 分区一致):后台(admin) / 桌面端(app)。 */
|
||||
const adminNodes = computed(() => data.value.filter((node) => node.type === 'admin'))
|
||||
const appNodes = computed(() => data.value.filter((node) => node.type === 'app'))
|
||||
const adminNodes = computed(() => visibleData.value.filter((node) => node.type === 'admin'))
|
||||
const appNodes = computed(() => visibleData.value.filter((node) => node.type === 'app'))
|
||||
|
||||
function applyChecked(): void {
|
||||
const ids = Array.isArray(props.checked) ? props.checked.filter((id) => typeof id === 'number' && id > 0) : []
|
||||
@@ -37,7 +46,8 @@ function onCheck(): void {
|
||||
// 提交前压缩为最小直接授权集:父级已勾选时后代不再重复提交(后端按“父级授权
|
||||
// 展开全部后代”判断权限,与旧 admin.html 勾父清后代语义一致),
|
||||
// 并剔除置灰的祖先分组(派生勾选,操作者无权授予)。
|
||||
emit('update:checked', compactDirectGrantIds(ids, data.value))
|
||||
// 压缩按「可见树」算:另一侧菜单不在树上,其历史勾选天然进不来。
|
||||
emit('update:checked', compactDirectGrantIds(ids, visibleData.value))
|
||||
}
|
||||
|
||||
async function load(): Promise<void> {
|
||||
@@ -49,12 +59,26 @@ async function load(): Promise<void> {
|
||||
// 渲染完成后再应用已勾选 id,否则作用在空 store 上导致已授权不回显。
|
||||
await nextTick()
|
||||
applyChecked()
|
||||
// 首屏就把勾选集收敛进可见树:编辑一个混档账号(既有亚马逊又有京东授权)时,
|
||||
// 打开弹窗那一刻就该按当前平台剪掉另一侧,而不是等用户点一下树才剪。
|
||||
pruneChecked()
|
||||
} catch {
|
||||
loaded.value = false
|
||||
emit('load', false)
|
||||
}
|
||||
}
|
||||
|
||||
/** 平台切换/首屏后把勾选集收敛进可见树:被过滤掉的另一侧勾选不再随表单提交,
|
||||
* 否则「京东档账号保存后仍带亚马逊授权」会把平台分侧静默架空。集合没变就不发
|
||||
* update 事件(避免与父级 v-model 循环互刷)。 */
|
||||
function pruneChecked(): void {
|
||||
const pruned = pruneCheckedIdsToTree(props.checked, visibleData.value)
|
||||
const current = Array.isArray(props.checked) ? props.checked : []
|
||||
if (pruned.length !== current.length || pruned.some((id, index) => id !== current[index])) {
|
||||
emit('update:checked', pruned)
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
watch(
|
||||
() => props.checked,
|
||||
@@ -62,6 +86,16 @@ watch(
|
||||
if (loaded.value) applyChecked()
|
||||
},
|
||||
)
|
||||
/** 平台翻档:可见树整棵换,勾选集同步收敛到新树并回显(被剪掉的勾选以 emit 形式
|
||||
* 落回表单,父级拿到的是纯当前平台的授权集)。 */
|
||||
watch(
|
||||
() => props.platform,
|
||||
() => {
|
||||
if (!loaded.value) return
|
||||
pruneChecked()
|
||||
void nextTick().then(applyChecked)
|
||||
},
|
||||
)
|
||||
/** 公司换了要整棵重取:勾选集里存的是 column id,别家同名菜单是另一份 id(V149 每公司一套树),
|
||||
* 拿别家的树勾出来的 id 提交会被后端判「无效的菜单权限项」,而已授权项也因为 id 不在这棵树上勾不上。 */
|
||||
watch(
|
||||
|
||||
@@ -151,10 +151,14 @@ onMounted(load)
|
||||
</div>
|
||||
<div class="form-group" v-if="isSuperAdmin && groupOptions.length" style="min-width: 170px">
|
||||
<label>分组</label>
|
||||
<select v-model="groupFilter">
|
||||
<option :value="null">全部分组</option>
|
||||
<option v-for="group in groupOptions" :key="group.id" :value="group.id">{{ group.groupName }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 的弹层是浏览器直角原生物
|
||||
⇒ 换 el-select(admin-filter 同壳 42px/9px 圆角,弹层是 EP 圆角面板),组多时可搜。
|
||||
「全部分组」的值仍是 null(下游 groupId 照旧 `|| undefined`),空档时由
|
||||
placeholder 显示同一句文案。 -->
|
||||
<el-select v-model="groupFilter" class="admin-filter" filterable placeholder="全部分组" aria-label="筛选分组">
|
||||
<el-option label="全部分组" :value="null" />
|
||||
<el-option v-for="group in groupOptions" :key="group.id" :label="group.groupName" :value="group.id" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label> </label>
|
||||
@@ -290,8 +294,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -305,12 +308,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -324,16 +324,23 @@ onMounted(load)
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 170px">
|
||||
<label>状态(三项都通过才算通过)</label>
|
||||
<select v-model="statusFilter">
|
||||
<option v-for="option in STATUS_OPTIONS" :key="option.value" :value="option.value">{{ option.label }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 的弹层是浏览器直角原生物
|
||||
⇒ 换 el-select(admin-filter 同壳 42px/9px 圆角,弹层是 EP 圆角面板)。
|
||||
「全部状态」仍是 STATUS_OPTIONS 里的空串档(下游 checkStatus 照旧传 ''→undefined);
|
||||
model 为空串时 EP 走 placeholder 显示,故 placeholder 与首档同文案。 -->
|
||||
<el-select v-model="statusFilter" class="admin-filter" placeholder="全部状态" aria-label="筛选密钥状态">
|
||||
<el-option v-for="option in STATUS_OPTIONS" :key="option.value" :label="option.label" :value="option.value" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group" v-if="isSuperAdmin && groupOptions.length" style="min-width: 170px">
|
||||
<label>分组</label>
|
||||
<select v-model="groupFilter">
|
||||
<option :value="null">全部分组</option>
|
||||
<option v-for="group in groupOptions" :key="group.id" :value="group.id">{{ group.groupName }}</option>
|
||||
</select>
|
||||
<!-- 同上(2026-11-17 换 el-select):分组可能很多 ⇒ 保留 filterable 可搜。
|
||||
「全部分组」的值仍是 null(下游 groupId 照旧 `|| undefined`),空档时由
|
||||
placeholder 显示同一句文案。 -->
|
||||
<el-select v-model="groupFilter" class="admin-filter" filterable placeholder="全部分组" aria-label="筛选分组">
|
||||
<el-option label="全部分组" :value="null" />
|
||||
<el-option v-for="group in groupOptions" :key="group.id" :label="group.groupName" :value="group.id" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label> </label>
|
||||
@@ -553,8 +560,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -568,12 +574,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -390,8 +390,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -405,12 +404,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -22,7 +22,7 @@ export interface CreateUserForm {
|
||||
expiresAt: string
|
||||
/** 所属公司 id:仅 role=company_super_admin 时由站点超管必选(2026-10-05 需求)。 */
|
||||
companyId?: number | null
|
||||
/** 所属平台(V206):弹窗打开时预填当前平台 tab,单选可改。 */
|
||||
/** 所属平台(V206):弹窗打开时预填当前平台 tab(不设手选——2026-11-17 用户口径)。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ export interface CreateUserPayload {
|
||||
* 反向钉(company-user-create.test.ts)唯一豁免的例外:公司超管必须落指定公司,
|
||||
* 否则会静默落操作者自己的公司(公司 1),用户需求就是给别家公司开超管。 */
|
||||
companyId?: number
|
||||
/** 所属平台(V206):恒下发(弹窗单选默认当前平台 tab),缺省后端落 amazon。 */
|
||||
/** 所属平台(V206):恒下发(预填当前平台 tab),缺省后端落 amazon。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ export interface EditUserForm {
|
||||
originalRole: string
|
||||
/** 到期时间(yyyy-MM-dd HH:mm:ss);空串 = 永不过期。null = 后端本来就无到期。 */
|
||||
expiresAt: string
|
||||
/** 所属平台(V206):单选可翻档,未知/缺省归亚马逊(存量默认)。 */
|
||||
/** 所属平台(V206):编辑回填行值(不设手选——2026-11-17 用户口径),未知/缺省归亚马逊(存量默认)。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ export interface EditUserUpdateRequest {
|
||||
password?: string
|
||||
/** 到期时间:空串=清除(恢复永不过期),有值=改期;总是下发(与后端"传了就更新"对齐)。 */
|
||||
expiresAt: string
|
||||
/** 所属平台(V206):总是下发(弹窗单选恒渲染),翻档即把记录挪到另一平台的列表。 */
|
||||
/** 所属平台(V206):总是下发(编辑保持行值原样,后端显式才落)。 */
|
||||
platform: PlatformTabId
|
||||
}
|
||||
|
||||
|
||||
@@ -146,3 +146,24 @@ export function compactDirectGrantIds(checkedIds: unknown, tree: MenuOptionNode[
|
||||
walk(tree, false)
|
||||
return ids.filter((id) => !ungrantable.has(id) && !coveredByAncestor.has(id))
|
||||
}
|
||||
|
||||
/**
|
||||
* 把勾选集收敛到「可见树」内(2026-11-17 用户口径「授权树按平台收」的另一半):
|
||||
* 授权树按平台过滤后,另一侧的已勾 id 在树上不可见、也不再属于这棵树——它们必须
|
||||
* 从表单勾选集里剔除,否则「京东档账号」保存后仍携带整批亚马逊菜单授权(侧边栏
|
||||
* 亚马逊 tab 照样全亮,平台分侧被静默架空)。纯函数:入参不动,返回去重升序交集。
|
||||
*/
|
||||
export function pruneCheckedIdsToTree(checkedIds: unknown, visibleTree: MenuOptionNode[]): number[] {
|
||||
const ids = normalizeMenuIds(checkedIds)
|
||||
if (ids.length === 0) return []
|
||||
if (visibleTree.length === 0) return []
|
||||
const visible = new Set<number>()
|
||||
const walk = (nodes: MenuOptionNode[]): void => {
|
||||
for (const node of nodes) {
|
||||
visible.add(node.id)
|
||||
if (node.children?.length) walk(node.children)
|
||||
}
|
||||
}
|
||||
walk(visibleTree)
|
||||
return ids.filter((id) => visible.has(id))
|
||||
}
|
||||
|
||||
@@ -290,8 +290,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -305,12 +304,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -70,6 +70,10 @@ const editSaving = ref(false)
|
||||
const editTarget = ref<DedupeTotalItem | null>(null)
|
||||
const editValue = ref('')
|
||||
const editGroupId = ref<number | null>(null)
|
||||
/** 弹窗分组下拉的清空回填值:EP 的 el-select 默认清空写 undefined,会破 editGroupId/importGroupId
|
||||
* 的 `number | null` 契约(下游 saveEdit/importValid 按假值判「未选」、updateDedupeTotal 的入参是 number)
|
||||
* ⇒ 清空一律钉回 null,与旧原生 select 空行(value=null)同语义。 */
|
||||
const nullOnClear = (): null => null
|
||||
|
||||
type ImportMode = 'add' | 'delete'
|
||||
const importVisible = ref(false)
|
||||
@@ -373,10 +377,14 @@ onUnmounted(() => {
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="code in ASIN_COUNTRY_CODES" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 的弹层是浏览器直角原生物
|
||||
⇒ 换 el-select(admin-filter 与亚马逊面同壳 42px/9px,弹层是 EP 圆角面板)。
|
||||
「全部国家」保留为空值首行(value="" 与改前同语义,下发参数仍是空串=不限);
|
||||
EP 把 '' 当空值 ⇒ 闭壳显示 placeholder,因此同时钉 placeholder="全部国家",视觉不变。 -->
|
||||
<el-select v-model="filter.country" class="admin-filter" filterable placeholder="全部国家" aria-label="筛选国家">
|
||||
<el-option label="全部国家" value="" />
|
||||
<el-option v-for="code in ASIN_COUNTRY_CODES" :key="code" :label="asinCountryLabel(code)" :value="code" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="dedupe-filter-actions">
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
@@ -452,10 +460,23 @@ onUnmounted(() => {
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>分组</label>
|
||||
<select v-model="editGroupId" :disabled="lockedGroupId != null">
|
||||
<option disabled :value="null">请选择分组</option>
|
||||
<option v-for="group in groups" :key="group.id" :value="group.id">{{ group.name }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物 ⇒ el-select。
|
||||
「未选」语义:原写法是 disabled 的空行(:value="null",选中后不可回退),这里改成
|
||||
placeholder="请选择分组" + clearable,并用 :value-on-clear 把清空值钉回 null
|
||||
(理由见上方 nullOnClear 注释:EP 默认回 undefined 会破 number | null 契约)。
|
||||
值域仍是 null 或分组 id(number),下游 editGroupId 的假值判断与入参形状不变;
|
||||
非超管单分组时照旧锁定展示(:disabled 与护栏测试钉住的写法一致)。 -->
|
||||
<el-select
|
||||
v-model="editGroupId"
|
||||
class="admin-filter"
|
||||
placeholder="请选择分组"
|
||||
clearable
|
||||
:value-on-clear="nullOnClear"
|
||||
:disabled="lockedGroupId != null"
|
||||
aria-label="编辑分组"
|
||||
>
|
||||
<el-option v-for="group in groups" :key="group.id" :label="group.name" :value="group.id" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="modal-actions">
|
||||
<button class="btn" type="button" :disabled="editSaving" @click="saveEdit">保存</button>
|
||||
@@ -473,10 +494,20 @@ onUnmounted(() => {
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>分组</label>
|
||||
<select v-model="importGroupId" :disabled="importRunning || lockedGroupId != null">
|
||||
<option disabled :value="null">请选择分组</option>
|
||||
<option v-for="group in groups" :key="group.id" :value="group.id">{{ group.name }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物 ⇒ el-select。
|
||||
与编辑弹窗同款「未选」处理(placeholder + clearable + 清空钉回 null),
|
||||
导入锁定条件(importRunning 或单分组)照旧挂在 :disabled 上。 -->
|
||||
<el-select
|
||||
v-model="importGroupId"
|
||||
class="admin-filter"
|
||||
placeholder="请选择分组"
|
||||
clearable
|
||||
:value-on-clear="nullOnClear"
|
||||
:disabled="importRunning || lockedGroupId != null"
|
||||
aria-label="导入分组"
|
||||
>
|
||||
<el-option v-for="group in groups" :key="group.id" :label="group.name" :value="group.id" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div v-if="importProgress" class="progress-wrap">
|
||||
<div class="progress-text">{{ importProgress }}</div>
|
||||
@@ -591,8 +622,9 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
/* 下拉壳由全局 .el-select.admin-filter(main.css:42px/9px 圆角/#f8fbfd 浅底/focus ring)出,
|
||||
与亚马逊面同一套;这里只留 input 的原生壳规则(2026-11-17 原生 select 全换 el-select)。 */
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -606,12 +638,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -387,10 +387,14 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="code in QUERY_ASIN_COUNTRIES" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 的弹层是浏览器直角原生物
|
||||
⇒ 换 el-select(与上面分组同一套 admin-filter 壳 42px/9px,弹层是 EP 圆角面板)。
|
||||
「全部国家」保留为空值首行(value="" 与改前同语义,下发仍是空串=不限);
|
||||
EP 把 '' 视作空值 ⇒ 闭壳走 placeholder,因此同步钉 placeholder="全部国家" 保持文案。 -->
|
||||
<el-select v-model="filter.country" class="admin-filter" filterable placeholder="全部国家" aria-label="筛选国家">
|
||||
<el-option label="全部国家" value="" />
|
||||
<el-option v-for="code in QUERY_ASIN_COUNTRIES" :key="code" :label="asinCountryLabel(code)" :value="code" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>ASIN</label>
|
||||
@@ -582,8 +586,9 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
/* 下拉壳由全局 .el-select.admin-filter(main.css:42px/9px 圆角/#f8fbfd 浅底/focus ring)出,
|
||||
与亚马逊面同一套;这里只留 input 的原生壳规则(2026-11-17 原生 select 全换 el-select)。 */
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -597,12 +602,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -432,10 +432,14 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="code in COUNTRIES" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 的弹层是浏览器直角原生物
|
||||
⇒ 换 el-select(与上面分组同一套 admin-filter 壳 42px/9px,弹层是 EP 圆角面板)。
|
||||
「全部国家」保留为空值首行(value="" 与改前同语义,下发仍是空串=不限);
|
||||
EP 把 '' 视作空值 ⇒ 闭壳走 placeholder,因此同步钉 placeholder="全部国家" 保持文案。 -->
|
||||
<el-select v-model="filter.country" class="admin-filter" filterable placeholder="全部国家" aria-label="筛选国家">
|
||||
<el-option label="全部国家" value="" />
|
||||
<el-option v-for="code in COUNTRIES" :key="code" :label="asinCountryLabel(code)" :value="code" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>ASIN</label>
|
||||
@@ -646,8 +650,9 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
/* 下拉壳由全局 .el-select.admin-filter(main.css:42px/9px 圆角/#f8fbfd 浅底/focus ring)出,
|
||||
与亚马逊面同一套;这里只留 input 的原生壳规则(2026-11-17 原生 select 全换 el-select)。 */
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -661,12 +666,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -5,7 +5,11 @@
|
||||
* 职责不变:当前数据权限分组的分类建/改名/删除+新增的名称搜索;商品归类不在这里
|
||||
* (去「批量编辑分类」)。列表状态自管理(写操作后自刷新并 emit changed 让父页刷筛选下拉)。
|
||||
* 权限口径(V203)不变:本组管理员/公司超管/平台超管可写(editable);同组普通号
|
||||
* 只读可看(无新建行,改名/删除按钮逐行不渲染),后端同口径 403 兜底。 */
|
||||
* 只读可看(无新建行,改名/删除按钮逐行不渲染),后端同口径 403 兜底。
|
||||
* 2026-11-17 晚用户口径「admin 权限最大」:京东侧还没有任何数据权限分组时(平台闸
|
||||
* 上线后 jd 档组全空),平台超管在本弹窗空态直建第一个京东档分组(组长=自己),
|
||||
* 建完 emit group-created 让父页重取作用域,当前分组翻到新组后接着就能建分类,
|
||||
* 不再死在「你还不属于任何数据权限分组」。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import {
|
||||
createJdProductGroup,
|
||||
@@ -14,6 +18,8 @@ import {
|
||||
updateJdProductGroup,
|
||||
type JdProductGroup,
|
||||
} from './jd-product-api.ts'
|
||||
import { createShopGroup } from '../account/shop-group-api.ts'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
@@ -27,9 +33,13 @@ const props = defineProps<{
|
||||
ownerGroupName: string
|
||||
/** 当前分组可写(scope 的 editable):建/改名/删除控件全挂它。 */
|
||||
editable: boolean
|
||||
/** 操作者是否平台超管(scope 原样透传):只在「还没有分组」的空态开直建口子。 */
|
||||
platformSuperAdmin?: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{ (event: 'close'): void; (event: 'changed'): void }>()
|
||||
const emit = defineEmits<{ (event: 'close'): void; (event: 'changed'): void; (event: 'group-created'): void }>()
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
|
||||
const loading = ref(false)
|
||||
/** 首屏取数失败(可见红条+重试);写操作失败走 errorText 红条(无重试语义)。 */
|
||||
@@ -38,6 +48,12 @@ const errorText = ref('')
|
||||
const groups = ref<JdProductGroup[]>([])
|
||||
/** 搜索:按分类名称包含过滤(本地过滤,不另发请求)。 */
|
||||
const keyword = ref('')
|
||||
/** 分页(2026-11-17 用户口径「分类这也要加分页」):分类与父页「分类」下拉共用同一条全量
|
||||
* 接口(下拉必须全量,不能分页),所以这里做本地切片;搜索同样是本地过滤 ⇒ 分页与搜索
|
||||
* 同源,不会出现「先 limit 再过滤」那种翻页永久漏项。每页 6 行:实测 8 行在 700px 高的
|
||||
* 视口里会顶出列表内滚动条(滚动条与页码条并存很难看),6 行矮屏也一屏放得下。 */
|
||||
const PAGE_SIZE = 6
|
||||
const pageNo = ref(1)
|
||||
/** 新建:只收名称(排序输入 2026-11-15 客户口径下线,sortOrder 恒 0,后端契约不变)。 */
|
||||
const createName = ref('')
|
||||
const creating = ref(false)
|
||||
@@ -53,7 +69,22 @@ const filteredGroups = computed(() => {
|
||||
if (!kw) return groups.value
|
||||
return groups.value.filter((group) => group.name.toLowerCase().includes(kw))
|
||||
})
|
||||
/** 空表文案分四种:不属于任何组 / 本组没分类(可管理)/ 本组没分类(只读)/ 搜索无命中。 */
|
||||
/** 总页数(至少 1 页:空列表时页码条不渲染,但钳制逻辑要有个有效上界)。 */
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(filteredGroups.value.length / PAGE_SIZE)))
|
||||
/** 当前页的行(在搜索命中集上切片)。 */
|
||||
const pagedGroups = computed(() => {
|
||||
const start = (pageNo.value - 1) * PAGE_SIZE
|
||||
return filteredGroups.value.slice(start, start + PAGE_SIZE)
|
||||
})
|
||||
/** 只有超过一页才出页码条:一屏装得下时不白占一行。 */
|
||||
const showPager = computed(() => filteredGroups.value.length > PAGE_SIZE)
|
||||
|
||||
/** 翻页:页码钳在 [1, totalPages](删除/搜索后越界不会翻到空白页)。 */
|
||||
function goPage(target: number): void {
|
||||
pageNo.value = Math.min(Math.max(1, target), totalPages.value)
|
||||
}
|
||||
/** 空表文案分四种:不属于任何组 / 本组没分类(可管理)/ 本组没分类(只读)/ 搜索无命中。
|
||||
* 平台超管的「还没有分组」空态不走这里——模板换成直建分组的表单(canBootstrapGroup)。 */
|
||||
const emptyListText = computed(() => {
|
||||
if (props.ownerGroupId <= 0) return '你还不属于任何数据权限分组'
|
||||
if (!groups.value.length) {
|
||||
@@ -62,6 +93,40 @@ const emptyListText = computed(() => {
|
||||
return '没有匹配的分类'
|
||||
})
|
||||
|
||||
/** 空态直建分组的口子(2026-11-17 用户口径「admin 权限最大」):平台超管 + 还没有任何
|
||||
* 可见分组时才开。组员/翻档等完整分组管理仍归「分组管理」页,这里只解决「从 0 到 1」。 */
|
||||
const canBootstrapGroup = computed(() => props.platformSuperAdmin === true && props.ownerGroupId <= 0)
|
||||
/** 直建表单:只收名称;组长=当前操作者,platform 恒 'jd'(京东侧作用域只认 jd 档)。 */
|
||||
const newGroupName = ref('')
|
||||
const creatingGroup = ref(false)
|
||||
const canCreateGroup = computed(() =>
|
||||
canBootstrapGroup.value && newGroupName.value.trim().length > 0 && !creatingGroup.value)
|
||||
|
||||
/** 平台超管空态直建第一个京东档分组:走分组管理同一条 POST(shop-manages/groups),
|
||||
* 组长=当前操作者、组员先空。成功后 emit group-created 让父页整条作用域重取——
|
||||
* ownerGroupId 翻到新组后由下方 watch 接手按新组重取分类,操作者接着就能建分类。 */
|
||||
async function submitCreateGroup(): Promise<void> {
|
||||
const name = newGroupName.value.trim()
|
||||
if (!name || creatingGroup.value || !canBootstrapGroup.value) return
|
||||
const operatorId = session.user?.id ?? 0
|
||||
if (!operatorId) {
|
||||
errorText.value = '无法获取当前登录用户,请重新登录'
|
||||
return
|
||||
}
|
||||
creatingGroup.value = true
|
||||
errorText.value = ''
|
||||
try {
|
||||
await createShopGroup(name, [], operatorId, 'jd')
|
||||
newGroupName.value = ''
|
||||
showAdminFeedback(`已新建京东档分组「${name}」`, 'success')
|
||||
emit('group-created')
|
||||
} catch (error) {
|
||||
errorText.value = requestErrorMessage(error) || '新建分组失败'
|
||||
} finally {
|
||||
creatingGroup.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadGroups(): Promise<void> {
|
||||
if (props.ownerGroupId <= 0) {
|
||||
groups.value = []
|
||||
@@ -157,25 +222,41 @@ watch(
|
||||
loadFailure.value = ''
|
||||
cancelRename()
|
||||
createName.value = ''
|
||||
newGroupName.value = ''
|
||||
pageNo.value = 1
|
||||
void loadGroups()
|
||||
}
|
||||
},
|
||||
// immediate:对话框可能以 visible=true 直接挂载(测试/复用场景),这时也要首取。
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
/** 建组成功后父页重取作用域会把 ownerGroupId 翻到新组:按新组重取分类列表,
|
||||
* 操作者不用关弹窗重开就能接着建分类。 */
|
||||
watch(
|
||||
() => props.ownerGroupId,
|
||||
(next, prev) => {
|
||||
if (next > 0 && next !== prev) void loadGroups()
|
||||
},
|
||||
)
|
||||
|
||||
/** 改关键字回第一页(命中集变了,停在旧页码会落在空白处)。 */
|
||||
watch(keyword, () => {
|
||||
pageNo.value = 1
|
||||
})
|
||||
/** 命中集变少(删掉最后一条/搜索收窄)后把越界页码钳回最后一页。 */
|
||||
watch(totalPages, (pages) => {
|
||||
if (pageNo.value > pages) pageNo.value = pages
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div v-if="visible" class="modal-mask" @click.self="emit('close')">
|
||||
<div class="manage-modal">
|
||||
<div class="modal-head">
|
||||
<h3>分类管理<span v-if="ownerGroupName" class="modal-sub">· {{ ownerGroupName }}</span></h3>
|
||||
<h3>分类管理</h3>
|
||||
<button class="modal-close" type="button" aria-label="关闭" @click="emit('close')">×</button>
|
||||
</div>
|
||||
<p class="modal-tip">
|
||||
分类按「数据权限分组」隔离,当前组{{ editable ? '只组长/超管可维护' : '由组长/超管维护' }};
|
||||
给商品归类:关掉本框,勾选商品后点「批量编辑分类」。
|
||||
</p>
|
||||
|
||||
<div class="manage-bar">
|
||||
<input v-model="keyword" class="search-input" type="text" placeholder="搜索分类名称" aria-label="搜索分类名称" />
|
||||
@@ -190,7 +271,7 @@ watch(
|
||||
|
||||
<ul class="option-list">
|
||||
<template v-if="filteredGroups.length">
|
||||
<li v-for="group in filteredGroups" :key="group.id" class="option-row">
|
||||
<li v-for="group in pagedGroups" :key="group.id" class="option-row">
|
||||
<template v-if="editingId === group.id">
|
||||
<input v-model="editingName" class="rename-input" type="text" aria-label="分类新名称" @keyup.enter="submitRename(group)" />
|
||||
<span class="row-actions">
|
||||
@@ -209,9 +290,30 @@ watch(
|
||||
</li>
|
||||
</template>
|
||||
<li v-else-if="loading" class="manage-empty">加载中...</li>
|
||||
<li v-else class="manage-empty">{{ emptyListText }}</li>
|
||||
<li v-else class="manage-empty">
|
||||
<template v-if="canBootstrapGroup">
|
||||
<div class="group-bootstrap">
|
||||
<input
|
||||
v-model="newGroupName"
|
||||
class="search-input"
|
||||
type="text"
|
||||
placeholder="输入分组名称"
|
||||
aria-label="新分组名称"
|
||||
@keyup.enter="submitCreateGroup"
|
||||
/>
|
||||
<button class="btn" type="button" :disabled="!canCreateGroup" @click="submitCreateGroup">新建分组</button>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>{{ emptyListText }}</template>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div v-if="showPager" class="manage-pager">
|
||||
<button class="btn btn-sm btn-secondary" type="button" :disabled="pageNo <= 1" @click="goPage(pageNo - 1)">上一页</button>
|
||||
<span class="pager-text">第 {{ pageNo }} / {{ totalPages }} 页 · 共 {{ filteredGroups.length }} 个分类</span>
|
||||
<button class="btn btn-sm btn-secondary" type="button" :disabled="pageNo >= totalPages" @click="goPage(pageNo + 1)">下一页</button>
|
||||
</div>
|
||||
|
||||
<div class="modal-foot">
|
||||
<button class="btn btn-secondary" type="button" @click="emit('close')">关闭</button>
|
||||
</div>
|
||||
@@ -234,7 +336,11 @@ watch(
|
||||
.manage-modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: min(480px, 100%);
|
||||
/* 2026-11-17 用户口径「宽度不需要那么宽」「红框大小就够了」:垂直排列后每行拉满,
|
||||
480/420 都显空荡;按用户红框量到约 340px(全局 main.css 有 `* { box-sizing: border-box }`,
|
||||
这个 width 就是含内边距与边框的总宽)。行内容(名称+商品数徽标+改名/删除)与页码条
|
||||
在 340−42=298px 可用宽度里仍放得下,不会挤换行。 */
|
||||
width: min(340px, 100%);
|
||||
max-height: 80vh;
|
||||
padding: 18px 20px 20px;
|
||||
border: 1px solid #c7d7e5;
|
||||
@@ -253,12 +359,6 @@ watch(
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
}
|
||||
.modal-sub {
|
||||
margin-left: 6px;
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
}
|
||||
.modal-close {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
@@ -275,15 +375,14 @@ watch(
|
||||
background: #eef4fa;
|
||||
color: #24384d;
|
||||
}
|
||||
.modal-tip {
|
||||
margin: 8px 0 10px;
|
||||
color: #8293a5;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
/* 2026-11-17 用户口径演变:「垂直排阿」→ 弹窗收窄到 340px 后「弄成一排呗」:
|
||||
搜索框、新分类名输入、新建按钮合回一行。340−42=298px 可用宽度:新建按钮约 56
|
||||
+两处 gap 16。实测按比例分(flex 1:1.75)会偏移(搜索 122/新建输入只剩 105,
|
||||
7 字占位 115px 被截),改成搜索定宽 108px(6 字占位 102px 放得下),新建行吃剩余
|
||||
(298−108−16=174,输入约 118px,占位完整)。 */
|
||||
.manage-bar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
flex-wrap: nowrap;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
margin-bottom: 12px;
|
||||
@@ -312,14 +411,14 @@ watch(
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.search-input {
|
||||
flex: 1;
|
||||
min-width: 140px;
|
||||
flex: 0 0 108px;
|
||||
min-width: 0;
|
||||
}
|
||||
.group-create {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
gap: 8px;
|
||||
min-width: 220px;
|
||||
min-width: 0;
|
||||
}
|
||||
.group-create input {
|
||||
flex: 1;
|
||||
@@ -354,8 +453,11 @@ watch(
|
||||
.option-row:hover {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
/* 名称不占剩余空间:它只包住自己的文字,数量徽标紧贴其后。
|
||||
剩余空间全部让给 row-actions 的 margin-left:auto(有操作时按钮仍靠右)。
|
||||
写回 flex:1 会让名称把空白吃满、把号码顶到行尾(2026-11-17 用户反馈「0 和名称离的有点远」)。 */
|
||||
.option-name {
|
||||
flex: 1;
|
||||
flex: 0 1 auto;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
@@ -375,6 +477,7 @@ watch(
|
||||
}
|
||||
.row-actions {
|
||||
flex: none;
|
||||
margin-left: auto;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.manage-empty {
|
||||
@@ -384,6 +487,28 @@ watch(
|
||||
font-size: 13px;
|
||||
list-style: none;
|
||||
}
|
||||
/* 平台超管空态直建分组:只有输入行(引导语/组长说明等小字 2026-11-17 用户口径「小字不需要」删除)。 */
|
||||
.group-bootstrap {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
.group-bootstrap .search-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
text-align: left;
|
||||
}
|
||||
.manage-pager {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.pager-text {
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.rename-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
|
||||
@@ -31,12 +31,19 @@ import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { isAdminRole, isCompanySuperAdminRole } from '@/types/admin'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
|
||||
/** 写权限口径(2026-11-16 用户口径):商品行写(编辑/删除/勾选批量删)只对平台超级管理员渲染;
|
||||
* 分类写(建/改名/删除、归类)由 scope 的每组 editable 决定(本组管理员/公司超管/平台超管)。 */
|
||||
/** 写权限口径(2026-11-17 用户口径「超管+管理员都可以,只有普通员工不能操作」):
|
||||
* 商品行写(编辑/删除/批量删除/传图)对管理员级(超级管理员/公司超级管理员/admin 档)渲染,
|
||||
* 普通账号只读(后端 requireJdProductWrite 同口径兜底);分类写(建/改名/删除、归类)
|
||||
* 由 scope 的每组 editable 决定(本组管理员/公司超管/平台超管),与本档无关。 */
|
||||
const session = useAdminSessionStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
const canWriteProducts = computed(() => isAdminRole(session.user?.role))
|
||||
/** 分组筛选(同日用户口径「超管可以有分组筛选,管理员及以下则没有」):筛选行「分组」控件
|
||||
* (下拉+单组锁定芯片)只对超管档(超级管理员/公司超级管理员)渲染;管理员及以下
|
||||
* 不出现,其分类面固定落在作用域默认分组上。 */
|
||||
const canFilterGroup = computed(() => session.isSuperAdmin || isCompanySuperAdminRole(session.user?.role))
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
@@ -48,6 +55,10 @@ const filter = reactive(createJdProductFilterState())
|
||||
/** 分类作用域(V203):可见分组 + 每组可写标记。失败静默回空作用域(分类列全空但商品照常)。 */
|
||||
const categoryScope = ref<JdCategoryGroupOption[]>([])
|
||||
const scopeDefaultGroupId = ref(0)
|
||||
/** 操作者是否平台超管(scope 原样透传):京东侧还没有任何分组时,分类管理弹窗
|
||||
* 靠它给平台超管开「直接新建数据权限分组」的口子(2026-11-17 用户口径「admin 权限最大」),
|
||||
* 其余角色维持空态指路,不在分类管理里建组。 */
|
||||
const scopeSuperAdmin = ref(false)
|
||||
/** 当前分组(数据权限分组 id):分类列/分类筛选/分类管理的共同作用域。 */
|
||||
const ownerGroupId = ref(0)
|
||||
/** 当前分组的分类下拉选项(按 ownerGroupId 取,切组即换)。 */
|
||||
@@ -71,12 +82,12 @@ const currentGroupOption = computed<JdCategoryGroupOption | null>(() =>
|
||||
const currentGroupName = computed(() => currentGroupOption.value?.name || '')
|
||||
/** 分类可管理(建/改名/删除/归类):本组管理员、公司超管、平台超管(后端 scope 判)。 */
|
||||
const canManageCategories = computed(() => currentGroupOption.value?.editable === true)
|
||||
/** 勾选列服务两类写:批量删除(只超管)+批量编辑分类(本组可写分类的管理员也要勾)。
|
||||
/** 勾选列服务两类写:批量删除(管理员级)+批量编辑分类(本组可写分类的管理员也要勾)。
|
||||
* 2026-11-17 弹窗下线后管理员失去弹窗右栏的勾选面 ⇒ 勾选列必须对「本组可写」放开,
|
||||
* 否则本组管理员没有归类入口。商品行按钮(编辑/删除/删除勾选)仍只归平台超管。 */
|
||||
const hasSelectionColumn = computed(() => isSuperAdmin.value || canManageCategories.value)
|
||||
/** 空态行 colspan:勾选列有无决定 5/6/7 列三种形状(超管含操作列)。 */
|
||||
const emptyColspan = computed(() => (isSuperAdmin.value ? 7 : hasSelectionColumn.value ? 6 : 5))
|
||||
* 否则本组管理员没有归类入口。 */
|
||||
const hasSelectionColumn = computed(() => canWriteProducts.value || canManageCategories.value)
|
||||
/** 空态行 colspan:勾选列有无决定 5/6/7 列三种形状(管理员级含操作列)。 */
|
||||
const emptyColspan = computed(() => (canWriteProducts.value ? 7 : hasSelectionColumn.value ? 6 : 5))
|
||||
/** 分组下拉只在能看多组时才渲染;只有一组(含无可见组)时按锁定态展示。 */
|
||||
const canSwitchGroup = computed(() => categoryScope.value.length > 1)
|
||||
|
||||
@@ -110,9 +121,11 @@ async function loadCategoryScope(): Promise<void> {
|
||||
const scope = await fetchJdCategoryScope()
|
||||
categoryScope.value = scope.groups
|
||||
scopeDefaultGroupId.value = scope.defaultGroupId ?? 0
|
||||
scopeSuperAdmin.value = scope.platformSuperAdmin === true
|
||||
} catch {
|
||||
categoryScope.value = []
|
||||
scopeDefaultGroupId.value = 0
|
||||
scopeSuperAdmin.value = false
|
||||
}
|
||||
// 当前分组:保留用户已选(仍可见时),否则回默认(可见组第一项)。
|
||||
const keep = categoryScope.value.some((group) => group.id === ownerGroupId.value)
|
||||
@@ -167,6 +180,15 @@ async function onManaged(): Promise<void> {
|
||||
await loadGroupOptions()
|
||||
}
|
||||
|
||||
/**
|
||||
* 分类管理里新建了第一个数据权限分组(平台超管空态直建,2026-11-17 用户口径「admin
|
||||
* 权限最大」):整条作用域重取——新组会进可见集并把「当前分组」翻过去,分类下拉、
|
||||
* 弹窗内分类列表随之按新组取,操作者接着就能建分类,不用关弹窗再开一遍。
|
||||
*/
|
||||
async function onGroupCreated(): Promise<void> {
|
||||
await loadCategoryScope()
|
||||
}
|
||||
|
||||
/** 批量归类完成(对话框已关):清勾选+重取列表(行集 groupName 变了)。
|
||||
* 移出分类 targetName 为 null;updated 是后端实际写入/解挂的归属行数。 */
|
||||
async function onBatchAssigned(updated: number, targetName: string | null): Promise<void> {
|
||||
@@ -189,6 +211,7 @@ async function load(): Promise<void> {
|
||||
titleKeyword: filter.titleKeyword,
|
||||
category: filter.category,
|
||||
groupId: filter.groupId,
|
||||
classified: filter.classified,
|
||||
ownerGroupId: ownerGroupId.value,
|
||||
syncedFrom: filter.syncedFrom,
|
||||
syncedTo: filter.syncedTo,
|
||||
@@ -292,9 +315,9 @@ async function removeOne(row: JdProductItem): Promise<void> {
|
||||
await removeMany([row.id], `确定删除商品「${row.productCode || row.title}」吗?`)
|
||||
}
|
||||
|
||||
/** 批量删除入口(工具栏按钮):按累计勾选 id 直删(跨页的行也在内),确认弹窗点名总数。 */
|
||||
/** 批量删除入口(筛选行右侧按钮):按累计勾选 id 直删(跨页的行也在内),确认弹窗点名总数。 */
|
||||
async function removeSelected(): Promise<void> {
|
||||
await removeMany([...selectedIds.value], `确定删除勾选的 ${selectedIds.value.size} 个商品吗?`)
|
||||
await removeMany([...selectedIds.value], `确定批量删除选中的 ${selectedIds.value.size} 个商品吗?`)
|
||||
}
|
||||
|
||||
/** 删除主流程:二次确认 → 先删桶、全成功才删库行(后端保证)→ 刷新列表并清勾选。 */
|
||||
@@ -354,20 +377,26 @@ onMounted(async () => {
|
||||
@change="onCategoryPicked"
|
||||
/>
|
||||
</div>
|
||||
<div v-if="categoryScope.length" class="form-group">
|
||||
<div v-if="canFilterGroup && categoryScope.length" class="form-group">
|
||||
<label>分组</label>
|
||||
<!-- 当前分组(V203):能看多组的人(平台超管/公司超管)下拉切换;只有一组时锁定显示组名。
|
||||
<!-- 当前分组(V203):超管档(平台/公司超管)专属——2026-11-17 用户口径
|
||||
「超管可以有分组筛选,管理员及以下则没有」,本控件对管理员及以下整块不渲染
|
||||
(其分类面固定落在作用域默认分组)。能看多组的人下拉切换;只有一组时锁定显示组名。
|
||||
2026-11-16 用户口径「做成分组」:从工具栏裸下拉上移进筛选行,做成带标签的表单控件
|
||||
(与其他筛选同壳同圆角)。分组是分类列/分类筛选/分类管理的作用域,不是筛选条件
|
||||
⇒ 放在筛选行也只是占位,「重置」不清它(挂载测试钉住)。 -->
|
||||
<select
|
||||
(与其他筛选同壳同圆角)。2026-11-17 用户口径「和亚马逊不统一」:原生 <select> 的
|
||||
弹层是浏览器直角原生物,换 el-select(同亚马逊面 admin-filter 同壳),组多时可搜索。
|
||||
分组是分类列/分类筛选/分类管理的作用域,不是筛选条件 ⇒ 放在筛选行也只是占位,
|
||||
「重置」不清它(挂载测试钉住)。 -->
|
||||
<el-select
|
||||
v-if="canSwitchGroup"
|
||||
:value="ownerGroupId"
|
||||
:model-value="ownerGroupId"
|
||||
class="admin-filter"
|
||||
filterable
|
||||
aria-label="当前分组"
|
||||
@change="changeOwnerGroup(Number(($event.target as HTMLSelectElement).value))"
|
||||
@change="changeOwnerGroup"
|
||||
>
|
||||
<option v-for="group in categoryScope" :key="group.id" :value="group.id">{{ group.label }}</option>
|
||||
</select>
|
||||
<el-option v-for="group in categoryScope" :key="group.id" :value="group.id" :label="group.label" />
|
||||
</el-select>
|
||||
<span v-else class="jd-group-locked" title="你的数据权限内只有这一个分组">{{ currentGroupName }}</span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
@@ -382,14 +411,12 @@ onMounted(async () => {
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
<button class="btn btn-secondary" type="button" @click="reset">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="jd-toolbar">
|
||||
<span class="jd-summary">共 {{ total }} 条京东商品</span>
|
||||
<!-- 批量动作条(2026-11-17 用户口径「共X条京东商品删掉,工具栏整体上移」):
|
||||
原「汇总+工具栏」整行上移并入筛选行,与查询/重置同排;汇总数字删除。
|
||||
放不下的项随 .jd-filter-row 的 flex-wrap 自然折行。 -->
|
||||
<!-- 批量编辑分类(2026-11-17 用户口径「店铺分类弹窗删了,加个批量编辑分类」):
|
||||
只对当前分组可写档(本组管理员/公司超管/平台超管)渲染;勾选 0 时置灰(与
|
||||
删除勾选同款常显口径),打开后按累计勾选(跨页)提交归入/移出。 -->
|
||||
批量删除同款常显口径),打开后按累计勾选(跨页)提交归入/移出。 -->
|
||||
<button
|
||||
v-if="canManageCategories"
|
||||
class="btn btn-secondary"
|
||||
@@ -397,13 +424,37 @@ onMounted(async () => {
|
||||
:disabled="!selectedCount"
|
||||
@click="openBatchEdit"
|
||||
>批量编辑分类</button>
|
||||
<!-- 商品行写只对平台超管;分类写由当前分组 editable 决定(本组管理员/公司超管/平台超管)。
|
||||
非超管看到只读提示,分类维护入口=工具栏「分类管理」(只读可看,写控件按 editable 分档)。 -->
|
||||
<span v-if="!isSuperAdmin" class="jd-readonly-tip">只读:编辑/删除仅超级管理员可用;分类在本页「分类管理」查看与维护</span>
|
||||
<select v-model="filter.groupId" aria-label="筛选店铺分类" @change="apply">
|
||||
<option value="">全部分类</option>
|
||||
<option v-for="group in groupOptions" :key="group.id" :value="String(group.id)">{{ group.name }}</option>
|
||||
</select>
|
||||
<!-- 商品行写对管理员级(超管+管理员)开放,普通账号看到只读提示;分类写由当前分组
|
||||
editable 决定(本组管理员/公司超管/平台超管),分类维护入口=「分类管理」
|
||||
(只读可看,写控件按 editable 分档)。 -->
|
||||
<span v-if="!canWriteProducts" class="jd-readonly-tip">只读:编辑/删除需超级管理员或管理员;分类在本页「分类管理」查看与维护</span>
|
||||
<!-- 分类筛选(2026-11-17 与分组同刀换 el-select,弹层圆角与亚马逊统一):保留显式
|
||||
「全部分类」行(value='',与旧原生下拉同语义——列表里永远有回全量的出口),
|
||||
选中它/重置回 '' 时闭壳显示同文案占位。 -->
|
||||
<el-select
|
||||
v-model="filter.groupId"
|
||||
class="admin-filter"
|
||||
placeholder="全部分类"
|
||||
aria-label="筛选店铺分类"
|
||||
@change="apply"
|
||||
>
|
||||
<el-option label="全部分类" value="" />
|
||||
<el-option v-for="group in groupOptions" :key="group.id" :label="group.name" :value="String(group.id)" />
|
||||
</el-select>
|
||||
<!-- 分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」+同日收敛
|
||||
「不需要全部分类 默认卡在未分类上就行」):已分类=当前分组下有分类
|
||||
(V203 归属表,与列表分类列同形——筛"未分类"的行分类列必显示未分类);
|
||||
两档下拉、出厂默认卡「未分类」,选中即查(回第一页);「重置」也回未分类档。 -->
|
||||
<el-select
|
||||
v-model="filter.classified"
|
||||
class="admin-filter"
|
||||
placeholder="未分类"
|
||||
aria-label="筛选分类状态"
|
||||
@change="apply"
|
||||
>
|
||||
<el-option label="已分类" value="classified" />
|
||||
<el-option label="未分类" value="ungrouped" />
|
||||
</el-select>
|
||||
<!-- 分类管理(2026-11-17 用户口径「京东分类管理并到京东数据库分类编辑里」):V204 独立
|
||||
子菜单页整体并入本对话框(搜索+新建+改名+删除)。入口对所有人渲染(同组普通号
|
||||
只读可看,V203),写控件由对话框按当前分组 editable 分档。 -->
|
||||
@@ -413,18 +464,20 @@ onMounted(async () => {
|
||||
@click="openManage"
|
||||
>分类管理</button>
|
||||
<!-- 批量删除 2026-11-16 客户口径「不要勾选后才显示」:常显,勾选 0 时置灰。
|
||||
同日写权限收窄到超管:非超管整颗按钮不渲染(勾选列 2026-11-17 起对本组可写
|
||||
分类管理员开放,服务批量归类)。 -->
|
||||
写权限 2026-11-17 口径放宽到管理员级:普通账号整颗按钮不渲染(勾选列 2026-11-17
|
||||
起对本组可写分类管理员开放,服务批量归类)。文案 2026-11-17 用户口径「删除勾选改成批量删除」。 -->
|
||||
<button
|
||||
v-if="isSuperAdmin"
|
||||
v-if="canWriteProducts"
|
||||
class="btn btn-danger jd-delete-btn"
|
||||
type="button"
|
||||
:disabled="deleting || !selectedCount"
|
||||
@click="removeSelected"
|
||||
>
|
||||
{{ deleting ? '删除中...' : `删除勾选(${selectedCount})` }}
|
||||
{{ deleting ? '删除中...' : `批量删除(${selectedCount})` }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll jd-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
@@ -435,9 +488,10 @@ onMounted(async () => {
|
||||
<th style="width: 76px">总库存</th>
|
||||
<th style="width: 120px">价格</th>
|
||||
<!-- 同步时间收尾(创建/修改两列 2026-11-16 客户口径「不要」下线,仍收详情抽屉);
|
||||
操作列 2026-11-16「操作放最后一列」口径置末;同日写权限收窄到超管 ⇒ 非超管不渲染。 -->
|
||||
操作列 2026-11-16「操作放最后一列」口径置末;写权限 2026-11-17 放宽到
|
||||
管理员级 ⇒ 普通账号不渲染该列。 -->
|
||||
<th style="width: 170px">同步时间</th>
|
||||
<th v-if="isSuperAdmin" style="width: 138px">操作</th>
|
||||
<th v-if="canWriteProducts" style="width: 138px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -472,8 +526,8 @@ onMounted(async () => {
|
||||
<td>{{ formatDateTime(row.syncedAt || '') }}</td>
|
||||
<!-- 操作列(2026-11-15 用户口径):编辑/删除;@click.stop 防冒泡开详情抽屉。
|
||||
2026-11-16「操作放最后一列」口径置末;「上架时间 / 商品状态」列同日整列下线;
|
||||
同日写权限收窄到超管 ⇒ 非超管不渲染该列。 -->
|
||||
<td v-if="isSuperAdmin" class="jd-ops-cell" @click.stop>
|
||||
写权限 2026-11-17 口径放宽到管理员级 ⇒ 普通账号不渲染该列。 -->
|
||||
<td v-if="canWriteProducts" class="jd-ops-cell" @click.stop>
|
||||
<button class="btn btn-sm" type="button" @click="openEdit(row)">编辑</button>
|
||||
<button class="btn btn-sm btn-danger" type="button" :disabled="deleting" @click="removeOne(row)">删除</button>
|
||||
</td>
|
||||
@@ -506,8 +560,10 @@ onMounted(async () => {
|
||||
:owner-group-id="ownerGroupId"
|
||||
:owner-group-name="currentGroupName"
|
||||
:editable="canManageCategories"
|
||||
:platform-super-admin="scopeSuperAdmin"
|
||||
@close="manageVisible = false"
|
||||
@changed="onManaged"
|
||||
@group-created="onGroupCreated"
|
||||
/>
|
||||
<JdProductDetailDrawer
|
||||
:item="detailItem"
|
||||
|
||||
@@ -62,8 +62,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -77,12 +76,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
@@ -125,46 +122,18 @@ h3 {
|
||||
border-color: #95b1cb;
|
||||
background: #edf5fb;
|
||||
}
|
||||
.jd-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 10px;
|
||||
/* 批量动作条(2026-11-17 用户口径「汇总删掉、工具栏整体上移」):并入 .jd-filter-row
|
||||
与查询/重置同排,不再有独立 .jd-toolbar 容器;放不下靠筛选行的 flex-wrap 折行。 */
|
||||
/* 分类筛选/状态快筛下拉(2026-11-17 用户口径「和亚马逊不统一」起换 el-select):42px 外壳、
|
||||
9px 圆角、#cbd9e6 描边、#f8fbfd 浅底与 focus ring 都由全局 .el-select.admin-filter
|
||||
皮肤(main.css)出——与亚马逊面同一套,弹层不再是浏览器原生直角列表。
|
||||
只钉动作条里的下拉位宽(admin-filter 出厂 width:100%,进 flex 行会横涨);
|
||||
用直接子级选择器,别误伤「分组」表单组里嵌的同款下拉(那个跟 form-group 走宽)。 */
|
||||
.jd-filter-row > .el-select.admin-filter {
|
||||
width: 200px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
/* 工具栏里的下拉与按钮统一 42px 外壳(2026-11-16 用户口径「样式要统一」):
|
||||
这一行此前只有 .btn 有壳,原生 <select> 落成 28px 灰框、字号也不跟,
|
||||
与旁边按钮同排时高矮不齐(分组下拉同日上移进筛选行,本行只剩分类筛选一颗)。
|
||||
数值与 .form-group select / .btn 同一套(42px 高、
|
||||
9px 圆角、#cbd9e6 描边、#f8fbfd 底),箭头用内联 SVG 自绘,避免各浏览器原生
|
||||
箭头粗细不一(appearance:none 后必须补 padding-right 给箭头留位)。 */
|
||||
.jd-toolbar select {
|
||||
min-height: 42px;
|
||||
max-width: 220px;
|
||||
padding: 0 34px 0 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background-color: #f8fbfd;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1.5 6 6.5 11 1.5' fill='none' stroke='%235b6f83' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
|
||||
background-repeat: no-repeat;
|
||||
background-position: right 12px center;
|
||||
appearance: none;
|
||||
-webkit-appearance: none;
|
||||
color: #24384d;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.jd-toolbar select:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.jd-toolbar select:focus {
|
||||
background-color: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
/* 危险动作(删除勾选)推到行尾:留在「批量编辑分类/分类筛选」旁边会被读成同一组动作。 */
|
||||
/* 危险动作(批量删除)推到行尾:留在「批量编辑分类/分类筛选」旁边会被读成同一组动作。 */
|
||||
.jd-delete-btn {
|
||||
margin-left: auto;
|
||||
}
|
||||
@@ -172,7 +141,7 @@ h3 {
|
||||
.jd-manage-btn {
|
||||
margin-left: 6px;
|
||||
}
|
||||
/* 危险动作(删除勾选):与全站 .btn-danger 同形——实心红渐变+白字。
|
||||
/* 危险动作(批量删除):与全站 .btn-danger 同形——实心红渐变+白字。
|
||||
旧版是白底红字描边,落在工具栏里看着像「未激活的次要按钮」,与打卡/分组等页不统一。 */
|
||||
.btn-danger {
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
@@ -182,19 +151,15 @@ h3 {
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
.jd-summary {
|
||||
color: #5b6f83;
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 非超管只读提示(2026-11-16 写权限收窄):紧跟汇总的一句话,不冒充可点按钮。 */
|
||||
/* 非超管只读提示(2026-11-16 写权限收窄):动作条里的一句话说明,不冒充可点按钮。
|
||||
(汇总「共 X 条京东商品」2026-11-17 用户口径删除,.jd-summary 样式随之摘除。) */
|
||||
.jd-readonly-tip {
|
||||
color: #8293a5;
|
||||
font-size: 12.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 只有一个可见分组时锁定的组名(不可切):筛选行「分组」标签下的静态芯片(2026-11-16 用户口径
|
||||
「做成分组」把下拉从工具栏上移进筛选行后跟着搬),与同排 select 同高同壳(42px/9px 圆角),
|
||||
「做成分组」把下拉从工具栏上移进筛选行后跟着搬),与同排 el-select 同高同壳(42px/9px 圆角),
|
||||
"一组锁定"和"多组下拉"两种形态占位一致;组名超宽省略号收口,不把筛选行撑破。 */
|
||||
.jd-group-locked {
|
||||
display: flex;
|
||||
|
||||
@@ -29,6 +29,7 @@ export async function fetchJdProductList(
|
||||
titleKeyword: params.titleKeyword ?? '',
|
||||
category: params.category ?? '',
|
||||
groupId: params.groupId ?? '',
|
||||
classified: (params.classified ?? '') as '' | 'classified' | 'ungrouped',
|
||||
syncedFrom: params.syncedFrom ?? '',
|
||||
syncedTo: params.syncedTo ?? '',
|
||||
},
|
||||
|
||||
@@ -19,6 +19,9 @@ export const JD_PRODUCT_PAGE_SIZE = 20
|
||||
export const JD_PRODUCT_MAX_PAGE_SIZE = 100
|
||||
/** 页码上限:与后端 MAX_PAGE(CR-18 先例,外观专利同值)对齐,两侧不漂。 */
|
||||
export const JD_PRODUCT_MAX_PAGE = 10_000
|
||||
/** 分类状态快筛的出厂档位(2026-11-17 用户口径「不需要全部分类 默认卡在未分类上就行」):
|
||||
* 首屏/重置都卡它;「筛选激活」判定也以「是否偏离它」为准。 */
|
||||
export const JD_PRODUCT_DEFAULT_CLASSIFIED = 'ungrouped' as const
|
||||
|
||||
export interface JdProductFilterState {
|
||||
/** 商品编码,空串不限。 */
|
||||
@@ -29,6 +32,13 @@ export interface JdProductFilterState {
|
||||
category: string
|
||||
/** 分组 id 文本(分组管理里那一行),空串=全部分组。 */
|
||||
groupId: string
|
||||
/** 分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」,同日二档收敛
|
||||
* 「不需要全部分类 默认卡在未分类上就行」):'classified'=已分类(当前分组下有分类),
|
||||
* 'ungrouped'=未分类,**出厂默认='ungrouped'**(首屏与「重置」都卡未分类档)。
|
||||
* 语义按 V203 归属表(当前数据权限分组)判定,与列表分类列同形;不是 11-16 撤掉的
|
||||
* 旧 grouped/ungrouped 参数(那两档读已停用的 biz_jd_product.group_id 列,后端仍拒收)。
|
||||
* ''/缺省=「全部」仍是序列化出口的兜底语义(脏值不冒充档位),但界面不再给这一档。 */
|
||||
classified?: '' | 'classified' | 'ungrouped'
|
||||
/** 同步开始日期(ISO yyyy-MM-dd;空串不限)。 */
|
||||
syncedFrom: string
|
||||
/** 同步结束日期(ISO yyyy-MM-dd;空串不限)。 */
|
||||
@@ -36,7 +46,9 @@ export interface JdProductFilterState {
|
||||
}
|
||||
|
||||
export function createJdProductFilterState(): JdProductFilterState {
|
||||
return { productCode: '', titleKeyword: '', category: '', groupId: '', syncedFrom: '', syncedTo: '' }
|
||||
// 分类状态出厂卡「未分类」(2026-11-17 用户口径「默认卡在未分类上就行」):
|
||||
// 首屏与「重置」都带 classified=false 查,用户要全量自己点「已分类」逐档看。
|
||||
return { productCode: '', titleKeyword: '', category: '', groupId: '', classified: JD_PRODUCT_DEFAULT_CLASSIFIED, syncedFrom: '', syncedTo: '' }
|
||||
}
|
||||
|
||||
/** 是否有任一激活筛选条件。 */
|
||||
@@ -45,6 +57,9 @@ export function jdProductFilterActive(state: JdProductFilterState): boolean {
|
||||
if ((state.titleKeyword || '').trim()) return true
|
||||
if ((state.category || '').trim()) return true
|
||||
if ((state.groupId || '').trim()) return true
|
||||
// 出厂默认本身卡未分类档(2026-11-17 用户口径),所以只有「偏离默认档」才算激活筛选,
|
||||
// 否则首屏就永远处于"有筛选"状态,空结果提示会误导用户去重置一个没动过的筛选。
|
||||
if (state.classified && state.classified !== JD_PRODUCT_DEFAULT_CLASSIFIED) return true
|
||||
if (validIsoDateOrUndefined(state.syncedFrom) || validIsoDateOrUndefined(state.syncedTo)) return true
|
||||
return false
|
||||
}
|
||||
@@ -59,6 +74,9 @@ export interface JdProductQuery {
|
||||
category?: string
|
||||
/** 自定义分类 id(当前分组下的一个分类;V203 起按归属表 EXISTS 过滤)。 */
|
||||
group_id?: number
|
||||
/** 分类状态快筛(2026-11-17):true=已分类、false=未分类,缺省不下发=全部。
|
||||
* 后端按「当前分组」(owner_group_id)的归属表 EXISTS/NOT EXISTS 在 SQL 侧下推。 */
|
||||
classified?: boolean
|
||||
/** 当前数据权限分组 id(分类列/分类筛选都按它取;V203「不同组不能看到跨组的分类」)。 */
|
||||
owner_group_id?: number
|
||||
synced_from?: string
|
||||
@@ -73,6 +91,8 @@ export interface JdProductListParams {
|
||||
titleKeyword?: string
|
||||
category?: string
|
||||
groupId?: string
|
||||
/** 分类状态快筛(''/缺省=全部,'classified'/'ungrouped' 见 JdProductFilterState)。 */
|
||||
classified?: string
|
||||
/** 当前分组(数据权限分组 id):分类列/分类筛选的作用域,非筛选条件(重置不清它)。 */
|
||||
ownerGroupId?: number | null
|
||||
syncedFrom?: string
|
||||
@@ -90,6 +110,10 @@ function toJdProductFilterQuery(state: JdProductFilterState): Omit<JdProductQuer
|
||||
if (category) query.category = category
|
||||
const groupId = Number.parseInt((state.groupId || '').trim(), 10)
|
||||
if (Number.isFinite(groupId) && groupId > 0) query.group_id = groupId
|
||||
// 分类状态快筛:只认两个显式档位,其余值(含脏值)按「全部」不下发——后端 classified
|
||||
// 只收 true/false/缺省,不拿脏值冒充档位。
|
||||
if (state.classified === 'classified') query.classified = true
|
||||
else if (state.classified === 'ungrouped') query.classified = false
|
||||
const syncedFrom = validIsoDateOrUndefined(state.syncedFrom)
|
||||
if (syncedFrom) query.synced_from = syncedFrom
|
||||
const syncedTo = validIsoDateOrUndefined(state.syncedTo)
|
||||
|
||||
@@ -170,18 +170,22 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="code in ASIN_COUNTRY_CODES" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
<!-- 下拉 2026-11-17 用户口径「和亚马逊不统一」:原生 <select> 的弹层是浏览器直角
|
||||
原生物 ⇒ 换 el-select(admin-filter 同壳 42px/9px,弹层 EP 圆角面板)。
|
||||
「全部国家」保留为空值首行(与旧原生下拉同语义,查询参数仍是空串)。 -->
|
||||
<el-select v-model="filter.country" class="admin-filter" aria-label="筛选国家">
|
||||
<el-option label="全部国家" value="" />
|
||||
<el-option v-for="code in ASIN_COUNTRY_CODES" :key="code" :label="asinCountryLabel(code)" :value="code" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>分组</label>
|
||||
<!-- 分组(主管)选中即查:选完立刻按该主管过滤刷新(回第一页),不必再点查询。 -->
|
||||
<select v-model="filter.groupId" @change="apply">
|
||||
<option value="">全部分组</option>
|
||||
<option v-for="group in groupOptions" :key="group.id" :value="String(group.id)">{{ group.name }}</option>
|
||||
</select>
|
||||
<!-- 分组(主管)选中即查:选完立刻按该主管过滤刷新(回第一页),不必再点查询。
|
||||
value 保持字符串形状(下游按字符串比对/透传)。 -->
|
||||
<el-select v-model="filter.groupId" class="admin-filter" aria-label="筛选分组" @change="apply">
|
||||
<el-option label="全部分组" value="" />
|
||||
<el-option v-for="group in groupOptions" :key="group.id" :label="group.name" :value="String(group.id)" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>同步开始日期</label>
|
||||
@@ -306,8 +310,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -321,12 +324,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -221,6 +221,11 @@ function modeLabel(mode: string): string {
|
||||
return mode === 'selected' ? '精选' : '全量'
|
||||
}
|
||||
|
||||
/** 终端覆盖下拉的显示文案(el-option 需要显式 label,文案与旧原生 <option> 逐字一致)。 */
|
||||
function deviceOptionLabel(device: DeviceLogDevice): string {
|
||||
return `${sourceLabel(device.source)} · ${device.deviceName || device.deviceId}(${device.deviceId})`
|
||||
}
|
||||
|
||||
async function openConfig() {
|
||||
configVisible.value = true
|
||||
await loadConfig()
|
||||
@@ -301,16 +306,20 @@ onMounted(() => {
|
||||
<div class="form-row logs-filter-row">
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>来源</label>
|
||||
<select v-model="sourceFilter">
|
||||
<option v-for="option in SOURCE_OPTIONS" :key="option.value" :value="option.value">{{ option.label }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
「全部来源」保留为空值首行(value 语义不变,查询参数仍是空串)。 -->
|
||||
<el-select v-model="sourceFilter" class="admin-filter" aria-label="来源">
|
||||
<el-option v-for="option in SOURCE_OPTIONS" :key="option.value" :label="option.label" :value="option.value" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 180px">
|
||||
<label>指定用户</label>
|
||||
<select v-model="uidFilter" :disabled="usersLoading">
|
||||
<option value="">全部用户</option>
|
||||
<option v-for="u in userOptions" :key="u.id" :value="String(u.id)">{{ u.username }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
「全部用户」保留为空值首行;用户值仍是 String(id)(下游按字符串判空、落库前再转数字)。 -->
|
||||
<el-select v-model="uidFilter" class="admin-filter" filterable aria-label="指定用户" :disabled="usersLoading">
|
||||
<el-option label="全部用户" value="" />
|
||||
<el-option v-for="u in userOptions" :key="u.id" :label="u.username" :value="String(u.id)" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>日志日期(起)</label>
|
||||
@@ -425,15 +434,21 @@ onMounted(() => {
|
||||
<div class="config-block">
|
||||
<h4>终端覆盖</h4>
|
||||
<div class="override-add">
|
||||
<select v-model="newOverrideKey" class="override-select">
|
||||
<option value="">选择终端(最近上报的设备)</option>
|
||||
<option v-for="device in devices" :key="`${device.source}|${device.deviceId}`" :value="`${device.source}|${device.deviceId}`">
|
||||
{{ sourceLabel(device.source) }} · {{ device.deviceName || device.deviceId }}({{ device.deviceId }})
|
||||
</option>
|
||||
</select>
|
||||
<select v-model="newOverrideMode">
|
||||
<option v-for="option in MODE_OPTIONS" :key="option.value" :value="option.value">{{ option.label }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
value 仍是 `${source}|${deviceId}` 与 'full'/'selected' 常量,逐字保留(addOverride
|
||||
按 '|' 切分、后端按 mode 常量解析,值形状一动就错单)。 -->
|
||||
<el-select v-model="newOverrideKey" class="admin-filter override-select" filterable aria-label="选择终端">
|
||||
<el-option label="选择终端(最近上报的设备)" value="" />
|
||||
<el-option
|
||||
v-for="device in devices"
|
||||
:key="`${device.source}|${device.deviceId}`"
|
||||
:label="deviceOptionLabel(device)"
|
||||
:value="`${device.source}|${device.deviceId}`"
|
||||
/>
|
||||
</el-select>
|
||||
<el-select v-model="newOverrideMode" class="admin-filter override-mode" aria-label="覆盖模式">
|
||||
<el-option v-for="option in MODE_OPTIONS" :key="option.value" :label="option.label" :value="option.value" />
|
||||
</el-select>
|
||||
<button class="btn btn-sm" type="button" @click="addOverride">添加/更新覆盖</button>
|
||||
</div>
|
||||
<table class="override-table">
|
||||
@@ -529,8 +544,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -543,8 +557,7 @@ h3 {
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
@@ -743,21 +756,15 @@ td {
|
||||
gap: 10px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.override-add select {
|
||||
min-height: 38px;
|
||||
padding: 6px 10px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13px;
|
||||
font-family: inherit;
|
||||
color-scheme: light;
|
||||
}
|
||||
/* 只管布局:外壳皮肤(42px/9 圆角/#f8fbfd/focus ring)由全局 .admin-filter 提供,
|
||||
这里不再重复描边(旧 `.override-add select` 那段原生下拉皮肤已随 el-select 删除)。 */
|
||||
.override-select {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.override-mode {
|
||||
flex: 0 0 140px;
|
||||
}
|
||||
.override-table td {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
@@ -146,10 +146,12 @@ onMounted(() => {
|
||||
<div class="form-row">
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>指定用户</label>
|
||||
<select v-model="filter.userId" :disabled="userLoading">
|
||||
<option value="">全部用户</option>
|
||||
<option v-for="u in userOptions" :key="u.id" :value="String(u.id)">{{ u.username }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
「全部用户」保留为空值首行;用户值仍是 String(id)(查询前再 Number() 转数字)。 -->
|
||||
<el-select v-model="filter.userId" class="admin-filter" filterable aria-label="指定用户" :disabled="userLoading">
|
||||
<el-option label="全部用户" value="" />
|
||||
<el-option v-for="u in userOptions" :key="u.id" :label="u.username" :value="String(u.id)" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>开始时间</label>
|
||||
@@ -294,8 +296,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -309,12 +310,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -379,17 +379,19 @@ onUnmounted(() => {
|
||||
<label>账号</label>
|
||||
<input v-model="filter.username" type="text" placeholder="模糊搜索账号名" @keyup.enter="search" />
|
||||
</div>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select
|
||||
(与下方店铺筛选同形,挂全局 admin-filter 皮肤)。 -->
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>业务</label>
|
||||
<select v-model="filter.moduleType">
|
||||
<option v-for="option in MODULE_OPTIONS" :key="option.value" :value="option.value">{{ option.label }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.moduleType" class="admin-filter" aria-label="筛选业务">
|
||||
<el-option v-for="option in MODULE_OPTIONS" :key="option.value" :value="option.value" :label="option.label" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 130px">
|
||||
<label>状态</label>
|
||||
<select v-model="filter.status">
|
||||
<option v-for="option in TASK_STATUS_OPTIONS" :key="option.value" :value="option.value">{{ option.label }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.status" class="admin-filter" aria-label="筛选任务状态">
|
||||
<el-option v-for="option in TASK_STATUS_OPTIONS" :key="option.value" :value="option.value" :label="option.label" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group shop-filter">
|
||||
<label>店铺</label>
|
||||
@@ -447,9 +449,11 @@ onUnmounted(() => {
|
||||
<div class="form-row">
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>状态</label>
|
||||
<select v-model="variantFilter.status">
|
||||
<option v-for="option in VARIANT_STATUS_OPTIONS" :key="option.value" :value="option.value">{{ option.label }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
value 原样透传('0'~'3' 是字符串,后端按值比对)。 -->
|
||||
<el-select v-model="variantFilter.status" class="admin-filter" aria-label="筛选变体状态">
|
||||
<el-option v-for="option in VARIANT_STATUS_OPTIONS" :key="option.value" :value="option.value" :label="option.label" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label> </label>
|
||||
@@ -689,8 +693,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -703,8 +706,7 @@ h3 {
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -253,15 +253,16 @@ onMounted(() => {
|
||||
</label>
|
||||
<label class="g-field">
|
||||
<span>国家</span>
|
||||
<select v-model="form.country">
|
||||
<option v-for="country in GATING_COUNTRIES" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。 -->
|
||||
<el-select v-model="form.country" class="admin-filter" aria-label="表单国家">
|
||||
<el-option v-for="country in GATING_COUNTRIES" :key="country" :value="country" :label="country" />
|
||||
</el-select>
|
||||
</label>
|
||||
<label class="g-field">
|
||||
<span>类型</span>
|
||||
<select v-model="form.gatingType">
|
||||
<option v-for="type in typeOptions" :key="type" :value="type">{{ type }}</option>
|
||||
</select>
|
||||
<el-select v-model="form.gatingType" class="admin-filter" aria-label="表单类型">
|
||||
<el-option v-for="type in typeOptions" :key="type" :value="type" :label="type" />
|
||||
</el-select>
|
||||
</label>
|
||||
<label class="g-field">
|
||||
<span>ASIN</span>
|
||||
@@ -302,23 +303,25 @@ onMounted(() => {
|
||||
<div class="g-panel-body">
|
||||
<div class="g-filters">
|
||||
<input v-model="filter.keyword" placeholder="搜索品牌 / ASIN" @keyup.enter="query" />
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="country in countryOptions" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
<select v-model="filter.gatingType">
|
||||
<option value="">全部类型</option>
|
||||
<option v-for="type in typeOptions" :key="type" :value="type">{{ type }}</option>
|
||||
</select>
|
||||
<select v-model="filter.status">
|
||||
<option value="">全部状态</option>
|
||||
<option value="1">生效</option>
|
||||
<option value="0">已解除</option>
|
||||
</select>
|
||||
<select v-model="filter.source">
|
||||
<option value="">全部来源</option>
|
||||
<option v-for="source in GATING_SOURCES" :key="source" :value="source">{{ sourceText(source) }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
「全部 XX」空值行保留、status 的 '1'/'0' 仍是字符串(后端按值比对)。 -->
|
||||
<el-select v-model="filter.country" class="admin-filter" style="width: 132px" aria-label="筛选国家">
|
||||
<el-option value="" label="全部国家" />
|
||||
<el-option v-for="country in countryOptions" :key="country" :value="country" :label="country" />
|
||||
</el-select>
|
||||
<el-select v-model="filter.gatingType" class="admin-filter" style="width: 132px" aria-label="筛选类型">
|
||||
<el-option value="" label="全部类型" />
|
||||
<el-option v-for="type in typeOptions" :key="type" :value="type" :label="type" />
|
||||
</el-select>
|
||||
<el-select v-model="filter.status" class="admin-filter" style="width: 132px" aria-label="筛选状态">
|
||||
<el-option value="" label="全部状态" />
|
||||
<el-option value="1" label="生效" />
|
||||
<el-option value="0" label="已解除" />
|
||||
</el-select>
|
||||
<el-select v-model="filter.source" class="admin-filter" style="width: 132px" aria-label="筛选来源">
|
||||
<el-option value="" label="全部来源" />
|
||||
<el-option v-for="source in GATING_SOURCES" :key="source" :value="source" :label="sourceText(source)" />
|
||||
</el-select>
|
||||
<button class="g-btn g-btn-primary" type="button" @click="query">查询</button>
|
||||
<button class="g-btn g-btn-ghost" type="button" @click="resetFilter">重置</button>
|
||||
</div>
|
||||
@@ -522,10 +525,9 @@ onMounted(() => {
|
||||
.g-field-wide {
|
||||
grid-column: span 2;
|
||||
}
|
||||
/* 下拉已换 el-select(2026-11-17)⇒ 皮肤走全局 .admin-filter,这里只留原生输入框。 */
|
||||
.g-field input,
|
||||
.g-field select,
|
||||
.g-filters input,
|
||||
.g-filters select {
|
||||
.g-filters input {
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
padding: 0 10px;
|
||||
@@ -538,13 +540,28 @@ onMounted(() => {
|
||||
outline: none;
|
||||
}
|
||||
.g-field input:focus,
|
||||
.g-field select:focus,
|
||||
.g-filters input:focus,
|
||||
.g-filters select:focus {
|
||||
.g-filters input:focus {
|
||||
border-color: var(--g-primary);
|
||||
box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
background: #fff;
|
||||
}
|
||||
/* 本页表单/筛选行是 34px 紧凑档(输入框与 `.g-btn` 同为 34px、7px 圆角、蓝色 focus)。
|
||||
新换的 el-select 若照全局 admin-filter(42px/9px/蓝灰 ring)会在同一行里高出一截,
|
||||
与旁边的输入框错位 ⇒ 在本页把壳压回本地档位(scoped 下 :deep 穿透 EP 内部结构)。 */
|
||||
.g-field :deep(.el-select__wrapper),
|
||||
.g-filters :deep(.el-select__wrapper) {
|
||||
min-height: 34px;
|
||||
padding: 0 10px;
|
||||
border-radius: 7px;
|
||||
background: #fbfcfe;
|
||||
box-shadow: 0 0 0 1px #d7dce5 inset;
|
||||
font-size: 13px;
|
||||
}
|
||||
.g-field :deep(.el-select__wrapper.is-focused),
|
||||
.g-filters :deep(.el-select__wrapper.is-focused) {
|
||||
background: #fff;
|
||||
box-shadow: 0 0 0 1px var(--g-primary) inset, 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
}
|
||||
.g-form-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
@@ -580,9 +597,6 @@ onMounted(() => {
|
||||
.g-filters input {
|
||||
width: 190px;
|
||||
}
|
||||
.g-filters select {
|
||||
width: 132px;
|
||||
}
|
||||
|
||||
.g-btn {
|
||||
height: 34px;
|
||||
|
||||
@@ -447,24 +447,26 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="f-group">
|
||||
<label>店铺</label>
|
||||
<select v-model="filter.shop">
|
||||
<option value="">全部店铺</option>
|
||||
<option v-for="shop in orderedShops" :key="shop.shopName" :value="shop.shopName">{{ shop.shopName }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
「全部 XX」空值行保留,候选值原样透传。 -->
|
||||
<el-select v-model="filter.shop" class="admin-filter" filterable style="width: 150px" aria-label="筛选店铺">
|
||||
<el-option value="" label="全部店铺" />
|
||||
<el-option v-for="shop in orderedShops" :key="shop.shopName" :value="shop.shopName" :label="shop.shopName" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div v-if="isSuper" class="f-group">
|
||||
<label>分组</label>
|
||||
<select v-model="filter.group">
|
||||
<option value="">全部分组</option>
|
||||
<option v-for="group in groupStats" :key="group.name" :value="group.name">{{ group.name }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.group" class="admin-filter" filterable style="width: 150px" aria-label="筛选分组">
|
||||
<el-option value="" label="全部分组" />
|
||||
<el-option v-for="group in groupStats" :key="group.name" :value="group.name" :label="group.name" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="f-group">
|
||||
<label>国家 / 站点</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="code in countryOptions" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.country" class="admin-filter" style="width: 150px" aria-label="筛选国家">
|
||||
<el-option value="" label="全部国家" />
|
||||
<el-option v-for="code in countryOptions" :key="code" :value="code" :label="asinCountryLabel(code)" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="f-group">
|
||||
<label>上架时间开始</label>
|
||||
@@ -774,7 +776,8 @@ onMounted(() => {
|
||||
.dup-ref .mono { font-family: var(--mono); }
|
||||
.dup-ref button { font-family: inherit; cursor: pointer; border: none; background: none; color: inherit; }
|
||||
.dup-ref button:disabled { opacity: 0.55; cursor: not-allowed; }
|
||||
.dup-ref input, .dup-ref select { font-family: inherit; font-size: 13px; color: var(--text); }
|
||||
/* 原生 select 已换 el-select(2026-11-17)⇒ 选择器里不再列 select。 */
|
||||
.dup-ref input { font-family: inherit; font-size: 13px; color: var(--text); }
|
||||
.dup-ref a { color: var(--primary); text-decoration: none; }
|
||||
.dup-ref .dim-cell { color: var(--text3); }
|
||||
.dup-ref .num-cell { font-variant-numeric: tabular-nums; }
|
||||
@@ -801,14 +804,27 @@ onMounted(() => {
|
||||
.dup-ref .filter-row { display: flex; align-items: flex-end; gap: 14px; flex-wrap: wrap; }
|
||||
.dup-ref .f-group { display: flex; flex-direction: column; gap: 6px; }
|
||||
.dup-ref .f-group label { font-size: 12px; color: var(--text2); }
|
||||
.dup-ref .f-group input, .dup-ref .f-group select {
|
||||
/* 下拉已换 el-select(2026-11-17)⇒ 皮肤走全局 .admin-filter。
|
||||
本页 style 块不是 scoped,`.f-group input` 会连带命中 el-select 内层的
|
||||
`input.el-select__input`(EP 自己的边框/背景会被这套规则压掉,控件变成框里套框)
|
||||
⇒ 必须显式排除。 */
|
||||
.dup-ref .f-group input:not(.el-select__input) {
|
||||
width: 170px;
|
||||
height: 34px; border: 1px solid var(--border-strong); border-radius: 7px; padding: 0 10px; background: #FBFCFE; outline: none;
|
||||
transition: border-color 0.15s, box-shadow 0.15s;
|
||||
}
|
||||
.dup-ref .f-group input:focus, .dup-ref .f-group select:focus { border-color: var(--primary); box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12); background: #fff; }
|
||||
.dup-ref .f-group input { width: 170px; }
|
||||
.dup-ref .f-group select { width: 150px; cursor: pointer; }
|
||||
.dup-ref .f-group input:not(.el-select__input):focus { border-color: var(--primary); box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12); background: #fff; }
|
||||
.dup-ref .f-group input[type="date"] { width: 150px; }
|
||||
/* 本页筛选行是 34px 紧凑档(输入框与 `.btn` 同为 34px、7px 圆角、蓝色 focus)。
|
||||
新换的 el-select 若照全局 admin-filter(42px/9px/蓝灰 ring)会与同行输入框错位
|
||||
⇒ 在本页把壳压回本地档位;本页 style 不 scoped,EP 内部结构可直接选中。 */
|
||||
.dup-ref .f-group .el-select__wrapper {
|
||||
min-height: 34px; padding: 0 10px; border-radius: 7px;
|
||||
background: #FBFCFE; box-shadow: 0 0 0 1px var(--border-strong) inset; font-size: 13px;
|
||||
}
|
||||
.dup-ref .f-group .el-select__wrapper.is-focused {
|
||||
background: #fff; box-shadow: 0 0 0 1px var(--primary) inset, 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
}
|
||||
.dup-ref .btn {
|
||||
height: 34px; border-radius: 7px; padding: 0 16px; font-size: 13px; font-weight: 600;
|
||||
display: inline-flex; align-items: center; gap: 6px; transition: background 0.15s, color 0.15s, border-color 0.15s;
|
||||
|
||||
@@ -185,19 +185,21 @@ onMounted(() => {
|
||||
<div class="kw-panel-head">筛选条件</div>
|
||||
<div class="kw-panel-body">
|
||||
<div class="kw-filters">
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。
|
||||
「全部 XX」空值行保留。 -->
|
||||
<label class="kw-field">
|
||||
<span>使用者</span>
|
||||
<select v-model="filter.user">
|
||||
<option value="">全部使用者</option>
|
||||
<option v-for="user in userOptions" :key="user" :value="user">{{ user }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.user" class="admin-filter" filterable aria-label="筛选使用者">
|
||||
<el-option value="" label="全部使用者" />
|
||||
<el-option v-for="user in userOptions" :key="user" :value="user" :label="user" />
|
||||
</el-select>
|
||||
</label>
|
||||
<label class="kw-field">
|
||||
<span>国家</span>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部国家</option>
|
||||
<option v-for="country in countryOptions" :key="country" :value="country">{{ country }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.country" class="admin-filter" aria-label="筛选国家">
|
||||
<el-option value="" label="全部国家" />
|
||||
<el-option v-for="country in countryOptions" :key="country" :value="country" :label="country" />
|
||||
</el-select>
|
||||
</label>
|
||||
<label class="kw-field kw-field-wide">
|
||||
<span>关键词</span>
|
||||
@@ -205,10 +207,10 @@ onMounted(() => {
|
||||
</label>
|
||||
<label class="kw-field">
|
||||
<span>场景</span>
|
||||
<select v-model="filter.scene">
|
||||
<option value="">全部场景</option>
|
||||
<option v-for="scene in KEYWORD_USAGE_SCENES" :key="scene" :value="scene">{{ scene }}</option>
|
||||
</select>
|
||||
<el-select v-model="filter.scene" class="admin-filter" aria-label="筛选场景">
|
||||
<el-option value="" label="全部场景" />
|
||||
<el-option v-for="scene in KEYWORD_USAGE_SCENES" :key="scene" :value="scene" :label="scene" />
|
||||
</el-select>
|
||||
</label>
|
||||
<div class="kw-actions">
|
||||
<button class="kw-btn kw-btn-primary" type="button" @click="query">查询</button>
|
||||
@@ -405,8 +407,8 @@ onMounted(() => {
|
||||
font-size: 12px;
|
||||
color: #5a6474;
|
||||
}
|
||||
.kw-field input,
|
||||
.kw-field select {
|
||||
/* 下拉已换 el-select(2026-11-17)⇒ 皮肤走全局 .admin-filter,这里只留原生输入框。 */
|
||||
.kw-field input {
|
||||
height: 34px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid #d7dce5;
|
||||
@@ -417,12 +419,26 @@ onMounted(() => {
|
||||
font-size: 13px;
|
||||
outline: none;
|
||||
}
|
||||
.kw-field input:focus,
|
||||
.kw-field select:focus {
|
||||
.kw-field input:focus {
|
||||
border-color: #2e5be6;
|
||||
box-shadow: 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
background: #fff;
|
||||
}
|
||||
/* 本页筛选行是 34px 紧凑档(关键词输入框 34px、7px 圆角、蓝色 focus)。
|
||||
新换的 el-select 若照全局 admin-filter(42px/9px/蓝灰 ring)会与同行输入框错位
|
||||
⇒ 在本页把壳压回本地档位(scoped 下 :deep 穿透 EP 内部结构)。 */
|
||||
.kw-field :deep(.el-select__wrapper) {
|
||||
min-height: 34px;
|
||||
padding: 0 10px;
|
||||
border-radius: 7px;
|
||||
background: #fbfcfe;
|
||||
box-shadow: 0 0 0 1px #d7dce5 inset;
|
||||
font-size: 13px;
|
||||
}
|
||||
.kw-field :deep(.el-select__wrapper.is-focused) {
|
||||
background: #fff;
|
||||
box-shadow: 0 0 0 1px #2e5be6 inset, 0 0 0 3px rgba(46, 91, 230, 0.12);
|
||||
}
|
||||
.kw-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
|
||||
@@ -334,10 +334,11 @@ onMounted(load)
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 130px">
|
||||
<label>国家</label>
|
||||
<select v-model="filter.country">
|
||||
<option value="">全部</option>
|
||||
<option v-for="code in ['UK', 'DE', 'FR', 'ES', 'IT']" :key="code" :value="code">{{ asinCountryLabel(code) }}</option>
|
||||
</select>
|
||||
<!-- 2026-11-17 用户口径「和亚马逊不统一」:原生 select 弹层是直角原生物,换 el-select。 -->
|
||||
<el-select v-model="filter.country" class="admin-filter" aria-label="筛选国家">
|
||||
<el-option value="" label="全部" />
|
||||
<el-option v-for="code in ['UK', 'DE', 'FR', 'ES', 'IT']" :key="code" :value="code" :label="asinCountryLabel(code)" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>创建开始</label>
|
||||
@@ -510,8 +511,7 @@ h3 {
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.form-group input,
|
||||
.form-group select {
|
||||
.form-group input {
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 8px 12px;
|
||||
@@ -525,12 +525,10 @@ h3 {
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.form-group input:hover,
|
||||
.form-group select:hover {
|
||||
.form-group input:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.form-group input:focus,
|
||||
.form-group select:focus {
|
||||
.form-group input:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
|
||||
@@ -86,3 +86,15 @@ export const useCompanyTabStore = defineStore('company-tab', {
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
/** 公司目录失效通知:公司管理页保存(新建/改名/启停/翻档)之后调这里,让全站 tab 条重拉一份。
|
||||
*
|
||||
* 为什么是 store 里的具名出口而不是让页面自己持一份 store:公司管理页**不参与公司隔离**
|
||||
* (控制方 2026-10-06「公司管理不要有 tab」),它要的不是 tab 状态,只是「别让 18 个页面的
|
||||
* tab 条端着旧名单」这一个动作。页面里一旦出现 `useCompanyTabStore()`,形状就和「给这页上了
|
||||
* tab」分不开——company-config-entry-super-only 的 pageFiles 分母会当场红(2026-11-17 实测:
|
||||
* ee613db0 给这页加了保存后重拉,正是踩在这条上)。
|
||||
* 失败语义同 refresh:error 落 store 再 rethrow,调用方决定要不要提示。 */
|
||||
export function refreshCompanyDirectory(): Promise<void> {
|
||||
return useCompanyTabStore().refresh()
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -51,7 +51,7 @@ test('请求体:admin/normal 一律不带 companyId;公司超管必须带且
|
||||
password: 'secret123',
|
||||
role: 'normal',
|
||||
columnIds: [3, 1],
|
||||
// V206:所属平台恒下发(弹窗单选默认当前平台 tab,空表单缺省亚马逊)。
|
||||
// V206:所属平台恒下发(预填当前平台 tab,空表单缺省亚马逊;弹窗不设手选)。
|
||||
platform: 'amazon',
|
||||
})
|
||||
// 所属管理员仍按原语义携带(仅 normal 角色)
|
||||
|
||||
@@ -75,9 +75,11 @@ test('京东列表参数——snake 形状:groupId 空→不带、有值→gro
|
||||
})
|
||||
assert.equal('shop_name' in full, false, '店铺筛选已下线,参数面不再出现 shop_name')
|
||||
|
||||
// 全空态只有分页两项;脏值(非数字分组、非法日期)同罪不下发。
|
||||
// 出厂态=分页两项+默认未分类档(classified:false,2026-11-17 用户口径「默认卡在未分类上就行」);
|
||||
// 脏值(非数字分组、非法日期)同罪不下发。
|
||||
const blank = toJdProductListParams(createJdProductFilterState(), 1, 20)
|
||||
assert.deepEqual(blank, { page: 1, page_size: 20 })
|
||||
assert.deepEqual(blank, { page: 1, page_size: 20, classified: false },
|
||||
'出厂默认必须带 classified:false——首屏就卡未分类,不是全量')
|
||||
assert.equal('group_id' in blank, false, 'groupId 空串不带 group_id')
|
||||
assert.equal('owner_group_id' in blank, false, '没传当前分组就不带 owner_group_id(后端按作用域默认组取)')
|
||||
const dirty = toJdProductListParams(
|
||||
@@ -108,6 +110,25 @@ test('京东列表参数——page 钳制防 (page-1)*page_size 溢出(铁律
|
||||
assert.equal(offset, 999_900)
|
||||
})
|
||||
|
||||
/** 分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」,同日收敛
|
||||
* 「不需要全部分类 默认卡在未分类上就行」):界面两档,'classified'→true、'ungrouped'→false;
|
||||
* 出厂默认与「重置」都卡 ungrouped。''/缺省/脏值=「全部」仍是序列化出口的兜底语义
|
||||
* (不拿脏值冒充档位),但界面不再提供这一档。
|
||||
* 参数名是新档 classified——不是后端仍拒收的旧 grouped/ungrouped 查询参数。 */
|
||||
test('京东列表参数——classified 默认卡未分类:已分类→true、未分类→false、脏值兜底不下发', () => {
|
||||
const yes = toJdProductListParams({ ...createJdProductFilterState(), classified: 'classified' }, 1, 20, 11)
|
||||
assert.equal(yes.classified, true)
|
||||
assert.equal(yes.owner_group_id, 11, 'classified 与当前分组成对下发(后端按组判已/未分类)')
|
||||
|
||||
assert.equal(createJdProductFilterState().classified, 'ungrouped',
|
||||
'出厂态与重置都必须卡未分类档(用户口径:默认卡在未分类上)')
|
||||
|
||||
for (const blank of ['', undefined, 'grouped', 'nonsense'] as const) {
|
||||
const q = toJdProductListParams({ ...createJdProductFilterState(), classified: blank }, 1, 20)
|
||||
assert.equal('classified' in q, false, `classified=${String(blank)} 按「全部」兜底处理,不拿脏值冒充档位`)
|
||||
}
|
||||
})
|
||||
|
||||
test('详情解析——attrGroups/images 结构化解析(snake 容错、缺 url 弃行)', () => {
|
||||
const detail = parseJdProductDetail({
|
||||
code: 0,
|
||||
|
||||
@@ -0,0 +1,217 @@
|
||||
/**
|
||||
* 账户域三页的原生 <select> → el-select(2026-11-17 用户口径「和亚马逊不统一」:
|
||||
* 原生 select 的弹层是浏览器直角原生物 ⇒ 换 EP 圆角弹层,外壳走全局 .admin-filter)。
|
||||
*
|
||||
* 钉住换壳最容易错的两件事:
|
||||
* 1. **值形状逐字不变**——菜单类型/密钥状态仍是 '' / 'admin' / 'app' / 'passed'…(空串=不筛),
|
||||
* 分组仍是 null 或数字 id(下游 `groupId: groupFilter.value || undefined` 一字不动);
|
||||
* 2. **「全部 XX」空值行还在**,且选中它就是"不改筛选条件",不是筛一个叫空的类型。
|
||||
*
|
||||
* aria-label 由 EP 落在内层 combobox input 上;选项清单走组件树读,点选走「点开→点选项」真实路径
|
||||
* (弹层 teleport 到 body)。页面模板靠 main.ts 全局注册 EP 组件,挂载测试不跑 main.ts ⇒
|
||||
* 这里必须显式把 ElSelect/ElOption 传进 plugins。
|
||||
*
|
||||
* 跑法:`npx vitest run tests/mount/account-select-el.mount.test.ts`
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
|
||||
import MenusPage from '@/pages/account/MenusPage.vue'
|
||||
import UserSecretsPage from '@/pages/account/UserSecretsPage.vue'
|
||||
import UserSecretUsagePage from '@/pages/account/UserSecretUsagePage.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
|
||||
const menuApi = vi.hoisted(() => ({
|
||||
loadMenuManageTree: vi.fn(),
|
||||
createMenu: vi.fn(),
|
||||
updateMenu: vi.fn(),
|
||||
deleteMenu: vi.fn(),
|
||||
reorderMenus: vi.fn(),
|
||||
}))
|
||||
|
||||
const secretsApi = vi.hoisted(() => ({
|
||||
fetchUserSecretList: vi.fn(),
|
||||
fetchAdminSecretBalances: vi.fn(),
|
||||
checkUserSecret: vi.fn(),
|
||||
deleteUserSecret: vi.fn(),
|
||||
saveUserSecretModule: vi.fn(),
|
||||
clearUserSecretModule: vi.fn(),
|
||||
}))
|
||||
|
||||
const usageApi = vi.hoisted(() => ({ fetchUserSecretUsage: vi.fn() }))
|
||||
|
||||
vi.mock('@/pages/account/menu-manage-api', () => menuApi)
|
||||
vi.mock('@/api/user-secrets', () => secretsApi)
|
||||
vi.mock('@/api/user-secret-usage', () => usageApi)
|
||||
|
||||
const GROUPS = [
|
||||
{ id: 7, groupName: '甲组' },
|
||||
{ id: 9, groupName: '乙组' },
|
||||
]
|
||||
|
||||
const MENU_ROWS = [
|
||||
{ id: 1, name: '后台菜单', columnKey: 'admin-col', parentId: null, menuType: 'admin', routePath: '/a', sortOrder: 0, children: [] },
|
||||
{ id: 2, name: '软件菜单', columnKey: 'app-col', parentId: null, menuType: 'app', routePath: '/b', sortOrder: 1, children: [] },
|
||||
]
|
||||
|
||||
// ---------------- el-select 交互助手(与京东数据库页/亚马逊面同一套口径) ----------------
|
||||
|
||||
/** 按 aria-label 找对应的 ElSelect 实例(EP 把该属性落在内层 combobox input 上)。 */
|
||||
function selectByLabel(wrapper: VueWrapper<Element>, label: string) {
|
||||
const found = wrapper.findAllComponents(ElSelect).find((s) => s.find(`[aria-label="${label}"]`).exists())
|
||||
expect(found, `应存在 aria-label="${label}" 的下拉`).toBeTruthy()
|
||||
return found!
|
||||
}
|
||||
|
||||
/** 某颗下拉的全部选项文案(读 el-option 的 label prop,不依赖插槽文本)。 */
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
/** 某颗下拉的全部选项 value(形状判据:空串/数字 id/null 逐字对撞)。 */
|
||||
function optionValues(wrapper: VueWrapper<Element>, label: string): unknown[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('value'))
|
||||
}
|
||||
|
||||
/** 点开指定下拉并点选目标文案的选项(触发 update:modelValue + change,与真实用户一致)。
|
||||
* 面板按内层 input 的 aria-controls 圈定,避免另一颗(可能仍挂着的)弹层串台。 */
|
||||
async function pickSelectOption(wrapper: VueWrapper<Element>, label: string, optionText: string): Promise<void> {
|
||||
const input = wrapper.get(`[aria-label="${label}"]`)
|
||||
await input.trigger('click')
|
||||
await flushPromises()
|
||||
const contentId = input.attributes('aria-controls')
|
||||
const scope = (contentId && document.getElementById(contentId)) ?? document.body
|
||||
const items = [...scope.querySelectorAll('.el-select-dropdown__item')].filter((el) => !el.classList.contains('is-hidden'))
|
||||
const target = items.find((el) => (el.textContent ?? '').trim() === optionText)
|
||||
expect(target, `下拉应弹出「${optionText}」选项`).toBeTruthy()
|
||||
await new DOMWrapper(target as Element).trigger('click')
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
/** 按文案点按钮(筛选条上的查询/重置)。 */
|
||||
async function clickButton(wrapper: VueWrapper<Element>, text: string): Promise<void> {
|
||||
const button = wrapper.findAll('button').find((b) => b.text().trim() === text)
|
||||
expect(button, `应存在「${text}」按钮`).toBeTruthy()
|
||||
await button!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
/** 最近一次调用的入参(首屏 + 公司 tab watch 可能各发一次,判"选完落什么参"只认最后一次)。 */
|
||||
function lastArgs(fn: { mock: { calls: unknown[][] } }): Record<string, unknown> {
|
||||
const calls = fn.mock.calls
|
||||
expect(calls.length, '接口应至少被调用一次').toBeGreaterThan(0)
|
||||
return calls[calls.length - 1][0] as Record<string, unknown>
|
||||
}
|
||||
|
||||
let pinia: Pinia
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
pinia = createPinia()
|
||||
setActivePinia(pinia)
|
||||
useAdminSessionStore().user = { id: 1, username: 'root', role: 'super_admin' }
|
||||
useCompanyTabStore().setActiveId(1)
|
||||
})
|
||||
|
||||
async function mountMenus(): Promise<VueWrapper<Element>> {
|
||||
menuApi.loadMenuManageTree.mockResolvedValue(MENU_ROWS)
|
||||
const wrapper = mount(MenusPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
async function mountSecrets(): Promise<VueWrapper<Element>> {
|
||||
secretsApi.fetchUserSecretList.mockResolvedValue({ items: [], total: 0, page: 1, pageSize: 15, groupOptions: GROUPS })
|
||||
secretsApi.fetchAdminSecretBalances.mockResolvedValue({ items: [] })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
async function mountUsage(): Promise<VueWrapper<Element>> {
|
||||
usageApi.fetchUserSecretUsage.mockResolvedValue({ items: [], total: 0, groupOptions: GROUPS })
|
||||
const wrapper = mount(UserSecretUsagePage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
/** 菜单表格里正在显示的行名(顺序=树展平顺序)。 */
|
||||
function visibleMenuNames(wrapper: VueWrapper<Element>): string[] {
|
||||
return wrapper.findAll('.menu-name-text').map((el) => el.text().trim())
|
||||
}
|
||||
|
||||
describe('菜单管理页 × el-select', () => {
|
||||
it('菜单类型下拉:空值行仍是空串,另两档仍是 admin/app', async () => {
|
||||
const wrapper = await mountMenus()
|
||||
expect(optionLabels(wrapper, '筛选菜单类型')).toEqual(['全部', '后台', '软件'])
|
||||
expect(optionValues(wrapper, '筛选菜单类型')).toEqual(['', 'admin', 'app'])
|
||||
})
|
||||
|
||||
it('选「软件」按 menuType 筛表,选回「全部」恢复全量(空串不参与筛选)', async () => {
|
||||
const wrapper = await mountMenus()
|
||||
expect(visibleMenuNames(wrapper)).toEqual(['后台菜单', '软件菜单'])
|
||||
await pickSelectOption(wrapper, '筛选菜单类型', '软件')
|
||||
expect(visibleMenuNames(wrapper)).toEqual(['软件菜单'])
|
||||
await pickSelectOption(wrapper, '筛选菜单类型', '全部')
|
||||
expect(visibleMenuNames(wrapper)).toEqual(['后台菜单', '软件菜单'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('密钥管理页 × el-select', () => {
|
||||
it('状态下拉:「全部状态」是空串档,其余各档码逐一在案', async () => {
|
||||
const wrapper = await mountSecrets()
|
||||
expect(optionLabels(wrapper, '筛选密钥状态')).toEqual([
|
||||
'全部状态',
|
||||
'检测通过',
|
||||
'检测失败',
|
||||
'未配齐',
|
||||
'无法判定/可重试',
|
||||
'未检测',
|
||||
])
|
||||
expect(optionValues(wrapper, '筛选密钥状态')).toEqual(['', 'passed', 'failed', 'incomplete', 'error', 'unknown'])
|
||||
})
|
||||
|
||||
it('分组下拉:「全部分组」仍是 null,组选项是数字 id', async () => {
|
||||
const wrapper = await mountSecrets()
|
||||
expect(optionLabels(wrapper, '筛选分组')).toEqual(['全部分组', '甲组', '乙组'])
|
||||
expect(optionValues(wrapper, '筛选分组')).toEqual([null, 7, 9])
|
||||
})
|
||||
|
||||
it('落参:checkStatus 是状态码、groupId 是数字;选回空值行后两者都不出现', async () => {
|
||||
const wrapper = await mountSecrets()
|
||||
await pickSelectOption(wrapper, '筛选密钥状态', '检测失败')
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组')
|
||||
await clickButton(wrapper, '查询')
|
||||
const selected = lastArgs(secretsApi.fetchUserSecretList)
|
||||
expect(selected.checkStatus).toBe('failed')
|
||||
expect(selected.groupId).toBe(7)
|
||||
|
||||
// 空值行=不筛:'' / null 都落回 undefined,查询参数与换壳前逐字一致
|
||||
await pickSelectOption(wrapper, '筛选密钥状态', '全部状态')
|
||||
await pickSelectOption(wrapper, '筛选分组', '全部分组')
|
||||
await clickButton(wrapper, '查询')
|
||||
const cleared = lastArgs(secretsApi.fetchUserSecretList)
|
||||
expect(cleared.checkStatus).toBeUndefined()
|
||||
expect(cleared.groupId).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
describe('密钥用量页 × el-select', () => {
|
||||
it('分组下拉与密钥页同口径(全部分组=null),落参仍是数字 id / 缺省', async () => {
|
||||
const wrapper = await mountUsage()
|
||||
expect(optionLabels(wrapper, '筛选分组')).toEqual(['全部分组', '甲组', '乙组'])
|
||||
expect(optionValues(wrapper, '筛选分组')).toEqual([null, 7, 9])
|
||||
|
||||
await pickSelectOption(wrapper, '筛选分组', '乙组')
|
||||
await clickButton(wrapper, '查询')
|
||||
expect(lastArgs(usageApi.fetchUserSecretUsage).groupId).toBe(9)
|
||||
|
||||
await pickSelectOption(wrapper, '筛选分组', '全部分组')
|
||||
await clickButton(wrapper, '查询')
|
||||
expect(lastArgs(usageApi.fetchUserSecretUsage).groupId).toBeUndefined()
|
||||
})
|
||||
})
|
||||
@@ -14,8 +14,9 @@
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { resolve } from 'node:path'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import AppearancePatentCleanItemsPage from '@/pages/patent/AppearancePatentCleanItemsPage.vue'
|
||||
import { adminPages } from '@/router/routes'
|
||||
@@ -74,12 +75,40 @@ beforeEach(() => {
|
||||
|
||||
async function mountWith(payload: unknown): Promise<VueWrapper<Element>> {
|
||||
cleanApi.fetchAppearancePatentCleanList.mockImplementation(() => Promise.resolve(payload))
|
||||
const wrapper = mount(AppearancePatentCleanItemsPage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(AppearancePatentCleanItemsPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
// ---------------- el-select 交互助手(2026-11-17 筛选行/分页条下拉换 el-select,与亚马逊面统一) ----------------
|
||||
// aria-label 经 EP 的 ariaLabel prop 落在内层 combobox input 上;弹层 teleport 到 body,
|
||||
// ElOption 仍在挂载树里 ⇒ 选项清单走组件树读,点选走「点开→点选项」真实路径。
|
||||
|
||||
function selectByLabel(wrapper: VueWrapper<Element>, label: string) {
|
||||
const found = wrapper.findAllComponents(ElSelect).find((s) => s.find(`[aria-label="${label}"]`).exists())
|
||||
expect(found, `应存在 aria-label="${label}" 的下拉`).toBeTruthy()
|
||||
return found!
|
||||
}
|
||||
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
async function pickSelectOption(wrapper: VueWrapper<Element>, label: string, optionText: string): Promise<void> {
|
||||
const input = wrapper.get(`[aria-label="${label}"]`)
|
||||
await input.trigger('click')
|
||||
await flushPromises()
|
||||
const contentId = input.attributes('aria-controls')
|
||||
const scope = (contentId && document.getElementById(contentId)) ?? document.body
|
||||
const items = [...scope.querySelectorAll('.el-select-dropdown__item')]
|
||||
.filter((el) => !el.classList.contains('is-hidden'))
|
||||
const target = items.find((el) => (el.textContent ?? '').trim() === optionText)
|
||||
expect(target, `下拉应弹出「${optionText}」选项`).toBeTruthy()
|
||||
await new DOMWrapper(target as Element).trigger('click')
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那个格式」)', () => {
|
||||
it('页面组件落位:明细表 + 明细端点 + 导出,卡片视图与删除入口已下架', () => {
|
||||
const src = readFileSync(resolve(process.cwd(), PAGE_PATH), 'utf-8')
|
||||
@@ -215,14 +244,13 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([{ id: 7, name: '甲组', leaderUserId: 9 }])
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]')
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]:not(.el-select__input)')
|
||||
expect(textInputs).toHaveLength(2, '任务号+ASIN 两个筛选框恢复(客户要一目了然)')
|
||||
await textInputs[0].setValue('33874')
|
||||
await textInputs[1].setValue('B0CLEAN')
|
||||
|
||||
const selects = wrapper.findAll('select')
|
||||
await selects[0].setValue('DE') // 国家排在前(模板顺序:任务号/ASIN/国家/分组)
|
||||
await selects[1].setValue('7') // 分组(主管=组长)
|
||||
await pickSelectOption(wrapper, '筛选国家', '德国') // 国家排在前(模板顺序:任务号/ASIN/国家/分组)
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组') // 分组(主管=组长)
|
||||
const dateInputs = wrapper.findAll('input[type="date"]')
|
||||
await dateInputs[0].setValue('2026-11-01')
|
||||
await dateInputs[1].setValue('2026-11-09')
|
||||
@@ -249,13 +277,12 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
expect(cleanApi.fetchDedupeTotalGroups).toHaveBeenCalledWith(1)
|
||||
|
||||
const groupSelect = wrapper.findAll('select')[1] // 模板顺序:国家在前、分组在后
|
||||
const optionTexts = groupSelect.findAll('option').map((o) => o.text())
|
||||
expect(optionTexts).toContain('全部分组')
|
||||
expect(optionTexts).toContain('甲组')
|
||||
const groups = optionLabels(wrapper, '筛选分组')
|
||||
expect(groups).toContain('全部分组')
|
||||
expect(groups).toContain('甲组')
|
||||
|
||||
const callsBeforeSelect = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
await groupSelect.setValue('7')
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组')
|
||||
await flushPromises()
|
||||
expect(cleanApi.fetchAppearancePatentCleanList.mock.calls.length).toBe(callsBeforeSelect + 1,
|
||||
'选中分组必须立刻重查')
|
||||
@@ -267,7 +294,7 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
|
||||
it('重置把筛选面回空并回第一页重取', async () => {
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]')
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]:not(.el-select__input)')
|
||||
await textInputs[0].setValue('33874')
|
||||
await textInputs[1].setValue('B0CLEAN')
|
||||
const callsBefore = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
@@ -288,8 +315,9 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
expect(cleanApi.fetchAppearancePatentCleanList).toHaveBeenCalledTimes(2)
|
||||
expect(cleanApi.fetchAppearancePatentCleanList.mock.calls[1][0].page).toBe(3)
|
||||
|
||||
const sizeSelect = wrapper.find('.page-size-select')
|
||||
await sizeSelect.setValue('50')
|
||||
// 每页条数下拉 2026-11-17 随分页条一起换 el-select(OldPagination 内局部注册)。
|
||||
expect(wrapper.find('.page-size-select').exists()).toBe(true, '分页条下拉保留 .page-size-select 定位类')
|
||||
await pickSelectOption(wrapper, '每页条数', '50条/页')
|
||||
await flushPromises()
|
||||
const last = cleanApi.fetchAppearancePatentCleanList.mock.calls.at(-1)![0]
|
||||
expect(last.pageSize).toBe(50)
|
||||
@@ -314,11 +342,10 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
it('切公司 Tab 重取并清掉上一家的筛选(company-tab-wiring 同口径)', async () => {
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([{ id: 7, name: '甲组', leaderUserId: 9 }])
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 10 })
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]')
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]:not(.el-select__input)')
|
||||
await textInputs[0].setValue('33874')
|
||||
await textInputs[1].setValue('B0CLEAN')
|
||||
const groupSelect = wrapper.findAll('select')[1]
|
||||
await groupSelect.setValue('7')
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组')
|
||||
const callsBefore = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
|
||||
useCompanyTabStore().setActiveId(2)
|
||||
|
||||
@@ -14,6 +14,7 @@ import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
|
||||
import JdCategoryManageDialog from '@/pages/jd/JdCategoryManageDialog.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
|
||||
const jdApi = vi.hoisted(() => ({
|
||||
fetchJdProductGroups: vi.fn(),
|
||||
@@ -22,9 +23,14 @@ const jdApi = vi.hoisted(() => ({
|
||||
deleteJdProductGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
const groupApi = vi.hoisted(() => ({
|
||||
createShopGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
const confirmMock = vi.hoisted(() => vi.fn())
|
||||
|
||||
vi.mock('@/pages/jd/jd-product-api.ts', () => jdApi)
|
||||
vi.mock('@/pages/account/shop-group-api.ts', () => groupApi)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
|
||||
/** 分组 id 常量:默认作用域就这一个可见且可写的组(组长档形状)。 */
|
||||
@@ -40,7 +46,10 @@ beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
pinia = createPinia()
|
||||
setActivePinia(pinia)
|
||||
// 空态直建分组(2026-11-17 用户口径「admin 权限最大」)需要当前登录人做组长。
|
||||
useAdminSessionStore().user = { id: 9, username: 'admin', role: 'super_admin' } as never
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([])
|
||||
groupApi.createShopGroup.mockResolvedValue({ id: 21, name: '京东-团队', ownerGroupId: 21, sortOrder: 0, productCount: 0 })
|
||||
confirmMock.mockResolvedValue(true)
|
||||
})
|
||||
|
||||
@@ -60,12 +69,13 @@ async function mountDialog(editable = true): Promise<VueWrapper<Element>> {
|
||||
}
|
||||
|
||||
describe('京东分类管理对话框(V204 独立页 2026-11-17 并入京东数据库页)', () => {
|
||||
it('打开即按当前分组取分类(ownerGroupId 必带);标题带当前分组名', async () => {
|
||||
it('打开即按当前分组取分类(ownerGroupId 必带);标题不带分组名(2026-11-17 用户口径「不要显示周丽娥」)', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3)])
|
||||
const wrapper = await mountDialog()
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenCalledWith(GROUP_A)
|
||||
expect(wrapper.get('.manage-modal').text()).toContain('分类管理')
|
||||
expect(wrapper.get('.manage-modal').text()).toContain('甲组', '标题/上下文带当前分组名')
|
||||
expect(wrapper.find('.modal-sub').exists()).toBe(false, '标题后缀(· 分组名)已删,不得长回来')
|
||||
expect(wrapper.get('.manage-modal').text()).not.toContain('甲组', '分组名不进标题')
|
||||
expect(wrapper.findAll('.option-row')).toHaveLength(1)
|
||||
wrapper.unmount()
|
||||
})
|
||||
@@ -110,6 +120,50 @@ describe('京东分类管理对话框(V204 独立页 2026-11-17 并入京东
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('分页:每页 6 条、翻页只换当前页、改搜索回第一页(2026-11-17 用户口径「分类这也要加分页」)', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue(
|
||||
Array.from({ length: 11 }, (_, index) => group(100 + index, `分类${index + 1}`)),
|
||||
)
|
||||
const wrapper = await mountDialog()
|
||||
expect(wrapper.findAll('.option-row')).toHaveLength(6, '第一页只渲染 6 行')
|
||||
expect(wrapper.text()).not.toContain('分类7', '第 7 条以后不在第一页')
|
||||
const pagerText = wrapper.get('.manage-pager').text()
|
||||
expect(pagerText).toContain('第 1 / 2 页')
|
||||
expect(pagerText).toContain('共 11 个分类', '总数取搜索命中集,不是当前页行数')
|
||||
|
||||
await wrapper.findAll('.manage-pager button').find((b) => b.text() === '下一页')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect(wrapper.findAll('.option-row')).toHaveLength(5, '第二页剩 5 行')
|
||||
expect(wrapper.text()).toContain('分类11')
|
||||
expect(wrapper.get('.manage-pager').text()).toContain('第 2 / 2 页')
|
||||
|
||||
await wrapper.get('.search-input').setValue('分类1')
|
||||
await flushPromises()
|
||||
expect(wrapper.find('.manage-pager').exists()).toBe(false, '命中 3 条不足一页 ⇒ 不渲染页码条')
|
||||
expect(wrapper.findAll('.option-row')).toHaveLength(3, '搜索回第一页(不是停在旧页码的空白处)')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('分页:一屏装得下就不出页码条(不白占一行)', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3), group(8, '裤装', 1)])
|
||||
const wrapper = await mountDialog()
|
||||
expect(wrapper.findAll('.option-row')).toHaveLength(2)
|
||||
expect(wrapper.find('.manage-pager').exists()).toBe(false)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('搜索与新建行同属 manage-bar 的一排(搜索在左、新建在右,2026-11-17 用户口径「弄成一排呗」)', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3)])
|
||||
const wrapper = await mountDialog()
|
||||
const bar = wrapper.get('.manage-bar')
|
||||
const children = Array.from(bar.element.children)
|
||||
expect(children).toHaveLength(2, '一排只有两件:搜索框、新建行(新建行内=输入框+新建按钮)')
|
||||
expect(children[0].classList.contains('search-input')).toBe(true, '搜索框在左')
|
||||
expect(children[1].classList.contains('group-create')).toBe(true, '新建行在右')
|
||||
expect(children[1].children).toHaveLength(2, '新建行只有输入框+按钮(排序输入 11-15 已下线,不得长出第三个框)')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('改名:行内编辑后按 (id, {name, sortOrder}) 提交并 emit changed', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3)])
|
||||
const wrapper = await mountDialog()
|
||||
@@ -207,8 +261,104 @@ describe('京东分类管理对话框(V204 独立页 2026-11-17 并入京东
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3)])
|
||||
const wrapper = await mountDialog()
|
||||
expect(wrapper.findAll('button').some((b) => b.text() === '批量编辑分类')).toBe(false, '归类入口在京东数据库页')
|
||||
expect(wrapper.text()).toContain('批量编辑分类', '但提示要指路(关掉本框去勾选商品归类)')
|
||||
expect(wrapper.text()).not.toContain('批量编辑分类',
|
||||
'指路小字已随 2026-11-17 用户口径「小字不需要」删除,弹窗里不该再出现这句')
|
||||
expect(jdApi.deleteJdProductGroup).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
/** 平台超管空态直建分组(2026-11-17 用户口径「admin 权限最大」):京东侧还没有任何
|
||||
* 数据权限分组时(平台闸上线后 jd 档组全空,B117-02 前置未做),平台超管在弹窗里
|
||||
* 直接建第一个京东档分组,不再死在「你还不属于任何数据权限分组」。 */
|
||||
describe('平台超管空态直建京东档分组', () => {
|
||||
function mountEmpty(platformSuperAdmin: boolean): VueWrapper<Element> {
|
||||
return mount(JdCategoryManageDialog, {
|
||||
global: { plugins: [pinia] },
|
||||
props: { visible: true, ownerGroupId: 0, ownerGroupName: '', editable: false, platformSuperAdmin },
|
||||
})
|
||||
}
|
||||
|
||||
it('平台超管空态:出直建表单(不是死路文案),提交走分组管理同一条 POST 且 platform 恒 jd、组长=当前登录人', async () => {
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductGroups).not.toHaveBeenCalled()
|
||||
expect(wrapper.get('.manage-empty').find('[aria-label="新分组名称"]').exists()).toBe(true,
|
||||
'空态直建表单就在空态区里(引导语小字已删,表单本身还在)')
|
||||
|
||||
const input = wrapper.get('[aria-label="新分组名称"]')
|
||||
await input.setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(groupApi.createShopGroup).toHaveBeenCalledTimes(1)
|
||||
expect(groupApi.createShopGroup).toHaveBeenCalledWith('京东-团队', [], 9, 'jd')
|
||||
expect(wrapper.emitted('group-created'), '建组成功即通知父页重取作用域').toBeTruthy()
|
||||
expect((input.element as HTMLInputElement).value).toBe('', '成功后清输入')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('没有当前登录人就不发请求并给可见错误(组长缺了这单没法建)', async () => {
|
||||
useAdminSessionStore().user = null
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await wrapper.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect(groupApi.createShopGroup).not.toHaveBeenCalled()
|
||||
expect(wrapper.text()).toContain('无法获取当前登录用户')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('建组失败:错误进红条、不发 group-created(父页作用域不动)', async () => {
|
||||
groupApi.createShopGroup.mockRejectedValueOnce(new Error('分组名称已存在'))
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await wrapper.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(wrapper.text()).toContain('分组名称已存在')
|
||||
expect(wrapper.emitted('group-created')).toBeFalsy()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('父页把 ownerGroupId 翻到新组后:直建表单消失、按新组重取分类(不用关弹窗重开)', async () => {
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await wrapper.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
const emittedBefore = wrapper.emitted('group-created')?.length ?? 0
|
||||
await wrapper.setProps({ ownerGroupId: 21, ownerGroupName: '京东-团队', editable: true })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenLastCalledWith(21)
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenCalledWith(21)
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false, '有组了直建口子就关')
|
||||
expect(wrapper.emitted('group-created')?.length).toBe(emittedBefore, '翻组重取不再重复通知父页')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('非平台超管的空态维持原状:死路文案照旧、无直建表单(口子不开给组长/公司超管)', async () => {
|
||||
const wrapper = mountEmpty(false)
|
||||
await flushPromises()
|
||||
expect(wrapper.get('.manage-empty').text()).toBe('你还不属于任何数据权限分组')
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('平台超管但已有分组(ownerGroupId>0):直建口子不出现(完整分组管理归「分组管理」页)', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3)])
|
||||
const wrapper = mount(JdCategoryManageDialog, {
|
||||
global: { plugins: [pinia] },
|
||||
props: { visible: true, ownerGroupId: GROUP_A, ownerGroupName: '甲组', editable: true, platformSuperAdmin: true },
|
||||
})
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false)
|
||||
expect(wrapper.find('.group-bootstrap').exists()).toBe(false, '有组时直建表单整体不渲染')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -18,8 +18,9 @@
|
||||
* 跑法:`npx vitest run tests/mount/jd-database-page.mount.test.ts`
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import JdDatabasePage from '@/pages/jd/JdDatabasePage.vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
@@ -44,7 +45,12 @@ const jdApi = vi.hoisted(() => ({
|
||||
|
||||
const confirmMock = vi.hoisted(() => vi.fn())
|
||||
|
||||
const groupApi = vi.hoisted(() => ({
|
||||
createShopGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/pages/jd/jd-product-api.ts', () => jdApi)
|
||||
vi.mock('@/pages/account/shop-group-api.ts', () => groupApi)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
|
||||
function item(id: number, over: Record<string, unknown> = {}) {
|
||||
@@ -102,17 +108,50 @@ beforeEach(() => {
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue(singleGroupScope())
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([])
|
||||
jdApi.fetchJdProductCategories.mockResolvedValue([])
|
||||
groupApi.createShopGroup.mockResolvedValue({ id: 21, name: '京东-团队', ownerGroupId: 21, sortOrder: 0, productCount: 0 })
|
||||
confirmMock.mockResolvedValue(true)
|
||||
})
|
||||
|
||||
async function mountWith(payload: unknown): Promise<VueWrapper<Element>> {
|
||||
jdApi.fetchJdProductList.mockImplementation(() => Promise.resolve(payload))
|
||||
const wrapper = mount(JdDatabasePage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(JdDatabasePage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
// ---------------- el-select 交互助手(2026-11-17 两颗下拉换 el-select,与亚马逊面统一) ----------------
|
||||
// aria-label 经 EP 的 ariaLabel prop 落在内层 combobox input 上;选项弹层 teleport 到 body,
|
||||
// 但 ElOption/ElSelect 组件仍在挂载树里 ⇒ 选项清单走组件树读,点选走「点开→点选项」真实路径。
|
||||
|
||||
/** 按 aria-label 找对应的 ElSelect 组件实例(页面有两颗下拉,靠内层 input 的 aria-label 区分)。 */
|
||||
function selectByLabel(wrapper: VueWrapper<Element>, label: string) {
|
||||
const found = wrapper.findAllComponents(ElSelect).find((s) => s.find(`[aria-label="${label}"]`).exists())
|
||||
expect(found, `应存在 aria-label="${label}" 的下拉`).toBeTruthy()
|
||||
return found!
|
||||
}
|
||||
|
||||
/** 读某颗下拉的全部选项文案(label prop;组件树查询不受弹层 teleport 影响)。 */
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
/** 点开指定下拉并点选目标文案的选项(触发 update:modelValue + change,与真实用户一致)。
|
||||
* 面板按内层 input 的 aria-controls 圈定,避免另一颗(可能仍挂着的)弹层串台。 */
|
||||
async function pickSelectOption(wrapper: VueWrapper<Element>, label: string, optionText: string): Promise<void> {
|
||||
const input = wrapper.get(`[aria-label="${label}"]`)
|
||||
await input.trigger('click')
|
||||
await flushPromises()
|
||||
const contentId = input.attributes('aria-controls')
|
||||
const scope = (contentId && document.getElementById(contentId)) ?? document.body
|
||||
const items = [...scope.querySelectorAll('.el-select-dropdown__item')]
|
||||
.filter((el) => !el.classList.contains('is-hidden'))
|
||||
const target = items.find((el) => (el.textContent ?? '').trim() === optionText)
|
||||
expect(target, `下拉应弹出「${optionText}」选项`).toBeTruthy()
|
||||
await new DOMWrapper(target as Element).trigger('click')
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
/** 批量编辑分类(2026-11-17 用户口径「店铺分类弹窗删了,加个批量编辑分类」):
|
||||
* 勾选跨页累计记忆(翻页/重取不清)→ 对话框选目标分类归入或移出 → 按 (ids, groupId,
|
||||
* ownerGroupId) 提交;成功后清勾选并重取。旧弹窗的「勾选翻页即清」口径同日废止。 */
|
||||
@@ -121,20 +160,20 @@ describe('批量编辑分类(店铺分类弹窗 2026-11-17 下线后的替代
|
||||
jdApi.fetchJdProductList
|
||||
.mockImplementationOnce(() => Promise.resolve({ items: [item(1)], total: 40, page: 1, pageSize: 20 }))
|
||||
.mockImplementation(() => Promise.resolve({ items: [item(2)], total: 40, page: 2, pageSize: 20 }))
|
||||
const wrapper = mount(JdDatabasePage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(JdDatabasePage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
const deleteBtn = () => wrapper.get('.jd-delete-btn')
|
||||
|
||||
await wrapper.findAll('tbody input[type="checkbox"]')[0].setValue(true)
|
||||
expect(deleteBtn().text()).toContain('删除勾选(1)')
|
||||
expect(deleteBtn().text()).toContain('批量删除(1)')
|
||||
|
||||
// 翻页:勾选不清(2026-11-17 口径「支持勾选翻页也要记住」)。
|
||||
await wrapper.findAll('button').find((b) => b.text() === '下一页')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect(deleteBtn().text()).toContain('删除勾选(1)', '翻页后第 1 页的勾选仍在累计集里')
|
||||
expect(deleteBtn().text()).toContain('批量删除(1)', '翻页后第 1 页的勾选仍在累计集里')
|
||||
await wrapper.findAll('tbody input[type="checkbox"]')[0].setValue(true)
|
||||
expect(deleteBtn().text()).toContain('删除勾选(2)', '第 2 页再勾 1 行,累计 2 行')
|
||||
expect(deleteBtn().text()).toContain('批量删除(2)', '第 2 页再勾 1 行,累计 2 行')
|
||||
expect(wrapper.findAll('button').some((b) => b.text() === '清除勾选')).toBe(false,
|
||||
'「清除勾选」按钮 2026-11-17 用户口径删除(显式反悔口没了,勾选只在批量操作成功后自动清)')
|
||||
|
||||
@@ -143,10 +182,10 @@ describe('批量编辑分类(店铺分类弹窗 2026-11-17 下线后的替代
|
||||
await deleteBtn().trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(confirmMock.mock.calls.at(-1)![0].message).toContain('确定删除勾选的 2 个商品吗', '确认文案点名累计总数')
|
||||
expect(confirmMock.mock.calls.at(-1)![0].message).toContain('确定批量删除选中的 2 个商品吗', '确认文案点名累计总数')
|
||||
// 跨页累计的 id 一起提交。
|
||||
expect(jdApi.deleteJdProducts).toHaveBeenLastCalledWith([1, 2])
|
||||
expect(deleteBtn().text()).toContain('删除勾选(0)', '批量删除成功后自动清勾选')
|
||||
expect(deleteBtn().text()).toContain('批量删除(0)', '批量删除成功后自动清勾选')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
@@ -159,7 +198,7 @@ describe('批量编辑分类(店铺分类弹窗 2026-11-17 下线后的替代
|
||||
const wrapper = await mountWith({ items: [item(1), item(2)], total: 2, page: 1, pageSize: 20 })
|
||||
const editBtn = () => wrapper.findAll('button').find((b) => b.text() === '批量编辑分类')!
|
||||
|
||||
expect(editBtn().attributes('disabled')).toBeDefined('勾选 0 时置灰(与删除勾选同款常显口径)')
|
||||
expect(editBtn().attributes('disabled')).toBeDefined('勾选 0 时置灰(与批量删除同款常显口径)')
|
||||
const boxes = wrapper.findAll('tbody input[type="checkbox"]')
|
||||
await boxes[0].setValue(true)
|
||||
await boxes[1].setValue(true)
|
||||
@@ -183,7 +222,7 @@ describe('批量编辑分类(店铺分类弹窗 2026-11-17 下线后的替代
|
||||
expect(document.body.textContent).toContain('已把 2 个商品归入「甲组」')
|
||||
expect(wrapper.find('.batch-modal').exists()).toBe(false, '成功后对话框自动关闭')
|
||||
expect(jdApi.fetchJdProductList.mock.calls.length).toBeGreaterThan(callsBefore, '成功后重取列表(groupName 变了)')
|
||||
expect(wrapper.get('.jd-delete-btn').text()).toContain('删除勾选(0)', '成功后清勾选')
|
||||
expect(wrapper.get('.jd-delete-btn').text()).toContain('批量删除(0)', '成功后清勾选')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
@@ -229,6 +268,34 @@ describe('批量编辑分类(店铺分类弹窗 2026-11-17 下线后的替代
|
||||
})
|
||||
})
|
||||
|
||||
/** 分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」+同日收敛
|
||||
* 「不需要全部分类 默认卡在未分类上就行」):工具栏「筛选分类状态」下拉只有两档
|
||||
* (已分类/未分类),出厂默认与「重置」都卡未分类;选中即查重回第一页;
|
||||
* 页面发的是筛选态字符串(classified/ungrouped),布尔换算收在 jd-product-filter 单一出口
|
||||
* (纯测试钉形状)。 */
|
||||
describe('分类状态快筛(两档,默认卡未分类)', () => {
|
||||
it('下拉只有两档且首屏就卡「未分类」(classified="ungrouped" 随首取下发)', async () => {
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
expect(optionLabels(wrapper, '筛选分类状态')).toEqual(['已分类', '未分类'])
|
||||
expect(jdApi.fetchJdProductList.mock.calls[0][0].classified).toBe('ungrouped',
|
||||
'首屏默认档=未分类——用户口径「默认卡在未分类上就行」')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('选「已分类」下发 classified 态;「重置」不放开筛选,而是回默认未分类档', async () => {
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
await pickSelectOption(wrapper, '筛选分类状态', '已分类')
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0].classified).toBe('classified')
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0]).toMatchObject({ page: 1 }, '选中即查回第一页')
|
||||
|
||||
await wrapper.findAll('button').find((b) => b.text() === '重置')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0].classified).toBe('ungrouped',
|
||||
'重置回出厂默认档(未分类),界面没有「全部」这一档可回')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
/** 分类管理入口(2026-11-17 用户口径「京东分类管理并到京东数据库分类编辑里」):
|
||||
* V204 独立子菜单页下线,工具栏「分类管理」打开 JdCategoryManageDialog(搜索+新建+
|
||||
* 改名+删除);入口对所有人渲染(同组普通号只读可看),写控件由对话框按 editable 分档;
|
||||
@@ -246,7 +313,7 @@ describe('分类管理入口(V204 独立页并入京东数据库页)', () =>
|
||||
await flushPromises()
|
||||
const modal = wrapper.get('.manage-modal')
|
||||
expect(modal.text()).toContain('分类管理')
|
||||
expect(modal.text()).toContain('甲组', '标题带当前分组名')
|
||||
expect(modal.text()).not.toContain('甲组', '标题不带分组名后缀(ea9dca3f 用户口径「不要显示周丽娥」)')
|
||||
expect(modal.get('.search-input').exists()).toBe(true, '搜索框是本对话框新能力')
|
||||
expect(modal.text()).toContain('裙装')
|
||||
expect(jdApi.fetchJdProductGroups.mock.calls.length).toBeGreaterThan(callsBefore,
|
||||
@@ -264,7 +331,7 @@ describe('分类管理入口(V204 独立页并入京东数据库页)', () =>
|
||||
: Promise.resolve([{ id: 8, name: '裤装', sortOrder: 1, productCount: 1 }])
|
||||
})
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
expect(wrapper.get('[aria-label="筛选店铺分类"]').text()).toContain('裙装', '首屏下拉含首取分类')
|
||||
expect(optionLabels(wrapper, '筛选店铺分类')).toContain('裙装', '首屏下拉含首取分类')
|
||||
|
||||
await wrapper.findAll('button').find((b) => b.text() === '分类管理')!.trigger('click')
|
||||
await flushPromises()
|
||||
@@ -276,9 +343,57 @@ describe('分类管理入口(V204 独立页并入京东数据库页)', () =>
|
||||
await flushPromises()
|
||||
expect(jdApi.deleteJdProductGroup, '删除按钮属于当前列表行').toHaveBeenCalledWith(8)
|
||||
// changed → 父页 loadGroupOptions:下拉按新列表重取(最后一次调用拿到删后列表)。
|
||||
const select = wrapper.get('[aria-label="筛选店铺分类"]')
|
||||
expect(select.text()).toContain('裤装', '下拉刷新出新一轮分类')
|
||||
expect(select.text()).not.toContain('裙装', '删掉的分类不再出现在筛选下拉')
|
||||
expect(optionLabels(wrapper, '筛选店铺分类')).toContain('裤装', '下拉刷新出新一轮分类')
|
||||
expect(optionLabels(wrapper, '筛选店铺分类')).not.toContain('裙装', '删掉的分类不再出现在筛选下拉')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
/** 平台超管空态直建分组(2026-11-17 用户口径「admin 权限最大」):京东侧还没有任何
|
||||
* 数据权限分组时,分类管理弹窗给平台超管开直建口子;建完 group-created ⇒ 父页整条
|
||||
* 作用域重取,当前分组翻到新组、分类下拉与弹窗列表随新组走——从「死路」到「接着建
|
||||
* 分类」一气呵成。scope.platformSuperAdmin 是这条链的唯一开关,非超管维持空态文案。 */
|
||||
describe('平台超管空态直建分组(页面级链路)', () => {
|
||||
it('超管 + 京东侧零分组:弹窗出直建表单,建组走 POST(jd 档) 且作用域重取翻到新组', async () => {
|
||||
let scopeFetchCount = 0
|
||||
jdApi.fetchJdCategoryScope.mockImplementation(() => {
|
||||
scopeFetchCount += 1
|
||||
return scopeFetchCount === 1
|
||||
? Promise.resolve({ platformSuperAdmin: true, defaultGroupId: null, groups: [] })
|
||||
: Promise.resolve({
|
||||
platformSuperAdmin: true,
|
||||
defaultGroupId: 21,
|
||||
groups: [{ id: 21, name: '京东-团队', label: '京东-团队', editable: true }],
|
||||
})
|
||||
})
|
||||
const wrapper = await mountWith({ items: [item(1, { groupId: null, groupName: '' })], total: 1, page: 1, pageSize: 20 })
|
||||
await wrapper.findAll('button').find((b) => b.text() === '分类管理')!.trigger('click')
|
||||
await flushPromises()
|
||||
const modal = wrapper.get('.manage-modal')
|
||||
expect(modal.get('[aria-label="新分组名称"]').exists()).toBe(true, '超管空态不是死路文案')
|
||||
|
||||
await modal.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await modal.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(groupApi.createShopGroup).toHaveBeenCalledWith('京东-团队', [], 1, 'jd')
|
||||
expect(jdApi.fetchJdCategoryScope).toHaveBeenCalledTimes(2, 'group-created ⇒ 父页整条作用域重取')
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenLastCalledWith(21)
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false, '有组了直建口子关掉')
|
||||
expect(wrapper.get('.manage-modal').text()).toContain('本组暂无分类,先新建一个', '接着就能建分类')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('非超管 + 京东侧零分组:弹窗维持空态文案,无直建表单(口子不开给组长/公司超管)', async () => {
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue({ platformSuperAdmin: false, defaultGroupId: null, groups: [] })
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
await wrapper.findAll('button').find((b) => b.text() === '分类管理')!.trigger('click')
|
||||
await flushPromises()
|
||||
const modal = wrapper.get('.manage-modal')
|
||||
expect(modal.text()).toContain('你还不属于任何数据权限分组')
|
||||
expect(modal.find('[aria-label="新分组名称"]').exists()).toBe(false)
|
||||
expect(groupApi.createShopGroup).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
@@ -293,7 +408,8 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
// 公司维度 2026-11-16 整页摘除:入参层不再有 companyId 键(单参 toHaveProperty 才是「键不存在」的真判据)。
|
||||
expect(firstCall).not.toHaveProperty('companyId')
|
||||
expect(wrapper.findAll('tbody tr')).toHaveLength(3)
|
||||
expect(wrapper.find('.jd-summary').text()).toContain('共 42 条京东商品')
|
||||
// 汇总条(共 X 条京东商品)2026-11-17 用户口径删除:不再渲染(反钉)。
|
||||
expect(wrapper.find('.jd-summary').exists()).toBe(false, '汇总条已按 2026-11-17 用户口径删除')
|
||||
})
|
||||
|
||||
it('行列字段与顺序(2026-11-15 用户口径;状态列+创建/修改两列 2026-11-16 客户口径「不需要采集/不要」下线仍收详情抽屉;操作置末「操作放最后一列」):勾选/分组/商品信息(图+标题+编码+货号+品牌·类目+SKU/信息分)/总库存/价格/同步/操作(7 列;店铺列 2026-11-15 下线)', async () => {
|
||||
@@ -418,7 +534,7 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
expect(textInputs).toHaveLength(2, '商品编码+标题关键字两个文本筛选框(店铺/商品状态已下线)')
|
||||
await textInputs[0].setValue('JD-1001')
|
||||
await textInputs[1].setValue('保温杯')
|
||||
await wrapper.get('[aria-label="筛选店铺分类"]').setValue('7')
|
||||
await pickSelectOption(wrapper, '筛选店铺分类', '甲组')
|
||||
const dateInputs = wrapper.findAll('input[type="date"]')
|
||||
await dateInputs[0].setValue('2026-11-01')
|
||||
await dateInputs[1].setValue('2026-11-09')
|
||||
@@ -541,9 +657,8 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
it('重置把筛选面回空并回第一页重取', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([{ id: 7, name: '甲组', sortOrder: 0, productCount: 1 }])
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 20 })
|
||||
const select = wrapper.get('[aria-label="筛选店铺分类"]')
|
||||
expect(select.text()).toContain('全部分类')
|
||||
await select.setValue('7')
|
||||
expect(optionLabels(wrapper, '筛选店铺分类')[0]).toBe('全部分类', '「全部分类」常驻列表首位(与旧原生下拉同语义)')
|
||||
await pickSelectOption(wrapper, '筛选店铺分类', '甲组')
|
||||
await wrapper.get('.cat-trigger').trigger('click')
|
||||
await wrapper.get('.cat-search').setValue('艺考')
|
||||
await wrapper.get('.cat-col-search .cat-row').trigger('click')
|
||||
@@ -558,7 +673,7 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
expect(jdApi.fetchJdProductList.mock.calls.length).toBeGreaterThan(callsBefore)
|
||||
const last = jdApi.fetchJdProductList.mock.calls.at(-1)![0]
|
||||
expect(last).toMatchObject({ productCode: '', titleKeyword: '', groupId: '', category: '', page: 1 }, '重置后筛选全空、回第一页')
|
||||
expect((select.element as HTMLSelectElement).value).toBe('')
|
||||
expect(selectByLabel(wrapper, '筛选店铺分类').props('modelValue')).toBe('', '重置后分类筛选回「全部分类」')
|
||||
})
|
||||
|
||||
it('翻页与改每页条数都重发请求,改条数回第一页', async () => {
|
||||
@@ -569,8 +684,10 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
expect(jdApi.fetchJdProductList).toHaveBeenCalledTimes(2)
|
||||
expect(jdApi.fetchJdProductList.mock.calls[1][0].page).toBe(3)
|
||||
|
||||
const sizeSelect = wrapper.find('.page-size-select')
|
||||
await sizeSelect.setValue('50')
|
||||
// 每页条数下拉 2026-11-17 随分页条一起换 el-select(OldPagination 内局部注册):
|
||||
// 点开→点选项,不再走原生 setValue。
|
||||
expect(wrapper.find('.page-size-select').exists()).toBe(true, '分页条下拉保留 .page-size-select 定位类')
|
||||
await pickSelectOption(wrapper, '每页条数', '50条/页')
|
||||
await flushPromises()
|
||||
const last = jdApi.fetchJdProductList.mock.calls.at(-1)![0]
|
||||
expect(last.pageSize).toBe(50)
|
||||
@@ -683,7 +800,7 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
const wrapper = await mountWith({ items: [item(1), item(2)], total: 2, page: 1, pageSize: 20 })
|
||||
|
||||
// 批量删除常显(2026-11-16 客户口径「不要勾选后才显示」):未勾选时就在,只是置灰。
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(true, '工具栏「删除勾选」常显')
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(true, '「批量删除」常显')
|
||||
expect(wrapper.find('.jd-delete-btn').attributes('disabled')).toBeDefined()
|
||||
const boxes = wrapper.findAll('tbody input[type="checkbox"]')
|
||||
await boxes[0].setValue(true)
|
||||
@@ -696,7 +813,7 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
expect(confirmMock).toHaveBeenCalledTimes(1)
|
||||
const options = confirmMock.mock.calls[0][0]
|
||||
expect(options.title).toBe('删除京东商品')
|
||||
expect(options.message).toContain('确定删除勾选的 2 个商品吗')
|
||||
expect(options.message).toContain('确定批量删除选中的 2 个商品吗')
|
||||
expect(options.message).toContain('jd-products 桶内图片文件一并删除', '确认弹窗必须点名「桶文件也会删」')
|
||||
expect(options.danger).toBe(true)
|
||||
|
||||
@@ -750,15 +867,15 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
})
|
||||
})
|
||||
|
||||
/** 写权限分档(2026-11-16 用户口径收窄商品行写;2026-11-17 弹窗下线后更新):
|
||||
* 商品行写(编辑/删除/勾选批量删)只对平台超管渲染;分类写(批量编辑分类、分类管理)由
|
||||
* scope 的每组 editable 决定(本组管理员/公司超管/平台超管)——同组普通号在本页只读,
|
||||
* 分类维护入口=工具栏「分类管理」对话框(V204 独立页 2026-11-17 并入,只读可看)。
|
||||
* 勾选列 2026-11-17 起对本组可写分类管理员开放(服务批量归类),商品行按钮仍只归平台超管。 */
|
||||
describe('京东数据库写权限分档(商品行写=平台超管;分类写=本组 editable)', () => {
|
||||
it('非超管且本组不可写:无勾选列、无操作列、无删除勾选、无批量编辑分类;列表/筛选/详情照常', async () => {
|
||||
useAdminSessionStore().user = { id: 2, username: 'ops', role: 'admin' }
|
||||
// 同组普通号:可见但不可写(editable=false)。
|
||||
/** 写权限分档(2026-11-17 用户口径「超管+管理员都可以,只有普通员工不能操作」,推翻
|
||||
* 2026-11-16 的平台超管单档):商品行写(编辑/删除/勾选批量删)对管理员级(超管/admin 档)
|
||||
* 渲染,普通账号只读;分类写(批量编辑分类、分类管理)由 scope 的每组 editable 决定
|
||||
* (本组管理员/公司超管/平台超管)。同日口径「超管可以有分组筛选,管理员及以下则没有」:
|
||||
* 筛选行「分组」控件整块只对超管档(超级管理员/公司超级管理员)渲染。 */
|
||||
describe('京东数据库写权限分档(商品行写=超管+管理员;分组筛选=超管档;分类写=本组 editable)', () => {
|
||||
it('普通员工且本组不可写:无勾选列、无操作列、无批量删除、无批量编辑分类、无分组控件;列表/筛选/详情照常', async () => {
|
||||
useAdminSessionStore().user = { id: 2, username: 'ops', role: 'normal' }
|
||||
// 普通员工:可见但不可写(editable=false)。
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue(singleGroupScope(false))
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([{ id: 7, name: '甲组', sortOrder: 0, productCount: 1 }])
|
||||
jdApi.fetchJdProductDetail.mockImplementation(() =>
|
||||
@@ -766,18 +883,21 @@ describe('京东数据库写权限分档(商品行写=平台超管;分类
|
||||
)
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
|
||||
expect(wrapper.findAll('tbody input[type="checkbox"]')).toHaveLength(0, '不可写分类的普通号没有勾选列')
|
||||
expect(wrapper.findAll('tbody input[type="checkbox"]')).toHaveLength(0, '不可写分类的普通员工没有勾选列')
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(false, '批量删除按钮不渲染')
|
||||
expect(wrapper.findAll('button').some((b) => b.text() === '批量编辑分类')).toBe(false, '分类写入口不渲染(本组不可写)')
|
||||
expect(wrapper.findAll('button').some((b) => b.text() === '分类管理')).toBe(true,
|
||||
'分类管理入口是读面,普通号也能打开看(写控件由对话框按 editable 分档)')
|
||||
'分类管理入口是读面,普通员工也能打开看(写控件由对话框按 editable 分档)')
|
||||
expect(wrapper.find('thead').text()).not.toContain('操作', '操作列(编辑/删除)不渲染')
|
||||
expect(wrapper.text()).toContain('只读:编辑/删除仅超级管理员可用', '只读提示必须看得见并区分两类写权限')
|
||||
expect(wrapper.text()).toContain('只读:编辑/删除需超级管理员或管理员', '只读提示必须看得见并区分两类写权限')
|
||||
expect(wrapper.text()).toContain('分类在本页「分类管理」查看与维护', '提示把分类维护入口指向本页「分类管理」(独立页已并入)')
|
||||
// 分组筛选=超管档专属(2026-11-17 口径):普通员工连单组锁定芯片都不出。
|
||||
expect(wrapper.find('[aria-label="当前分组"]').exists()).toBe(false, '普通员工不出分组下拉')
|
||||
expect(wrapper.find('.jd-group-locked').exists()).toBe(false, '普通员工不出分组锁定芯片')
|
||||
|
||||
// 读面不受影响:筛选下拉、列表行、点行开详情都还在。
|
||||
expect(wrapper.get('[aria-label="筛选店铺分类"]').exists()).toBe(true, '分类筛选是读面,保留')
|
||||
expect(wrapper.findAll('tbody tr')[0].findAll('td')).toHaveLength(5, '普通号列表 5 列:分类/商品信息/总库存/价格/同步时间')
|
||||
expect(wrapper.findAll('tbody tr')[0].findAll('td')).toHaveLength(5, '普通员工列表 5 列:分类/商品信息/总库存/价格/同步时间')
|
||||
await wrapper.findAll('tbody tr')[0].trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
@@ -786,7 +906,7 @@ describe('京东数据库写权限分档(商品行写=平台超管;分类
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('超管保留全部写入口(勾选列+操作列+删除勾选+批量编辑分类),且不显示只读提示', async () => {
|
||||
it('超管保留全部写入口(勾选列+操作列+批量删除+批量编辑分类),且不显示只读提示', async () => {
|
||||
// beforeEach 默认 super_admin;这里显式再钉一次,防默认值漂移把这条闸门变成恒绿。
|
||||
useAdminSessionStore().user = { id: 1, username: 'root', role: 'super_admin' }
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
@@ -796,18 +916,35 @@ describe('京东数据库写权限分档(商品行写=平台超管;分类
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(true)
|
||||
expect(wrapper.findAll('button').some((b) => b.text() === '批量编辑分类')).toBe(true)
|
||||
expect(wrapper.text()).not.toContain('只读:')
|
||||
expect(wrapper.find('.jd-group-locked').exists()).toBe(true, '超管档保留分组控件(单组=锁定芯片)')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('本组管理员(非平台超管):商品行按钮仍无,但勾选列随批量编辑分类放开(6 列形状)', async () => {
|
||||
it('公司超级管理员属超管档:写入口齐+分组控件在(单组=锁定芯片)', async () => {
|
||||
useAdminSessionStore().user = { id: 4, username: 'company-root', role: 'company_super_admin' }
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
|
||||
expect(wrapper.findAll('tbody input[type="checkbox"]')).toHaveLength(1)
|
||||
expect(wrapper.findAll('tbody tr')[0].findAll('td')).toHaveLength(7, '公司超管 7 列:含操作列')
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(true, '批量删除对公司超管渲染')
|
||||
expect(wrapper.text()).not.toContain('只读:')
|
||||
expect(wrapper.find('.jd-group-locked').exists()).toBe(true, '公司超管保留分组控件')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('管理员(admin 档):商品行写全放开(7 列+批量删除),分组控件整块不渲染', async () => {
|
||||
useAdminSessionStore().user = { id: 3, username: 'leader', role: 'admin' }
|
||||
// 组长档形状:可见组可写 ⇒ editable=true;商品行写仍按 isSuperAdmin 判(不受 editable 影响)。
|
||||
// 组长档形状:可见组可写 ⇒ editable=true;商品行写按管理员档判(2026-11-17 口径)。
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue(singleGroupScope(true))
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([{ id: 7, name: '甲组', sortOrder: 0, productCount: 1 }])
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
expect(wrapper.findAll('tbody tr')[0].findAll('td')).toHaveLength(6, '管理员 6 列:勾选/分类/商品信息/总库存/价格/同步时间(无操作列)')
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(false, '批量删除(商品行写)仍只归平台超管')
|
||||
expect(wrapper.find('thead').text()).not.toContain('操作')
|
||||
expect(wrapper.findAll('tbody tr')[0].findAll('td')).toHaveLength(7, '管理员 7 列:勾选/分类/商品信息/总库存/价格/同步/操作')
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(true, '批量删除(商品行写)对管理员渲染')
|
||||
expect(wrapper.find('thead').text()).toContain('操作', '操作列(编辑/删除)对管理员渲染')
|
||||
expect(wrapper.text()).not.toContain('只读:')
|
||||
// 分组筛选=超管档专属:管理员即使本组可写分类,也不出下拉/锁定芯片。
|
||||
expect(wrapper.find('[aria-label="当前分组"]').exists()).toBe(false, '管理员不出分组下拉')
|
||||
expect(wrapper.find('.jd-group-locked').exists()).toBe(false, '管理员不出分组锁定芯片')
|
||||
const editBtn = wrapper.findAll('button').find((b) => b.text() === '批量编辑分类')
|
||||
expect(editBtn, '本组管理员有批量编辑分类入口').toBeTruthy()
|
||||
|
||||
@@ -825,6 +962,48 @@ describe('京东数据库写权限分档(商品行写=平台超管;分类
|
||||
expect(jdApi.batchAssignJdProductGroup).toHaveBeenCalledWith([1], 7, GROUP_A)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('管理员多组可见也不出「分组」下拉(超管档专属),写入口与默认组取数照常', async () => {
|
||||
useAdminSessionStore().user = { id: 3, username: 'leader', role: 'admin' }
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue({
|
||||
platformSuperAdmin: false,
|
||||
defaultGroupId: 11,
|
||||
groups: [
|
||||
{ id: 11, name: 'A组', label: '甲公司 / A组', editable: true },
|
||||
{ id: 12, name: 'B组', label: '甲公司 / B组', editable: false },
|
||||
],
|
||||
})
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
|
||||
// 多组对管理员也不渲染切换下拉(作用域静默落在默认组)。
|
||||
expect(wrapper.find('[aria-label="当前分组"]').exists()).toBe(false, '多组也不给管理员出分组下拉')
|
||||
// 写入口不受影响:操作列+批量删除都在,列表按默认组取。
|
||||
expect(wrapper.find('thead').text()).toContain('操作')
|
||||
expect(wrapper.find('.jd-delete-btn').exists()).toBe(true)
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenCalledWith(11)
|
||||
expect(jdApi.fetchJdProductList.mock.calls[0][0]).toMatchObject({ ownerGroupId: 11 })
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('公司超级管理员多组可见:分组下拉在(超管档专属),可切组取数', async () => {
|
||||
useAdminSessionStore().user = { id: 4, username: 'company-root', role: 'company_super_admin' }
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue({
|
||||
platformSuperAdmin: false,
|
||||
defaultGroupId: 11,
|
||||
groups: [
|
||||
{ id: 11, name: 'A组', label: '甲公司 / A组', editable: true },
|
||||
{ id: 12, name: 'B组', label: '甲公司 / B组', editable: true },
|
||||
],
|
||||
})
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
|
||||
expect(wrapper.find('[aria-label="当前分组"]').exists()).toBe(true, '公司超管保留分组下拉')
|
||||
await pickSelectOption(wrapper, '当前分组', '甲公司 / B组')
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenLastCalledWith(12)
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0]).toMatchObject({ ownerGroupId: 12, page: 1 })
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
describe('京东数据库分类按数据权限分组隔离(V203)', () => {
|
||||
@@ -845,12 +1024,12 @@ describe('京东数据库分类按数据权限分组隔离(V203)', () => {
|
||||
const picker = wrapper.get('[aria-label="当前分组"]')
|
||||
// 2026-11-16 用户口径「做成分组」:分组在筛选行里是带标签的表单控件(与其他筛选同壳同圆角),
|
||||
// 不再是工具栏裸下拉——钉住形状,防止搬回工具栏或丢标签。
|
||||
const groupField = (picker.element as HTMLSelectElement).closest('.form-group')
|
||||
const groupField = picker.element.closest('.form-group')
|
||||
expect(groupField?.querySelector('label')?.textContent).toBe('分组')
|
||||
expect(picker.findAll('option').map((o) => o.text())).toEqual(['甲公司 / A组', '甲公司 / B组'],
|
||||
expect(optionLabels(wrapper, '当前分组')).toEqual(['甲公司 / A组', '甲公司 / B组'],
|
||||
'跨公司组名由后端拼进 label,前端不解析公司字段')
|
||||
|
||||
await picker.setValue('12')
|
||||
await pickSelectOption(wrapper, '当前分组', '甲公司 / B组')
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenLastCalledWith(12)
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0]).toMatchObject({ ownerGroupId: 12, page: 1 },
|
||||
@@ -876,13 +1055,12 @@ describe('京东数据库分类按数据权限分组隔离(V203)', () => {
|
||||
],
|
||||
})
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 20 })
|
||||
const picker = wrapper.get('[aria-label="当前分组"]')
|
||||
await picker.setValue('12')
|
||||
await pickSelectOption(wrapper, '当前分组', '甲公司 / B组')
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0]).toMatchObject({ ownerGroupId: 12 })
|
||||
await wrapper.findAll('button').find((b) => b.text() === '重置')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect((picker.element as HTMLSelectElement).value).toBe('12', '重置不清当前分组(作用域语义,搬进筛选行也不变)')
|
||||
expect(selectByLabel(wrapper, '当前分组').props('modelValue')).toBe(12, '重置不清当前分组(作用域语义,搬进筛选行也不变)')
|
||||
expect(jdApi.fetchJdProductList.mock.calls.at(-1)![0]).toMatchObject({ ownerGroupId: 12 },
|
||||
'重置后的重取仍带当前分组')
|
||||
wrapper.unmount()
|
||||
@@ -893,7 +1071,7 @@ describe('京东数据库分类按数据权限分组隔离(V203)', () => {
|
||||
const wrapper = await mountWith({ items: [item(1, { groupId: null, groupName: '' })], total: 1, page: 1, pageSize: 20 })
|
||||
expect(wrapper.find('[aria-label="当前分组"]').exists()).toBe(false)
|
||||
expect(wrapper.find('.jd-group-locked').exists()).toBe(false, '没有分组就没有可锁定的组名')
|
||||
expect(wrapper.find('[aria-label="筛选店铺分类"]').text()).toContain('全部分类', '分类筛选只剩「全部分类」')
|
||||
expect(optionLabels(wrapper, '筛选店铺分类')).toEqual(['全部分类'], '分类筛选只剩「全部分类」')
|
||||
expect(wrapper.findAll('tbody tr')[0].findAll('td')[1].text()).toBe('未分类')
|
||||
expect(wrapper.findAll('button').some((b) => b.text() === '批量编辑分类')).toBe(false, '没有分组就没有可写的分类面')
|
||||
expect(jdApi.batchAssignJdProductGroup).not.toHaveBeenCalled()
|
||||
|
||||
@@ -0,0 +1,215 @@
|
||||
/**
|
||||
* 日志管理页 / 生成记录页的原生 <select> → el-select(2026-11-17 用户口径「和亚马逊不统一」:
|
||||
* 原生 select 的弹层是浏览器直角原生物 ⇒ 换 EP 圆角弹层,外壳走全局 .admin-filter)。
|
||||
*
|
||||
* 这里钉住换壳时最容易错的两件事:
|
||||
* 1. **值形状逐字不变**——「全部来源」/「全部用户」空行仍是 ''、用户仍是 String(id)、
|
||||
* 终端仍是 `${source}|${deviceId}`、模式仍是 'full'/'selected' 常量(后端按这些字符串解析,
|
||||
* 形状一动就错单,而界面上看起来只是"选了个下拉");
|
||||
* 2. **选中 → 落参的链路仍只有一处**——来源 source、用户 Number(uid)、终端 '|' 切分与 mode 常量。
|
||||
*
|
||||
* aria-label 经 EP 的 ariaLabel prop 落在内层 combobox input 上,选项清单走组件树读
|
||||
* (弹层 teleport 到 body),点选走「点开→点选项」真实路径。
|
||||
* 不用 readFileSync(source-pin-ratchet 对台账外新文件带读点即红),全部走真实挂载断言。
|
||||
*
|
||||
* 跑法:`npx vitest run tests/mount/records-select-el.mount.test.ts`
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { defineComponent, h } from 'vue'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import DeviceLogsPage from '@/pages/records/DeviceLogsPage.vue'
|
||||
import RecordsHistoryPage from '@/pages/records/RecordsHistoryPage.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
|
||||
const deviceLogsApi = vi.hoisted(() => ({
|
||||
fetchDeviceLogFiles: vi.fn(),
|
||||
fetchDeviceLogContent: vi.fn(),
|
||||
fetchDeviceLogConfig: vi.fn(),
|
||||
fetchDeviceLogDevices: vi.fn(),
|
||||
deviceLogDownloadUrl: vi.fn((id: number) => `/api/admin/device-logs/${id}/download`),
|
||||
deleteDeviceLogFile: vi.fn(),
|
||||
deleteDeviceLogOverride: vi.fn(),
|
||||
updateDeviceLogGlobalMode: vi.fn(),
|
||||
updateDeviceLogOverride: vi.fn(),
|
||||
}))
|
||||
|
||||
const historyApi = vi.hoisted(() => ({
|
||||
fetchHistoryList: vi.fn(),
|
||||
fetchHistoryUserOptions: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/api/device-logs', () => deviceLogsApi)
|
||||
vi.mock('@/pages/records/history-api.ts', () => historyApi)
|
||||
|
||||
/** 采集配置弹窗(el-dialog)用桩:真实 dialog 把内容 teleport 到 body,wrapper 里就查不到;
|
||||
* 桩只留一层 div 并把默认插槽摊在挂载树里,modelValue 与真实一样控制开关。 */
|
||||
const DialogStub = defineComponent({
|
||||
name: 'ElDialogStub',
|
||||
props: { modelValue: { type: Boolean, default: false } },
|
||||
setup(props, { slots }) {
|
||||
return () => (props.modelValue ? h('div', { class: 'dialog-stub' }, slots.default?.()) : null)
|
||||
},
|
||||
})
|
||||
|
||||
// ---------------- el-select 交互助手(与京东数据库页/亚马逊面同一套口径) ----------------
|
||||
|
||||
/** 按 aria-label 找对应的 ElSelect 组件实例(页面里还有 OldPagination 的「每页条数」,靠 aria-label 区分)。 */
|
||||
function selectByLabel(wrapper: VueWrapper<Element>, label: string) {
|
||||
const found = wrapper.findAllComponents(ElSelect).find((s) => s.find(`[aria-label="${label}"]`).exists())
|
||||
expect(found, `应存在 aria-label="${label}" 的下拉`).toBeTruthy()
|
||||
return found!
|
||||
}
|
||||
|
||||
/** 读某颗下拉的全部选项文案(label prop;组件树查询不受弹层 teleport 影响)。 */
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
/** 读某颗下拉的全部选项 value(形状判据:空串/字符串 id/`source|deviceId`/mode 常量)。 */
|
||||
function optionValues(wrapper: VueWrapper<Element>, label: string): unknown[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('value'))
|
||||
}
|
||||
|
||||
/** 点开指定下拉并点选目标文案的选项(触发 update:modelValue + change,与真实用户一致)。
|
||||
* 面板按内层 input 的 aria-controls 圈定,避免另一颗(可能仍挂着的)弹层串台。 */
|
||||
async function pickSelectOption(wrapper: VueWrapper<Element>, label: string, optionText: string): Promise<void> {
|
||||
const input = wrapper.get(`[aria-label="${label}"]`)
|
||||
await input.trigger('click')
|
||||
await flushPromises()
|
||||
const contentId = input.attributes('aria-controls')
|
||||
const scope = (contentId && document.getElementById(contentId)) ?? document.body
|
||||
const items = [...scope.querySelectorAll('.el-select-dropdown__item')].filter((el) => !el.classList.contains('is-hidden'))
|
||||
const target = items.find((el) => (el.textContent ?? '').trim() === optionText)
|
||||
expect(target, `下拉应弹出「${optionText}」选项`).toBeTruthy()
|
||||
await new DOMWrapper(target as Element).trigger('click')
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
/** 按文案点按钮(筛选条上的查询/重置、弹窗里的添加/更新覆盖)。 */
|
||||
async function clickButton(wrapper: VueWrapper<Element>, text: string): Promise<void> {
|
||||
const button = wrapper.findAll('button').find((b) => b.text().trim() === text)
|
||||
expect(button, `应存在「${text}」按钮`).toBeTruthy()
|
||||
await button!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
/** 最近一次调用的入参(首屏 + 公司 tab watch 可能各发一次,判"选完落什么参"只认最后一次)。 */
|
||||
function lastArgs(fn: { mock: { calls: unknown[][] } }): Record<string, unknown> {
|
||||
const calls = fn.mock.calls
|
||||
expect(calls.length, '接口应至少被调用一次').toBeGreaterThan(0)
|
||||
return calls[calls.length - 1][0] as Record<string, unknown>
|
||||
}
|
||||
|
||||
const USERS = [
|
||||
{ id: 7, username: '张三' },
|
||||
{ id: 8, username: '李四' },
|
||||
]
|
||||
|
||||
let pinia: Pinia
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
pinia = createPinia()
|
||||
setActivePinia(pinia)
|
||||
useAdminSessionStore().user = { id: 1, username: 'root', role: 'super_admin' }
|
||||
historyApi.fetchHistoryUserOptions.mockResolvedValue(USERS)
|
||||
})
|
||||
|
||||
async function mountDeviceLogs(): Promise<VueWrapper<Element>> {
|
||||
deviceLogsApi.fetchDeviceLogFiles.mockResolvedValue({ items: [], total: 0, page: 1, pageSize: 15, retentionDays: 7 })
|
||||
deviceLogsApi.fetchDeviceLogConfig.mockResolvedValue({ globalMode: 'full', overrides: [] })
|
||||
deviceLogsApi.fetchDeviceLogDevices.mockResolvedValue([
|
||||
{ source: 'client', deviceId: 'dev-1', deviceName: '工位A', lastUploadAt: null },
|
||||
])
|
||||
const wrapper = mount(DeviceLogsPage, {
|
||||
global: { plugins: [pinia, ElSelect, ElOption], stubs: { ElDialog: DialogStub } },
|
||||
})
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
describe('日志管理页 × el-select', () => {
|
||||
it('筛选条两颗下拉:空行/字符串 id/来源常量逐字不变', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
expect(optionLabels(wrapper, '来源')).toEqual(['全部来源', '桌面客户端', '麦象采集机'])
|
||||
expect(optionValues(wrapper, '来源')).toEqual(['', 'client', 'maixiang'])
|
||||
// 用户清单很长 ⇒ filterable;值仍是 String(id)(下游 `uidFilter.value ? Number(...)` 判空)
|
||||
expect(selectByLabel(wrapper, '指定用户').props('filterable')).toBe(true)
|
||||
expect(optionLabels(wrapper, '指定用户')).toEqual(['全部用户', '张三', '李四'])
|
||||
expect(optionValues(wrapper, '指定用户')).toEqual(['', '7', '8'])
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('选中来源/用户后查询:source 走常量、uid 仍是数字', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
await pickSelectOption(wrapper, '来源', '麦象采集机')
|
||||
await pickSelectOption(wrapper, '指定用户', '李四')
|
||||
await clickButton(wrapper, '查询')
|
||||
const args = lastArgs(deviceLogsApi.fetchDeviceLogFiles)
|
||||
expect(args.source).toBe('maixiang')
|
||||
expect(args.uid).toBe(8)
|
||||
expect(typeof args.uid).toBe('number')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('重置回到空值首行:不发 source、不发 uid(空串的「全部」语义不变)', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
await pickSelectOption(wrapper, '来源', '桌面客户端')
|
||||
await pickSelectOption(wrapper, '指定用户', '张三')
|
||||
await clickButton(wrapper, '重置')
|
||||
const args = lastArgs(deviceLogsApi.fetchDeviceLogFiles)
|
||||
expect(args.source).toBeUndefined()
|
||||
expect(args.uid).toBeUndefined()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('采集配置弹窗:终端值仍是 `source|deviceId`、模式仍是 full/selected 常量', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
await clickButton(wrapper, '采集配置')
|
||||
expect(optionLabels(wrapper, '选择终端')).toEqual(['选择终端(最近上报的设备)', '桌面客户端 · 工位A(dev-1)'])
|
||||
expect(optionValues(wrapper, '选择终端')).toEqual(['', 'client|dev-1'])
|
||||
expect(optionLabels(wrapper, '覆盖模式')).toEqual(['全量采集', '精选采集'])
|
||||
expect(optionValues(wrapper, '覆盖模式')).toEqual(['full', 'selected'])
|
||||
|
||||
await pickSelectOption(wrapper, '选择终端', '桌面客户端 · 工位A(dev-1)')
|
||||
await pickSelectOption(wrapper, '覆盖模式', '全量采集')
|
||||
await clickButton(wrapper, '添加/更新覆盖')
|
||||
expect(deviceLogsApi.updateDeviceLogOverride).toHaveBeenCalledWith('client', 'dev-1', '工位A', 'full')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
describe('生成记录页 × el-select', () => {
|
||||
async function mountHistory(): Promise<VueWrapper<Element>> {
|
||||
historyApi.fetchHistoryList.mockResolvedValue({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
const wrapper = mount(RecordsHistoryPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
it('指定用户下拉:空行 + String(id) 值形状不变', async () => {
|
||||
const wrapper = await mountHistory()
|
||||
expect(selectByLabel(wrapper, '指定用户').props('filterable')).toBe(true)
|
||||
expect(optionLabels(wrapper, '指定用户')).toEqual(['全部用户', '张三', '李四'])
|
||||
expect(optionValues(wrapper, '指定用户')).toEqual(['', '7', '8'])
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('选用户查询发数字 userId;选回「全部用户」不发 userId', async () => {
|
||||
const wrapper = await mountHistory()
|
||||
await pickSelectOption(wrapper, '指定用户', '李四')
|
||||
await clickButton(wrapper, '查询')
|
||||
expect(lastArgs(historyApi.fetchHistoryList).userId).toBe(8)
|
||||
|
||||
await pickSelectOption(wrapper, '指定用户', '全部用户')
|
||||
await clickButton(wrapper, '查询')
|
||||
expect(lastArgs(historyApi.fetchHistoryList).userId).toBeUndefined()
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
@@ -9,6 +9,7 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import KeywordUsagePage from '@/pages/tasks/KeywordUsagePage.vue'
|
||||
import BrandGatingPanel from '@/pages/tasks/BrandGatingPanel.vue'
|
||||
@@ -50,7 +51,9 @@ const loadingDirective = { mounted() {}, updated() {} }
|
||||
function mountPage(component: Parameters<typeof mount>[0], pinia: Pinia): VueWrapper {
|
||||
return mount(component, {
|
||||
global: {
|
||||
plugins: [pinia],
|
||||
// 筛选下拉 2026-11-17 换成 el-select(原生 select 弹层是直角原生物,与亚马逊页不统一),
|
||||
// 两支页面都要把 EP 组件注册进来,否则渲染成未解析标签。
|
||||
plugins: [pinia, ElSelect, ElOption],
|
||||
directives: { loading: loadingDirective },
|
||||
},
|
||||
})
|
||||
|
||||
@@ -17,12 +17,30 @@
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
|
||||
import UserSecretsPage from '@/pages/account/UserSecretsPage.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
|
||||
/* 筛选下拉 2026-11-17 起是 el-select(原生 select 的弹层是浏览器直角原生物,用户要求与亚马逊统一)。
|
||||
页面模板不带局部 import、靠 main.ts 全局注册,挂载测试不跑 main.ts ⇒ 必须在这里显式注册,
|
||||
否则拿到的是未解析的空壳,`findAllComponents(ElSelect)` 一条也找不到。 */
|
||||
const EL_PLUGINS = [ElSelect, ElOption]
|
||||
|
||||
/** 按 aria-label 找下拉:EP 把该属性落在内层 combobox input 上,比按节点顺序取更稳。 */
|
||||
function selectByLabel(wrapper: VueWrapper<Element>, label: string) {
|
||||
const found = wrapper.findAllComponents(ElSelect).find((s) => s.find(`[aria-label="${label}"]`).exists())
|
||||
expect(found, `应存在 aria-label="${label}" 的下拉`).toBeTruthy()
|
||||
return found!
|
||||
}
|
||||
|
||||
/** 下拉里每一档的文案(读 el-option 的 label prop,不依赖插槽文本)。 */
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
const secretsApi = vi.hoisted(() => ({
|
||||
fetchUserSecretList: vi.fn(),
|
||||
fetchAdminSecretBalances: vi.fn(),
|
||||
@@ -106,7 +124,7 @@ describe('密钥管理页:检测结果按 check_code 分档渲染', () => {
|
||||
|
||||
async function mountWith(rowValue: Record<string, unknown>) {
|
||||
secretsApi.fetchUserSecretList.mockResolvedValue({ items: [rowValue], total: 1, page: 1, pageSize: 15, groupOptions: [] })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia, ...EL_PLUGINS] } })
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
@@ -239,7 +257,7 @@ describe('密钥管理页:检测结果按 check_code 分档渲染', () => {
|
||||
|
||||
it('筛选项把 error 这一档的两个可能读法都点名(选了要能筛到无可用通道的行)', async () => {
|
||||
const wrapper = await mountWith(busyRow())
|
||||
const options = wrapper.findAll('.secrets-filter-row select')[0].findAll('option').map((option) => option.text().trim())
|
||||
const options = optionLabels(wrapper, '筛选密钥状态')
|
||||
expect(options).toContain('无法判定/可重试')
|
||||
expect(options).not.toContain('无法判定')
|
||||
})
|
||||
@@ -249,7 +267,7 @@ describe('密钥管理页:检测结果按 check_code 分档渲染', () => {
|
||||
secretsApi.checkUserSecret.mockResolvedValue([
|
||||
{ moduleKey: 'proxy', checkStatus: 'error', checkCode: 'channel_busy', checkMessage: BUSY_MESSAGE, checkLatencyMs: 30, checkedAt: '2026-11-02T15:51:07', viaProxy: false },
|
||||
])
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia, ...EL_PLUGINS] } })
|
||||
await flushPromises()
|
||||
const checkButton = wrapper.findAll('button').find((button) => button.text().trim() === '立即检测')
|
||||
expect(checkButton, '行内应有「立即检测」入口').toBeDefined()
|
||||
|
||||
@@ -19,7 +19,14 @@ const messageMock = vi.hoisted(() => ({ success: vi.fn() }))
|
||||
vi.mock('@/pages/records/workbench-client-api.ts', () => api)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
vi.mock('@/components/admin-feedback-ui', () => ({ showAdminFeedback: feedbackMock }))
|
||||
vi.mock('element-plus', () => ({ ElMessage: messageMock }))
|
||||
// 整包 mock element-plus 时,凡被挂载树里其它组件「局部 import」的 EP 组件都要一并给桩:
|
||||
// OldPagination 2026-11-17 起用 ElSelect/ElOption 渲染每页条数下拉,缺桩会
|
||||
// 让 render 拿到 undefined 抛 shapeFlag 错(本文件曾因此红)。样式与弹层不参与本页断言。
|
||||
vi.mock('element-plus', () => ({
|
||||
ElMessage: messageMock,
|
||||
ElSelect: { name: 'ElSelect', render: () => null },
|
||||
ElOption: { name: 'ElOption', render: () => null },
|
||||
}))
|
||||
|
||||
const SHA = 'c'.repeat(64)
|
||||
const row = {
|
||||
|
||||
@@ -13,20 +13,22 @@ import { toCompanyPayload } from '../src/api/companies-dto.ts'
|
||||
/**
|
||||
* 账号域三页按平台 tab 分列(V206,2026-11-17 用户口径「这些亚马逊这边也要有……数据都是新的
|
||||
* 别把亚马逊的带过来」):users/company/biz_shop_manage_group 三表加 platform 列,存量默认亚马逊;
|
||||
* 前端同一套组件两 tab 共显,请求带 platform=当前 tab,弹窗单选默认当前平台、可翻档归侧。
|
||||
* 前端同一套组件两 tab 共显,请求带 platform=当前 tab。
|
||||
* 平台不设手选(2026-11-17 用户口径「有京东就不需要亚马逊了,亚马逊那边也是」):弹窗不再出
|
||||
* 「所属平台」单选——新建取当前平台 tab,编辑保持行值;值仍随保存下发(后端契约不变)。
|
||||
* 上架上限(jd_publish_quota)只属京东口径:编辑弹窗隐藏 + 校验/下发都跳过 + 列表列仅京东侧。
|
||||
*/
|
||||
|
||||
// ---------- 纯函数:payload 的 platform 下发与翻档 ----------
|
||||
// ---------- 纯函数:payload 的 platform 下发 ----------
|
||||
|
||||
test('建号 payload 恒带 platform:京东 tab 建的号默认归京东,单选翻档即改归属', () => {
|
||||
test('建号 payload 恒带 platform:京东 tab 建的号默认归京东(平台跟随当前 tab,弹窗不手选)', () => {
|
||||
const jd = toCreateUserRequest({ ...createEmptyCreateUserForm(), username: 'a', password: 'secret123', platform: 'jd' })
|
||||
assert.equal(jd.platform, 'jd')
|
||||
const amazon = toCreateUserRequest({ ...createEmptyCreateUserForm(), username: 'a', password: 'secret123' })
|
||||
assert.equal(amazon.platform, 'amazon', '空表单缺省亚马逊(存量口径),后端 normalizeOrCreate 同口径兜底')
|
||||
})
|
||||
|
||||
test('编辑回填 platform:行值 jd→jd,缺省/未知→amazon;请求体恒下发 platform(翻档即挪列)', () => {
|
||||
test('编辑回填 platform:行值 jd→jd,缺省/未知→amazon;请求体恒下发 platform(编辑保持行值)', () => {
|
||||
const jdForm = fillEditUserForm({ id: 7, username: '京东号', role: 'normal', platform: 'jd' })
|
||||
assert.equal(jdForm.platform, 'jd')
|
||||
assert.equal(toEditUserUpdateRequest(jdForm).platform, 'jd')
|
||||
@@ -34,7 +36,7 @@ test('编辑回填 platform:行值 jd→jd,缺省/未知→amazon;请求
|
||||
const legacy = fillEditUserForm({ id: 8, username: '存量号', role: 'normal' })
|
||||
assert.equal(legacy.platform, 'amazon', '旧负载没有 platform 时归亚马逊(存量默认),不许渲染成空串')
|
||||
|
||||
assert.equal(toEditUserUpdateRequest(legacy).platform, 'amazon', 'platform 恒下发:单选恒渲染,后端显式才落')
|
||||
assert.equal(toEditUserUpdateRequest(legacy).platform, 'amazon', 'platform 恒下发:编辑保持行值,后端显式才落')
|
||||
})
|
||||
|
||||
test('includeQuota=false(亚马逊侧编辑):不下发 jdPublishQuota,校验也跳过;platform 照常下发', () => {
|
||||
@@ -97,7 +99,7 @@ test('CompaniesPage:公司列表带平台、切平台重取数、编辑弹窗
|
||||
assert.match(page, /:platform="platformTab\.active"/, '新建公司弹窗默认落当前平台')
|
||||
})
|
||||
|
||||
test('EditUserDialog:上架上限仅京东侧显示且不参与亚马逊侧提交;所属平台单选恒在', () => {
|
||||
test('EditUserDialog:上架上限仅京东侧显示且不参与亚马逊侧提交;所属平台不设手选', () => {
|
||||
const dialog = readSource('src/pages/account/EditUserDialog.vue')
|
||||
assert.match(dialog, /v-if="includeQuota && \(targetIsCompanySuperAdmin \|\| form\.role === 'admin'\)"/,
|
||||
'quota 项必须叠上 includeQuota(京东侧)条件——只按角色判断会把该项带进亚马逊侧弹窗')
|
||||
@@ -105,26 +107,30 @@ test('EditUserDialog:上架上限仅京东侧显示且不参与亚马逊侧提
|
||||
'提交必须透传 includeQuota:亚马逊侧校验与下发都跳过 quota')
|
||||
assert.match(dialog, /validateEditUserForm\(form, \{ includeQuota: includeQuota\.value \}\)/,
|
||||
'校验与下发同口径(校验过了但不下发 = 静默改值)')
|
||||
assert.match(dialog, /v-model="form\.platform"/, '所属平台单选恒在:翻档是把记录挪到另一平台列表的唯一入口')
|
||||
assert.doesNotMatch(dialog, /v-model="form\.platform"/,
|
||||
'所属平台不设手选(2026-11-17 用户口径):平台跟随当前平台 tab,把单选写回来即红')
|
||||
assert.match(dialog, /props\.platform === 'jd'/, 'includeQuota 取自页面透传的当前平台')
|
||||
assert.match(dialog, /form\.platform = base\.platform/, '打开弹窗必须回填行值(旧负载缺省归亚马逊)')
|
||||
assert.match(dialog, /form\.platform = base\.platform/, '打开弹窗必须回填行值(旧负载缺省归亚马逊;保存原样下发)')
|
||||
})
|
||||
|
||||
test('CreateUserDialog/GroupEditorDialog/CompanyEditorDialog:新建默认当前平台、编辑回填行值', () => {
|
||||
test('CreateUserDialog/GroupEditorDialog/CompanyEditorDialog:平台不设手选,新建默认当前平台、编辑回填行值', () => {
|
||||
const create = readSource('src/pages/account/CreateUserDialog.vue')
|
||||
assert.match(create, /form\.platform = props\.platform \?\? 'amazon'/, '建号默认当前平台 tab')
|
||||
assert.match(create, /v-model="form\.platform"/, '所属平台单选在')
|
||||
assert.doesNotMatch(create, /v-model="form\.platform"/,
|
||||
'建号弹窗不设平台手选(2026-11-17 用户口径):把单选写回来即红')
|
||||
|
||||
const group = readSource('src/pages/account/GroupEditorDialog.vue')
|
||||
assert.match(group, /groupPlatform\.value = props\.platform \?\? 'amazon'/, '新建分组默认当前平台 tab')
|
||||
assert.match(group, /props\.group\.platform === 'jd' \? 'jd' : 'amazon'/, '编辑分组回填行值')
|
||||
assert.doesNotMatch(group, /v-model="groupPlatform"/, '分组弹窗不设平台手选:把单选写回来即红')
|
||||
assert.match(group, /createShopGroup\(groupName\.value, memberIds\.value, operatorId, groupPlatform\.value\)/,
|
||||
'创建分组必须带平台')
|
||||
assert.match(group, /updateShopGroup\(props\.group\.id, groupName\.value, memberIds\.value, groupPlatform\.value\)/,
|
||||
'更新分组必须带平台(翻档归侧)')
|
||||
'更新分组必须带平台(编辑保持行值下发)')
|
||||
assert.doesNotMatch(group, /companyTab/, '分组弹窗不读公司 tab(既有口径:候选按组长公司取人)')
|
||||
|
||||
const company = readSource('src/pages/account/CompanyEditorDialog.vue')
|
||||
assert.match(company, /platform: props\.platform \?\? 'amazon'/, '新建公司默认当前平台 tab')
|
||||
assert.match(company, /props\.company\.platform === 'jd' \? 'jd' : 'amazon'/, '编辑公司回填行值')
|
||||
assert.doesNotMatch(company, /v-model="form\.platform"/, '公司弹窗不设平台手选:把单选写回来即红')
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@ import assert from 'node:assert/strict'
|
||||
import type { AdminMenuNode } from '../src/types/admin.ts'
|
||||
import {
|
||||
BOTH_PLATFORM_MENU_KEYS,
|
||||
JD_APP_MENU_KEYS,
|
||||
JD_MENU_KEYS,
|
||||
PLATFORM_TABS,
|
||||
platformsOfMenuKey,
|
||||
@@ -115,7 +116,7 @@ test('tab 显示依据:两侧都有可见页才画 tab 条,仅一侧授权
|
||||
assert.deepEqual(visiblePlatformsFor(null), [])
|
||||
})
|
||||
|
||||
test('平台 tab 定义与两份菜单清单钉死(防清单漂移):京东独占仅数据库一页、双侧共用账号域三页', () => {
|
||||
test('平台 tab 定义与菜单清单钉死(防清单漂移):京东独占后台仅数据库一页、双侧共用账号域三页、桌面端京东工具台三件(V209)', () => {
|
||||
assert.deepEqual(PLATFORM_TABS, [
|
||||
{ id: 'amazon', label: '亚马逊' },
|
||||
{ id: 'jd', label: '京东' },
|
||||
@@ -124,6 +125,9 @@ test('平台 tab 定义与两份菜单清单钉死(防清单漂移):京东
|
||||
assert.deepEqual([...JD_MENU_KEYS], ['admin_jd_database'])
|
||||
assert.deepEqual([...BOTH_PLATFORM_MENU_KEYS].sort(),
|
||||
['admin_companies', 'admin_group_manage', 'admin_users'])
|
||||
// 桌面端(app)清单与 JD_MENU_KEYS 分列:app 菜单没有 admin 路由,不得混进
|
||||
// 「与 routes.ts 对撞」的那份(下方护栏用例只扫 JD_MENU_KEYS/BOTH 两份是刻意的)。
|
||||
assert.deepEqual([...JD_APP_MENU_KEYS].sort(), ['jd-collect', 'jd-publish', 'jd_tools'])
|
||||
})
|
||||
|
||||
test('两份清单的每一条都必须在路由注册表登记(同 company-menu-route 护栏形状:少登记=看得见点进去404)', () => {
|
||||
|
||||
@@ -88,10 +88,9 @@ test('test_task_048_normal_role_wording_agrees_across_all_exits', () => {
|
||||
const buttons = [...dialog.matchAll(/<el-radio-button\s+value="([a-z_]+)">([^<]*)</g)].map(
|
||||
(m) => [m[1], m[2]] as const,
|
||||
)
|
||||
// 2026-11-17 V206:弹窗新增「所属平台」单选(amazon/jd 两档)——角色按钮仍是前两枚,
|
||||
// 平台按钮单独钉,四出口文案对平的意图不变。
|
||||
assert.deepEqual(buttons.slice(0, 2), [['normal', word], ['admin', '管理员']], '编辑用户弹窗的角色按钮文案')
|
||||
assert.deepEqual(buttons.slice(2), [['amazon', '亚马逊'], ['jd', '京东']], '所属平台单选两档(V206 翻档归侧的唯一入口)')
|
||||
// 2026-11-17 V206 曾加「所属平台」单选;同日晚按用户口径「有京东就不需要亚马逊了」撤掉——
|
||||
// 平台跟随当前平台 tab,弹窗回到只剩角色两枚按钮(平台手选回流会在这里红)。
|
||||
assert.deepEqual(buttons, [['normal', word], ['admin', '管理员']], '编辑用户弹窗的角色按钮文案(且平台单选不得回流)')
|
||||
})
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
import { groupKeysForActive, toSidebarEntries } from '../src/layout/menu-mapper.ts'
|
||||
import { allGroupKeys, toSidebarEntries } from '../src/layout/menu-mapper.ts'
|
||||
import type { AdminMenuNode } from '../src/types/admin.ts'
|
||||
|
||||
function node(partial: Partial<AdminMenuNode> & { key: string; name: string }): AdminMenuNode {
|
||||
@@ -89,11 +89,21 @@ test('test_task_006_menu_sidebar_mapping_invalid_input_rejected', () => {
|
||||
})
|
||||
|
||||
test('test_task_006_menu_sidebar_mapping_dependency_failure_returns_actionable_message', () => {
|
||||
// 依赖失败:壳层消费映射模块;激活分组展开按当前路由命中。
|
||||
// 依赖失败:壳层消费映射模块;父菜单默认全展开(2026-11-17 用户口径「父菜单不要默认折叠」),
|
||||
// 不再按激活路由命中展开;entries 变化后必须命令式补开(el-menu 的 default-openeds 只在挂载读一次)。
|
||||
const layout = readSource('src/layout/AdminLayout.vue')
|
||||
assert.match(layout, /toSidebarEntries/)
|
||||
assert.match(layout, /groupKeysForActive/)
|
||||
const active = toSidebarEntries(TREE)
|
||||
assert.deepEqual(groupKeysForActive(active, '/account/menus'), ['account'])
|
||||
assert.deepEqual(groupKeysForActive(active, '/account/nope'), [], '未命中路由不展开任何分组')
|
||||
assert.match(layout, /allGroupKeys/)
|
||||
assert.doesNotMatch(layout, /groupKeysForActive/, '按激活路由展开的旧行为不得回流')
|
||||
assert.match(layout, /watch\(openedKeys/, 'entries 变化后必须命令式补开,否则切平台 tab 新组收起')
|
||||
assert.match(layout, /nextTick/)
|
||||
const entries = toSidebarEntries(TREE)
|
||||
assert.deepEqual(allGroupKeys(entries), ['account'])
|
||||
const mix = toSidebarEntries([
|
||||
node({ key: 'g1', name: '分组一', children: [node({ key: 'c1', name: '子一', route: '/x/c' })] }),
|
||||
node({ key: 'leaf', name: '顶级页', route: '/top' }),
|
||||
node({ key: 'g2', name: '分组二', children: [node({ key: 'c2', name: '子二', route: '/y/c' })] }),
|
||||
])
|
||||
assert.deepEqual(allGroupKeys(mix), ['g1', 'g2'], '分组全部展开、顶级叶项不产生展开键')
|
||||
assert.deepEqual(allGroupKeys(toSidebarEntries([])), [], '空菜单不产生展开键')
|
||||
})
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import {
|
||||
filterMenuTreeNodesByPlatform,
|
||||
JD_APP_MENU_KEYS,
|
||||
platformsOfMenuKey,
|
||||
} from '../src/config/platform-scope.ts'
|
||||
import { filterMenuTreeByPlatform } from '../src/layout/platform-menu-filter.ts'
|
||||
import type { MenuOptionNode } from '../src/pages/account/user-menu-auth.ts'
|
||||
import { pruneCheckedIdsToTree } from '../src/pages/account/user-menu-auth.ts'
|
||||
|
||||
/**
|
||||
* 授权树按平台过滤(2026-11-17 用户口径「这边也没有去掉亚马逊的」):建号/编辑弹窗的
|
||||
* 菜单权限树在选「京东」时只留京东侧菜单(京东数据库+双侧账号域三件),亚马逊菜单整枝
|
||||
* 隐藏;切平台时勾选集收敛进可见树(pruneCheckedIdsToTree),否则京东档账号保存后仍带
|
||||
* 亚马逊授权,平台分侧被静默架空。
|
||||
*
|
||||
* 算法与侧边栏同源(platform-scope.filterMenuTreeNodesByPlatform 唯一出口)——本文件
|
||||
* 同时钉「两个消费方同形」:同一夹具喂侧边栏版与授权树版,逐层 key 序列必须一致
|
||||
* (B79-12 同款钉法:一句判据在册有多份正本时,同形性本身要有人钉)。
|
||||
*/
|
||||
|
||||
const node = (id: number, key: string, children?: MenuOptionNode[]): MenuOptionNode => {
|
||||
const out: MenuOptionNode = { id, key, name: `菜单${id}`, sort: id, parentId: null, type: 'admin' }
|
||||
if (children) out.children = children
|
||||
return out
|
||||
}
|
||||
|
||||
/** 授权树实测形状缩影:混编分组(京东库+亚马逊页混在一个分组下)+两侧叶子。 */
|
||||
const TREE: MenuOptionNode[] = [
|
||||
node(1, 'admin_group_account', [
|
||||
node(11, 'admin_users'),
|
||||
node(12, 'admin_group_manage'),
|
||||
node(13, 'admin_companies'),
|
||||
node(14, 'admin_columns'),
|
||||
]),
|
||||
node(2, 'admin_jd_database'),
|
||||
node(3, 'admin_group_shop', [
|
||||
node(31, 'admin_shop_keys'),
|
||||
node(32, 'admin_shop_manage'),
|
||||
]),
|
||||
]
|
||||
|
||||
const keysOf = (nodes: MenuOptionNode[]): string[] =>
|
||||
nodes.map((n) => (n.children?.length ? `${n.key}(${keysOf(n.children).join(',')})` : n.key))
|
||||
|
||||
test('京东侧:只剩京东数据库+双侧账号域三件,亚马逊分组整枝消失', () => {
|
||||
const jd = filterMenuTreeNodesByPlatform(TREE, 'jd')
|
||||
assert.deepEqual(keysOf(jd), [
|
||||
'admin_group_account(admin_users,admin_group_manage,admin_companies)',
|
||||
'admin_jd_database',
|
||||
])
|
||||
})
|
||||
|
||||
test('亚马逊侧:京东独占菜单消失,亚马逊菜单与账号域分组原样', () => {
|
||||
const amazon = filterMenuTreeNodesByPlatform(TREE, 'amazon')
|
||||
assert.deepEqual(keysOf(amazon), [
|
||||
'admin_group_account(admin_users,admin_group_manage,admin_companies,admin_columns)',
|
||||
'admin_group_shop(admin_shop_keys,admin_shop_manage)',
|
||||
])
|
||||
})
|
||||
|
||||
test('与侧边栏过滤同形:同一夹具两个消费方逐层 key 一致(B79-12 钉法)', () => {
|
||||
for (const platform of ['amazon', 'jd'] as const) {
|
||||
const viaSidebar = keysOf(filterMenuTreeByPlatform(TREE as never, platform) as never)
|
||||
const viaAuthTree = keysOf(filterMenuTreeNodesByPlatform(TREE, platform))
|
||||
assert.deepEqual(viaAuthTree, viaSidebar, `platform=${platform} 两处消费方必须同形`)
|
||||
}
|
||||
})
|
||||
|
||||
test('判定出口不变:京东独占/双侧/默认亚马逊三个档位原样(改档位先改这里再改清单)', () => {
|
||||
assert.deepEqual(platformsOfMenuKey('admin_jd_database'), ['jd'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_users'), ['amazon', 'jd'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_shop_keys'), ['amazon'])
|
||||
})
|
||||
|
||||
/** 桌面端(app)分区缩影:V209 京东工具台组+两工具子行,旁置亚马逊侧 app 菜单。 */
|
||||
const APP_TREE: MenuOptionNode[] = [
|
||||
node(51, 'jd_tools', [node(511, 'jd-collect'), node(512, 'jd-publish')]),
|
||||
node(52, 'app_variant_collection'),
|
||||
]
|
||||
|
||||
test('桌面端京东侧不再整组消失:jd_tools 组+两工具保留,亚马逊 app 菜单剪掉(2026-11-17「前台的京东少了」回归钉)', () => {
|
||||
for (const key of JD_APP_MENU_KEYS) {
|
||||
assert.deepEqual(platformsOfMenuKey(key), ['jd'], `V209 app 菜单 ${key} 必须判京东侧`)
|
||||
}
|
||||
const jd = filterMenuTreeNodesByPlatform(APP_TREE, 'jd')
|
||||
assert.deepEqual(keysOf(jd), ['jd_tools(jd-collect,jd-publish)'],
|
||||
'选京东时桌面端分区必须保留京东工具台整组(叶子 key 认京东,组按存活子项去留)')
|
||||
})
|
||||
|
||||
test('桌面端亚马逊侧:京东工具台消失,亚马逊 app 菜单原样', () => {
|
||||
const amazon = filterMenuTreeNodesByPlatform(APP_TREE, 'amazon')
|
||||
assert.deepEqual(keysOf(amazon), ['app_variant_collection'])
|
||||
})
|
||||
|
||||
test('pruneCheckedIdsToTree:勾选集收敛进可见树,隐藏侧 id 被剔除且原数组不动', () => {
|
||||
const jd = filterMenuTreeNodesByPlatform(TREE, 'jd')
|
||||
const checked = [11, 12, 2, 31, 99]
|
||||
const snapshot = checked.slice()
|
||||
const pruned = pruneCheckedIdsToTree(checked, jd)
|
||||
assert.deepEqual(pruned, [2, 11, 12], '只留可见树内的 id(31=亚马逊店务、99=不存在)')
|
||||
assert.deepEqual(checked, snapshot, '入参数组不被改写')
|
||||
})
|
||||
|
||||
test('pruneCheckedIdsToTree:空树全剪、空勾选原样空、非法 id 不复活', () => {
|
||||
assert.deepEqual(pruneCheckedIdsToTree([1, 2], []), [], '可见树为空=无可保留')
|
||||
assert.deepEqual(pruneCheckedIdsToTree([], TREE), [])
|
||||
assert.deepEqual(pruneCheckedIdsToTree([0, -3, 'x', 11.7], TREE), [11], '非法 id 按 normalizeMenuIds 口径收敛(丢弃/取整),不会原样漏进提交集')
|
||||
})
|
||||
+32
-22
@@ -61,16 +61,18 @@ import java.util.List;
|
||||
* <p>鉴权照外观专利只读页私有 {@code requireXxxAccess} 形状:JWT → 内部令牌回退 → 超管放行 →
|
||||
* 非超管菜单权限(column_key/route_path 双匹配)。菜单行由 V196 只插 columns 不预授权
|
||||
* ⇒ 默认仅 super_admin 可见可访问,其余角色由超管在权限页手工勾授后才放行。
|
||||
* <b>2026-11-16 起读/写分档</b>:读(列表/类目/详情)按上面的菜单口径放行;写(编辑/上传图片/
|
||||
* 删除/批量删除/批量归类)在菜单口径之上再要求平台超管,非超管一律 403(前端同窗隐藏写入口)。</p>
|
||||
* <b>2026-11-16 起读/写分档(2026-11-17 口径放宽)</b>:读(列表/类目/详情)按上面的菜单
|
||||
* 口径放行;商品行写(编辑/上传图片/删除/批量删除)在菜单口径之上再走管理员级写闸
|
||||
* (平台超管+公司超管+admin 档放行,普通账号 403,见 {@code requireJdProductWrite});
|
||||
* 批量归类走 V203 的按组判(requireWritableGroup)。</p>
|
||||
*
|
||||
* <p><b>公司口径(2026-11-16 用户定案「删除掉公司 tab,参考品牌数据库」)</b>:读侧零公司
|
||||
* 维度——company_id 请求参数与 {@code superAdminScopedCompanyId} 谓词已随公共化收尾整批
|
||||
* 摘除(2026-11-15 定案「京东数据库不区分公司、属于公共的」的最后一截),行上的 company_id
|
||||
* 只剩「哪家公司客户端同步的」来源标记,不构成可见性边界;每个拿到本页菜单权限的管理员
|
||||
* (含站点超管)看到同一份全量公共库。详情与写侧(编辑/删除)同样没有公司维度:
|
||||
* 对全部公共行可编辑可删除,但<b>写动作只对平台超管开放</b>(2026-11-16 用户口径
|
||||
* 「京东数据库只有超管有编辑删除权限」,见 {@code requirePlatformSuperAdminWrite}),
|
||||
* 对全部公共行可编辑可删除,但<b>写动作只对管理员级开放</b>(2026-11-17 用户口径
|
||||
* 「超管+管理员都可以,只有普通员工不能」,见 {@code requireJdProductWrite}),
|
||||
* 写侧端点的 company_id 传参已随 2026-11-15 公共化摘除。</p>
|
||||
*
|
||||
* <p>导出端点已随 2026-11-15 客户口径「导出也不用」整段下线(控制器/服务/mapper 参数一起删);
|
||||
@@ -120,6 +122,9 @@ public class AdminJdProductController {
|
||||
@RequestParam(name = "synced_from", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime syncedFrom,
|
||||
@Parameter(description = "同步结束时间(包含,ISO datetime)")
|
||||
@RequestParam(name = "synced_to", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime syncedTo,
|
||||
@Parameter(description = "分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」):"
|
||||
+ "true=当前分组下有分类,false=未分类,缺省=全部;按 V203 归属表 SQL 侧下推")
|
||||
@RequestParam(name = "classified", required = false) Boolean classified,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requireJdAccess(request);
|
||||
if (request.getParameter("grouped") != null || request.getParameter("ungrouped") != null) {
|
||||
@@ -131,7 +136,8 @@ public class AdminJdProductController {
|
||||
requireVisibleCategory(scope, groupId);
|
||||
}
|
||||
return ApiResponse.success(jdProductQueryService.page(page, pageSize,
|
||||
productCode, titleKeyword, category, groupId, syncedFrom, syncedTo, scopedOwnerGroupId));
|
||||
productCode, titleKeyword, category, groupId, syncedFrom, syncedTo, classified,
|
||||
scopedOwnerGroupId));
|
||||
}
|
||||
|
||||
@GetMapping("/categories")
|
||||
@@ -168,7 +174,7 @@ public class AdminJdProductController {
|
||||
@Parameter(description = "商品行 id") @PathVariable("id") Long id,
|
||||
@Valid @RequestBody JdProductUpdateRequest body,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requirePlatformSuperAdminWrite(request);
|
||||
RequestOperator operator = requireJdProductWrite(request);
|
||||
Long updatedId = jdProductUpdateService.update(id, body);
|
||||
log.info("[jd-product] 编辑商品 operatorId={} id={} title={}",
|
||||
operator.id(), updatedId, body.getTitle());
|
||||
@@ -192,7 +198,7 @@ public class AdminJdProductController {
|
||||
@Parameter(description = "替换目标图片登记行 id(缺省=新增)")
|
||||
@RequestParam(value = "replace_image_id", required = false) Long replaceImageId,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requirePlatformSuperAdminWrite(request);
|
||||
RequestOperator operator = requireJdProductWrite(request);
|
||||
Long updatedId = jdProductUpdateService.uploadImage(id, file, imageType, attrName, replaceImageId);
|
||||
log.info("[jd-product] 上传图片 operatorId={} id={} replaceImageId={} imageType={}",
|
||||
operator.id(), updatedId, replaceImageId, imageType);
|
||||
@@ -207,7 +213,7 @@ public class AdminJdProductController {
|
||||
public ApiResponse<JdProductDeleteVo> delete(
|
||||
@Parameter(description = "商品行 id") @PathVariable("id") Long id,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requirePlatformSuperAdminWrite(request);
|
||||
RequestOperator operator = requireJdProductWrite(request);
|
||||
JdProductDeleteVo vo = jdProductDeleteService.delete(List.of(id));
|
||||
// 管理端破坏性动作必须留痕:谁、删了哪些行、桶里清了几个对象(同分组删除口径)。
|
||||
log.info("[jd-product] 删除商品 operatorId={} id={} deleted={} objectsDeleted={}",
|
||||
@@ -242,7 +248,7 @@ public class AdminJdProductController {
|
||||
public ApiResponse<JdProductDeleteVo> batchDelete(
|
||||
@Valid @RequestBody JdProductBatchDeleteRequest body,
|
||||
HttpServletRequest request) {
|
||||
RequestOperator operator = requirePlatformSuperAdminWrite(request);
|
||||
RequestOperator operator = requireJdProductWrite(request);
|
||||
JdProductDeleteVo vo = jdProductDeleteService.delete(body.getIds());
|
||||
log.info("[jd-product] 批量删除商品 operatorId={} requested={} deleted={} objectsDeleted={} kept={}",
|
||||
operator.id(), body.getIds().size(), vo.getDeleted(),
|
||||
@@ -263,23 +269,27 @@ public class AdminJdProductController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 写端点的越权闸(2026-11-16 用户口径「京东数据库只有超管有编辑删除权限」)。
|
||||
* 写端点的越权闸(2026-11-17 用户口径「超管+管理员都可以,只有普通员工不能操作」,
|
||||
* 推翻 2026-11-16「只有超管有编辑删除权限」的单档)。
|
||||
*
|
||||
* <p>读保持菜单权限口径(拿到 {@code admin_jd_database} 列权限的管理员可见同一份公共库),
|
||||
* 写(编辑 / 上传图片 / 单行删除 / 批量删除 / 批量归类)收窄到<b>平台超级管理员</b>:
|
||||
* 与 {@code BrandGatingController#requirePlatformSuperAdmin}、
|
||||
* {@code AdminDeviceLogController#requireSuperAdmin} 同一判据(
|
||||
* {@code DeviceSessionPolicy#isSuper} 只认站点 super_admin,公司超管不在内)。</p>
|
||||
* <p>读保持菜单权限口径(拿到 {@code admin_jd_database} 列权限的管理员可见同一份公共库);
|
||||
* 商品行写(编辑 / 上传图片 / 单行删除 / 批量删除)放宽到<b>管理员级</b>:平台超级管理员、
|
||||
* 公司超级管理员、admin 角色三档放行,普通账号(role 归不出档)403。分类写不在此闸——
|
||||
* {@code batch-assign-group} 沿用 V203 的 {@code requireWritableGroup}(本组管理员/
|
||||
* 公司超管/平台超管,按组判)。</p>
|
||||
*
|
||||
* <p>写动作会置人工编辑锁({@code manual_locked=1})并物理删除桶内图片,属影响全平台公共
|
||||
* 数据的动作,故不随读权限下放;非超管拿到 403 时前端已不渲染这些入口,本闸是兜底。</p>
|
||||
* <p>写动作会置人工编辑锁({@code manual_locked=1})并物理删除桶内图片;普通账号拿到 403
|
||||
* 时前端已不渲染这些入口,本闸是兜底。</p>
|
||||
*/
|
||||
private RequestOperator requirePlatformSuperAdminWrite(HttpServletRequest request) {
|
||||
private RequestOperator requireJdProductWrite(HttpServletRequest request) {
|
||||
RequestOperator operator = requireJdAccess(request);
|
||||
if (!operator.superAdmin()) {
|
||||
log.warn("[jd-product] 非平台超管写操作被拒 operatorId={} role={}",
|
||||
operator.id(), adminAuthSupport.currentRole(operator.user()));
|
||||
throw new BusinessException(403, "仅平台超级管理员可以编辑或删除京东数据库数据");
|
||||
String role = adminAuthSupport.currentRole(operator.user());
|
||||
boolean adminTier = operator.superAdmin()
|
||||
|| DeviceSessionPolicy.isCompanySuperAdmin(role)
|
||||
|| "admin".equals(role);
|
||||
if (!adminTier) {
|
||||
log.warn("[jd-product] 普通账号写操作被拒 operatorId={} role={}", operator.id(), role);
|
||||
throw new BusinessException(403, "仅超级管理员或管理员可以编辑或删除京东数据库数据");
|
||||
}
|
||||
return operator;
|
||||
}
|
||||
|
||||
@@ -49,13 +49,18 @@ public interface JdProductMapper extends BaseMapper<JdProductEntity> {
|
||||
* 「分类不要了,全部整合到类目里」撤掉(独立「分类」筛选框前端下线,
|
||||
* {@code groupId} 改由类目面板「自定义分类」选中驱动)。
|
||||
* 店铺名过滤参数已随 2026-11-15 客户口径「店铺不需要」同窗撤掉(DB 列与详情/回传链不动)。
|
||||
* {@code classified}+{@code ownerGroupId}(2026-11-17 用户口径「加个已分类和未分类的筛选」):
|
||||
* 按 V203 归属表 EXISTS/NOT EXISTS 快筛分类状态,NULL=不过滤;与 11-16 撤掉的旧
|
||||
* grouped/ungrouped(读已停用的 biz_jd_product.group_id 列)不是一回事。
|
||||
*/
|
||||
long countProducts(@Param("productCode") String productCode,
|
||||
@Param("titleKeyword") String titleKeyword,
|
||||
@Param("category") String category,
|
||||
@Param("groupId") Long groupId,
|
||||
@Param("syncedFrom") LocalDateTime syncedFrom,
|
||||
@Param("syncedTo") LocalDateTime syncedTo);
|
||||
@Param("syncedTo") LocalDateTime syncedTo,
|
||||
@Param("classified") Boolean classified,
|
||||
@Param("ownerGroupId") Long ownerGroupId);
|
||||
|
||||
/**
|
||||
* 商品上架配额计数({@code JdPublishQuotaService}):按 owner uid 集(管理员本人+
|
||||
@@ -95,6 +100,8 @@ public interface JdProductMapper extends BaseMapper<JdProductEntity> {
|
||||
@Param("groupId") Long groupId,
|
||||
@Param("syncedFrom") LocalDateTime syncedFrom,
|
||||
@Param("syncedTo") LocalDateTime syncedTo,
|
||||
@Param("classified") Boolean classified,
|
||||
@Param("ownerGroupId") Long ownerGroupId,
|
||||
@Param("offset") long offset,
|
||||
@Param("limit") int limit);
|
||||
|
||||
|
||||
+16
-11
@@ -79,14 +79,18 @@ public class JdProductQueryService {
|
||||
* 分页查询商品行({@code synced_at} 倒序)。
|
||||
*
|
||||
* <p>过滤面:商品编码 contains、标题关键词 contains、类目 eq、分组 eq(2026-11-16 起
|
||||
* 由类目面板「自定义分类」选中驱动)、同步起止(datetime 闭区间)。
|
||||
* 未分类/已分类两档(ungrouped/grouped)与独立「分类」筛选框随同日口径
|
||||
* 「分类不要了,全部整合到类目里」整批撤掉。
|
||||
* 由类目面板「自定义分类」选中驱动)、同步起止(datetime 闭区间)、分类状态档
|
||||
* {@code classified}(2026-11-17 用户口径「加个已分类和未分类的筛选」:true=当前分组下
|
||||
* 有分类、false=没有、null=全部;按 V203 归属表 EXISTS/NOT EXISTS 在 SQL 侧下推,
|
||||
* 判据与 {@link #fillGroupNames} 填分类列的条件同形——「筛选说未分类的行,列表分类列
|
||||
* 也必须是未分类」)。
|
||||
* 2026-11-16 撤掉的旧 ungrouped/grouped 两档读的是已停用的 biz_jd_product.group_id 列,
|
||||
* 与本档不是一回事;独立「分类」筛选框的撤掉口径不变。
|
||||
* 公司维过滤已随 2026-11-16 摘公司 tab 整批撤掉(全平台公共)。</p>
|
||||
*/
|
||||
public JdProductPageVo page(Long page, Long pageSize,
|
||||
String productCode, String titleKeyword, String category, Long groupId,
|
||||
LocalDateTime syncedFrom, LocalDateTime syncedTo, Long ownerGroupId) {
|
||||
LocalDateTime syncedFrom, LocalDateTime syncedTo, Boolean classified, Long ownerGroupId) {
|
||||
if (syncedFrom != null && syncedTo != null && syncedFrom.isAfter(syncedTo)) {
|
||||
throw new BusinessException("开始时间不能晚于结束时间");
|
||||
}
|
||||
@@ -94,14 +98,14 @@ public class JdProductQueryService {
|
||||
long safeSize = pageSize == null ? PageDefaults.JD_PRODUCTS_PAGE_SIZE_INT
|
||||
: Math.min(Math.max(pageSize, 1), MAX_PAGE_SIZE);
|
||||
Filter filter = filter(productCode, titleKeyword, category,
|
||||
groupId, syncedFrom, syncedTo);
|
||||
groupId, syncedFrom, syncedTo, classified);
|
||||
long total = jdProductMapper.countProducts(filter.productCode(),
|
||||
filter.titleKeyword(), filter.category(), filter.groupId(),
|
||||
filter.syncedFrom(), filter.syncedTo());
|
||||
filter.syncedFrom(), filter.syncedTo(), filter.classified(), ownerGroupId);
|
||||
List<JdProductEntity> rows = total <= 0 ? List.of()
|
||||
: jdProductMapper.selectProductPage(filter.productCode(),
|
||||
filter.titleKeyword(), filter.category(), filter.groupId(),
|
||||
filter.syncedFrom(), filter.syncedTo(),
|
||||
filter.syncedFrom(), filter.syncedTo(), filter.classified(), ownerGroupId,
|
||||
(safePage - 1) * safeSize, (int) safeSize);
|
||||
List<JdProductListItemVo> items = rows.stream().map(this::toListItem).toList();
|
||||
fillGroupNames(items, ownerGroupId);
|
||||
@@ -176,18 +180,19 @@ public class JdProductQueryService {
|
||||
|
||||
// ---------------------------------------------------------------- 过滤面
|
||||
|
||||
/** 服务侧过滤面归一:groupId ≤0 按没选处理,文本 trim 后空串归 null(无公司维,2026-11-16 摘)。 */
|
||||
/** 服务侧过滤面归一:groupId ≤0 按没选处理,文本 trim 后空串归 null(无公司维,2026-11-16 摘);
|
||||
* classified 原样直传(null=不过滤该面,2026-11-17 分类状态快筛)。 */
|
||||
private record Filter(String productCode, String titleKeyword,
|
||||
String category, Long groupId,
|
||||
LocalDateTime syncedFrom, LocalDateTime syncedTo) {
|
||||
LocalDateTime syncedFrom, LocalDateTime syncedTo, Boolean classified) {
|
||||
}
|
||||
|
||||
private static Filter filter(String productCode, String titleKeyword,
|
||||
String category, Long groupId,
|
||||
LocalDateTime syncedFrom, LocalDateTime syncedTo) {
|
||||
LocalDateTime syncedFrom, LocalDateTime syncedTo, Boolean classified) {
|
||||
Long safeGroupId = groupId != null && groupId > 0 ? groupId : null;
|
||||
return new Filter(trimToNull(productCode), trimToNull(titleKeyword),
|
||||
trimToNull(category), safeGroupId, syncedFrom, syncedTo);
|
||||
trimToNull(category), safeGroupId, syncedFrom, syncedTo, classified);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 列表/详情搬运
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
-- 迁移 V209:用户端京东功能纳入 app 菜单权限(「后台京东这边也要加菜单权限」2026-11-17)
|
||||
-- =============================================================
|
||||
-- 1. 变更目的:亚马逊/视频侧的用户端功能早已被 columns(menu_type='app') 树 + 逐用户勾授
|
||||
-- 管控(后管授权页勾选 → 用户端首页入口/工具台卡片按权限显隐),京东侧整条链缺失:
|
||||
-- app 树无任何京东行、京东工具台卡片不走过滤。本迁移补数据入口——新增「京东工具台」
|
||||
-- app 组行(jd_tools)+两个工具子行(jd-collect 获取店铺数据 / jd-publish 商品上架,
|
||||
-- 上架卡转正前占位,v1.5 Phase 4 无需再发迁移)。
|
||||
-- 【与 V190/V196 不预授权口径的偏离(有意,非漏写)】那是 admin 页面菜单——不预插时
|
||||
-- 默认仅超管可见,收紧不伤及现用人;app 行若不预授权,上线当天所有非超管账号立刻
|
||||
-- 失去现在人人可见的京东工具台,"隐藏"变成了静默断供。故预授权段逐字沿 V163 先例:
|
||||
-- 全表账号按所属公司授本公司【组行】(读侧 PermissionMenuService 展开子孙 ⇒ 两工具随组
|
||||
-- 可见;子行不预授,管理员收组后可按工具单独放)。停用账号照授(登录即拦,不构成可见
|
||||
-- 入口,避免解禁后菜单凭空消失——V163 头注 §2 同一口径)。
|
||||
--
|
||||
-- 2. 形状口径(V163 逐形,每公司一棵树按 V149 模型):
|
||||
-- - company_id=1 为模板树(CompanyService.create → copyTreeFromTemplate 的源头),
|
||||
-- 其余公司(含停用公司)逐家复制;子行 parent_id 认本公司组行,严禁跨公司认父。
|
||||
-- - 组行挂 app 根(parent_id=NULL,V80 组行形状),排序 140 接后勤工具(130) 之后;
|
||||
-- 子行 141/142。route_path=组 slug/前端 item key(V80/V90 形状),
|
||||
-- column_key 与前端 permissionKeys 逐字一致(jd_tools / jd-collect / jd-publish)。
|
||||
-- - 幂等守卫按 (company_id, column_key) 判存,同时防
|
||||
-- uk_company_menu_type_route_path(company_id, menu_type, route_path) 撞行。
|
||||
-- - 预授权 INSERT IGNORE 必须钉 col.column_key='jd_tools'——V163 第 4 段 JOIN 只按
|
||||
-- company_id 匹配(当时新键行天然唯一),照抄会让账号获得其本公司【全部】菜单行的
|
||||
-- 重复授权,属静默数据污染,此处按 key 收紧。
|
||||
--
|
||||
-- 3. 影响表与数据量:columns +3N 行(N=公司数),user_column_permission +账号数(只授组行);
|
||||
-- 字典/授权小表,毫秒级,不碰锁热点表。
|
||||
--
|
||||
-- 4. 可重跑性:三段 INSERT 都带 NOT EXISTS / INSERT IGNORE 守卫,重跑逐条 no-op;
|
||||
-- 自检闸门只读。
|
||||
--
|
||||
-- 5. 回滚(人工补丁,写成注释以免落在 Flyway 扫描路径里被当迁移执行;顺序照 V165:
|
||||
-- 先删授权,再删子行,最后删组行——parent_id 外键 ON DELETE RESTRICT):
|
||||
-- DELETE g FROM user_column_permission g JOIN columns c ON c.id=g.column_id
|
||||
-- WHERE c.column_key IN ('jd_tools','jd-collect','jd-publish');
|
||||
-- DELETE FROM columns WHERE column_key IN ('jd-collect','jd-publish');
|
||||
-- DELETE FROM columns WHERE column_key = 'jd_tools';
|
||||
-- DELETE FROM flyway_schema_history WHERE version='209';
|
||||
-- =============================================================
|
||||
|
||||
-- ---------- 1. 公司 1 模板树:组行 ----------
|
||||
INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`)
|
||||
SELECT '京东工具台', 'jd_tools', 'app', 'jd-tools', 140, NULL, 1
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM `columns`
|
||||
WHERE `company_id` = 1
|
||||
AND (`column_key` = 'jd_tools'
|
||||
OR (`menu_type` = 'app' AND `route_path` = 'jd-tools'))
|
||||
);
|
||||
|
||||
-- ---------- 2. 组行复制到其余公司(含停用公司) ----------
|
||||
INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`)
|
||||
SELECT '京东工具台', 'jd_tools', 'app', 'jd-tools', 140, NULL, c.`id`
|
||||
FROM `company` c
|
||||
WHERE c.`id` <> 1
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `columns` col
|
||||
WHERE col.`company_id` = c.`id`
|
||||
AND (col.`column_key` = 'jd_tools'
|
||||
OR (col.`menu_type` = 'app' AND col.`route_path` = 'jd-tools'))
|
||||
);
|
||||
|
||||
-- ---------- 3. 两个工具子行(每家公司认本公司组行) ----------
|
||||
INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`)
|
||||
SELECT '京东店铺数据采集', 'jd-collect', 'app', 'jd-collect', 141, grp.`id`, grp.`company_id`
|
||||
FROM `columns` grp
|
||||
WHERE grp.`column_key` = 'jd_tools'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `columns` col
|
||||
WHERE col.`company_id` = grp.`company_id`
|
||||
AND (col.`column_key` = 'jd-collect'
|
||||
OR (col.`menu_type` = 'app' AND col.`route_path` = 'jd-collect'))
|
||||
);
|
||||
|
||||
INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`)
|
||||
SELECT '京东商品上架', 'jd-publish', 'app', 'jd-publish', 142, grp.`id`, grp.`company_id`
|
||||
FROM `columns` grp
|
||||
WHERE grp.`column_key` = 'jd_tools'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `columns` col
|
||||
WHERE col.`company_id` = grp.`company_id`
|
||||
AND (col.`column_key` = 'jd-publish'
|
||||
OR (col.`menu_type` = 'app' AND col.`route_path` = 'jd-publish'))
|
||||
);
|
||||
|
||||
-- ---------- 4. 全量账号默认授权组行(按账号所属公司授本公司的 jd_tools 行) ----------
|
||||
-- 必须钉 column_key:不钉就是"每账号获得本公司全部菜单行的重复授权"(见头注 §2)。
|
||||
INSERT IGNORE INTO `user_column_permission` (`user_id`, `column_id`)
|
||||
SELECT u.`id`, col.`id`
|
||||
FROM `users` u
|
||||
JOIN `columns` col
|
||||
ON col.`company_id` = u.`company_id`
|
||||
AND col.`column_key` = 'jd_tools';
|
||||
|
||||
-- ---------- 5. 自检闸门:不为 0 就抛 1048(列 must_be_zero NOT NULL,V143/V149/V163 家族) ----------
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS `_v209_gate` (`must_be_zero` INT NOT NULL);
|
||||
|
||||
-- 闸门 1:每家公司恰好 组行+子行 各一行,子行父指本公司组行、排序 140/141/142——
|
||||
-- 专防 INSERT 段被 NOT EXISTS 守卫"一声不响少一家树"(V149 闸门 1 同一形态)。
|
||||
INSERT INTO `_v209_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM (
|
||||
SELECT c.`id`
|
||||
FROM `company` c
|
||||
LEFT JOIN `columns` grp ON grp.`company_id` = c.`id` AND grp.`column_key` = 'jd_tools'
|
||||
LEFT JOIN `columns` kid ON kid.`company_id` = c.`id`
|
||||
AND kid.`column_key` IN ('jd-collect', 'jd-publish') AND kid.`parent_id` = grp.`id`
|
||||
GROUP BY c.`id`
|
||||
HAVING COUNT(DISTINCT grp.`id`) <> 1
|
||||
OR COUNT(DISTINCT kid.`id`) <> 2
|
||||
OR MAX(grp.`sort_order`) <> 140
|
||||
OR MIN(kid.`sort_order`) <> 141
|
||||
OR MAX(kid.`sort_order`) <> 142
|
||||
) bad;
|
||||
|
||||
-- 闸门 2:三条 app 路由不允许被别的 column_key 占行(防 uk_company_menu_type_route_path 语义被顶)。
|
||||
INSERT INTO `_v209_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM `columns` col
|
||||
WHERE col.`menu_type` = 'app'
|
||||
AND col.`route_path` IN ('jd-tools', 'jd-collect', 'jd-publish')
|
||||
AND col.`column_key` NOT IN ('jd_tools', 'jd-collect', 'jd-publish');
|
||||
|
||||
-- 闸门 3:每只账号都必须持有本公司 jd_tools 直授(第 4 段漏一行 = 该账号当天丢京东入口,
|
||||
-- 正是本迁移要防的"静默断供"形状)。
|
||||
INSERT INTO `_v209_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM (
|
||||
SELECT u.`id`
|
||||
FROM `users` u
|
||||
JOIN `columns` grp ON grp.`company_id` = u.`company_id` AND grp.`column_key` = 'jd_tools'
|
||||
LEFT JOIN `user_column_permission` g ON g.`user_id` = u.`id` AND g.`column_id` = grp.`id`
|
||||
WHERE g.`user_id` IS NULL
|
||||
) bad;
|
||||
|
||||
-- 闸门 4:jd_tools 的授权绝不指向别公司的组行(V163 闸门 2 同形,给手工插错留复验位)。
|
||||
INSERT INTO `_v209_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM (
|
||||
SELECT g.`user_id`
|
||||
FROM `user_column_permission` g
|
||||
JOIN `users` u ON u.`id` = g.`user_id`
|
||||
JOIN `columns` col ON col.`id` = g.`column_id`
|
||||
WHERE col.`column_key` = 'jd_tools'
|
||||
AND col.`company_id` <> u.`company_id`
|
||||
) bad;
|
||||
|
||||
DROP TEMPORARY TABLE `_v209_gate`;
|
||||
@@ -56,8 +56,11 @@
|
||||
WHERE accessible_group_id IS NOT NULL
|
||||
ORDER BY accessible_group_id ASC
|
||||
</select>
|
||||
<!-- platform 列(2026-11-17):JdCategoryScopeService.retainJdPlatformGroups 只认本投影读出的
|
||||
platform,少了这列每行都是 null ⇒ 平台闸把全部分组(含 jd 档)判成非 jd 清空——
|
||||
与下面 selectLedGroups 同病,投影契约由 ShopManageGroupScopeSqlTest 钉。 -->
|
||||
<select id="selectAllGroups" resultType="com.nanri.aiimage.common.model.entity.ShopManageGroupEntity">
|
||||
SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId
|
||||
SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId, g.platform AS platform
|
||||
FROM biz_shop_manage_group g
|
||||
ORDER BY g.id ASC
|
||||
</select>
|
||||
@@ -81,7 +84,7 @@
|
||||
AND COALESCE(g.created_by_id, g.user_id) IS NOT NULL
|
||||
</select>
|
||||
<select id="selectLedGroups" resultType="com.nanri.aiimage.common.model.entity.ShopManageGroupEntity">
|
||||
SELECT g.id AS id, g.group_name AS groupName
|
||||
SELECT g.id AS id, g.group_name AS groupName, g.platform AS platform
|
||||
FROM biz_shop_manage_group g
|
||||
WHERE g.created_by_id = #{operatorId} OR g.user_id = #{operatorId}
|
||||
ORDER BY g.id ASC
|
||||
|
||||
@@ -122,6 +122,29 @@
|
||||
WHERE a.product_id = p.id AND a.category_id = #{groupId}
|
||||
)
|
||||
</if>
|
||||
<!-- 分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」):已分类=在
|
||||
「当前数据权限分组」(owner_group_id)下有 category_id 非空的归属行——与读侧
|
||||
fillGroupNames 把分类列填出来的条件同形;未分类=NOT EXISTS。谓词 SQL 侧下推
|
||||
(铁律 20 同形,不得 Java 侧对已取页 filter)。owner_group_id 为 NULL(作用域
|
||||
无可分组)时 EXISTS 恒假、NOT EXISTS 恒真——与列表「分类列全空」口径天然一致,
|
||||
不需要服务侧特判。与 2026-11-16 撤掉的旧 grouped/ungrouped 不是一回事:那两档
|
||||
读的是已停用的 biz_jd_product.group_id 列,本档读 V203 归属表。 -->
|
||||
<if test="classified != null">
|
||||
<choose>
|
||||
<when test="classified == true">
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM biz_jd_product_group_assign cs
|
||||
WHERE cs.product_id = p.id AND cs.owner_group_id = #{ownerGroupId} AND cs.category_id IS NOT NULL
|
||||
)
|
||||
</when>
|
||||
<otherwise>
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM biz_jd_product_group_assign cs
|
||||
WHERE cs.product_id = p.id AND cs.owner_group_id = #{ownerGroupId} AND cs.category_id IS NOT NULL
|
||||
)
|
||||
</otherwise>
|
||||
</choose>
|
||||
</if>
|
||||
<if test="syncedFrom != null">AND p.synced_at >= #{syncedFrom}</if>
|
||||
<if test="syncedTo != null">AND p.synced_at <= #{syncedTo}</if>
|
||||
</sql>
|
||||
|
||||
@@ -59,9 +59,15 @@ class MigratedSqlEquivalenceTest {
|
||||
// 补 g.company_id AS companyId(注解时代原文没有这列)——改动是有意的,按 selectTaskPage/V188
|
||||
// 同款处理整行摘出、点名 NOT_MIGRATED;新形状由 47fc0e08 那单的守卫钉。该笔走 fast 档发版
|
||||
// 没点本支,2026-11-17 京东分类管理发版窗 full 闸门抓到补记。
|
||||
private static final int LEDGER_ROWS = 82;
|
||||
// 60 → 59:摘出去那行是一条 select。(59 → 58:摘 ShopManageGroupMapper#selectAllGroups 同上。)
|
||||
private static final int LEDGER_SELECTS = 58;
|
||||
// 82 → 81:2026-11-17 京东分组作用域平台闸(retainJdPlatformGroups)上线当窗事故——
|
||||
// selectAllGroups 与 selectLedGroups 都没补 g.platform AS platform 投影,每行 getPlatform()
|
||||
// 恒 null ⇒ 平台闸把全部分组(含刚建的 jd 档)判成非 jd 清空(「建组建成功、京东侧永远
|
||||
// 不显示」)。selectLedGroups 同批补列,按同款先例整行摘账本点名 NOT_MIGRATED;新形状由
|
||||
// ShopManageGroupScopeSqlTest 两条投影钉。
|
||||
private static final int LEDGER_ROWS = 81;
|
||||
// 60 → 59:摘出去那行是一条 select。(59 → 58:摘 ShopManageGroupMapper#selectAllGroups 同上。
|
||||
// 58 → 57:摘 ShopManageGroupMapper#selectLedGroups 同上(2026-11-17 platform 补列)。)
|
||||
private static final int LEDGER_SELECTS = 57;
|
||||
/** 全部 mapper XML 里的 select 总数:账本 60 + TaskImageCache 5 + AsinResultCache 1。 */
|
||||
/** 66 → 67:会话容忍新增的 {@code AdminUserMapper#countLiveWorkFor} 也是一条 select。 */
|
||||
// 67 → 78:keywordshare 模块新写 11 条 select,逐条登记进下方 NOT_MIGRATED。
|
||||
@@ -206,7 +212,12 @@ class MigratedSqlEquivalenceTest {
|
||||
// g.company_id AS companyId:注解时代原文没有这列,等价性这支对撞即红。
|
||||
// 有意改动按先例整行摘账本点名留痕(LEDGER_ROWS 83 → 82 / SELECTS 59 → 58);
|
||||
// 该笔 fast 档发版漏记,2026-11-17 京东分类管理发版窗 full 闸门抓到补记。
|
||||
"ShopManageGroupMapper#selectAllGroups");
|
||||
"ShopManageGroupMapper#selectAllGroups",
|
||||
// 2026-11-17 京东分组作用域平台闸给 selectLedGroups 补 g.platform AS platform:
|
||||
// 注解时代原文没有这列(同批 selectAllGroups 也漏了 platform 投影,那已在
|
||||
// 上面豁免),平台闸读不到平台档把全部组清空。按同款先例整行摘账本点名留痕
|
||||
// (LEDGER_ROWS 82 → 81 / SELECTS 58 → 57);新形状由 ShopManageGroupScopeSqlTest 钉。
|
||||
"ShopManageGroupMapper#selectLedGroups");
|
||||
|
||||
/** 账本 5 列:接口 / 方法 / @Select 种类 / 是否含常量插值 / 注解原文(Java 反转义后那条串)。 */
|
||||
private static final int LEDGER_COLUMNS = 5;
|
||||
|
||||
+23
-6
@@ -23,7 +23,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
* NullPointerException。平台超管是唯一走这条投影的档位,所以只有超管整页炸,非超管一切正常,
|
||||
* mock 掉 mapper 的单元用例也全都绿。
|
||||
*
|
||||
* <p>判据:投影里少了 {@code company_id},本格直接红——那条查询是「组归属公司」的唯一来源。
|
||||
* <p>2026-11-17 同一条查询再缺一次列:平台闸({@code retainJdPlatformGroups})上线时
|
||||
* {@code selectAllGroups}/{@code selectLedGroups} 都没补 {@code platform} 投影,每行
|
||||
* {@code getPlatform()} 都是 {@code null} ⇒ 平台闸把<b>全部分组(含刚建的 jd 档)判成非 jd
|
||||
* 清空</b>——平台超管在京东侧永远空作用域、空态直建口永远在、建完的组永远不显示
|
||||
* (「建组建成功、界面永远不显示」的生产实录)。两条投影的判据一并钉进本格:
|
||||
* 少 {@code company_id} 或少 {@code platform} 都直接红。
|
||||
*/
|
||||
class ShopManageGroupScopeSqlTest {
|
||||
|
||||
@@ -31,13 +36,25 @@ class ShopManageGroupScopeSqlTest {
|
||||
private static final String NS = "com.nanri.aiimage.common.mapper.ShopManageGroupMapper";
|
||||
|
||||
@Test
|
||||
void 平台超管的组清单必须投影归属公司() throws Exception {
|
||||
void 平台超管的组清单必须投影归属公司与平台档() throws Exception {
|
||||
String sql = render("selectAllGroups");
|
||||
|
||||
assertEquals("SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId"
|
||||
+ " FROM biz_shop_manage_group g ORDER BY g.id ASC", sql,
|
||||
"投影变了:少了 company_id 就是 2026-11-16 那次线上 500(公司名映射为空、"
|
||||
+ "组标签前缀失效);多了列则要把 assemble 的跨公司前缀判据一起复核");
|
||||
assertEquals("SELECT g.id AS id, g.group_name AS groupName, g.company_id AS companyId,"
|
||||
+ " g.platform AS platform FROM biz_shop_manage_group g ORDER BY g.id ASC", sql,
|
||||
"投影变了:少 company_id 就是 2026-11-16 那次线上 500(公司名映射为空、"
|
||||
+ "组标签前缀失效);少 platform 就是 2026-11-17 那次平台闸清空全部分组"
|
||||
+ "(jd 档组建了也不显示);多了列则要把 assemble 的跨公司前缀判据一起复核");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 管理员档的组清单必须投影平台档() throws Exception {
|
||||
String sql = render("selectLedGroups");
|
||||
|
||||
assertEquals("SELECT g.id AS id, g.group_name AS groupName, g.platform AS platform"
|
||||
+ " FROM biz_shop_manage_group g WHERE g.created_by_id = ? OR g.user_id = ?"
|
||||
+ " ORDER BY g.id ASC", sql,
|
||||
"组长/普通号档走这条投影过平台闸:少 platform 则 jd 档组对非超管永远不可见"
|
||||
+ "(与 selectAllGroups 同一批病灶,2026-11-17 实录)");
|
||||
}
|
||||
|
||||
private static String render(String id) throws Exception {
|
||||
|
||||
@@ -105,6 +105,36 @@ class JdSchemaContractTest {
|
||||
assertTrue(sql.contains("迁移 V203"), "头注释必须是 `-- 迁移 V203…`(MigrationInventoryTest 口径)");
|
||||
}
|
||||
|
||||
@Test
|
||||
void V209_app菜单_京东工具台三行与全量组行预授权() {
|
||||
String sql = read(DB_DIR.resolve("V209__jd_app_menu.sql"));
|
||||
assertTrue(sql.contains("迁移 V209"), "头注释必须是 `-- 迁移 V209…`(MigrationInventoryTest 口径)");
|
||||
for (String key : List.of("jd_tools", "jd-collect", "jd-publish")) {
|
||||
assertTrue(sql.contains("'" + key + "'"), "缺 app column_key: " + key);
|
||||
}
|
||||
assertTrue(sql.contains("京东工具台") && sql.contains("京东店铺数据采集") && sql.contains("京东商品上架"),
|
||||
"缺菜单名(组/采集/上架)");
|
||||
for (String route : List.of("jd-tools", "jd-collect", "jd-publish")) {
|
||||
assertTrue(sql.contains("'" + route + "'"), "缺 route_path: " + route);
|
||||
}
|
||||
assertTrue(sql.contains("'app'"), "三行必须是 menu_type='app'(用户端权限树)");
|
||||
assertTrue(sql.contains("NOT EXISTS"), "必须带幂等守卫");
|
||||
// 预授权段:与 V190/V196(admin 页不预插)不同,app 行不预授权=现用人当天丢功能,
|
||||
// 口径沿 V163——全量账号按公司授【组行】,且必须钉 column_key。
|
||||
assertTrue(sql.contains("INSERT IGNORE INTO `user_column_permission`"), "缺预授权段(V163 口径:默认全授组行)");
|
||||
assertTrue(sql.indexOf("INSERT IGNORE INTO `user_column_permission`") < sql.indexOf("_v209_gate"),
|
||||
"预授权段必须落在自检闸门之前");
|
||||
String grantSection = sql.substring(sql.indexOf("INSERT IGNORE INTO `user_column_permission`"));
|
||||
assertTrue(grantSection.lines().limit(15).anyMatch(line -> line.contains("col.`column_key` = 'jd_tools'")),
|
||||
"预授权 JOIN 必须钉 column_key='jd_tools'——不钉就是每账号获得本公司全部菜单行的重复授权(V163 隐患,本笔收紧)");
|
||||
// 四道自检闸门(形状/路由占位/无漏授/无跨公司授权)都要在。
|
||||
assertTrue(sql.contains("_v209_gate"), "缺自检闸门");
|
||||
long gates = sql.lines().filter(line -> line.startsWith("-- 闸门")).count();
|
||||
assertTrue(gates >= 4, "闸门不足四道(V163 只有两道,本笔必须多一道『无账号漏授』)");
|
||||
// 回滚写成注释(不进 Flyway 扫描),顺序照 V165:授权→子行→组行。
|
||||
assertTrue(sql.contains("flyway_schema_history WHERE version='209'"), "缺回滚注释");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 配置_独立图片桶不落默认桶() {
|
||||
String appYml = read(RESOURCES.resolve("application.yml"));
|
||||
|
||||
+175
-48
@@ -77,7 +77,8 @@ import static org.mockito.Mockito.when;
|
||||
* <p><b>V203 分类按数据权限分组隔离(2026-11-16 用户口径)</b>:分类归属存
|
||||
* {@code biz_jd_product_group_assign} 的 (product_id, owner_group_id) 一行,读面靠
|
||||
* {@code owner_group_id} 取「当前分组」的分类(缺省=作用域默认分组),归类的写权限
|
||||
* 由 {@link JdCategoryScopeService} 判「该组可写」——商品行编辑/删除仍只平台超管。
|
||||
* 由 {@link JdCategoryScopeService} 判「该组可写」——商品行编辑/删除走管理员级写闸
|
||||
* (2026-11-17 用户口径「超管+管理员都可以,只有普通员工不能」)。
|
||||
* 本类把作用域服务整体 mock 掉(四档角色矩阵在 {@code JdCategoryScopeServiceTest} 里钉),
|
||||
* 只钉控制器怎么用它、以及拒绝语义不被吞。</p>
|
||||
*/
|
||||
@@ -164,6 +165,10 @@ class AdminJdProductControllerTest {
|
||||
}
|
||||
assertFalse(source.contains("@RequestParam(name = \"ungrouped\""));
|
||||
assertFalse(source.contains("@RequestParam(name = \"grouped\""));
|
||||
// 2026-11-17 分类状态快筛:新参数名 classified(不复用旧 grouped/ungrouped 两档——
|
||||
// 那两档读已停用的 biz_jd_product.group_id 列,语义不同,旧参数仍必须被拒收)。
|
||||
assertTrue(source.contains("@RequestParam(name = \"classified\""),
|
||||
"分类状态快筛参数 classified 必须在册(2026-11-17 用户口径)");
|
||||
// company_id 参数已随 2026-11-16「删除掉公司 tab」整批摘除(读侧零公司维度支另有反向钉)。
|
||||
assertFalse(source.contains("company_id"), "company_id 请求参数必须已删除,不得回潜");
|
||||
// 商品状态筛选框已随 2026-11-15 客户口径从前端下线 ⇒ 服务端同名参数一起撤(反向钉住防回潜)。
|
||||
@@ -231,25 +236,29 @@ class AdminJdProductControllerTest {
|
||||
assertTrue(source.contains("\"owner_group_id\""), "列表必须收 owner_group_id(当前分组)");
|
||||
}
|
||||
|
||||
// ===================== 写权限分档(2026-11-16 / V203) =====================
|
||||
// ===================== 写权限分档(2026-11-17:超管级+管理员可写,普通账号只读) =====================
|
||||
|
||||
/** 写端点越权闸的结构判据:商品行四条写路由走超管闸,读三条走菜单正门。 */
|
||||
/** 写端点越权闸的结构判据:商品行四条写路由走管理员级写闸,读三条走菜单正门。 */
|
||||
@Test
|
||||
void 商品页读写权限分档_商品行写端点逐条走超管闸() throws IOException {
|
||||
void 商品页读写权限分档_商品行写端点逐条走管理员级写闸() throws IOException {
|
||||
String source = stripComments(Files.readString(CONTROLLER));
|
||||
assertEquals(4, count(source, "requirePlatformSuperAdminWrite(request)"),
|
||||
"编辑/上传图片/单行删除/批量删除四条商品行写路由必须逐条走超管写闸"
|
||||
assertEquals(4, count(source, "requireJdProductWrite(request)"),
|
||||
"编辑/上传图片/单行删除/批量删除四条商品行写路由必须逐条走管理员级写闸"
|
||||
+ "(归类不在此列:V203 起归本组管理员可做)");
|
||||
assertEquals(5, count(source, "requireJdAccess(request)"),
|
||||
"列表/类目/详情/归类四条读+组内写路由,与超管写闸内部一处,共五处菜单权限正门");
|
||||
assertTrue(source.contains("仅平台超级管理员可以编辑或删除京东数据库数据"),
|
||||
"非超管写商品的 403 文案必须点名平台超管");
|
||||
"列表/类目/详情/归类四条读+组内写路由,与写闸内部一处,共五处菜单权限正门");
|
||||
assertTrue(source.contains("仅超级管理员或管理员可以编辑或删除京东数据库数据"),
|
||||
"普通账号写商品的 403 文案必须点名超管与管理员(2026-11-17 口径)");
|
||||
assertTrue(source.contains("operator.superAdmin()"),
|
||||
"写闸必须在菜单口径之上再判 superAdmin(只放行站点超管,公司超管不在内)");
|
||||
"写闸必须在菜单口径之上再判 superAdmin(平台超管直放)");
|
||||
assertTrue(source.contains("DeviceSessionPolicy.isCompanySuperAdmin(role)"),
|
||||
"写闸必须放行公司超级管理员(超管档,2026-11-17 口径「只有普通员工不能」)");
|
||||
assertTrue(source.contains("\"admin\".equals(role)"),
|
||||
"写闸必须放行 admin 角色(管理员档,2026-11-17 口径「超管+管理员都可以」)");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 非超管有菜单权限时读放行_商品行写一律403且不触服务() {
|
||||
void 普通账号有菜单权限时读放行_商品行写一律403且不触服务() {
|
||||
JdProductQueryService queryService = mock(JdProductQueryService.class);
|
||||
JdProductDeleteService deleteService = mock(JdProductDeleteService.class);
|
||||
JdProductUpdateService updateService = mock(JdProductUpdateService.class);
|
||||
@@ -263,11 +272,12 @@ class AdminJdProductControllerTest {
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(9L);
|
||||
operator.setUsername("company-admin");
|
||||
operator.setUsername("member");
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
// 非超管(管理员 / 公司超管同形):拿到 admin_jd_database 菜单权限后读可进、商品行写仍拒。
|
||||
when(authSupport.currentRole(operator)).thenReturn("admin");
|
||||
// 普通账号:resolveRole 归不出档返回 null(AdminAuthSupport.currentRole 真实形状);
|
||||
// 拿到 admin_jd_database 菜单权限后读可进、商品行写仍拒(2026-11-17 口径「只有普通员工不能」)。
|
||||
when(authSupport.currentRole(operator)).thenReturn(null);
|
||||
PermissionMenuItemVo grant = new PermissionMenuItemVo();
|
||||
grant.setColumnKey(COLUMN_KEY);
|
||||
grant.setRoutePath(ROUTE_PATH);
|
||||
@@ -279,30 +289,30 @@ class AdminJdProductControllerTest {
|
||||
// 读:菜单权限命中即放行(公共库一人一份全量)。
|
||||
JdProductPageVo pageVo = new JdProductPageVo();
|
||||
pageVo.setItems(List.of());
|
||||
when(queryService.page(1L, 20L, null, null, null, null, null, null, GROUP_ID)).thenReturn(pageVo);
|
||||
assertEquals(Boolean.TRUE, controller.page(1L, 20L, null, null, null, null, null, null, null, request)
|
||||
.isSuccess(), "非超管有菜单权限时读必须放行(读写分档只收窄写)");
|
||||
when(queryService.page(1L, 20L, null, null, null, null, null, null, null, GROUP_ID)).thenReturn(pageVo);
|
||||
assertEquals(Boolean.TRUE, controller.page(1L, 20L, null, null, null, null, null, null, null, null, request)
|
||||
.isSuccess(), "普通账号有菜单权限时读必须放行(读写分档只收窄写)");
|
||||
|
||||
// 商品行写:四条写入口一律 403,且业务服务一次都没被调到(不能「先写再拒」)。
|
||||
JdProductUpdateRequest updateBody = new JdProductUpdateRequest();
|
||||
updateBody.setTitle("标题");
|
||||
BusinessException updateEx = assertThrows(BusinessException.class,
|
||||
() -> controller.update(11L, updateBody, request));
|
||||
assertTrue(updateEx.getMessage().contains("仅平台超级管理员"), "编辑被拒文案点名平台超管");
|
||||
assertTrue(updateEx.getMessage().contains("仅超级管理员或管理员"), "编辑被拒文案点名超管与管理员");
|
||||
|
||||
BusinessException deleteEx = assertThrows(BusinessException.class,
|
||||
() -> controller.delete(11L, request));
|
||||
assertTrue(deleteEx.getMessage().contains("仅平台超级管理员"));
|
||||
assertTrue(deleteEx.getMessage().contains("仅超级管理员或管理员"));
|
||||
|
||||
JdProductBatchDeleteRequest batchBody = new JdProductBatchDeleteRequest();
|
||||
batchBody.setIds(List.of(11L, 12L));
|
||||
BusinessException batchEx = assertThrows(BusinessException.class,
|
||||
() -> controller.batchDelete(batchBody, request));
|
||||
assertTrue(batchEx.getMessage().contains("仅平台超级管理员"));
|
||||
assertTrue(batchEx.getMessage().contains("仅超级管理员或管理员"));
|
||||
|
||||
BusinessException uploadEx = assertThrows(BusinessException.class,
|
||||
() -> controller.uploadImage(11L, mock(MultipartFile.class), "MAIN", null, null, request));
|
||||
assertTrue(uploadEx.getMessage().contains("仅平台超级管理员"),
|
||||
assertTrue(uploadEx.getMessage().contains("仅超级管理员或管理员"),
|
||||
"上传/替换图片改桶内对象=写动作,必须同闸");
|
||||
|
||||
verify(updateService, never()).update(any(), any());
|
||||
@@ -311,6 +321,69 @@ class AdminJdProductControllerTest {
|
||||
verify(deleteService, never()).delete(any());
|
||||
}
|
||||
|
||||
/** 2026-11-17 口径「超管+管理员都可以」:admin 档四条写入口全放行、公司超管(超管档)同闸放行。 */
|
||||
@Test
|
||||
void 管理员与公司超管有菜单权限即可写商品_写入口放行且触服务() {
|
||||
JdProductQueryService queryService = mock(JdProductQueryService.class);
|
||||
JdProductDeleteService deleteService = mock(JdProductDeleteService.class);
|
||||
JdProductUpdateService updateService = mock(JdProductUpdateService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService permissionMenuService = mock(PermissionMenuService.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, deleteService, updateService, mock(JdProductGroupService.class),
|
||||
mock(JdCategoryScopeService.class), authSupport, permissionMenuService);
|
||||
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(9L);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
// 管理员(admin 档,非任何超管):菜单权限命中后商品行写全放行。
|
||||
when(authSupport.currentRole(operator)).thenReturn("admin");
|
||||
PermissionMenuItemVo grant = new PermissionMenuItemVo();
|
||||
grant.setColumnKey(COLUMN_KEY);
|
||||
grant.setRoutePath(ROUTE_PATH);
|
||||
when(permissionMenuService.getUserColumnPermissions(9L, "admin")).thenReturn(List.of(grant));
|
||||
|
||||
JdProductUpdateRequest updateBody = new JdProductUpdateRequest();
|
||||
updateBody.setTitle("标题");
|
||||
JdProductDetailVo detailVo = new JdProductDetailVo();
|
||||
detailVo.setId(11L);
|
||||
when(updateService.update(11L, updateBody)).thenReturn(11L);
|
||||
when(queryService.detail(11L, null)).thenReturn(detailVo);
|
||||
assertEquals(Boolean.TRUE, controller.update(11L, updateBody, request).isSuccess(),
|
||||
"admin 档编辑放行必须是 success 信封(B80-03)");
|
||||
verify(updateService).update(11L, updateBody);
|
||||
|
||||
when(updateService.uploadImage(11L, null, "MAIN", null, null)).thenReturn(11L);
|
||||
assertEquals(Boolean.TRUE,
|
||||
controller.uploadImage(11L, null, "MAIN", null, null, request).isSuccess(),
|
||||
"admin 档上传图片同闸放行");
|
||||
verify(updateService).uploadImage(11L, null, "MAIN", null, null);
|
||||
|
||||
JdProductDeleteVo receipt = new JdProductDeleteVo();
|
||||
receipt.setDeleted(1);
|
||||
when(deleteService.delete(List.of(11L))).thenReturn(receipt);
|
||||
assertEquals(Boolean.TRUE, controller.delete(11L, request).isSuccess(), "admin 档单行删除放行");
|
||||
JdProductBatchDeleteRequest batchBody = new JdProductBatchDeleteRequest();
|
||||
batchBody.setIds(List.of(11L, 12L));
|
||||
when(deleteService.delete(List.of(11L, 12L))).thenReturn(receipt);
|
||||
assertEquals(Boolean.TRUE, controller.batchDelete(batchBody, request).isSuccess(), "admin 档批量删除放行");
|
||||
verify(deleteService).delete(List.of(11L));
|
||||
verify(deleteService).delete(List.of(11L, 12L));
|
||||
|
||||
// 公司超管=超管档:同一道闸放行(单条删除代表性钉住,防「只放平台超管」回潜)。
|
||||
AdminUserEntity companySuper = new AdminUserEntity();
|
||||
companySuper.setId(8L);
|
||||
HttpServletRequest companyRequest = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(companyRequest)).thenReturn(companySuper);
|
||||
when(authSupport.currentRole(companySuper)).thenReturn("company_super_admin");
|
||||
when(permissionMenuService.getUserColumnPermissions(8L, "admin")).thenReturn(List.of(grant));
|
||||
when(deleteService.delete(List.of(21L))).thenReturn(receipt);
|
||||
assertEquals(Boolean.TRUE, controller.delete(21L, companyRequest).isSuccess(),
|
||||
"公司超级管理员属超管档,商品行写同闸放行(2026-11-17 口径)");
|
||||
verify(deleteService).delete(List.of(21L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 不可写组的分组写一律403且不触服务() {
|
||||
JdProductGroupService groupService = mock(JdProductGroupService.class);
|
||||
@@ -429,11 +502,11 @@ class AdminJdProductControllerTest {
|
||||
when(groupService.requireCategory(8L)).thenReturn(category(8L, 20L));
|
||||
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> controller.page(1L, 20L, null, null, null, 8L, null, null, null, request));
|
||||
() -> controller.page(1L, 20L, null, null, null, 8L, null, null, null, null, request));
|
||||
assertTrue(ex.getMessage().contains("无权查看该分组的分类"),
|
||||
"跨组分类筛选必须 403 点名分组,不做空结果降级");
|
||||
|
||||
verify(queryService, never()).page(any(), any(), any(), any(), any(), any(), any(), any(), any());
|
||||
verify(queryService, never()).page(any(), any(), any(), any(), any(), any(), any(), any(), any(), any());
|
||||
}
|
||||
|
||||
// ===================== 行为样本 =====================
|
||||
@@ -461,13 +534,13 @@ class AdminJdProductControllerTest {
|
||||
pageVo.setTotal(0L);
|
||||
pageVo.setPage(1L);
|
||||
pageVo.setPageSize((long) PageDefaults.JD_PRODUCTS_PAGE_SIZE_INT);
|
||||
when(queryService.page(1L, 20L, null, null, null, null, null, null, GROUP_ID)).thenReturn(pageVo);
|
||||
when(queryService.page(1L, 20L, null, null, null, null, null, null, null, GROUP_ID)).thenReturn(pageVo);
|
||||
|
||||
// 请求面没有 company_id:任何授权身份看到的都是同一份全量;分类列按 owner_group_id 取。
|
||||
ApiResponse<JdProductPageVo> response = controller.page(1L, 20L, null, null, null, null,
|
||||
GROUP_ID, null, null, request);
|
||||
GROUP_ID, null, null, null, request);
|
||||
|
||||
verify(queryService).page(1L, 20L, null, null, null, null, null, null, GROUP_ID);
|
||||
verify(queryService).page(1L, 20L, null, null, null, null, null, null, null, GROUP_ID);
|
||||
assertEquals(Boolean.TRUE, response.isSuccess(), "拒绝走 403 业务码,放行必须是 success 信封(B80-03)");
|
||||
assertEquals(pageVo, response.getData());
|
||||
}
|
||||
@@ -491,12 +564,12 @@ class AdminJdProductControllerTest {
|
||||
for (String value : List.of("true", "false", "")) {
|
||||
when(request.getParameter(name)).thenReturn(value);
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> controller.page(1L, 20L, null, null, null, 7L, null, null, null, request));
|
||||
() -> controller.page(1L, 20L, null, null, null, 7L, null, null, null, null, request));
|
||||
assertTrue(ex.getMessage().contains("刷新页面"));
|
||||
when(request.getParameter(name)).thenReturn(null);
|
||||
}
|
||||
}
|
||||
verify(queryService, never()).page(any(), any(), any(), any(), any(), any(), any(), any(), any());
|
||||
verify(queryService, never()).page(any(), any(), any(), any(), any(), any(), any(), any(), any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -615,23 +688,23 @@ class AdminJdProductControllerTest {
|
||||
void 查询服务分页钳制防溢出() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = queryService(mapper);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
|
||||
// page=0 / size=null ⇒ 归一为第 1 页、默认 20 条;offset = 0。
|
||||
service.page(0L, null, null, null, null, null, null, null, null);
|
||||
service.page(0L, null, null, null, null, null, null, null, null, null);
|
||||
ArgumentCaptor<Long> offset = ArgumentCaptor.forClass(Long.class);
|
||||
ArgumentCaptor<Integer> limit = ArgumentCaptor.forClass(Integer.class);
|
||||
verify(mapper).selectProductPage(isNull(), isNull(), isNull(), isNull(), isNull(), isNull(),
|
||||
offset.capture(), limit.capture());
|
||||
isNull(), isNull(), offset.capture(), limit.capture());
|
||||
assertEquals(0L, offset.getValue());
|
||||
assertEquals(PageDefaults.JD_PRODUCTS_PAGE_SIZE_INT, limit.getValue());
|
||||
|
||||
// page=Long.MAX_VALUE / size=500 ⇒ 钳到 10_000 页、100 条;乘积 999_900 不得变负(铁律 15)。
|
||||
service.page(Long.MAX_VALUE, 500L, null, null, null, null, null, null, null);
|
||||
service.page(Long.MAX_VALUE, 500L, null, null, null, null, null, null, null, null);
|
||||
ArgumentCaptor<Long> offsetMax = ArgumentCaptor.forClass(Long.class);
|
||||
ArgumentCaptor<Integer> limitMax = ArgumentCaptor.forClass(Integer.class);
|
||||
verify(mapper, times(2)).selectProductPage(any(), any(), any(), any(), any(), any(),
|
||||
offsetMax.capture(), limitMax.capture());
|
||||
any(), any(), offsetMax.capture(), limitMax.capture());
|
||||
assertEquals(999_900L, offsetMax.getValue(), "(page-1)*page_size 最大 999_900,钳制后不得溢出变负");
|
||||
assertEquals(100, limitMax.getValue());
|
||||
}
|
||||
@@ -643,23 +716,77 @@ class AdminJdProductControllerTest {
|
||||
LocalDateTime from = LocalDateTime.of(2026, 11, 14, 12, 0);
|
||||
LocalDateTime to = LocalDateTime.of(2026, 11, 14, 8, 0);
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> service.page(1L, 20L, null, null, null, null, from, to, null));
|
||||
() -> service.page(1L, 20L, null, null, null, null, from, to, null, null));
|
||||
assertTrue(ex.getMessage().contains("开始时间不能晚于结束时间"), "倒挂时间按业务异常拒绝");
|
||||
verify(mapper, never()).countProducts(any(), any(), any(), any(), any(), any());
|
||||
verify(mapper, never()).countProducts(any(), any(), any(), any(), any(), any(), any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 查询服务过滤面原样直传且空串归null() {
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = queryService(mapper);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
service.page(1L, 20L, " SKU-1 ", " 连衣裙 ", " 艺考形体服 ", 7L, null, null, null);
|
||||
verify(mapper).countProducts("SKU-1", "连衣裙", "艺考形体服", 7L, null, null);
|
||||
verify(mapper).selectProductPage("SKU-1", "连衣裙", "艺考形体服", 7L, null, null, 0L, 20);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
service.page(1L, 20L, " SKU-1 ", " 连衣裙 ", " 艺考形体服 ", 7L, null, null, null, null);
|
||||
verify(mapper).countProducts("SKU-1", "连衣裙", "艺考形体服", 7L, null, null, null, null);
|
||||
verify(mapper).selectProductPage("SKU-1", "连衣裙", "艺考形体服", 7L, null, null, null, null, 0L, 20);
|
||||
|
||||
service.page(1L, 20L, " ", null, null, 0L, null, null, null);
|
||||
verify(mapper).countProducts(null, null, null, null, null, null);
|
||||
verify(mapper).selectProductPage(null, null, null, null, null, null, 0L, 20);
|
||||
service.page(1L, 20L, " ", null, null, 0L, null, null, null, null);
|
||||
verify(mapper).countProducts(null, null, null, null, null, null, null, null);
|
||||
verify(mapper).selectProductPage(null, null, null, null, null, null, null, null, 0L, 20);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分类状态快筛(2026-11-17 用户口径「加个已分类和未分类的筛选」):
|
||||
* ① classified+ownerGroupId 必须原样下传给 mapper(谓词在 XML 的 EXISTS/NOT EXISTS 段,
|
||||
* 铁律 20 同形——不得 Java 侧对已取页 filter);
|
||||
* ② XML 绊线:两分支谓词逐字在册(改回 Java filter 或摘掉 owner_group_id 关联即红);
|
||||
* ③ 控制器把请求的 classified 直传服务(不吞、不改写)。
|
||||
*/
|
||||
@Test
|
||||
void 分类状态快筛必须SQL下推且classified与ownerGroupId成对直传() throws IOException {
|
||||
// ② XML 绊线:classified 档的 EXISTS/NOT EXISTS 两分支都在 productConds 里,
|
||||
// 且按「当前分组」owner_group_id+category_id 非空判——与读侧填分类列同形。
|
||||
Path xml = findJdProductMapperXml();
|
||||
String xmlText = stripComments(Files.readString(xml)).replaceAll("(?s)<!--.*?-->", "");
|
||||
assertTrue(xmlText.contains("classified == true"),
|
||||
"XML 必须有 classified==true 的已分类分支(SQL 侧下推,铁律 20 同形)");
|
||||
assertTrue(xmlText.contains("cs.owner_group_id = #{ownerGroupId}")
|
||||
&& xmlText.contains("cs.category_id IS NOT NULL"),
|
||||
"已分类判据必须按当前分组归属行且 category_id 非空(与 fillGroupNames 同形)");
|
||||
assertTrue(xmlText.contains("NOT EXISTS"), "未分类档必须是 NOT EXISTS(不是空结果降级)");
|
||||
assertEquals(2, count(xmlText, "cs.product_id = p.id"),
|
||||
"EXISTS/NOT EXISTS 两分支各一处商品关联,缺一个即红");
|
||||
|
||||
// ① 服务直传:classified 与 ownerGroupId 成对进 mapper(计数与分页同一过滤面)。
|
||||
JdProductMapper mapper = mock(JdProductMapper.class);
|
||||
JdProductQueryService service = queryService(mapper);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
service.page(1L, 20L, null, null, null, null, null, null, Boolean.TRUE, GROUP_ID);
|
||||
verify(mapper).countProducts(null, null, null, null, null, null, true, GROUP_ID);
|
||||
verify(mapper).selectProductPage(null, null, null, null, null, null, true, GROUP_ID, 0L, 20);
|
||||
|
||||
service.page(1L, 20L, null, null, null, null, null, null, Boolean.FALSE, GROUP_ID);
|
||||
verify(mapper).countProducts(null, null, null, null, null, null, false, GROUP_ID);
|
||||
verify(mapper).selectProductPage(null, null, null, null, null, null, false, GROUP_ID, 0L, 20);
|
||||
|
||||
// ③ 控制器直传:classified 原样进服务(owner_group_id 仍按作用域收敛后的值)。
|
||||
JdProductQueryService queryService = mock(JdProductQueryService.class);
|
||||
JdCategoryScopeService scopeService = mock(JdCategoryScopeService.class);
|
||||
AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
|
||||
AdminJdProductController controller = new AdminJdProductController(
|
||||
queryService, mock(JdProductDeleteService.class), mock(JdProductUpdateService.class),
|
||||
mock(JdProductGroupService.class), scopeService, authSupport,
|
||||
mock(PermissionMenuService.class));
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(7L);
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(authSupport.requireUser(request)).thenReturn(operator);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
JdCategoryScopeService.JdCategoryScope scope = writableScope(GROUP_ID, COMPANY_ID);
|
||||
when(scopeService.resolve(operator)).thenReturn(scope);
|
||||
when(scopeService.readGroupOrNull(scope, null)).thenReturn(GROUP_ID);
|
||||
controller.page(1L, 20L, null, null, null, null, null, null, null, Boolean.TRUE, request);
|
||||
verify(queryService).page(1L, 20L, null, null, null, null, null, null, Boolean.TRUE, GROUP_ID);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -807,8 +934,8 @@ class AdminJdProductControllerTest {
|
||||
|
||||
JdProductEntity categorized = productEntity(1L);
|
||||
JdProductEntity missing = productEntity(2L);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any())).thenReturn(2L);
|
||||
when(mapper.selectProductPage(any(), any(), any(), any(), any(), any(),
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(2L);
|
||||
when(mapper.selectProductPage(any(), any(), any(), any(), any(), any(), any(), any(),
|
||||
anyLong(), anyInt())).thenReturn(List.of(categorized, missing));
|
||||
when(assignMapper.selectList(any())).thenReturn(List.of(
|
||||
assign(1L, GROUP_ID, 3L), assign(2L, GROUP_ID, 99L)));
|
||||
@@ -817,7 +944,7 @@ class AdminJdProductControllerTest {
|
||||
category.setName("秋冬款");
|
||||
when(categoryMapper.selectBatchIds(any())).thenReturn(List.of(category));
|
||||
|
||||
JdProductPageVo vo = service.page(1L, 20L, null, null, null, null, null, null, GROUP_ID);
|
||||
JdProductPageVo vo = service.page(1L, 20L, null, null, null, null, null, null, null, GROUP_ID);
|
||||
|
||||
assertEquals(3L, vo.getItems().get(0).getGroupId(), "分类 id 取本组归属行");
|
||||
assertEquals("秋冬款", vo.getItems().get(0).getGroupName(), "行集归属一次取齐分类名(无逐行查询)");
|
||||
@@ -832,11 +959,11 @@ class AdminJdProductControllerTest {
|
||||
JdProductGroupAssignMapper assignMapper = mock(JdProductGroupAssignMapper.class);
|
||||
JdProductQueryService service = queryService(mapper, mock(JdProductImageMapper.class),
|
||||
mock(JdProductSkuMapper.class), mock(JdProductGroupMapper.class), assignMapper);
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
when(mapper.selectProductPage(any(), any(), any(), any(), any(), any(),
|
||||
when(mapper.countProducts(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(1L);
|
||||
when(mapper.selectProductPage(any(), any(), any(), any(), any(), any(), any(), any(),
|
||||
anyLong(), anyInt())).thenReturn(List.of(productEntity(1L)));
|
||||
|
||||
JdProductPageVo vo = service.page(1L, 20L, null, null, null, null, null, null, null);
|
||||
JdProductPageVo vo = service.page(1L, 20L, null, null, null, null, null, null, null, null);
|
||||
|
||||
assertNull(vo.getItems().get(0).getGroupId(), "不属于任何分组的账号:分类列一律空(未分类)");
|
||||
assertNull(vo.getItems().get(0).getGroupName());
|
||||
|
||||
@@ -44,7 +44,6 @@ ShopManageGroupMapper selectAccessibleCreatorUserIds Select PURE SELECT DISTINCT
|
||||
ShopManageGroupMapper selectAccessibleGroupIds Select PURE SELECT DISTINCT accessible_group_id\nFROM (\n SELECT g.id AS accessible_group_id\n FROM biz_shop_manage_group g\n WHERE g.created_by_id = #{operatorId}\n OR g.user_id = #{operatorId}\n UNION\n SELECT gm.group_id AS accessible_group_id\n FROM biz_shop_manage_group_member gm\n WHERE gm.user_id = #{operatorId}\n UNION\n SELECT g2.id AS accessible_group_id\n FROM biz_shop_manage_group_member gm\n INNER JOIN biz_shop_manage_group g1 ON g1.id = gm.group_id\n INNER JOIN biz_shop_manage_group g2\n ON g2.created_by_id = COALESCE(g1.created_by_id, g1.user_id)\n OR g2.user_id = COALESCE(g1.created_by_id, g1.user_id)\n WHERE gm.user_id = #{operatorId}\n AND COALESCE(g1.created_by_id, g1.user_id) IS NOT NULL\n UNION\n SELECT member_groups.id AS accessible_group_id\n FROM biz_shop_manage_group leader_group\n INNER JOIN biz_shop_manage_group_member direct_member ON direct_member.group_id = leader_group.id\n INNER JOIN biz_shop_manage_group member_groups\n ON member_groups.created_by_id = direct_member.user_id\n OR member_groups.user_id = direct_member.user_id\n WHERE leader_group.created_by_id = #{operatorId}\n OR leader_group.user_id = #{operatorId}\n) accessible_groups\nWHERE accessible_group_id IS NOT NULL\nORDER BY accessible_group_id ASC
|
||||
ShopManageGroupMapper selectGroupNamesByUserIds Select PURE <script>\nSELECT u.id AS userId, g.group_name AS groupName\nFROM users u\nINNER JOIN biz_shop_manage_group g\n ON g.created_by_id = u.created_by_id OR g.user_id = u.created_by_id\nWHERE u.created_by_id IS NOT NULL\n AND u.id IN\n<foreach collection='userIds' item='userId' open='(' separator=',' close=')'>\n #{userId}\n</foreach>\nORDER BY g.id ASC\n</script>
|
||||
ShopManageGroupMapper selectLeaderIdsByMemberUserId Select PURE SELECT DISTINCT COALESCE(g.created_by_id, g.user_id) AS leader_id\nFROM biz_shop_manage_group_member gm\nINNER JOIN biz_shop_manage_group g ON g.id = gm.group_id\nWHERE gm.user_id = #{userId}\n AND COALESCE(g.created_by_id, g.user_id) IS NOT NULL
|
||||
ShopManageGroupMapper selectLedGroups Select PURE SELECT g.id AS id, g.group_name AS groupName\nFROM biz_shop_manage_group g\nWHERE g.created_by_id = #{operatorId} OR g.user_id = #{operatorId}\nORDER BY g.id ASC
|
||||
ShopManageGroupMapper selectManagedMemberUserIds Select PURE SELECT DISTINCT gm.user_id\nFROM biz_shop_manage_group g\nINNER JOIN biz_shop_manage_group_member gm ON gm.group_id = g.id\nINNER JOIN users u ON u.id = gm.user_id\nWHERE g.created_by_id = #{operatorId}\n OR g.user_id = #{operatorId}\nORDER BY gm.user_id ASC
|
||||
ShopManageGroupMapper selectUserIdsByGroupId Select PURE SELECT u.id AS userId\nFROM users u\nINNER JOIN biz_shop_manage_group g ON g.id = #{groupId}\nWHERE u.id = COALESCE(g.created_by_id, g.user_id)\n OR u.created_by_id = COALESCE(g.created_by_id, g.user_id)\nORDER BY u.id ASC
|
||||
ShopManageGroupMapper selectUserIdsByGroupIds Select PURE <script>\nSELECT DISTINCT visible_user_id\nFROM (\n SELECT COALESCE(g.created_by_id, g.user_id) AS visible_user_id\n FROM biz_shop_manage_group g\n WHERE g.id IN\n <foreach collection='groupIds' item='groupId' open='(' separator=',' close=')'>\n #{groupId}\n </foreach>\n UNION\n SELECT gm.user_id AS visible_user_id\n FROM biz_shop_manage_group_member gm\n WHERE gm.group_id IN\n <foreach collection='groupIds' item='groupId' open='(' separator=',' close=')'>\n #{groupId}\n </foreach>\n) visible_users\nWHERE visible_user_id IS NOT NULL\nORDER BY visible_user_id ASC\n</script>
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 1 and column 222.
|
@@ -64,9 +64,10 @@
|
||||
data-column-key="wb"
|
||||
>视频</router-link>
|
||||
|
||||
<!-- 京东入口:一级入口,不挂在亚马逊/视频的权限树里(京东工具台自带两个菜单,
|
||||
权限收口在工具台内部;入口恒显示,避免账号还没配京东菜单时入口凭空消失)。 -->
|
||||
<!-- 京东入口(V209 起纳入 app 菜单权限):jd_tools 组行或其子项/祖先命中即可见。
|
||||
权限接口异常时退回显示(与亚马逊/视频入口同一兜底),不空白。 -->
|
||||
<router-link
|
||||
v-if="canShow.jd"
|
||||
:to="jdHref"
|
||||
class="entrance-btn jd"
|
||||
:class="{ disabled: !jdHref }"
|
||||
@@ -81,7 +82,8 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { restoreLoginUser } from '@/shared/auth/ensure-auth'
|
||||
import { getCurrentUserAppColumnRaw, readCachedAppColumnPermissions, type PermissionMenuItem } from '@/shared/api/permission'
|
||||
import { getCurrentUserAppColumnRaw, readCachedAppColumnPermissions } from '@/shared/api/permission'
|
||||
import { computePermissionState, type PermissionState } from './home-permission'
|
||||
import { useVersionUpdate } from '@/shared/composables/useVersionUpdate'
|
||||
import UpdateProgressBar from '@/shared/components/UpdateProgressBar.vue'
|
||||
import UpdateLogList from '@/shared/components/UpdateLogList.vue'
|
||||
@@ -116,10 +118,10 @@ const {
|
||||
// 桌面端原 Flask /logout 已随瘦身下线:统一跳登录页并清本地 token(/login?logout=1)
|
||||
const logoutHref = computed(() => `${resolvePageHref('/new_web_source/login.html')}?logout=1`)
|
||||
|
||||
// 桌面端首页仅保留一级入口:亚马逊 / 视频;图片已收进视频页(/image-video)二级菜单。
|
||||
// 桌面端首页仅保留一级入口:亚马逊 / 视频 / 京东;图片已收进视频页(/image-video)二级菜单。
|
||||
// 入口先乐观显示(接口返回后按权限隐藏),避免权限接口慢时首页入口空白"点不了"。
|
||||
type PermissionState = { amazon: boolean; video: boolean }
|
||||
const permissionState = ref<PermissionState>({ amazon: true, video: true })
|
||||
// 权限计算在 ./home-permission(纯函数,tests/desktop-home-permission.test.ts 直测)。
|
||||
const permissionState = ref<PermissionState>({ amazon: true, video: true, jd: true })
|
||||
const permissionUnavailable = ref(false)
|
||||
|
||||
const amazonHref = computed(() => resolvePageHref('/new_web_source/amazon-console.html'))
|
||||
@@ -128,7 +130,7 @@ const videoHref = computed(() => resolvePageHref('/new_web_source/image-video.ht
|
||||
const jdHref = computed(() => resolvePageHref('/new_web_source/jd-console.html'))
|
||||
|
||||
const canShow = computed(() =>
|
||||
permissionUnavailable.value ? { amazon: true, video: true } : permissionState.value,
|
||||
permissionUnavailable.value ? { amazon: true, video: true, jd: true } : permissionState.value,
|
||||
)
|
||||
|
||||
function getUid() {
|
||||
@@ -137,36 +139,6 @@ function getUid() {
|
||||
return Number.isFinite(numeric) && numeric > 0 ? String(numeric) : ''
|
||||
}
|
||||
|
||||
function computePermissionState(items: PermissionMenuItem[]): PermissionState {
|
||||
const allowedKeys: string[] = []
|
||||
const allowedColumnKeys: string[] = []
|
||||
const allowedRootKeys: string[] = []
|
||||
let hasRootMetadata = false
|
||||
const push = (list: string[], value: unknown) => {
|
||||
const key = String(value || '').trim().toLowerCase()
|
||||
if (key && list.indexOf(key) < 0) list.push(key)
|
||||
}
|
||||
;(items || []).forEach((item) => {
|
||||
push(allowedColumnKeys, item.columnKey)
|
||||
push(allowedColumnKeys, item.column_key)
|
||||
const root = item.rootColumnKey || item.root_column_key
|
||||
if (root) {
|
||||
hasRootMetadata = true
|
||||
push(allowedRootKeys, root)
|
||||
}
|
||||
;[item.columnKey, item.column_key, item.routePath, item.route_path].forEach((v) => push(allowedKeys, v))
|
||||
})
|
||||
const videoVisible = allowedKeys.indexOf('wb') >= 0
|
||||
let amazonVisible =
|
||||
allowedRootKeys.indexOf('brand_front_tools') >= 0 ||
|
||||
allowedRootKeys.indexOf('brand_operation_tools') >= 0 ||
|
||||
allowedRootKeys.indexOf('brand_logistics_tools') >= 0
|
||||
if (!hasRootMetadata) {
|
||||
amazonVisible = allowedColumnKeys.some((key) => key !== 'wb')
|
||||
}
|
||||
return { amazon: amazonVisible, video: videoVisible }
|
||||
}
|
||||
|
||||
async function loadPermissions() {
|
||||
const currentUid = getUid()
|
||||
if (!currentUid) {
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
/**
|
||||
* 桌面首页一级入口的权限计算(亚马逊 / 视频 / 京东)。
|
||||
*
|
||||
* 2026-11-17 自 DesktopHomePage.vue 原样抽薄(逻辑逐字未动):这段判据此前只活在 SFC 里、
|
||||
* 零测试;V209 把京东纳入 app 菜单权限并顺手收紧"只授京东的账号被误判亚马逊可见"的兜底,
|
||||
* 必须有用例钉住,故抽成纯函数模块由 tests/desktop-home-permission.test.ts 直测。
|
||||
* 数据源不变:shared/api/permission 的原始菜单项(含 localStorage 缓存路径),页面不得直连 /newApi。
|
||||
*/
|
||||
import type { PermissionMenuItem } from '@/shared/api/permission'
|
||||
|
||||
/** 京东侧权限键(V209 app 菜单):组行 jd_tools + 子行 jd-collect/jd-publish(route slug jd-tools)。 */
|
||||
export const JD_PERMISSION_KEYS: ReadonlySet<string> = new Set([
|
||||
'jd_tools',
|
||||
'jd-tools',
|
||||
'jd-collect',
|
||||
'jd-publish',
|
||||
])
|
||||
|
||||
export type PermissionState = { amazon: boolean; video: boolean; jd: boolean }
|
||||
|
||||
export function computePermissionState(items: PermissionMenuItem[]): PermissionState {
|
||||
const allowedKeys: string[] = []
|
||||
const allowedColumnKeys: string[] = []
|
||||
const allowedRootKeys: string[] = []
|
||||
let hasRootMetadata = false
|
||||
const push = (list: string[], value: unknown) => {
|
||||
const key = String(value || '').trim().toLowerCase()
|
||||
if (key && list.indexOf(key) < 0) list.push(key)
|
||||
}
|
||||
;(items || []).forEach((item) => {
|
||||
push(allowedColumnKeys, item.columnKey)
|
||||
push(allowedColumnKeys, item.column_key)
|
||||
const root = item.rootColumnKey || item.root_column_key
|
||||
if (root) {
|
||||
hasRootMetadata = true
|
||||
push(allowedRootKeys, root)
|
||||
}
|
||||
;[item.columnKey, item.column_key, item.routePath, item.route_path].forEach((v) => push(allowedKeys, v))
|
||||
})
|
||||
const videoVisible = allowedKeys.indexOf('wb') >= 0
|
||||
// 京东入口:组键命中(V209 预授权授的就是组行),或只授了子项时靠行的 root_column_key 祖先元数据命中。
|
||||
const jdVisible = allowedKeys.indexOf('jd_tools') >= 0 || allowedRootKeys.indexOf('jd_tools') >= 0
|
||||
let amazonVisible =
|
||||
allowedRootKeys.indexOf('brand_front_tools') >= 0 ||
|
||||
allowedRootKeys.indexOf('brand_operation_tools') >= 0 ||
|
||||
allowedRootKeys.indexOf('brand_logistics_tools') >= 0
|
||||
if (!hasRootMetadata) {
|
||||
// 旧权限接口不带 root 元数据时的兜底。原式只排除 'wb':V209 后"只授了京东"的账号会
|
||||
// 在这里被误判亚马逊可见(进去是空卡片墙),顺手把京东键一并排除——同形债不再留第二份。
|
||||
amazonVisible = allowedColumnKeys.some((key) => key !== 'wb' && !JD_PERMISSION_KEYS.has(key))
|
||||
}
|
||||
return { amazon: amazonVisible, video: videoVisible, jd: jdVisible }
|
||||
}
|
||||
@@ -21,7 +21,7 @@ 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 { JD_SHOP_CATEGORY_SNAPSHOT, type JdShopCategory } from './jd-shop-category.ts'
|
||||
import { JD_SHOP_CATEGORY_SNAPSHOT } from './jd-shop-category.ts'
|
||||
|
||||
/** 京东「获取店铺数据」(v1.5):一键建单 → 推送本机客户端 → 右侧任务面板实时进度。
|
||||
*
|
||||
@@ -55,23 +55,23 @@ const submitting = ref(false)
|
||||
const errorMessage = ref('')
|
||||
const successMessage = ref('')
|
||||
|
||||
// ---- 采集分类(可选,多选;空=全店采集)----
|
||||
// ---- 采集分类(可选,下拉多选;空=全店采集)----
|
||||
/** 选项集=京麦「店内分类」快照(getShopCategoryList,2026-11-16 真机取证 9 个;
|
||||
* 京麦侧改分类后按取证路重抓,见 jd-shop-category.ts 头注释——快照不会自动过期告警)。 */
|
||||
* 京麦侧改分类后按取证路重抓,见 jd-shop-category.ts 头注释——快照不会自动过期告警)。
|
||||
* 2026-11-17 客户口径「不要全展示出来,弄个下拉式多选」:复选列表换 el-select 多选
|
||||
* (collapse-tags 折叠成「+N」徽标),选择模型改存分类 id 数组,label/id 双键从快照反查。 */
|
||||
const shopCategoryOptions = JD_SHOP_CATEGORY_SNAPSHOT
|
||||
const selectedShopCategories = ref<JdShopCategory[]>([])
|
||||
|
||||
function toggleShopCategory(category: JdShopCategory) {
|
||||
const hit = selectedShopCategories.value.find((item) => item.value === category.value)
|
||||
selectedShopCategories.value = hit
|
||||
? selectedShopCategories.value.filter((item) => item.value !== category.value)
|
||||
: [...selectedShopCategories.value, category]
|
||||
}
|
||||
const selectedShopCategoryValues = ref<string[]>([])
|
||||
|
||||
function clearShopCategories() {
|
||||
selectedShopCategories.value = []
|
||||
selectedShopCategoryValues.value = []
|
||||
}
|
||||
|
||||
/** 选中项按快照原序反查回对象(下拉里点选的先后不进请求体——双键顺序恒等于快照序)。 */
|
||||
const selectedShopCategories = computed(() =>
|
||||
shopCategoryOptions.filter((item) => selectedShopCategoryValues.value.includes(item.value)),
|
||||
)
|
||||
|
||||
/** 建单/推送载荷的选中值:label 与 id 双键同发(行级填充形状未取证,任一键命中即命中)。 */
|
||||
const selectedShopCategoryNames = computed(() => selectedShopCategories.value.map((item) => item.label))
|
||||
const selectedShopCategoryIds = computed(() => selectedShopCategories.value.map((item) => item.value))
|
||||
@@ -413,22 +413,17 @@ onUnmounted(() => {
|
||||
<aside class="left-panel">
|
||||
<div class="category-block">
|
||||
<span class="category-label">采集分类(可选,多选)</span>
|
||||
<ul class="shop-cat-list">
|
||||
<li v-for="category in shopCategoryOptions" :key="category.value">
|
||||
<label class="shop-cat-item" :title="`${category.label}(id ${category.value})`">
|
||||
<input type="checkbox" class="shop-cat-check"
|
||||
:checked="selectedShopCategories.some((item) => item.value === category.value)"
|
||||
@change="toggleShopCategory(category)" />
|
||||
<span class="shop-cat-name">{{ category.label }}</span>
|
||||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
<el-select v-model="selectedShopCategoryValues" multiple collapse-tags collapse-tags-tooltip
|
||||
:max-collapse-tags="1" placeholder="全店采集(点击选择分类)" class="shop-cat-select">
|
||||
<el-option v-for="category in shopCategoryOptions" :key="category.value"
|
||||
:label="category.label" :value="category.value" />
|
||||
</el-select>
|
||||
<p class="category-hint">
|
||||
{{ selectedShopCategories.length
|
||||
? `只采选中 ${selectedShopCategories.length} 个分类的商品;`
|
||||
: '不选=全店采集。' }}
|
||||
{{ selectedShopCategoryValues.length
|
||||
? `只采选中 ${selectedShopCategoryValues.length} 个分类的商品;`
|
||||
: '默认全店采集。' }}
|
||||
分类是京麦后台「店内分类」(2026-11-16 快照);商品要先在京麦挂上分类才会被选中。
|
||||
<button v-if="selectedShopCategories.length" class="shop-cat-clear" type="button"
|
||||
<button v-if="selectedShopCategoryValues.length" class="shop-cat-clear" type="button"
|
||||
@click="clearShopCategories">清空</button>
|
||||
</p>
|
||||
</div>
|
||||
@@ -667,42 +662,21 @@ onUnmounted(() => {
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
/* 采集分类多选块(2026-11-16 京麦店内分类快照):label 复用 category-label,
|
||||
* 列表项按暗色主题复选行样式(快照是纯前端数据,无加载失败分支)。 */
|
||||
.shop-cat-list {
|
||||
margin: 8px 0 0;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
/* 采集分类下拉多选(2026-11-17 客户口径「别全展示,弄下拉式多选」):
|
||||
* 暗色主题套品牌页 el-select 同款壳(wrapper 底色/描边/文字色),
|
||||
* 面板内弹层由 Element Plus 自带样式,不再逐条铺 9 行复选框。 */
|
||||
.shop-cat-select {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.shop-cat-item {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 5px 10px;
|
||||
border: 1px solid #3e4a62;
|
||||
border-radius: 6px;
|
||||
background: #232b3d;
|
||||
.shop-cat-select :deep(.el-select__wrapper) {
|
||||
background-color: #232b3d;
|
||||
box-shadow: 0 0 0 1px #3e4a62 inset;
|
||||
}
|
||||
|
||||
.shop-cat-select :deep(.el-select__placeholder),
|
||||
.shop-cat-select :deep(.el-select__selected-item) {
|
||||
color: #c8d2e2;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.shop-cat-item:hover {
|
||||
border-color: #5a6b8c;
|
||||
}
|
||||
|
||||
.shop-cat-check {
|
||||
accent-color: #e1251b;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.shop-cat-name {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.shop-cat-clear {
|
||||
|
||||
@@ -31,11 +31,11 @@
|
||||
<i class="group-dot"></i>
|
||||
<span class="group-name">京东工具</span>
|
||||
<span class="group-desc">采集与上架,两条主线</span>
|
||||
<span class="group-count">{{ JD_TOOLS.length }} 个工具</span>
|
||||
<span class="group-count">{{ visibleTools.length }} 个工具</span>
|
||||
</header>
|
||||
|
||||
<div class="card-grid">
|
||||
<template v-for="tool in JD_TOOLS" :key="tool.id">
|
||||
<template v-for="tool in visibleTools" :key="tool.id">
|
||||
<router-link
|
||||
v-if="tool.href"
|
||||
:to="tool.href"
|
||||
@@ -89,11 +89,15 @@ import { onBeforeUnmount, onMounted, ref } from 'vue'
|
||||
|
||||
import NotificationBell from '@/shared/components/NotificationBell.vue'
|
||||
import { resolvePageHref } from '@/shared/page-prefix'
|
||||
import { JD_TOOLS, type JdToolInfo } from '@/pages/jd/tool-catalog'
|
||||
import { getCurrentUserAppColumnKeys } from '@/shared/api/permission'
|
||||
import { filterJdToolsByPermission, JD_TOOLS, type JdToolInfo } from '@/pages/jd/tool-catalog'
|
||||
|
||||
/** 返回桌面入口首页(亚马逊 / 京东 / 视频 一级入口) */
|
||||
const homeHref = resolvePageHref('/new_web_source/home.html')
|
||||
|
||||
/** 卡片显隐先乐观全量(接口返回后按菜单权限过滤,同 AmazonConsolePage 形状) */
|
||||
const visibleTools = ref<JdToolInfo[]>([...JD_TOOLS])
|
||||
|
||||
const username = ref('admin')
|
||||
const toastText = ref('')
|
||||
let toastTimer: number | undefined
|
||||
@@ -114,9 +118,21 @@ function onPendingClick(tool: JdToolInfo) {
|
||||
showToast(`${tool.name}暂未开通,敬请期待`)
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
onMounted(async () => {
|
||||
const localName = (window.localStorage.getItem('username') || '').trim()
|
||||
if (localName) username.value = localName
|
||||
// 判据与 AmazonConsolePage 同形:权限接口异常 ⇒ permissionUnavailable ⇒ 展示全部工具,
|
||||
// 正常 ⇒ 按 app 菜单权限过滤(V209:组键 jd_tools 整放,否则逐项 jd-collect/jd-publish)
|
||||
let allowedKeys: string[] = []
|
||||
let permissionUnavailable = false
|
||||
try {
|
||||
allowedKeys = await getCurrentUserAppColumnKeys()
|
||||
} catch (_error) {
|
||||
permissionUnavailable = true
|
||||
}
|
||||
visibleTools.value = permissionUnavailable
|
||||
? [...JD_TOOLS]
|
||||
: filterJdToolsByPermission(JD_TOOLS, allowedKeys)
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
|
||||
@@ -6,6 +6,12 @@
|
||||
* 2. 商品上架:功能未落地,先按"假菜单"占位(点击提示暂未开通),不发 href。
|
||||
*
|
||||
* 卡片形状照亚马逊工具台(tool-catalog.ts)的 ToolInfo,样式复用同一套深色卡片墙。
|
||||
*
|
||||
* 菜单权限(V209):permissionKeys 与后端 columns(menu_type='app') 的 column_key 逐字一致
|
||||
* (jd_tools 组行 / jd-collect / jd-publish),跨端契约见 tests/jd-console-tool-catalog.test.ts。
|
||||
* 卡片显隐过滤用本文件的 filterJdToolsByPermission——判据与亚马逊 filterGroupsByPermission
|
||||
* 同形(组键命中整放,否则逐项),不直接导入是因为 ToolGroup.key 是 'front'|'ops'|'logi'
|
||||
* 字面量联合且组形状带颜色/工作流等必填件,京东借不了那个类型;改语义两头都要过用例。
|
||||
*/
|
||||
|
||||
export type JdToolInfo = {
|
||||
@@ -19,8 +25,13 @@ export type JdToolInfo = {
|
||||
tag?: string
|
||||
/** 功能页地址;未提供表示暂未开通(占位菜单) */
|
||||
href?: string
|
||||
/** 菜单权限键(小写),与后端 app 菜单 column_key 逐字一致 */
|
||||
permissionKeys: string[]
|
||||
}
|
||||
|
||||
/** app 菜单组键(columns.column_key='jd_tools'):勾中整组放行,同亚马逊 brand_*_tools 语义 */
|
||||
export const JD_GROUP_COLUMN_KEY = 'jd_tools'
|
||||
|
||||
export const JD_TOOLS: ReadonlyArray<JdToolInfo> = [
|
||||
{
|
||||
id: 'jd-collect',
|
||||
@@ -28,15 +39,33 @@ export const JD_TOOLS: ReadonlyArray<JdToolInfo> = [
|
||||
desc: '一键抓取已登录京麦后台的店铺商品(列表 + 详情全部属性 + 图片),导入后台「京东数据库」',
|
||||
tag: '核心',
|
||||
href: '/jd-collect',
|
||||
permissionKeys: ['jd-collect'],
|
||||
},
|
||||
{
|
||||
id: 'jd-publish',
|
||||
name: '商品上架',
|
||||
desc: '把京东数据库里的商品批量上架到京麦店铺(建设中,敬请期待)',
|
||||
tag: '规划中',
|
||||
permissionKeys: ['jd-publish'],
|
||||
},
|
||||
]
|
||||
|
||||
/**
|
||||
* 按菜单权限过滤京东工具卡片(与亚马逊 tool-catalog.ts::filterGroupsByPermission 同形判据):
|
||||
* 组键 jd_tools 命中则整组放行(预授权授的就是组行,读侧由后端展开子孙);
|
||||
* 否则只放行 permissionKeys 命中的卡片;空权限集 ⇒ 全隐藏。
|
||||
*/
|
||||
export function filterJdToolsByPermission(
|
||||
tools: ReadonlyArray<JdToolInfo>,
|
||||
allowedKeys: ReadonlyArray<string>,
|
||||
): JdToolInfo[] {
|
||||
const allowedSet = new Set(allowedKeys.map((key) => String(key || '').trim().toLowerCase()).filter(Boolean))
|
||||
if (allowedSet.has(JD_GROUP_COLUMN_KEY)) {
|
||||
return [...tools]
|
||||
}
|
||||
return tools.filter((tool) => tool.permissionKeys.some((key) => allowedSet.has(key.toLowerCase())))
|
||||
}
|
||||
|
||||
export const JD_TOOL_MAP: ReadonlyMap<string, JdToolInfo> = new Map(
|
||||
JD_TOOLS.map((tool) => [tool.id, tool] as const),
|
||||
)
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
import assert from 'node:assert/strict'
|
||||
import test from 'node:test'
|
||||
|
||||
import { computePermissionState } from '../src/pages/home/home-permission.ts'
|
||||
|
||||
/**
|
||||
* 桌面首页一级入口权限计算(V209 把京东纳入 app 菜单权限)。
|
||||
* 判据形状:组行直授 / 子行直授带 root 元数据 / 无 root 元数据旧接口兜底,三条路都过。
|
||||
*/
|
||||
|
||||
type Item = Record<string, unknown>
|
||||
|
||||
function item(columnKey: string, rootColumnKey?: string, routePath?: string): Item {
|
||||
const it: Item = { id: columnKey, column_key: columnKey }
|
||||
if (rootColumnKey) it.root_column_key = rootColumnKey
|
||||
if (routePath) it.route_path = routePath
|
||||
return it
|
||||
}
|
||||
|
||||
test('组行 jd_tools 直授 ⇒ 京东入口可见', () => {
|
||||
const state = computePermissionState([item('jd_tools', 'jd_tools', 'jd-tools')])
|
||||
assert.equal(state.jd, true)
|
||||
})
|
||||
|
||||
test('只授子行(带 root_column_key=jd_tools 祖先元数据)⇒ 京东入口仍可见', () => {
|
||||
// V209 预授权授的是组行,但管理员收组后单授采集卡是合法配置:入口不能凭空消失。
|
||||
const state = computePermissionState([item('jd-collect', 'jd_tools', 'jd-collect')])
|
||||
assert.equal(state.jd, true)
|
||||
})
|
||||
|
||||
test('权限集与京东无关 ⇒ 京东入口隐藏', () => {
|
||||
const state = computePermissionState([item('wb', 'wb', 'image-video'), item('collect-data', 'brand_front_tools')])
|
||||
assert.equal(state.jd, false)
|
||||
assert.equal(state.video, true)
|
||||
})
|
||||
|
||||
test('只授京东 ⇒ 亚马逊入口不得假显示(有 root 元数据路)', () => {
|
||||
const state = computePermissionState([item('jd_tools', 'jd_tools', 'jd-tools')])
|
||||
assert.equal(state.jd, true)
|
||||
assert.equal(state.amazon, false)
|
||||
})
|
||||
|
||||
test('只授京东 ⇒ 亚马逊入口不得假显示(旧接口无 root 元数据兜底路,V209 顺手钉的判据)', () => {
|
||||
// 原实现兜底只排除 'wb':V209 后 jd 键混进兜底集合会被误判 amazon=true(点进去空卡片墙)。
|
||||
const state = computePermissionState([item('jd_tools'), item('jd-collect')])
|
||||
assert.equal(state.amazon, false, '无 root 元数据时,仅授京东键不得点亮亚马逊入口')
|
||||
assert.equal(state.jd, true)
|
||||
})
|
||||
|
||||
test('旧接口兜底不误伤既有语义:亚马逊子键仍点亮亚马逊入口', () => {
|
||||
const state = computePermissionState([item('collect-data')])
|
||||
assert.equal(state.amazon, true)
|
||||
})
|
||||
|
||||
test('大小写/空白归一:JD_TOOLS 照命中', () => {
|
||||
const state = computePermissionState([{ id: 1, column_key: ' JD_TOOLS ' }])
|
||||
assert.equal(state.jd, true)
|
||||
})
|
||||
@@ -71,6 +71,10 @@ test('分类多选来自京麦店内分类快照,平台分组从本页下线',
|
||||
'JdCollectTab.vue 必须消费京麦店内分类快照(jd-shop-category.ts)作采集分类多选选项')
|
||||
assert.ok(page.includes('采集分类(可选,多选)'),
|
||||
'JdCollectTab.vue 必须以「采集分类(可选,多选)」展示分类块')
|
||||
assert.ok(page.includes('<el-select') && page.includes('multiple'),
|
||||
'采集分类必须是下拉式多选(el-select multiple,2026-11-17 客户口径「不要全展示出来,弄个下拉式的多选」)')
|
||||
assert.ok(!page.includes('shop-cat-list'),
|
||||
'JdCollectTab.vue 不得再回到逐条复选框列表(旧形状 2026-11-17 下线)')
|
||||
assert.ok(!page.includes('JdCategoryCascader'),
|
||||
'JdCollectTab.vue 不得再引用类目级联(2026-11-16 客户口径「类目不需要」)')
|
||||
assert.ok(!page.includes('fetchJdCollectGroups'),
|
||||
|
||||
@@ -3,7 +3,12 @@ import test from 'node:test'
|
||||
import { existsSync, readFileSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
|
||||
import { JD_TOOLS, JD_TOOL_MAP } from '../src/pages/jd/tool-catalog.ts'
|
||||
import {
|
||||
filterJdToolsByPermission,
|
||||
JD_GROUP_COLUMN_KEY,
|
||||
JD_TOOLS,
|
||||
JD_TOOL_MAP,
|
||||
} from '../src/pages/jd/tool-catalog.ts'
|
||||
|
||||
/** 京东一级入口(v1.5):首页「京东」→ 京东工作台两个菜单(获取店铺数据 / 商品上架占位)。 */
|
||||
|
||||
@@ -54,3 +59,40 @@ test('获取店铺数据页是一键触发 + 服务端进度(任务面板改
|
||||
assert.ok(page.includes('jd-shop-collect-run'), '建单后必须推送本机客户端队列')
|
||||
assert.ok(page.includes('TaskCenterPanel'), '改版后右侧必须是共享任务面板(含历史任务层)')
|
||||
})
|
||||
|
||||
/* ===== V209 菜单权限:permissionKeys 与后端 app 菜单逐字对撞 + 过滤判据 ===== */
|
||||
|
||||
test('两张卡片都声明 permissionKeys 且与 V209 迁移 column_key 逐字一致', () => {
|
||||
// 跨仓对撞(后管 company-menu-route.test.ts 同族判据):迁移插的 app 菜单键与前端
|
||||
// permissionKeys 任何一侧改名而另一侧不动 ⇒ 这里红,而不是线上静默"勾了不显示"。
|
||||
const sqlPath = join(ROOT, '..', 'backend-java', 'src', 'main', 'resources', 'db', 'V209__jd_app_menu.sql')
|
||||
assert.ok(existsSync(sqlPath), `迁移缺失:${sqlPath}(V209 与前端权限键必须同窗改动)`)
|
||||
const sql = readFileSync(sqlPath, 'utf8')
|
||||
const frontendKeys = new Set<string>([JD_GROUP_COLUMN_KEY, ...JD_TOOLS.flatMap((tool) => tool.permissionKeys)])
|
||||
for (const key of frontendKeys) {
|
||||
assert.ok(sql.includes(`'${key}'`), `V209 迁移缺 column_key:${key}`)
|
||||
}
|
||||
for (const route of ['jd-tools', 'jd-collect', 'jd-publish']) {
|
||||
assert.ok(sql.includes(`'${route}'`), `V209 迁移缺 route_path:${route}`)
|
||||
}
|
||||
for (const tool of JD_TOOLS) {
|
||||
assert.ok(tool.permissionKeys.length > 0, `卡片 ${tool.id} 必须声明 permissionKeys`)
|
||||
}
|
||||
})
|
||||
|
||||
test('按菜单权限过滤京东卡片(与亚马逊 filterGroupsByPermission 同形判据)', () => {
|
||||
// 空权限集 ⇒ 全隐藏
|
||||
assert.deepEqual(filterJdToolsByPermission(JD_TOOLS, []), [])
|
||||
// 组键命中 ⇒ 整组放行(V209 预授权授的就是组行)
|
||||
assert.equal(filterJdToolsByPermission(JD_TOOLS, ['jd_tools']).length, 2)
|
||||
// 只授采集 ⇒ 只剩采集卡
|
||||
const collectOnly = filterJdToolsByPermission(JD_TOOLS, ['jd-collect'])
|
||||
assert.deepEqual(collectOnly.map((tool) => tool.id), ['jd-collect'])
|
||||
// 只授上架 ⇒ 只剩上架卡(占位卡转正前同样受控)
|
||||
const publishOnly = filterJdToolsByPermission(JD_TOOLS, ['jd-publish'])
|
||||
assert.deepEqual(publishOnly.map((tool) => tool.id), ['jd-publish'])
|
||||
// 大小写/空白归一(亚马逊侧同款 normalize:trim + lowercase)
|
||||
assert.equal(filterJdToolsByPermission(JD_TOOLS, [' JD_TOOLS ']).length, 2)
|
||||
// 无关键不放行任何卡片
|
||||
assert.deepEqual(filterJdToolsByPermission(JD_TOOLS, ['collect-data', 'wb']), [])
|
||||
})
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
*/
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import ElementPlus, { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import JdCollectTab from '@/pages/jd/JdCollectTab.vue'
|
||||
|
||||
@@ -101,13 +102,33 @@ function batchOf(item: Record<string, unknown>) {
|
||||
|
||||
let wrapper: VueWrapper | null = null
|
||||
|
||||
async function mountPage() {
|
||||
/** el-select/el-option 轻量桩:轮询组用例不带真实 ElementPlus——真件在 fake timers 下
|
||||
* 的内部计时/Popper 会被 `advanceTimersByTimeAsync(60s)` 一并点燃、打断任务面板轮询链
|
||||
* (2026-11-17 改版实测 SUCCESS/FAILED 两格因此转红)。下拉形状由分类两格的真实组件
|
||||
* 用例兜底,这里只保证模板可解析、v-model 透传、选项渲染计数。 */
|
||||
const ElSelectStub = {
|
||||
name: 'ElSelect',
|
||||
props: ['modelValue'],
|
||||
emits: ['update:modelValue'],
|
||||
template: '<div class="shop-cat-select"><slot /></div>',
|
||||
}
|
||||
const ElOptionStub = {
|
||||
name: 'ElOption',
|
||||
props: ['label', 'value'],
|
||||
template: '<div class="shop-cat-option">{{ label }}</div>',
|
||||
}
|
||||
|
||||
async function mountPage(realSelect = false) {
|
||||
wrapper = mount(JdCollectTab, {
|
||||
global: {
|
||||
// 分类两格用真实 ElementPlus 组件树(经 update:modelValue 模拟点选,
|
||||
// 弹层 teleport 到 body,不依赖开合动画);其余格用桩。
|
||||
...(realSelect ? { plugins: [ElementPlus] } : {}),
|
||||
stubs: {
|
||||
NotificationBell: true,
|
||||
RouterLink: { template: '<a class="router-link-stub"><slot /></a>' },
|
||||
'router-link': { template: '<a class="router-link-stub"><slot /></a>' },
|
||||
...(realSelect ? {} : { 'el-select': ElSelectStub, 'el-option': ElOptionStub }),
|
||||
},
|
||||
},
|
||||
})
|
||||
@@ -284,54 +305,55 @@ describe('获取店铺数据:一键采集 + 任务面板', () => {
|
||||
expect(w.find('.feedback.error').exists()).toBe(false)
|
||||
})
|
||||
|
||||
it('勾选分类后建单:店内分类双键随建单请求体与推送载荷同链下发', async () => {
|
||||
// 2026-11-16 客户口径「类目不需要只要分类」「选京麦的内部分类去采集」+「做成多选的」:
|
||||
// 选项集=京麦「店内分类」快照(jd-shop-category.ts,getShopCategoryList 取证 9 个),
|
||||
// checkbox 多选;建单请求体与推送载荷带 label+id 双键(行级填充形状未取证,客户端
|
||||
// 任一键命中即命中)——mock 选中项用快照真实行(拉丁舞服/1024347572),贴合下发形状。
|
||||
const w = await mountPage()
|
||||
it('下拉选分类后建单:店内分类双键随建单请求体与推送载荷同链下发', async () => {
|
||||
// 2026-11-16 客户口径「类目不需要只要分类」「选京麦的内部分类去采集」;
|
||||
// 2026-11-17 客户口径「不要全展示出来,弄个下拉式多选」:checkbox 列表换 el-select
|
||||
// 多选(collapse-tags)。选项集=京麦「店内分类」快照(jd-shop-category.ts,取证 9 个),
|
||||
// 选择模型是 id 数组;建单请求体与推送载荷带 label+id 双键、按快照原序反查(行级填充
|
||||
// 形状未取证,客户端任一键命中即命中)——选中项用快照真实行,贴合下发形状。
|
||||
const w = await mountPage(true)
|
||||
|
||||
const rows = w.findAll('.shop-cat-item')
|
||||
expect(rows.length).toBeGreaterThan(0, '分类多选列表必须渲染快照选项')
|
||||
const latinRow = rows.find((row) => row.text().includes('拉丁舞服'))
|
||||
expect(latinRow, '快照里必须有「拉丁舞服」').toBeTruthy()
|
||||
await latinRow!.find('input').setValue(true)
|
||||
const uniformRow = rows.find((row) => row.text().includes('工作制服'))
|
||||
await uniformRow!.find('input').setValue(true)
|
||||
const select = w.findComponent(ElSelect)
|
||||
expect(select.exists(), '采集分类必须是下拉多选(el-select),不再是逐条复选框').toBe(true)
|
||||
await select.vm.$emit('update:modelValue', ['1024347572', '1024347567'])
|
||||
await flushPromises()
|
||||
|
||||
await startCollect(w)
|
||||
|
||||
// 双键顺序恒等于快照序(工作制服在前),与点选先后无关——同源反查,不随 UI 顺序漂。
|
||||
expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['ONSALE', 'OFFSALE'], 0, [],
|
||||
['拉丁舞服', '工作制服'], ['1024347572', '1024347567'])
|
||||
['工作制服', '拉丁舞服'], ['1024347567', '1024347572'])
|
||||
const payload = api.enqueue.mock.calls[0][0]
|
||||
expect(payload.data).toEqual({
|
||||
taskId: 88,
|
||||
shopName: '京麦后台',
|
||||
listTabs: ['ONSALE', 'OFFSALE'],
|
||||
maxProducts: 0,
|
||||
shopCategoryNames: ['拉丁舞服', '工作制服'],
|
||||
shopCategoryIds: ['1024347572', '1024347567'],
|
||||
shopCategoryNames: ['工作制服', '拉丁舞服'],
|
||||
shopCategoryIds: ['1024347567', '1024347572'],
|
||||
})
|
||||
})
|
||||
|
||||
it('采集分类块:快照选项全量渲染并可取消勾选(清空恢复全店采集)', async () => {
|
||||
const w = await mountPage()
|
||||
it('采集分类块:下拉渲染快照全量选项并可清空(恢复全店采集)', async () => {
|
||||
const w = await mountPage(true)
|
||||
|
||||
const block = w.findAll('.category-block').find((el) => el.text().includes('采集分类'))
|
||||
expect(block, '必须有「采集分类(可选,多选)」块').toBeTruthy()
|
||||
expect(block!.text()).toContain('采集分类(可选,多选)')
|
||||
// 快照 9 项全渲染(客户端「能看见管理员/商家建的分类」口径落点就在这)
|
||||
expect(block!.findAll('.shop-cat-item').length).toBe(9)
|
||||
expect(block!.text()).toContain('不选=全店采集')
|
||||
// 快照 9 项全进下拉选项(客户端「能看见管理员/商家建的分类」口径落点就在这;
|
||||
// 弹层 teleport 到 body,选项组件仍挂在页面组件树里,按组件计数不按 DOM)
|
||||
expect(w.findAllComponents(ElOption).length).toBe(9)
|
||||
expect(block!.find('.shop-cat-select').exists(), '分类块必须是 el-select 下拉').toBe(true)
|
||||
expect(block!.text()).toContain('默认全店采集')
|
||||
expect(block!.findComponent(ElSelect).props('placeholder')).toBe('全店采集(点击选择分类)')
|
||||
|
||||
const first = block!.findAll('.shop-cat-item')[0]
|
||||
await first.find('input').setValue(true)
|
||||
const select = block!.findComponent(ElSelect)
|
||||
await select.vm.$emit('update:modelValue', ['1024347567'])
|
||||
await flushPromises()
|
||||
expect(block!.text()).toContain('只采选中 1 个分类的商品')
|
||||
expect(block!.find('.shop-cat-clear').exists()).toBe(true, '选中后出「清空」')
|
||||
expect(block!.find('.shop-cat-clear').exists(), '选中后出「清空」').toBe(true)
|
||||
await block!.find('.shop-cat-clear').trigger('click')
|
||||
await flushPromises()
|
||||
expect(block!.text()).toContain('不选=全店采集')
|
||||
expect(block!.text()).toContain('默认全店采集')
|
||||
})
|
||||
})
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
/**
|
||||
* 京东工作台卡片按 app 菜单权限(V209)显隐的挂载用例。
|
||||
*
|
||||
* 四态判据,与 AmazonConsolePage 同形:
|
||||
* ① 组键 jd_tools 命中 ⇒ 两张卡都在(V209 预授权授的就是组行,线上默认形态);
|
||||
* ② 只授 jd-collect ⇒ 只剩采集卡(上架占位同样受控,转正后行为不变);
|
||||
* ③ 权限集与京东无关 ⇒ 两张卡都隐藏;
|
||||
* ④ 权限接口异常 ⇒ 展示全部(现用人不因接口抖动丢功能)。
|
||||
*
|
||||
* 跑法:cd frontend-vue && npx vitest run tests/mount/jd-console-permission.mount.test.ts
|
||||
*/
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { mount, type VueWrapper } from '@vue/test-utils'
|
||||
|
||||
vi.mock('@/shared/api/permission', () => ({
|
||||
getCurrentUserAppColumnKeys: vi.fn(),
|
||||
}))
|
||||
|
||||
import { getCurrentUserAppColumnKeys } from '@/shared/api/permission'
|
||||
import JdConsolePage from '@/pages/jd/JdConsolePage.vue'
|
||||
|
||||
let wrapper: VueWrapper | null = null
|
||||
|
||||
const mockKeys = (keys: string[]) =>
|
||||
vi.mocked(getCurrentUserAppColumnKeys).mockResolvedValue(keys)
|
||||
|
||||
async function mountConsole() {
|
||||
wrapper = mount(JdConsolePage, {
|
||||
global: {
|
||||
stubs: {
|
||||
NotificationBell: true,
|
||||
RouterLink: { template: '<a class="router-link-stub"><slot /></a>' },
|
||||
'router-link': { template: '<a class="router-link-stub"><slot /></a>' },
|
||||
},
|
||||
},
|
||||
})
|
||||
// onMounted 里权限是异步 await,等过滤落地后再断言
|
||||
await vi.waitFor(() => {
|
||||
expect(vi.mocked(getCurrentUserAppColumnKeys).mock.calls.length).toBeGreaterThan(0)
|
||||
})
|
||||
return wrapper
|
||||
}
|
||||
|
||||
describe('京东工作台按菜单权限显隐(V209)', () => {
|
||||
beforeEach(() => {
|
||||
window.localStorage.setItem('username', 'admin')
|
||||
vi.mocked(getCurrentUserAppColumnKeys).mockReset()
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
wrapper?.unmount()
|
||||
wrapper = null
|
||||
window.localStorage.clear()
|
||||
})
|
||||
|
||||
it('组键命中 ⇒ 两张卡都在', async () => {
|
||||
mockKeys(['jd_tools', 'jd-tools'])
|
||||
const w = await mountConsole()
|
||||
await vi.waitFor(() => expect(w.findAll('.tool-card').length).toBe(2))
|
||||
})
|
||||
|
||||
it('只授 jd-collect ⇒ 只剩获取店铺数据卡', async () => {
|
||||
mockKeys(['jd-collect'])
|
||||
const w = await mountConsole()
|
||||
await vi.waitFor(() => expect(w.findAll('.tool-card').length).toBe(1))
|
||||
// 断言圈在卡片节点上:hero 文案("店铺采集 · 商品上架")与计数是页面静态区,
|
||||
// 不参与权限过滤,拿整页 text() 判"商品上架消失"会误红。
|
||||
const cards = w.findAll('.tool-card')
|
||||
expect(cards[0].text()).toContain('获取店铺数据')
|
||||
expect(cards.every((card) => !card.classes().includes('tool-card--pending'))).toBe(true)
|
||||
expect(w.find('.group-count').text()).toContain('1 个工具')
|
||||
})
|
||||
|
||||
it('权限集与京东无关 ⇒ 两张卡都隐藏', async () => {
|
||||
mockKeys(['wb', 'collect-data'])
|
||||
const w = await mountConsole()
|
||||
await vi.waitFor(() => expect(w.findAll('.tool-card').length).toBe(0))
|
||||
expect(w.findAll('.tool-card').length).toBe(0)
|
||||
})
|
||||
|
||||
it('权限接口异常 ⇒ 展示全部(兜底不让现用人丢入口)', async () => {
|
||||
vi.mocked(getCurrentUserAppColumnKeys).mockRejectedValue(new Error('获取菜单权限失败'))
|
||||
const w = await mountConsole()
|
||||
await vi.waitFor(() => expect(w.findAll('.tool-card').length).toBe(2))
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user