From 67e0b88a92c9cd9eaff19e83537e6ebe0b5ed2da Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 08:37:37 +0800
Subject: [PATCH 01/78] no message

Former-commit-id: c14b03309fa0c27239185fc57599c3a760fbfe65
Former-commit-id: 0fa8112aeb693c98edfc67a75831b350cf40930e
Former-commit-id: b27418317f332cd76de22359ee8e1b2df40549c2
---
 docs/.vuepress/config.js | 4 ++--
 docs/README.md           | 8 +++-----
 docs/zh/README.md        | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 071e74dd..71567a40 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -4,12 +4,12 @@ module.exports = {
     '/': {
       lang: 'en-US',
       title: 'D2 Admin',
-      description: 'An elegant template for management system'
+      description: 'Elegant management system front-end integration'
     },
     '/zh/': {
       lang: 'zh-CN',
       title: 'D2 Admin',
-      description: '做一个优雅的管理系统模板'
+      description: '优雅的管理系统前端集成方案'
     }
   },
   themeConfig: {
diff --git a/docs/README.md b/docs/README.md
index 429cf782..539d9be0 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,10 +4,10 @@ heroImage: /logo@2x.png
 actionText: Get Started →
 actionLink: /zh/guide/
 features:
-- title: Advocate succinct
-  details: On the visual basis of element UI, we have added some customization.
 - title: Vue-Powered
   details: Enjoy the dev experience of Vue + webpack, Ultra fast virtual DOM and the most economical optimization.
+- title: Rich integration
+  details: The plug-ins and components that are likely to be used are ready for you. Some come from third parties, others are designed for d2admin.
 - title: ElementUI component library
   details: Integrated and robust ElementUI, and use any ElementUI component at will.
 footer: MIT Licensed | Copyright © 2018-present FairyEver
@@ -15,11 +15,9 @@ footer: MIT Licensed | Copyright © 2018-present FairyEver
 
 **The English document will be launched in the future. Please move to the Chinese document.**
 
-**英文文档会在稍后推出，现请移步右上角中文文档**
+**英文文档会在中文文档大致完成后推出，现请移步中文文档**
 
 ```
-// chone
-git clone https://github.com/FairyEver/d2admin-vue-element.git
 // install package
 npm i
 // run
diff --git a/docs/zh/README.md b/docs/zh/README.md
index 2b69474c..50bd2b84 100644
--- a/docs/zh/README.md
+++ b/docs/zh/README.md
@@ -4,18 +4,16 @@ heroImage: /logo@2x.png
 actionText: 快速上手 →
 actionLink: /zh/guide/
 features:
-- title: 简洁至上
-  details: 在 element UI 的视觉基础上稍加定制。
 - title: Vue驱动
   details: 享受 Vue + webpack 的开发体验，超快虚拟 DOM 和最省心的优化。
+- title: 丰富集成
+  details: 已经为你准备好了很可能用到的插件和组件，有的来自第三方，有的专为 d2admin 设计。
 - title: ElementUI组件库
   details: 集成完善且强大的 ElementUI，随意搭配使用任何 ElementUI 组件。
 footer: MIT Licensed | Copyright © 2018-present FairyEver
 ---
 
 ```
-// 克隆仓库
-git clone https://github.com/FairyEver/d2admin-vue-element.git
 // 安装依赖
 npm i
 // 运行

From c21ea18342b4b2004a58ae3b1f2195268a25a131 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 09:24:44 +0800
Subject: [PATCH 02/78] no message

Former-commit-id: 8c0367d8dc40cee3a792ab70b714f848ae7bfd7f
Former-commit-id: c36d70b53d2e633b9c26c7d38a9b48aa8d09dc86
Former-commit-id: ba058de12ab0bd00dfc5f2b549699df5f72c08aa
---
 src/assets/style/theme/classic.scss           | 51 +++++++++----------
 .../MainLayout/components/SideMenu/index.vue  |  7 ---
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/assets/style/theme/classic.scss b/src/assets/style/theme/classic.scss
index f1631be3..87dc0abd 100644
--- a/src/assets/style/theme/classic.scss
+++ b/src/assets/style/theme/classic.scss
@@ -1,22 +1,23 @@
 @import '~@/assets/style/public.scss';
 
+$theme-color: #EFF4F8;
+
 // 默认主题
 .layout-main {
   &.classic {
     height: 100vh;
     width: 100vw;
-    background-color: #EFF4F8;
-    // [全局设置]
-    // 关闭所有卡片的阴影
+    background-color: $theme-color;
     .el-card {
       box-shadow: none;
       &:hover {
         box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
       }
     }
-    // [布局]
+    // [布局] 顶栏
     .el-header {
       padding: 0px;
+      // logo区域
       .logo-group {
         transition: width .3s;
         float: left;
@@ -25,6 +26,7 @@
           height: 60px;
         }
       }
+      // 折叠侧边栏切换按钮
       .toggle-sidemenu-btn {
         float: left;
         height: 60px;
@@ -43,14 +45,14 @@
           }
         }
       }
-      // 顶栏菜单
+      // [菜单] 顶栏
       .el-menu {
         float: left;
         border-bottom: none;
         background-color: transparent;
         .el-menu-item {
           border-bottom: none;
-          border-top: 2px solid #EFF4F8;
+          border-top: 2px solid transparent;
           &:hover {
             background-color: transparent;
           }
@@ -76,12 +78,13 @@
         }
       }
     }
