From 64685a2db6600e7f8e09d6e3f6096d3f99aebece Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 27 Jun 2018 16:07:01 +0800
Subject: [PATCH] no message

Former-commit-id: 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly c31bba0bcbe5dbbe311023f64cdce8ad0d3f9276 [formerly eb8211779aea015240ac95b0534324fd4c84dc67]]]]]
Former-commit-id: 47cded5f6aa6bab091b8a0871c4b7f03fcc32c15
Former-commit-id: b91a00e9032f7240777ad683b69ad87c9c9a3d1e
Former-commit-id: 9f00370a010a33f093521145e9c86bda0d7202d6 [formerly 1308aa9caab6092d9330825d070b2300fbd126ba]
Former-commit-id: 1c8d194ca4a214c568c55e1f012f33cfb1038c64
Former-commit-id: 0a1a134939dbe74bd406d1382f325e5c63131bc9
Former-commit-id: 9cab1bd5916dd249f16ede6d8806e1538300efee
Former-commit-id: b5a4e2a15bcf9f241ee4840cdbdd8c8430b10d8a
Former-commit-id: c6a72c1ecac32ea176ea48ffeba0078e49c38f88
---
 .eslintignore                                  |  1 +
 src/assets/style/theme/theme.scss              | 18 ++++++++++++++++--
 .../components/-menu-item/index.vue            |  2 +-
 .../components/-menu-side/index.vue            |  6 ++++--
 .../components/-menu-sub/index.vue             |  2 +-
 src/menu/index.js.REMOVED.git-id               |  2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 2bc76f59..ff3710d8 100755
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,3 +3,4 @@
 /dist/
 /*.js
 /src/plugin/vue-bigdata-table
+/src/pages/demo/charts
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 38288756..968c26f0 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -52,12 +52,19 @@
         float: left;
         border-bottom: none;
         background-color: transparent;
-        .el-menu-item {
+        %header-menu-item {
           @extend %unable-select;
+          i.fa {
+            font-size: 16px;
+            margin-right: 4px;
+          }
+        }
+        .el-menu-item {
+          @extend %header-menu-item;
           border-bottom: none;
         }
         .el-submenu {
-          @extend %unable-select;
+          @extend %header-menu-item;
           .el-submenu__title {
             border-bottom: none;
           }
@@ -227,17 +234,21 @@
         transition: border-top-color 0s;
         color: $theme-header-item-color;
         background: $theme-header-item-background-color;
+        i.fa { color: inherit; }
         &:hover {
           color: $theme-header-item-color-hover;
           background: $theme-header-item-background-color-hover;
+          i.fa { color: inherit; }
         }
         &:focus {
           color: $theme-header-item-color-focus;
           background: $theme-header-item-background-color-focus;
+          i.fa { color: inherit; }
         }
         &.is-active {
           color: $theme-header-item-color-active;
           background: $theme-header-item-background-color-active;
+          i.fa { color: inherit; }
         }
       }
       .el-submenu {
@@ -245,12 +256,14 @@
           transition: border-top-color 0s;
           color: $theme-header-item-color;
           background: $theme-header-item-background-color;
+          i.fa { color: inherit; }
           .el-submenu__icon-arrow {
             color: $theme-header-item-color;
           }
           &:hover {
             color: $theme-header-item-color-hover;
             background: $theme-header-item-background-color-hover;
+            i.fa { color: inherit; }
             .el-submenu__icon-arrow {
               color: $theme-header-item-color-hover;
             }
@@ -258,6 +271,7 @@
           &:focus {
             color: $theme-header-item-color-focus;
             background: $theme-header-item-background-color-focus;
+            i.fa { color: inherit; }
             .el-submenu__icon-arrow {
               color: $theme-header-item-color-focus;
             }
diff --git a/src/components/core/d2-layout-main/components/-menu-item/index.vue b/src/components/core/d2-layout-main/components/-menu-item/index.vue
index 845b83ba..caafa43f 100644
--- a/src/components/core/d2-layout-main/components/-menu-item/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-item/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-menu-item :index="menu.path || uniqueid">
-    <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
+    <i :class="`fa fa-${menu.icon || 'file-o'}`"></i>
     <span slot="title">{{menu.title}}</span>
   </el-menu-item>
 </template>
diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index ecf0413a..afeb81f0 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <el-scrollbar v-if="menus.length > 0 && !collapse">
+    <el-scrollbar v-if="menus.length > 0">
       <div :style="{ height: `${asideHeight}px` }">
         <el-menu
           :collapse="collapse"
@@ -60,7 +60,9 @@ export default {
         this.menus = _side.length > 0 ? _side[0].children : []
         this.active = val[val.length - 1].path
         this.$nextTick(() => {
-          this.$refs.menu.activeIndex = this.active
+          if (this.menus.length > 0) {
+            this.$refs.menu.activeIndex = this.active
+          }
         })
       },
       immediate: true
diff --git a/src/components/core/d2-layout-main/components/-menu-sub/index.vue b/src/components/core/d2-layout-main/components/-menu-sub/index.vue
index d4074819..88dd903b 100644
--- a/src/components/core/d2-layout-main/components/-menu-sub/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-sub/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-submenu :index="menu.path || uniqueid">
     <template slot="title">
-      <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
+      <i :class="`fa fa-${menu.icon || 'folder-o'}`"></i>
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 0e627d15..fab9a01c 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-bf6d527e9d3ed7e689157c558539c615f6d69190
\ No newline at end of file
+bdea6a7f1b965319df811436ddcfcd42f0051ff2
\ No newline at end of file