diff --git a/admin-frontend-vue/src/config/platform-scope.ts b/admin-frontend-vue/src/config/platform-scope.ts new file mode 100644 index 000000000..65684b8a5 --- /dev/null +++ b/admin-frontend-vue/src/config/platform-scope.ts @@ -0,0 +1,31 @@ +/** 平台 tab 口径的唯一清单(2026-11-16 用户定案「亚马逊/京东不混一起」)。 + * 仿 company-scope.ts 的形状:单独成文件而不是塞进 routes.ts——护栏用例要从这里 + * 反读清单与注册表对撞,放在一起会成环。 */ + +export type PlatformTabId = 'amazon' | 'jd' + +export interface PlatformTabDef { + id: PlatformTabId + label: string +} + +/** 侧边栏顶部平台 tab 的固定顺序:亚马逊在前(存量主体),京东在后。 */ +export const PLATFORM_TABS: readonly PlatformTabDef[] = [ + { id: 'amazon', label: '亚马逊' }, + { id: 'jd', label: '京东' }, +] + +/** 京东侧菜单的 menuKey 唯一清单(与 routes.ts 的 menuKey 逐字一致,用例钉住)。 + * 2026-11-16 用户按截图圈定四项;后续京东新页面上线把 key 加进这里即可, + * 清单外的 key(含店铺管理/生成记录等存量页)一律归亚马逊。 */ +export const JD_MENU_KEYS: readonly string[] = [ + 'admin_users', + 'admin_group_manage', + 'admin_companies', + 'admin_jd_database', +] + +/** menuKey → 平台归属:命中京东清单即 jd,其余(未知 key 在内)默认亚马逊。 */ +export function platformOfMenuKey(key: string): PlatformTabId { + return JD_MENU_KEYS.includes(key) ? 'jd' : 'amazon' +} diff --git a/admin-frontend-vue/src/layout/AdminLayout.vue b/admin-frontend-vue/src/layout/AdminLayout.vue index f0f2d371c..0aff1457f 100644 --- a/admin-frontend-vue/src/layout/AdminLayout.vue +++ b/admin-frontend-vue/src/layout/AdminLayout.vue @@ -6,6 +6,10 @@ 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 { filterMenuTreeByPlatform, visiblePlatformsFor } from '@/layout/platform-menu-filter' +import { PLATFORM_TABS, platformOfMenuKey } from '@/config/platform-scope' +import { usePlatformTabStore } from '@/stores/platform-tab' +import { firstVisiblePath } from '@/router/helpers' import { EMPTY_MENU_DESCRIPTION, EMPTY_MENU_TITLE, @@ -31,7 +35,15 @@ const router = useRouter() const session = useAdminSessionStore() const activePath = computed(() => route.path) -const menuEntries = computed(() => toSidebarEntries(session.menuTree)) +const platformTab = usePlatformTabStore() +// 平台 tab(亚马逊/京东,2026-11-16「不混」定案)只做显示分组:准入仍是 session.menuTree +// (后端按权限裁剪)+路由守卫,这里只把当前用户已被授权的菜单按平台分侧展示。 +const menuEntries = computed(() => + toSidebarEntries(filterMenuTreeByPlatform(session.menuTree, platformTab.active)), +) +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)) const emptyMenu = computed(() => shouldShowEmptyMenu(menuEntries.value.length > 0, session.loading, session.initialized)) const pageTitle = computed(() => pageTitleOf(route.meta.title)) @@ -45,6 +57,30 @@ watch( { immediate: true }, ) +// 直达 URL/面包屑跳到另一平台的页面时,tab 指示自动跟过去(与侧边栏保持一致)。 +watch( + () => route.meta.menuKey as string | undefined, + (menuKey) => { + if (!menuKey) return + const target = platformOfMenuKey(menuKey) + if (target !== platformTab.active && visibleTabIds.value.includes(target)) { + platformTab.setActive(target) + } + }, + { immediate: true }, +) + +// 切到另一侧 tab 时当前页多半不在那边:跳到该侧第一个可见页;该侧为空(tab 不可见)则不动。 +watch( + () => platformTab.active, + (tab) => { + const menuKey = route.meta.menuKey as string | undefined + if (!menuKey || platformOfMenuKey(menuKey) === tab) return + const first = firstVisiblePath(filterMenuTreeByPlatform(session.menuTree, tab)) + if (first) void router.replace(first) + }, +) + async function signOut() { try { await runLogout({ @@ -77,6 +113,19 @@ async function signOut() { + +