-    // 顶栏下面
+    // [布局] 顶栏下面
     .el-container {
       // 侧边栏
       .el-aside {
         transition: width .3s;
         overflow: inherit;
+        // 空菜单
         .dd-side-menu-empty {
           background-color: rgba(#000, .03);
           margin: $margin;
@@ -91,33 +94,29 @@
           text-align: center;
           color: $color-text-sub;
         }
+        .dd-side-menu {
+          &:not(.el-menu--collapse) {
+            width: 200px;
+            min-height: 400px;
+          }
+        }
+        // [菜单] 正常状态
         .el-menu {
-          background-color: transparent;
+          background-color: red;
           border-right: none;
-          &.el-menu--collapse {
-            .el-submenu {
-              .el-menu {
-                background-color: transparent;
-              }
-            }
-            .el-submenu__title {
-              text-align: center;
-            }
-          }
-          .el-menu-item {
-            &:focus {
-              background-color: rgba(#000, .05);
-            }
-            &:hover {
-              background-color: rgba(#000, .05);
-            }
-          }
           .el-submenu__title {
             &:hover {
               background-color: rgba(#000, .05);
             }
           }
         }
+        // [菜单] 折叠状态
+        .el-menu--collapse {
+          background-color: blue;
+          .el-submenu__title {
+            text-align: center;
+          }
+        }
       }
       .el-main {
         padding: 0px;
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index e5f7fa64..d7505406 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -65,10 +65,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-.dd-side-menu:not(.el-menu--collapse) {
-  width: 200px;
-  min-height: 400px;
-}
-</style>

From aecdd92b4cf2a61efe99c3daf10d0faded34225d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 09:39:57 +0800
Subject: [PATCH 03/78] no message

Former-commit-id: 04d919f45ca87195e22cd6f724a4e64a2a699ba4
Former-commit-id: 8d2c87f76bd8f59470314c2801b04a5ca2f7dd3e
Former-commit-id: be6e9ce987138cb7fae2f6275056751af28357ec
---
 src/components/core/MainLayout/index.vue | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 5b5657f7..2ea04d59 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -1,7 +1,8 @@
 <template>
   <el-container class="layout-main" :class="theme">
+    <!-- 顶栏 -->
     <el-header>
-      <div class="logo-group" :style="logoGroupStyle">
+      <div class="logo-group" :style="{width: collapse ? asideWidth : asideWidthCollapse}">
         <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
         <img v-else src="@/assets/image/logo/header.png">
       </div>
@@ -11,10 +12,13 @@
       <HeaderMenu></HeaderMenu>
       <HeaderRight></HeaderRight>
     </el-header>
+    <!-- 下面 主体 -->
     <el-container>
-      <el-aside :style="asideStyle">
+      <!-- 主体 侧边栏 -->
+      <el-aside :style="{width: collapse ? asideWidth : asideWidthCollapse}">
         <SideMenu :collapse="collapse"></SideMenu>
       </el-aside>
+      <!-- 主体 -->
       <el-main>
         <transition name="fade-transverse">
           <router-view></router-view>
@@ -34,19 +38,9 @@ export default {
   data () {
     return {
       theme: 'classic',
-      collapse: false
-    }
-  },
-  computed: {
-    logoGroupStyle () {
-      return {
-        width: `${this.collapse ? '65' : '200'}px`
-      }
-    },
-    asideStyle () {
-      return {
-        width: `${this.collapse ? '65' : '200'}px`
-      }
+      collapse: false,
+      asideWidth: '65px',
+      asideWidthCollapse: '200px'
     }
   },
   methods: {

From 8dd52f76c0110bde2cfcfece4a07642437c73713 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 09:41:27 +0800
Subject: [PATCH 04/78] no message

Former-commit-id: b965d9f4e1fb416e21fdb65fc979fd3741ffe44b
Former-commit-id: 47f07da8276d803ac1bdd950e405fb6fdd8e1666
Former-commit-id: 0d9fe09e7795e9bcf8dd48c9acdd0c4b1ddb1d9a
---
 src/components/core/MainLayout/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 2ea04d59..5615ef73 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -2,7 +2,7 @@
   <el-container class="layout-main" :class="theme">
     <!-- 顶栏 -->
     <el-header>
-      <div class="logo-group" :style="{width: collapse ? asideWidth : asideWidthCollapse}">
+      <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
         <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
         <img v-else src="@/assets/image/logo/header.png">
       </div>
@@ -15,7 +15,7 @@
     <!-- 下面 主体 -->
     <el-container>
       <!-- 主体 侧边栏 -->
-      <el-aside :style="{width: collapse ? asideWidth : asideWidthCollapse}">
+      <el-aside :style="{width: collapse ? asideWidthCollapse : asideWidth}">
         <SideMenu :collapse="collapse"></SideMenu>
       </el-aside>
       <!-- 主体 -->
@@ -39,8 +39,9 @@ export default {
     return {
       theme: 'classic',
       collapse: false,
-      asideWidth: '65px',
-      asideWidthCollapse: '200px'
+      // 侧边栏宽度
+      asideWidth: '200px',
+      asideWidthCollapse: '65px'
     }
   },
   methods: {

From 0a7223a9c94ef64392ea1276de1e3b7ae984bc4a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 09:46:53 +0800
Subject: [PATCH 05/78] no message

Former-commit-id: cce17961724bbc8171fd73c1403568d4e912f262
Former-commit-id: c5bfe1db039d310d51113e4c7e88be3f834508a2
Former-commit-id: e1522dfc3e74b2bd4c4badc35f305d3e2fca9ae3
---
 src/components/core/MainLayout/index.vue | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 5615ef73..3baabc18 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -6,22 +6,22 @@
         <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
         <img v-else src="@/assets/image/logo/header.png">
       </div>
-      <div class="toggle-sidemenu-btn" @click="toggleAside">
-        <Icon name="bars"></Icon>
+      <div class="toggle-sidemenu-btn" @click="collapse = !collapse">
+        <Icon name="bars"/>
       </div>
-      <HeaderMenu></HeaderMenu>
-      <HeaderRight></HeaderRight>
+      <HeaderMenu/>
+      <HeaderRight/>
     </el-header>
     <!-- 下面 主体 -->
     <el-container>
       <!-- 主体 侧边栏 -->
       <el-aside :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-        <SideMenu :collapse="collapse"></SideMenu>
+        <SideMenu :collapse="collapse"/>
       </el-aside>
       <!-- 主体 -->
       <el-main>
         <transition name="fade-transverse">
-          <router-view></router-view>
+          <router-view/>
         </transition>
       </el-main>
     </el-container>
@@ -39,15 +39,11 @@ export default {
     return {
       theme: 'classic',
       collapse: false,
-      // 侧边栏宽度
+      // [侧边栏宽度] 正常状态
       asideWidth: '200px',
+      // [侧边栏宽度] 折叠状态
       asideWidthCollapse: '65px'
     }
-  },
-  methods: {
-    toggleAside () {
-      this.collapse = !this.collapse
-    }
   }
 }
 </script>
@@ -56,4 +52,3 @@ export default {
 // 主题
 @import '~@/assets/style/theme/classic.scss';
 </style>
-

From f18cd637b4212d13e8fbc6b928b177735a78d6bb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 11:03:45 +0800
Subject: [PATCH 06/78] no message

Former-commit-id: ab7d7209674559ded34a11e3f727d2765920c69c
Former-commit-id: 8984a5d39d7b202d31c94c44a06ad52cc349db04
Former-commit-id: 968e58cc9c04636a9be9a17c0c64ccd828d848fe
---
 src/assets/style/theme/classic.scss           | 10 +--
 .../components/HeaderMenu/index.vue           | 75 ++++---------------
 .../MainLayout/components/SideMenu/index.vue  |  1 -
 3 files changed, 16 insertions(+), 70 deletions(-)

diff --git a/src/assets/style/theme/classic.scss b/src/assets/style/theme/classic.scss
index 87dc0abd..b730a417 100644
--- a/src/assets/style/theme/classic.scss
+++ b/src/assets/style/theme/classic.scss
@@ -94,15 +94,9 @@ $theme-color: #EFF4F8;
           text-align: center;
           color: $color-text-sub;
         }
-        .dd-side-menu {
-          &:not(.el-menu--collapse) {
-            width: 200px;
-            min-height: 400px;
-          }
-        }
         // [菜单] 正常状态
         .el-menu {
-          background-color: red;
+          background-color: transparent;
           border-right: none;
           .el-submenu__title {
             &:hover {
@@ -112,7 +106,7 @@ $theme-color: #EFF4F8;
         }
         // [菜单] 折叠状态
         .el-menu--collapse {
-          background-color: blue;
+          background-color: transparent;
           .el-submenu__title {
             text-align: center;
           }
diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index db3c6941..933c525a 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -1,76 +1,29 @@
 <template>
   <el-menu
-    class="el-menu-demo"
-    mode="horizontal">
-    <el-menu-item index="index" @click.native="active({name: 'index'})">首页</el-menu-item>
+    mode="horizontal"
+    :router="true">
     <el-menu-item
-      v-for="(item, index) in menu"
-      :key="index"
-      :index="String(index)"
-      @click.native="active(item)">
-      {{item.title}}
+      v-for="menu in menus"
+      :key="menu.path"
+      :index="menu.path">
+      首页
     </el-menu-item>
   </el-menu>
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
-import { menu, router } from '@/router/menu/index.js'
 export default {
   data () {
     return {
-      menu,
-      router
-    }
-  },
-  computed: {
-    // 当前路由的name
-    // 仅仅是返回当前的name而已
-    routeName () {
-      return this.$route.name
-    },
-    // 不管当前路由是不是顶级菜单 都返回这个路由所属的顶级菜单对象的name
-    // 如果返回 null 代表这个路由不是在菜单里显示的路由
-    routeTopLevelName () {
-      if (this.router.find(e => e.name === this.routeName)) {
-        return this.routeName
-      } else {
-        const find = this.router.find(e => e.children.find(child => child.name === this.routeName))
-        return find ? find.name : null
-      }
-    },
-    // 返回当前对象对应的顶级菜单下的所有子菜单 这些菜单可以在侧边栏菜单中直接使用
-    // 如果返回 null 代表这个路由没有对应的一级路由也就没有菜单
-    routeTopLevelMenu () {
-      return this.routeTopLevelName ? this.menu.find(e => e.name === this.routeTopLevelName).children : null
-    }
-  },
-  watch: {
-    routeName () {
-      this.refreshSideMenu()
-    }
-  },
-  mounted () {
-    this.refreshSideMenu()
-  },
-  methods: {
-    ...mapMutations([
-      'setSideMenu'
-    ]),
-    // 更新一次侧边栏
-    refreshSideMenu () {
-      if (this.routeTopLevelMenu) {
-        this.setSideMenu({
-          sideMenu: this.routeTopLevelMenu
-        })
-      }
-    },
-    // 跳转到某个路由
-    active (item) {
-      this.$router.push({
-        name: item.name
-      })
+      menus: [
+        {path: '/index', title: '首页'},
+        {path: '/demo/plugins', title: '插件'},
+        {path: '/demo/components', title: '组件'},
+        {path: '/demo/chart', title: '图表'},
+        {path: '/demo/business', title: '示例业务界面'}
+      ]
     }
   }
 }
 </script>
+
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index d7505406..dc0e2080 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -2,7 +2,6 @@
   <div>
     <el-menu
       v-if="sideMenu.filter(e => e.title).length > 0"
-      class="dd-side-menu"
       :collapse="collapse"
       :unique-opened="true">
       <template v-for="(menu, index) in sideMenu">

From 8b3fae5cc82e15c04e2d378eb6f39cf92ea29011 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 11:09:45 +0800
Subject: [PATCH 07/78] no message

Former-commit-id: 821c8686e08882ba6f43014d58ef22963c6da6ce
Former-commit-id: 4b3afa86922d1ac0b46fa03479d239a730c0fa18
Former-commit-id: ab0874a256dbfc22405cfff1e9404129bdcc6fad
---
 src/components/core/MainLayout/components/HeaderMenu/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index 933c525a..391713b9 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -6,7 +6,7 @@
       v-for="menu in menus"
       :key="menu.path"
       :index="menu.path">
-      首页
+      {{menu.title}}
     </el-menu-item>
   </el-menu>
 </template>
@@ -26,4 +26,3 @@ export default {
   }
 }
 </script>
-

From 45b080dd76e8140f2c4c61572b90e3566718efb6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 12:24:58 +0800
Subject: [PATCH 08/78] no message

Former-commit-id: 152e6e1b73e2dd8d29d8c45d9047c386df2d0c83
Former-commit-id: 2029f6e35556415cd805f7dfbf57687680bd14ac
Former-commit-id: f8ee5af5e0bb63a4823b8e03e6ebd0abaf3ab7a5
---
 .../MainLayout/components/SideMenu/index.vue  | 71 +++++++------------
 1 file changed, 27 insertions(+), 44 deletions(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index dc0e2080..fdebca00 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -1,48 +1,42 @@
 <template>
   <div>
     <el-menu
-      v-if="sideMenu.filter(e => e.title).length > 0"
       :collapse="collapse"
       :unique-opened="true">
-      <template v-for="(menu, index) in sideMenu">
-        <!-- 没有子菜单的菜单项 -->
-        <el-menu-item
-          v-if="!menu.children && menu.title"
-          :key="index"
-          :index="`${menu.title}${index}`"
-          @click.native="$router.push({name: menu.name})">
-          <i v-if="menu.icon" :class="'fa fa-' + menu.icon"></i>
-          <span slot="title">{{menu.title}}</span>
-        </el-menu-item>
-        <!-- 有子菜单的项目 -->
-        <el-submenu
-          v-if="menu.children"
-          :key="index"
-          :index="`${menu.title}${index}`">
-          <template slot="title">
-            <i v-if="menu.icon" :class="'fa fa-' + menu.icon"></i>
-            <span slot="title">{{menu.title}}</span>
-          </template>
-          <el-menu-item
-            v-for="(menuItem, menuItemIndex) in menu.children"
-            :key="menuItemIndex"
-            :index="`${menuItem.name}${menuItemIndex}`"
-            @click.native="$router.push({name: menuItem.name})">
-            <i v-if="menuItem.icon" :class="'fa fa-' + menuItem.icon"></i>
-            {{menuItem.title}}
-          </el-menu-item>
+      <el-submenu index="1">
+        <template slot="title">
+          <i class="el-icon-location"></i>
+          <span>导航一</span>
+        </template>
+        <el-menu-item-group>
+          <template slot="title">分组一</template>
+          <el-menu-item index="1-1">选项1</el-menu-item>
+          <el-menu-item index="1-2">选项2</el-menu-item>
+        </el-menu-item-group>
+        <el-menu-item-group title="分组2">
+          <el-menu-item index="1-3">选项3</el-menu-item>
+        </el-menu-item-group>
+        <el-submenu index="1-4">
+          <template slot="title">选项4</template>
+          <el-menu-item index="1-4-1">选项1</el-menu-item>
         </el-submenu>
-      </template>
+      </el-submenu>
+      <el-menu-item index="2">
+        <i class="el-icon-menu"></i>
+        <span slot="title">导航二</span>
+      </el-menu-item>
+      <el-menu-item index="4">
+        <i class="el-icon-setting"></i>
+        <span slot="title">导航四</span>
+      </el-menu-item>
     </el-menu>
-    <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
+    <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
-import { menu, router } from '@/router/menu/index.js'
 export default {
   props: {
     collapse: {
@@ -50,17 +44,6 @@ export default {
       required: false,
       default: false
     }
-  },
-  data () {
-    return {
-      menu,
-      router
-    }
-  },
-  computed: {
-    ...mapState({
-      sideMenu: state => state.menu.sideMenu
-    })
   }
 }
 </script>

From d5689cc8904065f85055aa642bfe86d01685aa32 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 12:32:00 +0800
Subject: [PATCH 09/78] no message

Former-commit-id: 8ce8cb42acdbf87130e324e5f7151196b227ff77
Former-commit-id: 48a32e02d0c630d539e88851d87e0cc963c53ccb
Former-commit-id: c8f85f64ae7f24ed44cc076b0cb0740fb01b289a
---
 .../MainLayout/components/SideMenu/index.vue  | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index fdebca00..81c18279 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -3,6 +3,16 @@
     <el-menu
       :collapse="collapse"
       :unique-opened="true">
+      <template v-for="(menu, menuIndex) in menus">
+        <el-menu-item :key="menuIndex" index="2">
+          <i :class="`fa fa-${menu.icon}`"></i>
+          <span slot="title">导航二</span>
+        </el-menu-item>
+      </template>
+      <!-- <el-menu-item index="2">
+        <i class="el-icon-menu"></i>
+        <span slot="title">导航二</span>
+      </el-menu-item>
       <el-submenu index="1">
         <template slot="title">
           <i class="el-icon-location"></i>
@@ -21,14 +31,10 @@
           <el-menu-item index="1-4-1">选项1</el-menu-item>
         </el-submenu>
       </el-submenu>
-      <el-menu-item index="2">
-        <i class="el-icon-menu"></i>
-        <span slot="title">导航二</span>
-      </el-menu-item>
       <el-menu-item index="4">
         <i class="el-icon-setting"></i>
         <span slot="title">导航四</span>
-      </el-menu-item>
+      </el-menu-item> -->
     </el-menu>
     <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
@@ -44,6 +50,13 @@ export default {
       required: false,
       default: false
     }
+  },
+  data () {
+    return {
+      menus: [
+        {path: '/a', title: 'menu-a', icon: 'plus'}
+      ]
+    }
   }
 }
 </script>

From 70d2ee0f44c479b4cf2ae054b35757af78f6617c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 12:38:00 +0800
Subject: [PATCH 10/78] no message

Former-commit-id: 65a11f4b12064ab018f164c6712e8d4ddb7ad5d2
Former-commit-id: f7ae7bf7a478fab396b34bec68753d6380d8a842
Former-commit-id: 98e2cfce1299db949e4e03083c082b2826af4a10
---
 .../core/MainLayout/components/SideMenu/index.vue          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 81c18279..2e54656d 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -2,11 +2,12 @@
   <div>
     <el-menu
       :collapse="collapse"
-      :unique-opened="true">
+      :unique-opened="true"
+      :router="true">
       <template v-for="(menu, menuIndex) in menus">
-        <el-menu-item :key="menuIndex" index="2">
+        <el-menu-item :key="menuIndex" :index="menu.path">
           <i :class="`fa fa-${menu.icon}`"></i>
-          <span slot="title">导航二</span>
+          <span slot="title">{{menu.title}}</span>
         </el-menu-item>
       </template>
       <!-- <el-menu-item index="2">

From d03baf512681fac5283324354a69582622aa708d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 12:41:14 +0800
Subject: [PATCH 11/78] no message

Former-commit-id: f303a502bd12d0d226d2e353f10ab5dd8d5471b6
Former-commit-id: 0c8aa569f8d1d5128497eb3a2cf3b372198a429c
Former-commit-id: 6f23b3c729bc90b214217c5926088693831ee14b
---
 .../core/MainLayout/components/SideMenu/index.vue    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 2e54656d..ac7ba498 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -4,11 +4,21 @@
       :collapse="collapse"
       :unique-opened="true"
       :router="true">
+      <!-- 循环每条菜单 -->
       <template v-for="(menu, menuIndex) in menus">
-        <el-menu-item :key="menuIndex" :index="menu.path">
+        <!-- 单个菜单 -->
+        <el-menu-item :key="`level1-item-${menuIndex}`" :index="menu.path">
           <i :class="`fa fa-${menu.icon}`"></i>
           <span slot="title">{{menu.title}}</span>
         </el-menu-item>
+        <!-- 有子菜单 -->
+        <el-submenu :key="`level1-submenu-${menuIndex}`" index="1">
+          <template slot="title">
+            <i class="el-icon-location"></i>
+            <span>导航一</span>
+          </template>
+          <el-menu-item index="1-1">选项1</el-menu-item>
+        </el-submenu>
       </template>
       <!-- <el-menu-item index="2">
         <i class="el-icon-menu"></i>

From acbaa2b28748a743006b51adbfc2f37ce46a1e47 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 12:53:51 +0800
Subject: [PATCH 12/78] no message

Former-commit-id: 27101f9e1deb0f9e88898fdb2d6c635c7078362c
Former-commit-id: e9fe219462eeef37087f89cb26095dd436c6492f
Former-commit-id: 6be08dad8f6a12cc49e01e43d57eff250f3290e8
---
 .../components/SideMenu/components/menus.vue  | 15 ++++++++
 .../MainLayout/components/SideMenu/index.vue  | 38 +++++++++++++------
 2 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 src/components/core/MainLayout/components/SideMenu/components/menus.vue

diff --git a/src/components/core/MainLayout/components/SideMenu/components/menus.vue b/src/components/core/MainLayout/components/SideMenu/components/menus.vue
new file mode 100644
index 00000000..07734c2c
--- /dev/null
+++ b/src/components/core/MainLayout/components/SideMenu/components/menus.vue
@@ -0,0 +1,15 @@
+<template>
+  
+</template>
+
+<script>
+export default {
+  name: 'menus',
+  props: {
+    menus: {
+      require: false,
+      default: () => []
+    }
+  }
+}
+</script>
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index ac7ba498..f1af18bd 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -4,22 +4,19 @@
       :collapse="collapse"
       :unique-opened="true"
       :router="true">
-      <!-- 循环每条菜单 -->
-      <template v-for="(menu, menuIndex) in menus">
-        <!-- 单个菜单 -->
-        <el-menu-item :key="`level1-item-${menuIndex}`" :index="menu.path">
+      <menus/>
+      <!-- <template v-for="(menu, menuIndex) in menus">
+        <el-menu-item v-if="menu.children === undefined" :key="`level1-item-${menuIndex}`" :index="menu.path">
           <i :class="`fa fa-${menu.icon}`"></i>
           <span slot="title">{{menu.title}}</span>
         </el-menu-item>
-        <!-- 有子菜单 -->
-        <el-submenu :key="`level1-submenu-${menuIndex}`" index="1">
+        <el-submenu v-else :key="`level1-submenu-${menuIndex}`" :index="`level1-submenu-${menuIndex}`">
           <template slot="title">
-            <i class="el-icon-location"></i>
-            <span>导航一</span>
+            <i :class="`fa fa-${menu.icon}`"></i>
+            <span slot="title">{{menu.title}}</span>
           </template>
-          <el-menu-item index="1-1">选项1</el-menu-item>
         </el-submenu>
-      </template>
+      </template> -->
       <!-- <el-menu-item index="2">
         <i class="el-icon-menu"></i>
         <span slot="title">导航二</span>
@@ -62,10 +59,29 @@ export default {
       default: false
     }
   },
+  components: {
+    menus: () => import('./components/menus.vue')
+  },
   data () {
     return {
       menus: [
-        {path: '/a', title: 'menu-a', icon: 'plus'}
+        {
+          path: '/a',
+          title: 'menu-a',
+          icon: 'plus'
+        },
+        {
+          path: '/b',
+          title: 'menu-b',
+          icon: 'plus',
+          children: [
+            {
+              path: '/a',
+              title: 'menu-a',
+              icon: 'plus'
+            }
+          ]
+        }
       ]
     }
   }

From d6391eb98b501da2855c0e73d0a865f4b927d804 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 13:01:38 +0800
Subject: [PATCH 13/78] no message

Former-commit-id: 3fb3864bd7dde71733cd6eb5306f7a0583fe924e
Former-commit-id: 40dee5ed0a8182e9e6d29d8f2ef4003b61f29a80
Former-commit-id: d3db5ce8a901006ee233a45afc4dfae5fca3cb5d
---
 .../SideMenu/components/ddMenus.vue           | 30 +++++++++++++
 .../components/SideMenu/components/menus.vue  | 15 -------
 .../MainLayout/components/SideMenu/index.vue  | 44 ++-----------------
 3 files changed, 34 insertions(+), 55 deletions(-)
 create mode 100644 src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
 delete mode 100644 src/components/core/MainLayout/components/SideMenu/components/menus.vue

diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
new file mode 100644
index 00000000..a55dff2b
--- /dev/null
+++ b/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <el-menu-item v-if="menu.children === undefined" :index="menu.path">
+      <i :class="`fa fa-${menu.icon}`"></i>
+      <span slot="title">{{menu.title}}</span>
+    </el-menu-item>
+    <el-submenu v-else index="1">
+      <template slot="title">
+        <i :class="`fa fa-${menu.icon}`"></i>
+        <span slot="title">{{menu.title}}</span>
+      </template>
+      <el-menu-item :index="menu.path">
+        <i :class="`fa fa-${menu.icon}`"></i>
+        <span slot="title">{{menu.title}}</span>
+      </el-menu-item>
+    </el-submenu>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'menus',
+  props: {
+    menu: {
+      require: false,
+      default: () => []
+    }
+  }
+}
+</script>
diff --git a/src/components/core/MainLayout/components/SideMenu/components/menus.vue b/src/components/core/MainLayout/components/SideMenu/components/menus.vue
deleted file mode 100644
index 07734c2c..00000000
--- a/src/components/core/MainLayout/components/SideMenu/components/menus.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  
-</template>
-
-<script>
-export default {
-  name: 'menus',
-  props: {
-    menus: {
-      require: false,
-      default: () => []
-    }
-  }
-}
-</script>
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index f1af18bd..4b850301 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -4,45 +4,9 @@
       :collapse="collapse"
       :unique-opened="true"
       :router="true">
-      <menus/>
-      <!-- <template v-for="(menu, menuIndex) in menus">
-        <el-menu-item v-if="menu.children === undefined" :key="`level1-item-${menuIndex}`" :index="menu.path">
-          <i :class="`fa fa-${menu.icon}`"></i>
-          <span slot="title">{{menu.title}}</span>
-        </el-menu-item>
-        <el-submenu v-else :key="`level1-submenu-${menuIndex}`" :index="`level1-submenu-${menuIndex}`">
-          <template slot="title">
-            <i :class="`fa fa-${menu.icon}`"></i>
-            <span slot="title">{{menu.title}}</span>
-          </template>
-        </el-submenu>
-      </template> -->
-      <!-- <el-menu-item index="2">
-        <i class="el-icon-menu"></i>
-        <span slot="title">导航二</span>
-      </el-menu-item>
-      <el-submenu index="1">
-        <template slot="title">
-          <i class="el-icon-location"></i>
-          <span>导航一</span>
-        </template>
-        <el-menu-item-group>
-          <template slot="title">分组一</template>
-          <el-menu-item index="1-1">选项1</el-menu-item>
-          <el-menu-item index="1-2">选项2</el-menu-item>
-        </el-menu-item-group>
-        <el-menu-item-group title="分组2">
-          <el-menu-item index="1-3">选项3</el-menu-item>
-        </el-menu-item-group>
-        <el-submenu index="1-4">
-          <template slot="title">选项4</template>
-          <el-menu-item index="1-4-1">选项1</el-menu-item>
-        </el-submenu>
-      </el-submenu>
-      <el-menu-item index="4">
-        <i class="el-icon-setting"></i>
-        <span slot="title">导航四</span>
-      </el-menu-item> -->
+      <template v-for="(menu, menuIndex) in menus">
+        <dd-menus :menu="menu" :key="menuIndex"/>
+      </template>
     </el-menu>
     <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
@@ -60,7 +24,7 @@ export default {
     }
   },
   components: {
-    menus: () => import('./components/menus.vue')
+    ddMenus: () => import('./components/ddMenus.vue')
   },
   data () {
     return {

From 04b9365fb14e139640fb8cccc3cb767bf25b8f0b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 13:14:12 +0800
Subject: [PATCH 14/78] no message

Former-commit-id: eed58007b7d833bf631c2d41995f674c684ef88f
Former-commit-id: 9595475f9795c91774d8e51239dea5ad191bfd29
Former-commit-id: 19eae36217dbae6d66c10124040d7011b70ea2b0
---
 docs/.vuepress/config.js                      |  3 ++-
 docs/zh/components/locally-valid.md           |  9 ++++++++
 .../SideMenu/components/ddMenus.vue           | 11 ++++-----
 .../MainLayout/components/SideMenu/index.vue  | 23 +++++++++++++++----
 4 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 docs/zh/components/locally-valid.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 71567a40..4ecb0714 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -87,7 +87,8 @@ function sideBarComponents (title) {
         'icon-select',
         'icon-svg',
         'icon',
-        'markdown'
+        'markdown',
+        'locally-valid'
       ]
     }
   ]
diff --git a/docs/zh/components/locally-valid.md b/docs/zh/components/locally-valid.md
new file mode 100644
index 00000000..36170eca
--- /dev/null
+++ b/docs/zh/components/locally-valid.md
@@ -0,0 +1,9 @@
+# 局部组件
+
+局部组件是指在某个组件内注册的组件，它一般只在一个地方用到，全局无法访问
+
+## dd-menu
+
+::: tip 出现位置
+src/components/core/MainLayout/components/SideMenu/index.vue
+:::
\ No newline at end of file
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
index a55dff2b..2bb50d12 100644
--- a/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
+++ b/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
@@ -1,25 +1,24 @@
 <template>
   <div>
+    <!-- 没有子元素 -->
     <el-menu-item v-if="menu.children === undefined" :index="menu.path">
       <i :class="`fa fa-${menu.icon}`"></i>
       <span slot="title">{{menu.title}}</span>
     </el-menu-item>
-    <el-submenu v-else index="1">
+    <!-- 有子元素 -->
+    <el-submenu v-else :index="menu.path">
       <template slot="title">
         <i :class="`fa fa-${menu.icon}`"></i>
         <span slot="title">{{menu.title}}</span>
       </template>
-      <el-menu-item :index="menu.path">
-        <i :class="`fa fa-${menu.icon}`"></i>
-        <span slot="title">{{menu.title}}</span>
-      </el-menu-item>
+      <dd-menus v-for="(child, childIndex) in menu.children" :menu="child" :key="childIndex"/>
     </el-submenu>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'menus',
+  name: 'dd-menus',
   props: {
     menu: {
       require: false,
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 4b850301..e82acc4a 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -4,9 +4,7 @@
       :collapse="collapse"
       :unique-opened="true"
       :router="true">
-      <template v-for="(menu, menuIndex) in menus">
-        <dd-menus :menu="menu" :key="menuIndex"/>
-      </template>
+      <dd-menus v-for="(menu, menuIndex) in menus" :menu="menu" :key="menuIndex"/>
     </el-menu>
     <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
@@ -40,9 +38,26 @@ export default {
           icon: 'plus',
           children: [
             {
-              path: '/a',
+              path: '/c-1',
               title: 'menu-a',
               icon: 'plus'
+            },
+            {
+              path: '/c',
+              title: 'menu-a',
+              icon: 'plus',
+              children: [
+                {
+                  path: '/d',
+                  title: 'menu-a',
+                  icon: 'plus'
+                },
+                {
+                  path: '/d',
+                  title: 'menu-a',
+                  icon: 'plus'
+                }
+              ]
             }
           ]
         }

From 614b7b5d372407064231dec190f46c0019d0ae6b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 13:21:31 +0800
Subject: [PATCH 15/78] no message

Former-commit-id: 18d72f99acbd878612074847bc7730ff4ce0f346
Former-commit-id: 8ad789c9af80f6c8478dd46b606dadc5773393e4
Former-commit-id: 1df8ae01a128fac4318afb3044dc6a151750f3b4
---
 docs/zh/components/locally-valid.md                         | 4 +++-
 .../SideMenu/components/{ddMenus.vue => ddMenu.vue}         | 6 ++----
 .../core/MainLayout/components/SideMenu/index.vue           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/components/core/MainLayout/components/SideMenu/components/{ddMenus.vue => ddMenu.vue} (76%)

diff --git a/docs/zh/components/locally-valid.md b/docs/zh/components/locally-valid.md
index 36170eca..6db777f4 100644
--- a/docs/zh/components/locally-valid.md
+++ b/docs/zh/components/locally-valid.md
@@ -6,4 +6,6 @@
 
 ::: tip 出现位置
 src/components/core/MainLayout/components/SideMenu/index.vue
-:::
\ No newline at end of file
+:::
+
+该组件会根据数据选择渲染 `<el-menu-item>` 或者 `<el-submenu>` 结构，并且在 `<el-submenu>` 中再次根据数据类型递归自身，最终生成 elementUI 的菜单组件结构，支持嵌套多级
\ No newline at end of file
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
similarity index 76%
rename from src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
rename to src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
index 2bb50d12..75827b65 100644
--- a/src/components/core/MainLayout/components/SideMenu/components/ddMenus.vue
+++ b/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
@@ -1,24 +1,22 @@
 <template>
   <div>
-    <!-- 没有子元素 -->
     <el-menu-item v-if="menu.children === undefined" :index="menu.path">
       <i :class="`fa fa-${menu.icon}`"></i>
       <span slot="title">{{menu.title}}</span>
     </el-menu-item>
-    <!-- 有子元素 -->
     <el-submenu v-else :index="menu.path">
       <template slot="title">
         <i :class="`fa fa-${menu.icon}`"></i>
         <span slot="title">{{menu.title}}</span>
       </template>
-      <dd-menus v-for="(child, childIndex) in menu.children" :menu="child" :key="childIndex"/>
+      <dd-menu v-for="(child, childIndex) in menu.children" :menu="child" :key="childIndex"/>
     </el-submenu>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'dd-menus',
+  name: 'dd-menu',
   props: {
     menu: {
       require: false,
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index e82acc4a..70d6774f 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -4,7 +4,7 @@
       :collapse="collapse"
       :unique-opened="true"
       :router="true">
-      <dd-menus v-for="(menu, menuIndex) in menus" :menu="menu" :key="menuIndex"/>
+      <dd-menu v-for="(menu, menuIndex) in menus" :menu="menu" :key="menuIndex"/>
     </el-menu>
     <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
@@ -22,7 +22,7 @@ export default {
     }
   },
   components: {
-    ddMenus: () => import('./components/ddMenus.vue')
+    ddMenu: () => import('./components/ddMenu.vue')
   },
   data () {
     return {

From 487f9d737401ca7e173aa9a29bd1ebfe8e4a68f8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 13:50:47 +0800
Subject: [PATCH 16/78] no message

Former-commit-id: ef1e14bc5eee9905394c7a7880e371990a1c80d1
Former-commit-id: 5081c36e3e48fb02c74f26d42da59f51c9b64459
Former-commit-id: 7fdb4997c920fc58e335dd66ee23eb4fe0ae8fb1
---
 docs/.vuepress/config.js                            |  1 +
 docs/zh/guide/pr.md                                 | 13 +++++++++++++
 .../components/SideMenu/components/ddMenu.vue       |  5 +++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 docs/zh/guide/pr.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 4ecb0714..6c579c98 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -58,6 +58,7 @@ function sideBarGuide (title) {
       children: [
         '',
         'q-a',
+        'pr',
         'change-log'
       ]
     }
diff --git a/docs/zh/guide/pr.md b/docs/zh/guide/pr.md
new file mode 100644
index 00000000..53423c6b
--- /dev/null
+++ b/docs/zh/guide/pr.md
@@ -0,0 +1,13 @@
+# 贡献指南
+
+## 如何贡献代码
+
+首先在[项目主页](https://github.com/FairyEver/d2admin-vue-element) fork 本仓库，然后进行你的开发，请确保你的开发是在 dev 分支进行。本地测试无误后方可 pull request，我在检查通过后会合并代码到原始仓库。
+
+## 要求
+
+本项目代码需要符合[vue.js 风格指南](https://cn.vuejs.org/v2/style-guide/)中[优先级A](https://cn.vuejs.org/v2/style-guide/#%E4%BC%98%E5%85%88%E7%BA%A7-A-%E7%9A%84%E8%A7%84%E5%88%99%EF%BC%9A%E5%BF%85%E8%A6%81%E7%9A%84-%E8%A7%84%E9%81%BF%E9%94%99%E8%AF%AF)和[优先级B](https://cn.vuejs.org/v2/style-guide/#%E4%BC%98%E5%85%88%E7%BA%A7-B-%E7%9A%84%E8%A7%84%E5%88%99%EF%BC%9A%E5%BC%BA%E7%83%88%E6%8E%A8%E8%8D%90-%E5%A2%9E%E5%BC%BA%E5%8F%AF%E8%AF%BB%E6%80%A7)的要求以及本项目中的 ESlint 校验
+
+::: tip
+由于项目初始没有仔细遵循风格指南，可能项目代码中已经存在不符合规范的代码，欢迎批评指正或者直接pr
+:::
\ No newline at end of file
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
index 75827b65..5a934148 100644
--- a/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
+++ b/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
@@ -19,8 +19,9 @@ export default {
   name: 'dd-menu',
   props: {
     menu: {
-      require: false,
-      default: () => []
+      type: Object,
+      required: false,
+      default: () => {}
     }
   }
 }

From bbcabd409def4fbc3ae16de4783f3622b8de776a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 14:26:51 +0800
Subject: [PATCH 17/78] no message

Former-commit-id: 638153021a82cf494e930a9f7bb29cd5add3c964
Former-commit-id: 7163441389d505d2fd3fcfcc98a4f6b8ca606bbf
Former-commit-id: 98306739ecb79c797976635f3fe2ac2d5d6caaae
---
 .../style/theme/{classic.scss => _bak.scss}   |  48 ++++-
 src/assets/style/theme/classic/index.scss     |   1 +
 src/assets/style/theme/classic/setting.scss   |   1 +
 src/assets/style/theme/theme-base.scss        | 166 ++++++++++++++++++
 src/components/core/CardFull/index.vue        |  45 -----
 src/components/core/MainLayout/index.vue      |   2 +-
 static/image/bg/star.jpg.REMOVED.git-id       |   1 +
 7 files changed, 217 insertions(+), 47 deletions(-)
 rename src/assets/style/theme/{classic.scss => _bak.scss} (66%)
 create mode 100644 src/assets/style/theme/classic/index.scss
 create mode 100644 src/assets/style/theme/classic/setting.scss
 create mode 100644 src/assets/style/theme/theme-base.scss
 create mode 100644 static/image/bg/star.jpg.REMOVED.git-id

diff --git a/src/assets/style/theme/classic.scss b/src/assets/style/theme/_bak.scss
similarity index 66%
rename from src/assets/style/theme/classic.scss
rename to src/assets/style/theme/_bak.scss
index b730a417..97ed2787 100644
--- a/src/assets/style/theme/classic.scss
+++ b/src/assets/style/theme/_bak.scss
@@ -2,16 +2,62 @@
 
 $theme-color: #EFF4F8;
 
+$border-color: #d8dfea;
 // 默认主题
 .layout-main {
   &.classic {
     height: 100vh;
     width: 100vw;
     background-color: $theme-color;
+    background-image: url('/static/image/bg/2.jpg');
+    background-size: cover;
+    background-position: center;
     .el-card {
       box-shadow: none;
       &:hover {
-        box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+        // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+        box-shadow: none;
+      }
+    }
+    .dd-card-full {
+      position: absolute;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+      border-top: 1px solid $border-color;
+      border-left: 1px solid $border-color;
+      border-right: 1px solid $border-color;
+      background-color: #fff;
+      overflow: hidden;
+      color: #303133;
+      &:hover {
+        // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+        box-shadow: none;
+      }
+      .dd-card-full__header {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        padding: 18px 20px;
+        border-bottom: 1px solid $border-color;
+        box-sizing: border-box;
+      }
+      .dd-card-full__body {
+        position: absolute;
+        padding: 20px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        overflow: auto;
+      }
+      .dd-card-full__footer {
+        position: absolute;
+        bottom: 0px;
+        left: 0px;
+        width: 100%;
+        padding: 18px 20px;
+        border-top: 1px solid $border-color;
+        box-sizing: border-box;
       }
     }
     // [布局] 顶栏
diff --git a/src/assets/style/theme/classic/index.scss b/src/assets/style/theme/classic/index.scss
new file mode 100644
index 00000000..54de7534
--- /dev/null
+++ b/src/assets/style/theme/classic/index.scss
@@ -0,0 +1 @@
+@import '../theme-base.scss';
\ No newline at end of file
diff --git a/src/assets/style/theme/classic/setting.scss b/src/assets/style/theme/classic/setting.scss
new file mode 100644
index 00000000..4fece6a7
--- /dev/null
+++ b/src/assets/style/theme/classic/setting.scss
@@ -0,0 +1 @@
+$theme-name: 'star'
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
new file mode 100644
index 00000000..33a61628
--- /dev/null
+++ b/src/assets/style/theme/theme-base.scss
@@ -0,0 +1,166 @@
+@import '~@/assets/style/public.scss';
+
+$theme-color: #EFF4F8;
+
+$border-color: #d8dfea;
+// 默认主题
+.classic {
+  height: 100vh;
+  width: 100vw;
+  background-color: $theme-color;
+  background-image: url('/static/image/bg/star.jpg');
+  background-size: cover;
+  background-position: center;
+  .el-card {
+    box-shadow: none;
+    &:hover {
+      // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+      box-shadow: none;
+    }
+  }
+  .dd-card-full {
+    position: absolute;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-top: 1px solid $border-color;
+    border-left: 1px solid $border-color;
+    border-right: 1px solid $border-color;
+    background-color: #fff;
+    overflow: hidden;
+    color: #303133;
+    &:hover {
+      // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+      box-shadow: none;
+    }
+    .dd-card-full__header {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      border-bottom: 1px solid $border-color;
+      box-sizing: border-box;
+    }
+    .dd-card-full__body {
+      position: absolute;
+      padding: 20px;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
+      overflow: auto;
+    }
+    .dd-card-full__footer {
+      position: absolute;
+      bottom: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      border-top: 1px solid $border-color;
+      box-sizing: border-box;
+    }
+  }
+  // [布局] 顶栏
+  .el-header {
+    padding: 0px;
+    // logo区域
+    .logo-group {
+      transition: width .3s;
+      float: left;
+      text-align: center;
+      img {
+        height: 60px;
+      }
+    }
+    // 折叠侧边栏切换按钮
+    .toggle-sidemenu-btn {
+      float: left;
+      height: 60px;
+      width: 60px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      user-select: none;
+      cursor: pointer;
+      i {
+        font-size: 20px;
+        color: $color-text-normal;
+        margin-top: 4px;
+        &:hover {
+          color: $color-primary;
+        }
+      }
+    }
+    // [菜单] 顶栏
+    .el-menu {
+      float: left;
+      border-bottom: none;
+      background-color: transparent;
+      .el-menu-item {
+        border-bottom: none;
+        border-top: 2px solid transparent;
+        &:hover {
+          background-color: transparent;
+        }
+        &.is-active {
+          border-bottom: none;
+          border-top: 2px solid $color-primary;
+          background-color: transparent;
+        }
+      }
+    }
+    // 顶栏右侧的按钮
+    .btn-group {
+      float: right;
+      height: 60px;
+      display: flex;
+      align-items: center;
+      .btn-text {
+        color: $color-text-normal;
+      }
+      .el-dropdown {
+        user-select: none;
+        cursor: pointer;
+      }
+    }
+  }
+  // [布局] 顶栏下面
+  .el-container {
+    // 侧边栏
+    .el-aside {
+      transition: width .3s;
+      overflow: inherit;
+      // 空菜单
+      .dd-side-menu-empty {
+        background-color: rgba(#000, .03);
+        margin: $margin;
+        margin-top: 0px;
+        border-radius: 4px;
+        line-height: 100px;
+        text-align: center;
+        color: $color-text-sub;
+      }
+      // [菜单] 正常状态
+      .el-menu {
+        background-color: transparent;
+        border-right: none;
+        .el-submenu__title {
+          &:hover {
+            background-color: rgba(#000, .05);
+          }
+        }
+      }
+      // [菜单] 折叠状态
+      .el-menu--collapse {
+        background-color: transparent;
+        .el-submenu__title {
+          text-align: center;
+        }
+      }
+    }
+    .el-main {
+      padding: 0px;
+      position: relative;
+      overflow: hidden;
+    }
+  }
+}
diff --git a/src/components/core/CardFull/index.vue b/src/components/core/CardFull/index.vue
index 76cf9ea6..9ac535a0 100644
--- a/src/components/core/CardFull/index.vue
+++ b/src/components/core/CardFull/index.vue
@@ -65,48 +65,3 @@ export default {
   }
 }
 </script>
-
-
-<style lang="scss" scoped>
-$border-color: #d8dfea;
-.dd-card-full {
-  position: absolute;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  border-top: 1px solid $border-color;
-  border-left: 1px solid $border-color;
-  border-right: 1px solid $border-color;
-  background-color: #fff;
-  overflow: hidden;
-  color: #303133;
-  &:hover {
-    box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-  }
-  .dd-card-full__header {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 100%;
-    padding: 18px 20px;
-    border-bottom: 1px solid $border-color;
-    box-sizing: border-box;
-  }
-  .dd-card-full__body {
-    position: absolute;
-    padding: 20px;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
-    overflow: auto;
-  }
-  .dd-card-full__footer {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    width: 100%;
-    padding: 18px 20px;
-    border-top: 1px solid $border-color;
-    box-sizing: border-box;
-  }
-}
-</style>
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 3baabc18..f3da37bb 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -50,5 +50,5 @@ export default {
 
 <style lang="scss">
 // 主题
-@import '~@/assets/style/theme/classic.scss';
+@import '~@/assets/style/theme/classic/index.scss';
 </style>
diff --git a/static/image/bg/star.jpg.REMOVED.git-id b/static/image/bg/star.jpg.REMOVED.git-id
new file mode 100644
index 00000000..7ee432a8
--- /dev/null
+++ b/static/image/bg/star.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+5d5d5cae76bf221fe4df90af31aba1800c621bc3
\ No newline at end of file

From 3b09d88200c4de0d66a3d67a3464b4dcc58a70ae Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 14:43:47 +0800
Subject: [PATCH 18/78] no message

Former-commit-id: d7106d025703b65fd309a8feaf399c3675babfc4
Former-commit-id: 227ac204f64b9799296d9b65e80e963ec90f5320
Former-commit-id: 342e6cbb22bfeea72cffdf552b42edb8621e084f
---
 src/assets/style/theme/classic/index.scss     | 20 ++++++++++++++++++-
 src/assets/style/theme/classic/setting.scss   |  1 -
 src/assets/style/theme/theme-base.scss        | 18 ++++-------------
 src/components/core/Container/index.vue       |  9 ++++++---
 .../{CardFull => ContainerFull}/index.vue     |  0
 .../MainLayout/components/SideMenu/index.vue  |  2 +-
 src/components/core/MainLayout/index.vue      |  4 ++--
 7 files changed, 32 insertions(+), 22 deletions(-)
 delete mode 100644 src/assets/style/theme/classic/setting.scss
 rename src/components/core/{CardFull => ContainerFull}/index.vue (100%)

diff --git a/src/assets/style/theme/classic/index.scss b/src/assets/style/theme/classic/index.scss
index 54de7534..4ec34a22 100644
--- a/src/assets/style/theme/classic/index.scss
+++ b/src/assets/style/theme/classic/index.scss
@@ -1 +1,19 @@
-@import '../theme-base.scss';
\ No newline at end of file
+@import '../theme-base.scss';
+
+$theme-name: 'star';
+$theme-bg-color: #EFF4F8;
+$theme-bg-image: '/static/image/bg/star.jpg';
+$theme-card-full-border-color: #d8dfea;
+
+.theme-#{$theme-name} {
+  background-color: $theme-bg-color;
+  background-image: url($theme-bg-image);
+  .dd-card-full {
+    .dd-card-full__header {
+      border-bottom: 1px solid $theme-card-full-border-color;
+    }
+    .dd-card-full__footer {
+      border-top: 1px solid $theme-card-full-border-color;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/assets/style/theme/classic/setting.scss b/src/assets/style/theme/classic/setting.scss
deleted file mode 100644
index 4fece6a7..00000000
--- a/src/assets/style/theme/classic/setting.scss
+++ /dev/null
@@ -1 +0,0 @@
-$theme-name: 'star'
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 33a61628..c5e99d16 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -2,34 +2,26 @@
 
 $theme-color: #EFF4F8;
 
-$border-color: #d8dfea;
-// 默认主题
-.classic {
+// 主题公用
+.theme {
   height: 100vh;
   width: 100vw;
-  background-color: $theme-color;
-  background-image: url('/static/image/bg/star.jpg');
   background-size: cover;
   background-position: center;
   .el-card {
     box-shadow: none;
     &:hover {
-      // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-      box-shadow: none;
+      box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
     }
   }
   .dd-card-full {
     position: absolute;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-    border-top: 1px solid $border-color;
-    border-left: 1px solid $border-color;
-    border-right: 1px solid $border-color;
-    background-color: #fff;
+    background-color: #FFF;
     overflow: hidden;
     color: #303133;
     &:hover {
-      // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
       box-shadow: none;
     }
     .dd-card-full__header {
@@ -38,7 +30,6 @@ $border-color: #d8dfea;
       left: 0px;
       width: 100%;
       padding: 18px 20px;
-      border-bottom: 1px solid $border-color;
       box-sizing: border-box;
     }
     .dd-card-full__body {
@@ -55,7 +46,6 @@ $border-color: #d8dfea;
       left: 0px;
       width: 100%;
       padding: 18px 20px;
-      border-top: 1px solid $border-color;
       box-sizing: border-box;
     }
   }
diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue
index 1c19a0b0..1e27b3e2 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/Container/index.vue
@@ -10,12 +10,12 @@
       <slot name="header"></slot>
       <slot></slot>
     </div>
-    <!-- [card-full] 撑满 -->
-    <card-full v-if="type === 'card-full'" :right="10" :bottom="0">
+    <!-- [container-full] 撑满 -->
+    <container-full v-if="type === 'card-full'" :right="10" :bottom="0">
       <slot v-if="$slots.header" name="header" slot="header"></slot>
       <slot></slot>
       <slot v-if="$slots.footer" name="footer" slot="footer"></slot>
-    </card-full>
+    </container-full>
   </div>
 </template>
 
@@ -34,6 +34,9 @@ export default {
       required: false,
       default: false
     }
+  },
+  components: {
+    containerFull: () => import('../ContainerFull/index.vue')
   }
 }
 </script>
diff --git a/src/components/core/CardFull/index.vue b/src/components/core/ContainerFull/index.vue
similarity index 100%
rename from src/components/core/CardFull/index.vue
rename to src/components/core/ContainerFull/index.vue
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 70d6774f..186d25d1 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -28,7 +28,7 @@ export default {
     return {
       menus: [
         {
-          path: '/a',
+          path: '/demo/components/container/card-full',
           title: 'menu-a',
           icon: 'plus'
         },
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index f3da37bb..219f3b5d 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-container class="layout-main" :class="theme">
+  <el-container class="layout-main theme" :class="theme">
     <!-- 顶栏 -->
     <el-header>
       <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
@@ -37,7 +37,7 @@ export default {
   },
   data () {
     return {
-      theme: 'classic',
+      theme: 'theme-star',
       collapse: false,
       // [侧边栏宽度] 正常状态
       asideWidth: '200px',

From 73f67414772b0144c4bf0a0a02e5aeb02b6c3f6e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 14:47:25 +0800
Subject: [PATCH 19/78] no message

Former-commit-id: 5a497d156a66299830a672ff1b8d22165c19a8cb
Former-commit-id: 6429c53c4c9592bf05987029d8ae7a62ee383df9
Former-commit-id: 6d3b1470b390e23f2f5fe6c58ddb762bedb96e98
---
 src/assets/style/theme/_bak.scss                     |  8 ++++----
 src/assets/style/theme/classic/index.scss            | 12 ++++++------
 src/assets/style/theme/theme-base.scss               |  8 ++++----
 src/components/core/Container/index.vue              |  2 +-
 src/components/core/ContainerFull/index.vue          |  8 ++++----
 .../core/MainLayout/components/SideMenu/index.vue    |  2 +-
 src/pages/core/index/index.vue                       |  2 +-
 src/pages/demo/business/index/index.vue              |  2 +-
 src/pages/demo/business/user-center/home/index.vue   |  2 +-
 src/pages/demo/chart/index/index.vue                 |  2 +-
 .../components/container/{card-full.vue => full.vue} |  2 +-
 src/pages/demo/components/index/index.vue            |  2 +-
 src/pages/demo/plugins/build/index.vue               |  2 +-
 src/pages/demo/plugins/index/index.vue               |  2 +-
 src/router/menu/_components.js                       |  6 +++---
 15 files changed, 31 insertions(+), 31 deletions(-)
 rename src/pages/demo/components/container/{card-full.vue => full.vue} (90%)

diff --git a/src/assets/style/theme/_bak.scss b/src/assets/style/theme/_bak.scss
index 97ed2787..3e49ed4d 100644
--- a/src/assets/style/theme/_bak.scss
+++ b/src/assets/style/theme/_bak.scss
@@ -19,7 +19,7 @@ $border-color: #d8dfea;
         box-shadow: none;
       }
     }
-    .dd-card-full {
+    .dd-container-full {
       position: absolute;
       border-top-left-radius: 4px;
       border-top-right-radius: 4px;
@@ -33,7 +33,7 @@ $border-color: #d8dfea;
         // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
         box-shadow: none;
       }
-      .dd-card-full__header {
+      .dd-container-full__header {
         position: absolute;
         top: 0px;
         left: 0px;
@@ -42,7 +42,7 @@ $border-color: #d8dfea;
         border-bottom: 1px solid $border-color;
         box-sizing: border-box;
       }
-      .dd-card-full__body {
+      .dd-container-full__body {
         position: absolute;
         padding: 20px;
         left: 0px;
@@ -50,7 +50,7 @@ $border-color: #d8dfea;
         bottom: 0px;
         overflow: auto;
       }
-      .dd-card-full__footer {
+      .dd-container-full__footer {
         position: absolute;
         bottom: 0px;
         left: 0px;
diff --git a/src/assets/style/theme/classic/index.scss b/src/assets/style/theme/classic/index.scss
index 4ec34a22..b3034fd7 100644
--- a/src/assets/style/theme/classic/index.scss
+++ b/src/assets/style/theme/classic/index.scss
@@ -3,17 +3,17 @@
 $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
 $theme-bg-image: '/static/image/bg/star.jpg';
-$theme-card-full-border-color: #d8dfea;
+$theme-container-full-border-color: #d8dfea;
 
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
-  .dd-card-full {
-    .dd-card-full__header {
-      border-bottom: 1px solid $theme-card-full-border-color;
+  .dd-container-full {
+    .dd-container-full__header {
+      border-bottom: 1px solid $theme-container-full-border-color;
     }
-    .dd-card-full__footer {
-      border-top: 1px solid $theme-card-full-border-color;
+    .dd-container-full__footer {
+      border-top: 1px solid $theme-container-full-border-color;
     }
   }
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index c5e99d16..3a0d270c 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -14,7 +14,7 @@ $theme-color: #EFF4F8;
       box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
     }
   }
-  .dd-card-full {
+  .dd-container-full {
     position: absolute;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
@@ -24,7 +24,7 @@ $theme-color: #EFF4F8;
     &:hover {
       box-shadow: none;
     }
-    .dd-card-full__header {
+    .dd-container-full__header {
       position: absolute;
       top: 0px;
       left: 0px;
@@ -32,7 +32,7 @@ $theme-color: #EFF4F8;
       padding: 18px 20px;
       box-sizing: border-box;
     }
-    .dd-card-full__body {
+    .dd-container-full__body {
       position: absolute;
       padding: 20px;
       left: 0px;
@@ -40,7 +40,7 @@ $theme-color: #EFF4F8;
       bottom: 0px;
       overflow: auto;
     }
-    .dd-card-full__footer {
+    .dd-container-full__footer {
       position: absolute;
       bottom: 0px;
       left: 0px;
diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue
index 1e27b3e2..10775106 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/Container/index.vue
@@ -11,7 +11,7 @@
       <slot></slot>
     </div>
     <!-- [container-full] 撑满 -->
-    <container-full v-if="type === 'card-full'" :right="10" :bottom="0">
+    <container-full v-if="type === 'full'" :right="10" :bottom="0">
       <slot v-if="$slots.header" name="header" slot="header"></slot>
       <slot></slot>
       <slot v-if="$slots.footer" name="footer" slot="footer"></slot>
diff --git a/src/components/core/ContainerFull/index.vue b/src/components/core/ContainerFull/index.vue
index 9ac535a0..3b114a70 100644
--- a/src/components/core/ContainerFull/index.vue
+++ b/src/components/core/ContainerFull/index.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="dd-card-full" :style="cardStyle">
-    <div v-if="$slots.header" class="dd-card-full__header" ref="header">
+  <div class="dd-container-full" :style="cardStyle">
+    <div v-if="$slots.header" class="dd-container-full__header" ref="header">
       <slot name="header"></slot>
     </div>
-    <div class="dd-card-full__body" :style="bodyStyle">
+    <div class="dd-container-full__body" :style="bodyStyle">
       <slot></slot>
     </div>
-    <div v-if="$slots.footer" class="dd-card-full__footer" ref="footer">
+    <div v-if="$slots.footer" class="dd-container-full__footer" ref="footer">
       <slot name="footer"></slot>
     </div>
   </div>
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 186d25d1..b026e9f2 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -28,7 +28,7 @@ export default {
     return {
       menus: [
         {
-          path: '/demo/components/container/card-full',
+          path: '/demo/components/container/container-full',
           title: 'menu-a',
           icon: 'plus'
         },
diff --git a/src/pages/core/index/index.vue b/src/pages/core/index/index.vue
index 0cf4c89c..1ff41795 100644
--- a/src/pages/core/index/index.vue
+++ b/src/pages/core/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="I AM D2ADMIN"
       sub-title="追求简约美感 & 上手即用的后台管理系统模板">
diff --git a/src/pages/demo/business/index/index.vue b/src/pages/demo/business/index/index.vue
index 4cd14eec..c8bbc4e1 100644
--- a/src/pages/demo/business/index/index.vue
+++ b/src/pages/demo/business/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="示例业务页面"
       sub-title="如果用不到 建议删除相关代码">
diff --git a/src/pages/demo/business/user-center/home/index.vue b/src/pages/demo/business/user-center/home/index.vue
index 774cb308..4e64bf09 100644
--- a/src/pages/demo/business/user-center/home/index.vue
+++ b/src/pages/demo/business/user-center/home/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       用户中心
     </template>
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index 3406c743..f4b49f7c 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="内置 G2 图表库"
       sub-title="如果用不到 建议删除相关代码和依赖">
diff --git a/src/pages/demo/components/container/card-full.vue b/src/pages/demo/components/container/full.vue
similarity index 90%
rename from src/pages/demo/components/container/card-full.vue
rename to src/pages/demo/components/container/full.vue
index 5fb74839..e8aeeda0 100644
--- a/src/pages/demo/components/container/card-full.vue
+++ b/src/pages/demo/components/container/full.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       我是插入到 header 中的内容
     </template>
diff --git a/src/pages/demo/components/index/index.vue b/src/pages/demo/components/index/index.vue
index d17da97c..0962999b 100644
--- a/src/pages/demo/components/index/index.vue
+++ b/src/pages/demo/components/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="内置组件"
       sub-title="D2Admin 为你提供了一些上手即用的组件">
diff --git a/src/pages/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/index.vue
index d68f191e..deb1c3ff 100644
--- a/src/pages/demo/plugins/build/index.vue
+++ b/src/pages/demo/plugins/build/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       多环境发布
     </template>
diff --git a/src/pages/demo/plugins/index/index.vue b/src/pages/demo/plugins/index/index.vue
index 1f4da72c..76757b45 100644
--- a/src/pages/demo/plugins/index/index.vue
+++ b/src/pages/demo/plugins/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="插件演示"
       sub-title="D2Admin 集成了许多实用插件">
diff --git a/src/router/menu/_components.js b/src/router/menu/_components.js
index 1e3f7931..650ef860 100644
--- a/src/router/menu/_components.js
+++ b/src/router/menu/_components.js
@@ -58,12 +58,12 @@ export const menu = {
         {
           title: '撑满',
           icon: 'file-o',
-          path: 'container/card-full',
-          name: 'demo-components-container-card-full',
+          path: 'container/full',
+          name: 'demo-components-container-full',
           meta: {
             requiresAuth: true
           },
-          component: resolve => { require(['@/pages/demo/components/container/card-full.vue'], resolve) }
+          component: resolve => { require(['@/pages/demo/components/container/full.vue'], resolve) }
         }
       ]
     },

From 2f9afc1f016a9cb4f67ee324e82ead9030b00067 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 14:47:50 +0800
Subject: [PATCH 20/78] no message

Former-commit-id: 1b09b60c46d813fa3b23e79ed11eae343cc38d90
Former-commit-id: 998cb4515c7d3abad9d76db946421134118e4c57
Former-commit-id: a9655a6226ce4404b099dc88a8a27d4eb67cdb88
---
 docs/zh/components/container.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 54190e06..7bd91393 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -6,7 +6,7 @@
 
 | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
 | --- | --- | --- | --- | --- | --- |
-| type | 容器类型 | 非 | String | card ghost card-full | card |
+| type | 容器类型 | 非 | String | card ghost full | card |
 | responsive | 响应式宽度 | 非 | Boolean |  | false |
 
 ::: tip
@@ -66,7 +66,7 @@ export default {
 
 ``` vue
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       可选的 header 内容 ...
     </template>

From 91b03b102683ccd944dedcb05a28ee008146d9d7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 14:53:35 +0800
Subject: [PATCH 21/78] no message

Former-commit-id: f89bb2099f95b7513f6f33074a3b8969955a8217
Former-commit-id: 489d532dc58ff358ad00612a7c83e31fe7a0409a
Former-commit-id: 4fc7ab24ca2a8f726b2e13a174558a5a5138e535
---
 src/components/core/register.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/core/register.js b/src/components/core/register.js
index 9071ae0b..a6a10f95 100644
--- a/src/components/core/register.js
+++ b/src/components/core/register.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 
-Vue.component('CardFull', resolve => { require(['@/components/core/CardFull'], resolve) })
 Vue.component('Container', resolve => { require(['@/components/core/Container'], resolve) })
 Vue.component('CountUp', resolve => { require(['@/components/core/CountUp'], resolve) })
 Vue.component('Highlight', resolve => { require(['@/components/core/Highlight'], resolve) })

From a28d8f246b5a1b7daae8b0ee5d4a73743c8a9cba Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 15:13:29 +0800
Subject: [PATCH 22/78] no message

Former-commit-id: 92b430b7bc92e6207b77fa78e49825f6b8d0b26a
Former-commit-id: b47caa67a46dc037d37a94a0541642d81d7140ce
Former-commit-id: b7f3f72c8a966c4cc3ce7563c8bab27a68b325fe
---
 src/assets/style/fixed/element.scss           |  9 +++-
 src/assets/style/theme/_bak.scss              |  2 +-
 .../style/theme/{classic => star}/index.scss  | 24 ++++++++-
 .../style/theme/theme-dd-container-full.scss  | 37 +++++++++++++
 .../theme/{theme-base.scss => theme.scss}     | 54 ++-----------------
 src/components/core/MainLayout/index.vue      |  4 +-
 6 files changed, 75 insertions(+), 55 deletions(-)
 rename src/assets/style/theme/{classic => star}/index.scss (54%)
 create mode 100644 src/assets/style/theme/theme-dd-container-full.scss
 rename src/assets/style/theme/{theme-base.scss => theme.scss} (66%)

diff --git a/src/assets/style/fixed/element.scss b/src/assets/style/fixed/element.scss
index 185cadd1..c75fb638 100644
--- a/src/assets/style/fixed/element.scss
+++ b/src/assets/style/fixed/element.scss
@@ -1 +1,8 @@
-// element 样式补丁
\ No newline at end of file
+// element 样式补丁
+
+.el-card {
+  box-shadow: none;
+  &:hover {
+    box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+  }
+}
\ No newline at end of file
diff --git a/src/assets/style/theme/_bak.scss b/src/assets/style/theme/_bak.scss
index 3e49ed4d..c767b8b0 100644
--- a/src/assets/style/theme/_bak.scss
+++ b/src/assets/style/theme/_bak.scss
@@ -73,7 +73,7 @@ $border-color: #d8dfea;
         }
       }
       // 折叠侧边栏切换按钮
-      .toggle-sidemenu-btn {
+      .toggle-aside-btn {
         float: left;
         height: 60px;
         width: 60px;
diff --git a/src/assets/style/theme/classic/index.scss b/src/assets/style/theme/star/index.scss
similarity index 54%
rename from src/assets/style/theme/classic/index.scss
rename to src/assets/style/theme/star/index.scss
index b3034fd7..63141e02 100644
--- a/src/assets/style/theme/classic/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -1,4 +1,4 @@
-@import '../theme-base.scss';
+@import '../theme.scss';
 
 $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
@@ -8,6 +8,7 @@ $theme-container-full-border-color: #d8dfea;
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
+  // [组件] dd-container-full
   .dd-container-full {
     .dd-container-full__header {
       border-bottom: 1px solid $theme-container-full-border-color;
@@ -16,4 +17,25 @@ $theme-container-full-border-color: #d8dfea;
       border-top: 1px solid $theme-container-full-border-color;
     }
   }
+  .el-header {
+    .toggle-aside-btn {
+      i {
+        color: #FFF;
+        &:hover {
+          color: #FFF;
+        }
+      }
+    }
+    .el-menu {
+      .el-menu-item {
+        color: #FFF;
+        &:hover {
+          background-color: rgba(#000, 0.1);
+        }
+        &.is-active {
+          border-top-color: #FFF;
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-dd-container-full.scss b/src/assets/style/theme/theme-dd-container-full.scss
new file mode 100644
index 00000000..4d6c95a8
--- /dev/null
+++ b/src/assets/style/theme/theme-dd-container-full.scss
@@ -0,0 +1,37 @@
+.theme {
+  .dd-container-full {
+    position: absolute;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    background-color: #FFF;
+    overflow: hidden;
+    color: #303133;
+    &:hover {
+      box-shadow: none;
+    }
+    .dd-container-full__header {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      box-sizing: border-box;
+    }
+    .dd-container-full__body {
+      position: absolute;
+      padding: 20px;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
+      overflow: auto;
+    }
+    .dd-container-full__footer {
+      position: absolute;
+      bottom: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      box-sizing: border-box;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme.scss
similarity index 66%
rename from src/assets/style/theme/theme-base.scss
rename to src/assets/style/theme/theme.scss
index 3a0d270c..bfc165bd 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,5 +1,7 @@
 @import '~@/assets/style/public.scss';
 
+@import './theme-dd-container-full.scss';
+
 $theme-color: #EFF4F8;
 
 // 主题公用
@@ -8,47 +10,6 @@ $theme-color: #EFF4F8;
   width: 100vw;
   background-size: cover;
   background-position: center;
-  .el-card {
-    box-shadow: none;
-    &:hover {
-      box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-    }
-  }
-  .dd-container-full {
-    position: absolute;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    background-color: #FFF;
-    overflow: hidden;
-    color: #303133;
-    &:hover {
-      box-shadow: none;
-    }
-    .dd-container-full__header {
-      position: absolute;
-      top: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-    .dd-container-full__body {
-      position: absolute;
-      padding: 20px;
-      left: 0px;
-      right: 0px;
-      bottom: 0px;
-      overflow: auto;
-    }
-    .dd-container-full__footer {
-      position: absolute;
-      bottom: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-  }
   // [布局] 顶栏
   .el-header {
     padding: 0px;
@@ -62,7 +23,7 @@ $theme-color: #EFF4F8;
       }
     }
     // 折叠侧边栏切换按钮
-    .toggle-sidemenu-btn {
+    .toggle-aside-btn {
       float: left;
       height: 60px;
       width: 60px;
@@ -73,11 +34,7 @@ $theme-color: #EFF4F8;
       cursor: pointer;
       i {
         font-size: 20px;
-        color: $color-text-normal;
         margin-top: 4px;
-        &:hover {
-          color: $color-primary;
-        }
       }
     }
     // [菜单] 顶栏
@@ -88,12 +45,9 @@ $theme-color: #EFF4F8;
       .el-menu-item {
         border-bottom: none;
         border-top: 2px solid transparent;
-        &:hover {
-          background-color: transparent;
-        }
         &.is-active {
           border-bottom: none;
-          border-top: 2px solid $color-primary;
+          border-top-color: $color-primary;
           background-color: transparent;
         }
       }
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 219f3b5d..5549f776 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -6,7 +6,7 @@
         <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
         <img v-else src="@/assets/image/logo/header.png">
       </div>
-      <div class="toggle-sidemenu-btn" @click="collapse = !collapse">
+      <div class="toggle-aside-btn" @click="collapse = !collapse">
         <Icon name="bars"/>
       </div>
       <HeaderMenu/>
@@ -50,5 +50,5 @@ export default {
 
 <style lang="scss">
 // 主题
-@import '~@/assets/style/theme/classic/index.scss';
+@import '~@/assets/style/theme/star/index.scss';
 </style>

From e41f583803cf7299b1b451f92ecfc14aeeafd3ef Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 15:18:09 +0800
Subject: [PATCH 23/78] no message

Former-commit-id: 576684d8aafb9b67dc24f405c1d3a5fef4b785ae
Former-commit-id: 651df7589d479c39b17453a8213c661f1feec434
Former-commit-id: bdcf1f2a639a25e840f47eb5766e4011cb408682
---
 src/assets/style/theme/_bak.scss              |  2 +-
 src/assets/style/theme/star/index.scss        | 14 ++++++
 .../style/theme/theme-dd-container-full.scss  | 37 ---------------
 src/assets/style/theme/theme.scss             | 45 +++++++++++++++----
 .../components/HeaderRight/index.vue          |  2 +-
 5 files changed, 53 insertions(+), 47 deletions(-)
 delete mode 100644 src/assets/style/theme/theme-dd-container-full.scss

diff --git a/src/assets/style/theme/_bak.scss b/src/assets/style/theme/_bak.scss
index c767b8b0..a0122f66 100644
--- a/src/assets/style/theme/_bak.scss
+++ b/src/assets/style/theme/_bak.scss
@@ -110,7 +110,7 @@ $border-color: #d8dfea;
         }
       }
       // 顶栏右侧的按钮
-      .btn-group {
+      .dd-header-right {
         float: right;
         height: 60px;
         display: flex;
diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 63141e02..e52f0a04 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -17,7 +17,9 @@ $theme-container-full-border-color: #d8dfea;
       border-top: 1px solid $theme-container-full-border-color;
     }
   }
+  // 顶栏
   .el-header {
+    // 切换按钮
     .toggle-aside-btn {
       i {
         color: #FFF;
@@ -26,6 +28,7 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
+    // 菜单
     .el-menu {
       .el-menu-item {
         color: #FFF;
@@ -37,5 +40,16 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
+    // 顶栏右侧
+    .dd-header-right {
+      .btn-text {
+        color: #FFF;
+      }
+      .el-dropdown {
+        .el-dropdown-link {
+          color: #FFF;
+        }
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-dd-container-full.scss b/src/assets/style/theme/theme-dd-container-full.scss
deleted file mode 100644
index 4d6c95a8..00000000
--- a/src/assets/style/theme/theme-dd-container-full.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.theme {
-  .dd-container-full {
-    position: absolute;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    background-color: #FFF;
-    overflow: hidden;
-    color: #303133;
-    &:hover {
-      box-shadow: none;
-    }
-    .dd-container-full__header {
-      position: absolute;
-      top: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-    .dd-container-full__body {
-      position: absolute;
-      padding: 20px;
-      left: 0px;
-      right: 0px;
-      bottom: 0px;
-      overflow: auto;
-    }
-    .dd-container-full__footer {
-      position: absolute;
-      bottom: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index bfc165bd..761f65a0 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,7 +1,5 @@
 @import '~@/assets/style/public.scss';
 
-@import './theme-dd-container-full.scss';
-
 $theme-color: #EFF4F8;
 
 // 主题公用
@@ -46,21 +44,16 @@ $theme-color: #EFF4F8;
         border-bottom: none;
         border-top: 2px solid transparent;
         &.is-active {
-          border-bottom: none;
-          border-top-color: $color-primary;
           background-color: transparent;
         }
       }
     }
     // 顶栏右侧的按钮
-    .btn-group {
+    .dd-header-right {
       float: right;
       height: 60px;
       display: flex;
       align-items: center;
-      .btn-text {
-        color: $color-text-normal;
-      }
       .el-dropdown {
         user-select: none;
         cursor: pointer;
@@ -107,4 +100,40 @@ $theme-color: #EFF4F8;
       overflow: hidden;
     }
   }
+  // [组件] dd-container-full
+  .dd-container-full {
+    position: absolute;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    background-color: #FFF;
+    overflow: hidden;
+    color: #303133;
+    &:hover {
+      box-shadow: none;
+    }
+    .dd-container-full__header {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      box-sizing: border-box;
+    }
+    .dd-container-full__body {
+      position: absolute;
+      padding: 20px;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
+      overflow: auto;
+    }
+    .dd-container-full__footer {
+      position: absolute;
+      bottom: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      box-sizing: border-box;
+    }
+  }
 }
diff --git a/src/components/core/MainLayout/components/HeaderRight/index.vue b/src/components/core/MainLayout/components/HeaderRight/index.vue
index 78a7afed..83a10546 100644
--- a/src/components/core/MainLayout/components/HeaderRight/index.vue
+++ b/src/components/core/MainLayout/components/HeaderRight/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="btn-group">
+  <div class="dd-header-right">
     <FullScreen></FullScreen>
     <UserDropdown></UserDropdown>
   </div>

From 80872b727e6c2b86d935c7d2465b3ae4fa5da6e5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 15:30:02 +0800
Subject: [PATCH 24/78] no message

Former-commit-id: 68d2ba05ec5fdb22a860ce1abd6bae4126b23249
Former-commit-id: 5247a8adaa9ad79f1d3861e55991f0d36cf7a199
Former-commit-id: 15cab048e5e177ca329218f86c5aba9d8296ed3d
---
 src/assets/style/theme/star/index.scss               | 11 +++++++++++
 .../core/MainLayout/components/HeaderMenu/index.vue  | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index e52f0a04..0fc398ee 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -39,6 +39,17 @@ $theme-container-full-border-color: #d8dfea;
           border-top-color: #FFF;
         }
       }
+      .el-submenu {
+        .el-submenu__title {
+          color: #FFF;
+          &:hover {
+            background-color: rgba(#000, 0.1);
+          }
+          .el-submenu__icon-arrow {
+            color: #FFF;
+          }
+        }
+      }
     }
     // 顶栏右侧
     .dd-header-right {
diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index 391713b9..d0994adc 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -2,6 +2,18 @@
   <el-menu
     mode="horizontal"
     :router="true">
+    <el-submenu index="2">
+      <template slot="title">我的工作台</template>
+      <el-menu-item index="2-1">选项1</el-menu-item>
+      <el-menu-item index="2-2">选项2</el-menu-item>
+      <el-menu-item index="2-3">选项3</el-menu-item>
+      <el-submenu index="2-4">
+        <template slot="title">选项4</template>
+        <el-menu-item index="2-4-1">选项1</el-menu-item>
+        <el-menu-item index="2-4-2">选项2</el-menu-item>
+        <el-menu-item index="2-4-3">选项3</el-menu-item>
+      </el-submenu>
+    </el-submenu>
     <el-menu-item
       v-for="menu in menus"
       :key="menu.path"

From 2f0bc664d2277939ef6c6391bd1cedbc17327839 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 15:54:54 +0800
Subject: [PATCH 25/78] no message

Former-commit-id: 2bfd8299753e5111a002360f60bbb542a0b77b04
Former-commit-id: 7a370ef4f8202b1cc28275f0efa1ae9a39fe1494
Former-commit-id: 548157f689124b2f2b917c29bfdbb4ce5ba772cd
---
 src/components/core/Container/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue
index 10775106..39e5a90a 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/Container/index.vue
@@ -11,7 +11,7 @@
       <slot></slot>
     </div>
     <!-- [container-full] 撑满 -->
-    <container-full v-if="type === 'full'" :right="10" :bottom="0">
+    <container-full v-if="type === 'full'" :right="20" :bottom="0">
       <slot v-if="$slots.header" name="header" slot="header"></slot>
       <slot></slot>
       <slot v-if="$slots.footer" name="footer" slot="footer"></slot>

From df33f0b17327053287755e7cf121f563a25446c0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 15:56:22 +0800
Subject: [PATCH 26/78] no message

Former-commit-id: 16781edff323cab647dab400c91e6986f415a970
Former-commit-id: a969e695a05705ccdfe79ba61f6366924e2f592e
Former-commit-id: 5e1145fb583ae99d887655900f8886cd1094c75f
---
 src/assets/style/fixed/element.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/assets/style/fixed/element.scss b/src/assets/style/fixed/element.scss
index c75fb638..b35e4901 100644
--- a/src/assets/style/fixed/element.scss
+++ b/src/assets/style/fixed/element.scss
@@ -5,4 +5,9 @@
   &:hover {
     box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
   }
+}
+
+
+.el-menu--horizontal {
+  border-bottom: none;
 }
\ No newline at end of file

From 9dbbbbc25396e90ebfc62fdffb669db884be8d75 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 16:29:54 +0800
Subject: [PATCH 27/78] no message

Former-commit-id: 72f5f7687bee588311719d2c95c85b1b283da6ae
Former-commit-id: b71dc77d42c0cb18ae01ed2f881556e2326af4c1
Former-commit-id: 5d142418b89ff2b6cb78aeecc7a39271166889d0
---
 src/assets/style/theme/star/index.scss | 12 +++++++++++-
 src/assets/style/theme/theme.scss      |  5 -----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 0fc398ee..e5384451 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -28,7 +28,7 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
-    // 菜单
+    // 顶栏菜单
     .el-menu {
       .el-menu-item {
         color: #FFF;
@@ -63,4 +63,14 @@ $theme-container-full-border-color: #d8dfea;
       }
     }
   }
+  // [布局] 顶栏下面
+  .el-container {
+    // 侧边栏
+    .el-aside {
+      // [菜单] 正常状态
+      .el-menu {
+        
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 761f65a0..28168786 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -80,11 +80,6 @@ $theme-color: #EFF4F8;
       .el-menu {
         background-color: transparent;
         border-right: none;
-        .el-submenu__title {
-          &:hover {
-            background-color: rgba(#000, .05);
-          }
-        }
       }
       // [菜单] 折叠状态
       .el-menu--collapse {

From b01cb62474f4b11b516b8cb6f8ff7a64fc6da57c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 16:33:49 +0800
Subject: [PATCH 28/78] no message

Former-commit-id: a8d66ec9fa0a371e554e1c266f00d0d34d49da01
Former-commit-id: e8d32cb335ce42fcba918341c0900c0f3df64534
Former-commit-id: 8a1297892eb75aa91480c83a06797a10ae91d4c9
---
 src/assets/style/theme/star/index.scss | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index e5384451..181713c6 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -69,7 +69,29 @@ $theme-container-full-border-color: #d8dfea;
     .el-aside {
       // [菜单] 正常状态
       .el-menu {
-        
+        .el-menu-item {
+          color: #FFF;
+          &:hover {
+            background-color: rgba(#000, 0.1);
+          }
+          i {
+            color: #FFF;
+          }
+        }
+      }
+      .el-submenu {
+        .el-submenu__title {
+          color: #FFF;
+          &:hover {
+            background-color: rgba(#000, 0.1);
+          }
+          i {
+            color: #FFF;
+          }
+          .el-submenu__icon-arrow {
+            color: #FFF;
+          }
+        }
       }
     }
   }

From 86c1a4e871b35c0e1d0b6929c9011cb9c983e2d1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 21:48:54 +0800
Subject: [PATCH 29/78] no message

Former-commit-id: ff1f48ca0d7660e878c84ca618fe4df4e32ff382
Former-commit-id: ba66d15b0081d5c90bf48e2dd26fc7a0a3441c0f
Former-commit-id: 30b9dde850aa227aaaaeb19ef55754233e38c4fb
---
 src/assets/style/theme/star/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 181713c6..5dfad9f0 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -1,7 +1,7 @@
 @import '../theme.scss';
 
 $theme-name: 'star';
-$theme-bg-color: #EFF4F8;
+$theme-bg-color: #000;
 $theme-bg-image: '/static/image/bg/star.jpg';
 $theme-container-full-border-color: #d8dfea;
 

From b25865691ddde8785c9e8f45d979832dddacc482 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 21:57:32 +0800
Subject: [PATCH 30/78] no message

Former-commit-id: 65f0105f8dcaa0bf324fc08d251a6234bd4b69aa
Former-commit-id: b7139bdedf4fa6c58e3d0f115811842c2e071bf6
Former-commit-id: 72a045a1c07a08a0d6db280f1e752317df5f3fdc
---
 src/assets/style/theme/star/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 5dfad9f0..181713c6 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -1,7 +1,7 @@
 @import '../theme.scss';
 
 $theme-name: 'star';
-$theme-bg-color: #000;
+$theme-bg-color: #EFF4F8;
 $theme-bg-image: '/static/image/bg/star.jpg';
 $theme-container-full-border-color: #d8dfea;
 

From 746b80c9d646c5ba45cf054898f37759d1e3e380 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 22:15:30 +0800
Subject: [PATCH 31/78] no message

Former-commit-id: aa201ea550d3ca46cf59ea3e05c97fd447602837
Former-commit-id: 4cc5d847842f326b6527ebaff446658db87ecd5a
Former-commit-id: 4f028100c1f776e38f4d67cda99c83b1c74a5924
---
 src/assets/style/theme/star/index.scss | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 181713c6..8079dae1 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -28,12 +28,18 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
+    @mixin header-el-menu-item {
+      background-color: transparent;
+      background-image: linear-gradient(-180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.00) 90%);
+      border-top-color: rgba(0, 0, 0, 0.6);
+    }
     // 顶栏菜单
     .el-menu {
       .el-menu-item {
+        transition: border-top-color 0s;
         color: #FFF;
         &:hover {
-          background-color: rgba(#000, 0.1);
+          @include header-el-menu-item;
         }
         &.is-active {
           border-top-color: #FFF;
@@ -41,9 +47,10 @@ $theme-container-full-border-color: #d8dfea;
       }
       .el-submenu {
         .el-submenu__title {
+          transition: border-top-color 0s;
           color: #FFF;
           &:hover {
-            background-color: rgba(#000, 0.1);
+            @include header-el-menu-item;
           }
           .el-submenu__icon-arrow {
             color: #FFF;
@@ -67,12 +74,16 @@ $theme-container-full-border-color: #d8dfea;
   .el-container {
     // 侧边栏
     .el-aside {
+      @mixin aside-el-menu-item {
+        background-color: transparent;
+        background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.00) 90%);
+      }
       // [菜单] 正常状态
       .el-menu {
         .el-menu-item {
           color: #FFF;
           &:hover {
-            background-color: rgba(#000, 0.1);
+            @include aside-el-menu-item;
           }
           i {
             color: #FFF;
@@ -83,7 +94,7 @@ $theme-container-full-border-color: #d8dfea;
         .el-submenu__title {
           color: #FFF;
           &:hover {
-            background-color: rgba(#000, 0.1);
+            @include aside-el-menu-item;
           }
           i {
             color: #FFF;

From ff2d262d66d7125b62ce85245ea6a8ee33b0f45d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 22:38:01 +0800
Subject: [PATCH 32/78] no message

Former-commit-id: bb428cfed5e1e6bc244675ee163157c83047c1db
Former-commit-id: 1996f09d9327b429a2a88aa72cf08895b4e447df
Former-commit-id: b90b1b7d11ba9895ab75a7e74e11f8fea72c7194
---
 .../components/ddMenuHaveChildren.vue         | 28 +++++++++++++++++++
 .../SideMenu/components/ddMenuItem.vue        | 19 +++++++++++++
 .../MainLayout/components/SideMenu/index.vue  |  8 ++++--
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue
 create mode 100644 src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue

diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue
new file mode 100644
index 00000000..b41f2166
--- /dev/null
+++ b/src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue
@@ -0,0 +1,28 @@
+<template>
+  <el-submenu :index="menu.path">
+    <template slot="title">
+      <i :class="`fa fa-${menu.icon}`"></i>
+      <span slot="title">{{menu.title}}</span>
+    </template>
+    <template v-for="(child, childIndex) in menu.children">
+      <ddMenuItem v-if="child.children === undefined" :menu="child" :key="childIndex"/>
+      <dd-menu-have-children v-else :menu="child" :key="childIndex"/>
+    </template>
+  </el-submenu>
+</template>
+
+<script>
+export default {
+  name: 'dd-menu-have-children',
+  props: {
+    menu: {
+      type: Object,
+      required: false,
+      default: () => {}
+    }
+  },
+  components: {
+    ddMenuItem: () => import('./ddMenuItem.vue')
+  }
+}
+</script>
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue
new file mode 100644
index 00000000..c40f937a
--- /dev/null
+++ b/src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue
@@ -0,0 +1,19 @@
+<template>
+  <el-menu-item :index="menu.path">
+    <i :class="`fa fa-${menu.icon}`"></i>
+    <span slot="title">{{menu.title}}</span>
+  </el-menu-item>
+</template>
+
+<script>
+export default {
+  name: 'dd-menu-item',
+  props: {
+    menu: {
+      type: Object,
+      required: false,
+      default: () => {}
+    }
+  }
+}
+</script>
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index b026e9f2..7ed45cfd 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -4,7 +4,10 @@
       :collapse="collapse"
       :unique-opened="true"
       :router="true">
-      <dd-menu v-for="(menu, menuIndex) in menus" :menu="menu" :key="menuIndex"/>
+      <template v-for="(menu, menuIndex) in menus">
+        <ddMenuItem v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+        <dd-menu-have-children v-else :menu="menu" :key="menuIndex"/>
+      </template>
     </el-menu>
     <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
@@ -22,7 +25,8 @@ export default {
     }
   },
   components: {
-    ddMenu: () => import('./components/ddMenu.vue')
+    ddMenuItem: () => import('./components/ddMenuItem.vue'),
+    ddMenuHaveChildren: () => import('./components/ddMenuHaveChildren.vue')
   },
   data () {
     return {

From 5a6fddef6398f637ba645d5fe8d28d27d41ae052 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 22:52:38 +0800
Subject: [PATCH 33/78] no message

Former-commit-id: 4396ced1431e32cd9557670cdbf05ae1f0c1c523
Former-commit-id: 29b5a6853a3fbae9b1c1b748459784bad67d5479
Former-commit-id: 4c07578eac615e772a6732630204206f6759c86c
---
 docs/zh/components/locally-valid.md           | 12 ++++++--
 .../{ddMenuItem.vue => D2MenuItem.vue}        |  2 +-
 .../{ddMenuHaveChildren.vue => D2Submenu.vue} |  8 +++---
 .../components/SideMenu/components/ddMenu.vue | 28 -------------------
 .../MainLayout/components/SideMenu/index.vue  |  8 +++---
 5 files changed, 19 insertions(+), 39 deletions(-)
 rename src/components/core/MainLayout/components/SideMenu/components/{ddMenuItem.vue => D2MenuItem.vue} (92%)
 rename src/components/core/MainLayout/components/SideMenu/components/{ddMenuHaveChildren.vue => D2Submenu.vue} (64%)
 delete mode 100644 src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue

diff --git a/docs/zh/components/locally-valid.md b/docs/zh/components/locally-valid.md
index 6db777f4..f5980fa9 100644
--- a/docs/zh/components/locally-valid.md
+++ b/docs/zh/components/locally-valid.md
@@ -2,10 +2,18 @@
 
 局部组件是指在某个组件内注册的组件，它一般只在一个地方用到，全局无法访问
 
-## dd-menu
+## D2MenuItem
 
 ::: tip 出现位置
 src/components/core/MainLayout/components/SideMenu/index.vue
 :::
 
-该组件会根据数据选择渲染 `<el-menu-item>` 或者 `<el-submenu>` 结构，并且在 `<el-submenu>` 中再次根据数据类型递归自身，最终生成 elementUI 的菜单组件结构，支持嵌套多级
\ No newline at end of file
+该组件会根据数据渲染 `<el-menu-item>`
+
+## D2Submenu
+
+::: tip 出现位置
+src/components/core/MainLayout/components/SideMenu/index.vue
+:::
+
+该组件会根据数据渲染 `<el-submenu>` 结构，并且在 `<el-submenu>` 中再次根据数据类型递归自身，最终生成 elementUI 的菜单组件结构，支持嵌套多级
\ No newline at end of file
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue b/src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue
similarity index 92%
rename from src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue
rename to src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue
index c40f937a..65f96d33 100644
--- a/src/components/core/MainLayout/components/SideMenu/components/ddMenuItem.vue
+++ b/src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue
@@ -7,7 +7,7 @@
 
 <script>
 export default {
-  name: 'dd-menu-item',
+  name: 'D2MenuItem',
   props: {
     menu: {
       type: Object,
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue b/src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue
similarity index 64%
rename from src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue
rename to src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue
index b41f2166..15f17561 100644
--- a/src/components/core/MainLayout/components/SideMenu/components/ddMenuHaveChildren.vue
+++ b/src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue
@@ -5,15 +5,15 @@
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">
-      <ddMenuItem v-if="child.children === undefined" :menu="child" :key="childIndex"/>
-      <dd-menu-have-children v-else :menu="child" :key="childIndex"/>
+      <d2-menu-item v-if="child.children === undefined" :menu="child" :key="childIndex"/>
+      <d2-submenu v-else :menu="child" :key="childIndex"/>
     </template>
   </el-submenu>
 </template>
 
 <script>
 export default {
-  name: 'dd-menu-have-children',
+  name: 'D2Submenu',
   props: {
     menu: {
       type: Object,
@@ -22,7 +22,7 @@ export default {
     }
   },
   components: {
-    ddMenuItem: () => import('./ddMenuItem.vue')
+    D2MenuItem: () => import('./D2MenuItem.vue')
   }
 }
 </script>
diff --git a/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue b/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
deleted file mode 100644
index 5a934148..00000000
--- a/src/components/core/MainLayout/components/SideMenu/components/ddMenu.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <div>
-    <el-menu-item v-if="menu.children === undefined" :index="menu.path">
-      <i :class="`fa fa-${menu.icon}`"></i>
-      <span slot="title">{{menu.title}}</span>
-    </el-menu-item>
-    <el-submenu v-else :index="menu.path">
-      <template slot="title">
-        <i :class="`fa fa-${menu.icon}`"></i>
-        <span slot="title">{{menu.title}}</span>
-      </template>
-      <dd-menu v-for="(child, childIndex) in menu.children" :menu="child" :key="childIndex"/>
-    </el-submenu>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'dd-menu',
-  props: {
-    menu: {
-      type: Object,
-      required: false,
-      default: () => {}
-    }
-  }
-}
-</script>
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 7ed45cfd..ce9786b3 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -5,8 +5,8 @@
       :unique-opened="true"
       :router="true">
       <template v-for="(menu, menuIndex) in menus">
-        <ddMenuItem v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-        <dd-menu-have-children v-else :menu="menu" :key="menuIndex"/>
+        <d2-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+        <d2-submenu v-else :menu="menu" :key="menuIndex"/>
       </template>
     </el-menu>
     <!-- <div v-if="sideMenu.filter(e => e.title).length === 0 && !collapse" class="dd-side-menu-empty">
@@ -25,8 +25,8 @@ export default {
     }
   },
   components: {
-    ddMenuItem: () => import('./components/ddMenuItem.vue'),
-    ddMenuHaveChildren: () => import('./components/ddMenuHaveChildren.vue')
+    D2MenuItem: () => import('./components/D2MenuItem.vue'),
+    D2Submenu: () => import('./components/D2Submenu.vue')
   },
   data () {
     return {

From b35219e448671c8e1b14262d57790a8c962e69be Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 23:23:01 +0800
Subject: [PATCH 34/78] no message

Former-commit-id: 374b5e6d4c3577f65820d0a6acd05fdefee6fb8f
Former-commit-id: 1510974157422345ce91b7adca76de82abfc6f73
Former-commit-id: d7e84f579d72317a20c64359c9819a045315d1d6
---
 src/assets/style/theme/_bak.scss  | 168 ------------------------------
 src/assets/style/theme/theme.scss |  17 +++
 2 files changed, 17 insertions(+), 168 deletions(-)
 delete mode 100644 src/assets/style/theme/_bak.scss

diff --git a/src/assets/style/theme/_bak.scss b/src/assets/style/theme/_bak.scss
deleted file mode 100644
index a0122f66..00000000
--- a/src/assets/style/theme/_bak.scss
+++ /dev/null
@@ -1,168 +0,0 @@
-@import '~@/assets/style/public.scss';
-
-$theme-color: #EFF4F8;
-
-$border-color: #d8dfea;
-// 默认主题
-.layout-main {
-  &.classic {
-    height: 100vh;
-    width: 100vw;
-    background-color: $theme-color;
-    background-image: url('/static/image/bg/2.jpg');
-    background-size: cover;
-    background-position: center;
-    .el-card {
-      box-shadow: none;
-      &:hover {
-        // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-        box-shadow: none;
-      }
-    }
-    .dd-container-full {
-      position: absolute;
-      border-top-left-radius: 4px;
-      border-top-right-radius: 4px;
-      border-top: 1px solid $border-color;
-      border-left: 1px solid $border-color;
-      border-right: 1px solid $border-color;
-      background-color: #fff;
-      overflow: hidden;
-      color: #303133;
-      &:hover {
-        // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-        box-shadow: none;
-      }
-      .dd-container-full__header {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        padding: 18px 20px;
-        border-bottom: 1px solid $border-color;
-        box-sizing: border-box;
-      }
-      .dd-container-full__body {
-        position: absolute;
-        padding: 20px;
-        left: 0px;
-        right: 0px;
-        bottom: 0px;
-        overflow: auto;
-      }
-      .dd-container-full__footer {
-        position: absolute;
-        bottom: 0px;
-        left: 0px;
-        width: 100%;
-        padding: 18px 20px;
-        border-top: 1px solid $border-color;
-        box-sizing: border-box;
-      }
-    }
-    // [布局] 顶栏
-    .el-header {
-      padding: 0px;
-      // logo区域
-      .logo-group {
-        transition: width .3s;
-        float: left;
-        text-align: center;
-        img {
-          height: 60px;
-        }
-      }
-      // 折叠侧边栏切换按钮
-      .toggle-aside-btn {
-        float: left;
-        height: 60px;
-        width: 60px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        user-select: none;
-        cursor: pointer;
-        i {
-          font-size: 20px;
-          color: $color-text-normal;
-          margin-top: 4px;
-          &:hover {
-            color: $color-primary;
-          }
-        }
-      }
-      // [菜单] 顶栏
-      .el-menu {
-        float: left;
-        border-bottom: none;
-        background-color: transparent;
-        .el-menu-item {
-          border-bottom: none;
-          border-top: 2px solid transparent;
-          &:hover {
-            background-color: transparent;
-          }
-          &.is-active {
-            border-bottom: none;
-            border-top: 2px solid $color-primary;
-            background-color: transparent;
-          }
-        }
-      }
-      // 顶栏右侧的按钮
-      .dd-header-right {
-        float: right;
-        height: 60px;
-        display: flex;
-        align-items: center;
-        .btn-text {
-          color: $color-text-normal;
-        }
-        .el-dropdown {
-          user-select: none;
-          cursor: pointer;
-        }
-      }
-    }
-    // [布局] 顶栏下面
-    .el-container {
-      // 侧边栏
-      .el-aside {
-        transition: width .3s;
-        overflow: inherit;
-        // 空菜单
-        .dd-side-menu-empty {
-          background-color: rgba(#000, .03);
-          margin: $margin;
-          margin-top: 0px;
-          border-radius: 4px;
-          line-height: 100px;
-          text-align: center;
-          color: $color-text-sub;
-        }
-        // [菜单] 正常状态
-        .el-menu {
-          background-color: transparent;
-          border-right: none;
-          .el-submenu__title {
-            &:hover {
-              background-color: rgba(#000, .05);
-            }
-          }
-        }
-        // [菜单] 折叠状态
-        .el-menu--collapse {
-          background-color: transparent;
-          .el-submenu__title {
-            text-align: center;
-          }
-        }
-      }
-      .el-main {
-        padding: 0px;
-        position: relative;
-        overflow: hidden;
-      }
-    }
-  }
-}
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 28168786..970907e2 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -80,6 +80,23 @@ $theme-color: #EFF4F8;
       .el-menu {
         background-color: transparent;
         border-right: none;
+        .el-menu-item {
+          i {
+            margin-right: 5px;
+            font-size: 20px;
+          }
+        }
+      }
+      .el-submenu {
+        .el-submenu__title {
+          i {
+            margin-right: 5px;
+            font-size: 20px;
+          }
+          .el-submenu__icon-arrow {
+            margin-top: -10px;
+          }
+        }
       }
       // [菜单] 折叠状态
       .el-menu--collapse {

From 6ec6e51e1867e80735800d78cdeefbb6ecf8bd46 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 12:49:10 +0800
Subject: [PATCH 35/78] no message

Former-commit-id: 4cbb612fa732dc619e4c14c19c89253a09c0fd49
Former-commit-id: a9532b0350bd454d27f12ff6a6cb360a1d254f3c
Former-commit-id: f83aad9229bb28c4be1ed6f3dee99c54171e5188
---
 src/assets/style/theme/star/index.scss                     | 7 +++++++
 src/assets/style/theme/theme.scss                          | 7 +++++--
 .../core/MainLayout/components/SideMenu/index.vue          | 4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 8079dae1..756593c8 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -42,6 +42,7 @@ $theme-container-full-border-color: #d8dfea;
           @include header-el-menu-item;
         }
         &.is-active {
+          background-color: transparent;
           border-top-color: #FFF;
         }
       }
@@ -85,6 +86,9 @@ $theme-container-full-border-color: #d8dfea;
           &:hover {
             @include aside-el-menu-item;
           }
+          &:focus {
+            @include aside-el-menu-item;
+          }
           i {
             color: #FFF;
           }
@@ -96,6 +100,9 @@ $theme-container-full-border-color: #d8dfea;
           &:hover {
             @include aside-el-menu-item;
           }
+          &:focus {
+            @include aside-el-menu-item;
+          }
           i {
             color: #FFF;
           }
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 970907e2..b5fe40b3 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -43,8 +43,11 @@ $theme-color: #EFF4F8;
       .el-menu-item {
         border-bottom: none;
         border-top: 2px solid transparent;
-        &.is-active {
-          background-color: transparent;
+      }
+      .el-submenu {
+        .el-submenu__title {
+          border-bottom: none;
+          border-top: 2px solid transparent;
         }
       }
     }
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index ce9786b3..87d64d93 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -32,7 +32,7 @@ export default {
     return {
       menus: [
         {
-          path: '/demo/components/container/container-full',
+          path: '/demo/components/container/full',
           title: 'menu-a',
           icon: 'plus'
         },
@@ -57,7 +57,7 @@ export default {
                   icon: 'plus'
                 },
                 {
-                  path: '/d',
+                  path: '/demo/components/container/full',
                   title: 'menu-a',
                   icon: 'plus'
                 }

From ccdfe68a7921c9276ee26ca2c3d078965ca40e58 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 13:00:17 +0800
Subject: [PATCH 36/78] no message

Former-commit-id: 7550205a6806f9eece74e85e246a5cc4b83e1c24
Former-commit-id: 6a36eaaa942e230de2be6e0ef8a680d2cfcdfcad
Former-commit-id: 8979525f2b4687b3627bd897263dc97c9904e0c2
---
 src/assets/style/theme/star/index.scss                        | 3 ---
 .../components/D2MenuItem.vue => D2MenuItem/index.vue}        | 0
 .../components/D2Submenu.vue => D2Submenu/index.vue}          | 2 +-
 .../core/MainLayout/components/HeaderMenu/index.vue           | 1 +
 .../core/MainLayout/components/HeaderRight/index.vue          | 1 +
 src/components/core/MainLayout/components/SideMenu/index.vue  | 4 ++--
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename src/components/core/MainLayout/components/{SideMenu/components/D2MenuItem.vue => D2MenuItem/index.vue} (100%)
 rename src/components/core/MainLayout/components/{SideMenu/components/D2Submenu.vue => D2Submenu/index.vue} (91%)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 756593c8..9d8ce88f 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -100,9 +100,6 @@ $theme-container-full-border-color: #d8dfea;
           &:hover {
             @include aside-el-menu-item;
           }
-          &:focus {
-            @include aside-el-menu-item;
-          }
           i {
             color: #FFF;
           }
diff --git a/src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue b/src/components/core/MainLayout/components/D2MenuItem/index.vue
similarity index 100%
rename from src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue
rename to src/components/core/MainLayout/components/D2MenuItem/index.vue
diff --git a/src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue b/src/components/core/MainLayout/components/D2Submenu/index.vue
similarity index 91%
rename from src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue
rename to src/components/core/MainLayout/components/D2Submenu/index.vue
index 15f17561..950b331d 100644
--- a/src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue
+++ b/src/components/core/MainLayout/components/D2Submenu/index.vue
@@ -22,7 +22,7 @@ export default {
     }
   },
   components: {
-    D2MenuItem: () => import('./D2MenuItem.vue')
+    D2MenuItem: () => import('../D2MenuItem/index.vue')
   }
 }
 </script>
diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index d0994adc..7352999c 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -25,6 +25,7 @@
 
 <script>
 export default {
+  name: 'HeaderMenu',
   data () {
     return {
       menus: [
diff --git a/src/components/core/MainLayout/components/HeaderRight/index.vue b/src/components/core/MainLayout/components/HeaderRight/index.vue
index 83a10546..25ee55e4 100644
--- a/src/components/core/MainLayout/components/HeaderRight/index.vue
+++ b/src/components/core/MainLayout/components/HeaderRight/index.vue
@@ -7,6 +7,7 @@
 
 <script>
 export default {
+  name: 'HeaderRight',
   components: {
     FullScreen: () => import('./components/FullScreen.vue'),
     UserDropdown: () => import('./components/UserDropdown.vue')
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 87d64d93..f3f5e5bd 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -25,8 +25,8 @@ export default {
     }
   },
   components: {
-    D2MenuItem: () => import('./components/D2MenuItem.vue'),
-    D2Submenu: () => import('./components/D2Submenu.vue')
+    D2MenuItem: () => import('../D2MenuItem/index.vue'),
+    D2Submenu: () => import('../D2Submenu/index.vue')
   },
   data () {
     return {

From a1c60d25efd862b84f59696298fcebbadbcbd778 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 13:08:49 +0800
Subject: [PATCH 37/78] no message

Former-commit-id: ec3e0487ed841a5b53eb7a0b0c43d4c70d48027f
Former-commit-id: fa521d0aefbd457c7e33a414d95757b455e3dac2
Former-commit-id: 9c3751710cc4549ef906b8008488411d1020ad6b
---
 .../components/D2MenuItem/index.vue           |  2 +-
 .../MainLayout/components/D2Submenu/index.vue |  2 +-
 .../components/HeaderMenu/index.vue           | 60 ++++++++++++-------
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/components/core/MainLayout/components/D2MenuItem/index.vue b/src/components/core/MainLayout/components/D2MenuItem/index.vue
index 65f96d33..899e90fb 100644
--- a/src/components/core/MainLayout/components/D2MenuItem/index.vue
+++ b/src/components/core/MainLayout/components/D2MenuItem/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-menu-item :index="menu.path">
-    <i :class="`fa fa-${menu.icon}`"></i>
+    <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
     <span slot="title">{{menu.title}}</span>
   </el-menu-item>
 </template>
diff --git a/src/components/core/MainLayout/components/D2Submenu/index.vue b/src/components/core/MainLayout/components/D2Submenu/index.vue
index 950b331d..3285ce6c 100644
--- a/src/components/core/MainLayout/components/D2Submenu/index.vue
+++ b/src/components/core/MainLayout/components/D2Submenu/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-submenu :index="menu.path">
     <template slot="title">
-      <i :class="`fa fa-${menu.icon}`"></i>
+      <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">
diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index 7352999c..1395bf77 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -2,38 +2,52 @@
   <el-menu
     mode="horizontal"
     :router="true">
-    <el-submenu index="2">
-      <template slot="title">我的工作台</template>
-      <el-menu-item index="2-1">选项1</el-menu-item>
-      <el-menu-item index="2-2">选项2</el-menu-item>
-      <el-menu-item index="2-3">选项3</el-menu-item>
-      <el-submenu index="2-4">
-        <template slot="title">选项4</template>
-        <el-menu-item index="2-4-1">选项1</el-menu-item>
-        <el-menu-item index="2-4-2">选项2</el-menu-item>
-        <el-menu-item index="2-4-3">选项3</el-menu-item>
-      </el-submenu>
-    </el-submenu>
-    <el-menu-item
-      v-for="menu in menus"
-      :key="menu.path"
-      :index="menu.path">
-      {{menu.title}}
-    </el-menu-item>
+    <template v-for="(menu, menuIndex) in menus">
+      <d2-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+      <d2-submenu v-else :menu="menu" :key="menuIndex"/>
+    </template>
   </el-menu>
 </template>
 
 <script>
 export default {
   name: 'HeaderMenu',
+  components: {
+    D2MenuItem: () => import('../D2MenuItem/index.vue'),
+    D2Submenu: () => import('../D2Submenu/index.vue')
+  },
   data () {
     return {
       menus: [
-        {path: '/index', title: '首页'},
-        {path: '/demo/plugins', title: '插件'},
-        {path: '/demo/components', title: '组件'},
-        {path: '/demo/chart', title: '图表'},
-        {path: '/demo/business', title: '示例业务界面'}
+        {
+          path: '/index',
+          title: '首页'
+        },
+        {
+          path: '/demo',
+          title: '功能',
+          children: [
+            {
+              path: '/demo/plugins',
+              title: '插件',
+              icon: 'plug'
+            },
+            {
+              path: '/demo/components',
+              title: '组件',
+              icon: 'puzzle-piece'
+            },
+            {
+              path: '/demo/chart',
+              title: '图表',
+              icon: 'pie-chart'
+            }
+          ]
+        },
+        {
+          path: '/demo/business',
+          title: '示例业务界面'
+        }
       ]
     }
   }

From abbd3b73f85edb7cda34d36d3fb925e0da046c57 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 13:22:59 +0800
Subject: [PATCH 38/78] no message

Former-commit-id: 951d7a20ad54bfa63ab573c72ad0d18300bad81f
Former-commit-id: 6907ebc0bb4dc59d8cd2d5dd60016f0312e428f8
Former-commit-id: 43c3ae475be2c81c8a2d5552bb96da3e024a6d6c
---
 src/assets/style/theme/star/index.scss | 32 +++++++++++++-------------
 src/assets/style/theme/theme.scss      |  2 --
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 9d8ce88f..cb2db71b 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -28,22 +28,19 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
-    @mixin header-el-menu-item {
-      background-color: transparent;
-      background-image: linear-gradient(-180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.00) 90%);
-      border-top-color: rgba(0, 0, 0, 0.6);
-    }
     // 顶栏菜单
     .el-menu {
       .el-menu-item {
         transition: border-top-color 0s;
         color: #FFF;
         &:hover {
-          @include header-el-menu-item;
+          background-color: rgba(#FFF, .3);
+        }
+        &:focus {
+          background-color: rgba(#FFF, .3);
         }
         &.is-active {
-          background-color: transparent;
-          border-top-color: #FFF;
+          background-color: rgba(#000, .3);
         }
       }
       .el-submenu {
@@ -51,7 +48,10 @@ $theme-container-full-border-color: #d8dfea;
           transition: border-top-color 0s;
           color: #FFF;
           &:hover {
-            @include header-el-menu-item;
+            background-color: rgba(#FFF, .3);
+          }
+          &:focus {
+            background-color: rgba(#FFF, .3);
           }
           .el-submenu__icon-arrow {
             color: #FFF;
@@ -75,30 +75,30 @@ $theme-container-full-border-color: #d8dfea;
   .el-container {
     // 侧边栏
     .el-aside {
-      @mixin aside-el-menu-item {
-        background-color: transparent;
-        background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.00) 90%);
-      }
       // [菜单] 正常状态
       .el-menu {
+        margin-top: 10px;
         .el-menu-item {
           color: #FFF;
           &:hover {
-            @include aside-el-menu-item;
+            background-color: rgba(#FFF, .3);
           }
           &:focus {
-            @include aside-el-menu-item;
+            background-color: rgba(#FFF, .3);
           }
           i {
             color: #FFF;
           }
+          &.is-active {
+            background-color: rgba(#000, .3);
+          }
         }
       }
       .el-submenu {
         .el-submenu__title {
           color: #FFF;
           &:hover {
-            @include aside-el-menu-item;
+            background-color: rgba(#FFF, .3);
           }
           i {
             color: #FFF;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index b5fe40b3..1b15f1f9 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -42,12 +42,10 @@ $theme-color: #EFF4F8;
       background-color: transparent;
       .el-menu-item {
         border-bottom: none;
-        border-top: 2px solid transparent;
       }
       .el-submenu {
         .el-submenu__title {
           border-bottom: none;
-          border-top: 2px solid transparent;
         }
       }
     }

From e2623544921b4f09148d3341576c637f59680262 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 14:10:57 +0800
Subject: [PATCH 39/78] no message

Former-commit-id: a91e60f02dbd2cb458a2b0fa3be083437641f3c9
Former-commit-id: f699535a3e6b3ae4a64b88b49e1a50f5e68aaf96
Former-commit-id: d93017d5808aec98007a9af759a709d490a726cc
---
 src/assets/style/theme/star/index.scss        |  1 +
 src/assets/style/theme/theme.scss             | 17 ++++++++++++++++-
 .../components/HeaderMenu/index.vue           | 19 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index cb2db71b..4fea247a 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -8,6 +8,7 @@ $theme-container-full-border-color: #d8dfea;
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
+
   // [组件] dd-container-full
   .dd-container-full {
     .dd-container-full__header {
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 1b15f1f9..28b904ca 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,6 +1,21 @@
 @import '~@/assets/style/public.scss';
 
-$theme-color: #EFF4F8;
+// 下面这部分是要根据主题修改的 但是没有办法加到主题中
+@mixin theme-menu-hover-style {
+  background-color: #eff4f8;
+}
+.el-submenu__title:hover {
+  @include theme-menu-hover-style;
+}
+.el-menu-item:hover {
+  @include theme-menu-hover-style;
+}
+.el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
+  @include theme-menu-hover-style;
+}
+.el-menu--horizontal .el-menu .el-submenu__title:hover {
+  @include theme-menu-hover-style;
+}
 
 // 主题公用
 .theme {
diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index 1395bf77..45b9c8ad 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -40,7 +40,24 @@ export default {
             {
               path: '/demo/chart',
               title: '图表',
-              icon: 'pie-chart'
+              icon: 'pie-chart',
+              children: [
+                {
+                  path: '/demo/plugins',
+                  title: '插件',
+                  icon: 'plug'
+                },
+                {
+                  path: '/demo/components',
+                  title: '组件',
+                  icon: 'puzzle-piece'
+                },
+                {
+                  path: '/demo/chart',
+                  title: '图表',
+                  icon: 'pie-chart'
+                }
+              ]
             }
           ]
         },

From d5682292745c77d8fd88bb9285f6494888f3c5cc Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 14:40:18 +0800
Subject: [PATCH 40/78] no message

Former-commit-id: b0dd61f6ea179f2cc6bcfb556a2cc6526f5eb84c
Former-commit-id: 4aad5b89f03923f6172b2b3e1369da53a17d2de5
Former-commit-id: 25427725cd27292c9f567d04659b9935fe824de3
---
 src/assets/style/theme/star/index.scss   | 17 ++++++++++++++++-
 src/assets/style/theme/theme.scss        | 17 -----------------
 src/components/core/MainLayout/index.vue |  3 +--
 src/main.js                              |  5 ++++-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 4fea247a..847482f9 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -8,7 +8,22 @@ $theme-container-full-border-color: #d8dfea;
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
-
+  // 菜单项目
+  @mixin theme-menu-hover-style {
+    background-color: #eff4f8;
+  }
+  .el-submenu__title:hover {
+    @include theme-menu-hover-style;
+  }
+  .el-menu-item:hover {
+    @include theme-menu-hover-style;
+  }
+  .el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
+    @include theme-menu-hover-style;
+  }
+  .el-menu--horizontal .el-menu .el-submenu__title:hover {
+    @include theme-menu-hover-style;
+  }
   // [组件] dd-container-full
   .dd-container-full {
     .dd-container-full__header {
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 28b904ca..d4413d39 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,22 +1,5 @@
 @import '~@/assets/style/public.scss';
 
-// 下面这部分是要根据主题修改的 但是没有办法加到主题中
-@mixin theme-menu-hover-style {
-  background-color: #eff4f8;
-}
-.el-submenu__title:hover {
-  @include theme-menu-hover-style;
-}
-.el-menu-item:hover {
-  @include theme-menu-hover-style;
-}
-.el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
-  @include theme-menu-hover-style;
-}
-.el-menu--horizontal .el-menu .el-submenu__title:hover {
-  @include theme-menu-hover-style;
-}
-
 // 主题公用
 .theme {
   height: 100vh;
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 5549f776..466826d0 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-container class="layout-main theme" :class="theme">
+  <el-container class="layout-main theme">
     <!-- 顶栏 -->
     <el-header>
       <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
@@ -37,7 +37,6 @@ export default {
   },
   data () {
     return {
-      theme: 'theme-star',
       collapse: false,
       // [侧边栏宽度] 正常状态
       asideWidth: '200px',
diff --git a/src/main.js b/src/main.js
index 0135ca41..2b862006 100755
--- a/src/main.js
+++ b/src/main.js
@@ -57,5 +57,8 @@ new Vue({
   i18n,
   router,
   template: '<App/>',
-  components: { App }
+  components: { App },
+  mounted () {
+    document.body.className = 'theme-star'
+  }
 })

From b398715e29f2a06bd03b836200325a07ee3a8228 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 14:43:43 +0800
Subject: [PATCH 41/78] no message

Former-commit-id: b8c6861f84476ee5df8b5b9abb87849f09bd70e4
Former-commit-id: 85422de5652d28d8a0b9718a20ad1df650bf1f30
Former-commit-id: 5f21294546776f11108d54fa80370a7c1272e98a
---
 src/store/modules/theme.js | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/store/modules/theme.js

diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js
new file mode 100644
index 00000000..7da93b18
--- /dev/null
+++ b/src/store/modules/theme.js
@@ -0,0 +1,11 @@
+export default {
+  state: {
+    themeName: 'star'
+  },
+  mutations: {
+    // 设置主题
+    setTheme (state, themeName) {
+      state.themeName = themeName
+    }
+  }
+}

From 8e5661cb6c6c5d59eac42652629aec1d829d98ba Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 14:44:28 +0800
Subject: [PATCH 42/78] no message

Former-commit-id: 89e246965b501ba16c9b5e6b2703747ac976634f
Former-commit-id: 3190b74deb83c355f8937f2b5b7d8b304a86c520
Former-commit-id: b8a22c2943f6790e3aff5bbb7b7a97d28a5935ec
---
 src/store/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index 9bef11d3..39812b26 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,12 +3,14 @@ import Vuex from 'vuex'
 
 import menu from './modules/menu'
 import fullScreen from './modules/fullScreen'
+import theme from './modules/theme'
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
     menu,
-    fullScreen
+    fullScreen,
+    theme
   }
 })

From dcceb29e2b96f337897b89b5968659f676082e60 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 14:49:52 +0800
Subject: [PATCH 43/78] no message

Former-commit-id: 7546b8ae59e7de1e87b41277a8576e140f75bc3e
Former-commit-id: 1143180996fc7b84745d2c6d6f2e2dd312189982
Former-commit-id: 194f90a841c1e20729ecb63f4353980f97583489
---
 src/assets/style/theme/star/index.scss | 2 ++
 src/assets/style/theme/theme.scss      | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 847482f9..4c6cb32b 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -8,6 +8,8 @@ $theme-container-full-border-color: #d8dfea;
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
+  background-size: cover;
+  background-position: center;
   // 菜单项目
   @mixin theme-menu-hover-style {
     background-color: #eff4f8;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index d4413d39..aa74877c 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -4,8 +4,6 @@
 .theme {
   height: 100vh;
   width: 100vw;
-  background-size: cover;
-  background-position: center;
   // [布局] 顶栏
   .el-header {
     padding: 0px;

From 39e7d2ca3caf6dbdaae6a52c3ea13ae13f2a85f7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 14:53:21 +0800
Subject: [PATCH 44/78] no message

Former-commit-id: 1685e45104c35f4132d485576253bc7891138a9c
Former-commit-id: 4a54bba4eb5971341718c239a10cfe4647cfbbb5
Former-commit-id: 1834cd06c20dd8a1c9d342528351913c29f0e549
---
 src/assets/style/theme/star/index.scss | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 4c6cb32b..3921d6b5 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -6,10 +6,12 @@ $theme-bg-image: '/static/image/bg/star.jpg';
 $theme-container-full-border-color: #d8dfea;
 
 .theme-#{$theme-name} {
-  background-color: $theme-bg-color;
-  background-image: url($theme-bg-image);
-  background-size: cover;
-  background-position: center;
+  .theme {
+    background-color: $theme-bg-color;
+    background-image: url($theme-bg-image);
+    background-size: cover;
+    background-position: center;
+  }
   // 菜单项目
   @mixin theme-menu-hover-style {
     background-color: #eff4f8;

From 636cb92d35ade50e5af16dac496cbc48f3654b4f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 15:02:34 +0800
Subject: [PATCH 45/78] no message

Former-commit-id: 06731affceb6439fbcb06c51b8e262b97c0a95d9
Former-commit-id: 017318042d186f3463880c9b39d74cbb493b1097
Former-commit-id: cb34b79f03b8da63321719f3f07bbd63c01d1dda
---
 src/router/index.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 2d3de63b..313fa7ba 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,8 +11,30 @@ Vue.use(VueRouter)
 
 let router = new VueRouter({
   routes: [
-    ...menu.router,
-    ...invisible
+    // 首页
+    {
+      path: '/',
+      component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
+      redirect: {
+        name: 'index'
+      },
+      children: [
+        {
+          path: 'index',
+          name: 'index',
+          meta: {
+            requiresAuth: true
+          },
+          component: resolve => { require(['@/pages/core/index/index.vue'], resolve) }
+        }
+      ]
+    },
+    // 登陆
+    {
+      path: '/login',
+      name: 'login',
+      component: resolve => { require(['@/pages/core/login/index.vue'], resolve) }
+    }
   ]
 })
 

From f760a671734f9b12f4fbcd6958470509499acd6a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 15:07:23 +0800
Subject: [PATCH 46/78] no message

Former-commit-id: 55a531099695b6bb2ae428a266939a284cb7f3d9
Former-commit-id: 8f73db9ec106f7b5947469cd310a462aeb06ab89
Former-commit-id: 4d751b86ce7355155f3df08b49f51083fb006851
---
 src/router/index.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 313fa7ba..581df74c 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,16 +15,12 @@ let router = new VueRouter({
     {
       path: '/',
       component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-      redirect: {
-        name: 'index'
-      },
+      redirect: { name: 'index' },
       children: [
         {
           path: 'index',
           name: 'index',
-          meta: {
-            requiresAuth: true
-          },
+          meta: { requiresAuth: true },
           component: resolve => { require(['@/pages/core/index/index.vue'], resolve) }
         }
       ]

From 74743d6bc9683e53d39a36cbfdd5f88eaf445391 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 15:22:20 +0800
Subject: [PATCH 47/78] no message

Former-commit-id: d220d30d09a9e3f437aaf496cd3b8a4fce280bc6
Former-commit-id: 925bd272bd7fa63d90114a385ba1e47fe9c43ac0
Former-commit-id: 7b121b91eaf588211b06ea79ca2413e98dcdb88b
---
 src/router/index.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 581df74c..2e4d5314 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,11 +2,6 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
-// 在菜单中显示的那部分路由
-import * as menu from '@/router/menu/index.js'
-// 不在菜单中显示的那部分路由
-import invisible from './invisible/index.js'
-
 Vue.use(VueRouter)
 
 let router = new VueRouter({
@@ -14,8 +9,8 @@ let router = new VueRouter({
     // 首页
     {
       path: '/',
-      component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
       redirect: { name: 'index' },
+      component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
       children: [
         {
           path: 'index',
@@ -25,6 +20,21 @@ let router = new VueRouter({
         }
       ]
     },
+    {
+      path: '/demo/plugins',
+      name: 'demo-plugins',
+      meta: { requiresAuth: true },
+      redirect: { name: 'demo-plugins-index' },
+      component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
+      children: [
+        {
+          path: 'index',
+          name: 'demo-plugins-index',
+          meta: { requiresAuth: true },
+          component: resolve => { require(['@/pages/demo/plugins/index/index.vue'], resolve) }
+        }
+      ]
+    },
     // 登陆
     {
       path: '/login',

From f29021343b3f3025f101d4114cff3cce07f27fb2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 15:33:21 +0800
Subject: [PATCH 48/78] no message

Former-commit-id: c0bc55ee8f1a9c836ed9911c32ddcf680177a7f3
Former-commit-id: f915fcf83a954bc69ce8ad33c3be474a7daef28d
Former-commit-id: 3112cbc21049801308b71d2b5b3aec2a342ce977
---
 src/pages/demo/plugins/build/{index.vue => page.vue}           | 0
 .../demo/plugins/clipboard-polyfill/{demo.vue => page.vue}     | 0
 src/router/index.js                                            | 3 +++
 3 files changed, 3 insertions(+)
 rename src/pages/demo/plugins/build/{index.vue => page.vue} (100%)
 rename src/pages/demo/plugins/clipboard-polyfill/{demo.vue => page.vue} (100%)

diff --git a/src/pages/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/page.vue
similarity index 100%
rename from src/pages/demo/plugins/build/index.vue
rename to src/pages/demo/plugins/build/page.vue
diff --git a/src/pages/demo/plugins/clipboard-polyfill/demo.vue b/src/pages/demo/plugins/clipboard-polyfill/page.vue
similarity index 100%
rename from src/pages/demo/plugins/clipboard-polyfill/demo.vue
rename to src/pages/demo/plugins/clipboard-polyfill/page.vue
diff --git a/src/router/index.js b/src/router/index.js
index 2e4d5314..67f2d5ce 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,6 +4,9 @@ import Cookies from 'js-cookie'
 
 Vue.use(VueRouter)
 
+const res = require.context('@/pages/demo/plugins', true, /page\.vue$/)
+console.log(res.keys().map(res))
+
 let router = new VueRouter({
   routes: [
     // 首页

From b5493ec1c2bcaf38bbce6bf916eaa55847765ac1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 16:21:06 +0800
Subject: [PATCH 49/78] no message

Former-commit-id: 9d931bf8ee17498b3cb6a4e8747a35379053d292
Former-commit-id: 839c0a8471016d910c9504e5a1e6cbd22a95479a
Former-commit-id: 7ffc8041a93f682c2b0cc6bed1c400437dff29fb
---
 package.json                                  |  2 +
 .../export/{table.vue => table/page.vue}      |  2 +-
 .../plugins/export/{txt.vue => txt/page.vue}  |  0
 .../plugins/import/{csv.vue => csv/page.vue}  |  0
 .../import/{xlsx.vue => xlsx/page.vue}        |  0
 .../plugins/index/{index.vue => page.vue}     |  0
 src/router/index.js                           | 96 +++++++++++--------
 7 files changed, 60 insertions(+), 40 deletions(-)
 rename src/pages/demo/plugins/export/{table.vue => table/page.vue} (98%)
 rename src/pages/demo/plugins/export/{txt.vue => txt/page.vue} (100%)
 rename src/pages/demo/plugins/import/{csv.vue => csv/page.vue} (100%)
 rename src/pages/demo/plugins/import/{xlsx.vue => xlsx/page.vue} (100%)
 rename src/pages/demo/plugins/index/{index.vue => page.vue} (100%)

diff --git a/package.json b/package.json
index d66deac3..c99ef7ce 100755
--- a/package.json
+++ b/package.json
@@ -23,6 +23,8 @@
     "github-markdown-css": "^2.10.0",
     "highlight.js": "^9.12.0",
     "js-cookie": "^2.2.0",
+    "lodash.get": "^4.4.2",
+    "lodash.replace": "^4.1.4",
     "marked": "^0.3.9",
     "mockjs": "^1.0.1-beta3",
     "papaparse": "^4.3.6",
diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table/page.vue
similarity index 98%
rename from src/pages/demo/plugins/export/table.vue
rename to src/pages/demo/plugins/export/table/page.vue
index 1400cb68..5034f804 100644
--- a/src/pages/demo/plugins/export/table.vue
+++ b/src/pages/demo/plugins/export/table/page.vue
@@ -28,7 +28,7 @@
 
 <script>
 // 假数据
-import table from './data'
+import table from '../data'
 export default {
   data () {
     return {
diff --git a/src/pages/demo/plugins/export/txt.vue b/src/pages/demo/plugins/export/txt/page.vue
similarity index 100%
rename from src/pages/demo/plugins/export/txt.vue
rename to src/pages/demo/plugins/export/txt/page.vue
diff --git a/src/pages/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv/page.vue
similarity index 100%
rename from src/pages/demo/plugins/import/csv.vue
rename to src/pages/demo/plugins/import/csv/page.vue
diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx/page.vue
similarity index 100%
rename from src/pages/demo/plugins/import/xlsx.vue
rename to src/pages/demo/plugins/import/xlsx/page.vue
diff --git a/src/pages/demo/plugins/index/index.vue b/src/pages/demo/plugins/index/page.vue
similarity index 100%
rename from src/pages/demo/plugins/index/index.vue
rename to src/pages/demo/plugins/index/page.vue
diff --git a/src/router/index.js b/src/router/index.js
index 67f2d5ce..f4820d19 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,49 +2,67 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
+import _path from 'path'
+import _get from 'lodash.get'
+import _replace from 'lodash.replace'
+
 Vue.use(VueRouter)
 
-const res = require.context('@/pages/demo/plugins', true, /page\.vue$/)
-console.log(res.keys().map(res))
+const maker = ({publicPath, namePrefix, req}) => {
+  return req.keys().map(req).map(page => {
+    const path = _replace(_path.dirname(page.default.__file), publicPath, '')
+    const name = namePrefix + path.split(_path.sep).join('-')
+    return {
+      path: `${path}${_get(page, 'router.pathSuffix', '')}`,
+      name,
+      ...page.router,
+      meta: { requiresAuth: true },
+      component: page.default
+    }
+  })
+}
+
+const routes = [
+  // 首页
+  {
+    path: '/',
+    redirect: { name: 'index' },
+    component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
+    children: [
+      {
+        path: 'index',
+        name: 'index',
+        meta: { requiresAuth: true },
+        component: resolve => { require(['@/pages/core/index/index.vue'], resolve) }
+      }
+    ]
+  },
+  {
+    path: '/demo/plugins',
+    name: 'demo-plugins',
+    meta: { requiresAuth: true },
+    redirect: { name: 'demo-plugins-index' },
+    component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
+    children: [
+      ...maker({
+        publicPath: 'src/pages/demo/plugins/',
+        namePrefix: 'demo-plugins-',
+        req: require.context('@/pages/demo/plugins', true, /page\.vue$/)
+      })
+    ]
+  },
+  // 登陆
+  {
+    path: '/login',
+    name: 'login',
+    component: resolve => { require(['@/pages/core/login/index.vue'], resolve) }
+  }
+]
+
+console.log(routes)
 
 let router = new VueRouter({
-  routes: [
-    // 首页
-    {
-      path: '/',
-      redirect: { name: 'index' },
-      component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-      children: [
-        {
-          path: 'index',
-          name: 'index',
-          meta: { requiresAuth: true },
-          component: resolve => { require(['@/pages/core/index/index.vue'], resolve) }
-        }
-      ]
-    },
-    {
-      path: '/demo/plugins',
-      name: 'demo-plugins',
-      meta: { requiresAuth: true },
-      redirect: { name: 'demo-plugins-index' },
-      component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-      children: [
-        {
-          path: 'index',
-          name: 'demo-plugins-index',
-          meta: { requiresAuth: true },
-          component: resolve => { require(['@/pages/demo/plugins/index/index.vue'], resolve) }
-        }
-      ]
-    },
-    // 登陆
-    {
-      path: '/login',
-      name: 'login',
-      component: resolve => { require(['@/pages/core/login/index.vue'], resolve) }
-    }
-  ]
+  routes
 })
 
 router.beforeEach((to, from, next) => {

From 2bfcbfca14b70aa0b8077072d3b1aeb36eb47d2f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 16:43:16 +0800
Subject: [PATCH 50/78] no message

Former-commit-id: 5f223b53b51a8d9f894f37a9612c342f19889615
Former-commit-id: 5df5738648a32e0b3392791acec6de00aa16e191
Former-commit-id: 4463c63b487ea246ed4e86156c37c9ca0fd30ce1
---
 .../demo/plugins/js-cookie/{demo.vue => page.vue}    |  0
 .../demo/plugins/layout/{grid.vue => grid/page.vue}  |  0
 .../layout/{splitpane.vue => splitpane/page.vue}     |  0
 .../plugins/mock/{ajax.vue => pages/ajax/page.vue}   |  0
 .../plugins/mock/{demoDPD.vue => pages/dpd/page.vue} |  4 ++--
 .../plugins/mock/{demoDTD.vue => pages/dtd/page.vue} |  8 ++++----
 .../demo/plugins/timeago/{demo.vue => page.vue}      |  0
 .../vue-i18n/{demo-1.vue => pages/demo-1/page.vue}   |  4 ++--
 .../vue-i18n/{demo-2.vue => pages/demo-2/page.vue}   |  4 ++--
 .../plugins/vue-i18n/{doc.vue => pages/doc/page.vue} |  0
 src/router/index.js                                  | 12 +++++-------
 11 files changed, 15 insertions(+), 17 deletions(-)
 rename src/pages/demo/plugins/js-cookie/{demo.vue => page.vue} (100%)
 rename src/pages/demo/plugins/layout/{grid.vue => grid/page.vue} (100%)
 rename src/pages/demo/plugins/layout/{splitpane.vue => splitpane/page.vue} (100%)
 rename src/pages/demo/plugins/mock/{ajax.vue => pages/ajax/page.vue} (100%)
 rename src/pages/demo/plugins/mock/{demoDPD.vue => pages/dpd/page.vue} (90%)
 rename src/pages/demo/plugins/mock/{demoDTD.vue => pages/dtd/page.vue} (88%)
 rename src/pages/demo/plugins/timeago/{demo.vue => page.vue} (100%)
 rename src/pages/demo/plugins/vue-i18n/{demo-1.vue => pages/demo-1/page.vue} (72%)
 rename src/pages/demo/plugins/vue-i18n/{demo-2.vue => pages/demo-2/page.vue} (72%)
 rename src/pages/demo/plugins/vue-i18n/{doc.vue => pages/doc/page.vue} (100%)

diff --git a/src/pages/demo/plugins/js-cookie/demo.vue b/src/pages/demo/plugins/js-cookie/page.vue
similarity index 100%
rename from src/pages/demo/plugins/js-cookie/demo.vue
rename to src/pages/demo/plugins/js-cookie/page.vue
diff --git a/src/pages/demo/plugins/layout/grid.vue b/src/pages/demo/plugins/layout/grid/page.vue
similarity index 100%
rename from src/pages/demo/plugins/layout/grid.vue
rename to src/pages/demo/plugins/layout/grid/page.vue
diff --git a/src/pages/demo/plugins/layout/splitpane.vue b/src/pages/demo/plugins/layout/splitpane/page.vue
similarity index 100%
rename from src/pages/demo/plugins/layout/splitpane.vue
rename to src/pages/demo/plugins/layout/splitpane/page.vue
diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/pages/ajax/page.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/ajax.vue
rename to src/pages/demo/plugins/mock/pages/ajax/page.vue
diff --git a/src/pages/demo/plugins/mock/demoDPD.vue b/src/pages/demo/plugins/mock/pages/dpd/page.vue
similarity index 90%
rename from src/pages/demo/plugins/mock/demoDPD.vue
rename to src/pages/demo/plugins/mock/pages/dpd/page.vue
index 13625bbc..bc497f68 100644
--- a/src/pages/demo/plugins/mock/demoDPD.vue
+++ b/src/pages/demo/plugins/mock/pages/dpd/page.vue
@@ -23,10 +23,10 @@
 import Vue from 'vue'
 import clone from '@/utils/clone.js'
 import Mock from 'mockjs'
-import settingDPD from './data/settingDPD'
+import settingDPD from '../../data/settingDPD'
 export default {
   components: {
-    MockDemoCard: () => import('./components/MockDemoCard')
+    MockDemoCard: () => import('../../components/MockDemoCard')
   },
   data () {
     return {
diff --git a/src/pages/demo/plugins/mock/demoDTD.vue b/src/pages/demo/plugins/mock/pages/dtd/page.vue
similarity index 88%
rename from src/pages/demo/plugins/mock/demoDTD.vue
rename to src/pages/demo/plugins/mock/pages/dtd/page.vue
index e12b1598..cfcaaab6 100644
--- a/src/pages/demo/plugins/mock/demoDTD.vue
+++ b/src/pages/demo/plugins/mock/pages/dtd/page.vue
@@ -35,16 +35,16 @@
 import Vue from 'vue'
 import clone from '@/utils/clone.js'
 import Mock from 'mockjs'
-import settingDTD from './data/settingDTD'
-import regexp from './mixins/regexp'
-import fn from './mixins/function'
+import settingDTD from '../../data/settingDTD'
+import regexp from '../../mixins/regexp'
+import fn from '../../mixins/function'
 export default {
   mixins: [
     regexp,
     fn
   ],
   components: {
-    MockDemoCard: () => import('./components/MockDemoCard')
+    MockDemoCard: () => import('../../components/MockDemoCard')
   },
   data () {
     return {
diff --git a/src/pages/demo/plugins/timeago/demo.vue b/src/pages/demo/plugins/timeago/page.vue
similarity index 100%
rename from src/pages/demo/plugins/timeago/demo.vue
rename to src/pages/demo/plugins/timeago/page.vue
diff --git a/src/pages/demo/plugins/vue-i18n/demo-1.vue b/src/pages/demo/plugins/vue-i18n/pages/demo-1/page.vue
similarity index 72%
rename from src/pages/demo/plugins/vue-i18n/demo-1.vue
rename to src/pages/demo/plugins/vue-i18n/pages/demo-1/page.vue
index d5c471b7..15fca86e 100644
--- a/src/pages/demo/plugins/vue-i18n/demo-1.vue
+++ b/src/pages/demo/plugins/vue-i18n/pages/demo-1/page.vue
@@ -13,8 +13,8 @@
 <script>
 export default {
   components: {
-    DemoI18nControl: () => import('./components/DemoI18nControl'),
-    DemoI18n: () => import('./components/DemoI18n')
+    DemoI18nControl: () => import('../../components/DemoI18nControl'),
+    DemoI18n: () => import('../../components/DemoI18n')
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/vue-i18n/demo-2.vue b/src/pages/demo/plugins/vue-i18n/pages/demo-2/page.vue
similarity index 72%
rename from src/pages/demo/plugins/vue-i18n/demo-2.vue
rename to src/pages/demo/plugins/vue-i18n/pages/demo-2/page.vue
index 26f8e8a3..433d7a26 100644
--- a/src/pages/demo/plugins/vue-i18n/demo-2.vue
+++ b/src/pages/demo/plugins/vue-i18n/pages/demo-2/page.vue
@@ -13,8 +13,8 @@
 <script>
 export default {
   components: {
-    DemoI18nControl: () => import('./components/DemoI18nControl'),
-    DemoI18n: () => import('./components/DemoI18n')
+    DemoI18nControl: () => import('../../components/DemoI18nControl'),
+    DemoI18n: () => import('../../components/DemoI18n')
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/vue-i18n/doc.vue b/src/pages/demo/plugins/vue-i18n/pages/doc/page.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/doc.vue
rename to src/pages/demo/plugins/vue-i18n/pages/doc/page.vue
diff --git a/src/router/index.js b/src/router/index.js
index f4820d19..5dbd8b95 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,13 +43,11 @@ const routes = [
     meta: { requiresAuth: true },
     redirect: { name: 'demo-plugins-index' },
     component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-    children: [
-      ...maker({
-        publicPath: 'src/pages/demo/plugins/',
-        namePrefix: 'demo-plugins-',
-        req: require.context('@/pages/demo/plugins', true, /page\.vue$/)
-      })
-    ]
+    children: maker({
+      publicPath: 'src/pages/demo/plugins/',
+      namePrefix: 'demo-plugins-',
+      req: require.context('@/pages/demo/plugins', true, /page\.vue$/)
+    })
   },
   // 登陆
   {

From 9435094c2ce182dea80d494b8efe78dd2e9149a8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 16:49:46 +0800
Subject: [PATCH 51/78] no message

Former-commit-id: 3ddc6b946a9175477b3ae1fa65a614f8d8a8a32f
Former-commit-id: 992fdd1b38b5fb70473f35aeed4fa35e28b3a50d
Former-commit-id: b8bec1a1392c993541fca276be41fc981224badb
---
 src/pages/demo/plugins/export/{ => page}/table/page.vue         | 2 +-
 src/pages/demo/plugins/export/{ => page}/txt/page.vue           | 0
 src/pages/demo/plugins/mock/{pages => page}/ajax/page.vue       | 0
 src/pages/demo/plugins/mock/{pages => page}/dpd/page.vue        | 0
 src/pages/demo/plugins/mock/{pages => page}/dtd/page.vue        | 0
 src/pages/demo/plugins/vue-i18n/{pages => page}/demo-1/page.vue | 0
 src/pages/demo/plugins/vue-i18n/{pages => page}/demo-2/page.vue | 0
 src/pages/demo/plugins/vue-i18n/{pages => page}/doc/page.vue    | 0
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename src/pages/demo/plugins/export/{ => page}/table/page.vue (97%)
 rename src/pages/demo/plugins/export/{ => page}/txt/page.vue (100%)
 rename src/pages/demo/plugins/mock/{pages => page}/ajax/page.vue (100%)
 rename src/pages/demo/plugins/mock/{pages => page}/dpd/page.vue (100%)
 rename src/pages/demo/plugins/mock/{pages => page}/dtd/page.vue (100%)
 rename src/pages/demo/plugins/vue-i18n/{pages => page}/demo-1/page.vue (100%)
 rename src/pages/demo/plugins/vue-i18n/{pages => page}/demo-2/page.vue (100%)
 rename src/pages/demo/plugins/vue-i18n/{pages => page}/doc/page.vue (100%)

diff --git a/src/pages/demo/plugins/export/table/page.vue b/src/pages/demo/plugins/export/page/table/page.vue
similarity index 97%
rename from src/pages/demo/plugins/export/table/page.vue
rename to src/pages/demo/plugins/export/page/table/page.vue
index 5034f804..f92b9050 100644
--- a/src/pages/demo/plugins/export/table/page.vue
+++ b/src/pages/demo/plugins/export/page/table/page.vue
@@ -28,7 +28,7 @@
 
 <script>
 // 假数据
-import table from '../data'
+import table from '../../data'
 export default {
   data () {
     return {
diff --git a/src/pages/demo/plugins/export/txt/page.vue b/src/pages/demo/plugins/export/page/txt/page.vue
similarity index 100%
rename from src/pages/demo/plugins/export/txt/page.vue
rename to src/pages/demo/plugins/export/page/txt/page.vue
diff --git a/src/pages/demo/plugins/mock/pages/ajax/page.vue b/src/pages/demo/plugins/mock/page/ajax/page.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/pages/ajax/page.vue
rename to src/pages/demo/plugins/mock/page/ajax/page.vue
diff --git a/src/pages/demo/plugins/mock/pages/dpd/page.vue b/src/pages/demo/plugins/mock/page/dpd/page.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/pages/dpd/page.vue
rename to src/pages/demo/plugins/mock/page/dpd/page.vue
diff --git a/src/pages/demo/plugins/mock/pages/dtd/page.vue b/src/pages/demo/plugins/mock/page/dtd/page.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/pages/dtd/page.vue
rename to src/pages/demo/plugins/mock/page/dtd/page.vue
diff --git a/src/pages/demo/plugins/vue-i18n/pages/demo-1/page.vue b/src/pages/demo/plugins/vue-i18n/page/demo-1/page.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/pages/demo-1/page.vue
rename to src/pages/demo/plugins/vue-i18n/page/demo-1/page.vue
diff --git a/src/pages/demo/plugins/vue-i18n/pages/demo-2/page.vue b/src/pages/demo/plugins/vue-i18n/page/demo-2/page.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/pages/demo-2/page.vue
rename to src/pages/demo/plugins/vue-i18n/page/demo-2/page.vue
diff --git a/src/pages/demo/plugins/vue-i18n/pages/doc/page.vue b/src/pages/demo/plugins/vue-i18n/page/doc/page.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/pages/doc/page.vue
rename to src/pages/demo/plugins/vue-i18n/page/doc/page.vue

From 553aca1bed5f8d7ebb0a02b3fa26b0cca954a179 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 21:51:18 +0800
Subject: [PATCH 52/78] no message

Former-commit-id: 51a73357a11d97ff941f96c297774aac49ac291c
Former-commit-id: 653879dbb24327bcc91e527b1dd5912f35687905
Former-commit-id: ec823e48d8980f96110769dac049381801f71311
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..3dc5abc8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.css linguist-language=JavaScript
\ No newline at end of file

From a14baee380565dcac3bb0f5450baf463b76cdedb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 22:26:36 +0800
Subject: [PATCH 53/78] no message

Former-commit-id: dc499eab13a941f5df15225ceb69f5d8ec3a53e0
Former-commit-id: 399654c912e1dd74e3dc74c3d83ff54ee951c915
Former-commit-id: 96f20b3d9ecc1c68c8d39969c96e238bfbc2c1e5
---
 docs/zh/guide/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index bd4c1ccf..d71c350e 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -4,6 +4,11 @@ d2admin-vue-element（以下简称 d2admin）是一个管理系统前端模板
 
 [Github仓库](https://github.com/FairyEver/d2admin-vue-element) - [预览地址](http://d2admin.fairyever.com/)
 
+<div>
+  <iframe src="//ghbtns.com/github-btn.html?user=FairyEver&repo=d2admin-vue-element&type=star&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+  <iframe src="//ghbtns.com/github-btn.html?user=FairyEver&repo=d2admin-vue-element&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+</div>
+
 ::: tip
 因为现在集成了很多的插件和组件，首次加载会占用较多的时间，虽然已经做了首屏加载动画，还是建议您在发布的时候一定要删除没有用到的代码。比如项目没有用到图表，最好将集成的图表库以及封装的图表组件删除。
 :::

From cbd0d4ad901172b036c530c7cd7491dfadd02ad8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Jun 2018 23:23:21 +0800
Subject: [PATCH 54/78] no message

Former-commit-id: aef0ff656954651f3d6dd8c848bd5b46d4c47461
Former-commit-id: 0184274816e5752c46e34d311ec74b33b62db3dd
Former-commit-id: d11702041043ab73e832d66be5782a50665428be
---
 src/router/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 5dbd8b95..1478b5cd 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,8 +10,11 @@ Vue.use(VueRouter)
 
 const maker = ({publicPath, namePrefix, req}) => {
   return req.keys().map(req).map(page => {
-    const path = _replace(_path.dirname(page.default.__file), publicPath, '')
-    const name = namePrefix + path.split(_path.sep).join('-')
+    const pageRegExp = new RegExp(`${_path.sep}page${_path.sep}`, 'g')
+    const path = _path.dirname(page.default.__file)
+      .replace(publicPath, '')
+      .replace(pageRegExp, _path.sep)
+    const name = namePrefix + path.split(_path.sep).join('-').replace(/-page-/g, '-')
     return {
       path: `${path}${_get(page, 'router.pathSuffix', '')}`,
       name,

From 98db238d4d656c7db9b43f5ec801d0a9b5cbc1e8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 00:33:59 +0800
Subject: [PATCH 55/78] no message

Former-commit-id: 6632d3d9a62eb98d3c0a02b49511eba75d9a3a9f
Former-commit-id: b8858da8ff5ff9970f1dfbd0f5227f56f0ed6620
Former-commit-id: d196bd19b1bbd0340b97209d5a799efec8ed925c
---
 src/router/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index 1478b5cd..d894f659 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,8 @@ import _path from 'path'
 import _get from 'lodash.get'
 import _replace from 'lodash.replace'
 
+console.log(_path)
+
 Vue.use(VueRouter)
 
 const maker = ({publicPath, namePrefix, req}) => {

From 8d2442b403cc148fc9bdbfe3a3733354feafe520 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 00:49:39 +0800
Subject: [PATCH 56/78] no message

Former-commit-id: 6834a1ab45d50c74d4df660acc5ce5d0ac12ec9d
Former-commit-id: 0aeaa818124f2c3ab496f4cf3e051634912b2dc4
Former-commit-id: 9dee2e7b7f8f9925bf97bd2dea0bf9f917e98a3d
---
 package.json        |  1 +
 src/router/index.js | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c99ef7ce..cadbc22d 100755
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "mockjs": "^1.0.1-beta3",
     "papaparse": "^4.3.6",
     "particles.js": "^2.0.0",
+    "path-posix": "^1.0.0",
     "quill": "^1.3.4",
     "simplemde": "^1.11.2",
     "timeago.js": "^3.0.2",
diff --git a/src/router/index.js b/src/router/index.js
index d894f659..aa0678dc 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,21 +2,22 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
-import _path from 'path'
+// import _path from 'path'
+import _path2 from 'path-posix'
 import _get from 'lodash.get'
-import _replace from 'lodash.replace'
+// import _replace from 'lodash.replace'
 
-console.log(_path)
+console.log(_path2)
 
 Vue.use(VueRouter)
 
 const maker = ({publicPath, namePrefix, req}) => {
   return req.keys().map(req).map(page => {
-    const pageRegExp = new RegExp(`${_path.sep}page${_path.sep}`, 'g')
-    const path = _path.dirname(page.default.__file)
+    const pageRegExp = new RegExp(`${_path2.sep}page${_path2.sep}`, 'g')
+    const path = _path2.dirname(page.default.__file)
       .replace(publicPath, '')
-      .replace(pageRegExp, _path.sep)
-    const name = namePrefix + path.split(_path.sep).join('-').replace(/-page-/g, '-')
+      .replace(pageRegExp, _path2.sep)
+    const name = namePrefix + path.split(_path2.sep).join('-').replace(/-page-/g, '-')
     return {
       path: `${path}${_get(page, 'router.pathSuffix', '')}`,
       name,

From 2f1d15c9d040e338f65f67cbd8f84a94c552be5c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 08:30:23 +0800
Subject: [PATCH 57/78] no message

Former-commit-id: 32e0e64214d58085b176bfca82959f8a04d41398
Former-commit-id: 498d78d7d186903de338cc0b263f46d85e485629
Former-commit-id: b2e153d028516bdef01cb73d3f62637905e070a8
---
 src/router/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index aa0678dc..aa114c50 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,7 @@ console.log(_path2)
 
 Vue.use(VueRouter)
 
-const maker = ({publicPath, namePrefix, req}) => {
+const routesMaker = ({publicPath, namePrefix, req}) => {
   return req.keys().map(req).map(page => {
     const pageRegExp = new RegExp(`${_path2.sep}page${_path2.sep}`, 'g')
     const path = _path2.dirname(page.default.__file)
@@ -49,7 +49,7 @@ const routes = [
     meta: { requiresAuth: true },
     redirect: { name: 'demo-plugins-index' },
     component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-    children: maker({
+    children: routesMaker({
       publicPath: 'src/pages/demo/plugins/',
       namePrefix: 'demo-plugins-',
       req: require.context('@/pages/demo/plugins', true, /page\.vue$/)

From 51874a3684a1b6ebaa4f01427f42d83cd885273e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 12:23:58 +0800
Subject: [PATCH 58/78] no message

Former-commit-id: 895cafea1f1c52ad3c97240049df42d5cd4f6dc6
Former-commit-id: eab05166af79958b8a5b32cb9ddf9c7f92a51bba
Former-commit-id: 4566dbc077a417b4061f65fa0fed56f458529352
---
 src/router/index.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index aa114c50..3fd28476 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,12 +11,21 @@ console.log(_path2)
 
 Vue.use(VueRouter)
 
+const path2Posix = pathString => pathString.split(_path2.sep).join('/')
+
 const routesMaker = ({publicPath, namePrefix, req}) => {
   return req.keys().map(req).map(page => {
+    // 匹配 '/page/'(posix) 或者 '\page\'(win)
     const pageRegExp = new RegExp(`${_path2.sep}page${_path2.sep}`, 'g')
-    const path = _path2.dirname(page.default.__file)
-      .replace(publicPath, '')
-      .replace(pageRegExp, _path2.sep)
+    // 每个文件的路径
+    const pagePath = _path2.dirname(page.default.__file)
+    console.log('pagePath', pagePath)
+    // 每个文件的路径 => posix 风格
+    const pagePathPosix = path2Posix(pagePath)
+    console.log('pagePathPosix', pagePathPosix)
+    // 路由中使用的路径
+    const path = pagePathPosix.replace(publicPath, '').replace(pageRegExp, _path2.sep)
+    console.log('path', path)
     const name = namePrefix + path.split(_path2.sep).join('-').replace(/-page-/g, '-')
     return {
       path: `${path}${_get(page, 'router.pathSuffix', '')}`,

From 10f38bb1cf488d6fd4a942096ff30ac0e050983b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 12:26:44 +0800
Subject: [PATCH 59/78] no message

Former-commit-id: cffb2fc3fd9e4c732b4ec46adceafd6728df8d0f
Former-commit-id: 688946554293716950dd891134301f2253f8b465
Former-commit-id: ac5933f85b0e18d3f9781d4fb33cc6ab0e39912e
---
 src/router/index.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 3fd28476..9a920a94 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,30 +3,28 @@ import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
 // import _path from 'path'
-import _path2 from 'path-posix'
+import pathPosix from 'path-posix'
 import _get from 'lodash.get'
 // import _replace from 'lodash.replace'
 
-console.log(_path2)
+console.log(pathPosix)
 
 Vue.use(VueRouter)
 
-const path2Posix = pathString => pathString.split(_path2.sep).join('/')
+const path2Posix = pathString => pathString.split(pathPosix.sep).join('/')
 
 const routesMaker = ({publicPath, namePrefix, req}) => {
   return req.keys().map(req).map(page => {
-    // 匹配 '/page/'(posix) 或者 '\page\'(win)
-    const pageRegExp = new RegExp(`${_path2.sep}page${_path2.sep}`, 'g')
     // 每个文件的路径
-    const pagePath = _path2.dirname(page.default.__file)
+    const pagePath = pathPosix.dirname(page.default.__file)
     console.log('pagePath', pagePath)
     // 每个文件的路径 => posix 风格
     const pagePathPosix = path2Posix(pagePath)
     console.log('pagePathPosix', pagePathPosix)
     // 路由中使用的路径
-    const path = pagePathPosix.replace(publicPath, '').replace(pageRegExp, _path2.sep)
+    const path = pagePathPosix.replace(publicPath, '').replace(new RegExp(`${pathPosix.sep}page${pathPosix.sep}`, 'g'), pathPosix.sep)
     console.log('path', path)
-    const name = namePrefix + path.split(_path2.sep).join('-').replace(/-page-/g, '-')
+    const name = namePrefix + path.split(pathPosix.sep).join('-').replace(/-page-/g, '-')
     return {
       path: `${path}${_get(page, 'router.pathSuffix', '')}`,
       name,

From e156aafcd4fba13d2d6143b12d74828ce5afe92f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 12:55:28 +0800
Subject: [PATCH 60/78] no message

Former-commit-id: 6c80c45adf2541bf0956803ff39949bbc6ec7cf4
Former-commit-id: a771e6e5a312afbfd5f591990fcced7851cc32eb
Former-commit-id: cfe2dadb617e29d7ba9c6a4484a5426d47962b8f
---
 src/router/index.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 9a920a94..faa3af01 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,18 +11,17 @@ console.log(pathPosix)
 
 Vue.use(VueRouter)
 
-const path2Posix = pathString => pathString.split(pathPosix.sep).join('/')
+const win2posix = pathString => pathString.split('\\').join('/')
 
 const routesMaker = ({publicPath, namePrefix, req}) => {
   return req.keys().map(req).map(page => {
     // 每个文件的路径
-    const pagePath = pathPosix.dirname(page.default.__file)
+    const pagePath = pathPosix.dirname(win2posix(page.default.__file))
     console.log('pagePath', pagePath)
-    // 每个文件的路径 => posix 风格
-    const pagePathPosix = path2Posix(pagePath)
-    console.log('pagePathPosix', pagePathPosix)
     // 路由中使用的路径
-    const path = pagePathPosix.replace(publicPath, '').replace(new RegExp(`${pathPosix.sep}page${pathPosix.sep}`, 'g'), pathPosix.sep)
+    const path = pagePath
+      .replace(win2posix(publicPath), '')
+      .replace(new RegExp(`${pathPosix.sep}page${pathPosix.sep}`, 'g'), pathPosix.sep)
     console.log('path', path)
     const name = namePrefix + path.split(pathPosix.sep).join('-').replace(/-page-/g, '-')
     return {

From 757e98b8afb3baaa3848bface78e08ceb6dce717 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 16:30:15 +0800
Subject: [PATCH 61/78] no message

Former-commit-id: 22fae0ad73606b5319c746f8d7402f40f877323f
Former-commit-id: c99a7a6b58df8f94ea5e2fa307c749573afaed40
Former-commit-id: 1d09ca5cd06f82c003ce66b89d93a1796d0907cf
---
 src/router/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index faa3af01..1758adac 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,18 +11,15 @@ console.log(pathPosix)
 
 Vue.use(VueRouter)
 
-const win2posix = pathString => pathString.split('\\').join('/')
-
 const routesMaker = ({publicPath, namePrefix, req}) => {
+  const win2posix = pathString => pathString.split('\\').join('/')
   return req.keys().map(req).map(page => {
     // 每个文件的路径
     const pagePath = pathPosix.dirname(win2posix(page.default.__file))
-    console.log('pagePath', pagePath)
     // 路由中使用的路径
     const path = pagePath
       .replace(win2posix(publicPath), '')
       .replace(new RegExp(`${pathPosix.sep}page${pathPosix.sep}`, 'g'), pathPosix.sep)
-    console.log('path', path)
     const name = namePrefix + path.split(pathPosix.sep).join('-').replace(/-page-/g, '-')
     return {
       path: `${path}${_get(page, 'router.pathSuffix', '')}`,

From 9b6242880c73d227142c20dc5de95c2fd0800be5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 16:48:24 +0800
Subject: [PATCH 62/78] no message

Former-commit-id: 6185c94b46d245179a63103d2e51894b0ff69157
Former-commit-id: 629bdc548b88af8f9a6f355eac464ba3da67374f
Former-commit-id: f31fcf3e81e2e186f7fead2d33d2b77acf49e53e
---
 package.json        | 1 -
 src/router/index.js | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/package.json b/package.json
index cadbc22d..84dbbf7b 100755
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "highlight.js": "^9.12.0",
     "js-cookie": "^2.2.0",
     "lodash.get": "^4.4.2",
-    "lodash.replace": "^4.1.4",
     "marked": "^0.3.9",
     "mockjs": "^1.0.1-beta3",
     "papaparse": "^4.3.6",
diff --git a/src/router/index.js b/src/router/index.js
index 1758adac..ed916870 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,12 +2,8 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
-// import _path from 'path'
 import pathPosix from 'path-posix'
 import _get from 'lodash.get'
-// import _replace from 'lodash.replace'
-
-console.log(pathPosix)
 
 Vue.use(VueRouter)
 

From 64f1a1f9a47cf412336c9cd0da55f06bd4516b38 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 16:59:50 +0800
Subject: [PATCH 63/78] no message

Former-commit-id: 07e067f222534f69801f90f79963c9538b90c06a
Former-commit-id: c94da06568a016bb4e170d0ff998127d3be54f42
Former-commit-id: d87bed1fbda898cdbbd5f1e40f0a2306b08784ac
---
 src/router/index.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index ed916870..4a4a8844 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,20 +10,25 @@ Vue.use(VueRouter)
 const routesMaker = ({publicPath, namePrefix, req}) => {
   const win2posix = pathString => pathString.split('\\').join('/')
   return req.keys().map(req).map(page => {
-    // 每个文件的路径
+    // 每个文件的路径 已经转换为 posix
     const pagePath = pathPosix.dirname(win2posix(page.default.__file))
     // 路由中使用的路径
     const path = pagePath
       .replace(win2posix(publicPath), '')
-      .replace(new RegExp(`${pathPosix.sep}page${pathPosix.sep}`, 'g'), pathPosix.sep)
-    const name = namePrefix + path.split(pathPosix.sep).join('-').replace(/-page-/g, '-')
-    return {
+      .replace(new RegExp('/page/', 'g'), '/')
+    const name = `${namePrefix}${path.split('/').join('-')}`
+    const route = {
       path: `${path}${_get(page, 'router.pathSuffix', '')}`,
       name,
       ...page.router,
       meta: { requiresAuth: true },
       component: page.default
     }
+    console.log(JSON.stringify({
+      path: route.path,
+      name: route.name
+    }))
+    return route
   })
 }
 

From 51c2260e8fad52b724a7f24676e306e3a872b0b0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 22:42:53 +0800
Subject: [PATCH 64/78] no message

Former-commit-id: f3c11b2f64cc627044be20129050e193a8eec631
Former-commit-id: 49657d956a264020cda5ee3230870cf736197400
Former-commit-id: c3796afffe32e911c917133f2dc804cfe664acd7
---
 .../plugins/build/{page.vue => index.vue}     |  0
 .../{page.vue => index.vue}                   |  0
 .../export/{page/table/page.vue => table.vue} |  0
 .../export/{page/txt/page.vue => txt.vue}     |  0
 .../plugins/import/{csv/page.vue => csv.vue}  |  0
 .../import/{xlsx/page.vue => xlsx.vue}        |  0
 .../plugins/index/{page.vue => index.vue}     |  0
 .../plugins/js-cookie/{page.vue => index.vue} |  0
 .../layout/{grid/page.vue => grid.vue}        |  0
 .../{splitpane/page.vue => splitpane.vue}     |  0
 .../mock/{page/ajax/page.vue => ajax.vue}     |  0
 .../mock/{page/dpd/page.vue => dpd.vue}       |  0
 .../mock/{page/dtd/page.vue => dtd.vue}       |  0
 .../plugins/timeago/{page.vue => index.vue}   |  0
 .../{page/demo-1/page.vue => demo1.vue}       |  0
 .../{page/demo-2/page.vue => demo2.vue}       |  0
 .../vue-i18n/{page/doc/page.vue => doc.vue}   |  0
 src/router/index.js                           | 40 ++-----------------
 18 files changed, 4 insertions(+), 36 deletions(-)
 rename src/pages/demo/plugins/build/{page.vue => index.vue} (100%)
 rename src/pages/demo/plugins/clipboard-polyfill/{page.vue => index.vue} (100%)
 rename src/pages/demo/plugins/export/{page/table/page.vue => table.vue} (100%)
 rename src/pages/demo/plugins/export/{page/txt/page.vue => txt.vue} (100%)
 rename src/pages/demo/plugins/import/{csv/page.vue => csv.vue} (100%)
 rename src/pages/demo/plugins/import/{xlsx/page.vue => xlsx.vue} (100%)
 rename src/pages/demo/plugins/index/{page.vue => index.vue} (100%)
 rename src/pages/demo/plugins/js-cookie/{page.vue => index.vue} (100%)
 rename src/pages/demo/plugins/layout/{grid/page.vue => grid.vue} (100%)
 rename src/pages/demo/plugins/layout/{splitpane/page.vue => splitpane.vue} (100%)
 rename src/pages/demo/plugins/mock/{page/ajax/page.vue => ajax.vue} (100%)
 rename src/pages/demo/plugins/mock/{page/dpd/page.vue => dpd.vue} (100%)
 rename src/pages/demo/plugins/mock/{page/dtd/page.vue => dtd.vue} (100%)
 rename src/pages/demo/plugins/timeago/{page.vue => index.vue} (100%)
 rename src/pages/demo/plugins/vue-i18n/{page/demo-1/page.vue => demo1.vue} (100%)
 rename src/pages/demo/plugins/vue-i18n/{page/demo-2/page.vue => demo2.vue} (100%)
 rename src/pages/demo/plugins/vue-i18n/{page/doc/page.vue => doc.vue} (100%)

diff --git a/src/pages/demo/plugins/build/page.vue b/src/pages/demo/plugins/build/index.vue
similarity index 100%
rename from src/pages/demo/plugins/build/page.vue
rename to src/pages/demo/plugins/build/index.vue
diff --git a/src/pages/demo/plugins/clipboard-polyfill/page.vue b/src/pages/demo/plugins/clipboard-polyfill/index.vue
similarity index 100%
rename from src/pages/demo/plugins/clipboard-polyfill/page.vue
rename to src/pages/demo/plugins/clipboard-polyfill/index.vue
diff --git a/src/pages/demo/plugins/export/page/table/page.vue b/src/pages/demo/plugins/export/table.vue
similarity index 100%
rename from src/pages/demo/plugins/export/page/table/page.vue
rename to src/pages/demo/plugins/export/table.vue
diff --git a/src/pages/demo/plugins/export/page/txt/page.vue b/src/pages/demo/plugins/export/txt.vue
similarity index 100%
rename from src/pages/demo/plugins/export/page/txt/page.vue
rename to src/pages/demo/plugins/export/txt.vue
diff --git a/src/pages/demo/plugins/import/csv/page.vue b/src/pages/demo/plugins/import/csv.vue
similarity index 100%
rename from src/pages/demo/plugins/import/csv/page.vue
rename to src/pages/demo/plugins/import/csv.vue
diff --git a/src/pages/demo/plugins/import/xlsx/page.vue b/src/pages/demo/plugins/import/xlsx.vue
similarity index 100%
rename from src/pages/demo/plugins/import/xlsx/page.vue
rename to src/pages/demo/plugins/import/xlsx.vue
diff --git a/src/pages/demo/plugins/index/page.vue b/src/pages/demo/plugins/index/index.vue
similarity index 100%
rename from src/pages/demo/plugins/index/page.vue
rename to src/pages/demo/plugins/index/index.vue
diff --git a/src/pages/demo/plugins/js-cookie/page.vue b/src/pages/demo/plugins/js-cookie/index.vue
similarity index 100%
rename from src/pages/demo/plugins/js-cookie/page.vue
rename to src/pages/demo/plugins/js-cookie/index.vue
diff --git a/src/pages/demo/plugins/layout/grid/page.vue b/src/pages/demo/plugins/layout/grid.vue
similarity index 100%
rename from src/pages/demo/plugins/layout/grid/page.vue
rename to src/pages/demo/plugins/layout/grid.vue
diff --git a/src/pages/demo/plugins/layout/splitpane/page.vue b/src/pages/demo/plugins/layout/splitpane.vue
similarity index 100%
rename from src/pages/demo/plugins/layout/splitpane/page.vue
rename to src/pages/demo/plugins/layout/splitpane.vue
diff --git a/src/pages/demo/plugins/mock/page/ajax/page.vue b/src/pages/demo/plugins/mock/ajax.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/page/ajax/page.vue
rename to src/pages/demo/plugins/mock/ajax.vue
diff --git a/src/pages/demo/plugins/mock/page/dpd/page.vue b/src/pages/demo/plugins/mock/dpd.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/page/dpd/page.vue
rename to src/pages/demo/plugins/mock/dpd.vue
diff --git a/src/pages/demo/plugins/mock/page/dtd/page.vue b/src/pages/demo/plugins/mock/dtd.vue
similarity index 100%
rename from src/pages/demo/plugins/mock/page/dtd/page.vue
rename to src/pages/demo/plugins/mock/dtd.vue
diff --git a/src/pages/demo/plugins/timeago/page.vue b/src/pages/demo/plugins/timeago/index.vue
similarity index 100%
rename from src/pages/demo/plugins/timeago/page.vue
rename to src/pages/demo/plugins/timeago/index.vue
diff --git a/src/pages/demo/plugins/vue-i18n/page/demo-1/page.vue b/src/pages/demo/plugins/vue-i18n/demo1.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/page/demo-1/page.vue
rename to src/pages/demo/plugins/vue-i18n/demo1.vue
diff --git a/src/pages/demo/plugins/vue-i18n/page/demo-2/page.vue b/src/pages/demo/plugins/vue-i18n/demo2.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/page/demo-2/page.vue
rename to src/pages/demo/plugins/vue-i18n/demo2.vue
diff --git a/src/pages/demo/plugins/vue-i18n/page/doc/page.vue b/src/pages/demo/plugins/vue-i18n/doc.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/page/doc/page.vue
rename to src/pages/demo/plugins/vue-i18n/doc.vue
diff --git a/src/router/index.js b/src/router/index.js
index 4a4a8844..e0807f7f 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,36 +2,8 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
-import pathPosix from 'path-posix'
-import _get from 'lodash.get'
-
 Vue.use(VueRouter)
 
-const routesMaker = ({publicPath, namePrefix, req}) => {
-  const win2posix = pathString => pathString.split('\\').join('/')
-  return req.keys().map(req).map(page => {
-    // 每个文件的路径 已经转换为 posix
-    const pagePath = pathPosix.dirname(win2posix(page.default.__file))
-    // 路由中使用的路径
-    const path = pagePath
-      .replace(win2posix(publicPath), '')
-      .replace(new RegExp('/page/', 'g'), '/')
-    const name = `${namePrefix}${path.split('/').join('-')}`
-    const route = {
-      path: `${path}${_get(page, 'router.pathSuffix', '')}`,
-      name,
-      ...page.router,
-      meta: { requiresAuth: true },
-      component: page.default
-    }
-    console.log(JSON.stringify({
-      path: route.path,
-      name: route.name
-    }))
-    return route
-  })
-}
-
 const routes = [
   // 首页
   {
@@ -53,11 +25,9 @@ const routes = [
     meta: { requiresAuth: true },
     redirect: { name: 'demo-plugins-index' },
     component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-    children: routesMaker({
-      publicPath: 'src/pages/demo/plugins/',
-      namePrefix: 'demo-plugins-',
-      req: require.context('@/pages/demo/plugins', true, /page\.vue$/)
-    })
+    children: [
+
+    ]
   },
   // 登陆
   {
@@ -69,9 +39,7 @@ const routes = [
 
 console.log(routes)
 
-let router = new VueRouter({
-  routes
-})
+let router = new VueRouter({ routes })
 
 router.beforeEach((to, from, next) => {
   // 需要身份校验

From 4e0aab11c62465171c3cd7cdaba9dc3926ea2b72 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 23:00:11 +0800
Subject: [PATCH 65/78] no message

Former-commit-id: 55ad03d532809432bd6050a8ccd5d9d6263b86a1
Former-commit-id: 16d572604a68ec53fef6463ac90daabfe2e47dcd
Former-commit-id: 1e85541e8b96a001a4713bb92a16a434e739e6dc
---
 src/pages/demo/plugins/export/table.vue       |  2 +-
 .../components/DemoI18n.vue                   |  0
 .../components/DemoI18nControl.vue            |  0
 .../{vue-i18n => i18n}/components/lang.json   |  0
 .../demo/plugins/{vue-i18n => i18n}/demo1.vue |  4 +--
 .../demo/plugins/{vue-i18n => i18n}/demo2.vue |  4 +--
 .../demo/plugins/{vue-i18n => i18n}/doc.vue   |  0
 src/pages/demo/plugins/mock/dpd.vue           |  4 +--
 src/pages/demo/plugins/mock/dtd.vue           |  8 ++---
 src/router/index.js                           | 30 ++++++++++++++-----
 10 files changed, 34 insertions(+), 18 deletions(-)
 rename src/pages/demo/plugins/{vue-i18n => i18n}/components/DemoI18n.vue (100%)
 rename src/pages/demo/plugins/{vue-i18n => i18n}/components/DemoI18nControl.vue (100%)
 rename src/pages/demo/plugins/{vue-i18n => i18n}/components/lang.json (100%)
 rename src/pages/demo/plugins/{vue-i18n => i18n}/demo1.vue (72%)
 rename src/pages/demo/plugins/{vue-i18n => i18n}/demo2.vue (72%)
 rename src/pages/demo/plugins/{vue-i18n => i18n}/doc.vue (100%)

diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue
index f92b9050..1400cb68 100644
--- a/src/pages/demo/plugins/export/table.vue
+++ b/src/pages/demo/plugins/export/table.vue
@@ -28,7 +28,7 @@
 
 <script>
 // 假数据
-import table from '../../data'
+import table from './data'
 export default {
   data () {
     return {
diff --git a/src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue b/src/pages/demo/plugins/i18n/components/DemoI18n.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue
rename to src/pages/demo/plugins/i18n/components/DemoI18n.vue
diff --git a/src/pages/demo/plugins/vue-i18n/components/DemoI18nControl.vue b/src/pages/demo/plugins/i18n/components/DemoI18nControl.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/components/DemoI18nControl.vue
rename to src/pages/demo/plugins/i18n/components/DemoI18nControl.vue
diff --git a/src/pages/demo/plugins/vue-i18n/components/lang.json b/src/pages/demo/plugins/i18n/components/lang.json
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/components/lang.json
rename to src/pages/demo/plugins/i18n/components/lang.json
diff --git a/src/pages/demo/plugins/vue-i18n/demo1.vue b/src/pages/demo/plugins/i18n/demo1.vue
similarity index 72%
rename from src/pages/demo/plugins/vue-i18n/demo1.vue
rename to src/pages/demo/plugins/i18n/demo1.vue
index 15fca86e..d5c471b7 100644
--- a/src/pages/demo/plugins/vue-i18n/demo1.vue
+++ b/src/pages/demo/plugins/i18n/demo1.vue
@@ -13,8 +13,8 @@
 <script>
 export default {
   components: {
-    DemoI18nControl: () => import('../../components/DemoI18nControl'),
-    DemoI18n: () => import('../../components/DemoI18n')
+    DemoI18nControl: () => import('./components/DemoI18nControl'),
+    DemoI18n: () => import('./components/DemoI18n')
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/vue-i18n/demo2.vue b/src/pages/demo/plugins/i18n/demo2.vue
similarity index 72%
rename from src/pages/demo/plugins/vue-i18n/demo2.vue
rename to src/pages/demo/plugins/i18n/demo2.vue
index 433d7a26..26f8e8a3 100644
--- a/src/pages/demo/plugins/vue-i18n/demo2.vue
+++ b/src/pages/demo/plugins/i18n/demo2.vue
@@ -13,8 +13,8 @@
 <script>
 export default {
   components: {
-    DemoI18nControl: () => import('../../components/DemoI18nControl'),
-    DemoI18n: () => import('../../components/DemoI18n')
+    DemoI18nControl: () => import('./components/DemoI18nControl'),
+    DemoI18n: () => import('./components/DemoI18n')
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/vue-i18n/doc.vue b/src/pages/demo/plugins/i18n/doc.vue
similarity index 100%
rename from src/pages/demo/plugins/vue-i18n/doc.vue
rename to src/pages/demo/plugins/i18n/doc.vue
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index bc497f68..13625bbc 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -23,10 +23,10 @@
 import Vue from 'vue'
 import clone from '@/utils/clone.js'
 import Mock from 'mockjs'
-import settingDPD from '../../data/settingDPD'
+import settingDPD from './data/settingDPD'
 export default {
   components: {
-    MockDemoCard: () => import('../../components/MockDemoCard')
+    MockDemoCard: () => import('./components/MockDemoCard')
   },
   data () {
     return {
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index cfcaaab6..e12b1598 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -35,16 +35,16 @@
 import Vue from 'vue'
 import clone from '@/utils/clone.js'
 import Mock from 'mockjs'
-import settingDTD from '../../data/settingDTD'
-import regexp from '../../mixins/regexp'
-import fn from '../../mixins/function'
+import settingDTD from './data/settingDTD'
+import regexp from './mixins/regexp'
+import fn from './mixins/function'
 export default {
   mixins: [
     regexp,
     fn
   ],
   components: {
-    MockDemoCard: () => import('../../components/MockDemoCard')
+    MockDemoCard: () => import('./components/MockDemoCard')
   },
   data () {
     return {
diff --git a/src/router/index.js b/src/router/index.js
index e0807f7f..24b79f44 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,13 +9,13 @@ const routes = [
   {
     path: '/',
     redirect: { name: 'index' },
-    component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
+    component: () => import('@/components/core/MainLayout/index.vue'),
     children: [
       {
         path: 'index',
         name: 'index',
         meta: { requiresAuth: true },
-        component: resolve => { require(['@/pages/core/index/index.vue'], resolve) }
+        component: () => import('@/pages/core/index/index.vue')
       }
     ]
   },
@@ -24,16 +24,32 @@ const routes = [
     name: 'demo-plugins',
     meta: { requiresAuth: true },
     redirect: { name: 'demo-plugins-index' },
-    component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
-    children: [
-
-    ]
+    component: () => import('@/components/core/MainLayout/index.vue'),
+    children: ((pub) => [
+      { path: 'build', name: `${pub}build`, component: () => import('@/pages/demo/plugins/build/index.vue') },
+      { path: 'clipboard-polyfill', name: `${pub}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') },
+      { path: 'export/table', name: `${pub}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue') },
+      { path: 'export/txt', name: `${pub}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue') },
+      { path: 'i18n/demo1', name: `${pub}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue') },
+      { path: 'i18n/demo2', name: `${pub}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue') },
+      { path: 'i18n/doc', name: `${pub}i18n-doc`, component: () => import('@/pages/demo/plugins/i18n/doc.vue') },
+      { path: 'import/csv', name: `${pub}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue') },
+      { path: 'import/xlsx', name: `${pub}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue') },
+      { path: 'index', name: `${pub}index`, component: () => import('@/pages/demo/plugins/index/index.vue') },
+      { path: 'js-cookie', name: `${pub}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue') },
+      { path: 'layout/grid', name: `${pub}layout-grid`, component: () => import('@/pages/demo/plugins/layout/grid.vue') },
+      { path: 'layout/splitpane', name: `${pub}layout-splitpane`, component: () => import('@/pages/demo/plugins/layout/splitpane.vue') },
+      { path: 'mock/ajax', name: `${pub}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue') },
+      { path: 'mock/dpd', name: `${pub}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue') },
+      { path: 'mock/dtd', name: `${pub}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') },
+      { path: 'timeago', name: `${pub}timeago`, component: () => import('@/pages/demo/plugins/timeago/index.vue') }
+    ])('demo-plugins-')
   },
   // 登陆
   {
     path: '/login',
     name: 'login',
-    component: resolve => { require(['@/pages/core/login/index.vue'], resolve) }
+    component: () => import('@/pages/core/login/index.vue')
   }
 ]
 

From 40275cdfeea2f22f2d070a59e631da88b63a89a4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Jun 2018 23:02:52 +0800
Subject: [PATCH 66/78] no message

Former-commit-id: 9880fc57298c622096786d36830463b958d85846
Former-commit-id: ea1e0d3e477bbf86865d571fed4f85b66a8617de
Former-commit-id: 6fb03cf3201b1c82e85ad7455396561c1daace5b
---
 src/router/index.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 24b79f44..112d50f1 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,24 +25,24 @@ const routes = [
     meta: { requiresAuth: true },
     redirect: { name: 'demo-plugins-index' },
     component: () => import('@/components/core/MainLayout/index.vue'),
-    children: ((pub) => [
-      { path: 'build', name: `${pub}build`, component: () => import('@/pages/demo/plugins/build/index.vue') },
-      { path: 'clipboard-polyfill', name: `${pub}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') },
-      { path: 'export/table', name: `${pub}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue') },
-      { path: 'export/txt', name: `${pub}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue') },
-      { path: 'i18n/demo1', name: `${pub}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue') },
-      { path: 'i18n/demo2', name: `${pub}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue') },
-      { path: 'i18n/doc', name: `${pub}i18n-doc`, component: () => import('@/pages/demo/plugins/i18n/doc.vue') },
-      { path: 'import/csv', name: `${pub}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue') },
-      { path: 'import/xlsx', name: `${pub}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue') },
-      { path: 'index', name: `${pub}index`, component: () => import('@/pages/demo/plugins/index/index.vue') },
-      { path: 'js-cookie', name: `${pub}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue') },
-      { path: 'layout/grid', name: `${pub}layout-grid`, component: () => import('@/pages/demo/plugins/layout/grid.vue') },
-      { path: 'layout/splitpane', name: `${pub}layout-splitpane`, component: () => import('@/pages/demo/plugins/layout/splitpane.vue') },
-      { path: 'mock/ajax', name: `${pub}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue') },
-      { path: 'mock/dpd', name: `${pub}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue') },
-      { path: 'mock/dtd', name: `${pub}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') },
-      { path: 'timeago', name: `${pub}timeago`, component: () => import('@/pages/demo/plugins/timeago/index.vue') }
+    children: ((pre) => [
+      { path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue') },
+      { path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') },
+      { path: 'export/table', name: `${pre}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue') },
+      { path: 'export/txt', name: `${pre}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue') },
+      { path: 'i18n/demo1', name: `${pre}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue') },
+      { path: 'i18n/demo2', name: `${pre}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue') },
+      { path: 'i18n/doc', name: `${pre}i18n-doc`, component: () => import('@/pages/demo/plugins/i18n/doc.vue') },
+      { path: 'import/csv', name: `${pre}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue') },
+      { path: 'import/xlsx', name: `${pre}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue') },
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/plugins/index/index.vue') },
+      { path: 'js-cookie', name: `${pre}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue') },
+      { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/plugins/layout/grid.vue') },
+      { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/plugins/layout/splitpane.vue') },
+      { path: 'mock/ajax', name: `${pre}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue') },
+      { path: 'mock/dpd', name: `${pre}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue') },
+      { path: 'mock/dtd', name: `${pre}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') },
+      { path: 'timeago', name: `${pre}timeago`, component: () => import('@/pages/demo/plugins/timeago/index.vue') }
     ])('demo-plugins-')
   },
   // 登陆

From f6020167ad4c94f8f7c71a36e6136141446c9d95 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 8 Jun 2018 23:52:13 +0800
Subject: [PATCH 67/78] no message

Former-commit-id: f0207a1b3d4a0b29e414db4e6b7162631f0521ca
Former-commit-id: 6c35c139c51e3077b285c7b2e7c64c197d5165f4
Former-commit-id: 082fdb8222ff834150dee83fbf18d2a3b5369003
---
 docs/zh/guide/change-log.md                   |  3 +
 .../components/HeaderMenu/index.vue           | 50 +-----------
 src/menu/index.js                             | 79 +++++++++++++++++++
 src/pages/demo/components/container/index.vue |  6 --
 .../countup/{demo.vue => index.vue}           |  0
 .../quill/demo.vue => editor-quill/index.vue} |  0
 .../{editor/quill => editor-quill}/value.js   |  0
 .../demo.vue => editor-simpleMDE/index.vue}   |  0
 .../simpleMDE => editor-simpleMDE}/text.js    |  0
 .../highlight/{demo.vue => index.vue}         |  0
 src/pages/demo/components/markdown/doc.vue    |  9 ---
 .../markdown/{demo.vue => index.vue}          |  0
 src/pages/demo/plugins/i18n/doc.vue           | 10 ---
 src/router/index.js                           | 27 ++++++-
 14 files changed, 109 insertions(+), 75 deletions(-)
 create mode 100644 src/menu/index.js
 delete mode 100644 src/pages/demo/components/container/index.vue
 rename src/pages/demo/components/countup/{demo.vue => index.vue} (100%)
 rename src/pages/demo/components/{editor/quill/demo.vue => editor-quill/index.vue} (100%)
 rename src/pages/demo/components/{editor/quill => editor-quill}/value.js (100%)
 rename src/pages/demo/components/{editor/simpleMDE/demo.vue => editor-simpleMDE/index.vue} (100%)
 rename src/pages/demo/components/{editor/simpleMDE => editor-simpleMDE}/text.js (100%)
 rename src/pages/demo/components/highlight/{demo.vue => index.vue} (100%)
 delete mode 100644 src/pages/demo/components/markdown/doc.vue
 rename src/pages/demo/components/markdown/{demo.vue => index.vue} (100%)
 delete mode 100644 src/pages/demo/plugins/i18n/doc.vue

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 445d28cd..a47b5d70 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -6,6 +6,9 @@
 这是正在开发的版本，还没有正式发布
 :::
 
+* [ 修改 ] 顶栏和侧边栏菜单新的结构生成方式，新的方案使用 `数据` + `递归组件` 实现无限制多级菜单
+* [ 修改 ] 路由注册回归最简单的写法
+
 ## v1.0.0
 
 [https://github.com/FairyEver/d2admin-vue-element/releases/tag/v1.0.0](https://github.com/FairyEver/d2admin-vue-element/releases/tag/v1.0.0)
diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
index 45b9c8ad..ee54407b 100644
--- a/src/components/core/MainLayout/components/HeaderMenu/index.vue
+++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue
@@ -10,6 +10,7 @@
 </template>
 
 <script>
+import menus from '@/menu/index.js'
 export default {
   name: 'HeaderMenu',
   components: {
@@ -18,54 +19,7 @@ export default {
   },
   data () {
     return {
-      menus: [
-        {
-          path: '/index',
-          title: '首页'
-        },
-        {
-          path: '/demo',
-          title: '功能',
-          children: [
-            {
-              path: '/demo/plugins',
-              title: '插件',
-              icon: 'plug'
-            },
-            {
-              path: '/demo/components',
-              title: '组件',
-              icon: 'puzzle-piece'
-            },
-            {
-              path: '/demo/chart',
-              title: '图表',
-              icon: 'pie-chart',
-              children: [
-                {
-                  path: '/demo/plugins',
-                  title: '插件',
-                  icon: 'plug'
-                },
-                {
-                  path: '/demo/components',
-                  title: '组件',
-                  icon: 'puzzle-piece'
-                },
-                {
-                  path: '/demo/chart',
-                  title: '图表',
-                  icon: 'pie-chart'
-                }
-              ]
-            }
-          ]
-        },
-        {
-          path: '/demo/business',
-          title: '示例业务界面'
-        }
-      ]
+      menus
     }
   }
 }
diff --git a/src/menu/index.js b/src/menu/index.js
new file mode 100644
index 00000000..c3fa639b
--- /dev/null
+++ b/src/menu/index.js
@@ -0,0 +1,79 @@
+export default [
+  {
+    path: '/index',
+    title: '首页'
+  },
+  {
+    path: '/demo',
+    title: '功能',
+    children: [
+      {
+        path: '/demo/plugins',
+        title: '插件',
+        icon: 'plug',
+        children: ((pre) => [
+          { path: `${pre}index`, title: '插件首页' },
+          { path: `${pre}build`, title: '环境区分' },
+          { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
+          {
+            path: `${pre}export`,
+            title: '导出',
+            children: [
+              { path: `${pre}export/table`, title: '表格' },
+              { path: `${pre}export/txt`, title: '文本' }
+            ]
+          },
+          {
+            path: `${pre}i18n`,
+            title: '多国语',
+            children: [
+              { path: `${pre}i18n/demo1`, title: '示例1' },
+              { path: `${pre}i18n/demo2`, title: '示例2' }
+            ]
+          },
+          {
+            path: `${pre}import`,
+            title: '导入',
+            children: [
+              { path: `${pre}import/csv`, title: 'csv' },
+              { path: `${pre}import/xlsx`, title: 'xlsx' }
+            ]
+          },
+          { path: `${pre}js-cookie`, title: 'title' },
+          {
+            path: `${pre}layout`,
+            title: '布局',
+            children: [
+              { path: `${pre}layout/grid`, title: '可拖动卡片' },
+              { path: `${pre}layout/splitpane`, title: '分割面板' }
+            ]
+          },
+          {
+            path: `${pre}mock`,
+            title: '布局',
+            children: [
+              { path: `${pre}mock/ajax`, title: '拦截异步请求' },
+              { path: `${pre}mock/dpd`, title: 'DPD规则' },
+              { path: `${pre}mock/dtd`, title: 'DTD规则' }
+            ]
+          },
+          { path: `${pre}timeago`, title: '计算已经过去的时间' }
+        ])('/demo/plugins/')
+      },
+      {
+        path: '/demo/components',
+        title: '组件',
+        icon: 'puzzle-piece'
+      },
+      {
+        path: '/demo/chart',
+        title: '图表',
+        icon: 'pie-chart'
+      }
+    ]
+  },
+  {
+    path: '/demo/business',
+    title: '示例业务界面'
+  }
+]
diff --git a/src/pages/demo/components/container/index.vue b/src/pages/demo/components/container/index.vue
deleted file mode 100644
index 3be25510..00000000
--- a/src/pages/demo/components/container/index.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template>
-  <Container>
-    <template slot="header">页面容器组件 文档</template>
-    <Markdown url="/static/md/组件 - 页面容器.md"></Markdown>
-  </Container>
-</template>
diff --git a/src/pages/demo/components/countup/demo.vue b/src/pages/demo/components/countup/index.vue
similarity index 100%
rename from src/pages/demo/components/countup/demo.vue
rename to src/pages/demo/components/countup/index.vue
diff --git a/src/pages/demo/components/editor/quill/demo.vue b/src/pages/demo/components/editor-quill/index.vue
similarity index 100%
rename from src/pages/demo/components/editor/quill/demo.vue
rename to src/pages/demo/components/editor-quill/index.vue
diff --git a/src/pages/demo/components/editor/quill/value.js b/src/pages/demo/components/editor-quill/value.js
similarity index 100%
rename from src/pages/demo/components/editor/quill/value.js
rename to src/pages/demo/components/editor-quill/value.js
diff --git a/src/pages/demo/components/editor/simpleMDE/demo.vue b/src/pages/demo/components/editor-simpleMDE/index.vue
similarity index 100%
rename from src/pages/demo/components/editor/simpleMDE/demo.vue
rename to src/pages/demo/components/editor-simpleMDE/index.vue
diff --git a/src/pages/demo/components/editor/simpleMDE/text.js b/src/pages/demo/components/editor-simpleMDE/text.js
similarity index 100%
rename from src/pages/demo/components/editor/simpleMDE/text.js
rename to src/pages/demo/components/editor-simpleMDE/text.js
diff --git a/src/pages/demo/components/highlight/demo.vue b/src/pages/demo/components/highlight/index.vue
similarity index 100%
rename from src/pages/demo/components/highlight/demo.vue
rename to src/pages/demo/components/highlight/index.vue
diff --git a/src/pages/demo/components/markdown/doc.vue b/src/pages/demo/components/markdown/doc.vue
deleted file mode 100644
index e83493d8..00000000
--- a/src/pages/demo/components/markdown/doc.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <Container>
-    <PageHeader
-      slot="header"
-      title="文档">
-    </PageHeader>
-    <markdown url="/static/md/组件 - markdown - 文档.md"></markdown>
-  </Container>
-</template>
\ No newline at end of file
diff --git a/src/pages/demo/components/markdown/demo.vue b/src/pages/demo/components/markdown/index.vue
similarity index 100%
rename from src/pages/demo/components/markdown/demo.vue
rename to src/pages/demo/components/markdown/index.vue
diff --git a/src/pages/demo/plugins/i18n/doc.vue b/src/pages/demo/plugins/i18n/doc.vue
deleted file mode 100644
index 27c8f52c..00000000
--- a/src/pages/demo/plugins/i18n/doc.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-  <Container>
-    <PageHeader
-      slot="header"
-      title="使用方法"
-      url="http://kazupon.github.io/vue-i18n/en/">
-    </PageHeader>
-    <Markdown url="/static/md/插件 - 多国语.md"></Markdown>
-  </Container>
-</template>
diff --git a/src/router/index.js b/src/router/index.js
index 112d50f1..355e133e 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,6 +19,28 @@ const routes = [
       }
     ]
   },
+  {
+    path: '/demo/components',
+    name: 'demo-components',
+    meta: { requiresAuth: true },
+    redirect: { name: 'demo-components-index' },
+    component: () => import('@/components/core/MainLayout/index.vue'),
+    children: ((pre) => [
+      { path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue') },
+      { path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue') },
+      { path: 'container/normal', name: `${pre}container-normal`, component: () => import('@/pages/demo/components/container/normal.vue') },
+      { path: 'countup', name: `${pre}countup`, component: () => import('@/pages/demo/components/countup/index.vue') },
+      { path: 'editor-quill', name: `${pre}editor-quill`, component: () => import('@/pages/demo/components/editor-quill/index.vue') },
+      { path: 'editor-simpleMDE', name: `${pre}editor-simpleMDE`, component: () => import('@/pages/demo/components/editor-simpleMDE/index.vue') },
+      { path: 'highlight', name: `${pre}highlight`, component: () => import('@/pages/demo/components/highlight/index.vue') },
+      { path: 'icon/icon', name: `${pre}icon-icon`, component: () => import('@/pages/demo/components/icon/icon.vue') },
+      { path: 'icon/list', name: `${pre}icon-list`, component: () => import('@/pages/demo/components/icon/list.vue') },
+      { path: 'icon/select', name: `${pre}icon-select`, component: () => import('@/pages/demo/components/icon/select.vue') },
+      { path: 'icon/svg', name: `${pre}icon-svg`, component: () => import('@/pages/demo/components/icon/svg.vue') },
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/components/index/index.vue') },
+      { path: 'markdown', name: `${pre}markdown`, component: () => import('@/pages/demo/components/markdown/index.vue') }
+    ])('demo-components-')
+  },
   {
     path: '/demo/plugins',
     name: 'demo-plugins',
@@ -32,7 +54,6 @@ const routes = [
       { path: 'export/txt', name: `${pre}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue') },
       { path: 'i18n/demo1', name: `${pre}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue') },
       { path: 'i18n/demo2', name: `${pre}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue') },
-      { path: 'i18n/doc', name: `${pre}i18n-doc`, component: () => import('@/pages/demo/plugins/i18n/doc.vue') },
       { path: 'import/csv', name: `${pre}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue') },
       { path: 'import/xlsx', name: `${pre}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue') },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/plugins/index/index.vue') },
@@ -53,7 +74,9 @@ const routes = [
   }
 ]
 
-console.log(routes)
+routes[2].children.forEach(e => {
+  console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`)
+})
 
 let router = new VueRouter({ routes })
 

From 1d3f8b0deacb0a3d749714f43d3406628511d627 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 19:29:47 +0800
Subject: [PATCH 68/78] no message

Former-commit-id: 4ff959864c27386d2341886771f701e63c0672f8
Former-commit-id: 38cb84d340e9e94f14d535de64f98f237d85ecc9
Former-commit-id: 8083bbb37a37f8e281ab331c87cf40d0837b9a0d
---
 src/menu/index.js                             | 85 ++++++++++++-------
 .../{plugins => components}/layout/grid.vue   |  0
 .../layout/splitpane.vue                      |  0
 src/router/index.js                           |  6 +-
 4 files changed, 59 insertions(+), 32 deletions(-)
 rename src/pages/demo/{plugins => components}/layout/grid.vue (100%)
 rename src/pages/demo/{plugins => components}/layout/splitpane.vue (100%)

diff --git a/src/menu/index.js b/src/menu/index.js
index c3fa639b..e6feab07 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -13,8 +13,23 @@ export default [
         icon: 'plug',
         children: ((pre) => [
           { path: `${pre}index`, title: '插件首页' },
-          { path: `${pre}build`, title: '环境区分' },
-          { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
+          {
+            path: `${pre}mock`,
+            title: '模拟数据',
+            children: [
+              { path: `${pre}mock/ajax`, title: '拦截异步请求' },
+              { path: `${pre}mock/dpd`, title: 'DPD规则' },
+              { path: `${pre}mock/dtd`, title: 'DTD规则' }
+            ]
+          },
+          {
+            path: `${pre}import`,
+            title: '导入',
+            children: [
+              { path: `${pre}import/csv`, title: 'csv' },
+              { path: `${pre}import/xlsx`, title: 'xlsx' }
+            ]
+          },
           {
             path: `${pre}export`,
             title: '导出',
@@ -31,39 +46,51 @@ export default [
               { path: `${pre}i18n/demo2`, title: '示例2' }
             ]
           },
-          {
-            path: `${pre}import`,
-            title: '导入',
-            children: [
-              { path: `${pre}import/csv`, title: 'csv' },
-              { path: `${pre}import/xlsx`, title: 'xlsx' }
-            ]
-          },
-          { path: `${pre}js-cookie`, title: 'title' },
-          {
-            path: `${pre}layout`,
-            title: '布局',
-            children: [
-              { path: `${pre}layout/grid`, title: '可拖动卡片' },
-              { path: `${pre}layout/splitpane`, title: '分割面板' }
-            ]
-          },
-          {
-            path: `${pre}mock`,
-            title: '布局',
-            children: [
-              { path: `${pre}mock/ajax`, title: '拦截异步请求' },
-              { path: `${pre}mock/dpd`, title: 'DPD规则' },
-              { path: `${pre}mock/dtd`, title: 'DTD规则' }
-            ]
-          },
+          { path: `${pre}build`, title: '环境区分' },
+          { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
+          { path: `${pre}js-cookie`, title: 'cookie读写' },
           { path: `${pre}timeago`, title: '计算已经过去的时间' }
         ])('/demo/plugins/')
       },
       {
         path: '/demo/components',
         title: '组件',
-        icon: 'puzzle-piece'
+        icon: 'puzzle-piece',
+        children: ((pre) => [
+          { path: `${pre}index`, title: '组件首页' },
+          {
+            path: `${pre}container`,
+            title: '布局容器',
+            children: [
+              { path: `${pre}container/full`, title: '填满' },
+              { path: `${pre}container/ghost`, title: '隐形' },
+              { path: `${pre}container/normal`, title: '一般' }
+            ]
+          },
+          {
+            path: `${pre}layout/grid`,
+            title: '高级布局',
+            children: [
+              { path: `${pre}layout/grid`, title: 'title' },
+              { path: `${pre}layout/splitpane`, title: 'title' }
+            ]
+          },
+          {
+            path: `${pre}icon`,
+            title: '图标',
+            children: [
+              { path: `${pre}icon/icon`, title: '图标组件' },
+              { path: `${pre}icon/list`, title: 'FontAwesome' },
+              { path: `${pre}icon/select`, title: '图标选择器' },
+              { path: `${pre}icon/svg`, title: 'SVG图标组件' }
+            ]
+          },
+          { path: `${pre}countup`, title: '数字动画' },
+          { path: `${pre}editor-quill`, title: '富文本编辑器' },
+          { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' },
+          { path: `${pre}highlight`, title: '代码高亮显示' },
+          { path: `${pre}markdown`, title: 'markdown解析' }
+        ])('/demo/components/')
       },
       {
         path: '/demo/chart',
diff --git a/src/pages/demo/plugins/layout/grid.vue b/src/pages/demo/components/layout/grid.vue
similarity index 100%
rename from src/pages/demo/plugins/layout/grid.vue
rename to src/pages/demo/components/layout/grid.vue
diff --git a/src/pages/demo/plugins/layout/splitpane.vue b/src/pages/demo/components/layout/splitpane.vue
similarity index 100%
rename from src/pages/demo/plugins/layout/splitpane.vue
rename to src/pages/demo/components/layout/splitpane.vue
diff --git a/src/router/index.js b/src/router/index.js
index 355e133e..b59f112d 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -38,6 +38,8 @@ const routes = [
       { path: 'icon/select', name: `${pre}icon-select`, component: () => import('@/pages/demo/components/icon/select.vue') },
       { path: 'icon/svg', name: `${pre}icon-svg`, component: () => import('@/pages/demo/components/icon/svg.vue') },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/components/index/index.vue') },
+      { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/components/layout/grid.vue') },
+      { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/components/layout/splitpane.vue') },
       { path: 'markdown', name: `${pre}markdown`, component: () => import('@/pages/demo/components/markdown/index.vue') }
     ])('demo-components-')
   },
@@ -58,8 +60,6 @@ const routes = [
       { path: 'import/xlsx', name: `${pre}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue') },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/plugins/index/index.vue') },
       { path: 'js-cookie', name: `${pre}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue') },
-      { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/plugins/layout/grid.vue') },
-      { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/plugins/layout/splitpane.vue') },
       { path: 'mock/ajax', name: `${pre}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue') },
       { path: 'mock/dpd', name: `${pre}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue') },
       { path: 'mock/dtd', name: `${pre}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') },
@@ -74,7 +74,7 @@ const routes = [
   }
 ]
 
-routes[2].children.forEach(e => {
+routes[1].children.forEach(e => {
   console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`)
 })
 

From 9b1be08fc6fabfbe92d5ef14e3d4f4c73e51c7f6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 20:00:01 +0800
Subject: [PATCH 69/78] no message

Former-commit-id: b246e06820042d5f145172f16cfe18e69627a9e2
Former-commit-id: 158136e0584bf7e629f180becbae797520184f4b
Former-commit-id: 9b9f374a2db074133d1d7c2d66e3a8fe6b137f68
---
 src/menu/index.js   | 25 ++++++++++++++++++++++---
 src/router/index.js | 26 +++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/menu/index.js b/src/menu/index.js
index e6feab07..54ace6da 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -11,7 +11,7 @@ export default [
         path: '/demo/plugins',
         title: '插件',
         icon: 'plug',
-        children: ((pre) => [
+        children: (pre => [
           { path: `${pre}index`, title: '插件首页' },
           {
             path: `${pre}mock`,
@@ -56,7 +56,7 @@ export default [
         path: '/demo/components',
         title: '组件',
         icon: 'puzzle-piece',
-        children: ((pre) => [
+        children: (pre => [
           { path: `${pre}index`, title: '组件首页' },
           {
             path: `${pre}container`,
@@ -95,7 +95,26 @@ export default [
       {
         path: '/demo/chart',
         title: '图表',
-        icon: 'pie-chart'
+        icon: 'pie-chart',
+        children: (pre => [
+          { path: `${pre}index`, title: '图表首页' },
+          {
+            path: `${pre}demo`,
+            title: '单图示例',
+            children: [
+              { path: `${pre}demo/areaBase`, title: '区域折线图' },
+              { path: `${pre}demo/barBase`, title: '条形图' },
+              { path: `${pre}demo/columnBase`, title: '柱形图' },
+              { path: `${pre}demo/lineBase`, title: '折线图' },
+              { path: `${pre}demo/lineStep`, title: '阶梯折线图' },
+              { path: `${pre}demo/nightingaleRoseBase`, title: '南丁格尔玫瑰图' },
+              { path: `${pre}demo/PieBase`, title: '饼图' },
+              { path: `${pre}demo/radarBase`, title: '雷达图' }
+            ]
+          },
+          { path: `${pre}all`, title: '示例' },
+          { path: `${pre}dynamicSize`, title: '动态尺寸与可拖拽' }
+        ])('/demo/chart/')
       }
     ]
   },
diff --git a/src/router/index.js b/src/router/index.js
index b59f112d..4fbfdf79 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,7 +25,7 @@ const routes = [
     meta: { requiresAuth: true },
     redirect: { name: 'demo-components-index' },
     component: () => import('@/components/core/MainLayout/index.vue'),
-    children: ((pre) => [
+    children: (pre => [
       { path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue') },
       { path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue') },
       { path: 'container/normal', name: `${pre}container-normal`, component: () => import('@/pages/demo/components/container/normal.vue') },
@@ -49,7 +49,7 @@ const routes = [
     meta: { requiresAuth: true },
     redirect: { name: 'demo-plugins-index' },
     component: () => import('@/components/core/MainLayout/index.vue'),
-    children: ((pre) => [
+    children: (pre => [
       { path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue') },
       { path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') },
       { path: 'export/table', name: `${pre}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue') },
@@ -66,6 +66,26 @@ const routes = [
       { path: 'timeago', name: `${pre}timeago`, component: () => import('@/pages/demo/plugins/timeago/index.vue') }
     ])('demo-plugins-')
   },
+  {
+    path: '/demo/chart',
+    name: 'demo-chart',
+    meta: { requiresAuth: true },
+    redirect: { name: 'demo-chart-index' },
+    component: () => import('@/components/core/MainLayout/index.vue'),
+    children: (pre => [
+      { path: 'all', name: `${pre}all`, component: () => import('@/pages/demo/chart/all/index.vue') },
+      { path: 'demo/areaBase', name: `${pre}demo-areaBase`, component: () => import('@/pages/demo/chart/demo/areaBase.vue') },
+      { path: 'demo/barBase', name: `${pre}demo-barBase`, component: () => import('@/pages/demo/chart/demo/barBase.vue') },
+      { path: 'demo/columnBase', name: `${pre}demo-columnBase`, component: () => import('@/pages/demo/chart/demo/columnBase.vue') },
+      { path: 'demo/lineBase', name: `${pre}demo-lineBase`, component: () => import('@/pages/demo/chart/demo/lineBase.vue') },
+      { path: 'demo/lineStep', name: `${pre}demo-lineStep`, component: () => import('@/pages/demo/chart/demo/lineStep.vue') },
+      { path: 'demo/nightingaleRoseBase', name: `${pre}demo-nightingaleRoseBase`, component: () => import('@/pages/demo/chart/demo/nightingaleRoseBase.vue') },
+      { path: 'demo/PieBase', name: `${pre}demo-PieBase`, component: () => import('@/pages/demo/chart/demo/PieBase.vue') },
+      { path: 'demo/radarBase', name: `${pre}demo-radarBase`, component: () => import('@/pages/demo/chart/demo/radarBase.vue') },
+      { path: 'dynamicSize', name: `${pre}dynamicSize`, component: () => import('@/pages/demo/chart/dynamicSize/index.vue') },
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/chart/index/index.vue') }
+    ])('demo-chart-')
+  },
   // 登陆
   {
     path: '/login',
@@ -74,7 +94,7 @@ const routes = [
   }
 ]
 
-routes[1].children.forEach(e => {
+routes[3].children.forEach(e => {
   console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`)
 })
 

From 23219fd89e17300c9abbfe7020f59b7284cb809c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 20:00:54 +0800
Subject: [PATCH 70/78] no message

Former-commit-id: 38ef616f6307c8ba8a0666b20fe57b854d91e0ef
Former-commit-id: 81c9732a93d3b378df1d4064d04722ee947d0eb9
Former-commit-id: 2ef88ff32fdd43d8a10edb42e3fd3a157838b31b
---
 src/menu/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/menu/index.js b/src/menu/index.js
index 54ace6da..526dc59d 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -71,8 +71,8 @@ export default [
             path: `${pre}layout/grid`,
             title: '高级布局',
             children: [
-              { path: `${pre}layout/grid`, title: 'title' },
-              { path: `${pre}layout/splitpane`, title: 'title' }
+              { path: `${pre}layout/grid`, title: '拖拽位置和大小' },
+              { path: `${pre}layout/splitpane`, title: '区域划分' }
             ]
           },
           {

From 1c5367c9801f11ba4f31978c5f32f42f5377543a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 20:35:03 +0800
Subject: [PATCH 71/78] no message

Former-commit-id: e81e8cc565dd5a6bfcc82dc96d195173f97ee9b0
Former-commit-id: b24482b830a621e4ea601bad8a5e2346327fd4de
Former-commit-id: 6f67dfb78ba352529970effc9515f84d26a75f85
---
 src/router/index.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index 4fbfdf79..c848cdc1 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -86,6 +86,16 @@ const routes = [
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/chart/index/index.vue') }
     ])('demo-chart-')
   },
+  {
+    path: '/demo/business',
+    name: 'demo-business',
+    meta: { requiresAuth: true },
+    redirect: { name: 'demo-business-index' },
+    component: () => import('@/components/core/MainLayout/index.vue'),
+    children: (pre => [
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index/index.vue') }
+    ])('demo-business-')
+  },
   // 登陆
   {
     path: '/login',

From ba4c7d11b6ee0fe396dfc106b8558cc6f88db6f2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 20:43:20 +0800
Subject: [PATCH 72/78] no message

Former-commit-id: 3d99fcf1c831fa35821f6c39234469cf9db8352d
Former-commit-id: 6f1dd0f01a90c06350622725e0756645a338cf75
Former-commit-id: 0e9c7779dfff5b6a6cf7efa4d6b6061e65e18b3f
---
 src/assets/style/fixed/element.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/style/fixed/element.scss b/src/assets/style/fixed/element.scss
index b35e4901..be34caca 100644
--- a/src/assets/style/fixed/element.scss
+++ b/src/assets/style/fixed/element.scss
@@ -3,11 +3,11 @@
 .el-card {
   box-shadow: none;
   &:hover {
-    box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+    // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+    box-shadow: none;
   }
 }
 
-
 .el-menu--horizontal {
   border-bottom: none;
 }
\ No newline at end of file

From 277538de13163e3e6ff5bd0eb3b86ed31a03f7b6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 21:20:32 +0800
Subject: [PATCH 73/78] no message

Former-commit-id: 0b7b1cc03b0a9da81cb5943b83761c44ecc21b1d
Former-commit-id: c48d9e5242f4463be2f816b47fd9d810ce2090d3
Former-commit-id: 375643e2538186e230c35e8074adc3b105d5f25a
---
 .../MainLayout/components/SideMenu/index.vue  | 42 +++----------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index f3f5e5bd..2fcebe18 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -30,42 +30,12 @@ export default {
   },
   data () {
     return {
-      menus: [
-        {
-          path: '/demo/components/container/full',
-          title: 'menu-a',
-          icon: 'plus'
-        },
-        {
-          path: '/b',
-          title: 'menu-b',
-          icon: 'plus',
-          children: [
-            {
-              path: '/c-1',
-              title: 'menu-a',
-              icon: 'plus'
-            },
-            {
-              path: '/c',
-              title: 'menu-a',
-              icon: 'plus',
-              children: [
-                {
-                  path: '/d',
-                  title: 'menu-a',
-                  icon: 'plus'
-                },
-                {
-                  path: '/demo/components/container/full',
-                  title: 'menu-a',
-                  icon: 'plus'
-                }
-              ]
-            }
-          ]
-        }
-      ]
+      menus: []
+    }
+  },
+  watch: {
+    $route (val) {
+      console.log(val)
     }
   }
 }

From 90530d8bd4ffdfe327caaa4e7afc8f9e5546a8b0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 21:28:23 +0800
Subject: [PATCH 74/78] no message

Former-commit-id: 71b80b9ef4c9945e3e648a3ee8932d05db30d7f3
Former-commit-id: bc8f4d4a05862cd678edf9caf3fc1a7104b333da
Former-commit-id: be0ace8e27b2c77e76dab235f7641f49bbf84ed5
---
 .../core/MainLayout/components/SideMenu/index.vue           | 6 ++++--
 src/router/index.js                                         | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 2fcebe18..fda20c7f 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -34,8 +34,10 @@ export default {
     }
   },
   watch: {
-    $route (val) {
-      console.log(val)
+    '$route.matched': {
+      handler (val) {
+        console.log(val)
+      }
     }
   }
 }
diff --git a/src/router/index.js b/src/router/index.js
index c848cdc1..5c309787 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -104,9 +104,9 @@ const routes = [
   }
 ]
 
-routes[3].children.forEach(e => {
-  console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`)
-})
+// routes[3].children.forEach(e => {
+//   console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`)
+// })
 
 let router = new VueRouter({ routes })
 

From a9144e2b70691d483188d4869e4dae303f44b221 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 21:43:59 +0800
Subject: [PATCH 75/78] no message

Former-commit-id: ba35b8e3c2dc8d8ddeb91951b12485b9bbe255b9
Former-commit-id: 0c7de77a06c20eec527d94e267dd05d177505e38
Former-commit-id: 677a14140769c64edb97c075e4dfc4a93792a879
---
 .../MainLayout/components/SideMenu/index.vue  |   3 +-
 src/menu/index.js                             | 228 +++++++++---------
 2 files changed, 121 insertions(+), 110 deletions(-)

diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index fda20c7f..262d6451 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -37,7 +37,8 @@ export default {
     '$route.matched': {
       handler (val) {
         console.log(val)
-      }
+      },
+      immediate: true
     }
   }
 }
diff --git a/src/menu/index.js b/src/menu/index.js
index 526dc59d..fdc3f36b 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -1,3 +1,119 @@
+// 路由菜单 插件
+const demoPlugins = {
+  path: '/demo/plugins',
+  title: '插件',
+  icon: 'plug',
+  children: (pre => [
+    { path: `${pre}index`, title: '插件首页' },
+    {
+      path: `${pre}mock`,
+      title: '模拟数据',
+      children: [
+        { path: `${pre}mock/ajax`, title: '拦截异步请求' },
+        { path: `${pre}mock/dpd`, title: 'DPD规则' },
+        { path: `${pre}mock/dtd`, title: 'DTD规则' }
+      ]
+    },
+    {
+      path: `${pre}import`,
+      title: '导入',
+      children: [
+        { path: `${pre}import/csv`, title: 'csv' },
+        { path: `${pre}import/xlsx`, title: 'xlsx' }
+      ]
+    },
+    {
+      path: `${pre}export`,
+      title: '导出',
+      children: [
+        { path: `${pre}export/table`, title: '表格' },
+        { path: `${pre}export/txt`, title: '文本' }
+      ]
+    },
+    {
+      path: `${pre}i18n`,
+      title: '多国语',
+      children: [
+        { path: `${pre}i18n/demo1`, title: '示例1' },
+        { path: `${pre}i18n/demo2`, title: '示例2' }
+      ]
+    },
+    { path: `${pre}build`, title: '环境区分' },
+    { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
+    { path: `${pre}js-cookie`, title: 'cookie读写' },
+    { path: `${pre}timeago`, title: '计算已经过去的时间' }
+  ])('/demo/plugins/')
+}
+
+// 路由菜单 组件
+const demoComponents = {
+  path: '/demo/components',
+  title: '组件',
+  icon: 'puzzle-piece',
+  children: (pre => [
+    { path: `${pre}index`, title: '组件首页' },
+    {
+      path: `${pre}container`,
+      title: '布局容器',
+      children: [
+        { path: `${pre}container/full`, title: '填满' },
+        { path: `${pre}container/ghost`, title: '隐形' },
+        { path: `${pre}container/normal`, title: '一般' }
+      ]
+    },
+    {
+      path: `${pre}layout/grid`,
+      title: '高级布局',
+      children: [
+        { path: `${pre}layout/grid`, title: '拖拽位置和大小' },
+        { path: `${pre}layout/splitpane`, title: '区域划分' }
+      ]
+    },
+    {
+      path: `${pre}icon`,
+      title: '图标',
+      children: [
+        { path: `${pre}icon/icon`, title: '图标组件' },
+        { path: `${pre}icon/list`, title: 'FontAwesome' },
+        { path: `${pre}icon/select`, title: '图标选择器' },
+        { path: `${pre}icon/svg`, title: 'SVG图标组件' }
+      ]
+    },
+    { path: `${pre}countup`, title: '数字动画' },
+    { path: `${pre}editor-quill`, title: '富文本编辑器' },
+    { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' },
+    { path: `${pre}highlight`, title: '代码高亮显示' },
+    { path: `${pre}markdown`, title: 'markdown解析' }
+  ])('/demo/components/')
+}
+
+// 路由菜单 图表
+const demoChart = {
+  path: '/demo/chart',
+  title: '图表',
+  icon: 'pie-chart',
+  children: (pre => [
+    { path: `${pre}index`, title: '图表首页' },
+    {
+      path: `${pre}demo`,
+      title: '单图示例',
+      children: [
+        { path: `${pre}demo/areaBase`, title: '区域折线图' },
+        { path: `${pre}demo/barBase`, title: '条形图' },
+        { path: `${pre}demo/columnBase`, title: '柱形图' },
+        { path: `${pre}demo/lineBase`, title: '折线图' },
+        { path: `${pre}demo/lineStep`, title: '阶梯折线图' },
+        { path: `${pre}demo/nightingaleRoseBase`, title: '南丁格尔玫瑰图' },
+        { path: `${pre}demo/PieBase`, title: '饼图' },
+        { path: `${pre}demo/radarBase`, title: '雷达图' }
+      ]
+    },
+    { path: `${pre}all`, title: '示例' },
+    { path: `${pre}dynamicSize`, title: '动态尺寸与可拖拽' }
+  ])('/demo/chart/')
+}
+
+// 菜单
 export default [
   {
     path: '/index',
@@ -7,115 +123,9 @@ export default [
     path: '/demo',
     title: '功能',
     children: [
-      {
-        path: '/demo/plugins',
-        title: '插件',
-        icon: 'plug',
-        children: (pre => [
-          { path: `${pre}index`, title: '插件首页' },
-          {
-            path: `${pre}mock`,
-            title: '模拟数据',
-            children: [
-              { path: `${pre}mock/ajax`, title: '拦截异步请求' },
-              { path: `${pre}mock/dpd`, title: 'DPD规则' },
-              { path: `${pre}mock/dtd`, title: 'DTD规则' }
-            ]
-          },
-          {
-            path: `${pre}import`,
-            title: '导入',
-            children: [
-              { path: `${pre}import/csv`, title: 'csv' },
-              { path: `${pre}import/xlsx`, title: 'xlsx' }
-            ]
-          },
-          {
-            path: `${pre}export`,
-            title: '导出',
-            children: [
-              { path: `${pre}export/table`, title: '表格' },
-              { path: `${pre}export/txt`, title: '文本' }
-            ]
-          },
-          {
-            path: `${pre}i18n`,
-            title: '多国语',
-            children: [
-              { path: `${pre}i18n/demo1`, title: '示例1' },
-              { path: `${pre}i18n/demo2`, title: '示例2' }
-            ]
-          },
-          { path: `${pre}build`, title: '环境区分' },
-          { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
-          { path: `${pre}js-cookie`, title: 'cookie读写' },
-          { path: `${pre}timeago`, title: '计算已经过去的时间' }
-        ])('/demo/plugins/')
-      },
-      {
-        path: '/demo/components',
-        title: '组件',
-        icon: 'puzzle-piece',
-        children: (pre => [
-          { path: `${pre}index`, title: '组件首页' },
-          {
-            path: `${pre}container`,
-            title: '布局容器',
-            children: [
-              { path: `${pre}container/full`, title: '填满' },
-              { path: `${pre}container/ghost`, title: '隐形' },
-              { path: `${pre}container/normal`, title: '一般' }
-            ]
-          },
-          {
-            path: `${pre}layout/grid`,
-            title: '高级布局',
-            children: [
-              { path: `${pre}layout/grid`, title: '拖拽位置和大小' },
-              { path: `${pre}layout/splitpane`, title: '区域划分' }
-            ]
-          },
-          {
-            path: `${pre}icon`,
-            title: '图标',
-            children: [
-              { path: `${pre}icon/icon`, title: '图标组件' },
-              { path: `${pre}icon/list`, title: 'FontAwesome' },
-              { path: `${pre}icon/select`, title: '图标选择器' },
-              { path: `${pre}icon/svg`, title: 'SVG图标组件' }
-            ]
-          },
-          { path: `${pre}countup`, title: '数字动画' },
-          { path: `${pre}editor-quill`, title: '富文本编辑器' },
-          { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' },
-          { path: `${pre}highlight`, title: '代码高亮显示' },
-          { path: `${pre}markdown`, title: 'markdown解析' }
-        ])('/demo/components/')
-      },
-      {
-        path: '/demo/chart',
-        title: '图表',
-        icon: 'pie-chart',
-        children: (pre => [
-          { path: `${pre}index`, title: '图表首页' },
-          {
-            path: `${pre}demo`,
-            title: '单图示例',
-            children: [
-              { path: `${pre}demo/areaBase`, title: '区域折线图' },
-              { path: `${pre}demo/barBase`, title: '条形图' },
-              { path: `${pre}demo/columnBase`, title: '柱形图' },
-              { path: `${pre}demo/lineBase`, title: '折线图' },
-              { path: `${pre}demo/lineStep`, title: '阶梯折线图' },
-              { path: `${pre}demo/nightingaleRoseBase`, title: '南丁格尔玫瑰图' },
-              { path: `${pre}demo/PieBase`, title: '饼图' },
-              { path: `${pre}demo/radarBase`, title: '雷达图' }
-            ]
-          },
-          { path: `${pre}all`, title: '示例' },
-          { path: `${pre}dynamicSize`, title: '动态尺寸与可拖拽' }
-        ])('/demo/chart/')
-      }
+      demoPlugins,
+      demoComponents,
+      demoChart
     ]
   },
   {

From 96165a3a4d4ab8fc44a752b8d2198ac1c706f086 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 22:01:49 +0800
Subject: [PATCH 76/78] no message

Former-commit-id: d9b03b1aba4d211c5b7e4664aeb0c3e0e582291d
Former-commit-id: 375b499e66faf4e31a1377ab3eda69a914432b0c
Former-commit-id: de4ed0beb15eeb7c61e69b14557dc85f81ed53d5
---
 src/assets/style/theme/star/index.scss                   | 1 -
 .../core/MainLayout/components/SideMenu/index.vue        | 4 +++-
 src/menu/index.js                                        | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 3921d6b5..b8c4c0df 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -97,7 +97,6 @@ $theme-container-full-border-color: #d8dfea;
     .el-aside {
       // [菜单] 正常状态
       .el-menu {
-        margin-top: 10px;
         .el-menu-item {
           color: #FFF;
           &:hover {
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 262d6451..b4f00e3e 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -16,6 +16,7 @@
 </template>
 
 <script>
+import { side } from '@/menu/index.js'
 export default {
   props: {
     collapse: {
@@ -36,7 +37,8 @@ export default {
   watch: {
     '$route.matched': {
       handler (val) {
-        console.log(val)
+        const path = val[0].path
+        this.menus = side.filter(menu => menu.path === path)
       },
       immediate: true
     }
diff --git a/src/menu/index.js b/src/menu/index.js
index fdc3f36b..9de0d79f 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -113,7 +113,14 @@ const demoChart = {
   ])('/demo/chart/')
 }
 
-// 菜单
+// 菜单 侧边栏
+export const side = [
+  demoPlugins,
+  demoComponents,
+  demoChart
+]
+
+// 菜单 顶栏
 export default [
   {
     path: '/index',

From a7f24e5f0c56ba4c934481c9beafe85d49133ac1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 22:18:49 +0800
Subject: [PATCH 77/78] no message

Former-commit-id: 7cd462d92a94a90c0097954367c6dea1fd49472c
Former-commit-id: cc2184acc06a8f012c52fc5436b4aba3a7c4bcf5
Former-commit-id: 648b049ab68e25a60815bfc4c4cabe3d30712296
---
 index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 453ee30b..ab41521e 100755
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
         margin: 0px;
         padding: 0px;
       }
-      .loading-group {
+      .d2-app-loading-group {
         height: 100%;
         width: 100%;
         display: flex;
@@ -27,7 +27,7 @@
         background: -webkit-linear-gradient(to top, #D7DDE8, #757F9A);
         background: linear-gradient(to top, #D7DDE8, #757F9A);
       }
-      .title {
+      .d2-app-loading-title {
         color: #FFF;
         font-weight: bold;
         font-size: 14px;
@@ -35,7 +35,7 @@
         margin-bottom: 10px;
         letter-spacing: 0.2em;
       }
-      .sub-title {
+      .d2-app-loading-sub-title {
         color: #FFF;
         font-size: 10px;
       }
@@ -107,7 +107,7 @@
   </head>
   <body>
     <div id="app">
-      <div class="loading-group">
+      <div class="d2-app-loading-group">
         <div class="sk-cube-grid">
           <div class="sk-cube sk-cube1"></div>
           <div class="sk-cube sk-cube2"></div>
@@ -119,8 +119,8 @@
           <div class="sk-cube sk-cube8"></div>
           <div class="sk-cube sk-cube9"></div>
         </div>
-        <div class="title">加载中</div>
-        <div class="sub-title">初次加载会比较慢，请耐心等待</div>
+        <div class="d2-app-loading-title">加载中</div>
+        <div class="d2-app-loading-sub-title">初次加载会比较慢，请耐心等待</div>
       </div>
     </div>
   </body>

From 6740663337112bea19e73d3f4f7059c1a6f6ab8e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 9 Jun 2018 22:21:03 +0800
Subject: [PATCH 78/78] no message

Former-commit-id: be09922e1e8d4f343e766c6a07e29bec11d3f62d
Former-commit-id: ca7911cd08d25808ad212021e1126d9915a14035
Former-commit-id: d55e7afcf604c097d2132afb4b2f50a680f945c1
---
 index.html | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/index.html b/index.html
index ab41521e..e9756cc9 100755
--- a/index.html
+++ b/index.html
@@ -39,52 +39,52 @@
         color: #FFF;
         font-size: 10px;
       }
-      .sk-cube-grid {
+      .d2-app-loading-grid {
         width: 30px;
         height: 30px;
       }
 
-      .sk-cube-grid .sk-cube {
+      .d2-app-loading-grid .d2-app-loading {
         width: 10px;
         height: 10px;
         background-color: #FFF;
         float: left;
-        -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;
-                animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; 
+        -webkit-animation: d2-app-loading-grid-scale-delay 1.3s infinite ease-in-out;
+                animation: d2-app-loading-grid-scale-delay 1.3s infinite ease-in-out; 
       }
-      .sk-cube-grid .sk-cube1 {
+      .d2-app-loading-grid .d2-app-loading1 {
         border-top-left-radius: 4px;
         -webkit-animation-delay: 0.2s;
                 animation-delay: 0.2s; }
-      .sk-cube-grid .sk-cube2 {
+      .d2-app-loading-grid .d2-app-loading2 {
         -webkit-animation-delay: 0.3s;
                 animation-delay: 0.3s; }
-      .sk-cube-grid .sk-cube3 {
+      .d2-app-loading-grid .d2-app-loading3 {
         border-top-right-radius: 4px;
         -webkit-animation-delay: 0.4s;
                 animation-delay: 0.4s; }
-      .sk-cube-grid .sk-cube4 {
+      .d2-app-loading-grid .d2-app-loading4 {
         -webkit-animation-delay: 0.1s;
                 animation-delay: 0.1s; }
-      .sk-cube-grid .sk-cube5 {
+      .d2-app-loading-grid .d2-app-loading5 {
         -webkit-animation-delay: 0.2s;
                 animation-delay: 0.2s; }
-      .sk-cube-grid .sk-cube6 {
+      .d2-app-loading-grid .d2-app-loading6 {
         -webkit-animation-delay: 0.3s;
                 animation-delay: 0.3s; }
-      .sk-cube-grid .sk-cube7 {
+      .d2-app-loading-grid .d2-app-loading7 {
         border-bottom-left-radius: 4px;
         -webkit-animation-delay: 0s;
                 animation-delay: 0s; }
-      .sk-cube-grid .sk-cube8 {
+      .d2-app-loading-grid .d2-app-loading8 {
         -webkit-animation-delay: 0.1s;
                 animation-delay: 0.1s; }
-      .sk-cube-grid .sk-cube9 {
+      .d2-app-loading-grid .d2-app-loading9 {
         border-bottom-right-radius: 4px;
         -webkit-animation-delay: 0.2s;
                 animation-delay: 0.2s; }
 
-      @-webkit-keyframes sk-cubeGridScaleDelay {
+      @-webkit-keyframes d2-app-loading-grid-scale-delay {
         0%, 70%, 100% {
           -webkit-transform: scale3D(1, 1, 1);
                   transform: scale3D(1, 1, 1);
@@ -94,7 +94,7 @@
         }
       }
 
-      @keyframes sk-cubeGridScaleDelay {
+      @keyframes d2-app-loading-grid-scale-delay {
         0%, 70%, 100% {
           -webkit-transform: scale3D(1, 1, 1);
                   transform: scale3D(1, 1, 1);
@@ -108,16 +108,16 @@
   <body>
     <div id="app">
       <div class="d2-app-loading-group">
-        <div class="sk-cube-grid">
-          <div class="sk-cube sk-cube1"></div>
-          <div class="sk-cube sk-cube2"></div>
-          <div class="sk-cube sk-cube3"></div>
-          <div class="sk-cube sk-cube4"></div>
-          <div class="sk-cube sk-cube5"></div>
-          <div class="sk-cube sk-cube6"></div>
-          <div class="sk-cube sk-cube7"></div>
-          <div class="sk-cube sk-cube8"></div>
-          <div class="sk-cube sk-cube9"></div>
+        <div class="d2-app-loading-grid">
+          <div class="d2-app-loading d2-app-loading1"></div>
+          <div class="d2-app-loading d2-app-loading2"></div>
+          <div class="d2-app-loading d2-app-loading3"></div>
+          <div class="d2-app-loading d2-app-loading4"></div>
+          <div class="d2-app-loading d2-app-loading5"></div>
+          <div class="d2-app-loading d2-app-loading6"></div>
+          <div class="d2-app-loading d2-app-loading7"></div>
+          <div class="d2-app-loading d2-app-loading8"></div>
+          <div class="d2-app-loading d2-app-loading9"></div>
         </div>
         <div class="d2-app-loading-title">加载中</div>
         <div class="d2-app-loading-sub-title">初次加载会比较慢，请耐心等待</div>