From 8865bf7ae04a30e1e7cebf498ac2254bf6746c23 Mon Sep 17 00:00:00 2001 From: XiaoDaiGua-Ray <51957438+XiaoDaiGua-Ray@users.noreply.github.com> Date: Fri, 6 Nov 2026 22:09:48 +0800 Subject: [PATCH] fix(ui): align account themes and stabilize menu tags --- __test__/layout/menu-tag.spec.tsx | 168 ++++++++++++++++++ .../src/layout/components/MenuTag/index.scss | 6 + .../src/layout/components/MenuTag/index.tsx | 29 ++- .../src/views/account-profile/index.scss | 110 +++--------- .../admin/src/views/account-profile/index.tsx | 24 +-- docs/ui-design.md | 2 +- packages/admin-shell/src/Tabs.scss | 26 +-- 7 files changed, 233 insertions(+), 132 deletions(-) create mode 100644 __test__/layout/menu-tag.spec.tsx create mode 100644 apps/admin/src/layout/components/MenuTag/index.scss diff --git a/__test__/layout/menu-tag.spec.tsx b/__test__/layout/menu-tag.spec.tsx new file mode 100644 index 00000000..82621bb7 --- /dev/null +++ b/__test__/layout/menu-tag.spec.tsx @@ -0,0 +1,168 @@ +import MenuTag from '@/layout/components/MenuTag' +import type { MenuTagOptions } from '@/types' +import { flushPromises, mount } from '@vue/test-utils' +import type { VueWrapper } from '@vue/test-utils' +import { NDropdown } from 'naive-ui' +import { h, nextTick, ref } from 'vue' +import type { Ref } from 'vue' +import { createMemoryHistory, createRouter } from 'vue-router' +import type { Router } from 'vue-router' + +const state = vi.hoisted(() => ({ + tags: null as unknown as Ref, + active: null as unknown as Ref, + close: vi.fn(), + navigate: vi.fn(), +})) + +vi.mock('@/hooks', () => ({ + useI18n: () => ({ t: (key: string) => key }), + useMaximize: () => ({ maximize: vi.fn() }), + useSpinning: () => ({ reload: vi.fn() }), + useSiderBar: () => ({ + close: state.close, + closeForbiddenPage: vi.fn(), + closeAll: vi.fn(), + closeRight: vi.fn(), + closeLeft: vi.fn(), + closeOther: vi.fn(), + checkCloseLeft: (index: number) => index > 0, + checkCloseRight: (index: number) => index < state.tags.value.length - 1, + }), +})) + +vi.mock('@/store', () => ({ + useMenuGetters: () => ({ + getMenuTagOptions: state.tags, + getCurrentMenuOption: state.active, + }), + useMenuActions: () => ({ changeMenuModelValue: state.navigate }), + useRuntimeGetters: () => ({ globalMainLayoutLoad: ref(true) }), +})) + +let wrapper: VueWrapper +let router: Router +let host: HTMLElement +let outside: HTMLButtonElement + +beforeEach(async () => { + vi.clearAllMocks() + state.tags = ref( + ['Reports', 'Orders', 'Users'].map((label) => ({ + fullPath: `/${label.toLowerCase()}`, + breadcrumbLabel: label, + meta: {}, + })) as MenuTagOptions[], + ) + state.active = ref(state.tags.value[0]!) + router = createRouter({ + history: createMemoryHistory(), + routes: [ + { path: '/:pathMatch(.*)*', component: { render: () => h('div') } }, + ], + }) + await router.push('/reports') + host = document.createElement('div') + outside = document.createElement('button') + document.body.append(host, outside) + wrapper = mount(MenuTag, { + attachTo: host, + global: { + plugins: [router], + mocks: { $t: (key: string) => key }, + }, + }) +}) + +afterEach(() => { + wrapper.unmount() + router.options.history.destroy() + host.remove() + outside.remove() +}) + +const contextDropdown = () => + wrapper + .findAllComponents(NDropdown) + .find((menu) => menu.props('trigger') === 'manual')! + +const mouse = (element: Element, type: string, button: number) => { + element.dispatchEvent( + new MouseEvent(type, { + bubbles: true, + cancelable: true, + button, + clientX: 120, + clientY: 80, + }), + ) +} + +const openContextMenu = async (index: number) => { + const tab = wrapper.findAll('.menu-tag__tab')[index]!.element + + mouse(tab, 'mousedown', 2) + mouse(tab, 'contextmenu', 2) + await nextTick() + await nextTick() + mouse(tab, 'mouseup', 2) + await flushPromises() +} + +it('keeps the context menu open while repeatedly right-clicking other tags', async () => { + for (const index of [0, 1, 2, 0]) { + await openContextMenu(index) + expect(contextDropdown().props('show')).toBe(true) + expect(document.querySelector('.menu-tag__dropdown')).not.toBeNull() + } +}) + +it('applies a context command to the most recently right-clicked tag', async () => { + await openContextMenu(0) + await openContextMenu(2) + + const command = [ + ...document.querySelectorAll('.n-dropdown-option-body'), + ].find((option) => option.textContent === 'closeCurrent') + + expect(command).toBeDefined() + mouse(command!, 'click', 0) + await nextTick() + expect(state.close).toHaveBeenCalledExactlyOnceWith(2) + expect(contextDropdown().props('show')).toBe(false) +}) + +it.each([0, 2])( + 'dismisses when mouse button %i is clicked outside the tags and menu', + async (button) => { + await openContextMenu(0) + mouse(outside, 'mousedown', button) + mouse(outside, 'mouseup', button) + await nextTick() + expect(contextDropdown().props('show')).toBe(false) + }, +) + +it('dismisses the context menu when selecting a different tag', async () => { + await openContextMenu(0) + const tab = wrapper.findAll('.menu-tag__tab')[1]! + + mouse(tab.element, 'mousedown', 0) + mouse(tab.element, 'mouseup', 0) + await tab.trigger('click') + expect(contextDropdown().props('show')).toBe(false) + expect(state.navigate).toHaveBeenCalledExactlyOnceWith( + '/orders', + state.tags.value[1], + ) +}) + +it('dismisses the context menu with Escape after switching tags', async () => { + await openContextMenu(0) + await openContextMenu(1) + document.dispatchEvent( + new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }), + ) + await nextTick() + expect(contextDropdown().props('show')).toBe(false) +}) diff --git a/apps/admin/src/layout/components/MenuTag/index.scss b/apps/admin/src/layout/components/MenuTag/index.scss new file mode 100644 index 00000000..01917c74 --- /dev/null +++ b/apps/admin/src/layout/components/MenuTag/index.scss @@ -0,0 +1,6 @@ +.menu-tag__dropdown.n-dropdown-menu { + min-inline-size: 188px; + padding: 6px; + border: 1px solid var(--r-line); + border-radius: var(--r-radius); +} diff --git a/apps/admin/src/layout/components/MenuTag/index.tsx b/apps/admin/src/layout/components/MenuTag/index.tsx index ed859a70..0fd2d42b 100644 --- a/apps/admin/src/layout/components/MenuTag/index.tsx +++ b/apps/admin/src/layout/components/MenuTag/index.tsx @@ -1,3 +1,4 @@ +import './index.scss' import { RIcon, RMoreDropdown } from '@/components' import { useI18n, useMaximize, useSiderBar, useSpinning } from '@/hooks' import { FORBIDDEN_ROUTE_PATH } from '@/router/constant' @@ -248,13 +249,22 @@ export default defineComponent({ e.preventDefault() currentContextmenuIndex.value = idx - actionState.actionDropdownShow = false + actionState.x = e.clientX + actionState.y = e.clientY + actionState.actionDropdownShow = true + } - nextTick(() => { - actionState.x = e.clientX - actionState.y = e.clientY - actionState.actionDropdownShow = true - }) + const dismissContextMenu = (event: MouseEvent | TouchEvent) => { + // clickoutside 在 mouseup 触发;标签上的同一次右键抬起不能关闭刚切换的菜单。 + if ( + event instanceof MouseEvent && + event.button === 2 && + event.target instanceof Element && + tagsRef.value?.contains(event.target.closest('.menu-tag__item')) + ) + return + + actionState.actionDropdownShow = false } const setCurrentContextmenuIndex = () => { @@ -310,6 +320,7 @@ export default defineComponent({ actionDropdownSelect, actionState, menuTagContextMenu, + dismissContextMenu, setCurrentContextmenuIndex, maximize, reload, @@ -336,14 +347,14 @@ export default defineComponent({ options={this.moreOptions} x={this.actionState.x} y={this.actionState.y} - keyboard={false} show={this.actionState.actionDropdownShow} trigger="manual" placement="bottom-start" onSelect={actionDropdownSelect} - onClickoutside={() => { - this.actionState.actionDropdownShow = false + onUpdateShow={(show) => { + this.actionState.actionDropdownShow = show }} + onClickoutside={this.dismissContextMenu} /> div { display: grid; align-content: start; - gap: 4px; - padding: 8px 12px; - border: 1px solid var(--r-line); - border-radius: var(--r-control-radius); - background: var(--r-surface-muted); + gap: 6px; } dt { color: var(--r-text-muted); - font-size: 11px; + font-size: 12px; line-height: 1.45; } @@ -138,21 +94,21 @@ &__workspace { display: grid; align-items: start; - gap: 16px; + gap: 24px; } &__navigation { display: grid; - gap: 5px; - padding: 7px; + min-inline-size: 0; + gap: 8px; } &__section { display: grid; - grid-template-columns: 34px minmax(0, 1fr) auto; + grid-template-columns: 22px minmax(0, 1fr) auto; align-items: center; - gap: 9px; - padding: 9px 10px; + gap: 12px; + padding: 14px 12px; border: 1px solid transparent; border-radius: var(--r-control-radius); background: transparent; @@ -161,21 +117,13 @@ text-align: start; cursor: pointer; - &:hover { + &:hover:not([aria-selected='true']) { background: var(--r-surface-hover); } &[aria-selected='true'] { - border-color: color-mix( - in srgb, - var(--r-theme-primary-color) 26%, - var(--r-line) - ); - background: color-mix( - in srgb, - var(--r-theme-primary-color) 11%, - var(--r-surface) - ); + border-color: var(--r-control-border); + background: var(--r-surface-muted); color: var(--r-selected-text); } } @@ -183,16 +131,7 @@ &__section-icon { display: grid; place-items: center; - inline-size: 34px; - block-size: 34px; - border-radius: var(--r-control-radius); - background: var(--r-surface-muted); - color: var(--r-text-secondary); - } - - &__section[aria-selected='true'] &__section-icon { - background: var(--r-surface); - color: var(--r-primary-text); + color: inherit; } &__section-copy { @@ -209,7 +148,7 @@ &__section-hint { color: var(--r-text-secondary); - font-size: 11px; + font-size: 12px; line-height: 1.4; } @@ -292,6 +231,13 @@ grid-template-columns: minmax(0, 1fr) minmax(250px, 0.58fr); } + .r-account-profile__facts { + padding-block-start: 0; + padding-inline-start: 24px; + border-block-start: 0; + border-inline-start: 1px solid var(--r-line); + } + .r-account-profile__workspace { grid-template-columns: 238px minmax(0, 1fr); } diff --git a/apps/admin/src/views/account-profile/index.tsx b/apps/admin/src/views/account-profile/index.tsx index 2bfcc13f..d5caea70 100644 --- a/apps/admin/src/views/account-profile/index.tsx +++ b/apps/admin/src/views/account-profile/index.tsx @@ -196,18 +196,15 @@ export default defineComponent({ class="r-account-profile__summary" aria-label={t('details')} > -