From d46879d20402e4f8cd7f201b089b8d304bfdd411 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Wed, 4 Nov 2020 16:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E8=BF=87=E9=95=BF=E6=97=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Breadcrumb/index.vue | 27 ++++++++++++++--------
 src/layout/components/UserMenu/index.vue   |  2 ++
 src/layout/index.vue                       |  1 +
 src/setting.js                             |  4 ++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/Breadcrumb/index.vue b/src/layout/components/Breadcrumb/index.vue
index 6fdfc8c2..26dd417f 100644
--- a/src/layout/components/Breadcrumb/index.vue
+++ b/src/layout/components/Breadcrumb/index.vue
@@ -54,7 +54,6 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0 20px;
     height: $g-breadcrumb-height;
     background-color: #fff;
     transition: 0.3s;
@@ -65,10 +64,12 @@ export default {
     .left-box {
         display: flex;
         align-items: center;
+        padding-right: 50px;
+        overflow: hidden;
+        mask-image: linear-gradient(90deg, #000 0%, #000 calc(100% - 50px), transparent);
         .sidebar-collapse {
             display: flex;
             align-items: center;
-            margin-left: -20px;
             padding: 0 20px;
             height: 50px;
             cursor: pointer;
@@ -82,15 +83,21 @@ export default {
             &.is-collapse .svg-icon {
                 transform: rotateZ(-180deg);
             }
-        }
-    }
-    ::v-deep .el-breadcrumb {
-        .el-breadcrumb__item {
-            span {
-                font-weight: normal;
+            & + .el-breadcrumb {
+                margin-left: 0;
             }
-            &:last-child span {
-                color: #97a8be;
+        }
+        ::v-deep .el-breadcrumb {
+            margin-left: 20px;
+            white-space: nowrap;
+            .el-breadcrumb__item {
+                float: initial;
+                span {
+                    font-weight: normal;
+                }
+                &:last-child span {
+                    color: #97a8be;
+                }
             }
         }
     }
diff --git a/src/layout/components/UserMenu/index.vue b/src/layout/components/UserMenu/index.vue
index b6f4c0a7..be78fb08 100644
--- a/src/layout/components/UserMenu/index.vue
+++ b/src/layout/components/UserMenu/index.vue
@@ -104,6 +104,8 @@ export default {
 .user {
     display: flex;
     align-items: center;
+    padding: 0 20px;
+    white-space: nowrap;
 }
 .tools {
     margin-right: 20px;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 19d1dff9..be33c7f1 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -225,6 +225,7 @@ header {
         }
     }
     ::v-deep .user {
+        padding: 0;
         .user-container {
             color: #fff;
             font-size: 16px;
diff --git a/src/setting.js b/src/setting.js
index d1c61c11..1c3d1153 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -37,8 +37,8 @@ let globalSettings = {
     enableThemeSetting: true
 }
 
-// 演示环境开启全部功能（这部分代码可删除，仅方便作者打包演示环境）
-if (process.env.VUE_APP_TYPE == 'example') {
+// 演示&开发环境开启全部功能（这部分代码可删除，仅方便作者打包演示环境）
+if (process.env.VUE_APP_TYPE == 'example' || process.env.NODE_ENV == 'development') {
     globalSettings.openPermission = true
     globalSettings.enableSidebarCollapse = true
     globalSettings.enableFullscreen = true