From e139978f0453bde9554396af12cb56390f024c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Sat, 17 Oct 2026 10:35:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E7=AB=AF=E9=A1=B6?=
=?UTF-8?q?=E6=A0=8F):=20=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=8E=BB=E6=8E=89?=
=?UTF-8?q?=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8=E5=90=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
按需求摘掉 AmazonTopBar 的公司名胶囊,连带清掉随之死掉的
readCompanyIdentity import / companyName ref / onMounted 赋值与 .company-name
样式(留着会被 tests/dead-code-cleanup.test.ts 的 vue-tsc --noEmit 判红)。
公司身份机制与 companyName 载荷一律不动——那仍是登录/多租户判断的输入,
只是不再在顶栏显示。
补 tests/mount/amazon-topbar-no-company.mount.test.ts 三条真挂载用例:
公司名不进 DOM、同框用户名照旧出现(防"挂载失败"冒充"已摘掉")、
readCompanyIdentity 仍读得到。已做反向证伪:把胶囊塞回去第一条即红。
用户端实测:npm test 862 例 0 红;npx vitest run 19 例 0 红;vue-tsc --noEmit rc=0。
---
.../pages/amazon/components/AmazonTopBar.vue | 17 -----
.../amazon-topbar-no-company.mount.test.ts | 74 +++++++++++++++++++
2 files changed, 74 insertions(+), 17 deletions(-)
create mode 100644 frontend-vue/tests/mount/amazon-topbar-no-company.mount.test.ts
diff --git a/frontend-vue/src/pages/amazon/components/AmazonTopBar.vue b/frontend-vue/src/pages/amazon/components/AmazonTopBar.vue
index 05af06bf3..ac5f4f824 100644
--- a/frontend-vue/src/pages/amazon/components/AmazonTopBar.vue
+++ b/frontend-vue/src/pages/amazon/components/AmazonTopBar.vue
@@ -31,7 +31,6 @@
- {{ companyName }}
{{ username }}
@@ -46,7 +45,6 @@ import { filterGroupsByPermission, TOOL_GROUPS } from '@/pages/amazon/tool-catal
import type { VisibleGroup } from '@/pages/amazon/tool-catalog'
import { resolvePageHref } from '@/shared/page-prefix'
import { getCurrentUserAppColumnKeys } from '@/shared/api/permission'
-import { readCompanyIdentity } from '@/shared/auth/company-identity'
const props = withDefaults(
defineProps<{
@@ -63,8 +61,6 @@ const emit = defineEmits<{ change: [key: 'front' | 'ops' | 'logi'] }>()
const activeCat = computed(() => props.activeCat)
const visibleCats = ref(TOOL_GROUPS.map((group) => ({ ...group, tools: [...group.tools] })))
const username = ref('admin')
-/** 所属公司名:后端未返回时为空串,该段整体不渲染(不能显示 undefined)。 */
-const companyName = ref('')
/** 分类 tab 点击回到工具台对应分组 */
const toolbarHref = resolvePageHref('/new_web_source/amazon-console.html')
@@ -88,7 +84,6 @@ function underlineStyle(cat: VisibleGroup) {
onMounted(async () => {
const localName = typeof window === 'undefined' ? '' : (window.localStorage.getItem('username') || '').trim()
if (localName) username.value = localName
- companyName.value = readCompanyIdentity()
try {
const keys = await getCurrentUserAppColumnKeys()
visibleCats.value = filterGroupsByPermission(TOOL_GROUPS, keys)
@@ -258,18 +253,6 @@ onMounted(async () => {
flex-shrink: 0;
}
-.company-name {
- max-width: 180px;
- padding: 3px 10px;
- border: 1px solid #3e4a62;
- border-radius: 999px;
- color: #9fb0c9;
- font-size: 12px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
.admin-name {
color: #c8d2e2;
font-size: 13px;
diff --git a/frontend-vue/tests/mount/amazon-topbar-no-company.mount.test.ts b/frontend-vue/tests/mount/amazon-topbar-no-company.mount.test.ts
new file mode 100644
index 000000000..d13e0bb5f
--- /dev/null
+++ b/frontend-vue/tests/mount/amazon-topbar-no-company.mount.test.ts
@@ -0,0 +1,74 @@
+/**
+ * 亚马逊工具台顶栏的挂载用例:右上角不显示公司名(2026-10-17 需求「客户端的前端右上角不要显示公司」)。
+ *
+ * 三件事都要判,缺一条就是假绿:
+ * ① 公司名不进 DOM——localStorage 里明明有好端确认过的公司名,顶栏也不许渲染它;
+ * ② 正向对照——同一框里的用户名必须照旧出现。少了这条,"顶栏整个挂载失败"
+ * 与"公司名被摘掉了"在这支用例里同形,`.company-name` 查不到也能蒙过;
+ * ③ 身份机制没被拆——readCompanyIdentity 仍读得到那个值。公司名是登录/多租户判断的输入
+ * (check_login 与登录响应带下来,见 shared/auth/company-identity.ts),
+ * 本轮只是不再显示,不是不再持有。
+ *
+ * 跑法:cd frontend-vue && npx vitest run(tests/mount/** 由 vitest.config.ts 收,
+ * `npm test` 那支 node --test 的 glob 不递归,抓不到这里)。
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
+
+import AmazonTopBar from '@/pages/amazon/components/AmazonTopBar.vue'
+import { COMPANY_NAME_STORAGE_KEY, readCompanyIdentity } from '@/shared/auth/company-identity'
+
+const permission = vi.hoisted(() => ({ getCurrentUserAppColumnKeys: vi.fn() }))
+
+vi.mock('@/shared/api/permission', () => ({
+ getCurrentUserAppColumnKeys: permission.getCurrentUserAppColumnKeys,
+}))
+
+const COMPANY = '厦门米椿花'
+const USER = '黄建新'
+
+let wrapper: VueWrapper | null = null
+
+async function mountTopBar() {
+ wrapper = mount(AmazonTopBar, {
+ global: {
+ // 顶栏右侧的铃铛与密钥入口各有自己的依赖树(轮询、面板),这里只关心顶栏本身的输出
+ stubs: { NotificationBell: true, BrandApiSecretSettingsButton: true, RouterLink: true, 'router-link': true },
+ },
+ })
+ await flushPromises()
+ return wrapper
+}
+
+describe('亚马逊工具台顶栏右上角', () => {
+ beforeEach(() => {
+ permission.getCurrentUserAppColumnKeys.mockResolvedValue([])
+ window.localStorage.setItem('username', USER)
+ window.localStorage.setItem(COMPANY_NAME_STORAGE_KEY, COMPANY)
+ })
+
+ afterEach(() => {
+ wrapper?.unmount()
+ wrapper = null
+ window.localStorage.clear()
+ })
+
+ it('localStorage 里有公司名时也不渲染公司名', async () => {
+ const w = await mountTopBar()
+ expect(w.find('.company-name').exists(), '公司名胶囊节点不得存在').toBe(false)
+ expect(w.text(), `顶栏文本里不应出现 ${COMPANY}`).not.toContain(COMPANY)
+ expect(w.html()).not.toContain('所属公司')
+ })
+
+ it('正向对照:同框的用户名照旧渲染(防"挂载失败"冒充"已摘掉")', async () => {
+ const w = await mountTopBar()
+ const adminName = w.find('.admin-name')
+ expect(adminName.exists(), '用户名节点必须还在,否则上一条的红/绿都无意义').toBe(true)
+ expect(adminName.text()).toBe(USER)
+ })
+
+ it('公司身份机制未被拆除:不显示但仍读得到', async () => {
+ await mountTopBar()
+ expect(readCompanyIdentity()).toBe(COMPANY)
+ })
+})