diff --git a/clientarea/hgcloud/components/topMenu/topMenu.js b/clientarea/hgcloud/components/topMenu/topMenu.js index 7dc1c99..e381ad4 100644 --- a/clientarea/hgcloud/components/topMenu/topMenu.js +++ b/clientarea/hgcloud/components/topMenu/topMenu.js @@ -75,6 +75,9 @@ const topMenu = {
+ + + .el-container { - flex-direction: row !important; + display: grid !important; + grid-template-columns: 190px 1fr !important; + grid-template-rows: 60px 1fr !important; + min-height: 100vh !important; + width: 100% !important; } -/* 内层容器:垂直方向(top-menu 上 + el-main 下) */ +/* 内层 el-container: display:contents 让子元素直接参与外层 grid */ .template > .el-container > .el-container { - flex-direction: column !important; + display: contents !important; +} + +/* top-menu 组件的
包裹层也 display:contents */ +.template > .el-container > .el-container > div { + display: contents !important; +} + +/* el-header: 跨两列, 第一行, 全宽 */ +.el-header { + grid-column: 1 / -1 !important; + grid-row: 1 !important; + background: #FFFFFF !important; + box-shadow: 0 1px 0 rgba(0,0,0,0.06) !important; + border-bottom: 1px solid rgba(0,0,0,0.06); + z-index: 100 !important; + position: sticky !important; + top: 0 !important; +} + +/* el-aside: 第一列, 第二行 */ +.template > .el-container > .el-aside { + grid-column: 1 !important; + grid-row: 2 !important; +} + +/* el-main: 第二列, 第二行 */ +.el-main { + grid-column: 2 !important; + grid-row: 2 !important; +} + +/* ============ 顶栏 Logo ============ */ +.header-logo-link { + display: flex; + align-items: center; + margin-right: 16px; + cursor: pointer; +} + +.header-logo { + height: 32px; + width: auto; } /* ============ 侧边栏 ============ */ +/* 隐藏侧边栏原有 logo (已移到顶栏) */ +.el-aside > a:first-child { + display: none !important; +} + .el-aside { background: #FFFFFF !important; - border-right: none !important; - border-radius: 0 16px 16px 0 !important; - box-shadow: 1px 0 3px rgba(0,0,0,0.04) !important; + border-right: 1px solid rgba(0,0,0,0.06) !important; overflow-y: auto !important; overflow-x: hidden !important; } +/* 侧边栏菜单不再需要 86px 的 logo 占位 */ +.el-aside .menu-top { + margin-top: 12px !important; +} + .ali-logo { filter: none; } @@ -120,12 +174,7 @@ html, body { border-right: none !important; } -/* ============ 顶栏 ============ */ -.el-header { - background: #FFFFFF !important; - box-shadow: 0 1px 0 rgba(0,0,0,0.06) !important; - border-bottom: 1px solid rgba(0,0,0,0.06); -} +/* ============ 顶栏子元素 ============ */ .el-header .search-value, .el-header .search-name {