From 142612cfbd45eae6c0e95cba338e7cdcf3f29e45 Mon Sep 17 00:00:00 2001
From: ray_wuhao <443547225@qq.com>
Date: Sat, 11 Mar 2023 18:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=83=E5=B1=80border?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Menu/index.scss    |  1 +
 src/layout/components/MenuTag/index.scss |  1 +
 src/layout/components/MenuTag/index.tsx  | 39 +++++++++++++-----------
 src/layout/index.tsx                     |  2 +-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/layout/components/Menu/index.scss b/src/layout/components/Menu/index.scss
index a37609a6..b4d90627 100644
--- a/src/layout/components/Menu/index.scss
+++ b/src/layout/components/Menu/index.scss
@@ -19,6 +19,7 @@
   gap: 8px 12px;
   font-weight: 600;
   overflow: hidden;
+  border-right: solid 1px var(--n-border-color);
 
   &.ray-menu__logo-url {
     position: sticky;
diff --git a/src/layout/components/MenuTag/index.scss b/src/layout/components/MenuTag/index.scss
index bc091e87..39988bce 100644
--- a/src/layout/components/MenuTag/index.scss
+++ b/src/layout/components/MenuTag/index.scss
@@ -2,6 +2,7 @@ $space: calc($layoutRouterViewContainer / 2);
 
 .menu-tag {
   height: $layoutMenuHeight;
+  border-bottom: solid 1px var(--n-border-color);
 
   & .menu-tag-sapce {
     width: calc(100% - $space * 2);
diff --git a/src/layout/components/MenuTag/index.tsx b/src/layout/components/MenuTag/index.tsx
index 9af2ad24..ff3af757 100644
--- a/src/layout/components/MenuTag/index.tsx
+++ b/src/layout/components/MenuTag/index.tsx
@@ -10,7 +10,7 @@
  */
 
 import './index.scss'
-import { NScrollbar, NTag, NSpace } from 'naive-ui'
+import { NScrollbar, NTag, NSpace, NLayoutHeader } from 'naive-ui'
 import { useMenu } from '@/store'
 
 import type { MenuOption } from 'naive-ui'
@@ -61,23 +61,26 @@ const MenuTag = defineComponent({
   },
   render() {
     return (
-      <NScrollbar class="menu-tag" xScrollable>
-        <NSpace class="menu-tag-sapce" wrap={false} align="center">
-          {this.modelMenuTagOptions.map((curr, idx) => (
-            <NTag
-              closable={
-                curr.key !== '/dashboard' && this.modelMenuTagOptions.length > 1
-              }
-              onClose={() => this.handleCloseTag(idx)}
-              type={curr.key === this.menuKey ? 'success' : 'info'}
-              onClick={this.handleTagClick.bind(this, curr)}
-              bordered={false}
-            >
-              {typeof curr.label === 'function' ? curr.label() : curr.label}
-            </NTag>
-          ))}
-        </NSpace>
-      </NScrollbar>
+      <NLayoutHeader>
+        <NScrollbar class="menu-tag" xScrollable>
+          <NSpace class="menu-tag-sapce" wrap={false} align="center">
+            {this.modelMenuTagOptions.map((curr, idx) => (
+              <NTag
+                closable={
+                  curr.key !== '/dashboard' &&
+                  this.modelMenuTagOptions.length > 1
+                }
+                onClose={() => this.handleCloseTag(idx)}
+                type={curr.key === this.menuKey ? 'success' : 'info'}
+                onClick={this.handleTagClick.bind(this, curr)}
+                bordered={false}
+              >
+                {typeof curr.label === 'function' ? curr.label() : curr.label}
+              </NTag>
+            ))}
+          </NSpace>
+        </NScrollbar>
+      </NLayoutHeader>
     )
   },
 })
diff --git a/src/layout/index.tsx b/src/layout/index.tsx
index 9ff51e65..a363493a 100644
--- a/src/layout/index.tsx
+++ b/src/layout/index.tsx
@@ -25,7 +25,7 @@ const Layout = defineComponent({
 
       if (settingStore.menuTagSwitch) {
         cssVar = {
-          '--layout-content-height': 'calc(100% - 110px)',
+          '--layout-content-height': 'calc(100% - 111px)',
         }
       } else {
         cssVar = {