Issue#6·P3·C3: MainLayout+TagsBar 契约重排——①MainLayout:aurora 光斑退役/顶栏 54→64(菜单钮+页标题 top-title 18/600+theme+avatar,brand 出场)/sidebar-header 品牌区(router-link /:logo 36 r12 gradient glow ✦+品牌 18/700+ver-badge 版本徽章迁品牌下方=用户指令位,红点/未读/markSeen/testid 全保留)/菜单 icon 14→20/sidebar-foot 只余折叠钮/shortVersion 退役(折叠态徽章随品牌隐藏=契约);②TagsBar scoped 契约化(chip h32 r12 13px/激活 primary-50 底,功能与 testid 零动);③goRelease 替代 ver-chip 跳转;④门禁=vue-tsc 0/eslint 0/vitest 182 全绿(keep-alive/Issue#2/#4 资产无伤);教训留痕:template 整段替换须防 dropdown 内层 </template> 截断(首版致 8 解析错,已全量重写修复)

This commit is contained in:
2026-11-18 10:58:18 +08:00
parent 1b276d73c6
commit 2cc027a1df
2 changed files with 48 additions and 40 deletions
+12 -10
View File
@@ -59,7 +59,9 @@ function onAuxClick(t: TabItem, e: MouseEvent) {
</script>
<style scoped>
.tags-bar { display: flex; align-items: center; gap: 8px; margin-bottom: 14px; min-width: 0; }
/* Issue#6 P3:sub2api 契约化——chip h32/r12/13px,激活 primary-soft 底
primary 字(同 nav-item 激活语义);ghost 动作钮 12px。功能零动。 */
.tags-bar { display: flex; align-items: center; gap: 8px; margin-bottom: 16px; min-width: 0; }
.tags-scroll {
display: flex; align-items: center; gap: 6px; flex: 1; min-width: 0;
overflow-x: auto; scrollbar-width: none; padding: 2px;
@@ -67,26 +69,26 @@ function onAuxClick(t: TabItem, e: MouseEvent) {
.tags-scroll::-webkit-scrollbar { display: none; }
.tag-chip {
display: inline-flex; align-items: center; gap: 6px; flex-shrink: 0;
padding: 4px 10px; border-radius: 10px; border: 1px solid transparent;
background: var(--gosms-card-veil); color: var(--gosms-text);
font-size: 12px; line-height: 1.4; cursor: pointer; transition: all 0.2s; white-space: nowrap;
height: 32px; padding: 0 12px; border-radius: 12px; border: 1px solid transparent;
background: var(--gosms-input-veil); color: var(--gosms-text-secondary);
font-size: 13px; line-height: 1.4; cursor: pointer; transition: all 0.2s; white-space: nowrap;
}
.tag-chip:hover { background: var(--gosms-card-hover); color: var(--gosms-text-bright); }
.tag-chip.active { background: var(--gosms-primary-soft); color: var(--gosms-primary); font-weight: 600; }
html:not(.dark) .tag-chip.active { background: var(--gosms-primary-50); color: var(--gosms-primary-600); }
.tag-close {
display: inline-grid; place-items: center; width: 14px; height: 14px;
display: inline-grid; place-items: center; width: 16px; height: 16px;
border-radius: 4px; font-size: 10px; color: var(--gosms-text-muted); transition: all 0.15s;
}
.tag-close:hover { color: var(--gosms-red); background: rgba(248, 113, 113, 0.12); }
.tag-close:hover { color: var(--gosms-red); background: rgba(239, 68, 68, 0.12); }
.tags-actions { display: flex; gap: 6px; flex-shrink: 0; }
.tag-act {
font-size: 11px; color: var(--gosms-text-muted); background: none;
border: 1px solid var(--gosms-border); border-radius: 8px; padding: 4px 10px;
font-size: 12px; color: var(--gosms-text-secondary); background: none;
border: 1px solid var(--gosms-border); border-radius: 8px; padding: 5px 10px;
cursor: pointer; transition: all 0.2s; white-space: nowrap;
}
.tag-act:hover { color: var(--gosms-primary); border-color: var(--gosms-primary); }
.tag-act:hover { color: var(--gosms-primary); border-color: var(--gosms-primary); background: var(--gosms-primary-soft); }
@media (max-width: 900px) {
/* 移动端收紧:动作按钮保留,chip 区横向滚动已由 tags-scroll 承接 */
.tags-bar { gap: 6px; margin-bottom: 10px; }
.tag-act { padding: 4px 8px; }
}
+36 -30
View File
@@ -1,14 +1,9 @@
<template>
<!-- G2:demo-c-aurora.html body 结构 1:1 直译——aurora 光斑 + topbar + shell(sidebar/main)
EP 导航壳(el-menu/el-scrollbar/el-drawer)全部退场,菜单= demo 原生 nav-item -->
<div class="aurora"></div>
<!-- Issue#6 P3:sub2api 契约壳——顶栏 64 glass(页标题+动作)/侧栏 256·折叠 72
(sidebar-header 品牌区+版本徽章=用户指令位)/main 32/keep-alive 不变 -->
<header class="topbar">
<button class="menu-btn" aria-label="打开导航菜单" data-testid="menu-drawer-btn" @click="navOpen = true">☰</button>
<div class="brand">
<div class="brand-mark">✦</div>
<div><div class="brand-name">go-sms</div><div class="brand-sub">AURORA CONSOLE</div></div>
</div>
<h1 class="top-title" data-testid="top-title">{{ route.meta.title ?? '' }}</h1>
<div class="top-actions">
<button class="theme-btn" data-testid="dark-toggle" :aria-label="isDark ? '切换到亮色主题' : '切换到暗色主题'" @click="toggleTheme">
{{ isDark ? '☀ 亮色' : '◑ 主题' }}
@@ -29,9 +24,25 @@
</header>
<div class="shell">
<!-- ===== 侧栏(demo sidebar 原文结构;唯一菜单,无折叠/无 popup) ===== -->
<!-- ===== 侧栏(sub2api AppSidebar 结构:header 品牌区+nav 滚动区+foot) ===== -->
<aside class="sidebar" :class="{ open: navOpen, collapsed: collapsed && !navOpen }">
<!-- W6:菜单滚动区(flex:1 承接滚动) + 底脚收起按钮(固定最下方) -->
<router-link to="/" class="sidebar-header" @click="navOpen = false">
<div class="brand">
<div class="brand-mark">✦</div>
<div>
<div class="brand-name">go-sms</div>
<!-- Issue#4 资产:版本徽章迁品牌下方(用户指令位);红点=本地未读,点击进发布日志 -->
<span
class="ver-badge" data-testid="sidebar-version"
:title="release.hasUpdate ? `发现新版本 v${APP_VERSION},点击查看更新内容` : `当前版本 v${APP_VERSION}`"
@click.stop.prevent="goRelease"
>
<span v-if="release.hasUpdate" class="ver-dot" data-testid="sidebar-version-dot"></span>
<span class="ver-txt">v{{ APP_VERSION }}</span>
</span>
</div>
</div>
</router-link>
<div class="nav-scroll">
<template v-for="(items, group) in menuGroups" :key="group">
<div class="nav-group">{{ group }}</div>
@@ -40,20 +51,11 @@
class="nav-item" :class="{ active: isActive(m.path) }"
:data-testid="`menu-${m.name}`" @click="navOpen = false"
>
<span class="ic"><el-icon :size="14"><component :is="m.icon" /></el-icon></span><span class="txt">{{ m.title }}</span>
<span class="ic"><el-icon :size="20"><component :is="m.icon" /></el-icon></span><span class="txt">{{ m.title }}</span>
</router-link>
</template>
</div>
<div class="sidebar-foot">
<!-- Issue#4:当前版本号(折叠按钮旁;点击进发布日志,有未读新版本时红点闪烁) -->
<router-link
to="/system/release" class="ver-chip" data-testid="sidebar-version"
:title="release.hasUpdate ? `发现新版本 v${APP_VERSION},点击查看更新内容` : `当前版本 v${APP_VERSION}`"
@click="release.markSeen()"
>
<span v-if="release.hasUpdate" class="ver-dot" data-testid="sidebar-version-dot"></span>
<span class="ver-txt">{{ collapsed ? shortVersion : `v${APP_VERSION}` }}</span>
</router-link>
<button class="collapse-btn" :aria-label="collapsed ? '展开侧栏' : '收起侧栏'" data-testid="sidebar-collapse-btn" @click="toggleCollapse">
<span class="cg" :style="{ transform: collapsed ? 'rotate(180deg)' : '' }">❮</span>
</button>
@@ -61,7 +63,7 @@
</aside>
<div v-if="navOpen" class="nav-scrim" @click="navOpen = false"></div>
<!-- ===== 主区(demo main 原文) ===== -->
<!-- ===== 主区 ===== -->
<main class="main">
<!-- Issue#2:多标签导航(独立关闭/关闭其他/全部关闭) -->
<TagsBar />
@@ -96,13 +98,10 @@ const route = useRoute()
const router = useRouter()
const userStore = useUserStore()
const tabs = useTabsStore()
// Issue#4:版本已读状态(侧栏版本号红点判定)
// Issue#4:版本已读状态(品牌区版本徽章红点判定)
const release = useReleaseStore()
// 折叠态(64px 窄栏)短版本:v1.5.0 → 1.5(去 v 前缀,实测 monospace 渲染偏宽,
// 带 v 的 "v1.5" 在 64px 侧栏溢出 foot 内容区——style-check 实测 55px>47px)
const shortVersion = computed(() => APP_VERSION.split('.').slice(0, 2).join('.'))
// ===== 暗色模式(html.dark;demo data-theme 的项目语义映射) =====
// ===== 暗色模式(html.dark) =====
const isDark = ref(document.documentElement.classList.contains('dark'))
function toggleTheme() {
isDark.value = !isDark.value
@@ -110,23 +109,30 @@ function toggleTheme() {
localStorage.setItem('gosms_dark', isDark.value ? '1' : '0')
}
// ===== 移动端汉堡抽屉(<=900,demo 断点;CSS transform,无 EP) =====
// ===== 移动端汉堡抽屉(<=900,CSS transform,无 EP) =====
const navOpen = ref(false)
// ===== H1:桌面侧栏收起/展开(64px 图标态;localStorage 持久化) =====
// ===== 侧栏收起/展开(72px 图标态;localStorage 持久化) =====
const collapsed = ref(localStorage.getItem('gosms_sidebar') === '1')
function toggleCollapse() {
collapsed.value = !collapsed.value
localStorage.setItem('gosms_sidebar', collapsed.value ? '1' : '0')
}
// ===== 头像首字母(demo avatar:AD) =====
// ===== 头像首字母 =====
const initials = computed(() => (userStore.user?.username ?? '?').slice(0, 2).toUpperCase())
// page-head 副题(meta.subtitle 可选)
const pageSub = computed(() => (route.meta as { subtitle?: string }).subtitle ?? '')
// ===== 菜单:可访问路由生成,按 group 分组(demo nav-item 数据源) =====
// Issue#4→P3:版本徽章迁 sidebar-header 品牌下方;折叠态随品牌隐藏(契约同
// sub2api),shortVersion 退役;点击徽章进发布日志并 markSeen。
function goRelease() {
release.markSeen()
void router.push('/system/release')
}
// ===== 菜单:可访问路由生成,按 group 分组 =====
interface MenuItem { path: string; name: string; title: string; icon: string }
const menuItems = computed<MenuItem[]>(() =>
accessibleRoutes(userStore.roles)