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