From 1105320354f1c8aec917f203d7410d3a998c878f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 18 Nov 2026 02:17:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(admin-shell):=20=E5=A3=B3=E5=B1=82=E9=94=81?= =?UTF-8?q?=E8=A7=86=E5=8F=A3=E9=AB=98=E2=80=94=E2=80=94=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E5=9B=BA=E5=AE=9A=E3=80=81=E8=8F=9C=E5=8D=95=E5=8C=BA?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=BB=9A=E5=8A=A8=E6=9D=A1=EF=BC=882026-11-1?= =?UTF-8?q?8=20=E7=94=A8=E6=88=B7=E5=8F=A3=E5=BE=84=E3=80=8C=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=8A=A0=E4=B8=AA=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=90=A7?= =?UTF-8?q?=20=E4=B8=8D=E7=84=B6=E6=BB=9A=E5=8A=A8=E4=B8=8B=E6=9D=A5=20?= =?UTF-8?q?=E5=8F=88=E4=BE=A7=E7=9C=8B=E4=B8=8D=E8=A7=81=E4=BA=86=E3=80=8D?= =?UTF-8?q?=EF=BC=89=E2=80=94=E2=80=94=E6=A0=B9=E5=9B=A0=EF=BC=9D.admin-sh?= =?UTF-8?q?ell=20=E7=94=A8=20min-height:100vh=20=E8=AE=A9=E6=95=B4?= =?UTF-8?q?=E6=9D=A1=20flex=20=E9=AB=98=E5=BA=A6=E9=93=BE=E5=A4=B1?= =?UTF-8?q?=E5=8E=BB=E7=A1=AE=E5=AE=9A=E6=80=A7=EF=BC=9A.admin-menu-scroll?= =?UTF-8?q?(flex:1)=20=E5=86=85=E7=9A=84=20el-scrollbar=EF=BC=88=E5=86=85?= =?UTF-8?q?=E9=83=A8=20height:100%=20=E9=9C=80=E7=88=B6=E7=BA=A7=E5=AE=9A?= =?UTF-8?q?=E9=AB=98=EF=BC=89=E4=B8=8E=20.admin-content=EF=BC=88=E7=8E=B0?= =?UTF-8?q?=E6=88=90=20overflow:auto=EF=BC=89=E5=8F=8C=E5=8F=8C=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E3=80=81=E6=BB=9A=E5=8A=A8=E5=9B=9E=E8=90=BD=E6=95=B4?= =?UTF-8?q?=E9=A1=B5=E6=BB=9A=EF=BC=8C=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E5=93=81=E7=89=8C=E5=8C=BA/=E5=B9=B3=E5=8F=B0=20tab?= =?UTF-8?q?=20=E8=A2=AB=E6=BB=9A=E5=87=BA=E8=A7=86=E5=8F=A3=EF=BC=9B?= =?UTF-8?q?=E6=94=B9=20height:100vh=EF=BC=8Boverflow:hidden=20=E5=90=8E?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=AE=9A=E8=A7=86=E5=8F=A3=E9=AB=98?= =?UTF-8?q?=E3=80=81=E8=8F=9C=E5=8D=95=E5=8C=BA=E8=87=AA=E5=87=BA=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E3=80=81=E5=86=85=E5=AE=B9=E5=8C=BA=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E6=BB=9A=E5=8A=A8=E3=80=81=E9=A1=B6=E6=A0=8F=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=EF=BC=88html/body/#app=20L33=20=E5=B7=B2=20height:100?= =?UTF-8?q?%=20=E6=97=A0=E9=9C=80=E5=8A=A8=EF=BC=9B=E4=B8=8D=E5=88=A0?= =?UTF-8?q?=E4=BB=BB=E4=BD=95=E7=8E=B0=E6=9C=89=E5=A3=B0=E6=98=8E=EF=BC=8C?= =?UTF-8?q?task-243=20=E9=92=89=E7=9A=84=20sidebar=20252px/topbar=2076px/?= =?UTF-8?q?=E6=B8=90=E5=8F=98=E5=85=A8=E5=85=BC=E5=AE=B9=EF=BC=89=E3=80=82?= =?UTF-8?q?=E5=88=A4=E6=8D=AE=EF=BC=9Atask-243=20=E9=A6=96=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E6=96=B0=E5=A2=9E=E4=B8=89=E6=9D=A1=E7=BB=8A=E7=BA=BF?= =?UTF-8?q?=E6=96=AD=E8=A8=80=EF=BC=88.admin-shell=20=E5=BF=85=E9=A1=BB=20?= =?UTF-8?q?height:100vh=EF=BC=8Boverflow:hidden=E3=80=81=E4=B8=8D=E5=BE=97?= =?UTF-8?q?=E5=9B=9E=E9=80=80=20min-height:100vh=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E5=8D=B3=E7=BA=A2=EF=BC=9B=E5=9C=A8=E6=97=A2=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=86=85=E5=8A=A0=E6=96=AD=E8=A8=80=E8=A1=8C?= =?UTF-8?q?=E4=B8=8D=E6=96=B0=E5=A2=9E=20test=20=E5=9D=97/read=20=E7=82=B9?= =?UTF-8?q?=EF=BC=8Csource-pin=20=E6=A3=98=E8=BD=AE=E9=92=89=E5=AD=90=3D46?= =?UTF-8?q?0/=E8=AF=BB=E7=82=B9=3D658=20=E4=B8=8E=E5=9F=BA=E7=BA=BF?= =?UTF-8?q?=E9=80=90=E5=AD=97=E5=90=8C=E9=9B=B6=E5=8F=B0=E8=B4=A6=E5=8F=98?= =?UTF-8?q?=E5=8C=96=EF=BC=89=EF=BC=9Bvue-tsc=20rc=3D0=EF=BC=9Bnode=20--te?= =?UTF-8?q?st=20task-243/4/242/=E6=A3=98=E8=BD=AE=2030/30=EF=BC=9B?= =?UTF-8?q?=E5=BF=AB=E6=A3=80=20overall=3Dpass=20=E5=9B=9B=E9=9D=A2?= =?UTF-8?q?=E7=BB=BF=EF=BC=88=E5=90=8E=E7=AB=AF=209.5/=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=208.8/=E5=AE=A2=E6=88=B7=E7=AB=AF=2010.0/=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=209.6=EF=BC=89=E3=80=82=E7=BA=AF=20CSS=20=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E9=9A=8F=E4=B8=8B=E4=B8=80=E7=AA=97=E5=8F=A3=E5=90=8E?= =?UTF-8?q?=E7=AE=A1=E5=8F=91=E7=89=88=E7=94=9F=E6=95=88=EF=BC=8C=E7=9C=9F?= =?UTF-8?q?=E6=9C=BA=E7=9B=AE=E6=A3=80=E7=99=BB=E5=BD=95=E5=90=8E=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E8=8F=9C=E5=8D=95=E5=8D=B3=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-frontend-vue/src/styles/main.css | 5 ++++- admin-frontend-vue/tests/task-243.test.ts | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/admin-frontend-vue/src/styles/main.css b/admin-frontend-vue/src/styles/main.css index e902edf1a..24741055b 100644 --- a/admin-frontend-vue/src/styles/main.css +++ b/admin-frontend-vue/src/styles/main.css @@ -41,7 +41,10 @@ body { button, input, textarea, select { font: inherit; } /* ===== 蓝白浅色壳层(对齐 admin.html 末层皮肤) ===== */ -.admin-shell { display: flex; min-height: 100vh; background: var(--admin-bg); } +/* 壳层锁视口高(2026-11-18「菜单加个滚动条」):min-height 会让 flex 高度链失去确定性, + * el-scrollbar 与 .admin-content 的 overflow 全部失效、回落整页滚,侧边栏顶部(品牌区/平台 + * tab)被滚出视口。height:100vh 定高后侧边栏与 .admin-content 各自独立滚动、顶栏固定。 */ +.admin-shell { display: flex; height: 100vh; overflow: hidden; background: var(--admin-bg); } .admin-sidebar { display: flex; flex: 0 0 252px; flex-direction: column; background: linear-gradient(180deg, var(--admin-sidebar) 0%, var(--admin-sidebar-deep) 100%); diff --git a/admin-frontend-vue/tests/task-243.test.ts b/admin-frontend-vue/tests/task-243.test.ts index 4efdfe0cd..5bedc93fe 100644 --- a/admin-frontend-vue/tests/task-243.test.ts +++ b/admin-frontend-vue/tests/task-243.test.ts @@ -10,6 +10,12 @@ test('test_task_243_shell_normal_primary_path', () => { assert.match(css, /\.admin-sidebar\s*\{[^}]*flex:\s*0\s*0\s*252px/, '侧栏宽度应为 252px') assert.match(css, /\.admin-topbar\s*\{[^}]*min-height:\s*76px/, '顶栏高度应为 76px') assert.match(css, /linear-gradient\(180deg,\s*var\(--admin-sidebar\)\s*0%,/, '侧栏应为浅色渐变底') + // 壳层锁视口高(2026-11-18「菜单加个滚动条」绊线):.admin-shell 必须 height:100vh + + // overflow:hidden——侧边栏固定、菜单区 el-scrollbar 与内容区 overflow:auto 才能各自独立滚动; + // 改回 min-height 会把整条 flex 高度链放软、回落整页滚(侧边栏顶部被滚出视口)。 + assert.match(css, /\.admin-shell\s*\{[^}]*height:\s*100vh/, '.admin-shell 必须锁视口高') + assert.match(css, /\.admin-shell\s*\{[^}]*overflow:\s*hidden/, '.admin-shell 必须 overflow:hidden') + assert.equal(/\.admin-shell\s*\{[^}]*min-height:\s*100vh/.test(css), false, '.admin-shell 不得回退 min-height:100vh') }) test('test_task_243_shell_normal_variant_input', () => {