From dd98561b1dccb31ec60d3eb1ec770936e99ecd88 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 14:05:11 +0800
Subject: [PATCH 001/128] auto commit on save

Former-commit-id: a043120ed897c07da4985cd4a3080e41d9b5cc7c [formerly a043120ed897c07da4985cd4a3080e41d9b5cc7c [formerly a043120ed897c07da4985cd4a3080e41d9b5cc7c [formerly a043120ed897c07da4985cd4a3080e41d9b5cc7c [formerly 3b0b58c899689f60ca0be35c66c1cab23eed8041 [formerly a67452f5c960fa6617e38033383b96ca043dbc83]]]]]
Former-commit-id: ef1f321d66d72697ca0a5140bb751b7cfe3e7c5b
Former-commit-id: c290f4d783274e5485553a05fccfc47f979e6a0c
Former-commit-id: 2458f2965383404ab815c5d738e1b1884fdb1e97 [formerly 1532848fce0c8becf8471203f479011d4e24273c]
Former-commit-id: c31ff6c1e538cfe9dd2a56b936c97e1d080f4b74
Former-commit-id: 24fc9b6e3417f35370ea744dfd5c1093c4571ae8
Former-commit-id: 90a12159d4bc73a89b32d6d968912fa6b4fce8c2
Former-commit-id: 79ad61f64132d6afdd6bd765e26fd03f28cd0c41
Former-commit-id: a17147696b5dd5823c873026afaaacdfe9be96ab
---
 docs/zh/guide/pr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/guide/pr.md b/docs/zh/guide/pr.md
index 9371bd79..db6c8775 100644
--- a/docs/zh/guide/pr.md
+++ b/docs/zh/guide/pr.md
@@ -2,7 +2,7 @@
 
 ## 如何贡献代码
 
-首先在[项目主页](https://github.com/FairyEver/d2-admin) fork 本仓库，然后进行你的开发，请确保你的开发是在 dev 分支进行。本地测试无误后方可 pull request，我在检查通过后会合并代码到原始仓库。
+首先在[项目主页](https://github.com/FairyEver/d2-admin) fork 本仓库，然后进行你的开发，请确保你的开发是在 **dev** 分支进行。本地测试无误后方可 pull request，我在检查通过后会合并代码到原始仓库。
 
 ## 要求
 

From 608973c60e83a45b04e2199e334640a2d3c3d076 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 14:12:19 +0800
Subject: [PATCH 002/128] commit with auto save

Former-commit-id: f30bf4a866dfda88538953cff8cb65a0716347cd [formerly f30bf4a866dfda88538953cff8cb65a0716347cd [formerly f30bf4a866dfda88538953cff8cb65a0716347cd [formerly f30bf4a866dfda88538953cff8cb65a0716347cd [formerly e57975761066c0087ca39a6dc6436761713aae32 [formerly 2f32547e1c53a254847b2fe68ee52266b1f47887]]]]]
Former-commit-id: a57e9ba4bd1fbfd297919d53cd86fae9df85fe1a
Former-commit-id: 4647e31336dd796379b51c7f0acffebaf126ace8
Former-commit-id: 7febbca9b55e1631cccbc3e19c26ce9731145c83 [formerly fb9506a0ab1b19ee17145161767c468a12f05a24]
Former-commit-id: 69e75b9b5bff46351413787502aeafcae58ad225
Former-commit-id: 5d6484c4d93e001d57bd6f286fb9f9bf685c9639
Former-commit-id: 37f38d05fc5b50c549ed6f36aa36526339dd2397
Former-commit-id: ff23e83988ec160fa5c10883db32dcc36869e424
Former-commit-id: 90e0cb5272abeea96e196f358b23d5c242fa09a4
---
 deploy-github-add.sh       | 5 -----
 deploy-github-auto-save.sh | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100755 deploy-github-add.sh
 create mode 100755 deploy-github-auto-save.sh

diff --git a/deploy-github-add.sh b/deploy-github-add.sh
deleted file mode 100755
index 956a4c0e..00000000
--- a/deploy-github-add.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -e
-
-git add --all
-
-git commit -m 'auto commit on save'
\ No newline at end of file
diff --git a/deploy-github-auto-save.sh b/deploy-github-auto-save.sh
new file mode 100755
index 00000000..61fde96c
--- /dev/null
+++ b/deploy-github-auto-save.sh
@@ -0,0 +1,5 @@
+set -e
+
+git add --all
+
+git commit -m 'commit with auto save'
\ No newline at end of file

From 13c9718881f82ec5e9dc2236e39b8d7335493cf8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 14:15:29 +0800
Subject: [PATCH 003/128] commit with auto save

Former-commit-id: caaff9f3080ed7520d39ee31b8fbaff505b3b22e [formerly caaff9f3080ed7520d39ee31b8fbaff505b3b22e [formerly caaff9f3080ed7520d39ee31b8fbaff505b3b22e [formerly caaff9f3080ed7520d39ee31b8fbaff505b3b22e [formerly a65b7f989f4449248335b090b5a3cb51833dbe05 [formerly 93f7d6a8907e17c5dd0629c93b187de2a6b2a520]]]]]
Former-commit-id: ab82b6f9b156baeb8bb6561286c6393021512419
Former-commit-id: 8aacf958aa2774c9deb65d68f104eaa26fcad5fd
Former-commit-id: 552213d68288acd259aa17b30588b271abdeeb24 [formerly b2c9f16069204cde21526f4ff7be95f08fd6124c]
Former-commit-id: 3282168a03072e297b2f3800d5cf6871899f1544
Former-commit-id: 6a31ec2bab4a8b15c84463eefbaca78c9e874e84
Former-commit-id: 188d453f6c59ff923dcb218a7fe4e8ec5be848ef
Former-commit-id: 18f8bf0275f9434c755748e561dd4aedf4c55a3c
Former-commit-id: 432d8eb0754ffa6f75c21649533585d8ff961d3f
---
 src/libs/util.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/util.js b/src/libs/util.js
index 54394b44..4a2a2c07 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -48,6 +48,7 @@ util.exitFullScreen = function () {
  * @param {object} query query object
  */
 util.openNewPage = function (vm, name, argu, query) {
+  console.log('vm.$store', vm.$store)
   // 已经打开的页面
   let pageOpenedList = vm.$store.state.d2admin.pageOpenedList
   // 判断此页面是否已经打开 并且记录位置

From 4636f1128c5ef718366d41f236da5da843897331 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 14:29:11 +0800
Subject: [PATCH 004/128] no message

Former-commit-id: 40496ceaf1489dcc382f41c6e62fa91a1a300a44 [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81] [formerly 40496ceaf1489dcc382f41c6e62fa91a1a300a44 [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81] [formerly 40496ceaf1489dcc382f41c6e62fa91a1a300a44 [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81] [formerly 6ddfd235e7040886302c149d3c52164ecfcbcb81 [formerly ca7166204cdc0b4981386253fcb1c91df5897f50 [formerly 532b8ccca65817759686fc4445e3057ca6f38a51]]]]]
Former-commit-id: a0e9da94e1a9c1d05cafbb2738393349f1cef5bf
Former-commit-id: 3c8899a38ae8f560ded9ce8896abcaa5fa14b58f
Former-commit-id: 79f47d61913a660041ec81b911740a223d383621 [formerly 90c37d4093027b78e6b17f5dd580fc83db4cf8af]
Former-commit-id: 85a6e59e46dcc696406663ab1a669495da39975a
Former-commit-id: 304894163377cf8ad053052f1957c8787925aa96
Former-commit-id: 2de3894486eb764120833d39c05965c3fdbd26ab
Former-commit-id: 7b1469b3c0189f67f83664cb0068b35c2f3ec0ee
Former-commit-id: 42a48a1a70d2ea650b8df2255a2c8de1b31a3df4
---
 src/components/core/d2-multiple-page-control/index.vue | 2 +-
 src/main.js                                            | 9 +++++----
 src/router/index.js                                    | 6 ++++--
 src/router/routers.js.REMOVED.git-id                   | 1 -
 src/router/routes.js.REMOVED.git-id                    | 1 +
 5 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 src/router/routers.js.REMOVED.git-id
 create mode 100644 src/router/routes.js.REMOVED.git-id

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index d6f1e5aa..b7d4cc11 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
diff --git a/src/main.js b/src/main.js
index 0777cec0..de5fee98 100755
--- a/src/main.js
+++ b/src/main.js
@@ -2,9 +2,13 @@ import 'babel-polyfill'
 
 import Vue from 'vue'
 import App from './App'
-import router from './router'
 import i18n from './i18n'
 
+// vuex
+import store from '@/store/index.js'
+
+import router from './router'
+
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 
@@ -35,9 +39,6 @@ import '@/plugin/axios'
 // mock接口设置
 import '@/mock/register'
 
-// vuex
-import store from '@/store/index.js'
-
 // 右键菜单
 import contentmenu from 'v-contextmenu'
 import 'v-contextmenu/dist/index.css'
diff --git a/src/router/index.js b/src/router/index.js
index 20007feb..209c9ba6 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,13 +3,13 @@ import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
 // 路由数据
-import routers from './routers'
+import routes from './routes'
 
 import util from '@/libs/util.js'
 
 Vue.use(VueRouter)
 
-let router = new VueRouter({ routers })
+let router = new VueRouter({ routes })
 
 /**
  * 路由拦截
@@ -36,6 +36,7 @@ router.beforeEach((to, from, next) => {
 
 // TODO: 路由跳转后自动滚动到顶部
 router.afterEach(to => {
+  console.log('to', to)
   // 需要的信息
   const app = router.app
   const { name, params, query } = to
@@ -47,6 +48,7 @@ router.afterEach(to => {
   console.log('query: ', query)
   console.groupEnd()
   // 多页控制 打开新的页面
+  console.log('app', app)
   util.openNewPage(app, name, params, query)
 })
 
diff --git a/src/router/routers.js.REMOVED.git-id b/src/router/routers.js.REMOVED.git-id
deleted file mode 100644
index 37308904..00000000
--- a/src/router/routers.js.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-13063df4cba8c554e147adf0a2aa576871880a84
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
new file mode 100644
index 00000000..44a18954
--- /dev/null
+++ b/src/router/routes.js.REMOVED.git-id
@@ -0,0 +1 @@
+a7db0247e157a65ee28ba9fc302b042b5ee0c289
\ No newline at end of file

From ef56828ccf376643cc01515402ec6093c482b5a4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 15:42:04 +0800
Subject: [PATCH 005/128] no message

Former-commit-id: b18d2e79b32a114de2d412de0b02c6890cd20448 [formerly 016a5a6df0157a2a92558e109e7a3e48ea903fb0] [formerly b18d2e79b32a114de2d412de0b02c6890cd20448 [formerly 016a5a6df0157a2a92558e109e7a3e48ea903fb0] [formerly b18d2e79b32a114de2d412de0b02c6890cd20448 [formerly 016a5a6df0157a2a92558e109e7a3e48ea903fb0] [formerly 016a5a6df0157a2a92558e109e7a3e48ea903fb0 [formerly a1b37ed05c57fad981c72c75f7f71a1b81c5829d [formerly 4832403e7da7a7101336ee08ba7a7d8f28aa3129]]]]]
Former-commit-id: 71f90fbafda2b84f03eea9d18855bfcba703b25b
Former-commit-id: 8e8399eb321fcbfa14e571ab9f0f86caddb1765e
Former-commit-id: 5a5864ba7f2ea290b7c5bf0de213f9e3432164e2 [formerly e3f0050d3e299b84d7f483a638648c0c0ed3686c]
Former-commit-id: c5409df62bce5f0d91240519f2280e0afbb1f8ce
Former-commit-id: aad9ef2bd990278650be188d53ce5ee26699394c
Former-commit-id: 5a17a9701ea1a0cd82e174dc184e98f4fac7019c
Former-commit-id: 07bfa7139c6227d3f266ce0ed5ee101a2a7b2af3
Former-commit-id: a0b2ea513273e4222111acf0c576e8671f81f90b
---
 .../d2-layout-main/components/mixin/menu.js   |  7 ++++-
 src/main.js                                   | 29 ++++++++++++++++++-
 src/router/index.js                           |  6 ++--
 src/router/routes.js.REMOVED.git-id           |  2 +-
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/mixin/menu.js b/src/components/core/d2-layout-main/components/mixin/menu.js
index d4544be5..6c39a2be 100644
--- a/src/components/core/d2-layout-main/components/mixin/menu.js
+++ b/src/components/core/d2-layout-main/components/mixin/menu.js
@@ -1,10 +1,15 @@
 export default {
   methods: {
     handleMenuSelect (index, indexPath) {
+      console.group('handleMenuSelect')
+      console.log('index: ', index)
+      console.groupEnd()
       if (/^d2-menu-empty-\d+$/.test(index)) {
         this.$message('功能正在开发')
       } else {
-        this.$router.push(index)
+        this.$router.push({
+          path: index
+        })
       }
     }
   }
diff --git a/src/main.js b/src/main.js
index de5fee98..dfbb3489 100755
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,10 @@ import i18n from './i18n'
 // vuex
 import store from '@/store/index.js'
 
+// 路由
 import router from './router'
+// 框架内的路由
+import { frameInRoutes } from '@/router/routes'
 
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
@@ -79,5 +82,29 @@ new Vue({
   i18n,
   router,
   template: '<App/>',
-  components: { App }
+  components: { App },
+  created () {
+    // 处理路由 得到每一级的路由设置
+    this.getAllTagFromRoutes()
+  },
+  methods: {
+    /**
+     * 处理路由 得到每一级的路由设置
+     */
+    getAllTagFromRoutes () {
+      console.log('routes', frameInRoutes)
+      const tags = []
+      const push = function (routes) {
+        routes.forEach(route => {
+          if (route.children) {
+            push(route.children)
+          } else {
+            tags.push(route)
+          }
+        })
+      }
+      push(frameInRoutes)
+      console.log('tags', tags)
+    }
+  }
 })
diff --git a/src/router/index.js b/src/router/index.js
index 209c9ba6..a3d6dd80 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,11 +2,11 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Cookies from 'js-cookie'
 
+import util from '@/libs/util.js'
+
 // 路由数据
 import routes from './routes'
 
-import util from '@/libs/util.js'
-
 Vue.use(VueRouter)
 
 let router = new VueRouter({ routes })
@@ -36,7 +36,6 @@ router.beforeEach((to, from, next) => {
 
 // TODO: 路由跳转后自动滚动到顶部
 router.afterEach(to => {
-  console.log('to', to)
   // 需要的信息
   const app = router.app
   const { name, params, query } = to
@@ -48,7 +47,6 @@ router.afterEach(to => {
   console.log('query: ', query)
   console.groupEnd()
   // 多页控制 打开新的页面
-  console.log('app', app)
   util.openNewPage(app, name, params, query)
 })
 
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 44a18954..d11962f2 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-a7db0247e157a65ee28ba9fc302b042b5ee0c289
\ No newline at end of file
+bd6085cdedc8b795441980caba311c098d002f0d
\ No newline at end of file

From 6ec19d0994efa818fe56cd0dcd12faa0f7289bf6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 16:45:06 +0800
Subject: [PATCH 006/128] no message

Former-commit-id: fecd15de69d56381101476f4661390022320797b [formerly fecd15de69d56381101476f4661390022320797b [formerly fecd15de69d56381101476f4661390022320797b [formerly fecd15de69d56381101476f4661390022320797b [formerly ef319f6d08860c3e1496d77bf196a26e26834e1b [formerly 2b63a8f4aadb093749af078c0f0585894a4a8905]]]]]
Former-commit-id: 7ac89b5fbc75e657572856a53f7ec44f690051af
Former-commit-id: f2c7e3a59fed3ff686ec8570af3f487c4e69dd3a
Former-commit-id: 27b28805c5f32ffd40c825cf8afa9944b41367a3 [formerly 454932a2cac3059d4794516613533670d8a11de4]
Former-commit-id: 5e825ae2b734cd4e098a9614ac4ac307e43eedbd
Former-commit-id: 5aff1e6b7cfb8de0c38759f699418b73ea726b2e
Former-commit-id: 707a7a3cb50856c8eb6216664970c3d1e0b720b7
Former-commit-id: d4db2890074f6a3df7c580644413b0f6ca472750
Former-commit-id: 434daeea46dc29638a4f60e07974adc28be86cff
---
 src/libs/util.js             | 35 +++++++++++++++++++++++------------
 src/main.js                  |  7 +++----
 src/store/modules/d2admin.js | 28 ++++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index 4a2a2c07..9860226a 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -48,7 +48,6 @@ util.exitFullScreen = function () {
  * @param {object} query query object
  */
 util.openNewPage = function (vm, name, argu, query) {
-  console.log('vm.$store', vm.$store)
   // 已经打开的页面
   let pageOpenedList = vm.$store.state.d2admin.pageOpenedList
   // 判断此页面是否已经打开 并且记录位置
@@ -59,22 +58,34 @@ util.openNewPage = function (vm, name, argu, query) {
     return same
   })
   if (pageOpend) {
-    // 页面以前打开过
-    console.group('page opend')
-    console.log('pageOpendIndex: ', pageOpendIndex)
-    console.groupEnd()
-    // 虽然页面以前打开过
-    // 但是新的页面可能 name 一样，参数不一样
+    // 页面以前打开过 但是新的页面可能 name 一样，参数不一样
     vm.$store.commit('d2adminpageOpenedListUpdateItem', {
       index: pageOpendIndex,
-      argu: argu,
-      query: query
+      argu,
+      query
     })
   } else {
     // 页面以前没有打开过
-    console.group('page not opend')
-    console.log('pageOpendIndex: ', pageOpendIndex)
-    console.groupEnd()
+    const tagPool = vm.$store.state.d2admin.tagPool
+    let tag = tagPool.find(t => t.name === name)
+    if (tag) {
+      vm.$store.commit('d2adminTagIncreate', {
+        tag, argu, query
+      })
+    }
+  }
+}
+
+/**
+ * 判断是否在其内
+ * @param {*} ele element
+ * @param {array} targetArr array
+ */
+util.oneOf = function (ele, targetArr) {
+  if (targetArr.indexOf(ele) >= 0) {
+    return true
+  } else {
+    return false
   }
 }
 
diff --git a/src/main.js b/src/main.js
index dfbb3489..8d142afa 100755
--- a/src/main.js
+++ b/src/main.js
@@ -92,19 +92,18 @@ new Vue({
      * 处理路由 得到每一级的路由设置
      */
     getAllTagFromRoutes () {
-      console.log('routes', frameInRoutes)
-      const tags = []
+      const tagPool = []
       const push = function (routes) {
         routes.forEach(route => {
           if (route.children) {
             push(route.children)
           } else {
-            tags.push(route)
+            tagPool.push(route)
           }
         })
       }
       push(frameInRoutes)
-      console.log('tags', tags)
+      this.$store.commit('d2admintagPoolSet', tagPool)
     }
   }
 })
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 44b6f9e2..6164bb42 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -11,13 +11,15 @@ export default {
     // 主题
     themeList,
     themeActive: themeList[1],
-    // 多页
+    // 当前显示的多页面列表
     pageOpenedList: [
       {
         name: 'index',
         title: '首页'
       }
-    ]
+    ],
+    // 可以在多页 tab 模式下显示的页面
+    tagPool: []
   },
   mutations: {
     /**
@@ -48,6 +50,28 @@ export default {
         }).write()
       }
     },
+    /**
+     * 保存 tagPool (候选池)
+     * @param {state} state vuex state
+     * @param {Array} tagPool tags
+     */
+    d2admintagPoolSet (state, tagPool) {
+      state.tagPool = tagPool
+    },
+    /**
+     * 新增一个 tag
+     * @param {state} state vuex state
+     * @param {object} param1 new tag info
+     */
+    d2adminTagIncreate (state, { tag, argu, query }) {
+      // if (!Util.oneOf(tagObj.name, state.dontCache)) {
+      //   state.cachePage.push(tagObj.name);
+      //   localStorage.cachePage = JSON.stringify(state.cachePage);
+      // }
+      // state.pageOpenedList.push(tagObj);
+      // localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
+      console.log('d2adminTagIncreate')
+    },
     /**
      * 切换全屏
      * @param {state} state vuex state

From e09198e49b8e07a16bca486497196f2378972fb6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 17:52:57 +0800
Subject: [PATCH 007/128] no message

Former-commit-id: 6c0824b8d2e59ef3a72a65a6044c1217cd3a351d [formerly c9f42aa09c4b0b5de2ac5473f9384d6f7e187063] [formerly 6c0824b8d2e59ef3a72a65a6044c1217cd3a351d [formerly c9f42aa09c4b0b5de2ac5473f9384d6f7e187063] [formerly 6c0824b8d2e59ef3a72a65a6044c1217cd3a351d [formerly c9f42aa09c4b0b5de2ac5473f9384d6f7e187063] [formerly c9f42aa09c4b0b5de2ac5473f9384d6f7e187063 [formerly 5dde11521f5740d96ce6b0c8b4d4dc6ec738bf57 [formerly e474ecb99ef86f507fc991cb4aeb89b6f4b7afc0]]]]]
Former-commit-id: 81e5bed2d676b45a8097efe31e1862e2065a8e54
Former-commit-id: 82dad2622857f00c98550e67eb002617f76871d5
Former-commit-id: d87b796d20ce2f6e113c44b45e09e88f154788be [formerly 3f52ba8cba47a6470c20c9495b639959f74022e3]
Former-commit-id: 054f1738830a6c8af8385e54c06efc097ecd4259
Former-commit-id: 61560008239c38171cf4798db3ba5763dbf3108a
Former-commit-id: ddff9ce6841ba7387b1a572321b5723b442839bf
Former-commit-id: 8f689cf6a6844f6afa197e1238954636b98836d8
Former-commit-id: c218d2c370666254593f7102c2a959ffdd175583
---
 src/components/core/d2-layout-main/index.vue  |  7 +-
 .../core/d2-multiple-page-control/index.vue   | 16 +++--
 src/libs/db.js                                |  3 +-
 src/libs/util.js                              | 13 ++--
 src/router/index.js                           |  7 --
 src/store/modules/d2admin.js                  | 68 ++++++++++++++-----
 6 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index bd757071..6be0e832 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -34,7 +34,9 @@
           </div>
           <div class="d2-layout-main-body">
             <transition name="fade-transverse">
-              <router-view/>
+              <keep-alive :include="pageCacheList">
+                <router-view/>
+              </keep-alive>
             </transition>
           </div>
         </el-main>
@@ -68,7 +70,8 @@ export default {
   computed: {
     ...mapState({
       themeActive: state => state.d2admin.themeActive,
-      isGrayMode: state => state.d2admin.isGrayMode
+      isGrayMode: state => state.d2admin.isGrayMode,
+      pageCacheList: state => state.d2admin.pageCacheList
     }),
     styleLayoutMainGroup () {
       return {
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index b7d4cc11..882fa3a4 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -1,13 +1,13 @@
 <template>
   <el-tabs
     class="d2-multiple-page-control"
-    v-model="activeName"
+    :value="pageCurrent"
     type="card"
     @tab-click="handleClick">
     <el-tab-pane
       v-for="(page, index) in pageOpenedList"
       :key="index"
-      :label="page.title"
+      :label="page.name"
       :name="page.name">
     </el-tab-pane>
   </el-tabs>
@@ -23,12 +23,20 @@ export default {
   },
   computed: {
     ...mapState({
-      pageOpenedList: state => state.d2admin.pageOpenedList
+      pageOpenedList: state => state.d2admin.pageOpenedList,
+      pageCurrent: state => state.d2admin.pageCurrent
     })
   },
   methods: {
     handleClick (tab, event) {
-      // console.log(tab, event)
+      const page = this.pageOpenedList.find(page => page.name === tab.name)
+      if (page) {
+        this.$router.push({
+          name: page.name,
+          params: page.argu,
+          query: page.query
+        })
+      }
     }
   }
 }
diff --git a/src/libs/db.js b/src/libs/db.js
index 869ddd50..604d87eb 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -6,7 +6,8 @@ const db = low(adapter)
 
 db.defaults({
   themeActive: [],
-  pageOpenedList: []
+  pageOpenedList: [],
+  pageCacheList: []
 })
   .write()
 
diff --git a/src/libs/util.js b/src/libs/util.js
index 9860226a..10039d3c 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -59,21 +59,16 @@ util.openNewPage = function (vm, name, argu, query) {
   })
   if (pageOpend) {
     // 页面以前打开过 但是新的页面可能 name 一样，参数不一样
-    vm.$store.commit('d2adminpageOpenedListUpdateItem', {
-      index: pageOpendIndex,
-      argu,
-      query
-    })
+    vm.$store.commit('d2adminpageOpenedListUpdateItem', { index: pageOpendIndex, argu, query })
   } else {
     // 页面以前没有打开过
     const tagPool = vm.$store.state.d2admin.tagPool
     let tag = tagPool.find(t => t.name === name)
     if (tag) {
-      vm.$store.commit('d2adminTagIncreate', {
-        tag, argu, query
-      })
+      vm.$store.commit('d2adminTagIncreate', { tag, argu, query })
     }
   }
+  vm.$store.commit('d2adminPageSetCurrentName', name)
 }
 
 /**
@@ -81,7 +76,7 @@ util.openNewPage = function (vm, name, argu, query) {
  * @param {*} ele element
  * @param {array} targetArr array
  */
-util.oneOf = function (ele, targetArr) {
+util.isOneOf = function (ele, targetArr) {
   if (targetArr.indexOf(ele) >= 0) {
     return true
   } else {
diff --git a/src/router/index.js b/src/router/index.js
index a3d6dd80..7d3cdf72 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -39,13 +39,6 @@ router.afterEach(to => {
   // 需要的信息
   const app = router.app
   const { name, params, query } = to
-  // dev
-  console.group('router.afterEach')
-  console.log('app: ', app)
-  console.log('name: ', name)
-  console.log('params: ', params)
-  console.log('query: ', query)
-  console.groupEnd()
   // 多页控制 打开新的页面
   util.openNewPage(app, name, params, query)
 })
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 6164bb42..bdd91245 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -11,29 +11,36 @@ export default {
     // 主题
     themeList,
     themeActive: themeList[1],
+    // 可以在多页 tab 模式下显示的页面
+    tagPool: [],
     // 当前显示的多页面列表
     pageOpenedList: [
-      {
-        name: 'index',
-        title: '首页'
-      }
+      { name: 'index', title: '首页' }
     ],
-    // 可以在多页 tab 模式下显示的页面
-    tagPool: []
+    // 当前页面
+    pageCurrent: '',
+    // 使用缓存的页面 (需要在页面中写 name)
+    pageCacheList: [],
+    // 不使用缓存的页面
+    pageDisableCacheList: [
+      'no-cache'
+    ]
   },
   mutations: {
+    /**
+     * 设置当前激活的页面 name
+     * @param {state} state vuex state
+     * @param {string} name new name
+     */
+    d2adminPageSetCurrentName (state, name) {
+      state.pageCurrent = name
+    },
     /**
      * 更新页面列表上的某一项
      * @param {state} state vuex state
      * @param {info} param1 new page info
      */
     d2adminpageOpenedListUpdateItem (state, { index, argu, query }) {
-      // dev
-      console.group('d2adminpageOpenedListUpdateItem')
-      console.log('index: ', index)
-      console.log('argu: ', argu)
-      console.log('query: ', query)
-      console.groupEnd()
       // 更新页面列表某一项
       let page = state.pageOpenedList[index]
       page.argu = argu || page.argu
@@ -64,12 +71,37 @@ export default {
      * @param {object} param1 new tag info
      */
     d2adminTagIncreate (state, { tag, argu, query }) {
-      // if (!Util.oneOf(tagObj.name, state.dontCache)) {
-      //   state.cachePage.push(tagObj.name);
-      //   localStorage.cachePage = JSON.stringify(state.cachePage);
-      // }
-      // state.pageOpenedList.push(tagObj);
-      // localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
+      // 设置新的 tag
+      let newTag = tag
+      newTag.argu = argu || newTag.argu
+      newTag.query = query || newTag.query
+      // 检查这个页面是不是属于不使用缓存的页面
+      if (!util.isOneOf(newTag.name, state.pageDisableCacheList)) {
+        // 在缓存页面的列表加入这个页面的 name
+        state.pageCacheList.push(newTag.name)
+        // 更新设置到数据库
+        const setting = db.get('pageCacheList').find({uuid: util.uuid()})
+        if (setting.value()) {
+          setting.assign({value: state.pageCacheList}).write()
+        } else {
+          db.get('pageCacheList').push({
+            uuid: util.uuid(),
+            value: state.pageCacheList
+          }).write()
+        }
+      }
+      // 添加进当前显示的页面数组
+      state.pageOpenedList.push(newTag)
+      // 更新设置到数据库
+      const setting = db.get('pageOpenedList').find({uuid: util.uuid()})
+      if (setting.value()) {
+        setting.assign({value: state.pageOpenedList}).write()
+      } else {
+        db.get('pageOpenedList').push({
+          uuid: util.uuid(),
+          value: state.pageOpenedList
+        }).write()
+      }
       console.log('d2adminTagIncreate')
     },
     /**

From 5b1efcf1649d83cee8ec4988d0efd835dfbeaf3b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 18:12:02 +0800
Subject: [PATCH 008/128] no message

Former-commit-id: d97c13ae6a0218e0d6b43b698f6ba065ffa9fabe [formerly d97c13ae6a0218e0d6b43b698f6ba065ffa9fabe [formerly d97c13ae6a0218e0d6b43b698f6ba065ffa9fabe [formerly d97c13ae6a0218e0d6b43b698f6ba065ffa9fabe [formerly 8af3b8cf799f5599a7c708a9c03848e07660f713 [formerly 48d537ed7323a9d26fc3baff4a74e6765385a089]]]]]
Former-commit-id: 8320e4f21313b27cbe1f15589803ab26dd26a065
Former-commit-id: af143dcf993e384f77dc8ab10f881680b3b9252f
Former-commit-id: 4b0bcca697ca8df9084f1cdf1950ff0fc91863ec [formerly 3bb910f2c309c5837f9671fd12663f520d945e41]
Former-commit-id: fac37af6297d5c17188ffe1f60cb3dffa9327de8
Former-commit-id: 8a3939bd303dac222a561c46cb8fbbae94b2ad91
Former-commit-id: ef1c1db97b0713386c94fb5a1ecfaf6c570d1235
Former-commit-id: 534253616edbd0471b7966d2e678388a528398ce
Former-commit-id: 5c549c5924fbd8d7813802089209023404f116a1
---
 src/components/core/d2-layout-main/index.vue |  4 +--
 src/libs/db.js                               |  3 +-
 src/libs/util.js                             |  2 +-
 src/main.js                                  |  1 +
 src/store/modules/d2admin.js                 | 33 +++++++-------------
 5 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 6be0e832..cb29e836 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -34,7 +34,7 @@
           </div>
           <div class="d2-layout-main-body">
             <transition name="fade-transverse">
-              <keep-alive :include="pageCacheList">
+              <keep-alive :include="pageUseCacheList">
                 <router-view/>
               </keep-alive>
             </transition>
@@ -71,7 +71,7 @@ export default {
     ...mapState({
       themeActive: state => state.d2admin.themeActive,
       isGrayMode: state => state.d2admin.isGrayMode,
-      pageCacheList: state => state.d2admin.pageCacheList
+      pageUseCacheList: state => state.d2admin.pageUseCacheList
     }),
     styleLayoutMainGroup () {
       return {
diff --git a/src/libs/db.js b/src/libs/db.js
index 604d87eb..869ddd50 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -6,8 +6,7 @@ const db = low(adapter)
 
 db.defaults({
   themeActive: [],
-  pageOpenedList: [],
-  pageCacheList: []
+  pageOpenedList: []
 })
   .write()
 
diff --git a/src/libs/util.js b/src/libs/util.js
index 10039d3c..343338e7 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -68,7 +68,7 @@ util.openNewPage = function (vm, name, argu, query) {
       vm.$store.commit('d2adminTagIncreate', { tag, argu, query })
     }
   }
-  vm.$store.commit('d2adminPageSetCurrentName', name)
+  vm.$store.commit('d2adminPageCurrentSet', name)
 }
 
 /**
diff --git a/src/main.js b/src/main.js
index 8d142afa..43189fb9 100755
--- a/src/main.js
+++ b/src/main.js
@@ -104,6 +104,7 @@ new Vue({
       }
       push(frameInRoutes)
       this.$store.commit('d2admintagPoolSet', tagPool)
+      // d2adminPageUseCacheList
     }
   }
 })
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index bdd91245..ea1d6d4d 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -19,20 +19,24 @@ export default {
     ],
     // 当前页面
     pageCurrent: '',
-    // 使用缓存的页面 (需要在页面中写 name)
-    pageCacheList: [],
-    // 不使用缓存的页面
-    pageDisableCacheList: [
-      'no-cache'
-    ]
+    // 使用缓存的页面
+    pageUseCacheList: []
   },
   mutations: {
+    /**
+     * 设置使用缓存的页面
+     * @param {state} state vuex state
+     * @param {array} name pageUseCacheList
+     */
+    d2adminPageUseCacheList (state, list) {
+      state.pageUseCacheList = list
+    },
     /**
      * 设置当前激活的页面 name
      * @param {state} state vuex state
      * @param {string} name new name
      */
-    d2adminPageSetCurrentName (state, name) {
+    d2adminPageCurrentSet (state, name) {
       state.pageCurrent = name
     },
     /**
@@ -75,21 +79,6 @@ export default {
       let newTag = tag
       newTag.argu = argu || newTag.argu
       newTag.query = query || newTag.query
-      // 检查这个页面是不是属于不使用缓存的页面
-      if (!util.isOneOf(newTag.name, state.pageDisableCacheList)) {
-        // 在缓存页面的列表加入这个页面的 name
-        state.pageCacheList.push(newTag.name)
-        // 更新设置到数据库
-        const setting = db.get('pageCacheList').find({uuid: util.uuid()})
-        if (setting.value()) {
-          setting.assign({value: state.pageCacheList}).write()
-        } else {
-          db.get('pageCacheList').push({
-            uuid: util.uuid(),
-            value: state.pageCacheList
-          }).write()
-        }
-      }
       // 添加进当前显示的页面数组
       state.pageOpenedList.push(newTag)
       // 更新设置到数据库

From 27ab18faa002e0ac2b6dba36e165ba628480c316 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 19:29:01 +0800
Subject: [PATCH 009/128] no message

Former-commit-id: 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 435c4d936c2f8ab5eea278e4432a0df286286f01 [formerly f87cff38d27cea83e7a7fd974aff47bac7801bc7]]]]]
Former-commit-id: 848af72c6b5e06521da331a7d35c2ef802d17a22
Former-commit-id: ae82c772d169467c14849964521f203c819bc4cf
Former-commit-id: 75e0c51e1a5a1720a40d48b2319f69fa0dcd9dfd [formerly 8732955133a2a8df5b4c4ed780161a27b8468dc8]
Former-commit-id: e0404cd785b26d49dd4309fa182d921679401c17
Former-commit-id: 8073756eb1b1431acc4f31798822e453304d6545
Former-commit-id: 4c642306a6aaa3daf3f6cafaaae40129e879e6d4
Former-commit-id: e18a58a22d64f6ec527909074a193716f163489b
Former-commit-id: 9b9eeb009de56ee3405ac4be0eed2551f1ed06d8
---
 src/main.js                                    |  9 +++++++--
 src/menu/index.js.REMOVED.git-id               |  2 +-
 src/pages/demo/playground/page-cache/index.vue | 17 +++++++++++++++++
 src/router/routes.js.REMOVED.git-id            |  2 +-
 src/store/modules/d2admin.js                   |  3 +--
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/demo/playground/page-cache/index.vue

diff --git a/src/main.js b/src/main.js
index 43189fb9..e47e1ace 100755
--- a/src/main.js
+++ b/src/main.js
@@ -92,19 +92,24 @@ new Vue({
      * 处理路由 得到每一级的路由设置
      */
     getAllTagFromRoutes () {
+      // 所有加载在主框架内的页面
       const tagPool = []
+      // 所有需要被缓存的页面组件 name
+      const pageUseCacheList = []
       const push = function (routes) {
         routes.forEach(route => {
           if (route.children) {
             push(route.children)
           } else {
+            console.log('alive', route.meta.alive)
             tagPool.push(route)
           }
         })
       }
       push(frameInRoutes)
-      this.$store.commit('d2admintagPoolSet', tagPool)
-      // d2adminPageUseCacheList
+      console.log('tagPool', tagPool)
+      this.$store.commit('d2adminTagPoolSet', tagPool)
+      this.$store.commit('d2adminPageUseCacheListSet', pageUseCacheList)
     }
   }
 })
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index b1c5f226..a8f0a8fb 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-7562f0a732bab9f663056b29032ad38a3cfcae86
\ No newline at end of file
+a741ca1e629d094296537193224186be0fe27007
\ No newline at end of file
diff --git a/src/pages/demo/playground/page-cache/index.vue b/src/pages/demo/playground/page-cache/index.vue
new file mode 100644
index 00000000..153f7817
--- /dev/null
+++ b/src/pages/demo/playground/page-cache/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <d2-container type="full">
+    page-name
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index d11962f2..b3e92774 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-bd6085cdedc8b795441980caba311c098d002f0d
\ No newline at end of file
+e5b63ace9e1672fcf1badc8cbb5889e21060b67f
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index ea1d6d4d..6dbb95a4 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -66,7 +66,7 @@ export default {
      * @param {state} state vuex state
      * @param {Array} tagPool tags
      */
-    d2admintagPoolSet (state, tagPool) {
+    d2adminTagPoolSet (state, tagPool) {
       state.tagPool = tagPool
     },
     /**
@@ -91,7 +91,6 @@ export default {
           value: state.pageOpenedList
         }).write()
       }
-      console.log('d2adminTagIncreate')
     },
     /**
      * 切换全屏

From 436c9271054bccd6d89cfdc32236cd71ba158828 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 19:59:04 +0800
Subject: [PATCH 010/128] no message

Former-commit-id: 39ce7cc5f4fedfbc532ce0dd84969566f2ac9ea9 [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa] [formerly 39ce7cc5f4fedfbc532ce0dd84969566f2ac9ea9 [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa] [formerly 39ce7cc5f4fedfbc532ce0dd84969566f2ac9ea9 [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa] [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa [formerly 6a0f8169e55aef3a06ad4ad1a886ccefbb89c7c6 [formerly 7c6206c877e9d669c7549f216a743ba7749f568c]]]]]
Former-commit-id: c3d91f0f3530405ede6dd6d0b3af0f4182098792
Former-commit-id: 12e4b2e828fc38cf1825ce4e3205abe7914bab20
Former-commit-id: 4c6031327259be12bc930cc1b99257bfac590672 [formerly 78a40e795c2429e3fc8d42bc790c59dbec7c5911]
Former-commit-id: d164c4db1803cd684bf9806e4d044b5032e0612e
Former-commit-id: 9df3d0fe1a100cf6d1bed1ef46fe79f4330aa277
Former-commit-id: edf76528ce6ecd10f92dbc2c65e8fb3bacd3b86b
Former-commit-id: 485555b0759bf336c15a561343a7ad6a150a2aee
Former-commit-id: 2177d168625cf72c301207b8be4efb254be963e5
---
 package.json                                 |  1 -
 src/components/core/d2-layout-main/index.vue |  5 ++---
 src/main.js                                  |  6 +-----
 src/router/routes.js.REMOVED.git-id          |  2 +-
 src/store/modules/d2admin.js                 | 12 +-----------
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 1c7b2f58..8426f1b4 100755
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "highlight.js": "^9.12.0",
     "js-cookie": "^2.2.0",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.get": "^4.4.2",
     "lodash.uniqueid": "^4.0.1",
     "lowdb": "^1.0.0",
     "marked": "^0.3.9",
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index cb29e836..1871996c 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -34,7 +34,7 @@
           </div>
           <div class="d2-layout-main-body">
             <transition name="fade-transverse">
-              <keep-alive :include="pageUseCacheList">
+              <keep-alive>
                 <router-view/>
               </keep-alive>
             </transition>
@@ -70,8 +70,7 @@ export default {
   computed: {
     ...mapState({
       themeActive: state => state.d2admin.themeActive,
-      isGrayMode: state => state.d2admin.isGrayMode,
-      pageUseCacheList: state => state.d2admin.pageUseCacheList
+      isGrayMode: state => state.d2admin.isGrayMode
     }),
     styleLayoutMainGroup () {
       return {
diff --git a/src/main.js b/src/main.js
index e47e1ace..f624d9b3 100755
--- a/src/main.js
+++ b/src/main.js
@@ -57,6 +57,7 @@ import pluginOpen from '@/plugin/open'
 // 插件 支持百万级数据的表格
 import bigdataTable from '@/plugin/vue-bigdata-table'
 
+// 打包的设置 用户获取路径
 import buildConfig from '../config/index'
 
 Vue.use(ElementUI)
@@ -94,22 +95,17 @@ new Vue({
     getAllTagFromRoutes () {
       // 所有加载在主框架内的页面
       const tagPool = []
-      // 所有需要被缓存的页面组件 name
-      const pageUseCacheList = []
       const push = function (routes) {
         routes.forEach(route => {
           if (route.children) {
             push(route.children)
           } else {
-            console.log('alive', route.meta.alive)
             tagPool.push(route)
           }
         })
       }
       push(frameInRoutes)
-      console.log('tagPool', tagPool)
       this.$store.commit('d2adminTagPoolSet', tagPool)
-      this.$store.commit('d2adminPageUseCacheListSet', pageUseCacheList)
     }
   }
 })
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index b3e92774..9a319d1d 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-e5b63ace9e1672fcf1badc8cbb5889e21060b67f
\ No newline at end of file
+c33ea8b29ae79d4d8fd278159427b1f326d0d9a9
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 6dbb95a4..54cdc24e 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -18,19 +18,9 @@ export default {
       { name: 'index', title: '首页' }
     ],
     // 当前页面
-    pageCurrent: '',
-    // 使用缓存的页面
-    pageUseCacheList: []
+    pageCurrent: ''
   },
   mutations: {
-    /**
-     * 设置使用缓存的页面
-     * @param {state} state vuex state
-     * @param {array} name pageUseCacheList
-     */
-    d2adminPageUseCacheList (state, list) {
-      state.pageUseCacheList = list
-    },
     /**
      * 设置当前激活的页面 name
      * @param {state} state vuex state

From 3bfeabea9f424384f5a77c262efb9a4793bda071 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 20:23:50 +0800
Subject: [PATCH 011/128] no message

Former-commit-id: ce1e8da6144a0b9fb947336d56df1deba2d7ad92 [formerly ce1e8da6144a0b9fb947336d56df1deba2d7ad92 [formerly ce1e8da6144a0b9fb947336d56df1deba2d7ad92 [formerly ce1e8da6144a0b9fb947336d56df1deba2d7ad92 [formerly 6953b0ad96b8fce65908dacfc7d93d2fa4cd232a [formerly dd99c86232a5da894db614f3afb11014bd0d3470]]]]]
Former-commit-id: c32d5c983c5527bf6b410bcfdd29d48dd856fac4
Former-commit-id: f58431af307f27e31a19969b40ca5db4bf88ad0e
Former-commit-id: aca490422b0abeeaf53398ed6f88bb8e841f152d [formerly 0cd810bf8ee1c2c95e52f279b4f7b6d29899bfd5]
Former-commit-id: b8fbd8eead9a8a382d23c458c1ea3eca37e0b930
Former-commit-id: 9f8464014a4c2e4aa0d3be177c180afd0e86ea69
Former-commit-id: 1149c7d49ae85f4ec8b38db96938526ecff34ac5
Former-commit-id: ecad8d328d89f6494ed701eb3197a312827aca75
Former-commit-id: 43abd5a1fcf08ce7afa02d38c1d3709cf2a427d1
---
 src/components/core/d2-layout-main/index.vue   | 15 +++++++++++++--
 src/menu/index.js.REMOVED.git-id               |  2 +-
 src/pages/demo/playground/page-cache/index.vue | 17 -----------------
 src/pages/demo/playground/page-cache/off.vue   | 17 +++++++++++++++++
 src/pages/demo/playground/page-cache/on.vue    | 17 +++++++++++++++++
 src/router/routes.js.REMOVED.git-id            |  2 +-
 6 files changed, 49 insertions(+), 21 deletions(-)
 delete mode 100644 src/pages/demo/playground/page-cache/index.vue
 create mode 100644 src/pages/demo/playground/page-cache/off.vue
 create mode 100644 src/pages/demo/playground/page-cache/on.vue

diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 1871996c..dc5dc5d6 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -30,14 +30,17 @@
         <!-- 主体 -->
         <el-main>
           <div class="d2-layout-main-header">
-            <d2-multiple-page-control></d2-multiple-page-control>
+            <d2-multiple-page-control/>
           </div>
           <div class="d2-layout-main-body">
             <transition name="fade-transverse">
               <keep-alive>
-                <router-view/>
+                <router-view v-if="alive"/>
               </keep-alive>
             </transition>
+            <transition name="fade-transverse">
+              <router-view v-if="!alive"/>
+            </transition>
           </div>
         </el-main>
       </el-container>
@@ -78,6 +81,14 @@ export default {
           backgroundImage: `url('${this.$assetsPublicPath}${this.themeActive.backgroundImage}')`
         } : {}
       }
+    },
+    alive () {
+      if (this.$route.meta) {
+        if (this.$route.meta.alive) {
+          return true
+        }
+      }
+      return false
     }
   },
   mounted () {
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index a8f0a8fb..d13d7329 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-a741ca1e629d094296537193224186be0fe27007
\ No newline at end of file
+25bf046328d0f61221cbfbd777ae8dfcfefb8b6f
\ No newline at end of file
diff --git a/src/pages/demo/playground/page-cache/index.vue b/src/pages/demo/playground/page-cache/index.vue
deleted file mode 100644
index 153f7817..00000000
--- a/src/pages/demo/playground/page-cache/index.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <d2-container type="full">
-    page-name
-  </d2-container>
-</template>
-
-<script>
-export default {
-  data () {
-    return {}
-  },
-  computed: {
-  },
-  methods: {
-  }
-}
-</script>
diff --git a/src/pages/demo/playground/page-cache/off.vue b/src/pages/demo/playground/page-cache/off.vue
new file mode 100644
index 00000000..79444750
--- /dev/null
+++ b/src/pages/demo/playground/page-cache/off.vue
@@ -0,0 +1,17 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">这个页面不会被 keep-alive</template>
+    <p class="d2-mt-0">在下面的输入框输入任意字符后，切换到其它页面，再回到此页时输入框文字消失，证明没有被缓存</p>
+    <el-input v-model="value" placeholder="input here"></el-input>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      value: ''
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/playground/page-cache/on.vue b/src/pages/demo/playground/page-cache/on.vue
new file mode 100644
index 00000000..8d5ed49c
--- /dev/null
+++ b/src/pages/demo/playground/page-cache/on.vue
@@ -0,0 +1,17 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">这个页面会被 keep-alive</template>
+    <p class="d2-mt-0">在下面的输入框输入任意字符后，切换到其它页面，再回到此页时输入框文字保留，证明被缓存</p>
+    <el-input v-model="value" placeholder="input here"></el-input>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      value: ''
+    }
+  }
+}
+</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 9a319d1d..56b22f5e 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-c33ea8b29ae79d4d8fd278159427b1f326d0d9a9
\ No newline at end of file
+f8c29d259d65f4cb1bf09a96087e6bd73c78f24f
\ No newline at end of file

From 58277f8fcfb29a90e721d640401d6219ee94167e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 20:30:17 +0800
Subject: [PATCH 012/128] no message

Former-commit-id: a44ccee47d3b588046c01804458586a39a0abe4e [formerly a44ccee47d3b588046c01804458586a39a0abe4e [formerly a44ccee47d3b588046c01804458586a39a0abe4e [formerly a44ccee47d3b588046c01804458586a39a0abe4e [formerly ac5bb2b97241519b40ed58a5f92a316310682740 [formerly 3e27e09ec3323058ab51e752894640be47379ed3]]]]]
Former-commit-id: 6789f9164d182011af33dc7bacee65c570ac907e
Former-commit-id: b9729702ff2c55fec49e78f4d0fd504d4c1a17cc
Former-commit-id: 9b0af7be41ae212220a6cf4b227a955474083d62 [formerly 9208f7f747e05a8165e4cd642da8a4fdb2b6483f]
Former-commit-id: 153ee4f67a4d7521898b078fbb58d056e143d6fd
Former-commit-id: 000391cb0557a5e19c56b5b0b79729aebe11b1cf
Former-commit-id: 0be1e2130751b5a63cb00c1f88c9a6f0ab98712f
Former-commit-id: 8d214afb0897bd2829d7a9fb84aa20860aa80a36
Former-commit-id: 30828e856002999c167336a45384575a0d6ddafc
---
 src/menu/index.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index d13d7329..46f5b431 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-25bf046328d0f61221cbfbd777ae8dfcfefb8b6f
\ No newline at end of file
+5d07a0a3c1939c6162e76c9f15d7614697aa5a7d
\ No newline at end of file

From db6467fd8069eff28869187c6c66bcfda9299489 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 20:51:38 +0800
Subject: [PATCH 013/128] no message

Former-commit-id: fda4e2edd35bab5f0cd0e6669093ced86fdfd6a4 [formerly 9a5135089da4106ab349f2f419de1267e63ef5a4] [formerly fda4e2edd35bab5f0cd0e6669093ced86fdfd6a4 [formerly 9a5135089da4106ab349f2f419de1267e63ef5a4] [formerly fda4e2edd35bab5f0cd0e6669093ced86fdfd6a4 [formerly 9a5135089da4106ab349f2f419de1267e63ef5a4] [formerly 9a5135089da4106ab349f2f419de1267e63ef5a4 [formerly 005235eee1eeefb9146892ea1deaa69838982a9d [formerly a16b34a79b276489346c4a81957e70e713253c4c]]]]]
Former-commit-id: 4b680c18cd70562a8f90888340c76d5d7901caf7
Former-commit-id: 1e7e2a83ca21b3e0291d60237e56a859516ce4a4
Former-commit-id: a13bba025d3d2b03f9fd93fde53dd7da00983181 [formerly f3e53c669ed8ddebdf0f218255642cebee8ec83a]
Former-commit-id: 880917ff6ad56c4e6906ecd4cc69e5753c4ecdbe
Former-commit-id: e87be214f4bba28dee05d9c23679b040c81e8b17
Former-commit-id: 9f089a89610161ea851955806fdf7c95ddf924c0
Former-commit-id: b551b9c8adcb873a23f6e3d59cabcc68a951246e
Former-commit-id: c9683dcc2cb01fc96dfd6a4f83a3f5ea6ad112a4
---
 src/components/core/d2-multiple-page-control/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 882fa3a4..00217ed7 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -3,6 +3,8 @@
     class="d2-multiple-page-control"
     :value="pageCurrent"
     type="card"
+    :closable="true"
+    :stretch="pageOpenedList.length > 1"
     @tab-click="handleClick">
     <el-tab-pane
       v-for="(page, index) in pageOpenedList"

From ac4c5acc7ecaf971a906af86cafeeb585081e3cf Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 21:46:45 +0800
Subject: [PATCH 014/128] no message

Former-commit-id: 3666599580a9423d33d22b54a9f056c3c4daad2c [formerly 881979e36cf5ba24abf3dfbcda345d8a13744ced] [formerly 3666599580a9423d33d22b54a9f056c3c4daad2c [formerly 881979e36cf5ba24abf3dfbcda345d8a13744ced] [formerly 3666599580a9423d33d22b54a9f056c3c4daad2c [formerly 881979e36cf5ba24abf3dfbcda345d8a13744ced] [formerly 881979e36cf5ba24abf3dfbcda345d8a13744ced [formerly 015e354640ed19382d10c87fb1cfe6e97ca15862 [formerly b058cdfe3544ef7972dbb251a48e5459e3d44ae2]]]]]
Former-commit-id: ed050dd77d26ae19353b71be05162c76dc610f24
Former-commit-id: 4504ca6b6345ac572fcb86abaf0a423ab8ebfc92
Former-commit-id: 71e03955e6307ef23f22fbf4e65eb2ac737f8f5b [formerly 697f059274598c91a4e4eefa1c1bafce7b5a14da]
Former-commit-id: 81d14c727c7d7bb6185fecf2d95a4a925efcb346
Former-commit-id: 61b7dc81e5e5b795719dc1f2ec1afc2e7ab3e733
Former-commit-id: cdb301674dc58a73f12634f28ed8b11502f28064
Former-commit-id: b4879fe9e54bc0260dcbaaed7d1ee4aa3604e62f
Former-commit-id: ff3aacefa1c666bd53f5eb203de2734d39af93f0
---
 src/assets/style/theme/theme.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 0ef7efc4..54d274af 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -202,6 +202,7 @@
           .el-tabs__nav {
             border-color: $theme-multiple-page-control-border-color;
             .el-tabs__item {
+              @extend %unable-select;
               color: $theme-multiple-page-control-color;
               background-color: $theme-multiple-page-control-background-color;
               border-left-color: $theme-multiple-page-control-border-color;

From b4b5f8a89bdbc0bbda3ca9accae1ec44f2f2d831 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 23:05:33 +0800
Subject: [PATCH 015/128] no message

Former-commit-id: f7ba33518846257aae5268858d680b9109294667 [formerly 8eb2a86ad37d78bcf52375760709db98d776512c] [formerly f7ba33518846257aae5268858d680b9109294667 [formerly 8eb2a86ad37d78bcf52375760709db98d776512c] [formerly f7ba33518846257aae5268858d680b9109294667 [formerly 8eb2a86ad37d78bcf52375760709db98d776512c] [formerly 8eb2a86ad37d78bcf52375760709db98d776512c [formerly e243925654ec6a8cfe98203e6961137a1078deaf [formerly cc58ac91b6cf31b77929a105f0e2ef40750b65ba]]]]]
Former-commit-id: fcd287104b6c9a31699f61e44117f7dff2a94870
Former-commit-id: 30b27fc7454da4e836ab5185689d423cf573cdfc
Former-commit-id: 24e9d0161ecdb0a747ed1236ad6860191c6b8fda [formerly 0f90def6ce7858ad9e6cd22d845731a6c9f93c4e]
Former-commit-id: 26b5ad3e654e30993e378cc2a1a1e65876032449
Former-commit-id: c563fe12250e2b496208ea2d1bbc9b036b97f1b9
Former-commit-id: 5212ef499e8de74b8fe925d7db39db4149c8db1e
Former-commit-id: 1a1680cc9d36fafd1790b5e0ad825bc538c02393
Former-commit-id: 4e44335b9846b0e502d584ae7ef431de9363c672
---
 design.sketch.REMOVED.git-id                  |  2 +-
 src/assets/style/theme/theme-base.scss        | 14 ++++-----
 src/assets/style/theme/theme.scss             | 14 ++++-----
 src/assets/style/theme/violet/index.scss      |  2 +-
 src/components/core/d2-layout-main/index.vue  | 21 +++++++++-----
 src/menu/index.js.REMOVED.git-id              |  2 +-
 src/pages/core/setting/index/index.vue        |  9 ++++++
 src/pages/core/setting/theme/index.vue        | 29 +++++++++++++++++++
 src/pages/demo/playground/theme/index.vue     |  4 +--
 src/router/routes.js.REMOVED.git-id           |  2 +-
 .../image/icon/500/setting.png.REMOVED.git-id |  1 +
 11 files changed, 72 insertions(+), 28 deletions(-)
 create mode 100644 src/pages/core/setting/index/index.vue
 create mode 100644 src/pages/core/setting/theme/index.vue
 create mode 100644 static/image/icon/500/setting.png.REMOVED.git-id

diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id
index 7d792df5..79561a15 100644
--- a/design.sketch.REMOVED.git-id
+++ b/design.sketch.REMOVED.git-id
@@ -1 +1 @@
-fa557a428388c3e73ddee4997e5feb56297e1304
\ No newline at end of file
+471d1d7f715345325951f4b26ad14275b4c3e745
\ 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 6abee281..326c1349 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -1,5 +1,5 @@
 // 主题公用
-.layout-main-group {
+.d2-layout-main-group {
   &.grayMode {
     -webkit-filter: grayscale(100%);
     -moz-filter: grayscale(100%);
@@ -23,14 +23,14 @@
     left: 0px;
   }
   // 主体
-  .layout-main {
+  .el-container.d2-layout-main-content {
     position: absolute;
     top: 0px;
     right: 0px;
     bottom: 0px;
     left: 0px;
     // [布局] 顶栏
-    .el-header {
+    .el-header.d2-theme-header {
       padding: 0px;
       // logo区域
       .logo-group {
@@ -56,7 +56,7 @@
         }
       }
       // [菜单] 顶栏
-      .el-menu {
+      .el-menu.d2-theme-header-menu {
         float: left;
         border-bottom: none;
         background-color: transparent;
@@ -96,9 +96,9 @@
       }
     }
     // [布局] 顶栏下面
-    .el-container {
+    .el-container.d2-theme-container {
       // 侧边栏
-      .el-aside {
+      .el-aside.d2-theme-container-aside {
         transition: width .3s;
         overflow: auto;
         // [菜单] 正常状态
@@ -155,7 +155,7 @@
         }
       }
       // 右下 主体
-      .el-main {
+      .el-main.d2-theme-container-main {
         padding: 0px;
         position: relative;
         overflow: hidden;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 54d274af..65055d47 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -2,9 +2,9 @@
 .theme-#{$theme-name} {
 
   // 背景图片和遮罩
-  .layout-main-group {
+  .d2-layout-main-group {
     background-color: $theme-bg-color;
-    .layout-main-mask {
+    .d2-layout-main-mask {
       background: $theme-bg-mask;
     }
   }
@@ -39,7 +39,7 @@
   }
   
   // 顶栏
-  .el-header {
+  .el-header.d2-theme-header {
     // 切换按钮
     .toggle-aside-btn {
       i {
@@ -51,7 +51,7 @@
       }
     }
     // 顶栏菜单
-    .el-menu {
+    .el-menu.d2-theme-header-menu {
       .el-menu-item {
         transition: border-top-color 0s;
         color: $theme-header-item-color;
@@ -115,9 +115,9 @@
     }
   }
   // [布局] 顶栏下面
-  .el-container {
+  .el-container.d2-theme-container {
     // 侧边栏
-    .el-aside {
+    .el-aside.d2-theme-container-aside {
       // 菜单为空的时候显示的信息
       .menu-empty {
         background: $theme-aside-menu-empty-background-color;
@@ -191,7 +191,7 @@
         }
       }
     }
-    .el-main {
+    .el-main.d2-theme-container-main {
       // 主体部分分为多页面控制器 和主体
       .d2-layout-main-header {
         // 多页面控制器
diff --git a/src/assets/style/theme/violet/index.scss b/src/assets/style/theme/violet/index.scss
index 156630be..66943b90 100644
--- a/src/assets/style/theme/violet/index.scss
+++ b/src/assets/style/theme/violet/index.scss
@@ -2,7 +2,7 @@
 @import '../theme.scss';
 
 .theme-#{$theme-name} {
-  .layout-main-group {
+  .d2-layout-main-group {
     background: #bc00e3;
     background: linear-gradient(120deg, #bc00e3 0%, #4EFFFB 100%);
   }
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index dc5dc5d6..97bb1b7c 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -1,9 +1,14 @@
 <template>
-  <div class="layout-main-group" :style="styleLayoutMainGroup" :class="{grayMode: isGrayMode}">
-    <div class="layout-main-mask"></div>
-    <el-container class="layout-main">
+  <div
+    class="d2-layout-main-group"
+    :style="styleLayoutMainGroup"
+    :class="{grayMode: isGrayMode}">
+    <!-- 半透明遮罩 -->
+    <div class="d2-layout-main-mask"></div>
+    <!-- 主体内容 -->
+    <el-container class="d2-layout-main-content">
       <!-- 顶栏 -->
-      <el-header>
+      <el-header class="d2-theme-header">
         <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
           <img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActive.value}/logo/icon-only.png`">
           <img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActive.value}/logo/all.png`">
@@ -11,7 +16,7 @@
         <div class="toggle-aside-btn" @click="collapse = !collapse">
           <d2-icon name="bars"/>
         </div>
-        <d2-layout-main-menu-header/>
+        <d2-layout-main-menu-header class="d2-theme-header-menu"/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
           <d2-layout-main-header-github/>
@@ -22,13 +27,13 @@
         </div>
       </el-header>
       <!-- 下面 主体 -->
-      <el-container>
+      <el-container class="d2-theme-container">
         <!-- 主体 侧边栏 -->
-        <el-aside ref="aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
+        <el-aside ref="aside" class="d2-theme-container-aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
           <d2-layout-main-menu-side :collapse="collapse"/>
         </el-aside>
         <!-- 主体 -->
-        <el-main>
+        <el-main class="d2-theme-container-main">
           <div class="d2-layout-main-header">
             <d2-multiple-page-control/>
           </div>
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 46f5b431..80a26f5b 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-5d07a0a3c1939c6162e76c9f15d7614697aa5a7d
\ No newline at end of file
+371d0012ac6ca136b6eb1ced00b4f1f1d4410111
\ No newline at end of file
diff --git a/src/pages/core/setting/index/index.vue b/src/pages/core/setting/index/index.vue
new file mode 100644
index 00000000..94e627d7
--- /dev/null
+++ b/src/pages/core/setting/index/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <d2-container type="full">
+    <d2-demo-page-cover
+      title="设置"
+      sub-title="系统设置">
+      <img :src="`${$assetsPublicPath}static/image/icon/500/setting.png`">
+    </d2-demo-page-cover>
+  </d2-container>
+</template>
diff --git a/src/pages/core/setting/theme/index.vue b/src/pages/core/setting/theme/index.vue
new file mode 100644
index 00000000..c4644e3b
--- /dev/null
+++ b/src/pages/core/setting/theme/index.vue
@@ -0,0 +1,29 @@
+<template>
+  <d2-container type="full" class="page">
+    <el-container>
+      <el-aside>1</el-aside>
+      <el-main>2</el-main>
+    </el-container>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.page {
+  // Your page style here
+  // Do not use empty rulesets
+  // If empty, delete it
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/demo/playground/theme/index.vue b/src/pages/demo/playground/theme/index.vue
index 52984acb..03066d41 100644
--- a/src/pages/demo/playground/theme/index.vue
+++ b/src/pages/demo/playground/theme/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container type="full" class="page-demo-playground-theme">
+  <d2-container type="full" class="page">
     <template slot="header">主题</template>
     <el-table :data="themeList" v-bind="table">
       <el-table-column prop="name" align="center" width="260"/>
@@ -60,7 +60,7 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
-.page-demo-playground-theme {
+.page {
   .theme-preview {
     height: 50px;
     width: 100px;
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 56b22f5e..ec011958 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-f8c29d259d65f4cb1bf09a96087e6bd73c78f24f
\ No newline at end of file
+85c7b06c7b454a5dc839da0766ea8db873a5c448
\ No newline at end of file
diff --git a/static/image/icon/500/setting.png.REMOVED.git-id b/static/image/icon/500/setting.png.REMOVED.git-id
new file mode 100644
index 00000000..a03c2440
--- /dev/null
+++ b/static/image/icon/500/setting.png.REMOVED.git-id
@@ -0,0 +1 @@
+9851294b2913d958bb04963a36bd096527b0f506
\ No newline at end of file

From d64d3cbc4f9040992c7fe4c3f1eb744c5c58fa9e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 23:15:49 +0800
Subject: [PATCH 016/128] no message

Former-commit-id: 574cc5941b0dd1c75d0355ddc8afe823b9f545b7 [formerly dcdb69c962e712fa885eb3cc436b1dffdfc3c68b] [formerly 574cc5941b0dd1c75d0355ddc8afe823b9f545b7 [formerly dcdb69c962e712fa885eb3cc436b1dffdfc3c68b] [formerly 574cc5941b0dd1c75d0355ddc8afe823b9f545b7 [formerly dcdb69c962e712fa885eb3cc436b1dffdfc3c68b] [formerly dcdb69c962e712fa885eb3cc436b1dffdfc3c68b [formerly 1cf1c792e4c633232a630145fb72c9fbf69be80c [formerly e109a21835146645124bfe135cd04f3c9b8f47de]]]]]
Former-commit-id: a94c13cbabe581be47acb9e632cbf99a5879578a
Former-commit-id: 06c197d68cca465971268fd498859925645092ff
Former-commit-id: bb51031c0529e94d9c62fc346c3cec5c7157108a [formerly f61d6c3ec2d4be672a3756b9d081f19b2d0fe01e]
Former-commit-id: 7fd64296d5db5f6558dff233271d61e46e1e51f1
Former-commit-id: 2fd87f0ff8eba7bf36197e4c9e110df075954d18
Former-commit-id: afafc2a4e06ee2f5d92b2f9675feb40d7ac38fe7
Former-commit-id: c6b2f56c8ee5e4ff76a596951f341bc6dd40b06c
Former-commit-id: b2e10701e07e32e9accabc62ac5d3c365e7e8aa6
---
 src/assets/style/theme/theme-base.scss       | 4 ++--
 src/assets/style/theme/theme.scss            | 4 ++--
 src/components/core/d2-layout-main/index.vue | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 326c1349..d9b4ea7d 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -162,7 +162,7 @@
         display: flex;
         flex-direction: column;
         // 主体部分分为多页面控制器 和主体
-        .d2-layout-main-header {
+        .d2-theme-container-main-header {
           flex-grow: 0;
           // 多页面控制器
           .d2-multiple-page-control {
@@ -176,7 +176,7 @@
           }
         }
         // 主体
-        .d2-layout-main-body {
+        .d2-theme-container-main-body {
           flex-grow: 1;
           position: relative;
           // 布局组件
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 65055d47..59dcad55 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -193,7 +193,7 @@
     }
     .el-main.d2-theme-container-main {
       // 主体部分分为多页面控制器 和主体
-      .d2-layout-main-header {
+      .d2-theme-container-main-header {
         // 多页面控制器
         .d2-multiple-page-control {
           .el-tabs__header.is-top {
@@ -230,7 +230,7 @@
         }
       }
       // 主体
-      .d2-layout-main-body {
+      .d2-theme-container-main-body {
         // 布局组件
         .container-component {
           // [组件] d2-container-full
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 97bb1b7c..c3989dba 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -34,10 +34,10 @@
         </el-aside>
         <!-- 主体 -->
         <el-main class="d2-theme-container-main">
-          <div class="d2-layout-main-header">
+          <div class="d2-theme-container-main-header">
             <d2-multiple-page-control/>
           </div>
-          <div class="d2-layout-main-body">
+          <div class="d2-theme-container-main-body">
             <transition name="fade-transverse">
               <keep-alive>
                 <router-view v-if="alive"/>

From 642a57fce88072837146242771b7601135fa98ed Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 23:17:06 +0800
Subject: [PATCH 017/128] no message

Former-commit-id: d6e75a334d8531d759e7f94f2e836c041e7550da [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad] [formerly d6e75a334d8531d759e7f94f2e836c041e7550da [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad] [formerly d6e75a334d8531d759e7f94f2e836c041e7550da [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad] [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad [formerly 4c11071f915c4f0116a46261b3dd770091972017 [formerly fcef7f9f40c200fe087bbe2b1d50d9990c9c2ee7]]]]]
Former-commit-id: 4cd0eed73bde345a69ae32bb429a9d0500185077
Former-commit-id: 0d242ffc8e8f781b00fda2c094949bd086ac9bb9
Former-commit-id: b033616bf69e58ab05fdccada41413976b34e35c [formerly b8a194d17dc99b589141b416122396929cff86b9]
Former-commit-id: 73a9f7165240ad39189f1c00dcdc596fd38872ef
Former-commit-id: f2d09e628c50423bd00729df777918004c872879
Former-commit-id: 1adb7b002e38ca0d2ce70310e39f2b95ac620525
Former-commit-id: f92f60c2b8b8196833686ddaabbf5a3b44ae8a64
Former-commit-id: aa20183d040bd2f6e5920906f79a223433fba929
---
 src/assets/style/theme/theme-base.scss       | 2 +-
 src/assets/style/theme/theme.scss            | 2 +-
 src/components/core/d2-layout-main/index.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index d9b4ea7d..95ec8d2c 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -56,7 +56,7 @@
         }
       }
       // [菜单] 顶栏
-      .el-menu.d2-theme-header-menu {
+      .el-menu {
         float: left;
         border-bottom: none;
         background-color: transparent;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 59dcad55..6ebf382f 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -51,7 +51,7 @@
       }
     }
     // 顶栏菜单
-    .el-menu.d2-theme-header-menu {
+    .el-menu {
       .el-menu-item {
         transition: border-top-color 0s;
         color: $theme-header-item-color;
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index c3989dba..3a7015de 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -16,7 +16,7 @@
         <div class="toggle-aside-btn" @click="collapse = !collapse">
           <d2-icon name="bars"/>
         </div>
-        <d2-layout-main-menu-header class="d2-theme-header-menu"/>
+        <d2-layout-main-menu-header/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
           <d2-layout-main-header-github/>

From 07eb0ac54ed81d9e46b5900f5d7deb12b2b7f104 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 00:18:50 +0800
Subject: [PATCH 018/128] no message

Former-commit-id: 14dcb39a84f37012dbc96ca8b89af5d2aec97d03 [formerly 14dcb39a84f37012dbc96ca8b89af5d2aec97d03 [formerly 14dcb39a84f37012dbc96ca8b89af5d2aec97d03 [formerly 14dcb39a84f37012dbc96ca8b89af5d2aec97d03 [formerly a390e8df109c570d1bde826e247640e8c789e6c8 [formerly f85dedacd9f81af4b66f7ec44650e6f04fb411ba]]]]]
Former-commit-id: e609185f9352e0ff444c0dc2ecc2956ce124f53b
Former-commit-id: e2cac8713eda2ab90cf52f4e1a420cf415dbcf60
Former-commit-id: a23b52723a1c6cae67f0f6aad0b1b91485f4eb4c [formerly 0bc974b72f95d4e6b8bbe8bd22448ce44abf40bd]
Former-commit-id: 078a690d15378ead3ca2b79b4c6eca96f253da59
Former-commit-id: a1b13823c6e28a77e509642239c9496fea5012fa
Former-commit-id: f38637c15162e58793c7c7f6d8d2bcb899625bdd
Former-commit-id: 5364a49b5383f9f0c01ec85abf727ca33a1f6ebf
Former-commit-id: 1f8a3acec1f6e615166f9ae32924927ecf91ceed
---
 .../core/d2-multiple-page-control/index.vue   |  1 -
 src/menu/index.js.REMOVED.git-id              |  2 +-
 src/pages/core/setting/theme/index.vue        | 29 -------------------
 src/router/routes.js.REMOVED.git-id           |  2 +-
 4 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 src/pages/core/setting/theme/index.vue

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 00217ed7..db7e0a59 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -4,7 +4,6 @@
     :value="pageCurrent"
     type="card"
     :closable="true"
-    :stretch="pageOpenedList.length > 1"
     @tab-click="handleClick">
     <el-tab-pane
       v-for="(page, index) in pageOpenedList"
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 80a26f5b..a836b17d 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-371d0012ac6ca136b6eb1ced00b4f1f1d4410111
\ No newline at end of file
+c02607ed6a82cd84405afe72723c3a3bb5bf245c
\ No newline at end of file
diff --git a/src/pages/core/setting/theme/index.vue b/src/pages/core/setting/theme/index.vue
deleted file mode 100644
index c4644e3b..00000000
--- a/src/pages/core/setting/theme/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <d2-container type="full" class="page">
-    <el-container>
-      <el-aside>1</el-aside>
-      <el-main>2</el-main>
-    </el-container>
-  </d2-container>
-</template>
-
-<script>
-export default {
-  data () {
-    return {}
-  },
-  computed: {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
-.page {
-  // Your page style here
-  // Do not use empty rulesets
-  // If empty, delete it
-}
-</style>
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index ec011958..15f1ab44 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-85c7b06c7b454a5dc839da0766ea8db873a5c448
\ No newline at end of file
+db0caf465ac803c34c944d37433696624422b82c
\ No newline at end of file

From ea279ec070b9f2b3b5b85dc381718f91ffe3e3be Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 07:59:03 +0800
Subject: [PATCH 019/128] no message

Former-commit-id: 7b1d09098f8cdb1f8c868728169f34d2948ef302 [formerly 7b1d09098f8cdb1f8c868728169f34d2948ef302 [formerly 7b1d09098f8cdb1f8c868728169f34d2948ef302 [formerly 7b1d09098f8cdb1f8c868728169f34d2948ef302 [formerly 0d5452563daf6af5143670eb619be1fb179fb1a3 [formerly 275ac47567ba771b1f52d33c9cd6c0af723bae92]]]]]
Former-commit-id: 2b35c977218a3a6278b5073a3f1c37dd3ba61cd5
Former-commit-id: 30f48ece8879d53d36deca92557cc971828d7723
Former-commit-id: b3c6821e9fff9744524a066d99f7d49ed4b464c6 [formerly 9f911f80f47b98390abb4cd6832fb45e0a16076a]
Former-commit-id: cbc10943d7f3368e69f50ed7ea63b6e6d4186326
Former-commit-id: 9e3cc8645db16e7942c7bf8fe6b48314a4ddc40d
Former-commit-id: 7e0e28fe59bb7754e62c9d1a35076af106af6e2e
Former-commit-id: fc47e64210e5bdfec843ca997739df7ccfd2bad1
Former-commit-id: b4fe4ecceba9d5ee2610bfcf804a06dbfc49af9f
---
 src/pages/core/setting/theme/custom.vue | 26 +++++++++++++++++++++++++
 src/pages/core/setting/theme/theme.vue  | 26 +++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/pages/core/setting/theme/custom.vue
 create mode 100644 src/pages/core/setting/theme/theme.vue

diff --git a/src/pages/core/setting/theme/custom.vue b/src/pages/core/setting/theme/custom.vue
new file mode 100644
index 00000000..a42e311b
--- /dev/null
+++ b/src/pages/core/setting/theme/custom.vue
@@ -0,0 +1,26 @@
+<template>
+  <d2-container type="full" class="page">
+    custom theme setting coming soon
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.page {
+  // Your page style here
+  // Do not use empty rulesets
+  // If empty, delete it
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/core/setting/theme/theme.vue b/src/pages/core/setting/theme/theme.vue
new file mode 100644
index 00000000..be0ae9c4
--- /dev/null
+++ b/src/pages/core/setting/theme/theme.vue
@@ -0,0 +1,26 @@
+<template>
+  <d2-container type="full" class="page">
+    theme setting coming soon
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.page {
+  // Your page style here
+  // Do not use empty rulesets
+  // If empty, delete it
+}
+</style>
\ No newline at end of file

From 41d03890dd076bcbd50455d092082d981fb00a5f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 08:06:48 +0800
Subject: [PATCH 020/128] no message

Former-commit-id: 64557eba27063be2a7bf6155abdb9e6960257281 [formerly 64557eba27063be2a7bf6155abdb9e6960257281 [formerly 64557eba27063be2a7bf6155abdb9e6960257281 [formerly 64557eba27063be2a7bf6155abdb9e6960257281 [formerly 9e5d9fd884d6c710421759189782f1c2641b0806 [formerly 3a65af4aff2a56931051a3b4022cd5b128b5e87c]]]]]
Former-commit-id: f83e0a0cabcdee6826bd614521fced09e1bf7c75
Former-commit-id: 1c63e125adfa60abd219bcbf38f9f3e7985967e8
Former-commit-id: 2f7bffa12d268a48b3a054e54679a8ae805ba36d [formerly c5f8e89b6bd5f3b9080c7c8c96eceb90acdb7894]
Former-commit-id: 48180b1768b550be5f44560d80fc9ce88d297608
Former-commit-id: e26c26e0d1e9655f1250fe632fc8a5b3bacc23d0
Former-commit-id: cb6eb5a29a1af0164cf7e8af3c8ab7eb78b8f893
Former-commit-id: ec4d7a81ab51cd2cc70e9251b1dee0e10958f32d
Former-commit-id: dafb1a7f9b1caf46ef9badf97308f4d67d6c71f2
---
 src/menu/index.js.REMOVED.git-id    | 2 +-
 src/router/routes.js.REMOVED.git-id | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index a836b17d..43ac2588 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-c02607ed6a82cd84405afe72723c3a3bb5bf245c
\ No newline at end of file
+d490236cefe994028877481378a746c127961b8a
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 15f1ab44..122631f5 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-db0caf465ac803c34c944d37433696624422b82c
\ No newline at end of file
+da015ca4f9149d9a74447ab5d1003b3c93e58547
\ No newline at end of file

From 75406e3d3141bdf46bfbb8739607f74906bce11d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 09:18:17 +0800
Subject: [PATCH 021/128] no message

Former-commit-id: 8f37a9ab91003199586822548b2ab4dad4365c48 [formerly 8f37a9ab91003199586822548b2ab4dad4365c48 [formerly 8f37a9ab91003199586822548b2ab4dad4365c48 [formerly 8f37a9ab91003199586822548b2ab4dad4365c48 [formerly 3fa57671ce059dc9105498324d796124c44eec20 [formerly 54ef70a9aa6c2fbdc3afaae82c583a9dd6184f36]]]]]
Former-commit-id: 73e125775a9b96c0728dcfe440ff7af50c9c2d83
Former-commit-id: 28362f415fc8ff668487d44eca347fb136ccffc7
Former-commit-id: 36403ff71596b74bef716028c0d25b2c53bad953 [formerly fb4c3201d0455bcb70913f1fd6662ac2d5088162]
Former-commit-id: cfd5272e3169363c9b545687d6e0a016c9b596d0
Former-commit-id: fcf7cbb087c38e8f5cefcfe19a03b3d54c25e87d
Former-commit-id: 0cea4eda5d45dc00a58dde26cf10663f8fa3f125
Former-commit-id: f651e4e2b3047e7a5cacd7ea71228af5601c53ca
Former-commit-id: c795caab437ec1189c1252838e5532135894b693
---
 .../core/d2-multiple-page-control/index.vue   | 46 ++++++++++++++++++-
 src/pages/core/setting/theme/theme.vue        | 25 +---------
 src/store/modules/d2admin.js                  | 14 +++++-
 3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index db7e0a59..5ac95c0b 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -4,7 +4,8 @@
     :value="pageCurrent"
     type="card"
     :closable="true"
-    @tab-click="handleClick">
+    @tab-click="handleClick"
+    @edit="handleTabsEdit">
     <el-tab-pane
       v-for="(page, index) in pageOpenedList"
       :key="index"
@@ -38,6 +39,49 @@ export default {
           query: page.query
         })
       }
+    },
+    handleTabsEdit(tagName, action) {
+      if (action === 'remove') {
+        this.closeTag(tagName)
+      }
+    },
+    /**
+     * 关闭一个指定的 tag
+     */
+    closeTag (tagName) {
+      // 下个新的页面
+      let newPage = this.pageOpenedList[0]
+      // 如果关闭的页面就是当前显示的页面
+      if (this.pageCurrent === tagName) {
+        // 去找一个新的页面
+        let len = this.pageOpenedList.length
+        for (let i = 1; i < len; i++) {
+          if (this.pageOpenedList[i].name === tagName) {
+            if (i < len - 1) {
+              newPage = this.pageOpenedList[i + 1]
+            } else {
+              newPage = this.pageOpenedList[i - 1]
+            }
+            break
+          }
+        }
+      } else {
+        // 关闭的页面不是当前的页面
+        // 这里暂时不需要做什么
+      }
+      this.$store.commit('d2adminTagClose', tagName)
+      if (this.pageCurrent === tagName) {
+        this.linkTo(newPage)
+      }
+    },
+    // TODO: 需要完善赋值
+    linkTo ({ name, argu, query }) {
+      let routerObj = {
+        name,
+        params: argu || {},
+        query
+      }
+      this.$router.push(routerObj)
     }
   }
 }
diff --git a/src/pages/core/setting/theme/theme.vue b/src/pages/core/setting/theme/theme.vue
index be0ae9c4..d2852d73 100644
--- a/src/pages/core/setting/theme/theme.vue
+++ b/src/pages/core/setting/theme/theme.vue
@@ -1,26 +1,5 @@
 <template>
-  <d2-container type="full" class="page">
-    theme setting coming soon
+  <d2-container>
+    <d2-theme-list/>
   </d2-container>
 </template>
-
-<script>
-export default {
-  data () {
-    return {}
-  },
-  computed: {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
-.page {
-  // Your page style here
-  // Do not use empty rulesets
-  // If empty, delete it
-}
-</style>
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 54cdc24e..af13832d 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -60,7 +60,7 @@ export default {
       state.tagPool = tagPool
     },
     /**
-     * 新增一个 tag
+     * 新增一个 tag (打开一个页面)
      * @param {state} state vuex state
      * @param {object} param1 new tag info
      */
@@ -82,6 +82,18 @@ export default {
         }).write()
       }
     },
+    /**
+     * 关闭一个 tag (关闭一个页面)
+     * @param {state} state vuex state
+     * @param {string} name close tag name
+     */
+    d2adminTagClose (state, name) {
+      // 找到这个页面在已经打开的数据里是第几个
+      const index = state.pageOpenedList.findIndex(page => page.name === name)
+      if (index >= 0) {
+        state.pageOpenedList.splice(index, 1)
+      }
+    },
     /**
      * 切换全屏
      * @param {state} state vuex state

From bf786d978891af46a7f5f1566ce9f2019941927e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 09:41:16 +0800
Subject: [PATCH 022/128] no message

Former-commit-id: 46934d9d1fe3020fcd10c258fbf26f147814135f [formerly 46934d9d1fe3020fcd10c258fbf26f147814135f [formerly 46934d9d1fe3020fcd10c258fbf26f147814135f [formerly 46934d9d1fe3020fcd10c258fbf26f147814135f [formerly b3e1461b6ea8591de714a33a9e52e4bb07d48d7d [formerly cab5ddc409113a23eae6291df46a37555238fb9f]]]]]
Former-commit-id: bb8e64aff5482c16aa96756b5966c00fe52be385
Former-commit-id: 45c0ee9b74bca8b1e885c19c5dc76d9801769781
Former-commit-id: 762189b20cd613e7740c0970d6274e4ded2c8efd [formerly a89e56287c0e00f74d851ee11713431c0162f507]
Former-commit-id: d6798c3d563d835f7f3a7fee25975622f8e8da3d
Former-commit-id: d660229504595bd39635f5b0ae66db593db5ca58
Former-commit-id: 73ce237bb3e34b7d864ea53d3176865bac7641fc
Former-commit-id: 123703b4b2a5bc6ae6088e9d9adfa4cda8d1020d
Former-commit-id: 9dd7e11ea0687ef14e9335b34f7312aa3f84ff55
---
 src/assets/style/theme/theme.scss             |  6 ++
 .../core/d2-multiple-page-control/index.vue   |  4 +-
 src/store/modules/d2admin.js                  | 60 +++++++------------
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 6ebf382f..b147ab7e 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -208,6 +208,12 @@
               border-left-color: $theme-multiple-page-control-border-color;
               &:first-child {
                 border-left: none;
+                &:hover {
+                  padding: 0px 20px;
+                }
+                .el-icon-close {
+                  display: none;
+                }
               }
             }
             .el-tabs__item.is-active {
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 5ac95c0b..86dbabee 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -42,7 +42,9 @@ export default {
     },
     handleTabsEdit(tagName, action) {
       if (action === 'remove') {
-        this.closeTag(tagName)
+        if (tagName !== 'index') {
+          this.closeTag(tagName)
+        }
       }
     },
     /**
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index af13832d..cdb2a560 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -21,6 +21,21 @@ export default {
     pageCurrent: ''
   },
   mutations: {
+    /**
+     * 将 state 中某一项存储到数据库
+     * @param {state} state vuex state
+     */
+    d2adminVuex2Db (state, key) {
+      const setting = db.get(key).find({uuid: util.uuid()})
+      if (setting.value()) {
+        setting.assign({value: state[key]}).write()
+      } else {
+        db.get(key).push({
+          uuid: util.uuid(),
+          value: state[key]
+        }).write()
+      }
+    },
     /**
      * 设置当前激活的页面 name
      * @param {state} state vuex state
@@ -41,15 +56,7 @@ export default {
       page.query = query || page.query
       state.pageOpenedList.splice(index, 1, page)
       // 更新设置到数据库
-      const setting = db.get('pageOpenedList').find({uuid: util.uuid()})
-      if (setting.value()) {
-        setting.assign({value: state.pageOpenedList}).write()
-      } else {
-        db.get('pageOpenedList').push({
-          uuid: util.uuid(),
-          value: state.pageOpenedList
-        }).write()
-      }
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
      * 保存 tagPool (候选池)
@@ -72,15 +79,7 @@ export default {
       // 添加进当前显示的页面数组
       state.pageOpenedList.push(newTag)
       // 更新设置到数据库
-      const setting = db.get('pageOpenedList').find({uuid: util.uuid()})
-      if (setting.value()) {
-        setting.assign({value: state.pageOpenedList}).write()
-      } else {
-        db.get('pageOpenedList').push({
-          uuid: util.uuid(),
-          value: state.pageOpenedList
-        }).write()
-      }
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
      * 关闭一个 tag (关闭一个页面)
@@ -125,17 +124,17 @@ export default {
     /**
      * 激活一个主题（应用到dom上）
      * @param {state} state vuex state
-     * @param {string} themeActiveValue 需要激活的主题名称
+     * @param {string} themeValue 需要激活的主题名称
      */
-    d2adminThemeSet (state, themeActiveValue) {
+    d2adminThemeSet (state, themeValue) {
       // 从列表里找到需要激活的主题的数据
-      const theme = state.themeList.find(e => e.value === themeActiveValue) || state.themeList[0]
+      const theme = state.themeList.find(e => e.value === themeValue) || state.themeList[0]
       // 设置 state
       state.themeActive = theme
       // 设置 dom
       document.body.className = `theme-${state.themeActive.value}`
       // 保存到数据库
-      this.commit('d2adminThemeSave', themeActiveValue)
+      this.commit('d2adminVuex2Db', 'themeActive')
     },
     /**
      * 从数据库加载主题设置
@@ -144,23 +143,6 @@ export default {
     d2adminThemeLoad (state) {
       const themeActive = db.get('themeActive').find({uuid: util.uuid()}).value()
       this.commit('d2adminThemeSet', themeActive ? themeActive.value : state.themeList[0].value)
-    },
-    /**
-     * 向数据保存一个主题
-     * @param {state} state vuex state
-     * @param {string} themeActiveValue 需要保存的主题名称
-     */
-    d2adminThemeSave (state, themeActiveValue) {
-      // 检查这个用户是否有主题设置
-      const setting = db.get('themeActive').find({uuid: util.uuid()})
-      if (setting.value()) {
-        setting.assign({value: themeActiveValue}).write()
-      } else {
-        db.get('themeActive').push({
-          uuid: util.uuid(),
-          value: themeActiveValue
-        }).write()
-      }
     }
   }
 }

From e9e29121873cea9952f49d63b5edabc1252ae6ec Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 09:46:15 +0800
Subject: [PATCH 023/128] no message

Former-commit-id: 0443e1b97b06ae127eaaa41bacbb5367df7d376a [formerly 0443e1b97b06ae127eaaa41bacbb5367df7d376a [formerly 0443e1b97b06ae127eaaa41bacbb5367df7d376a [formerly 0443e1b97b06ae127eaaa41bacbb5367df7d376a [formerly 47d763d40d139b8e69e306503a4df9954460fbb5 [formerly 2dcea71e99148211ad856d13193af5189ead5b82]]]]]
Former-commit-id: 71d6c48e8d309cab7265c2f12205b0b3f6df1383
Former-commit-id: bc44a6ef2f93b5674f8ae1729f1cb4cc92a0cb33
Former-commit-id: b55cf2677a26ff2bde87b1459b9e3f55d20c2f9d [formerly f22584059bfe219350573f29fbd9a576a29c6dfb]
Former-commit-id: bc4d9b4f170ab789608731901ee0c11bbf637479
Former-commit-id: 306fb6267a367bf9aacb6567a072d2b7daa75e6d
Former-commit-id: cb108493b7a9118471295f8ad6cd84694715e75b
Former-commit-id: 54173c605df41dda18e14771bb7cfbf70d759e5f
Former-commit-id: eb923b29e00c90ecb71ad42708f0c4a34e8056db
---
 docs/zh/guide/change-log.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 15186fe9..ce88ce00 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -5,6 +5,8 @@
 * [ 修改 ] 全局状态管理设计优化
 * [ 修改 ] 主题调优
 * [ 新增 ] playground 模块，方便测试和展示一些功能实现方式/调用方法
+* [ 新增 ] 多页模式
+* [ 新增 ] 多页模式缓存
 
 ## v1.1.3
 

From 973c0e6720775cd2baa4c685705748025ae83bee Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 10:46:16 +0800
Subject: [PATCH 024/128] no message

Former-commit-id: 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly 21ed621413d31f08bc09fef2434f346ccc6e35c4 [formerly ad5d4dfc63a11806f8520cace706ce6991799b1c [formerly d6b1c89dc39dbce331512f34ade3fd3aeb29aba5]]]]]
Former-commit-id: 30ac8d35a30f7c5d94147f7d2bfbd857459cdb15
Former-commit-id: 89d37a785bec75e4ab66271007c977b0d4b2269e
Former-commit-id: 0c1688272fc8ed888c40103e4754a0c98b064066 [formerly 3472c47ed9e316f10ff391f948848261772dbd41]
Former-commit-id: 527a5962a449368887d774783c39870527b1b972
Former-commit-id: 716620c7a2611ae6a6e65911b82a783cd3f18f00
Former-commit-id: 4db3f7630ffa62162b7e907d2a57791b747306b9
Former-commit-id: 1aa9c3087bb6df186392e09c85b88e64fb39daf9
Former-commit-id: b1eee3017a0c4654e6314d49a6d9c008213dc9c4
---
 src/assets/style/theme/theme-base.scss        | 39 +++++++++++++---
 src/assets/style/theme/theme.scss             | 10 +++++
 .../core/d2-multiple-page-control/index.vue   | 44 +++++++++++++------
 3 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 95ec8d2c..cf8423eb 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -165,19 +165,46 @@
         .d2-theme-container-main-header {
           flex-grow: 0;
           // 多页面控制器
-          .d2-multiple-page-control {
-            .el-tabs__header.is-top {
-              margin: 0px;
-              margin-right: 20px;
+          .d2-multiple-page-control-group {
+            display: flex;
+            margin-right: 20px;
+            .d2-multiple-page-control-content {
+              flex-grow: 1;
+              position: relative;
+              .d2-multiple-page-control-content-inner {
+                position: absolute;
+                left: 0px;
+                right: 0px;
+                .d2-multiple-page-control {
+                  .el-tabs__header.is-top {
+                    margin: 0px;
+                  }
+                  .el-tabs__nav {
+                    overflow: hidden;
+                  }
+                }
+              }
             }
-            .el-tabs__nav {
-              overflow: hidden;
+            .d2-multiple-page-control-btn {
+              position: relative;
+              bottom: -1px;
+              .el-dropdown {
+                .el-button-group {
+                  .el-button:first-child {
+                    border-bottom-left-radius: 0px;
+                  }
+                  .el-button:last-child {
+                    border-bottom-right-radius: 0px;
+                  }
+                }
+              }
             }
           }
         }
         // 主体
         .d2-theme-container-main-body {
           flex-grow: 1;
+          margin-top: 1px;
           position: relative;
           // 布局组件
           .container-component {
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index b147ab7e..0ae8ba93 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -234,6 +234,16 @@
             color: $theme-multiple-page-control-nav-next-color;
           }
         }
+        // 多页控制器的关闭控制
+        .d2-multiple-page-control-btn {
+          .el-dropdown {
+            .el-button-group {
+              .el-button {
+                border-color: $theme-multiple-page-control-border-color;
+              }
+            }
+          }
+        }
       }
       // 主体
       .d2-theme-container-main-body {
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 86dbabee..7b32c9f7 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -1,18 +1,34 @@
 <template>
-  <el-tabs
-    class="d2-multiple-page-control"
-    :value="pageCurrent"
-    type="card"
-    :closable="true"
-    @tab-click="handleClick"
-    @edit="handleTabsEdit">
-    <el-tab-pane
-      v-for="(page, index) in pageOpenedList"
-      :key="index"
-      :label="page.name"
-      :name="page.name">
-    </el-tab-pane>
-  </el-tabs>
+  <div class="d2-multiple-page-control-group">
+    <div class="d2-multiple-page-control-content">
+      <div class="d2-multiple-page-control-content-inner">
+        <el-tabs
+          class="d2-multiple-page-control"
+          :value="pageCurrent"
+          type="card"
+          :closable="true"
+          @tab-click="handleClick"
+          @edit="handleTabsEdit">
+          <el-tab-pane
+            v-for="(page, index) in pageOpenedList"
+            :key="index"
+            :label="page.name"
+            :name="page.name">
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+    <div class="d2-multiple-page-control-btn">
+      <el-dropdown split-button @click="handleClick">
+        <d2-icon name="trash"/>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item>关闭左侧</el-dropdown-item>
+          <el-dropdown-item>关闭右侧</el-dropdown-item>
+          <el-dropdown-item>全部关闭</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
 </template>
 
 <script>

From 3cef34afb6697905cc235e37eb198f480f6282df Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 10:53:44 +0800
Subject: [PATCH 025/128] no message

Former-commit-id: 2ec2adeb18748e8d7d3393613e79811818743abe [formerly 2ec2adeb18748e8d7d3393613e79811818743abe [formerly 2ec2adeb18748e8d7d3393613e79811818743abe [formerly 2ec2adeb18748e8d7d3393613e79811818743abe [formerly f0879e759cbb2d309119f0b623bafab25ff7f8a1 [formerly 8f484b46cbdabf58ef4a66bf504a5fa08bcb2228]]]]]
Former-commit-id: b8b12d6500e0a0c5ee5ff94d6d25d6cf85dbfbf4
Former-commit-id: 546fa77e4593eb327aa30f9ce5ab650f7797072b
Former-commit-id: 5d2475d9c827bee2b01762ad5a5c44d61e068a9e [formerly b70996164fc0dbd06feae0885a02c5f036eb9a00]
Former-commit-id: 3f9b5468f37fc1f9082eb876a9b2fe729933f2f0
Former-commit-id: c684a3306cb1dadc2a743e194704997b1bf1170a
Former-commit-id: e71581dba805576e1fffa2d440272d4cf43788ce
Former-commit-id: b0ebc8cb2a3a1e488f999734d6e25f7133bbb007
Former-commit-id: ad2caaa61a285a636965b7fd58da3a9cf2ca70c6
---
 .../core/d2-multiple-page-control/index.vue   | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 7b32c9f7..236065a0 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -20,11 +20,20 @@
     </div>
     <div class="d2-multiple-page-control-btn">
       <el-dropdown split-button @click="handleClick">
-        <d2-icon name="trash"/>
+        <d2-icon name="times"/>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item>关闭左侧</el-dropdown-item>
-          <el-dropdown-item>关闭右侧</el-dropdown-item>
-          <el-dropdown-item>全部关闭</el-dropdown-item>
+          <el-dropdown-item>
+            <d2-icon name="arrow-left" class="d2-mr-10"/>
+            关闭左侧
+          </el-dropdown-item>
+          <el-dropdown-item>
+            <d2-icon name="arrow-right" class="d2-mr-10"/>
+            关闭右侧
+          </el-dropdown-item>
+          <el-dropdown-item>
+            <d2-icon name="times" class="d2-mr-10"/>
+            全部关闭
+          </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -46,6 +55,9 @@ export default {
     })
   },
   methods: {
+    /**
+     * 接收点击 tab 标签的事件
+     */
     handleClick (tab, event) {
       const page = this.pageOpenedList.find(page => page.name === tab.name)
       if (page) {
@@ -56,11 +68,13 @@ export default {
         })
       }
     },
+    /**
+     * 点击 tab 上的删除按钮后首先触发这里
+     */
     handleTabsEdit(tagName, action) {
       if (action === 'remove') {
-        if (tagName !== 'index') {
-          this.closeTag(tagName)
-        }
+        // 首页的删除按钮已经隐藏 因此这里不用判断是 index
+        this.closeTag(tagName)
       }
     },
     /**

From b2a1940d945b2bf6c86dfb3a10441e186d8958a2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 11:23:33 +0800
Subject: [PATCH 026/128] no message

Former-commit-id: cdcdb5dd88e58a3e26f54ee3ae1a0cc83ce83f20 [formerly cdcdb5dd88e58a3e26f54ee3ae1a0cc83ce83f20 [formerly cdcdb5dd88e58a3e26f54ee3ae1a0cc83ce83f20 [formerly cdcdb5dd88e58a3e26f54ee3ae1a0cc83ce83f20 [formerly 31cec02dfd7c845e1a2d75bce165e6e3ec054c46 [formerly ff90e389af802780e7c3501d1c5d8387eb6af6b8]]]]]
Former-commit-id: f0c46800807863ab7b3629a35c3231baed8ea1c9
Former-commit-id: f6b4cf11d6b0839f112a1672c300d1fb6d59ba70
Former-commit-id: d03ee0f0af1c1f0d83779cf1834b181f711b953d [formerly 7787f7f1e003a2dec4a85a7551ba5a6ce31f630b]
Former-commit-id: 56ecb0cef906382f23131499fa34266c5f845086
Former-commit-id: 8df445034cab37061cd5953d22e814bbe26e6840
Former-commit-id: caf8c8d018f8ae1c04e537377e4860fe6d29ca8b
Former-commit-id: 18f23af64396ce297fb7cf494c30adbd05e239b1
Former-commit-id: 364ce101edd9df6e42b6bd0f22d0e002a61031c6
---
 .../core/d2-multiple-page-control/index.vue   | 24 +++++++++++++++++--
 src/store/modules/d2admin.js                  |  7 ++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 236065a0..56e99f2b 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -19,8 +19,8 @@
       </div>
     </div>
     <div class="d2-multiple-page-control-btn">
-      <el-dropdown split-button @click="handleClick">
-        <d2-icon name="times"/>
+      <el-dropdown split-button @click="handleControlBtnClick">
+        <d2-icon name="times-circle"/>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item>
             <d2-icon name="arrow-left" class="d2-mr-10"/>
@@ -32,6 +32,10 @@
           </el-dropdown-item>
           <el-dropdown-item>
             <d2-icon name="times" class="d2-mr-10"/>
+            关闭其它
+          </el-dropdown-item>
+          <el-dropdown-item>
+            <d2-icon name="times-circle" class="d2-mr-10"/>
             全部关闭
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -55,6 +59,13 @@ export default {
     })
   },
   methods: {
+    /**
+     * 接收点击关闭控制上按钮的事件
+     */
+    handleControlBtnClick () {
+      // 关闭所有
+      this.closeAllTag()
+    },
     /**
      * 接收点击 tab 标签的事件
      */
@@ -77,6 +88,15 @@ export default {
         this.closeTag(tagName)
       }
     },
+    /**
+     * 关闭全部的 tag
+     */
+    closeAllTag () {
+      this.$store.commit('d2adminTagCloseAll')
+      this.$router.push({
+        name: 'index'
+      })
+    },
     /**
      * 关闭一个指定的 tag
      */
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index cdb2a560..5af348ab 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -93,6 +93,13 @@ export default {
         state.pageOpenedList.splice(index, 1)
       }
     },
+    /**
+     * 关闭所有 tag
+     * @param {state} state vuex state
+     */
+    d2adminTagCloseAll (state) {
+      state.pageOpenedList.splice(1)
+    },
     /**
      * 切换全屏
      * @param {state} state vuex state

From c877e1598204888cfd22f37eaeb22e2312873499 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 11:30:48 +0800
Subject: [PATCH 027/128] no message

Former-commit-id: 44455561540efd5ee7eeda99619b56bbdc3c4483 [formerly 9eff67380b88fb469a12628c38644aaa8d8e7886] [formerly 44455561540efd5ee7eeda99619b56bbdc3c4483 [formerly 9eff67380b88fb469a12628c38644aaa8d8e7886] [formerly 44455561540efd5ee7eeda99619b56bbdc3c4483 [formerly 9eff67380b88fb469a12628c38644aaa8d8e7886] [formerly 9eff67380b88fb469a12628c38644aaa8d8e7886 [formerly fd4d47079158260cb6d680d0795df0302715b512 [formerly 371c006bdf5609bb48566173dd118d439674032c]]]]]
Former-commit-id: b105c75f6be816036ba15cda54b4500cf010f557
Former-commit-id: 66cf21c0c8b62a260ab0bfbfdfe8dfcd8d13e330
Former-commit-id: fd474a3d1044eeaf30c7ae6cb46fe3154afd9c3e [formerly dbc60930bc3cc385a4bea13408003daa41d73f4e]
Former-commit-id: a406577f63e8997311b04785b53b87a804fed948
Former-commit-id: f20d752037021c97391b032e86df77b986a4bb6c
Former-commit-id: 05d1e6a0dffbda5ac88b4c5b4b5c42ce23054abf
Former-commit-id: dbf7091388cc539bd9332fb9090fe5e66e1b173b
Former-commit-id: e7e320ae45961f33de11a4ca78aa0a69522ae65f
---
 .../core/d2-multiple-page-control/index.vue   | 50 +++++++++++++++++--
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 56e99f2b..0411588d 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -19,22 +19,22 @@
       </div>
     </div>
     <div class="d2-multiple-page-control-btn">
-      <el-dropdown split-button @click="handleControlBtnClick">
+      <el-dropdown split-button @click="handleControlBtnClick" @command="handleControlItemClick">
         <d2-icon name="times-circle"/>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item>
+          <el-dropdown-item command="left">
             <d2-icon name="arrow-left" class="d2-mr-10"/>
             关闭左侧
           </el-dropdown-item>
-          <el-dropdown-item>
+          <el-dropdown-item command="right">
             <d2-icon name="arrow-right" class="d2-mr-10"/>
             关闭右侧
           </el-dropdown-item>
-          <el-dropdown-item>
+          <el-dropdown-item command="other">
             <d2-icon name="times" class="d2-mr-10"/>
             关闭其它
           </el-dropdown-item>
-          <el-dropdown-item>
+          <el-dropdown-item command="all">
             <d2-icon name="times-circle" class="d2-mr-10"/>
             全部关闭
           </el-dropdown-item>
@@ -59,6 +59,28 @@ export default {
     })
   },
   methods: {
+    /**
+     * 接收点击关闭控制上选项的事件
+     */
+    handleControlItemClick (command) {
+      switch (command) {
+        case 'left':
+          console.log('left')
+          break;
+        case 'right':
+          console.log('right')
+          break;
+        case 'other':
+          console.log('other')
+          break;
+        case 'all':
+          console.log('all')
+          break;
+        default:
+          console.log('无效指令')
+          break;
+      }
+    },
     /**
      * 接收点击关闭控制上按钮的事件
      */
@@ -88,6 +110,24 @@ export default {
         this.closeTag(tagName)
       }
     },
+    /**
+     * 关闭左侧的 tag
+     */
+    closeAllTagLeft () {
+      //
+    },
+    /**
+     * 关闭右侧的 tag
+     */
+    closeAllTagRight () {
+      //
+    },
+    /**
+     * 关闭其它的 tag
+     */
+    closeAllTagOther () {
+      //
+    },
     /**
      * 关闭全部的 tag
      */

From bc97252bd86163e5e8de0af6f52964e469bae904 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 11:52:33 +0800
Subject: [PATCH 028/128] no message

Former-commit-id: 057dd0a1deaad680e991751bd1a36a9d17825fa8 [formerly 057dd0a1deaad680e991751bd1a36a9d17825fa8 [formerly 057dd0a1deaad680e991751bd1a36a9d17825fa8 [formerly 057dd0a1deaad680e991751bd1a36a9d17825fa8 [formerly 8e83a63e10145658744dd21445dad8eba44466a0 [formerly bd51475e9a45b64342a539141a2d3bad2b93defc]]]]]
Former-commit-id: 596bba56eb613636f5f5c7c7f5cbdb55a3d250d9
Former-commit-id: d6b4414ef70ac46f6c3c72392166d5d9d4810d10
Former-commit-id: c07b8cc58f3c720acb72e1393bf0fd13547cf329 [formerly 5ed4b1e3f9a4ef644f679333a491940a9c6af078]
Former-commit-id: c105880757bab8347a1c01d2c80f3784e0644bd8
Former-commit-id: b6129e20f9b75fce0d57eaad8db6498081b0ce51
Former-commit-id: 7612a3fe80fc49b88f8d850cb95a801e3c55ec69
Former-commit-id: 2a12c98c9f4d98436aed048cb079746dcc111b57
Former-commit-id: 38c475e3433acee4767d71aec229899729d1e01f
---
 .../core/d2-multiple-page-control/index.vue   | 22 +++---
 src/store/modules/d2admin.js                  | 77 ++++++++++++++-----
 2 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 0411588d..ede0c9ae 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -65,20 +65,20 @@ export default {
     handleControlItemClick (command) {
       switch (command) {
         case 'left':
-          console.log('left')
-          break;
+          this.closeAllTagLeft()
+          break
         case 'right':
-          console.log('right')
-          break;
+          this.closeAllTagRight()
+          break
         case 'other':
-          console.log('other')
-          break;
+          this.closeAllTagOther()
+          break
         case 'all':
-          console.log('all')
-          break;
+          this.closeAllTagAll()
+          break
         default:
           console.log('无效指令')
-          break;
+          break
       }
     },
     /**
@@ -104,7 +104,7 @@ export default {
     /**
      * 点击 tab 上的删除按钮后首先触发这里
      */
-    handleTabsEdit(tagName, action) {
+    handleTabsEdit (tagName, action) {
       if (action === 'remove') {
         // 首页的删除按钮已经隐藏 因此这里不用判断是 index
         this.closeTag(tagName)
@@ -126,7 +126,7 @@ export default {
      * 关闭其它的 tag
      */
     closeAllTagOther () {
-      //
+      this.$store.commit('d2adminTagCloseOther')
     },
     /**
      * 关闭全部的 tag
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 5af348ab..9deb3927 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -22,7 +22,8 @@ export default {
   },
   mutations: {
     /**
-     * 将 state 中某一项存储到数据库
+     * @class 通用工具
+     * @description 将 state 中某一项存储到数据库
      * @param {state} state vuex state
      */
     d2adminVuex2Db (state, key) {
@@ -37,7 +38,8 @@ export default {
       }
     },
     /**
-     * 设置当前激活的页面 name
+     * @class pageCurrent
+     * @description 设置当前激活的页面 name
      * @param {state} state vuex state
      * @param {string} name new name
      */
@@ -45,7 +47,17 @@ export default {
       state.pageCurrent = name
     },
     /**
-     * 更新页面列表上的某一项
+     * @class tagPool
+     * @description 保存 tagPool (候选池)
+     * @param {state} state vuex state
+     * @param {Array} tagPool tags
+     */
+    d2adminTagPoolSet (state, tagPool) {
+      state.tagPool = tagPool
+    },
+    /**
+     * @class pageOpenedList
+     * @description 更新页面列表上的某一项
      * @param {state} state vuex state
      * @param {info} param1 new page info
      */
@@ -59,20 +71,13 @@ export default {
       this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
-     * 保存 tagPool (候选池)
-     * @param {state} state vuex state
-     * @param {Array} tagPool tags
-     */
-    d2adminTagPoolSet (state, tagPool) {
-      state.tagPool = tagPool
-    },
-    /**
-     * 新增一个 tag (打开一个页面)
+     * @class pageOpenedList
+     * @description 新增一个 tag (打开一个页面)
      * @param {state} state vuex state
      * @param {object} param1 new tag info
      */
     d2adminTagIncreate (state, { tag, argu, query }) {
-      // 设置新的 tag
+      // 设置新的 tag 在新打开一个以前没打开过的页面时使用
       let newTag = tag
       newTag.argu = argu || newTag.argu
       newTag.query = query || newTag.query
@@ -82,7 +87,8 @@ export default {
       this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
-     * 关闭一个 tag (关闭一个页面)
+     * @class pageOpenedList
+     * @description 关闭一个 tag (关闭一个页面)
      * @param {state} state vuex state
      * @param {string} name close tag name
      */
@@ -92,16 +98,43 @@ export default {
       if (index >= 0) {
         state.pageOpenedList.splice(index, 1)
       }
+      // 更新设置到数据库
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
-     * 关闭所有 tag
+     * @class pageOpenedList
+     * @description 关闭当前激活之外的 tag
+     * @param {state} state vuex state
+     */
+    d2adminTagCloseOther (state) {
+      let currentIndex = 0
+      state.pageOpenedList.forEach((page, index) => {
+        if (page.name === state.pageCurrent) {
+          currentIndex = index
+        }
+      })
+      if (currentIndex === 0) {
+        state.pageOpenedList.splice(1)
+      } else {
+        state.pageOpenedList.splice(currentIndex + 1)
+        state.pageOpenedList.splice(1, currentIndex - 1)
+      }
+      // 更新设置到数据库
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
+    },
+    /**
+     * @class pageOpenedList
+     * @description 关闭所有 tag
      * @param {state} state vuex state
      */
     d2adminTagCloseAll (state) {
       state.pageOpenedList.splice(1)
+      // 更新设置到数据库
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
-     * 切换全屏
+     * @class isFullScreen
+     * @description 切换全屏
      * @param {state} state vuex state
      */
     d2adminFullScreenToggle (state) {
@@ -114,14 +147,16 @@ export default {
       }
     },
     /**
-     * 切换灰度状态
+     * @class isGrayMode
+     * @description 切换灰度状态
      * @param {state} state vuex state
      */
     d2adminGrayModeToggle (state) {
       state.isGrayMode = !state.isGrayMode
     },
     /**
-     * 设置灰度模式
+     * @class isGrayMode
+     * @description 设置灰度模式
      * @param {state} state vuex state
      * @param {boolean} value new value
      */
@@ -129,7 +164,8 @@ export default {
       state.isGrayMode = value
     },
     /**
-     * 激活一个主题（应用到dom上）
+     * @class themeActive
+     * @description 激活一个主题（应用到dom上）
      * @param {state} state vuex state
      * @param {string} themeValue 需要激活的主题名称
      */
@@ -144,7 +180,8 @@ export default {
       this.commit('d2adminVuex2Db', 'themeActive')
     },
     /**
-     * 从数据库加载主题设置
+     * @class themeActive
+     * @description 从数据库加载主题设置
      * @param {state} state vuex state
      */
     d2adminThemeLoad (state) {

From 2e6bb556113bd0b43728b27eead660d38fff17ea Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 11:59:45 +0800
Subject: [PATCH 029/128] no message

Former-commit-id: 3123de483a6b5abbd15b8ce8bd4d5b5428d39b3b [formerly 3123de483a6b5abbd15b8ce8bd4d5b5428d39b3b [formerly 3123de483a6b5abbd15b8ce8bd4d5b5428d39b3b [formerly 3123de483a6b5abbd15b8ce8bd4d5b5428d39b3b [formerly 637b320cf959b619863326f172f99d334eacae65 [formerly 8a7e4de2582817ecd7239d47e139ee4b6a350fdc]]]]]
Former-commit-id: 229208ac13a2a74eefba0e275b8d6a57bce796fb
Former-commit-id: 0f69eef13b3c6a7540fc1cbcdfbccbd5ff48a855
Former-commit-id: 833b1d0ad1915e411fc26a007140975afb374cb3 [formerly a73bf5168a2b36ba18d16b375b10957a4736634b]
Former-commit-id: a1fa346230b33b498e60df99bc93354c4f3c7a9e
Former-commit-id: 4296366eb30ba534eec60989bf187e3a4648efd3
Former-commit-id: 5c569feb58a462ab1dc4bf159ccc585c929c8b66
Former-commit-id: b785695d1da85ffc45b8de86e6ef9340af8ab1f0
Former-commit-id: bb42bdfc692066063adc8a6b40696f2576b7f4ea
---
 docs/zh/guide/change-log.md                            | 1 +
 src/components/core/d2-multiple-page-control/index.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index ce88ce00..2ac2e2da 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -7,6 +7,7 @@
 * [ 新增 ] playground 模块，方便测试和展示一些功能实现方式/调用方法
 * [ 新增 ] 多页模式
 * [ 新增 ] 多页模式缓存
+* [ 新增 ] 多页模式快速关闭
 
 ## v1.1.3
 
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index ede0c9ae..317e75a7 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -74,7 +74,7 @@ export default {
           this.closeAllTagOther()
           break
         case 'all':
-          this.closeAllTagAll()
+          this.closeAllTag()
           break
         default:
           console.log('无效指令')

From 0d44d584859676e35b325871d7a85271f105af27 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 15:43:22 +0800
Subject: [PATCH 030/128] no message

Former-commit-id: 86f9ed2fff02c4a5fafc731888781edccedc5a28 [formerly 95972867313a71c118ea0eff9a1476ec558550de] [formerly 86f9ed2fff02c4a5fafc731888781edccedc5a28 [formerly 95972867313a71c118ea0eff9a1476ec558550de] [formerly 86f9ed2fff02c4a5fafc731888781edccedc5a28 [formerly 95972867313a71c118ea0eff9a1476ec558550de] [formerly 95972867313a71c118ea0eff9a1476ec558550de [formerly 463e594a6422611dd505ad6632c04ffd36d5dc4e [formerly 3ba0fd928198f4defa5a0a80418f6845b0910afb]]]]]
Former-commit-id: b2cd29ab5f335d6458e649e8b075f73a3fdccab3
Former-commit-id: 5be4a40c9ba7df59fe9503dc43dcb8222bbe992f
Former-commit-id: c06aa08bf003516c444daeac5dd5a6c8d46a16f0 [formerly 7d9b2259e80e1063cd2180ba72501cf0a7ddbe0a]
Former-commit-id: d3114e236eea2869c4e06de235723761677d98bf
Former-commit-id: 3ae1bc3ab30b51c747f08e2fc3122f7558f0e71c
Former-commit-id: cf745e2968126d0bedf579bce2606cf7bf2a1570
Former-commit-id: f1aa2ab2b8f1b2e07a065d54ea520e7cce4a32f5
Former-commit-id: 744a9a299f2607ed751ed2118a841f6f2f9462f2
---
 .../core/d2-multiple-page-control/index.vue   | 30 ++++++++++---------
 src/store/modules/d2admin.js                  | 16 ++++++++++
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 317e75a7..43a9b469 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -60,7 +60,7 @@ export default {
   },
   methods: {
     /**
-     * 接收点击关闭控制上选项的事件
+     * @description 接收点击关闭控制上选项的事件
      */
     handleControlItemClick (command) {
       switch (command) {
@@ -82,14 +82,14 @@ export default {
       }
     },
     /**
-     * 接收点击关闭控制上按钮的事件
+     * @description 接收点击关闭控制上按钮的事件
      */
     handleControlBtnClick () {
       // 关闭所有
       this.closeAllTag()
     },
     /**
-     * 接收点击 tab 标签的事件
+     * @description 接收点击 tab 标签的事件
      */
     handleClick (tab, event) {
       const page = this.pageOpenedList.find(page => page.name === tab.name)
@@ -102,7 +102,7 @@ export default {
       }
     },
     /**
-     * 点击 tab 上的删除按钮后首先触发这里
+     * @description 点击 tab 上的删除按钮后首先触发这里
      */
     handleTabsEdit (tagName, action) {
       if (action === 'remove') {
@@ -111,25 +111,25 @@ export default {
       }
     },
     /**
-     * 关闭左侧的 tag
+     * @description 关闭左侧的 tag
      */
     closeAllTagLeft () {
-      //
+      this.$store.commit('d2adminTagCloseLeft')
     },
     /**
-     * 关闭右侧的 tag
+     * @description 关闭右侧的 tag
      */
     closeAllTagRight () {
-      //
+      this.$store.commit('d2adminTagCloseRight')
     },
     /**
-     * 关闭其它的 tag
+     * @description 关闭其它的 tag
      */
     closeAllTagOther () {
       this.$store.commit('d2adminTagCloseOther')
     },
     /**
-     * 关闭全部的 tag
+     * @description 关闭全部的 tag
      */
     closeAllTag () {
       this.$store.commit('d2adminTagCloseAll')
@@ -138,7 +138,7 @@ export default {
       })
     },
     /**
-     * 关闭一个指定的 tag
+     * @description 关闭一个指定的 tag
      */
     closeTag (tagName) {
       // 下个新的页面
@@ -166,11 +166,13 @@ export default {
         this.linkTo(newPage)
       }
     },
-    // TODO: 需要完善赋值
-    linkTo ({ name, argu, query }) {
+    /**
+     * @description 跳转到新的页面
+     */
+    linkTo ({ name = '', argu = {}, query = {} }) {
       let routerObj = {
         name,
-        params: argu || {},
+        params: argu,
         query
       }
       this.$router.push(routerObj)
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 9deb3927..c04cbe9b 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -100,6 +100,22 @@ export default {
       }
       // 更新设置到数据库
       this.commit('d2adminVuex2Db', 'pageOpenedList')
+    },
+    /**
+     * @class pageOpenedList
+     * @description 关闭当前标签左边的标签
+     * @param {state} state vuex state
+     */
+    d2adminTagCloseLeft (state) {
+
+    },
+    /**
+     * @class pageOpenedList
+     * @description 关闭当前标签右边的标签
+     * @param {state} state vuex state
+     */
+    d2adminTagCloseRight (state) {
+
     },
     /**
      * @class pageOpenedList

From 6906f7d5e7ebee553ac04f11039e144f9a419269 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 15:51:18 +0800
Subject: [PATCH 031/128] no message

Former-commit-id: e8bd7cc50b71e33351940ca4f86976efabde73ee [formerly 8c6e4b28d15eacb09c7f8eecef5089625a60fc69] [formerly e8bd7cc50b71e33351940ca4f86976efabde73ee [formerly 8c6e4b28d15eacb09c7f8eecef5089625a60fc69] [formerly e8bd7cc50b71e33351940ca4f86976efabde73ee [formerly 8c6e4b28d15eacb09c7f8eecef5089625a60fc69] [formerly 8c6e4b28d15eacb09c7f8eecef5089625a60fc69 [formerly 9a33a5f25529a894c50f3e6f5fbb1a9035689793 [formerly 9d3c3ac74a16d014dfad32381b60eba4a2c43625]]]]]
Former-commit-id: da23a8aa024f578750bdeed60d14eecf58c1bd36
Former-commit-id: a39ee1f8b67deaae09a1eb9c7d1e6d9eb2a7e1df
Former-commit-id: c93a0c7bcf82275ee182ca504110529fc3ba141f [formerly c8aefa9d4dbc65e6a0dd013314c14c98bf3c455c]
Former-commit-id: 599ab8dcb8e8f2f56cb7885779c9ce93a1e2e90e
Former-commit-id: 110e17a3dbabe71c2aa2585bd942b15edb5c9c94
Former-commit-id: a46a9428cb2f865b2b4521186509e590b8edff89
Former-commit-id: d5d75597de6e5b093ccfe01929146a79d9c4e484
Former-commit-id: 2f0531a412f1905651d45b9282bc3dc3531376d8
---
 src/store/modules/d2admin.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index c04cbe9b..1edf5951 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -107,7 +107,17 @@ export default {
      * @param {state} state vuex state
      */
     d2adminTagCloseLeft (state) {
-
+      let currentIndex = 0
+      state.pageOpenedList.forEach((page, index) => {
+        if (page.name === state.pageCurrent) {
+          currentIndex = index
+        }
+      })
+      if (currentIndex > 0) {
+        state.pageOpenedList.splice(1, currentIndex - 1)
+      }
+      // 更新设置到数据库
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -115,7 +125,15 @@ export default {
      * @param {state} state vuex state
      */
     d2adminTagCloseRight (state) {
-
+      let currentIndex = 0
+      state.pageOpenedList.forEach((page, index) => {
+        if (page.name === state.pageCurrent) {
+          currentIndex = index
+        }
+      })
+      state.pageOpenedList.splice(currentIndex + 1)
+      // 更新设置到数据库
+      this.commit('d2adminVuex2Db', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList

From ef4992ae527c34880d297316a33975343d34bdc7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 16:26:45 +0800
Subject: [PATCH 032/128] no message

Former-commit-id: b632d6424f412c396322c6dcba4c30a9e49a1259 [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d] [formerly b632d6424f412c396322c6dcba4c30a9e49a1259 [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d] [formerly b632d6424f412c396322c6dcba4c30a9e49a1259 [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d] [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d [formerly af1a65d4356d15f94c9bc7a91ce1f4d484a80fcf [formerly efb8c71eca3e74dcae10402308de8b6bfe39153e]]]]]
Former-commit-id: 4828ba46103d0a7c8e63ee8eb585ff2bf9f5884c
Former-commit-id: 6e4b91c1f6f0fb38689a61a7949e1dd15579270d
Former-commit-id: aae30e98a077fe2f2d117fddd1cf37c4aafadbd3 [formerly 18be65e9ba9d8a8d66a8fdc12b38e669a2a4c42b]
Former-commit-id: ff755de34fb6e691b9dbbf4ce3eca9be4574da24
Former-commit-id: 9d6328bb28adeb12574a46ce9f1762ebd06c9ddd
Former-commit-id: 825f14bed9c794c4d92b34b620ee5a30b910f246
Former-commit-id: 1598f53f9c914a477a9dc2d262b038449f43ecd4
Former-commit-id: ec19d1d3a4ef2346434ddbf30aaeea3c87d32601
---
 src/assets/style/theme/list.js               | 20 +++++------
 src/components/core/d2-layout-main/index.vue | 14 ++++----
 src/components/core/d2-theme-list/index.vue  | 20 ++++++-----
 src/libs/db.js                               |  2 +-
 src/store/modules/d2admin.js                 | 38 +++++++++++++-------
 5 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/src/assets/style/theme/list.js b/src/assets/style/theme/list.js
index 2dfcabc6..55173bdd 100644
--- a/src/assets/style/theme/list.js
+++ b/src/assets/style/theme/list.js
@@ -1,29 +1,29 @@
 export default [
   {
-    name: 'd2admin 经典',
-    value: 'd2',
+    title: 'd2admin 经典',
+    name: 'd2',
     preview: 'static/image/theme/d2/preview@2x.png'
   },
   {
-    name: '紫罗兰',
-    value: 'violet',
+    title: '紫罗兰',
+    name: 'violet',
     preview: 'static/image/theme/violet/preview@2x.png'
   },
   {
-    name: '简约线条',
-    value: 'line',
+    title: '简约线条',
+    name: 'line',
     backgroundImage: 'static/image/bg/line-squashed.jpg',
     preview: 'static/image/theme/line/preview@2x.png'
   },
   {
-    name: '流星',
-    value: 'star',
+    title: '流星',
+    name: 'star',
     backgroundImage: 'static/image/bg/star-squashed.jpg',
     preview: 'static/image/theme/star/preview@2x.png'
   },
   {
-    name: 'Tomorrow Night Blue (vsCode)',
-    value: 'tomorrow-night-blue',
+    title: 'Tomorrow Night Blue (vsCode)',
+    name: 'tomorrow-night-blue',
     preview: 'static/image/theme/tomorrow-night-blue/preview@2x.png'
   }
 ]
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 3a7015de..5be2c48e 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -10,8 +10,8 @@
       <!-- 顶栏 -->
       <el-header class="d2-theme-header">
         <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-          <img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActive.value}/logo/icon-only.png`">
-          <img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActive.value}/logo/all.png`">
+          <img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.value}/logo/icon-only.png`">
+          <img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.value}/logo/all.png`">
         </div>
         <div class="toggle-aside-btn" @click="collapse = !collapse">
           <d2-icon name="bars"/>
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapGetters, mapMutations } from 'vuex'
 export default {
   name: 'd2-layout-main',
   components: {
@@ -77,13 +77,15 @@ export default {
   },
   computed: {
     ...mapState({
-      themeActive: state => state.d2admin.themeActive,
       isGrayMode: state => state.d2admin.isGrayMode
     }),
+    ...mapGetters([
+      'themeActiveSetting'
+    ]),
     styleLayoutMainGroup () {
       return {
-        ...this.themeActive.backgroundImage ? {
-          backgroundImage: `url('${this.$assetsPublicPath}${this.themeActive.backgroundImage}')`
+        ...this.themeActiveSetting.backgroundImage ? {
+          backgroundImage: `url('${this.$assetsPublicPath}${this.themeActiveSetting.backgroundImage}')`
         } : {}
       }
     },
diff --git a/src/components/core/d2-theme-list/index.vue b/src/components/core/d2-theme-list/index.vue
index c46506e0..45ce5426 100644
--- a/src/components/core/d2-theme-list/index.vue
+++ b/src/components/core/d2-theme-list/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-table :data="themeList" v-bind="table">
-    <el-table-column prop="name" align="center" width="160"/>
+    <el-table-column prop="title" align="center" width="160"/>
     <el-table-column label="预览" width="120">
       <div
         slot-scope="scope"
@@ -10,15 +10,15 @@
     </el-table-column>
     <el-table-column prop="address" align="center">
       <template slot-scope="scope">
-        <el-button v-if="themeActive.value === scope.row.value" type="success" icon="el-icon-check" round>已激活</el-button>
-        <el-button v-else round @click="handleSelectTheme(scope.row.value)">使用</el-button>
+        <el-button v-if="themeActiveSetting.name === scope.row.name" type="success" icon="el-icon-check" round>已激活</el-button>
+        <el-button v-else round @click="handleSelectTheme(scope.row.name)">使用</el-button>
       </template>
     </el-table-column>
   </el-table>
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapGetters, mapMutations } from 'vuex'
 export default {
   name: 'd2-theme-list',
   data () {
@@ -31,16 +31,18 @@ export default {
   },
   computed: {
     ...mapState({
-      themeList: state => state.d2admin.themeList,
-      themeActive: state => state.d2admin.themeActive
-    })
+      themeList: state => state.d2admin.themeList
+    }),
+    ...mapGetters([
+      'themeActiveSetting'
+    ])
   },
   methods: {
     ...mapMutations([
       'd2adminThemeSet'
     ]),
-    handleSelectTheme (value) {
-      this.d2adminThemeSet(value)
+    handleSelectTheme (name) {
+      this.d2adminThemeSet(name)
     }
   }
 }
diff --git a/src/libs/db.js b/src/libs/db.js
index 869ddd50..8d403104 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -5,7 +5,7 @@ const adapter = new LocalStorage('d2admin')
 const db = low(adapter)
 
 db.defaults({
-  themeActive: [],
+  themeActiveName: [],
   pageOpenedList: []
 })
   .write()
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 1edf5951..9bf06016 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -10,7 +10,7 @@ export default {
     isGrayMode: false,
     // 主题
     themeList,
-    themeActive: themeList[1],
+    themeActiveName: themeList[0].name, // 这应该是一个名字 不是对象
     // 可以在多页 tab 模式下显示的页面
     tagPool: [],
     // 当前显示的多页面列表
@@ -20,6 +20,15 @@ export default {
     // 当前页面
     pageCurrent: ''
   },
+  getters: {
+    /**
+     * @description 返回当前的主题信息 不是一个名字 而是所有的主题数据
+     * @param {state} state vuex state
+     */
+    themeActiveSetting (state) {
+      return state.themeList.find(theme => theme.name === state.themeActiveName)
+    }
+  },
   mutations: {
     /**
      * @class 通用工具
@@ -198,29 +207,34 @@ export default {
       state.isGrayMode = value
     },
     /**
-     * @class themeActive
+     * @class themeActiveName
      * @description 激活一个主题（应用到dom上）
      * @param {state} state vuex state
      * @param {string} themeValue 需要激活的主题名称
      */
-    d2adminThemeSet (state, themeValue) {
-      // 从列表里找到需要激活的主题的数据
-      const theme = state.themeList.find(e => e.value === themeValue) || state.themeList[0]
-      // 设置 state
-      state.themeActive = theme
+    d2adminThemeSet (state, themeName) {
+      // 检查这个主题在主题列表里是否存在
+      const theme = state.themeList.find(e => e.name === themeName)
+      if (theme) {
+        // 设置 state
+        state.themeActiveName = themeName
+      } else {
+        // 设置为列表第一个主题
+        state.themeActiveName = state.themeList[0].name
+      }
       // 设置 dom
-      document.body.className = `theme-${state.themeActive.value}`
+      document.body.className = `theme-${state.themeActiveName}`
       // 保存到数据库
-      this.commit('d2adminVuex2Db', 'themeActive')
+      this.commit('d2adminVuex2Db', 'themeActiveName')
     },
     /**
-     * @class themeActive
+     * @class themeActiveName
      * @description 从数据库加载主题设置
      * @param {state} state vuex state
      */
     d2adminThemeLoad (state) {
-      const themeActive = db.get('themeActive').find({uuid: util.uuid()}).value()
-      this.commit('d2adminThemeSet', themeActive ? themeActive.value : state.themeList[0].value)
+      const themeActiveName = db.get('themeActiveName').find({uuid: util.uuid()}).value()
+      this.commit('d2adminThemeSet', themeActiveName.value || state.themeList[0].name)
     }
   }
 }

From bb93372a322738698307e9ec670b7d6c4921934a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 16:32:39 +0800
Subject: [PATCH 033/128] no message

Former-commit-id: a4766e75abf319ce89b9a0f4a3ceb97bc1bd7227 [formerly a4766e75abf319ce89b9a0f4a3ceb97bc1bd7227 [formerly a4766e75abf319ce89b9a0f4a3ceb97bc1bd7227 [formerly a4766e75abf319ce89b9a0f4a3ceb97bc1bd7227 [formerly 2615751c4f188770651bfea90bb1f078a6810fb7 [formerly 74c50920b94a6ca5fc7c06c92e7cc1188ea20102]]]]]
Former-commit-id: ee4f713add089a654893db4d7c0606e06ea56aa0
Former-commit-id: 2fcdefc68f10e92895a68e507fb7a23e6d52ec54
Former-commit-id: 69ab4b81c86b55ddf75744ab9d68b9b35b835b3d [formerly afcd944ebc30a0c312617b5f4d39df522f384475]
Former-commit-id: 4c2bc76f3f79ad0a656562d935e9ec4e1e57b215
Former-commit-id: bdd3dd8cc8e9fef3905abf0902852a1d9f83c7ea
Former-commit-id: f8c245182f90a438e4be31259a9041e3b04216a4
Former-commit-id: 397d87f0994ab8aa3db374b068c8996cd0e4f332
Former-commit-id: 45291cf1fb05e8861793ab09c66fdfa1857cdb2a
---
 src/components/core/d2-theme-list/index.vue | 12 +++++-------
 src/pages/demo/playground/theme/index.vue   | 12 ++++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/core/d2-theme-list/index.vue b/src/components/core/d2-theme-list/index.vue
index 45ce5426..5a4fa3df 100644
--- a/src/components/core/d2-theme-list/index.vue
+++ b/src/components/core/d2-theme-list/index.vue
@@ -10,7 +10,7 @@
     </el-table-column>
     <el-table-column prop="address" align="center">
       <template slot-scope="scope">
-        <el-button v-if="themeActiveSetting.name === scope.row.name" type="success" icon="el-icon-check" round>已激活</el-button>
+        <el-button v-if="themeActiveName === scope.row.name" type="success" icon="el-icon-check" round>已激活</el-button>
         <el-button v-else round @click="handleSelectTheme(scope.row.name)">使用</el-button>
       </template>
     </el-table-column>
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters, mapMutations } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 export default {
   name: 'd2-theme-list',
   data () {
@@ -31,11 +31,9 @@ export default {
   },
   computed: {
     ...mapState({
-      themeList: state => state.d2admin.themeList
-    }),
-    ...mapGetters([
-      'themeActiveSetting'
-    ])
+      themeList: state => state.d2admin.themeList,
+      themeActiveName: state => state.d2admin.themeActiveName
+    })
   },
   methods: {
     ...mapMutations([
diff --git a/src/pages/demo/playground/theme/index.vue b/src/pages/demo/playground/theme/index.vue
index 03066d41..8a3981cf 100644
--- a/src/pages/demo/playground/theme/index.vue
+++ b/src/pages/demo/playground/theme/index.vue
@@ -12,8 +12,8 @@
       </el-table-column>
       <el-table-column prop="address" align="center">
         <template slot-scope="scope">
-          <el-button v-if="themeActive.value === scope.row.value" type="success" icon="el-icon-check" round>已激活</el-button>
-          <el-button v-else round @click="handleSelectTheme(scope.row.value)">使用</el-button>
+          <el-button v-if="themeActiveName === scope.row.name" type="success" icon="el-icon-check" round>已激活</el-button>
+          <el-button v-else round @click="handleSelectTheme(scope.row.name)">使用</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -25,7 +25,7 @@
       </el-button>
     </div>
     <template slot="footer">
-      <el-button type="primary" size="small">当前激活主题 {{themeActive.name}}</el-button>
+      <el-button type="primary" size="small">当前激活主题 {{themeActiveName}}</el-button>
     </template>
   </d2-container>
 </template>
@@ -44,15 +44,15 @@ export default {
   computed: {
     ...mapState({
       themeList: state => state.d2admin.themeList,
-      themeActive: state => state.d2admin.themeActive
+      themeActiveName: state => state.d2admin.themeActiveName
     })
   },
   methods: {
     ...mapMutations([
       'd2adminThemeSet'
     ]),
-    handleSelectTheme (value) {
-      this.d2adminThemeSet(value)
+    handleSelectTheme (name) {
+      this.d2adminThemeSet(name)
     }
   }
 }

From 318e2c44cabe200dddcf687503c57f9160156553 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 16:33:11 +0800
Subject: [PATCH 034/128] no message

Former-commit-id: 8a9ca84d14eb84dc4e1b9a4e133bd6cfffa3ca5c [formerly 8a9ca84d14eb84dc4e1b9a4e133bd6cfffa3ca5c [formerly 8a9ca84d14eb84dc4e1b9a4e133bd6cfffa3ca5c [formerly 8a9ca84d14eb84dc4e1b9a4e133bd6cfffa3ca5c [formerly 9621536a7a80c42195b37951007c99e03aa3cadd [formerly 17e387559a5a115b8d5dc78736e44b18e3e75e92]]]]]
Former-commit-id: abc8ed86cb533c85faa94a262af8c1b3f3e30459
Former-commit-id: 21220fadf5b5d8a32286ccea7e95f784d04dc687
Former-commit-id: ec4dbab4a4d7b177746f58da3a22386da5baa8a8 [formerly 04bb40e0dbba45d6c74c7778c15bf55240f7fc13]
Former-commit-id: e2c15ec309988b9c73d5044d8caeb3a41290deec
Former-commit-id: 089eb39c9ca4aa27c65f36db3193bc0ec3a3b017
Former-commit-id: b93dcb094f0af0ad26f326da4d9b875ad236065d
Former-commit-id: ab9c290388603587cab3bf0dd2712c47a98e7d1f
Former-commit-id: 3fdd316ac6748fcd100ea4b62ab56681f525f5e2
---
 src/components/core/d2-layout-main/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 5be2c48e..3e4e25d4 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -10,8 +10,8 @@
       <!-- 顶栏 -->
       <el-header class="d2-theme-header">
         <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-          <img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.value}/logo/icon-only.png`">
-          <img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.value}/logo/all.png`">
+          <img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
+          <img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.name}/logo/all.png`">
         </div>
         <div class="toggle-aside-btn" @click="collapse = !collapse">
           <d2-icon name="bars"/>

From 83c54cc99557c284fdec4609ee61c0a430d27418 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 16:37:26 +0800
Subject: [PATCH 035/128] no message

Former-commit-id: df63abb278791c41d643a4834f92435afe14ab6c [formerly 0f3174933dbd504acd096e78c9cf77dc9834c4a0] [formerly df63abb278791c41d643a4834f92435afe14ab6c [formerly 0f3174933dbd504acd096e78c9cf77dc9834c4a0] [formerly df63abb278791c41d643a4834f92435afe14ab6c [formerly 0f3174933dbd504acd096e78c9cf77dc9834c4a0] [formerly 0f3174933dbd504acd096e78c9cf77dc9834c4a0 [formerly 5524f18a464036d7dc4b355f9048aaaa5f08ef03 [formerly edb0262bff13d645d8c29327a21fb789d66f9f79]]]]]
Former-commit-id: d3da922f895c718bd0ebac948320690c26e05ffb
Former-commit-id: cce2f1d767ea80d520105d64715b892d91f9c23d
Former-commit-id: 5486d2a08c2a6625fd28de1521f61d0eb9475eb4 [formerly 72d29e2a3c47c97bf977aedce66f8e2be778f153]
Former-commit-id: 43730fbbb1270aaf45bdb6a8a817041cb1b9f7fb
Former-commit-id: e7b081ec5b41433ef0193b3074ad7a271ca9c213
Former-commit-id: 5501dedf767eaebbb86ea119e479e14507eedbbe
Former-commit-id: 1998e2b885e155ab3b2a2395df8cc1c8d01a0e6c
Former-commit-id: 729debde2da5c6ef4c70a596ddc57e07d0442d08
---
 deploy-github-auto-save.sh             | 5 -----
 deploy-doc.sh => deploy/doc.sh         | 0
 deploy-github.sh => deploy/github.sh   | 0
 deploy-preview.sh => deploy/preview.sh | 0
 4 files changed, 5 deletions(-)
 delete mode 100755 deploy-github-auto-save.sh
 rename deploy-doc.sh => deploy/doc.sh (100%)
 rename deploy-github.sh => deploy/github.sh (100%)
 rename deploy-preview.sh => deploy/preview.sh (100%)

diff --git a/deploy-github-auto-save.sh b/deploy-github-auto-save.sh
deleted file mode 100755
index 61fde96c..00000000
--- a/deploy-github-auto-save.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -e
-
-git add --all
-
-git commit -m 'commit with auto save'
\ No newline at end of file
diff --git a/deploy-doc.sh b/deploy/doc.sh
similarity index 100%
rename from deploy-doc.sh
rename to deploy/doc.sh
diff --git a/deploy-github.sh b/deploy/github.sh
similarity index 100%
rename from deploy-github.sh
rename to deploy/github.sh
diff --git a/deploy-preview.sh b/deploy/preview.sh
similarity index 100%
rename from deploy-preview.sh
rename to deploy/preview.sh

From 61b1540a0407cbc7204d40697b755e7efa670b86 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 16:45:59 +0800
Subject: [PATCH 036/128] no message

Former-commit-id: e522f6b89ca68bf9e018fcb7e7a40ad4c5de0f7c [formerly 18c44184ac8192fe3792dab6406e3954d42ab335] [formerly e522f6b89ca68bf9e018fcb7e7a40ad4c5de0f7c [formerly 18c44184ac8192fe3792dab6406e3954d42ab335] [formerly e522f6b89ca68bf9e018fcb7e7a40ad4c5de0f7c [formerly 18c44184ac8192fe3792dab6406e3954d42ab335] [formerly 18c44184ac8192fe3792dab6406e3954d42ab335 [formerly c672c4439034ec267824f00aa9c6b92f69f58fb4 [formerly 3da2aa1d0934279d4007dd0ab48869f047c46334]]]]]
Former-commit-id: 5046351e91730896c3038ee83e2c200475606d7f
Former-commit-id: b8e4d7bf7f6140f78836a6f40eb9683f6b48bb44
Former-commit-id: 2ad5834246ed76089982b1b2770ef41fc0b8faf1 [formerly 5e481f769113c12391c97c6f40b005a10161ab62]
Former-commit-id: 13746cdd511ad1a338bf26ddcad7ca2acac32f98
Former-commit-id: e3a9c06f2f972e6fc27037ef55ae2cba8de52dc4
Former-commit-id: d2f9f1de0cb05366b661ea9c2762e9e14377361d
Former-commit-id: f42ee63d81a7fc527778fdf420e52214ac6a9b86
Former-commit-id: c5786b65ca5b63b158d9825c7499917b59c5fe31
---
 src/router/index.js                 | 1 -
 src/router/routes.js.REMOVED.git-id | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 7d3cdf72..6a79cb90 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,7 +34,6 @@ router.beforeEach((to, from, next) => {
   }
 })
 
-// TODO: 路由跳转后自动滚动到顶部
 router.afterEach(to => {
   // 需要的信息
   const app = router.app
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 122631f5..4b19a510 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-da015ca4f9149d9a74447ab5d1003b3c93e58547
\ No newline at end of file
+7cc39e5aa61631be559f5b0319ee5a1915748943
\ No newline at end of file

From 3dbbedab1918853ce15d40d9080abd44f8117524 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 17:05:08 +0800
Subject: [PATCH 037/128] no message

Former-commit-id: f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly 7d74baa4d8735b5d53d887764596718a452eb882 [formerly 2d951cb28db647f9625b2cbc51a9044662bb6ba6]]]]]
Former-commit-id: 114d9468457a4726368f5b5b6d623bf37ba1c62f
Former-commit-id: 5e998690676c64c6802d74841e3227c169fe3657
Former-commit-id: 1ae7da9fb2ab678d06cc46a206440c661fa19778 [formerly b41944d9b4d60f08dbc231ffc4bdc6409cb56190]
Former-commit-id: ef76da60c7f97f35b784cd365bb4376c514c5443
Former-commit-id: 7515c1cf89bc0c3061d491303108b75f0c4d4b2f
Former-commit-id: e8335658051fc72cfba71f7d86b420584173e205
Former-commit-id: eb02daa9d354d9795825a42e96137ba020325f3c
Former-commit-id: 5cb1c7907d8e9c6f7d46750b5d90d8bd3d0e43a4
---
 .../core/d2-multiple-page-control/index.vue     |  2 +-
 src/router/routes.js.REMOVED.git-id             |  2 +-
 src/store/modules/d2admin.js                    | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 43a9b469..262584c6 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -12,7 +12,7 @@
           <el-tab-pane
             v-for="(page, index) in pageOpenedList"
             :key="index"
-            :label="page.name"
+            :label="page.meta.title || '未命名'"
             :name="page.name">
           </el-tab-pane>
         </el-tabs>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 4b19a510..24682293 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-7cc39e5aa61631be559f5b0319ee5a1915748943
\ No newline at end of file
+bb07b3ba57519000163de64466fa95e4ce348572
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 9bf06016..8e3d4383 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -15,7 +15,13 @@ export default {
     tagPool: [],
     // 当前显示的多页面列表
     pageOpenedList: [
-      { name: 'index', title: '首页' }
+      {
+        name: 'index',
+        meta: {
+          title: '首页',
+          requiresAuth: false
+        }
+      }
     ],
     // 当前页面
     pageCurrent: ''
@@ -87,11 +93,12 @@ export default {
      */
     d2adminTagIncreate (state, { tag, argu, query }) {
       // 设置新的 tag 在新打开一个以前没打开过的页面时使用
-      let newTag = tag
-      newTag.argu = argu || newTag.argu
-      newTag.query = query || newTag.query
+      let newPage = tag
+      newPage.argu = argu || newPage.argu
+      newPage.query = query || newPage.query
+      newPage.argu = argu || newPage.argu
       // 添加进当前显示的页面数组
-      state.pageOpenedList.push(newTag)
+      state.pageOpenedList.push(newPage)
       // 更新设置到数据库
       this.commit('d2adminVuex2Db', 'pageOpenedList')
     },

From 331ec7c02b9b10f250adbedc4795cd39cdb74997 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 17:37:20 +0800
Subject: [PATCH 038/128] no message

Former-commit-id: 3b81057c2e6ee2c377e48e4b12a0e0db13f9f393 [formerly 3b81057c2e6ee2c377e48e4b12a0e0db13f9f393 [formerly 3b81057c2e6ee2c377e48e4b12a0e0db13f9f393 [formerly 3b81057c2e6ee2c377e48e4b12a0e0db13f9f393 [formerly aeafc1a57a6a33ab2b89708361d5ba56dd86bc05 [formerly f0dde4e2af6a93ea33e1c5d6174c6b0ddbf8e11d]]]]]
Former-commit-id: a6f21514f5845f6efc0f3838baa635900939fd79
Former-commit-id: 852787f7e4f2f19bfd484f6e9f6850fa4665ef24
Former-commit-id: 92ebe8951832816b7b0b23acfea23a158ca261c6 [formerly dd63ec2984a3c071b647412f72344bbc32c63ed3]
Former-commit-id: c227e979c8cab412c09a3ff33d5959316cf40340
Former-commit-id: 5abda248deafc2ffe5d49f6dd1e592628ce554d9
Former-commit-id: 32e8ff61c19ed9bcba78363176655062a987312b
Former-commit-id: 91a798632df70e3b7847579d14036057114a0fd4
Former-commit-id: 7d50160fe7a8b08e8be9f3a2a3606edf1c0b5b4d
---
 src/menu/index.js.REMOVED.git-id              |  2 +-
 .../bigdata-table/{demo.vue => index.vue}     |  0
 .../demo/components/bigdata-table/select.vue  | 88 -------------------
 src/router/routes.js.REMOVED.git-id           |  2 +-
 4 files changed, 2 insertions(+), 90 deletions(-)
 rename src/pages/demo/components/bigdata-table/{demo.vue => index.vue} (100%)
 delete mode 100644 src/pages/demo/components/bigdata-table/select.vue

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 43ac2588..88d345bb 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-d490236cefe994028877481378a746c127961b8a
\ No newline at end of file
+35a1519553c12e452244d02c9010ff5200e2c0d0
\ No newline at end of file
diff --git a/src/pages/demo/components/bigdata-table/demo.vue b/src/pages/demo/components/bigdata-table/index.vue
similarity index 100%
rename from src/pages/demo/components/bigdata-table/demo.vue
rename to src/pages/demo/components/bigdata-table/index.vue
diff --git a/src/pages/demo/components/bigdata-table/select.vue b/src/pages/demo/components/bigdata-table/select.vue
deleted file mode 100644
index aeba4a30..00000000
--- a/src/pages/demo/components/bigdata-table/select.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-	<d2-container>
-    <template slot="header">勾选</template>
-    <div class="wraper">
-			<bigdata-table
-				v-model="tableDataHandled"
-				:row-num="20"
-				:col-num="7"
-				show-index
-				fixed
-				stripe
-				:col-width="200"
-				:header-height="40"
-				:columns="columns"
-				:index-render="indexRender"
-				:fixed-col="1"
-				@on-click-tr="handleClickTr"/>
-		</div>
-  </d2-container>
-</template>
-
-<script>
-/* eslint-disable */
-// 本页是由 https://github.com/lison16/vue-bigdata-table/blob/master/src/App.vue 修改而来
-// 由于原页面有太多的地方不符合本项目的代码规范，本页面不做代码检查
-export default {
-  data () {
-    return {
-      tableData: [],
-      tableDataSelected: [],
-      columns: [],
-      tableDataHandled: [], // 带有数据的表格数据
-      emptyData: [], // 空的表格数据
-      canEdit: true,
-      editRow: 1,
-      editCol: 1,
-      defaultSort: {1: 'down'}
-    }
-  },
-  methods: {
-    indexRender (h, index) {
-      return h('input', {
-        domProps: {
-          type: 'checkbox',
-          checked: this.tableDataSelected[index]
-        }
-      }, '')
-    },
-    handleClickTr (index) {
-      this.$set(this.tableDataSelected, index, !this.tableDataSelected[index])
-    },
-    changeData (rowLen) {
-      let dataArr = []
-      for (let i = 0; i < rowLen; i++) {
-        let arr = [
-          i + '00',
-          'count' + i,
-          '23.4534534345',
-          '0023' + i,
-          '123.234534534534',
-          'namenasdfsdfsdfsdfssdfsdfsdsdfsdfsf' + i,
-          '2014年1月1日'
-        ]
-        dataArr.push(arr)
-      }
-      this.tableDataHandled = dataArr
-      this.tableDataSelected = dataArr.map(e => false)
-    }
-  },
-  mounted () {
-    this.changeData(1000)
-    let columns = ['这是数字', '这是字符1列', '这是纬度', '这是数字', '这是经度', '这是字符2列', '这是时间'].map((title, col) => {
-      return {
-        title: title,
-        align: 'center'
-      }
-    })
-    this.columns = columns
-  }
-}
-</script>
-
-<style lang="scss">
-.wraper{
-  height: 400px;
-  overflow: auto;
-}
-</style>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 24682293..8c7574d7 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-bb07b3ba57519000163de64466fa95e4ce348572
\ No newline at end of file
+f07ff536632fcb4e7ee76075c5c0846e6a07b078
\ No newline at end of file

From 92bc11d67b2c8c70ced4c7f4b86e2a61ee712d30 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 17:40:10 +0800
Subject: [PATCH 039/128] no message

Former-commit-id: 5ed6c012a2b3503586b216ed51d119276a1e0be6 [formerly 5a2151621023b5360af2ea859d85148dabced616] [formerly 5ed6c012a2b3503586b216ed51d119276a1e0be6 [formerly 5a2151621023b5360af2ea859d85148dabced616] [formerly 5ed6c012a2b3503586b216ed51d119276a1e0be6 [formerly 5a2151621023b5360af2ea859d85148dabced616] [formerly 5a2151621023b5360af2ea859d85148dabced616 [formerly cfe6beee6c7342d6bcf774ad22289005f649420b [formerly 85f63f617207cb87825dfb15a5e723eea64ec770]]]]]
Former-commit-id: bb419811964546aec24f010b662dc616c7fb5785
Former-commit-id: f1b0c5f2d5fb0b8907a6848fe29c7ddc739daf2e
Former-commit-id: cc060bd07871ca501d42aa0dc204336652259e82 [formerly 10751b401cf945855d9c7e7f576a4aaa3fdca6ec]
Former-commit-id: 83ecfa02ede7a32f737f8bd1e879bcb9330a9dd8
Former-commit-id: ef8b85e55bf9aa7ca7d65c32dfffb955a806aa58
Former-commit-id: 3c91e1bca68e74f02440b685c0948cd0929a6549
Former-commit-id: e7c613828558e2958aadae42a395650dfcf0aa23
Former-commit-id: e8ef664daba740ba502b054f4af30304b753e88c
---
 src/router/routes.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 8c7574d7..244d07a5 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-f07ff536632fcb4e7ee76075c5c0846e6a07b078
\ No newline at end of file
+e8c4c3e16fcb1ddb9ef21f6e9a83fccc3cea38ff
\ No newline at end of file

From b282fc3f61627478377a33fbc6712dff62e35312 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 20:14:42 +0800
Subject: [PATCH 040/128] no message

Former-commit-id: 02ac02536e51d18a326e0c245493c2c8463b176f [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388] [formerly 02ac02536e51d18a326e0c245493c2c8463b176f [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388] [formerly 02ac02536e51d18a326e0c245493c2c8463b176f [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388] [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388 [formerly e34aa936be18eff22179a1c83c037b63b5ea9c15 [formerly 3f5d3d2d1b26943366a435af82aa3d6c2a49933d]]]]]
Former-commit-id: 84d14fe2b07b1d3385731f5f033fda5da5d67a10
Former-commit-id: e7c1007be2d49ae2f70f32c9507c118484608ffb
Former-commit-id: 3035850965a00de2bf7f2be0493690da7e3a6b06 [formerly 1eca63099818cbdae450aeb83cb9f9e4c3674f00]
Former-commit-id: 1d5d1d89ff0fed9bf428d4eaa24da88a1a8d3b44
Former-commit-id: 30ca02893ec87fb93a1145a397ce7b32d9e7a218
Former-commit-id: 12ef57ba36ef26bcbb038f0fe805ff67b81d1386
Former-commit-id: 81d0e81655ccc418430c935e932b4ab44ce7e5cf
Former-commit-id: 43410c9f50803e6c424dc8db35dc9eba33f9cee4
---
 .../components/-menu-side/index.vue           | 35 ++++++-------------
 .../d2-layout-main/components/mixin/menu.js   |  3 --
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index afeb81f0..7700492b 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -1,20 +1,16 @@
 <template>
   <div style="height: 100%;">
-    <el-scrollbar v-if="menus.length > 0">
-      <div :style="{ height: `${asideHeight}px` }">
-        <el-menu
-          :collapse="collapse"
-          :unique-opened="true"
-          :default-active="active"
-          ref="menu"
-          @select="handleMenuSelect">
-          <template v-for="(menu, menuIndex) in menus">
-            <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-            <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
-          </template>
-        </el-menu>
-      </div>
-    </el-scrollbar>
+    <el-menu
+      :collapse="collapse"
+      :unique-opened="true"
+      :default-active="active"
+      ref="menu"
+      @select="handleMenuSelect">
+      <template v-for="(menu, menuIndex) in menus">
+        <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+        <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
+      </template>
+    </el-menu>
     <div v-if="menus.length === 0 && !collapse" class="menu-empty">
       <d2-icon name="hdd-o"/>
       <span>当前目录没有菜单</span>
@@ -68,19 +64,10 @@ export default {
       immediate: true
     }
   },
-  mounted () {
-    this.updateAsideHeight()
-    window.onresize = () => {
-      this.updateAsideHeight()
-    }
-  },
   beforeDestroy () {
     window.onresize = function () {}
   },
   methods: {
-    updateAsideHeight () {
-      this.asideHeight = this.$el.offsetHeight
-    }
   }
 }
 </script>
diff --git a/src/components/core/d2-layout-main/components/mixin/menu.js b/src/components/core/d2-layout-main/components/mixin/menu.js
index 6c39a2be..efd488b1 100644
--- a/src/components/core/d2-layout-main/components/mixin/menu.js
+++ b/src/components/core/d2-layout-main/components/mixin/menu.js
@@ -1,9 +1,6 @@
 export default {
   methods: {
     handleMenuSelect (index, indexPath) {
-      console.group('handleMenuSelect')
-      console.log('index: ', index)
-      console.groupEnd()
       if (/^d2-menu-empty-\d+$/.test(index)) {
         this.$message('功能正在开发')
       } else {

From 1d45ccbd18482dd54dc5c77cfdecb34bc46ea226 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 20:23:07 +0800
Subject: [PATCH 041/128] no message

Former-commit-id: 1ac3bd03bae422250aff66e0b8c0aae9b29285f0 [formerly 1ac3bd03bae422250aff66e0b8c0aae9b29285f0 [formerly 1ac3bd03bae422250aff66e0b8c0aae9b29285f0 [formerly 1ac3bd03bae422250aff66e0b8c0aae9b29285f0 [formerly 7e0101f9a81843e15b8b370af9b141743561bc1a [formerly 079246c38007a7f992da0143d189e8f4208abfc0]]]]]
Former-commit-id: a4b0a025eb79b04147f1fff967feb01e90a3aee1
Former-commit-id: b365c4518265586113e5568b025d984c16b58190
Former-commit-id: 311812a0cbdd1a8d62c1e28697272df6b69d0abc [formerly 1ab69e8804c4af35df22231f92aee5f83ee383aa]
Former-commit-id: 219aa552ce1cdcc6aebfef9e783e247a78f3faab
Former-commit-id: 52c59f5eb9f4cf8838cc1ae7d43f0af77715bc6b
Former-commit-id: 30c6354133e3276ee00f558f2f5747c01c192b8f
Former-commit-id: 98a603b4e2766420e13c4e4b77c10cf7411f9b51
Former-commit-id: 0d42b47cca18516955a262f6c9970ce2810b5a98
---
 .../components/-menu-side/index.vue           | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index 7700492b..d11b17d3 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%;">
+  <div style="height: 100%;" class="d2-layout-main-menu-side">
     <el-menu
       :collapse="collapse"
       :unique-opened="true"
@@ -24,6 +24,8 @@ import menuMixin from '../mixin/menu'
 // 组件
 import d2LayoutMainMenuItem from '../-menu-item/index.vue'
 import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
+// 插件
+import BScroll from 'better-scroll'
 
 export default {
   name: 'd2-layout-main-menu-side',
@@ -45,7 +47,8 @@ export default {
     return {
       menus: [],
       active: '',
-      asideHeight: 300
+      asideHeight: 300,
+      BS: null
     }
   },
   watch: {
@@ -67,7 +70,20 @@ export default {
   beforeDestroy () {
     window.onresize = function () {}
   },
-  methods: {
+  mounted () {
+    this.BS = new BScroll(this.$el, {
+      mouseWheel: true,
+      scrollbar: {
+        fade: true,
+        interactive: false
+      }
+    })
   }
 }
 </script>
+
+<style lang="scss">
+.d2-layout-main-menu-side {
+  position: relative;
+}
+</style>

From d34952f2427c9f3663fbec7253a97c50429b9afa Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 20:25:53 +0800
Subject: [PATCH 042/128] no message

Former-commit-id: 99675667f6c1e9b33b62150733816bb1332c3bda [formerly 5295e4c96699cc3c0d84d1e4b8ae903fde8a45d6] [formerly 99675667f6c1e9b33b62150733816bb1332c3bda [formerly 5295e4c96699cc3c0d84d1e4b8ae903fde8a45d6] [formerly 99675667f6c1e9b33b62150733816bb1332c3bda [formerly 5295e4c96699cc3c0d84d1e4b8ae903fde8a45d6] [formerly 5295e4c96699cc3c0d84d1e4b8ae903fde8a45d6 [formerly c8fd30337c7ed45735aaefa2bee99096179c28a2 [formerly 4314ddc832d1e806ac7e7a88ce7c9c1f72751125]]]]]
Former-commit-id: f76d879ec747720714358f9a84a4ad3c4e5ea288
Former-commit-id: 1310dd7e12a0e4f2e036312037e6db1c796bccc9
Former-commit-id: dd20bf3ae88d3e167e762746d6a4c5f0d3dbf804 [formerly 7707b5cef53c58ead493431cd6fe4563e561e9df]
Former-commit-id: cf4537803019c6104d68b82e810ce9e992937230
Former-commit-id: 8759a24e8238cf31fc10d0f84671467632897aff
Former-commit-id: 8c703804f90c570719f39df05f8d833614d9a864
Former-commit-id: 14f609910083851b67fd7f49b0cd8a3570f39b70
Former-commit-id: 14f5bd1c5e2a6091e7945d1667602a2016fd87b1
---
 .../core/d2-layout-main/components/-menu-side/index.vue        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index d11b17d3..c968c308 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -67,9 +67,6 @@ export default {
       immediate: true
     }
   },
-  beforeDestroy () {
-    window.onresize = function () {}
-  },
   mounted () {
     this.BS = new BScroll(this.$el, {
       mouseWheel: true,

From 63759ec3ecf00035aa32ddb4393a908688a40299 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 20:29:59 +0800
Subject: [PATCH 043/128] no message

Former-commit-id: 765871be1e57d1d700475c8a06650d40956df857 [formerly 09298e3fc24a4977d940fc7b8d9777f1bb6d76a6] [formerly 765871be1e57d1d700475c8a06650d40956df857 [formerly 09298e3fc24a4977d940fc7b8d9777f1bb6d76a6] [formerly 765871be1e57d1d700475c8a06650d40956df857 [formerly 09298e3fc24a4977d940fc7b8d9777f1bb6d76a6] [formerly 09298e3fc24a4977d940fc7b8d9777f1bb6d76a6 [formerly 963da86e6766c7af5c6ac951e8dbb828487535de [formerly 7194dfc68c6826329fc4aa78c1d62a9ac033d501]]]]]
Former-commit-id: 8da9938f0d5a1cc2c5497df3daae76bccc7b3de4
Former-commit-id: 8cbb6cbb38017a67f621a1cea9340c42830901c6
Former-commit-id: 3b93aba8d2353ee2463aa9799d88ed9d661b0cba [formerly c16f309e8ac445e6adab3a3e35b82be789b18765]
Former-commit-id: 6e6b3e5755890b6755587e592e29c44e3e8a75b3
Former-commit-id: f7d6ffa0697c6ca3992cb35b5ed893faaf418587
Former-commit-id: 290dfe73f85b57a58beaf661767464eceba7f202
Former-commit-id: 5ee923100dc7260509893b541392d3d07572572d
Former-commit-id: b8ce24190bc8f9c74545da04660624b00625c758
---
 docs/zh/guide/change-log.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 2ac2e2da..2c8f5397 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -7,7 +7,8 @@
 * [ 新增 ] playground 模块，方便测试和展示一些功能实现方式/调用方法
 * [ 新增 ] 多页模式
 * [ 新增 ] 多页模式缓存
-* [ 新增 ] 多页模式快速关闭
+* [ 新增 ] 多页模式快速关闭（关闭左侧 右侧 全部 其它）
+* [ 修改 ] 侧边栏滚动优化
 
 ## v1.1.3
 

From 743b084d4a04eae695a4f80ac4a0fc9b7359eff0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 20:57:15 +0800
Subject: [PATCH 044/128] no message

Former-commit-id: cb9aed62a77b182a5fd4ff818dbf57da53809b5c [formerly cb9aed62a77b182a5fd4ff818dbf57da53809b5c [formerly cb9aed62a77b182a5fd4ff818dbf57da53809b5c [formerly cb9aed62a77b182a5fd4ff818dbf57da53809b5c [formerly 640177e2b7eeb70e6ad29fb47f6c91d5e12a21eb [formerly dd97bf357a2d59a91fad3b7a37e2e289e6c3298f]]]]]
Former-commit-id: 542883849f2fd445c591e848fb10965e83dbd3a9
Former-commit-id: 2659fa4592115845114189635c56c3c616d283a5
Former-commit-id: 716e6c450abf4064463800f08761d513b3cc3e95 [formerly ad352254dd0907dc9a72b96d464b7fdbccca7d33]
Former-commit-id: dfa79894672e4f95bf4f1fb3a29c555e57b8fd3a
Former-commit-id: 838365672167d541e8c5222358aff50dfa432503
Former-commit-id: 6b2bbbc51e573a5faf006f8142e4d0b2bcb7bfec
Former-commit-id: 1f5d8efc64c2bc80b267364a5785d1935a590a3d
Former-commit-id: 94ab50748f5c4a487c08e3bd98d317e609737e35
---
 .../components/d2-container-full-bs.vue       | 62 +++++++++++++++
 src/components/core/d2-container/index.vue    | 20 ++++-
 src/menu/index.js.REMOVED.git-id              |  2 +-
 .../demo/components/container/full-bs.vue     | 22 ++++++
 .../components/container/md/doc-full-bs.md    | 75 +++++++++++++++++++
 .../demo/components/container/md/doc-full.md  |  2 +-
 src/router/routes.js.REMOVED.git-id           |  2 +-
 7 files changed, 179 insertions(+), 6 deletions(-)
 create mode 100644 src/components/core/d2-container/components/d2-container-full-bs.vue
 create mode 100644 src/pages/demo/components/container/full-bs.vue
 create mode 100644 src/pages/demo/components/container/md/doc-full-bs.md

diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
new file mode 100644
index 00000000..d58c5fec
--- /dev/null
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="d2-container-full">
+    <div v-if="$slots.header" class="d2-container-full__header" ref="header">
+      <slot name="header"/>
+    </div>
+    <div class="d2-container-full__body" ref="wrapper">
+      <div style="padding: 20px 0px;">
+        <slot/>
+      </div>
+    </div>
+    <div v-if="$slots.footer" class="d2-container-full__footer" ref="footer">
+      <slot name="footer"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import BScroll from 'better-scroll'
+export default {
+  name: 'd2-container-full',
+  data () {
+    return {
+      BS: null
+    }
+  },
+  mounted () {
+    this.BS = new BScroll(this.$refs.wrapper, {
+      mouseWheel: true,
+      scrollbar: {
+        fade: true,
+        interactive: false
+      }
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// [组件] d2-container-full
+.d2-container-full {
+  position: absolute;
+  top: 0px;
+  right: 20px;
+  bottom: 0px;
+  left: 0px;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  .d2-container-full__header {
+    padding: 20px;
+  }
+  .d2-container-full__body {
+    flex-grow: 1;
+    padding: 0px 20px;
+    overflow: auto;
+    position: relative;
+  }
+  .d2-container-full__footer {
+    padding: 20px;
+  }
+}
+</style>
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 07e80a81..5f2f86e9 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -10,17 +10,24 @@
       <slot name="header"/>
       <slot/>
     </div>
-    <!-- [container-full] 撑满 -->
-    <d2-container-full v-if="type === 'full'">
+    <!-- [container-full] 填充 -->
+    <d2-container-full v-if="type === 'full' && !scroll">
       <slot v-if="$slots.header" name="header" slot="header"/>
       <slot/>
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
     </d2-container-full>
+    <!-- [container-full-bs] 填充 滚动优化 -->
+    <d2-container-full-bs v-if="type === 'full' && scroll">
+      <slot v-if="$slots.header" name="header" slot="header"/>
+      <slot/>
+      <slot v-if="$slots.footer" name="footer" slot="footer"/>
+    </d2-container-full-bs>
   </div>
 </template>
 
 <script>
 import d2ContainerFull from './components/d2-container-full.vue'
+import d2ContainerFullBs from './components/d2-container-full-bs.vue'
 export default {
   name: 'd2-container',
   props: {
@@ -30,6 +37,12 @@ export default {
       required: false,
       default: 'card'
     },
+    // 滚动优化
+    scroll: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     // 是否开启响应式尺寸变化
     responsive: {
       type: Boolean,
@@ -38,7 +51,8 @@ export default {
     }
   },
   components: {
-    'd2-container-full': d2ContainerFull
+    'd2-container-full': d2ContainerFull,
+    'd2-container-full-bs': d2ContainerFullBs
   }
 }
 </script>
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 88d345bb..2d5a60b8 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-35a1519553c12e452244d02c9010ff5200e2c0d0
\ No newline at end of file
+3d08e93eeb3db6899777433a901454fe4f35f86e
\ No newline at end of file
diff --git a/src/pages/demo/components/container/full-bs.vue b/src/pages/demo/components/container/full-bs.vue
new file mode 100644
index 00000000..cc50b43f
--- /dev/null
+++ b/src/pages/demo/components/container/full-bs.vue
@@ -0,0 +1,22 @@
+<template>
+  <d2-container type="full" :scroll="true">
+    <template slot="header">
+      我是插入到 header 中的内容
+    </template>
+    <d2-markdown :source="doc"/>
+    <template slot="footer">
+      <d2-demo-link-btn title="D2Admin" link="https://github.com/FairyEver/d2-admin"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import doc from './md/doc-full-bs.md'
+export default {
+  data () {
+    return {
+      doc
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/components/container/md/doc-full-bs.md b/src/pages/demo/components/container/md/doc-full-bs.md
new file mode 100644
index 00000000..8b319183
--- /dev/null
+++ b/src/pages/demo/components/container/md/doc-full-bs.md
@@ -0,0 +1,75 @@
+## 自适应填充页面容器 + 滚动优化
+
+无论内容高度多少，都会自动撑满页面，并有可选的 `header` 和 `footer` 插槽，**并且使用自定义滚动条代替原生滚动条**，是否启用此功能请自行取舍
+
+示例：
+
+```
+<template>
+  <d2-container type="full" :scroll="true">
+    <template slot="header">
+      可选的 header 内容 ...
+    </template>
+    主体内容 ...
+    <template slot="footer">
+      可选的 footer 内容 ...
+    </template>
+  </d2-container>
+</template>
+```
+
+下面是一个较长的演示文章，仅仅是为了演示一些文字的显示效果
+
+## vue.js
+
+**易用**
+
+已经会了 HTML、CSS、JavaScript？即刻阅读指南开始构建应用！
+
+**灵活**
+
+不断繁荣的生态系统，可以在一个库和一套完整框架之间自如伸缩。
+
+**高效**
+
+20kB min+gzip 运行大小
+
+超快虚拟 DOM
+
+最省心的优化
+
+**Vue.js 是什么**
+
+Vue (读音 /vjuː/，类似于 view) 是一套用于构建用户界面的渐进式框架。与其它大型框架不同的是，Vue 被设计为可以自底向上逐层应用。Vue 的核心库只关注视图层，不仅易于上手，还便于与第三方库或既有项目整合。另一方面，当与现代化的工具链以及各种支持类库结合使用时，Vue 也完全能够为复杂的单页应用提供驱动。
+
+如果你已经是有经验的前端开发者，想知道 Vue 与其它库/框架有哪些区别，请查看对比其它框架。
+
+## Element
+
+Element，一套为开发者、设计师和产品经理准备的基于 Vue 2.0 的桌面端组件库
+
+**一致性** Consistency
+
+- 与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；
+
+- 在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。
+
+**反馈** Feedback
+
+- 控制反馈：通过界面样式和交互动效让用户可以清晰的感知自己的操作；
+
+- 页面反馈：操作后，通过页面元素的变化清晰地展现当前状态。
+
+**效率** Efficiency
+
+- 简化流程：设计简洁直观的操作流程；
+
+- 清晰明确：语言表达清晰且表意明确，让用户快速理解进而作出决策；
+
+- 帮助用户识别：界面简单直白，让用户快速识别而非回忆，减少用户记忆负担。
+
+**可控** Controllability
+
+- 用户决策：根据场景可给予用户操作建议或安全提示，但不能代替用户进行决策；
+
+- 结果可控：用户可以自由的进行操作，包括撤销、回退和终止当前操作等。
\ No newline at end of file
diff --git a/src/pages/demo/components/container/md/doc-full.md b/src/pages/demo/components/container/md/doc-full.md
index a254fc10..b4aea88b 100644
--- a/src/pages/demo/components/container/md/doc-full.md
+++ b/src/pages/demo/components/container/md/doc-full.md
@@ -6,7 +6,7 @@
 
 ```
 <template>
-  <d2-container type="card-full">
+  <d2-container type="full">
     <template slot="header">
       可选的 header 内容 ...
     </template>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 244d07a5..e0c109c3 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-e8c4c3e16fcb1ddb9ef21f6e9a83fccc3cea38ff
\ No newline at end of file
+003fe0eab9894c5bbfc8cc4f0ad571b8dcb29ce2
\ No newline at end of file

From 739eb1795066e25aaac8366cd0e1f8949636efe7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 22:22:37 +0800
Subject: [PATCH 045/128] no message

Former-commit-id: e01489f822c48c2f3b7173e16cb30f08b7379558 [formerly e01489f822c48c2f3b7173e16cb30f08b7379558 [formerly e01489f822c48c2f3b7173e16cb30f08b7379558 [formerly e01489f822c48c2f3b7173e16cb30f08b7379558 [formerly 32c1376e476b5d4edb17809d13574f13823a4549 [formerly 153fadde55a169de719930b038ffec0d1e200ef9]]]]]
Former-commit-id: 89f2502e98f2749a24bf8fb7fc0aa149126f04b7
Former-commit-id: e78de3eb9c810e075249551e938c0ee7887b9e41
Former-commit-id: e73a96b6e1d7574e689a1404eb7141c0fb78af57 [formerly b3baaf0bd76aec9c3f7f94a336c4090617ddd840]
Former-commit-id: 881e9ffac5a68ccc764522f75a8ea2e6b87f6158
Former-commit-id: 228f0016350b21216c5823eed9aef008def9498c
Former-commit-id: 215c5cdf1d4ee0ce2a0edb062cd9eda910d439b8
Former-commit-id: e2341ec18b23031a65320e4f065fe7e9bbe8526b
Former-commit-id: 7bba7e84f15f5493180377839b46b6b979469cc7
---
 docs/zh/components/container.md | 5 +++++
 docs/zh/guide/change-log.md     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index e5dabe9a..dbff3d8a 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -7,6 +7,7 @@
 | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
 | --- | --- | --- | --- | --- | --- |
 | type | 容器类型 | 非 | String | card ghost full | card |
+| scroll | 滚动优化 | 非 | Boolean |  | false |
 | responsive | 响应式宽度 | 非 | Boolean |  | false |
 
 ::: tip
@@ -78,6 +79,10 @@ export default {
 </template>
 ```
 
+`v1.1.4` 新增
+
+你可以通过设置 `:scroll="true"` 来启用自定义滚动条，看起来更美观一些
+
 ## 隐形页面容器
 
 不显示任何背景色和边框
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 2c8f5397..6f134c85 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -9,6 +9,7 @@
 * [ 新增 ] 多页模式缓存
 * [ 新增 ] 多页模式快速关闭（关闭左侧 右侧 全部 其它）
 * [ 修改 ] 侧边栏滚动优化
+* [ 新增 ] `d2-container` 组件新增滚动优化模式
 
 ## v1.1.3
 

From b23d5728191b9b1c85687f8d6def3c95ac3f5df4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 22:45:41 +0800
Subject: [PATCH 046/128] no message

Former-commit-id: fa2177d78f85c39d7c09579a1d5acb84b346fe08 [formerly fa2177d78f85c39d7c09579a1d5acb84b346fe08 [formerly fa2177d78f85c39d7c09579a1d5acb84b346fe08 [formerly fa2177d78f85c39d7c09579a1d5acb84b346fe08 [formerly 8390465d98a8307c523383de1cabf895f957f7f1 [formerly 158a4737b05965eefd5ff435f6ef3c4002ffbe83]]]]]
Former-commit-id: a3db87b39113071027ee0544e885f1b231ad890d
Former-commit-id: bba1db492cb6914aaa2f56c13281e5618b3d0e2e
Former-commit-id: 42107d64ae5bfac3723614ed95326bb5f5419e41 [formerly d090d9ea1439d09653dbad558816ac70a1b91cf7]
Former-commit-id: 6f3dbac2d65d17c6ac9a98aa92345bdd78fdeeb8
Former-commit-id: e597a369de513fb9af63bfcda5672d864f485de2
Former-commit-id: f4562f7f9dc40cca8641ffdc8dccd1d36f6abd5f
Former-commit-id: ea6a1b96ebdff9832005176ea31989aa837237a9
Former-commit-id: 302ae6c7a185fa77043f63c6874131c8b6166750
---
 docs/.vuepress/config.js         |  1 +
 docs/zh/components/charts-new.md | 13 +++++++++++++
 docs/zh/components/container.md  |  8 ++++----
 docs/zh/guide/README.md          | 26 +++++++++++++++++---------
 4 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 docs/zh/components/charts-new.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index a0edcd07..250e2a18 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -90,6 +90,7 @@ function sideBarComponents (title) {
       children: [
         '',
         'charts',
+        'charts-new',
         'container',
         'count-up',
         'highlight',
diff --git a/docs/zh/components/charts-new.md b/docs/zh/components/charts-new.md
new file mode 100644
index 00000000..b96bb263
--- /dev/null
+++ b/docs/zh/components/charts-new.md
@@ -0,0 +1,13 @@
+# 图表 [ v-charts ]
+
+::: tip
+`1.1.0` 版本使用的是 `G2` 图表库，`1.1.3` 开始使用 `v-charts`
+:::
+
+## 介绍
+
+在使用 echarts 生成图表时，经常需要做繁琐的数据类型转化、修改复杂的配置项，v-charts 的出现正是为了解决这个痛点。基于 Vue2.0 和 echarts 封装的 v-charts 图表组件，只需要统一提供一种对前后端都友好的数据格式设置简单的配置项，便可轻松生成常见的图表。
+
+[v-charts 文档](https://v-charts.js.org/#/)
+
+D2Admin 已经安装并注册完毕 v-charts，你可以直接使用
\ No newline at end of file
diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index dbff3d8a..95731ba3 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -40,7 +40,7 @@ export default {
 </style>
 ```
 
-## 基础页面容器
+### 基础页面容器
 
 高度根据内容适应
 
@@ -59,7 +59,7 @@ export default {
 </d2-container>
 ```
 
-## 自适应填充页面容器
+### 自适应填充页面容器
 
 无论内容高度多少，都会自动撑满页面，并有可选的 `header` 和 `footer` 插槽
 
@@ -83,7 +83,7 @@ export default {
 
 你可以通过设置 `:scroll="true"` 来启用自定义滚动条，看起来更美观一些
 
-## 隐形页面容器
+### 隐形页面容器
 
 不显示任何背景色和边框
 
@@ -91,4 +91,4 @@ export default {
 <d2-container type="ghost">
   主体内容
 </d2-container>
-```
\ No newline at end of file
+```
diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index 756fe94d..fe680ad8 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -68,10 +68,12 @@ D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布
 * 为 markdown 扩展了百度云链接解析和优化显示
 * 右键菜单组件
 * 自定义滚动条和滚动控制
-* 内置4种主题
+* 内置5种主题
 * 公用样式抽离，方便的主题定制
 * 支持百万级数据量的表格组件
 * 打包后随意目录部署（已经做好兼容设置）
+* 多标签页模式 `1.1.4 +`
+* 支持临时菜单配置
 
 ## TODO
 
@@ -81,17 +83,18 @@ D2Admin 仍然处于开发中，这里有一些暂时的计划：
 * 推出基于 [ice](https://alibaba.github.io/ice) 平台的版本
 * 增加右上角通知中心
 * 增加一些实例页面以提供业务页面布局建议
-* 更换图表库
-* 多 tab 页结构
 * 面包屑导航
 * 树型表格组件
 * 更多类型的编辑器
 * socket 连接
 * 浏览器版本提示
 * 日志控制台
-* `1.1.0 完成` 抽离项目里的文档，集中存放在文档站点
-* `1.1.0 完成` 对主界面进行一次完善，调整整体布局和颜色
-* `1.1.0 完成` 切换主题功能
+* `1.1.4 已完成` 自定义滚动条
+* `1.1.4 已完成` 多 tab 页结构
+* `1.1.3 已完成` 更换图表库
+* `1.1.0 已完成` 抽离项目里的文档，集中存放在文档站点
+* `1.1.0 已完成` 对主界面进行一次完善，调整整体布局和颜色
+* `1.1.0 已完成` 切换主题功能
 
 欢迎你为 D2Admin 的开发作出贡献（代码编写/文档翻译）。
 
@@ -100,6 +103,8 @@ D2Admin 仍然处于开发中，这里有一些暂时的计划：
 ```
 ├─ build
 ├─ config
+├─ deploy
+├─ dist
 ├─ docs // 文档
 ├─ src
 │  ├─ assets // 资源
@@ -112,13 +117,13 @@ D2Admin 仍然处于开发中，这里有一些暂时的计划：
 │  │  ├─ core // 核心组件
 │  │  └─ demo // 示例组件
 │  ├─ i18n // 多国语
+│  ├─ libs // 通用库
 │  ├─ menu // 菜单
 │  ├─ mock // 模拟数据
 │  ├─ pages // 页面
 │  ├─ plugin // 插件
 │  ├─ router // 路由
 │  ├─ store // vuex
-│  ├─ utils // 通用函数
 │  ├─ App.vue
 │  └─ main.js
 ├─ static // 静态资源
@@ -135,7 +140,6 @@ D2Admin 仍然处于开发中，这里有一些暂时的计划：
 ├─ design.sketch // 设计文件
 ├─ index.html
 └─ package.json
-
 ```
 
 ## 获取代码
@@ -146,6 +150,10 @@ D2Admin 仍然处于开发中，这里有一些暂时的计划：
 
 * Fork 仓库到你的 github 然后克隆到本地，然后使用 master 分支继续你的开发。这种方式得到的是最新的代码，但是会有未完成的新功能。**不建议使用这种方式**
 
+* 由于 github 访问较慢，推荐前往码云仓库下载 [gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin)，码云上的仓库**在每次发布版本才会更新**，所以如果你选择此方法，请直接 fork 仓库并克隆到本地
+
+> 码云的仓库由 github 同步，但是发行版和标签同步有一些问题，所以推荐直接 fork 仓库
+
 ## 使用
 
 ```
@@ -178,5 +186,5 @@ npm run doc:dev
 ```
 
 ::: tip
-你可能会发现项目目录中有一个 deploy.sh 文件，这个文件是为了方便发布文档用的，通常你并不需要使用它
+你可能会发现项目目录中有一个 deploy 文件夹，这个文件是为了方便发布和提交代码用的，通常你并不需要使用它
 :::
\ No newline at end of file

From ce2b28f24d927a3f47c95b2f176cbf470bf600df Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 22:54:40 +0800
Subject: [PATCH 047/128] no message

Former-commit-id: 50bccfea763781097971e319bdefebe0dc97210c [formerly 50bccfea763781097971e319bdefebe0dc97210c [formerly 50bccfea763781097971e319bdefebe0dc97210c [formerly 50bccfea763781097971e319bdefebe0dc97210c [formerly 4b51cc38c5456a9c8d40386c6cb11134727454f2 [formerly f4892f6bd01dc45471290f484244aca43d1769c1]]]]]
Former-commit-id: 324a4bf2ecab61b995aea0dc4d60a8dedc2dc757
Former-commit-id: 3bbc64401c9cbb8cc1774956cae8ee2cd0f91d9e
Former-commit-id: 9dd9047b25fcfba89e1ca314928c1358e3a7c705 [formerly 65c434fddb1178b9d98b4e2b509d14f28eff0ed3]
Former-commit-id: 8d0bd6f3b85ff98d87f4972e6a736758fe4cf3e5
Former-commit-id: 6c5f53180f179f26e605565b44c2c10246843a4a
Former-commit-id: ab6798d67a546f654ac3a4442706c449eb85bbe6
Former-commit-id: 91eb98dc9163fec07c1090d80ef5aec11e4a29b3
Former-commit-id: 96793f5304bc4dca4006f4c7dda51d3cc42327e3
---
 docs/zh/components/image/baiduyun.png.REMOVED.git-id |  1 +
 docs/zh/components/markdown.md                       | 10 +++-------
 docs/zh/plugins/README.md                            |  6 +++++-
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 docs/zh/components/image/baiduyun.png.REMOVED.git-id

diff --git a/docs/zh/components/image/baiduyun.png.REMOVED.git-id b/docs/zh/components/image/baiduyun.png.REMOVED.git-id
new file mode 100644
index 00000000..b72710d1
--- /dev/null
+++ b/docs/zh/components/image/baiduyun.png.REMOVED.git-id
@@ -0,0 +1 @@
+3a5bb0f2628d9251bbe7474c0535258784cf770b
\ No newline at end of file
diff --git a/docs/zh/components/markdown.md b/docs/zh/components/markdown.md
index 92fd7e89..71a6f1c5 100644
--- a/docs/zh/components/markdown.md
+++ b/docs/zh/components/markdown.md
@@ -79,14 +79,10 @@ export default {
 > 链接: https://pan.baidu.com/s/1ggFW21l 密码: 877y
 ```
 
-markdown 中引用部分的文本由于被识别为百度云的分享链接，所以不会被当做 `blockquote` 渲染（非百度云链接的引用行不会改变），会以一种特别的块来显示
+markdown 中引用部分的文本由于被识别为百度云的分享链接，所以不会被当做 `blockquote` 渲染（非百度云链接的引用行不会改变），会以一种特别的块来显示，效果见下
 
-就像这样
-
-> https://pan.baidu.com/s/1kW6uUwB
-
-上面的块会嵌套在你的 markdown 渲染结果中
+![效果](./image/baiduyun.png)
 
 ::: tip
-了解 D2Admin 是如何在 markdown 中匹配百度云链接的？ [查看源码](https://github.com/FairyEver/d2-admin/blob/master/src/components/core/Markdown/plugin/baidupan.js)
+了解 D2Admin 是如何在 markdown 中匹配百度云链接的？ [查看源码](https://github.com/FairyEver/d2-admin/blob/master/src/components/core/d2-markdown/index.vue)
 :::
\ No newline at end of file
diff --git a/docs/zh/plugins/README.md b/docs/zh/plugins/README.md
index cdac3b88..d5688fce 100644
--- a/docs/zh/plugins/README.md
+++ b/docs/zh/plugins/README.md
@@ -1,3 +1,7 @@
 # 插件概述
 
-d2-admin（以下简称 d2admin）封装（或者集成第三方）了一些插件，方便开发者进行开发，具体组件文档请从左侧列表进入
\ No newline at end of file
+d2-admin（以下简称 d2admin）封装（或者集成第三方）了一些插件，方便开发者进行开发，具体组件文档请从左侧列表进入
+
+::: tip
+这里只列出一部分需要特别说明的插件，大部分集成的插件都可以在网络上找到官方文档
+:::
\ No newline at end of file

From 0a6197af96da6d61cddb41d0dafad42137b2534b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 22:58:01 +0800
Subject: [PATCH 048/128] no message

Former-commit-id: 5687d48500127f5179c5df5f44c145a424ab8685 [formerly 5687d48500127f5179c5df5f44c145a424ab8685 [formerly 5687d48500127f5179c5df5f44c145a424ab8685 [formerly 5687d48500127f5179c5df5f44c145a424ab8685 [formerly deb8efa876d93a0165de65ce1aced033188a937b [formerly 8e82e9a1dcbd7aa23397bfd876f3d3cab340508e]]]]]
Former-commit-id: 6d53503b8dbcdc069888df0fec05e61ccff5573d
Former-commit-id: 2bbcccac95df7dbfe0462cadc284453c4e44700a
Former-commit-id: 7f7989dac21939e8b801e787a568926388de5e90 [formerly 1b8dfb3c382ffe2597804e302960f2c75b0cf438]
Former-commit-id: e58dc76303156f64e75360dc6ca3d0d819d440fd
Former-commit-id: 9a5dd96415bea1023d6c7959da1905d46f7151e5
Former-commit-id: da456b5bb83a3073e6d56104bbf6ee23b98d289c
Former-commit-id: afbddff8fc88b51bcef2a0e2001842a8cdf502e2
Former-commit-id: 5026ae150e2d62fb5eb939b34cab754fb96aca3f
---
 docs/zh/components/charts-new.md | 2 +-
 docs/zh/components/icon-svg.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/components/charts-new.md b/docs/zh/components/charts-new.md
index b96bb263..3a4f8b86 100644
--- a/docs/zh/components/charts-new.md
+++ b/docs/zh/components/charts-new.md
@@ -10,4 +10,4 @@
 
 [v-charts 文档](https://v-charts.js.org/#/)
 
-D2Admin 已经安装并注册完毕 v-charts，你可以直接使用
\ No newline at end of file
+处于对用户使用方便的角度考虑，从 `1.1.3` 开始使用 v-charts。项目中已经安装并注册完毕 v-charts，你可以直接使用
\ No newline at end of file
diff --git a/docs/zh/components/icon-svg.md b/docs/zh/components/icon-svg.md
index a9616141..245e1cad 100644
--- a/docs/zh/components/icon-svg.md
+++ b/docs/zh/components/icon-svg.md
@@ -4,7 +4,7 @@
 
 | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
 | --- | --- | --- | --- | --- | --- |
-| name | 图标名称 | 非 | String | 放在 src/assets/icons/svg 中的 .svg 文件名 | 空 |
+| name | 图标名称 | 非 | String | src/assets/icons/svg 中 .svg 文件名 | 空 |
 
 ## 使用方法
 

From 2e70faf629fb66c74d40d70b506acf909b1d9a59 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 23:00:25 +0800
Subject: [PATCH 049/128] no message

Former-commit-id: 2d9fca4bd5be98e2dd5274c3f51841db5948ecd5 [formerly 2d9fca4bd5be98e2dd5274c3f51841db5948ecd5 [formerly 2d9fca4bd5be98e2dd5274c3f51841db5948ecd5 [formerly 2d9fca4bd5be98e2dd5274c3f51841db5948ecd5 [formerly dbca75b2442fe346f7f52898f5e2510000ab2ba5 [formerly b0aa58372c0ce501532fa22900adf7ef498936b5]]]]]
Former-commit-id: 0e283f3b7c94b34ef95d8fdf5c58306f46e985d0
Former-commit-id: d5095950f8442363df2b8078b78adf0958251e48
Former-commit-id: 6277e0fa7bf4b8a4db4abe980f8bba5abb3b724b [formerly 58da4b033bc9054316350431191b39a3e01653ba]
Former-commit-id: f1308f710692274c1d3dc22213b47db16b0bd79d
Former-commit-id: e77bfa875c7cbd403de96e550e3b0c7ce0eae051
Former-commit-id: 61d26225e9ec72c0038fd3e7b08fdfab4c347a4d
Former-commit-id: b5de0f5a8d28ad9ab65be9c6dea5b8161a722736
Former-commit-id: d386400244f02bf26450561ef1dd963794575d27
---
 README.md               | 86 ++++++++++++++++++++++-------------------
 docs/zh/guide/README.md |  3 +-
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 44f3b09e..ce4e20eb 100755
--- a/README.md
+++ b/README.md
@@ -1,30 +1,30 @@
-<p align="center">
-  <img width="550" src="http://fairyever.qiniudn.com/github-banner.png">
-</p>
-
-Solution of management system front-end based on `vue.js` and `ElementUI`
-
 # 介绍
 
 D2Admin 是一个开源的管理系统前端集成方案
 
 [Github仓库](https://github.com/FairyEver/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 
-[中文文档](https://fairyever.gitee.io/d2-admin-doc/zh/)
-
-[下载地址(不要直接克隆仓库)](https://github.com/FairyEver/d2-admin/releases)
+::: tip
+因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件。
+:::
 
 D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https://github.com/FairyEver) 在工作之余完全由兴趣驱动完成，如果你也一样喜欢前端开发，欢迎加入我们的讨论/学习群，群内可以`提问答疑`，`分享学习资料`或者随便扯淡
 
-**QQ群**
+**QQ群 806395827**
 
-群号 806395827 欢迎大家
+<a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=48323a4ed7a059a5d75f4a81586161ee60e495ab31905f8daaee8939ecacb363"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="D2Admin | js | vue 交流" title="D2Admin | js | vue 交流"></a>
 
 **微信群**
 
 作者微信 liyang1711467488
 
-> 微信群需要先加群主才可以拉进群 PS 微信群不太活跃，建议进QQ群
+> 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
+
+::: tip Thanks
+D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布，中间断断续续做了四个多月，发布一个月内收获将近 700star，在此对支持我的朋友表示感谢，D2Admin 将会保持更新，如果你有想法、建议、或者问题欢迎加群讨论
+
+—— 2018年6月20日
+:::
 
 ## 功能
 
@@ -63,26 +63,34 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 * 为 markdown 扩展了百度云链接解析和优化显示
 * 右键菜单组件
 * 自定义滚动条和滚动控制
-* 内置4种主题
+* 内置5种主题
 * 公用样式抽离，方便的主题定制
 * 支持百万级数据量的表格组件
 * 打包后随意目录部署（已经做好兼容设置）
+* 支持临时菜单配置
+* 多标签页模式 `1.1.4 +`
+* 美化滚动条 `1.1.4 +`
 
 ## TODO
 
-D2Admin 仍然处于开发中，这里有一些计划：
+D2Admin 仍然处于开发中，这里有一些暂时的计划：
 
 * 分离出简化版本
 * 推出基于 [ice](https://alibaba.github.io/ice) 平台的版本
 * 增加右上角通知中心
 * 增加一些实例页面以提供业务页面布局建议
-* 更换图表库
-* 多 tab 页结构
 * 面包屑导航
 * 树型表格组件
-* `1.1.0 完成` 抽离项目里的文档，集中存放在文档站点
-* `1.1.0 完成` 对主界面进行一次完善，调整整体布局和颜色
-* `1.1.0 完成` 切换主题功能
+* 更多类型的编辑器
+* socket 连接
+* 浏览器版本提示
+* 日志控制台
+* `1.1.4 已完成` 自定义滚动条
+* `1.1.4 已完成` 多 tab 页结构
+* `1.1.3 已完成` 更换图表库
+* `1.1.0 已完成` 抽离项目里的文档，集中存放在文档站点
+* `1.1.0 已完成` 对主界面进行一次完善，调整整体布局和颜色
+* `1.1.0 已完成` 切换主题功能
 
 欢迎你为 D2Admin 的开发作出贡献（代码编写/文档翻译）。
 
@@ -91,6 +99,8 @@ D2Admin 仍然处于开发中，这里有一些计划：
 ```
 ├─ build
 ├─ config
+├─ deploy
+├─ dist
 ├─ docs // 文档
 ├─ src
 │  ├─ assets // 资源
@@ -99,17 +109,17 @@ D2Admin 仍然处于开发中，这里有一些计划：
 │  │  ├─ library
 │  │  └─ style
 │  ├─ components // 组件
-│  │  ├─ charts
-│  │  ├─ core
-│  │  └─ demo
+│  │  ├─ charts // 图表组件
+│  │  ├─ core // 核心组件
+│  │  └─ demo // 示例组件
 │  ├─ i18n // 多国语
+│  ├─ libs // 通用库
 │  ├─ menu // 菜单
 │  ├─ mock // 模拟数据
 │  ├─ pages // 页面
 │  ├─ plugin // 插件
 │  ├─ router // 路由
 │  ├─ store // vuex
-│  ├─ utils
 │  ├─ App.vue
 │  └─ main.js
 ├─ static // 静态资源
@@ -128,6 +138,18 @@ D2Admin 仍然处于开发中，这里有一些计划：
 └─ package.json
 ```
 
+## 获取代码
+
+有两种方式可以获得 D2Admin 的代码
+
+* 在 [releases](https://github.com/FairyEver/d2-admin/releases) 页面下载最新的发行版。发行版一般是完成了某个大升级或者修复重要 bug 后发布的压缩包，你可以下载下来直接使用
+
+* Fork 仓库到你的 github 然后克隆到本地，然后使用 master 分支继续你的开发。这种方式得到的是最新的代码，但是会有未完成的新功能。**不建议使用这种方式**
+
+* 由于 github 访问较慢，推荐前往码云仓库下载 [gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin)，码云上的仓库**在每次发布版本才会更新**，所以如果你选择此方法，请直接 fork 仓库并克隆到本地
+
+> 码云的仓库由 github 同步，但是发行版和标签同步有一些问题，所以推荐直接 fork 仓库
+
 ## 使用
 
 ```
@@ -139,20 +161,4 @@ npm run dev
 
 // 打包
 npm run build
-```
-
-## 书写文档
-
-这里目前还有一个小遗憾，d2admin 使用的 webpack 版本不能符合 vuepress 的要求，所以如果你想在本地启动文档站点的服务，需要按下述步骤
-
-首先将 vuepress 安装到全局
-
-```
-npm i -g vuepress
-```
-
-启动服务
-
-```
-npm run doc:dev
-```
+```
\ No newline at end of file
diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index fe680ad8..2f8ef50f 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -72,8 +72,9 @@ D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布
 * 公用样式抽离，方便的主题定制
 * 支持百万级数据量的表格组件
 * 打包后随意目录部署（已经做好兼容设置）
-* 多标签页模式 `1.1.4 +`
 * 支持临时菜单配置
+* 多标签页模式 `1.1.4 +`
+* 美化滚动条 `1.1.4 +`
 
 ## TODO
 

From 5d05d5dda7d34dd07aeee1c52165dd53a6816786 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 23:03:25 +0800
Subject: [PATCH 050/128] no message

Former-commit-id: 7068e59e0d55d3b8da5970cbd4c1cd8fcf2227fb [formerly 7068e59e0d55d3b8da5970cbd4c1cd8fcf2227fb [formerly 7068e59e0d55d3b8da5970cbd4c1cd8fcf2227fb [formerly 7068e59e0d55d3b8da5970cbd4c1cd8fcf2227fb [formerly 6640b1333370401941210869dbfebb9c5e759a3f [formerly f414c5389f1e1b5ee4611ce08c4d0796c88347f5]]]]]
Former-commit-id: e64570c4120ed2b52700e968f3884e9ae96eca3c
Former-commit-id: 9b381354d0eea69f33f00055e2b691d963bb82f3
Former-commit-id: 73dbd0ff87229c4b9e596afe38c26d02fa4dc7bb [formerly ac3f7ce0906626c9b8ee933083475a5e1db9604a]
Former-commit-id: 7ac76583a2a507f9db73a26a159b6dff0d3cea8d
Former-commit-id: ef01095f0b9032e25e8d9d15f17bfbefb4345f79
Former-commit-id: 75f55b1a92d94506453c6b16b86fb763e3fe80fc
Former-commit-id: 497f85c0591f88ddacd6d2326220e272cf672e7f
Former-commit-id: 20cac441100be7fa73554b93f4c05223b6840cea
---
 README.md                 |  2 +-
 docs/zh/guide/README.md   | 24 ++----------------------
 docs/zh/guide/question.md | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index ce4e20eb..03ceba83 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 D2Admin 是一个开源的管理系统前端集成方案
 
-[Github仓库](https://github.com/FairyEver/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
+[Github仓库](https://github.com/FairyEver/d2-admin) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 
 ::: tip
 因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件。
diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index 2f8ef50f..8ac674fd 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -2,7 +2,7 @@
 
 D2Admin 是一个开源的管理系统前端集成方案
 
-[Github仓库](https://github.com/FairyEver/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
+[Github仓库](https://github.com/FairyEver/d2-admin) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 
 <div>
   <iframe src="//ghbtns.com/github-btn.html?user=FairyEver&repo=d2-admin&type=star&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
@@ -168,24 +168,4 @@ npm run dev
 npm run build
 ```
 
-> 如果上述步骤出现错误，建议您升级 node 版本 > 8，如果有其它疑问请参考[常见问题](/zh/guide/question.html)
-
-## 书写文档
-
-这里目前还有一个小遗憾，d2admin 使用的 webpack 版本不能符合 vuepress 的要求，所以如果你想在本地启动文档站点的服务，需要按下述步骤
-
-首先将 vuepress 安装到全局
-
-```
-npm i -g vuepress
-```
-
-启动服务
-
-```
-npm run doc:dev
-```
-
-::: tip
-你可能会发现项目目录中有一个 deploy 文件夹，这个文件是为了方便发布和提交代码用的，通常你并不需要使用它
-:::
\ No newline at end of file
+> 如果上述步骤出现错误，建议您升级 node 版本 > 8，如果有其它疑问请参考[常见问题](/zh/guide/question.html)
\ No newline at end of file
diff --git a/docs/zh/guide/question.md b/docs/zh/guide/question.md
index cd689bf8..43fd83cf 100644
--- a/docs/zh/guide/question.md
+++ b/docs/zh/guide/question.md
@@ -27,6 +27,26 @@ v8.11.1
 推荐使用 [nrm](https://github.com/Pana/nrm) 管理 npm 源，不建议使用 cnpm
 :::
 
+## 文档运行报错
+
+这里目前还有一个小遗憾，d2admin 使用的 webpack 版本不能符合 vuepress 的要求，所以如果你想在本地启动文档站点的服务，需要按下述步骤
+
+首先将 vuepress 安装到全局
+
+```
+npm i -g vuepress
+```
+
+启动服务
+
+```
+npm run doc:dev
+```
+
+::: tip
+你可能会发现项目目录中有一个 deploy 文件夹，这个文件是为了方便发布和提交代码用的，通常你并不需要使用它
+:::
+
 ## 删除页面右上角 github 链接
 
 在 `src/components/demo/d2-demo-page-cover/index.vue` 中删除相关代码即可

From 5e664683593b21b9e15a173f4ba366518a13746a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 23:05:47 +0800
Subject: [PATCH 051/128] no message

Former-commit-id: a0b28700074cfc7c594f97469f0af6470d91bb36 [formerly a0b28700074cfc7c594f97469f0af6470d91bb36 [formerly a0b28700074cfc7c594f97469f0af6470d91bb36 [formerly a0b28700074cfc7c594f97469f0af6470d91bb36 [formerly 8c71c5a074b56934ae31649d074533ea5d572476 [formerly 2467d9f1d7586fbfb53c73ef987c35cff8dff9d7]]]]]
Former-commit-id: e136cf939650c49cbca586ff305423b0cff12a04
Former-commit-id: 9a9297083f915c101e1b7f1008defbc9d0dcfbb4
Former-commit-id: dd031eec0b8c65b59efc93ff4818f3b7a8dc570b [formerly 2373c56b2c7e62e9daa720ea3954609a712de1e8]
Former-commit-id: 4d6bab56301f9449eadf619b646af40d19fd4247
Former-commit-id: 40fa0d9c12869f7c4c1f22086d008c005cc3938e
Former-commit-id: 7eed958882196fbf5fa79c9959d85bbff733cdc5
Former-commit-id: 73d799f6b88d01280ac697f378437049b3a266ec
Former-commit-id: b57ded5dd32295c9c2f4b0e0e8234934cf882280
---
 README.md               | 1 +
 docs/zh/guide/README.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 03ceba83..c8f04adf 100755
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布
 * 支持百万级数据量的表格组件
 * 打包后随意目录部署（已经做好兼容设置）
 * 支持临时菜单配置
+* 提供“试验台”功能 方便展示系统功能调用方法 `1.1.4 +`
 * 多标签页模式 `1.1.4 +`
 * 美化滚动条 `1.1.4 +`
 
diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index 8ac674fd..7de55c32 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -73,6 +73,7 @@ D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布
 * 支持百万级数据量的表格组件
 * 打包后随意目录部署（已经做好兼容设置）
 * 支持临时菜单配置
+* 提供“试验台”功能 方便展示系统功能调用方法 `1.1.4 +`
 * 多标签页模式 `1.1.4 +`
 * 美化滚动条 `1.1.4 +`
 

From 66d9209f81e7ff078f2e9ea55ec6754b1460045d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 23:11:47 +0800
Subject: [PATCH 052/128] no message

Former-commit-id: f0106ff64902a227195e38affb4b5e9b2fd3b03c [formerly f0106ff64902a227195e38affb4b5e9b2fd3b03c [formerly f0106ff64902a227195e38affb4b5e9b2fd3b03c [formerly f0106ff64902a227195e38affb4b5e9b2fd3b03c [formerly ca35601f3d151a1124848b937f956bbd0ea5ad20 [formerly 53cf13a7833749ed67461a81236f6afeb91bba7b]]]]]
Former-commit-id: d36ea87d56fa0906c867ee93bbcf79fffd420fa8
Former-commit-id: 8d1351b13bd4e911b0f12268b08470d77ea8cd5f
Former-commit-id: eecf09072ba9f5a2fd9465f846733e56b7fae103 [formerly 10e3141d7ba81893e5b7f9ecdf6f20ac0b37a14b]
Former-commit-id: 26cbc33efca25ba54b665c47253c19d72f2a435a
Former-commit-id: 1615536e841cde0c2c96452326fb60c0876d9371
Former-commit-id: 3e2250bcb245087f402848377a3ad07a6d9e03bd
Former-commit-id: b89829fa2a7941da07255ba3fed0b6af234f49f6
Former-commit-id: 9597db12d94f160bd06003492edafe4e2d60584f
---
 src/menu/index.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 2d5a60b8..b36a004e 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-3d08e93eeb3db6899777433a901454fe4f35f86e
\ No newline at end of file
+a5c3358c215874a8d4c65884722d34082f92646f
\ No newline at end of file

From cc2861b08c462e5dbb016ce51f24ea3aa4a16ab3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 23:18:12 +0800
Subject: [PATCH 053/128] no message

Former-commit-id: 37086d42a62702c8b19ac22e45f9efccaf5cab81 [formerly e9f762e2b44ca5349beb715a95e136737010172a] [formerly 37086d42a62702c8b19ac22e45f9efccaf5cab81 [formerly e9f762e2b44ca5349beb715a95e136737010172a] [formerly 37086d42a62702c8b19ac22e45f9efccaf5cab81 [formerly e9f762e2b44ca5349beb715a95e136737010172a] [formerly e9f762e2b44ca5349beb715a95e136737010172a [formerly 736a7d98e2c50e8607a0e92107bea12527d2662a [formerly 0f85db08e30abd4ee2069e87d3482bde8aaf34cd]]]]]
Former-commit-id: 44d7300ef37aae9a173aba2e065ef0ed9bd31a13
Former-commit-id: 023bc6d0302dfe85d7689c356ede34690b025414
Former-commit-id: 25ef2c06c68c900bbf5b19223ce7f1ccc786a516 [formerly 86d9d4dbcbe6a84f06c0f764e753cb817dd52f53]
Former-commit-id: 468a7d3b0404b49907fd2b35ffd120c9f18337e5
Former-commit-id: 0a7c26e9b58970c36b74eeff99da7eddb15a46d6
Former-commit-id: c8a3433382382c140a289eb8cfacad2aee7a10b1
Former-commit-id: 6a11d6c4e6132bc5a079bdd77543c55d3116fa59
Former-commit-id: e4b1f7567019c943e7de692d292685e4ded46b1b
---
 docs/zh/guide/question.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/question.md b/docs/zh/guide/question.md
index 43fd83cf..b4972356 100644
--- a/docs/zh/guide/question.md
+++ b/docs/zh/guide/question.md
@@ -55,6 +55,10 @@ npm run doc:dev
 
 el-scrollbar 组件是 ElementUI 自带的一个隐藏组件，没有写入文档，详见 [https://github.com/ElemeFE/element/issues/2238](https://github.com/ElemeFE/element/issues/2238)
 
+::: tip
+官方解释此组件在使用的时候需要注意较多问题，不推荐使用，如果你希望自定义滚动条或者实现滚动控制，可以使用 D2Admin 已经集成的 better-scroll
+:::
+
 ## 兼容性
 
 首先 vue.js 和 ElementUI 做不到兼容的，D2Admin 肯定也兼容不了，实测在 macOS 下 Chrome 和新版本的火狐浏览器以及 Safari 都正常使用，这类管理系统一般是内部使用，通常不必太纠结兼容低版本浏览器，如果你发现了显示的 bug，可以加 QQ 群反应，如果你可以修复这个 bug 使其在你的浏览器上显示正常，欢迎你的 pr。
@@ -197,4 +201,8 @@ Mock.setup({
 ```
 npm remove @antv/data-set -S
 npm remove @antv/g2 -S
-```
\ No newline at end of file
+```
+
+## 项目里有未完成的代码
+
+有些示例（比如 v-charts 和 ElementUI）是很方便就可以找到官网示例和文档的，这些插件和组件的示例在本项目中就可能处于未完成的状态，但是以后会完成
\ No newline at end of file

From d9a43f2adf2008643d86264c486e580915ce2276 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:06:16 +0800
Subject: [PATCH 054/128] no message

Former-commit-id: cbef5892343586ce077dba6afd4fba1d98723d8d [formerly 7e6888586ec0f65a6d11573215a12851a0b54b02] [formerly cbef5892343586ce077dba6afd4fba1d98723d8d [formerly 7e6888586ec0f65a6d11573215a12851a0b54b02] [formerly cbef5892343586ce077dba6afd4fba1d98723d8d [formerly 7e6888586ec0f65a6d11573215a12851a0b54b02] [formerly 7e6888586ec0f65a6d11573215a12851a0b54b02 [formerly af5f705edee2717557d95a165603200d03e87b40 [formerly e9951c131eac3968a4439be9f2ac7177820c1779]]]]]
Former-commit-id: 656499d798bc55b18329c867ecbd939ec07c11f7
Former-commit-id: a9515a33b56472fd77c425d1f92682e7009233a9
Former-commit-id: 8e6f6911e5f18862f774940f41e9be3d8536efba [formerly ff3a23b83e293220b18a20d05c16f40593e398de]
Former-commit-id: ea196dcc00fef5851130b67c140500524e3ed687
Former-commit-id: e9053dbda26584790fc9245a67ea50a3124c620b
Former-commit-id: f483a6a921a015570d4c36527fd8fe6bb8e7b73e
Former-commit-id: 9ef8b2f38f016d0a520b4e43932f749dd241f4be
Former-commit-id: 12b61fbb0729e56c5e3d394cb616d00d00c70fa4
---
 README.md                    | 3 +--
 github/qq.jpg.REMOVED.git-id | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 github/qq.jpg.REMOVED.git-id

diff --git a/README.md b/README.md
index c8f04adf..cd63eddb 100755
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 
 **QQ群 806395827**
 
-<a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=48323a4ed7a059a5d75f4a81586161ee60e495ab31905f8daaee8939ecacb363"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="D2Admin | js | vue 交流" title="D2Admin | js | vue 交流"></a>
-
+![QQ](./github/qq/jpg)
 **微信群**
 
 作者微信 liyang1711467488
diff --git a/github/qq.jpg.REMOVED.git-id b/github/qq.jpg.REMOVED.git-id
new file mode 100644
index 00000000..a957a237
--- /dev/null
+++ b/github/qq.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+b27de32f6832b50dc5b8b1dc613060a81f88a8e9
\ No newline at end of file

From 324a1bf96d61e16fde429a4ec03a921838bd2349 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:07:30 +0800
Subject: [PATCH 055/128] no message

Former-commit-id: 6a41b9a9df9726b19aea43a774230e806ac8cab2 [formerly 6a41b9a9df9726b19aea43a774230e806ac8cab2 [formerly 6a41b9a9df9726b19aea43a774230e806ac8cab2 [formerly 6a41b9a9df9726b19aea43a774230e806ac8cab2 [formerly a0d3365ee55b07f680dfa1ec2253598aa8387b34 [formerly cfab57d7ac108b0183cbf9c2b65c19d81f0735cd]]]]]
Former-commit-id: 3721af66077e88290903f6bf51e38e01aa266f31
Former-commit-id: b241d872e331793455532ff1e032d9522ce6cd15
Former-commit-id: 9f76b6a420bbd7ecd48831c13d80578b486256c4 [formerly 4dc984da2e74c04e45fa51574886a31a6519bf5b]
Former-commit-id: 25b5f81991f1acd3102cb5b7ed3801f2b7f8b504
Former-commit-id: 3e03f308154e9226ac71806d899cf7e90f6782e4
Former-commit-id: ac2b228504903d40239f2e9552b585e73a1305f4
Former-commit-id: dc1823d6176fb097abc9e6f73d90ca482dc9cab7
Former-commit-id: 23bd9e3be3d71739523600f97992d4d0b520f7c5
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd63eddb..345928b8 100755
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 
 **QQ群 806395827**
 
-![QQ](./github/qq/jpg)
+![QQ](d2-admin/github/qq.jpg)
 **微信群**
 
 作者微信 liyang1711467488

From f49821a584799599037dcc3b8562492b66af9bdd Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:08:52 +0800
Subject: [PATCH 056/128] no message

Former-commit-id: 3b8bbfd0c7e70c4b74ff3be81e5301ee029952f2 [formerly 7d74ea4bb4465dd98cc9a353110be52423367681] [formerly 3b8bbfd0c7e70c4b74ff3be81e5301ee029952f2 [formerly 7d74ea4bb4465dd98cc9a353110be52423367681] [formerly 3b8bbfd0c7e70c4b74ff3be81e5301ee029952f2 [formerly 7d74ea4bb4465dd98cc9a353110be52423367681] [formerly 7d74ea4bb4465dd98cc9a353110be52423367681 [formerly 17d3dcfdac80965f8f4c933c1c203cf482f16d3b [formerly 84f2b44697ed4df6a44c564a3566f87a5abdd99a]]]]]
Former-commit-id: 054ac544dc1ba5da983a1b09793576e0a4ef98c8
Former-commit-id: 2c583a0be22bb57aaf6d0844628e253d709c7473
Former-commit-id: 22ccac2e7b68f2e937727d6b3fdce24c0eedb671 [formerly e4b8db3ddc5058ab56c2d66c0e38642f823c47fb]
Former-commit-id: c8bad5f4069e2d9a716e06f80db8563913fba6a5
Former-commit-id: 68faf90d6e8acb424987034e8f8ca4c28870ef51
Former-commit-id: 7707f8946d9a726f49631a6d31e6d8580bfa32ae
Former-commit-id: e177e62d5ad63427fe4955eaadc0d81d53999534
Former-commit-id: 47da0d6c21ff9b3fa9c25aca41b4d05d03d71859
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 345928b8..96a32708 100755
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 
 **QQ群 806395827**
 
-![QQ](d2-admin/github/qq.jpg)
+![QQ](https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg)
 **微信群**
 
 作者微信 liyang1711467488

From 08c3341874bd0fb040622a97008d4e9707c256d1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:10:17 +0800
Subject: [PATCH 057/128] no message

Former-commit-id: 1dc585f1d3cd72b90cb33450b1ad23b914f857cf [formerly f4a4890afc876281336d16352daa123a51091268] [formerly 1dc585f1d3cd72b90cb33450b1ad23b914f857cf [formerly f4a4890afc876281336d16352daa123a51091268] [formerly 1dc585f1d3cd72b90cb33450b1ad23b914f857cf [formerly f4a4890afc876281336d16352daa123a51091268] [formerly f4a4890afc876281336d16352daa123a51091268 [formerly 150d2e4b696cf9d4fe7c4775f8f02180fe001105 [formerly 655f94263379b480842c31469b1b32c072737585]]]]]
Former-commit-id: c9fbe8692f8bc0d227a2955b133e2a2eec3efcc4
Former-commit-id: 8c19f56505be9ac4fa0a160e5157764269c9d163
Former-commit-id: 74017dbd889c372123763679d75dae130aebc22c [formerly 15ed14aa004ac620ab709244c278897f1b5e2acd]
Former-commit-id: 3ceac7e974971b6145fdce9185a5a055592b613d
Former-commit-id: 6475f2f47d014c1b9869e59c9a3ef6d1aae05249
Former-commit-id: 554d5b553a45d28339923d628f8c3ee4246e990a
Former-commit-id: 3fbb558c53b81f8e07806c186957f626d234efb3
Former-commit-id: 8d8931d21d372c634986c9343b253344fb3dd0fe
---
 README.md                    | 1 +
 github/we.jpg.REMOVED.git-id | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 github/we.jpg.REMOVED.git-id

diff --git a/README.md b/README.md
index 96a32708..2f8aabd4 100755
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 **微信群**
 
 作者微信 liyang1711467488
+![we](https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg)
 
 > 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
 
diff --git a/github/we.jpg.REMOVED.git-id b/github/we.jpg.REMOVED.git-id
new file mode 100644
index 00000000..af83cd85
--- /dev/null
+++ b/github/we.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+391119ecb08564a4e5d87c23be171f8ab9a4c894
\ No newline at end of file

From ab585de9ef72791fcea7767b9880c9dabb8ee183 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:11:37 +0800
Subject: [PATCH 058/128] no message

Former-commit-id: 3e1b5bb4fed7133fb811d74d76df33ea3e0b21fe [formerly 926fdf70cb75f8d18008f9b977607a965c0d8648] [formerly 3e1b5bb4fed7133fb811d74d76df33ea3e0b21fe [formerly 926fdf70cb75f8d18008f9b977607a965c0d8648] [formerly 3e1b5bb4fed7133fb811d74d76df33ea3e0b21fe [formerly 926fdf70cb75f8d18008f9b977607a965c0d8648] [formerly 926fdf70cb75f8d18008f9b977607a965c0d8648 [formerly 1274b28c219f14e140dc29ea9ba5ecd41077fa49 [formerly 306da4c6efb6b10c867644db0f8f25bec79fa021]]]]]
Former-commit-id: 63e7ddaec3a71400101961660e04793c173f0fa5
Former-commit-id: 6de0a242d773024bfa15d5e13a4db0fedc71f764
Former-commit-id: 6e8a61f1b31ba17b5596ac1654431dfc39281cd9 [formerly 3e47e6162d3e0bc57d4d9fca5e3781d3c2567f1c]
Former-commit-id: 95d81628417b486b803cc50d3d6c5f46595d61d2
Former-commit-id: 92fe056ef036d81b0cb3ec27663c186cda15e416
Former-commit-id: 9b468f64701682cc0c30cc4bf2b3adbc1847e534
Former-commit-id: e7ec70086c95940f2f14e52ecbaadb8029bed2d0
Former-commit-id: d89db7567df112a73925302d9dfcfff3732fb931
---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2f8aabd4..709c7575 100755
--- a/README.md
+++ b/README.md
@@ -12,11 +12,13 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 
 **QQ群 806395827**
 
-![QQ](https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg)
+<img src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/>
+
 **微信群**
 
 作者微信 liyang1711467488
-![we](https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg)
+
+<img src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/>
 
 > 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
 

From 0742fadcf5d62085ee8c740c05de6f9986b2d808 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:15:33 +0800
Subject: [PATCH 059/128] no message

Former-commit-id: bb0c85b126e9a00492afeed8eeba260f1ff7e4bc [formerly 34b8c95381075bc9c30b0f76eb4f85eba79f296e] [formerly bb0c85b126e9a00492afeed8eeba260f1ff7e4bc [formerly 34b8c95381075bc9c30b0f76eb4f85eba79f296e] [formerly bb0c85b126e9a00492afeed8eeba260f1ff7e4bc [formerly 34b8c95381075bc9c30b0f76eb4f85eba79f296e] [formerly 34b8c95381075bc9c30b0f76eb4f85eba79f296e [formerly 6d2ac71711f5271d939b334fc4ddb530c6cd9d20 [formerly b515f33efcc33cf4eb45c3ed56e5aeed5f51d130]]]]]
Former-commit-id: d5ae75ce6a9002e5c6602827e7559106325d7b6e
Former-commit-id: 690ae4e041ae29d314902a015825d7a1d4947a7c
Former-commit-id: 9e6482f834a7215404233716f46acc4aa9912144 [formerly 67cc6ada78e17e0f2d4fcdad24850e080c23505c]
Former-commit-id: 526210c429f927b83ab834ec394a349bd7fbeba3
Former-commit-id: 71193501748ac5ef943b297be30899f418890768
Former-commit-id: 73dd1b2e2bb3dc267099c9b84c584562ef84020c
Former-commit-id: baf19eb4265e47526408ae9f682e01fd55ba41ac
Former-commit-id: 168f65bda59aa692788033760aeac1c22ae44318
---
 README.md | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 709c7575..9739ccde 100755
--- a/README.md
+++ b/README.md
@@ -10,15 +10,9 @@ D2Admin 是一个开源的管理系统前端集成方案
 
 D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https://github.com/FairyEver) 在工作之余完全由兴趣驱动完成，如果你也一样喜欢前端开发，欢迎加入我们的讨论/学习群，群内可以`提问答疑`，`分享学习资料`或者随便扯淡
 
-**QQ群 806395827**
-
-<img src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/>
-
-**微信群**
-
-作者微信 liyang1711467488
-
-<img src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/>
+| QQ群 806395827 | 微信 liyang1711467488 |
+| --- | --- |
+| <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
 
 > 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
 

From 8d536bb6778fde9b478939609a68beda5a4afd26 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:16:48 +0800
Subject: [PATCH 060/128] no message

Former-commit-id: b004c055207009835838dc57567dd97f50739737 [formerly 8e5ec606007e683a6fb5d5f4e1985b0fbabe35c1] [formerly b004c055207009835838dc57567dd97f50739737 [formerly 8e5ec606007e683a6fb5d5f4e1985b0fbabe35c1] [formerly b004c055207009835838dc57567dd97f50739737 [formerly 8e5ec606007e683a6fb5d5f4e1985b0fbabe35c1] [formerly 8e5ec606007e683a6fb5d5f4e1985b0fbabe35c1 [formerly be1234366553bf690c16dabc0f1e63538011370f [formerly 695f36610735c96a21f15f9b24758bbdfdaa6a37]]]]]
Former-commit-id: e30b592cdcf23d02e118f8f9dfbe1ced2a8b84e0
Former-commit-id: 2ebe251712bf0ff476612a0e6a233d70cd2cfb8f
Former-commit-id: 12938b5b200e1c3313762a991c3846148bc4b56c [formerly df040c3e49b6979dbf00d0f60a1698ac42de8f8e]
Former-commit-id: 82b059b9dd156cb901ad6619c542bfd28ca9a40e
Former-commit-id: 436c25ad10718050181840f11f4604d4d7b1c5e6
Former-commit-id: 35f6b5e1a2beb6adfbe7fa187b7eeb2b8001ad85
Former-commit-id: 01f4dec6a4ce9a67e2979576cccd7afd4d171365
Former-commit-id: 962aad8956b59b2272594cf05c8782b213fa555f
---
 README.md | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 9739ccde..6b9d7374 100755
--- a/README.md
+++ b/README.md
@@ -4,23 +4,7 @@ D2Admin 是一个开源的管理系统前端集成方案
 
 [Github仓库](https://github.com/FairyEver/d2-admin) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 
-::: tip
 因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件。
-:::
-
-D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https://github.com/FairyEver) 在工作之余完全由兴趣驱动完成，如果你也一样喜欢前端开发，欢迎加入我们的讨论/学习群，群内可以`提问答疑`，`分享学习资料`或者随便扯淡
-
-| QQ群 806395827 | 微信 liyang1711467488 |
-| --- | --- |
-| <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
-
-> 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
-
-::: tip Thanks
-D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布，中间断断续续做了四个多月，发布一个月内收获将近 700star，在此对支持我的朋友表示感谢，D2Admin 将会保持更新，如果你有想法、建议、或者问题欢迎加群讨论
-
-—— 2018年6月20日
-:::
 
 ## 功能
 
@@ -68,6 +52,16 @@ D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布
 * 多标签页模式 `1.1.4 +`
 * 美化滚动条 `1.1.4 +`
 
+## 加入小组
+
+D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https://github.com/FairyEver) 在工作之余完全由兴趣驱动完成，如果你也一样喜欢前端开发，欢迎加入我们的讨论/学习群，群内可以`提问答疑`，`分享学习资料`或者随便扯淡
+
+| QQ群 806395827 | 微信 liyang1711467488 |
+| --- | --- |
+| <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
+
+> 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
+
 ## TODO
 
 D2Admin 仍然处于开发中，这里有一些暂时的计划：

From 75e68a03818da91d0c13f1f5213f93f004b37ebe Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:18:05 +0800
Subject: [PATCH 061/128] no message

Former-commit-id: 53a447ab2b28f74ac62e2c94f47bfb002322f8a1 [formerly 53a447ab2b28f74ac62e2c94f47bfb002322f8a1 [formerly 53a447ab2b28f74ac62e2c94f47bfb002322f8a1 [formerly 53a447ab2b28f74ac62e2c94f47bfb002322f8a1 [formerly cbece95a98426db464305aab205d434857eb67e3 [formerly c57d7d7a31bc171b70be94c789de6458e96cf860]]]]]
Former-commit-id: 2bc516ea5e6278350c485ccebd4f99e59094aab3
Former-commit-id: 86b35b84a53ee1cb2d761dcab50dab2a2bbe0182
Former-commit-id: b69f416e59b5213ead6d8b224c2db0a60dc25150 [formerly 757b92e9bbe3389087c3dc32cb856a9ee1189b18]
Former-commit-id: c00cbdb3e47147d0877ede3abdc012833684f96f
Former-commit-id: add326cf96d6d0887b33e2145c96e48c2b9903a8
Former-commit-id: 539e9e6588421fbb72157173d22baae3ea98beb9
Former-commit-id: 1b91dbf64e0abf5690c8b520b6ebdf3317507d2d
Former-commit-id: 8f543671e1f8cce4364b883cf62c0a2438a26feb
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6b9d7374..854ba75b 100755
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 
 | QQ群 806395827 | 微信 liyang1711467488 |
 | --- | --- |
-| <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="height: 240px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
+| <img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
 
 > 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
 

From 9f3bc97cc3daeddc80c4e07e3573641ab696c341 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:19:36 +0800
Subject: [PATCH 062/128] no message

Former-commit-id: 1eafdb57e493312c814d613b6658e07eba26efea [formerly 1eafdb57e493312c814d613b6658e07eba26efea [formerly 1eafdb57e493312c814d613b6658e07eba26efea [formerly 1eafdb57e493312c814d613b6658e07eba26efea [formerly 0647d0a29a4c146864490ed90f04c9f84f5fcfd0 [formerly e871ad08a2c3a8a6085701f724de47d3c6c98384]]]]]
Former-commit-id: 0161093aa7a3da83f681920faeb9d169f2016185
Former-commit-id: b7f1273263fbc7b4dda30a4393bce71161b4a5e5
Former-commit-id: 7807f6488c8d12ee7f700ab55c0793ec12809448 [formerly 085bc47692ad7e492c6de5a021e06511ad04510d]
Former-commit-id: fe1f64b1313a5677b80a1f33d2cf0b3a18745637
Former-commit-id: de24927dc9a0fa1f2081ff9902188f1ac3906f1e
Former-commit-id: af57a77b0e75f7148524002f95762fe3bff69943
Former-commit-id: d0d5bd9c4487d66b4c8cbb61032017147ea7cb8f
Former-commit-id: 41669edfc7600c959d4f0c2fba8b431121ce25ec
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 854ba75b..2043bfd2 100755
--- a/README.md
+++ b/README.md
@@ -60,6 +60,9 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 | --- | --- |
 | <img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
 
+
+<img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/>
+
 > 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
 
 ## TODO

From 9d8defcab23cbf3d33a8816c8e56eb21034340bf Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 06:20:36 +0800
Subject: [PATCH 063/128] no message

Former-commit-id: 58716dccb61e907a51077f2569d3d8ca6306f450 [formerly 3c074713c0c8373913c91a7a2c01fc011b614ad1] [formerly 58716dccb61e907a51077f2569d3d8ca6306f450 [formerly 3c074713c0c8373913c91a7a2c01fc011b614ad1] [formerly 58716dccb61e907a51077f2569d3d8ca6306f450 [formerly 3c074713c0c8373913c91a7a2c01fc011b614ad1] [formerly 3c074713c0c8373913c91a7a2c01fc011b614ad1 [formerly bf29f19ed73e147c05ec962ef4b129620b616fc1 [formerly 38b09fef23fce7dd76c833c3c3bf243946809fff]]]]]
Former-commit-id: 729c69e3e22f6cd8c7c935040c803a858fd2cc96
Former-commit-id: e1694310cc4b408e733d62cdcce04b601d0df7b7
Former-commit-id: 0ff74391636c7481b13e20dc1393a2c58e70234a [formerly a4a16b07fe2efdef57ecbd0b382b43eafd2a75c5]
Former-commit-id: d1f764264c5cb5e2b79d184a976182dbec85bd05
Former-commit-id: 93f62ad4792aaffec25ee96ad2b4f75e7b2ce352
Former-commit-id: 8de2c07bfa738da92adc3fced9b456b0518630cf
Former-commit-id: 5ef24aedd4468a5c8a768fd80d6cb59582c6b938
Former-commit-id: c560ac33df538b7c02999ee2400004d2306d09bb
---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 2043bfd2..854ba75b 100755
--- a/README.md
+++ b/README.md
@@ -60,9 +60,6 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https
 | --- | --- |
 | <img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/> | <img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/we.jpg"/> |
 
-
-<img style="width: 200px;" src="https://raw.githubusercontent.com/FairyEver/d2-admin/dev/github/qq.jpg"/>
-
 > 微信群需要先加群主才可以拉进群 PS 微信群交流不太方便，建议QQ群
 
 ## TODO

From 3585e9eb78ab45a8e46ef32f3354094bbf2b282f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 08:22:28 +0800
Subject: [PATCH 064/128] no message

Former-commit-id: 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly dea08899083aa05e8d6f14614c025b48b97741e6 [formerly 1ce2023c82a4fcd9627e210eb274c69219fd7425]]]]]
Former-commit-id: 940e1f2395a642c9af922dab82dc23bac003f17f
Former-commit-id: 99acadc56e19d94f968c0d8e63a4b25dddde8c3b
Former-commit-id: 21cecee25d507ce21b21c9cbbfc811c8257cfb0d [formerly d218edea00350bf5c15b8c72263474467eea3e56]
Former-commit-id: 7d5e734f081616be0d3b49e7dcb460a9f38c9e11
Former-commit-id: 3b94c9ce56c268eb3b1866883f1c7805673f25b9
Former-commit-id: 642c47e68190eff32090d358c65df31f40854a3c
Former-commit-id: 36eb24536167392823e080fae3d21dde6f9d318c
Former-commit-id: a87d518565feff320f9f4de7b19d3165a5a3c51d
---
 docs/zh/components/container.md               |   4 +-
 src/assets/style/theme/theme.scss             |  10 +-
 src/pages/demo/components/container/ghost.vue |   2 +-
 .../demo/components/container/md/doc-ghost.md |   6 +-
 src/pages/demo/element/basic-color/index.vue  | 164 +++++++-------
 src/pages/demo/element/basic-layout/index.vue | 206 +++++++++---------
 .../demo/element/basic-typography/index.vue   | 102 ++++-----
 7 files changed, 241 insertions(+), 253 deletions(-)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 95731ba3..27cfc424 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -85,10 +85,12 @@ export default {
 
 ### 隐形页面容器
 
-不显示任何背景色和边框
+不显示任何背景色和边框，通常这个模式只有在极少情况下会使用
 
 ``` vue
 <d2-container type="ghost">
   主体内容
 </d2-container>
 ```
+
+如果你不希望内容紧贴上边，可以在内容外层容器设置 `class="d2-mt"`
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 0ae8ba93..c09a7e93 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -249,7 +249,8 @@
       .d2-theme-container-main-body {
         // 布局组件
         .container-component {
-          // [组件] d2-container-full
+          // [组件]
+          // d2-container-full 填充型
           .d2-container-full {
             border: $theme-container-border-outer;
             border-top: none;
@@ -266,16 +267,17 @@
               background: $theme-container-header-footer-background-color;
             }
           }
-          // [组件] d2-container-card
+          // [组件]
+          // d2-container-card 卡片型
           .d2-container-card {
             border: $theme-container-border-outer;
             border-top: none;
             background: transparent;
-            .el-card__header {
+            &>.el-card__header {
               border-bottom: $theme-container-border-inner;
               background: $theme-container-header-footer-background-color;
             }
-            .el-card__body {
+            &>.el-card__body {
               background: $theme-container-background-color;
             }
           }
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index cb58c0cb..7a19241d 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container type="ghost">
-    <el-card shadow="never" style="width: 50%;">
+    <el-card shadow="never" class="d2-mt" style="width: 50%;">
       <d2-markdown :source="doc"/>
     </el-card>
   </d2-container>
diff --git a/src/pages/demo/components/container/md/doc-ghost.md b/src/pages/demo/components/container/md/doc-ghost.md
index 9a5ab565..af284fb9 100644
--- a/src/pages/demo/components/container/md/doc-ghost.md
+++ b/src/pages/demo/components/container/md/doc-ghost.md
@@ -1,9 +1,11 @@
 ## 隐形页面容器
 
-不显示任何背景色和边框
+不显示任何背景色和边框，通常这个模式只有在极少情况下会使用
 
 ```
 <d2-container type="ghost">
   主体内容
 </d2-container>
-```
\ No newline at end of file
+```
+
+如果你不希望内容紧贴上边，可以在内容外层容器设置 `class="d2-mt"`
\ No newline at end of file
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 15883b83..3a73aa22 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -1,90 +1,84 @@
 <template>
-  <d2-container type="ghost">
+  <d2-container>
     
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">主色</template>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <div class="color color-primary">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-      </el-row>
-    </el-card>
-    
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">辅助色</template>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <div class="color color-info">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-success">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-warning">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-danger">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-      </el-row>
-    </el-card>
-    
-    <el-card shadow="never">
-      <template slot="header">中性色</template>
-      <el-row :gutter="20" class="d2-mb">
-        <el-col :span="6">
-          <div class="color color-text-main">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-text-normal">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-text-sub">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-text-placehoder">
-            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <div class="color color-border-1">
-            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-border-2">
-            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-border-3">
-            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="color color-border-4">
-            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
-          </div>
-        </el-col>
-      </el-row>
-    </el-card>
+    <h1 class="d2-mt-0">主色</h1>
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <div class="color color-primary">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+    </el-row>
+
+    <h1>辅助色</h1>
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <div class="color color-info">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-success">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-warning">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-danger">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+    </el-row>
+  
+    <h1>中性色</h1>
+    <el-row :gutter="20" class="d2-mb">
+      <el-col :span="6">
+        <div class="color color-text-main">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-text-normal">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-text-sub">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-text-placehoder">
+          <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <div class="color color-border-1">
+          <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-border-2">
+          <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-border-3">
+          <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="color color-border-4">
+          <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+        </div>
+      </el-col>
+    </el-row>
     
   </d2-container>
 </template>
diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
index 262f4022..e3912336 100644
--- a/src/pages/demo/element/basic-layout/index.vue
+++ b/src/pages/demo/element/basic-layout/index.vue
@@ -1,118 +1,106 @@
 <template>
-  <d2-container type="ghost">
+  <d2-container>
+
+    <h1 class="d2-mt-0">基础布局</h1>
+    <el-row>
+      <el-col :span="24"><div class="grid-content bg-purple-dark"></div></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="12"><div class="grid-content bg-purple-light"></div></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="8"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
+    </el-row>
     
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">基础布局</template>
-      <el-row>
-        <el-col :span="24"><div class="grid-content bg-purple-dark"></div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="12"><div class="grid-content bg-purple-light"></div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="8"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
-      </el-row>
-    </el-card>
+    <h1>分栏间隔</h1>
+    <el-row :gutter="20">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
     
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">分栏间隔</template>
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-    </el-card>
+    <h1>混合布局</h1>
+    <el-row :gutter="20">
+      <el-col :span="16"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="16"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
     
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">混合布局</template>
-      <el-row :gutter="20">
-        <el-col :span="16"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="16"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-    </el-card>
+    <h1>分栏偏移</h1>
+    <el-row :gutter="20">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
     
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">分栏偏移</template>
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12" :offset="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-    </el-card>
+    <h1>对齐方式</h1>
+    <el-row type="flex" class="row-bg">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row type="flex" class="row-bg" justify="center">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row type="flex" class="row-bg" justify="end">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row type="flex" class="row-bg" justify="space-between">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
+    <el-row type="flex" class="row-bg" justify="space-around">
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+    </el-row>
     
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">对齐方式</template>
-      <el-row type="flex" class="row-bg">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row type="flex" class="row-bg" justify="center">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row type="flex" class="row-bg" justify="end">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row type="flex" class="row-bg" justify="space-between">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-      <el-row type="flex" class="row-bg" justify="space-around">
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
-      </el-row>
-    </el-card>
-    
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">响应式布局</template>
-      <el-row :gutter="10">
-        <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11"><div class="grid-content bg-purple-light"></div></el-col>
-        <el-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11"><div class="grid-content bg-purple"></div></el-col>
-        <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple-light"></div></el-col>
-      </el-row>
-    </el-card>
+    <h1>响应式布局</h1>
+    <el-row :gutter="10">
+      <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11"><div class="grid-content bg-purple-light"></div></el-col>
+      <el-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11"><div class="grid-content bg-purple"></div></el-col>
+      <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple-light"></div></el-col>
+    </el-row>
     
   </d2-container>
 </template>
diff --git a/src/pages/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
index 8632c179..6e5318af 100644
--- a/src/pages/demo/element/basic-typography/index.vue
+++ b/src/pages/demo/element/basic-typography/index.vue
@@ -1,55 +1,55 @@
 <template>
-  <d2-container type="ghost">
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">中文字体</template>
-      <el-row :gutter="10">
-        <el-col :span="6">
-          <el-card shadow="never">
-            <template slot="header">PingFang SC</template>
-            <p class="basic-typography-text typography-style-1">和畅惠风</p>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never">
-            <template slot="header">Hiragino Sans GB</template>
-            <p class="basic-typography-text typography-style-2">和畅惠风</p>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never">
-            <template slot="header">Microsoft YaHei</template>
-            <p class="basic-typography-text typography-style-3">和畅惠风</p>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-card>
-    <el-card shadow="never" class="d2-mb">
-      <template slot="header">英文／数字字体</template>
-      <el-row :gutter="10">
-        <el-col :span="6">
-          <el-card shadow="never">
-            <template slot="header">Helvetica Neue</template>
-            <p class="basic-typography-text typography-style-4">RGag</p>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never">
-            <template slot="header">Helvetica</template>
-            <p class="basic-typography-text typography-style-5">RGag</p>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never">
-            <template slot="header">Arial</template>
-            <p class="basic-typography-text typography-style-6">RGag</p>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-card>
-    <el-card shadow="never">
-      <template slot="header">Font-family 代码</template>
-      <d2-highlight :code="code"/>
-    </el-card>
+  <d2-container>
+
+    <template slot="header">字体</template>
+    
+    <h1 class="d2-mt-0">中文字体</h1>
+    <el-row :gutter="10">
+      <el-col :span="6">
+        <el-card shadow="never">
+          <template slot="header">PingFang SC</template>
+          <p class="basic-typography-text typography-style-1">和畅惠风</p>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <template slot="header">Hiragino Sans GB</template>
+          <p class="basic-typography-text typography-style-2">和畅惠风</p>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <template slot="header">Microsoft YaHei</template>
+          <p class="basic-typography-text typography-style-3">和畅惠风</p>
+        </el-card>
+      </el-col>
+    </el-row>
+  
+    <h1>英文／数字字体</h1>
+    <el-row :gutter="10">
+      <el-col :span="6">
+        <el-card shadow="never">
+          <template slot="header">Helvetica Neue</template>
+          <p class="basic-typography-text typography-style-4">RGag</p>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <template slot="header">Helvetica</template>
+          <p class="basic-typography-text typography-style-5">RGag</p>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <template slot="header">Arial</template>
+          <p class="basic-typography-text typography-style-6">RGag</p>
+        </el-card>
+      </el-col>
+    </el-row>
+    
+    <h1>Font-family 代码</h1>
+    <d2-highlight :code="code"/>
+
   </d2-container>
 </template>
 

From 0db2c843b1a64bffe591bc5ee4fa306859872c3c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 08:27:41 +0800
Subject: [PATCH 065/128] no message

Former-commit-id: b47c9d9b1c25aa15c2a6c5889b0f172d314bd566 [formerly e863cfaefda49059d286e446c84d1c661e57b68f] [formerly b47c9d9b1c25aa15c2a6c5889b0f172d314bd566 [formerly e863cfaefda49059d286e446c84d1c661e57b68f] [formerly b47c9d9b1c25aa15c2a6c5889b0f172d314bd566 [formerly e863cfaefda49059d286e446c84d1c661e57b68f] [formerly e863cfaefda49059d286e446c84d1c661e57b68f [formerly 9a88fcc87873f0d55e2e624cda3828179e76a25a [formerly 9fa8d2610a943ca3a7ac8ffdb1b1baca3f390608]]]]]
Former-commit-id: 68ce4d064dfbb4dc85207e98771eda4c0ad82de7
Former-commit-id: 5ac183a96841c3785cf3f3937c9c0cf5137a355c
Former-commit-id: 9d0b01efd64e5b55bf13f65e2d986849c6b71179 [formerly 52c8d040b7e467de5551e7e6f551abbb9e16e9a8]
Former-commit-id: 03670ed612a01fc12ac4a31103ad4058550c3710
Former-commit-id: 69c2f76c73fa4f23ccb446771c7538932166129e
Former-commit-id: 2edee67a3495b6449690fb909ee0025f0c3c72a9
Former-commit-id: 6a39322370728d67c604fc7e9f113e5e096c0aec
Former-commit-id: 3473894f1bb0a3a637f2c26b7a8c0a206c291c7a
---
 src/pages/demo/element/basic-typography/index.vue | 2 --
 src/pages/demo/plugins/mock/dpd.vue               | 8 +++-----
 src/pages/demo/plugins/mock/dtd.vue               | 8 +++-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/pages/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
index 6e5318af..4eead4b3 100644
--- a/src/pages/demo/element/basic-typography/index.vue
+++ b/src/pages/demo/element/basic-typography/index.vue
@@ -1,7 +1,5 @@
 <template>
   <d2-container>
-
-    <template slot="header">字体</template>
     
     <h1 class="d2-mt-0">中文字体</h1>
     <el-row :gutter="10">
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index 5c138aae..6f4b050f 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -1,9 +1,7 @@
 <template>
-  <d2-container type="ghost">
-    <el-card shadow="never" class="d2-mb">
-      <d2-demo-page-header slot="header" title="数据占位符"/>
-      <d2-markdown :source="doc"/>
-    </el-card>
+  <d2-container>
+    <d2-demo-page-header slot="header" title="数据占位符"/>
+    <d2-markdown :source="doc" class="d2-mb"/>
     <d2-demo-mock-card
       v-for="(item, index) in settingDPD"
       :key="index"
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index 4b5ac8b2..8612cecf 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -1,9 +1,7 @@
 <template>
-  <d2-container type="ghost">
-    <el-card shadow="never" class="d2-mb">
-      <d2-demo-page-header slot="header" title="数据模板"/>
-      <d2-markdown :source="doc"/>
-    </el-card>
+  <d2-container>
+    <d2-demo-page-header slot="header" title="数据模板"/>
+    <d2-markdown :source="doc" class="d2-mb"/>
     <d2-demo-mock-card
       v-for="(item, index) in settingDTD"
       :key="index"

From c0ed136400b4ceb2707eb5f5317ab462dcbbfb78 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 08:39:32 +0800
Subject: [PATCH 066/128] no message

Former-commit-id: 7ca51691874208e9e9f47fda72b1fb2042f5dd4a [formerly 7ca51691874208e9e9f47fda72b1fb2042f5dd4a [formerly 7ca51691874208e9e9f47fda72b1fb2042f5dd4a [formerly 7ca51691874208e9e9f47fda72b1fb2042f5dd4a [formerly cc1f2a5021c8e8950f6681fabd79286a8a527b39 [formerly 02765b5bd1d731d28e38edd0142f413b7a03ca72]]]]]
Former-commit-id: 3f90c4350da70f7b0099dcea375ce3f95d80770a
Former-commit-id: 6100f0a1615fcffd3ae40510eab63527875f4b3f
Former-commit-id: bff74c6aaa718e5c1f58308ac1f67ec75b3a744e [formerly 067d923c1a8c883af30906de916bfd5075c2e95c]
Former-commit-id: 31a47bebc12d18dcf05aa6b7ce467738a7beae4f
Former-commit-id: b4041296309c369a6026873ea9a71b691dc59cc2
Former-commit-id: 1b97af2f3ead70b83927a64ea9cc70c5777031af
Former-commit-id: 753592f1ca8d478c1b3899c4f11a23ea7869808c
Former-commit-id: b95f7c825743947f840e05dca1f1abdf7d94ee1d
---
 .../core/d2-layout-main/components/-menu-side/index.vue       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index c968c308..bd7206e4 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%;" class="d2-layout-main-menu-side">
+  <div class="d2-layout-main-menu-side">
     <el-menu
       :collapse="collapse"
       :unique-opened="true"
@@ -82,5 +82,7 @@ export default {
 <style lang="scss">
 .d2-layout-main-menu-side {
   position: relative;
+  height: 100%;
+  overflow: hidden;
 }
 </style>

From 183f645c02b70ea06f98146cc52218094010fac7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 08:50:40 +0800
Subject: [PATCH 067/128] no message

Former-commit-id: fa02b476a5cc01e0e21a3611345188ae533d5f6e [formerly 328213cafed8350628647033b857a75065c95536] [formerly fa02b476a5cc01e0e21a3611345188ae533d5f6e [formerly 328213cafed8350628647033b857a75065c95536] [formerly fa02b476a5cc01e0e21a3611345188ae533d5f6e [formerly 328213cafed8350628647033b857a75065c95536] [formerly 328213cafed8350628647033b857a75065c95536 [formerly 4b8e232a92043e08834fa83c3360af5c685e12c0 [formerly 30f6f01f92691e0bc24bd5ef4adee76ff35de4a2]]]]]
Former-commit-id: d83801002c127df474087fdee19efbb093780945
Former-commit-id: 316482718c9b973196deac2dfd54c6701de7a1e2
Former-commit-id: f282101ca7b4096a95d5e2ae9e068ae112f77846 [formerly f4bd4592f01b18a2b7b47f068770529b4fecbcb7]
Former-commit-id: 821f1203e81d71e697f0aa1a52bc11d30480f141
Former-commit-id: 90b5716839458871d9e3fbb57a918e845e041806
Former-commit-id: 19a4383bf1bfc77a1dac1ad237132c4aff643937
Former-commit-id: d2d5dacab8f5c753cad9850d9ca31e379d073ada
Former-commit-id: 7d8f4d81e84f71e5a484159dc287472fed6535b4
---
 src/components/core/d2-container/index.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 5f2f86e9..5bd15a90 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container-component" :class="{responsive}">
+  <div class="container-component" :class="{responsive}" ref="container">
     <!-- [card] 卡片容器 -->
     <el-card v-if="type === 'card'" shadow="never" class="d2-container-card d2-mr d2-mb">
       <slot v-if="$slots.header" name="header" slot="header"/>
@@ -26,6 +26,9 @@
 </template>
 
 <script>
+// 插件
+import BScroll from 'better-scroll'
+// 组件
 import d2ContainerFull from './components/d2-container-full.vue'
 import d2ContainerFullBs from './components/d2-container-full-bs.vue'
 export default {
@@ -53,6 +56,20 @@ export default {
   components: {
     'd2-container-full': d2ContainerFull,
     'd2-container-full-bs': d2ContainerFullBs
+  },
+  data () {
+    return {
+      BS: null
+    }
+  },
+  mounted () {
+    this.BS = new BScroll(this.$refs.container, {
+      mouseWheel: true,
+      scrollbar: {
+        fade: true,
+        interactive: false
+      }
+    })
   }
 }
 </script>
@@ -65,7 +82,7 @@ export default {
   bottom: 0px;
   left: 0px;
   right: 0px;
-  overflow: auto;
+  overflow: hidden;
 }
 @media (min-width: 576px) {
   // 根据你的需要在这里添加样式

From 1a15d950422337b871e7f9c24f54a4f3d87510e1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:03:25 +0800
Subject: [PATCH 068/128] no message

Former-commit-id: 5805aadc93264b3c5aa87ffc955c4f1b48f00750 [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5] [formerly 5805aadc93264b3c5aa87ffc955c4f1b48f00750 [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5] [formerly 5805aadc93264b3c5aa87ffc955c4f1b48f00750 [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5] [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5 [formerly 5994250766d06d7484a8ffe85aea646c23d07382 [formerly 5a89ce685e2b2da74e75e22488b1bcd73d8a5e50]]]]]
Former-commit-id: fa1baf35127d3e3110e92cc232f2fa99b045567b
Former-commit-id: 8cc23e52208fc66befe21fb88e6e434f0c4dc79e
Former-commit-id: 1389043b3fd6d688c817adc4f28e1fd72fb2d19f [formerly b2d8ee0ad34df4b52b252252c469bb3d95ab0d4c]
Former-commit-id: 7366655675b3764970acc20465174dd2c31b8c43
Former-commit-id: 17430795e77b31c80dcf56b5e1f7397a393c6577
Former-commit-id: 7cfc33889dfe0aa966d09b4b8ef9208ea278b552
Former-commit-id: 25e7ed8ecb7a66480b5b4b598a897e0387f942d2
Former-commit-id: 390b817f127ee5b442f05977758aab8374b60d03
---
 .../components/d2-container-full-bs.vue          |  2 +-
 src/components/core/d2-container/index.vue       | 16 +++++++++-------
 src/pages/demo/plugins/mock/dpd.vue              |  1 +
 src/pages/demo/plugins/mock/dtd.vue              |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
index d58c5fec..81019358 100644
--- a/src/components/core/d2-container/components/d2-container-full-bs.vue
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -52,7 +52,7 @@ export default {
   .d2-container-full__body {
     flex-grow: 1;
     padding: 0px 20px;
-    overflow: auto;
+    overflow: hidden;
     position: relative;
   }
   .d2-container-full__footer {
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 5bd15a90..b6521bcf 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -63,13 +63,15 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.container, {
-      mouseWheel: true,
-      scrollbar: {
-        fade: true,
-        interactive: false
-      }
-    })
+    if (this.type !== 'full') {
+      this.BS = new BScroll(this.$refs.container, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index 6f4b050f..ec1234ba 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -8,6 +8,7 @@
       :title="item.title"
       :code="JSON.stringify(item.json, null, 2)"
       :mock="mockResult[index]"
+      style="margin-bottom: 0px !important;"
       @reload="doMock(index)">
     </d2-demo-mock-card>
   </d2-container>
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index 8612cecf..059e614c 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -20,6 +20,7 @@
       :title="regexp.title"
       :code="regexp.code"
       :mock="regexp.mocked"
+      style="margin-bottom: 0px !important;"
       @reload="regexpMock()">
     </d2-demo-mock-card>
   </d2-container>

From b53e4f280fe7461ca97053ae8b2eaa86cef26008 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:08:25 +0800
Subject: [PATCH 069/128] no message

Former-commit-id: dfce7fbc9bca2067040e6e8c23b66a6c7aa83954 [formerly dfce7fbc9bca2067040e6e8c23b66a6c7aa83954 [formerly dfce7fbc9bca2067040e6e8c23b66a6c7aa83954 [formerly dfce7fbc9bca2067040e6e8c23b66a6c7aa83954 [formerly 0ca6fc401bc9eed429d63d2f325a51427e64efaf [formerly fc38bbe5b0872fe19fba8c2c1a18b012a1196dd1]]]]]
Former-commit-id: f89ce864541c5bd3b5575fd5f004166f264ba979
Former-commit-id: 72c12de2fb73d8a611de1ab490a0350dc8d0854e
Former-commit-id: 2c5855db32c4f9bd6443b4feafc36cc97f485c6a [formerly dec663903e8ed536195246c100e252139303a38c]
Former-commit-id: 29d7df6bf67e26ba34eea97d7fa13780db34cb33
Former-commit-id: de5395cf09cc52ee68cc40cbb540df99144501d9
Former-commit-id: bf93df20659a08143ac052c4f71f3e8526087ffa
Former-commit-id: b49da24340c8a064b15ab1a90bbb5e6070ecd611
Former-commit-id: 76337aae3c06b11a6cf4f6b836c3e8adab599f49
---
 docs/zh/guide/question.md                     |  8 ---
 src/menu/index.js.REMOVED.git-id              |  2 +-
 src/pages/demo/components/scrollbar/index.vue | 49 -------------------
 src/pages/demo/components/scrollbar/md/doc.md |  5 --
 src/router/routes.js.REMOVED.git-id           |  2 +-
 5 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 src/pages/demo/components/scrollbar/index.vue
 delete mode 100644 src/pages/demo/components/scrollbar/md/doc.md

diff --git a/docs/zh/guide/question.md b/docs/zh/guide/question.md
index b4972356..f20d47d1 100644
--- a/docs/zh/guide/question.md
+++ b/docs/zh/guide/question.md
@@ -51,14 +51,6 @@ npm run doc:dev
 
 在 `src/components/demo/d2-demo-page-cover/index.vue` 中删除相关代码即可
 
-## el-scrollbar 组件
-
-el-scrollbar 组件是 ElementUI 自带的一个隐藏组件，没有写入文档，详见 [https://github.com/ElemeFE/element/issues/2238](https://github.com/ElemeFE/element/issues/2238)
-
-::: tip
-官方解释此组件在使用的时候需要注意较多问题，不推荐使用，如果你希望自定义滚动条或者实现滚动控制，可以使用 D2Admin 已经集成的 better-scroll
-:::
-
 ## 兼容性
 
 首先 vue.js 和 ElementUI 做不到兼容的，D2Admin 肯定也兼容不了，实测在 macOS 下 Chrome 和新版本的火狐浏览器以及 Safari 都正常使用，这类管理系统一般是内部使用，通常不必太纠结兼容低版本浏览器，如果你发现了显示的 bug，可以加 QQ 群反应，如果你可以修复这个 bug 使其在你的浏览器上显示正常，欢迎你的 pr。
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index b36a004e..a25b9e17 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-a5c3358c215874a8d4c65884722d34082f92646f
\ No newline at end of file
+1cb25eb88e2e503ea0849d3c27b9871e62e335a8
\ No newline at end of file
diff --git a/src/pages/demo/components/scrollbar/index.vue b/src/pages/demo/components/scrollbar/index.vue
deleted file mode 100644
index 49c7ae8b..00000000
--- a/src/pages/demo/components/scrollbar/index.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <d2-container>
-    <template slot="header">Element 滚动条组件</template>
-    <el-card shadow="never" class="demo-scrollbar-card d2-mb">
-      <div class="demo-scrollbar-card-inner">
-        <el-scrollbar>
-          <div class="demo-scrollbar-group">
-            <div v-for="n in 20" :key="n" class="demo-scrollbar-item">
-              <el-button size="mini">n : {{n}}</el-button>
-            </div>
-          </div>
-        </el-scrollbar>
-      </div>
-    </el-card>
-    <d2-markdown :source="doc"/>
-  </d2-container>
-</template>
-
-<script>
-import doc from './md/doc.md'
-export default {
-  data () {
-    return {
-      doc
-    }
-  }
-}
-</script>
-
-
-<style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
-.demo-scrollbar-card {
-  width: 300px;
-  .demo-scrollbar-card-inner {
-    margin: -20px;
-  }
-  .demo-scrollbar-group {
-    height: 200px;
-    .demo-scrollbar-item {
-      padding: 10px;
-      border-bottom: 1px solid $color-border-4;
-      &:last-child {
-        border-bottom: none;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/demo/components/scrollbar/md/doc.md b/src/pages/demo/components/scrollbar/md/doc.md
deleted file mode 100644
index 21113513..00000000
--- a/src/pages/demo/components/scrollbar/md/doc.md
+++ /dev/null
@@ -1,5 +0,0 @@
-本示例演示 ElementUI 的隐藏组件 `<el-scrollbar>`，详细信可以参照 [element/issues#2238](https://github.com/ElemeFE/element/issues/2238)
-
-> ElementUI 官网以及部分涉及滚动操作的组件内部使用了 `<el-scrollbar>` 组件，虽然已经暴露到全局但是并没有相关文档介绍
-
-如果你需要更高级的滚动自定义控制，D2Admin 已经集成 [better-scroll](https://github.com/ustbhuangyi/better-scroll)，示例见 [自定义滚动](/#/demo/plugins/better-scroll/base)，[滚动定位](/#/demo/plugins/better-scroll/to)
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index e0c109c3..f8109dbf 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-003fe0eab9894c5bbfc8cc4f0ad571b8dcb29ce2
\ No newline at end of file
+ffe496e6ad1cc8ce892d32163b8312a4d525aeed
\ No newline at end of file

From 6d60fdb03d32e2fa5eea72bd57dbe6012150e5d1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:11:33 +0800
Subject: [PATCH 070/128] no message

Former-commit-id: c2a7bcd1da315a1dfcf7c8ab47fb18e7f7c29373 [formerly d120d2d175d8ee41dc49f607e2801adeed4c1b48] [formerly c2a7bcd1da315a1dfcf7c8ab47fb18e7f7c29373 [formerly d120d2d175d8ee41dc49f607e2801adeed4c1b48] [formerly c2a7bcd1da315a1dfcf7c8ab47fb18e7f7c29373 [formerly d120d2d175d8ee41dc49f607e2801adeed4c1b48] [formerly d120d2d175d8ee41dc49f607e2801adeed4c1b48 [formerly 4da829d33370eaddf7dea324f5c8d2b054716be7 [formerly 9f07081fc9f6ad141df7b0535b7d223c8cfad2e7]]]]]
Former-commit-id: 10825f64970d380110b4d00ed3ed1c66d21c95bc
Former-commit-id: b72e352b60fc161ffc4392f194d705034814ed56
Former-commit-id: 2d6f2afae9c28167db8c37df78152a3bbb2376eb [formerly b280bad795e034d61767b60b7096aee03216808b]
Former-commit-id: e7c9a41178c44220ce22b44d4c98565fb1778070
Former-commit-id: 4eb9250ff52b4269e611e12815e72416bc2105c6
Former-commit-id: 2dc43a7e5c3486d2e09aa18239dddd3bd7989a8f
Former-commit-id: 673665a2ef837bc83aded65677261a3dee6fe05a
Former-commit-id: 496483b6ff4a1c25468b144b4c7ca523be0ea72f
---
 docs/zh/guide/change-log.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 6f134c85..9046f340 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -9,7 +9,8 @@
 * [ 新增 ] 多页模式缓存
 * [ 新增 ] 多页模式快速关闭（关闭左侧 右侧 全部 其它）
 * [ 修改 ] 侧边栏滚动优化
-* [ 新增 ] `d2-container` 组件新增滚动优化模式
+* [ 新增 ] `d2-container` 填充模式自定义滚动条
+* [ 新增 ] `d2-container` 组件卡片和隐形模式自定义滚动条
 
 ## v1.1.3
 

From 30a1d7c71a053e43eee2cd37d99861696c6e7147 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:22:01 +0800
Subject: [PATCH 071/128] no message

Former-commit-id: 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly 2abfbd6e94052d07f85634f475442288b28bccc8 [formerly f13339f93def6bd6950951a8f55c060b77a55ba1 [formerly ccb30639df081f493bbc37c3265e295da38e7d6f]]]]]
Former-commit-id: 367c7b9ef13f571a327fe59c332b31fc7c68aeff
Former-commit-id: 6a04cd021c861a399249fe7ffa0fcde74f6e4309
Former-commit-id: 9ebfb32347efd07d0adbd3664c49f4ae4bf2c366 [formerly b3c413cccd29f4c8c17c1820500304628d1a4da5]
Former-commit-id: 3d1a3ab3d41580b9882869006d520d2e6db85ea1
Former-commit-id: e9758df27bfe06c6ca6c70caac07bdae9f833054
Former-commit-id: 8a9941a0718ddf61583c3d21596b1c7dd4dd9bb3
Former-commit-id: 7a15a08cde23e51dcc814fa878b57c5b4272c22b
Former-commit-id: 9be0087752755f36602ce9ba04d8e421d32a7da5
---
 src/store/modules/d2admin.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 8e3d4383..392f2e5a 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -241,7 +241,11 @@ export default {
      */
     d2adminThemeLoad (state) {
       const themeActiveName = db.get('themeActiveName').find({uuid: util.uuid()}).value()
-      this.commit('d2adminThemeSet', themeActiveName.value || state.themeList[0].name)
+      if (themeActiveName) {
+        this.commit('d2adminThemeSet', themeActiveName.value)
+      } else {
+        this.commit('d2adminThemeSet', state.themeList[0].name)
+      }
     }
   }
 }

From 4e40494e6377c71f6d7fd542596a5ecd77f1670a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:26:54 +0800
Subject: [PATCH 072/128] no message

Former-commit-id: 2e0867b6216b0c58a5ed7a7ea265e414a9e60d27 [formerly c5495b1c018394f5da4e8082cf05d8f688226daf] [formerly 2e0867b6216b0c58a5ed7a7ea265e414a9e60d27 [formerly c5495b1c018394f5da4e8082cf05d8f688226daf] [formerly 2e0867b6216b0c58a5ed7a7ea265e414a9e60d27 [formerly c5495b1c018394f5da4e8082cf05d8f688226daf] [formerly c5495b1c018394f5da4e8082cf05d8f688226daf [formerly c3b2eb79e82f049f67c4c09d3a8afd665e9e484b [formerly 639ed2e47365c0cd07ce1964cf99f89a8658d8c5]]]]]
Former-commit-id: c332d3e50c3b82b0b78c8549f6fea6e637be9263
Former-commit-id: 42fc74baa12e3b9fb81579cb28d7b5cdc6926d7f
Former-commit-id: 02bf3339060e4b0896a853817c8743b8c5a74b51 [formerly 9fe999bc18b4d74b8bfa81428e941faf7f2a0c51]
Former-commit-id: 810d9c3b08616ae9e5bc9604bc581e7201ca3200
Former-commit-id: 949a3499d6c780b585b96de24d159ab921777412
Former-commit-id: 8c21aef367c4a85221be8aec23ee924d42a0b0b1
Former-commit-id: 89cf9f31d3128b0d2512c313d0b8bd66d22b409b
Former-commit-id: 86ff2df49e47b5250708015b254c2ee1804b7100
---
 src/components/core/d2-container/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index b6521bcf..ac8122fc 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container-component" :class="{responsive}" ref="container">
     <!-- [card] 卡片容器 -->
-    <el-card v-if="type === 'card'" shadow="never" class="d2-container-card d2-mr d2-mb">
+    <el-card v-if="type === 'card'" shadow="never" class="d2-container-card d2-mr">
       <slot v-if="$slots.header" name="header" slot="header"/>
       <slot/>
     </el-card>

From 9dda8c892b4fc8829fbea139efb6503d8750a18f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:28:15 +0800
Subject: [PATCH 073/128] no message

Former-commit-id: 7c007f7a799f88f198d15a02238b1bb8e7081a8e [formerly 65f18ecae27b5303f07d74d74b24dcf965ac7e0a] [formerly 7c007f7a799f88f198d15a02238b1bb8e7081a8e [formerly 65f18ecae27b5303f07d74d74b24dcf965ac7e0a] [formerly 7c007f7a799f88f198d15a02238b1bb8e7081a8e [formerly 65f18ecae27b5303f07d74d74b24dcf965ac7e0a] [formerly 65f18ecae27b5303f07d74d74b24dcf965ac7e0a [formerly 739a0e6ef45789fbc27f60c9a6a1d5596ac8db7b [formerly 4d28f1c8bf2a1e92b164b9f916140b4f79e88eac]]]]]
Former-commit-id: 2db237b22b6a157763acbd846f49b1f10b7fdcac
Former-commit-id: a7620881909537fe851cc4bd5316b3cef3c78368
Former-commit-id: 6bc93d73cc7e0b24a2a92bed41bc612f4986f36a [formerly 6ea5bdd63932c7c57f09f80faf84527ac98e00ff]
Former-commit-id: 42d82d0d1af14832c061e588054931dca3a508f4
Former-commit-id: 1cf5a22caf0f948249c1cd122ec2c90b719b476f
Former-commit-id: 2b50a6a18cb096d0b5665eb40cda67d493561c87
Former-commit-id: bb49b9463a21c4fd5961b65e68bc0b619da78bc5
Former-commit-id: 0f8c1ea4046ad21677cde9adfe7257fd2a6c452c
---
 src/menu/index.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index a25b9e17..e43ab11a 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-1cb25eb88e2e503ea0849d3c27b9871e62e335a8
\ No newline at end of file
+29e192f50a90764c273aab5cb84c7d6fd0f91c68
\ No newline at end of file

From 5d7aad57867d5275ebcc881f185f0dcad4190fc0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:59:39 +0800
Subject: [PATCH 074/128] no message

Former-commit-id: 6e3a91875816d9e9a401cf6ef6ef6d5c57b330a4 [formerly 204827cd3446c1353f9a62726144bde614fd4aa8] [formerly 6e3a91875816d9e9a401cf6ef6ef6d5c57b330a4 [formerly 204827cd3446c1353f9a62726144bde614fd4aa8] [formerly 6e3a91875816d9e9a401cf6ef6ef6d5c57b330a4 [formerly 204827cd3446c1353f9a62726144bde614fd4aa8] [formerly 204827cd3446c1353f9a62726144bde614fd4aa8 [formerly e9e8b0c0e60d32cbb24e3162984c0098bbf41a34 [formerly eb6c2c5aba86fec7066554af243201a4bbe88794]]]]]
Former-commit-id: d9cd51ae384090c54a3157348c80d4821f567fa4
Former-commit-id: f179d80a5dddc6c059e3e90322bf94370fe27fc2
Former-commit-id: 999b22e27e9251fe30a654465b56505eabdbdb23 [formerly 6a3baa7c907bdcd69997ebb88546200b06000f76]
Former-commit-id: fd0184b2cc3b89cbaf4c743df75a96576739b5ec
Former-commit-id: af9b28d9ad44830c8f8a2f3dd86d99d5ea9e570b
Former-commit-id: d2f730edab8dcda77059c2fffe0c5225fe624b2a
Former-commit-id: 896031ba85f107feaeb5c819081854d8433b2ee0
Former-commit-id: b2f67824edda0e10fdb4b912d5d0133250ef4a72
---
 docs/zh/guide/change-log.md |  1 +
 src/libs/util.js            | 19 ++++++++++++++-----
 src/router/index.js         |  2 ++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 9046f340..0f9fb78d 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -11,6 +11,7 @@
 * [ 修改 ] 侧边栏滚动优化
 * [ 新增 ] `d2-container` 填充模式自定义滚动条
 * [ 新增 ] `d2-container` 组件卡片和隐形模式自定义滚动条
+* [ 新增 ] 现在页面标题可以根据路由做出对应变化了
 
 ## v1.1.3
 
diff --git a/src/libs/util.js b/src/libs/util.js
index 343338e7..d5fe9f9e 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -3,14 +3,23 @@ import Cookies from 'js-cookie'
 let util = {}
 
 /**
- * 得到现在的用户
+ * @description 得到现在的用户
  */
 util.uuid = function () {
   return Cookies.get('uuid')
 }
 
 /**
- * 打开全屏
+ * @description 更新标题
+ * @param {string} title 标题
+ */
+util.title = function (title) {
+  const prefix = 'D2Admin'
+  window.document.title = `${prefix}${title ? ` | ${title}` : ''}`
+}
+
+/**
+ * @description 打开全屏
  */
 util.openFullScreen = function () {
   const body = document.body
@@ -26,7 +35,7 @@ util.openFullScreen = function () {
 }
 
 /**
- * 关闭全屏
+ * @description 关闭全屏
  */
 util.exitFullScreen = function () {
   if (document.exitFullscreen) {
@@ -41,7 +50,7 @@ util.exitFullScreen = function () {
 }
 
 /**
- * 在每次打开新页面的时候调用 打开一个新的 tab
+ * @description 在每次打开新页面的时候调用 打开一个新的 tab
  * @param {object} vm vue
  * @param {string} name route name
  * @param {object} argu arguments
@@ -72,7 +81,7 @@ util.openNewPage = function (vm, name, argu, query) {
 }
 
 /**
- * 判断是否在其内
+ * @description 判断是否在其内
  * @param {*} ele element
  * @param {array} targetArr array
  */
diff --git a/src/router/index.js b/src/router/index.js
index 6a79cb90..1a5fffa7 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,6 +40,8 @@ router.afterEach(to => {
   const { name, params, query } = to
   // 多页控制 打开新的页面
   util.openNewPage(app, name, params, query)
+  // 更改标题
+  util.title(to.meta.title)
 })
 
 export default router

From bfb758989916151189dbb72fb10d1b55dfe86d72 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 10:15:20 +0800
Subject: [PATCH 075/128] no message

Former-commit-id: 963610a6ae2b537cb740f334c12d5ab217ddc841 [formerly f4f4982090dcdcced3527e03949e4893526a06c7] [formerly 963610a6ae2b537cb740f334c12d5ab217ddc841 [formerly f4f4982090dcdcced3527e03949e4893526a06c7] [formerly 963610a6ae2b537cb740f334c12d5ab217ddc841 [formerly f4f4982090dcdcced3527e03949e4893526a06c7] [formerly f4f4982090dcdcced3527e03949e4893526a06c7 [formerly e0c49bd9ba3b1f4d9704a7a1182f2d1b28d26624 [formerly 35ce3aba101ae3d0c36785b7ab8ca8cae4805c1f]]]]]
Former-commit-id: 5d004586bc92f1ec25a08260694c9724111a740b
Former-commit-id: fd20038aec1b43ffc17205fc9e7bd856405ae8b0
Former-commit-id: f6f7e5aff28f0496edc8b90cff1317c4ac28ce8e [formerly 23b7b72214095ff18eba7330a79b899b7ea42733]
Former-commit-id: 0c6e9ca174319877eb6afb705bdd138397e4075e
Former-commit-id: a8fd6f1f29bfca6e3107be9bf3941b72337b8f89
Former-commit-id: 3e8143803eff0b6d582fb1f191c4076c51a62823
Former-commit-id: a67913d13808f3578c59cc38d0d029d0765fc916
Former-commit-id: 8ba70ff2cae197f46bdfd7c265676adb95b37211
---
 package.json     |  4 ++--
 src/libs/util.js | 21 +++++++++++++++++++++
 src/main.js      | 11 +++++++++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 8426f1b4..7e27fec4 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.0.0",
+  "version": "1.1.4",
   "description": "A management system framework based on element",
   "author": "李杨 <1711467488@qq.com>",
   "private": true,
@@ -84,7 +84,7 @@
     "postcss-loader": "^2.0.8",
     "rimraf": "^2.6.0",
     "sass-loader": "^6.0.6",
-    "semver": "^5.3.0",
+    "semver": "^5.5.0",
     "shelljs": "^0.7.6",
     "svg-sprite-loader": "^3.6.2",
     "text-loader": "0.0.1",
diff --git a/src/libs/util.js b/src/libs/util.js
index d5fe9f9e..fd512758 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -1,4 +1,10 @@
+// 插件
 import Cookies from 'js-cookie'
+import axios from 'axios'
+import semver from 'semver'
+
+// 获取项目信息
+import packJson from '../../package.json'
 
 let util = {}
 
@@ -93,4 +99,19 @@ util.isOneOf = function (ele, targetArr) {
   }
 }
 
+util.checkUpdate = function (vm) {
+  axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest').then(res => {
+    console.group('update check')
+    let version = res.tag_name
+    console.log('远程版本', semver.clean(version))
+    console.log('本地版本', semver.clean(packJson.version))
+    if (semver.lt(packJson.version, version)) {
+      console.log('D2Admin 有新版本')
+    } else {
+      console.log('D2Admin 已经是最新版本')
+    }
+    console.groupEnd()
+  })
+}
+
 export default util
diff --git a/src/main.js b/src/main.js
index f624d9b3..ad0b5975 100755
--- a/src/main.js
+++ b/src/main.js
@@ -4,8 +4,11 @@ import Vue from 'vue'
 import App from './App'
 import i18n from './i18n'
 
+// 工具
+import util from '@/libs/util'
+
 // vuex
-import store from '@/store/index.js'
+import store from '@/store/index'
 
 // 路由
 import router from './router'
@@ -25,7 +28,7 @@ import '@/assets/library/font-awesome-4.7.0/css/font-awesome.min.css'
 import 'simplemde/dist/simplemde.min.css'
 
 // svg图标
-import '@/assets/icons/index.js'
+import '@/assets/icons/index'
 
 // markdown主题
 import 'github-markdown-css'
@@ -88,6 +91,10 @@ new Vue({
     // 处理路由 得到每一级的路由设置
     this.getAllTagFromRoutes()
   },
+  mounted () {
+    // D2Admin 检查更新
+    util.checkUpdate(this)
+  },
   methods: {
     /**
      * 处理路由 得到每一级的路由设置

From a87440ed7fe89e4d3285cc5c60dbedd69f9caedc Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 10:48:06 +0800
Subject: [PATCH 076/128] no message

Former-commit-id: 13419f92c5622fbfbf7f17334bf46f5c81802dd4 [formerly 13419f92c5622fbfbf7f17334bf46f5c81802dd4 [formerly 13419f92c5622fbfbf7f17334bf46f5c81802dd4 [formerly 13419f92c5622fbfbf7f17334bf46f5c81802dd4 [formerly 3b8db4da8eda0c4494cdd75da070738913a6daf7 [formerly f043a2c0f06c85cace241c6b18079dbb3dfcd35d]]]]]
Former-commit-id: f8735b5cac364ed161b41d810a0bf228e7f09f66
Former-commit-id: 6b9840fd8d662b2f8a1ac7b1275c6d6e6f21f37d
Former-commit-id: 54fe457fd4810e591f1f91f2d6acab18587112b4 [formerly 34a25898a147c7634a8577ba93ae9f400f43efda]
Former-commit-id: 894d636a82ec1199bf9e888a5deed49d1b41e2a7
Former-commit-id: 7e7162eb76c4a15081f15694c0b3e4f006e7c145
Former-commit-id: ea613e712c64fdd0a11f1dfd516801003981ff03
Former-commit-id: 49349d6c0c2151dad24c32c359ab4f56f69343e6
Former-commit-id: 295dba6f186293af1302c32ce13b34fd4425593c
---
 src/libs/util.js             | 27 +++++++++++++++------------
 src/store/modules/d2admin.js | 22 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index fd512758..231abe99 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -100,18 +100,21 @@ util.isOneOf = function (ele, targetArr) {
 }
 
 util.checkUpdate = function (vm) {
-  axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest').then(res => {
-    console.group('update check')
-    let version = res.tag_name
-    console.log('远程版本', semver.clean(version))
-    console.log('本地版本', semver.clean(packJson.version))
-    if (semver.lt(packJson.version, version)) {
-      console.log('D2Admin 有新版本')
-    } else {
-      console.log('D2Admin 已经是最新版本')
-    }
-    console.groupEnd()
-  })
+  axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest')
+    .then(res => {
+      let version = res.tag_name
+      const update = semver.lt(packJson.version, version)
+      if (update) {
+        console.log('update')
+      } else {
+        console.log('no update')
+      }
+      vm.$store.commit('d2adminUpdateSet', update)
+      vm.$store.commit('d2adminReleasesSet', res)
+    })
+    .catch(err => {
+      console.log('checkUpdate error', err)
+    })
 }
 
 export default util
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 392f2e5a..b7a5ce86 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -4,6 +4,10 @@ import themeList from '@/assets/style/theme/list.js'
 
 export default {
   state: {
+    // 拉取的最新版本信息
+    releases: {},
+    // 有更新
+    update: false,
     // 全屏
     isFullScreen: false,
     // 灰度
@@ -52,6 +56,24 @@ export default {
         }).write()
       }
     },
+    /**
+     * @description 更新远端的版本信息
+     * @class releases
+     * @param {state} state vuex state
+     * @param {object} releases info
+     */
+    d2adminReleasesSet (state, releases) {
+      state.releases = releases
+    },
+    /**
+     * @description 设置是否有更新
+     * @class update
+     * @param {state} state vuex state
+     * @param {boolean} update update value
+     */
+    d2adminUpdateSet (state, update) {
+      state.update = update
+    },
     /**
      * @class pageCurrent
      * @description 设置当前激活的页面 name

From 744400bd3eb4f6002bc6fdc9c8b9e1a07619db05 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 11:11:34 +0800
Subject: [PATCH 077/128] no message

Former-commit-id: 51d1fef43b49167144327c62b45d8e9bbb5cd1a7 [formerly 184a56d14648049c28ec392e20d88b1f9cf0c53b] [formerly 51d1fef43b49167144327c62b45d8e9bbb5cd1a7 [formerly 184a56d14648049c28ec392e20d88b1f9cf0c53b] [formerly 51d1fef43b49167144327c62b45d8e9bbb5cd1a7 [formerly 184a56d14648049c28ec392e20d88b1f9cf0c53b] [formerly 184a56d14648049c28ec392e20d88b1f9cf0c53b [formerly 468866b89662ae5a923a5ed755b5a8221cb7b1db [formerly 6d576dbfd246dfe4157e3dca73bd18dd4640bf22]]]]]
Former-commit-id: 3c3e378f5e378bd9b93e7beec3cd2ec2dbb5a815
Former-commit-id: 74c495c6fae4fd1b05c7c2e348f84674daed1d61
Former-commit-id: 263a2c4139d3a675e685df7a5e0e01d6943213f5 [formerly abb3b3765efe373441a66c8b90533ba651fdb439]
Former-commit-id: b1bb0183dfba53ae64b4025ff5cacc94c1fe5732
Former-commit-id: 5bf9706eec5f66484193c94cd2fa423e4399f91f
Former-commit-id: 4f81c095ed67ee18cbb0424a08b9135cd0ec7866
Former-commit-id: 4aae2a4e7391a7706fd000bbd5c284b8c603d51c
Former-commit-id: 6b6720954af0c80bae7677f0e63d04bedfe723bd
---
 package.json     |  2 +-
 src/libs/util.js | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7e27fec4..ee1b73e6 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.1.4",
+  "version": "1.1.1",
   "description": "A management system framework based on element",
   "author": "李杨 <1711467488@qq.com>",
   "private": true,
diff --git a/src/libs/util.js b/src/libs/util.js
index 231abe99..477005bf 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -2,6 +2,7 @@
 import Cookies from 'js-cookie'
 import axios from 'axios'
 import semver from 'semver'
+import dayjs from 'dayjs'
 
 // 获取项目信息
 import packJson from '../../package.json'
@@ -105,9 +106,26 @@ util.checkUpdate = function (vm) {
       let version = res.tag_name
       const update = semver.lt(packJson.version, version)
       if (update) {
-        console.log('update')
-      } else {
-        console.log('no update')
+        vm.$nextTick(() => {
+          vm.$notify({
+            title: `D2Admin 新版本 ${res.name}`,
+            duration: 0,
+            dangerouslyUseHTMLString: true,
+            message: `
+              <p>${dayjs(res.created_at).format('YYYY年M月D日')}更新 版本号:${res.tag_name}</p>
+              <p>
+                <a
+                  href="${res.html_url}"
+                  class="el-button el-button--primary el-button--mini"
+                  style="text-decoration: none; margin-top: 10px;"
+                  target="blank">
+                  <i class="fa fa-link" style="margin-right: 5px;"></i>
+                  详细信息
+                </a>
+              </p>
+            `.trim()
+          })
+        })
       }
       vm.$store.commit('d2adminUpdateSet', update)
       vm.$store.commit('d2adminReleasesSet', res)

From 620e280fbe41f6a7b99e2e3ba329109706983760 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 11:12:12 +0800
Subject: [PATCH 078/128] no message

Former-commit-id: 35324fd39443af9b7973a70f00a82c0910c64b5b [formerly e069ab9f805cfd6d4b16f24bbf2ef764d8c0b05c] [formerly 35324fd39443af9b7973a70f00a82c0910c64b5b [formerly e069ab9f805cfd6d4b16f24bbf2ef764d8c0b05c] [formerly 35324fd39443af9b7973a70f00a82c0910c64b5b [formerly e069ab9f805cfd6d4b16f24bbf2ef764d8c0b05c] [formerly e069ab9f805cfd6d4b16f24bbf2ef764d8c0b05c [formerly fe8101f4b9c86562bdb17b7549d0a63ca333f78d [formerly c99e0e57bbb16036fa55da7d36fb02ee9c844142]]]]]
Former-commit-id: 7817e80fb3c008657daf4a2fe836c2bf31493fa1
Former-commit-id: a71fc823517df63cd2342308b1587834456f1a32
Former-commit-id: 8c9bdfc759348ed76623e208a4407f2461a7d42c [formerly 02e4414d5ec810f4bd60b09fe33390f69490eeb6]
Former-commit-id: 12f50580e7924730338779465b129247c41ce1a1
Former-commit-id: f15ccbfa9e0b8ab23679844025d80461e7d2e2cf
Former-commit-id: becfb818d7c11a797ebc73decdcfd3d3f05abd21
Former-commit-id: 9c459b63993afd1ee15b28739d163b227dec9180
Former-commit-id: 90a19138140684440b35d4c3bad8ef7bbce6649e
---
 src/libs/util.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/util.js b/src/libs/util.js
index 477005bf..6bdd10d5 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -100,6 +100,10 @@ util.isOneOf = function (ele, targetArr) {
   }
 }
 
+/**
+ * @description 检查版本更新
+ * @param {object} vm vue
+ */
 util.checkUpdate = function (vm) {
   axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest')
     .then(res => {

From 719cb6687114e2a2ef5fbcc9d71a0fc47ac5a355 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 11:13:47 +0800
Subject: [PATCH 079/128] no message

Former-commit-id: 42e9955e9e26bf5b09ababe8157fbbf8dab870fc [formerly 42e9955e9e26bf5b09ababe8157fbbf8dab870fc [formerly 42e9955e9e26bf5b09ababe8157fbbf8dab870fc [formerly 42e9955e9e26bf5b09ababe8157fbbf8dab870fc [formerly 21c4ec9e46090a777805f9448e34345b19acde42 [formerly 275006c286dc9acf3475fea69c727cec5de1dac1]]]]]
Former-commit-id: 3315c734777c3edb67f81347db1458155b8d9b23
Former-commit-id: ba6d378696dac5fba1c0e1c7958476e9009e9c26
Former-commit-id: ebe002a768ee5f069042e5dd87af13e05ad282a4 [formerly b33f9e993ce4c2fec376ad397bece6257b06017e]
Former-commit-id: 330ba54ff14ad7b8ed4376111818970216c29af0
Former-commit-id: 6390d807ea5d0face8882953c0ad45c935ef0cf6
Former-commit-id: a30ea0bfb14639d96ba76f21c77b1b22639ad52b
Former-commit-id: 2b38428794e04424cc9970f25f5d203df49873eb
Former-commit-id: 28fc59858d3a68aabd7e09c29d3bd185224864b8
---
 src/libs/util.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/util.js b/src/libs/util.js
index 6bdd10d5..b7da4b60 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -104,6 +104,7 @@ util.isOneOf = function (ele, targetArr) {
  * @description 检查版本更新
  * @param {object} vm vue
  */
+// TODO: 添加 跳过此版本 选项
 util.checkUpdate = function (vm) {
   axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest')
     .then(res => {

From a2f93bf96ee91595c74685fb5e8e4f72badcb058 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 11:17:25 +0800
Subject: [PATCH 080/128] no message

Former-commit-id: d3acc7a0a51207d0cabcf4595003a0ce39890773 [formerly d3acc7a0a51207d0cabcf4595003a0ce39890773 [formerly d3acc7a0a51207d0cabcf4595003a0ce39890773 [formerly d3acc7a0a51207d0cabcf4595003a0ce39890773 [formerly 165ae46087ccb138f50f5463f6706a4be7ffb782 [formerly 9130b441498b1b4422118b284fc809698ba69ec4]]]]]
Former-commit-id: 123ac33f775ac840924409f24602a7eb9137c16a
Former-commit-id: 9588bd3924766ea09c146c1c726b86b6e43a7294
Former-commit-id: 7da68b2619eae861d45c1ace95d2f6a400b6ea7a [formerly c17beb102375fde1f34b23e498a0f8712b73bac0]
Former-commit-id: 238b857a36439273b84df72474e486c689867fdb
Former-commit-id: c587a29d725c36c91cbdf41c22db16bb141ba173
Former-commit-id: e096d154c768f46711551ea57fdf38e3fc066d13
Former-commit-id: dea9d1b24bac49bfd08dddd65b885c0651d275b0
Former-commit-id: f96f943cffdc2818a31014b745fb9df4e509fd29
---
 src/pages/demo/components/layout/grid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/demo/components/layout/grid.vue b/src/pages/demo/components/layout/grid.vue
index 0b99b45e..abdb5d0c 100644
--- a/src/pages/demo/components/layout/grid.vue
+++ b/src/pages/demo/components/layout/grid.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container type="ghost" class="demo-layout-grid d2-mt">
+  <d2-container type="ghost" class="demo-layout-grid">
     <d2-grid-layout
       v-bind="layout"
       @layout-updated="layoutUpdatedHandler">

From f979d92620f4094ffe62e98dbbc09429e81c2b40 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:03:33 +0800
Subject: [PATCH 081/128] no message

Former-commit-id: d947e54093471ecc85fe9171d51aa64ad560ba9e [formerly d947e54093471ecc85fe9171d51aa64ad560ba9e [formerly d947e54093471ecc85fe9171d51aa64ad560ba9e [formerly d947e54093471ecc85fe9171d51aa64ad560ba9e [formerly 0639e27228bd4ce7583671ac6c5d1702c75c57b9 [formerly c263545cb8457cb5b8194fdbe6393a9e38ad26a6]]]]]
Former-commit-id: 7a51bd5d5340e8df7112dedf6fb4bcc3209bf6ea
Former-commit-id: b0e44c55c5a159403518bc96eeaab4ddce82b379
Former-commit-id: d061577549c79468a84ac65e541110d512de97e8 [formerly 7a35d2d01c56d0520cf62edc02cc5630d0232b49]
Former-commit-id: 0aae62a7688da3c9b63b88e2c3416ec4faa8735a
Former-commit-id: 2f1c380beb8720f3aa8e50099f467bd55a7f2259
Former-commit-id: 5b8f973daa4f9f9de742bf832784f8a86f037a9d
Former-commit-id: 09933084b7cbc32ff54f0f158aecc352061e158d
Former-commit-id: 445510e39e959b6b0451d1d47c6427f16361cd87
---
 src/components/core/d2-container/index.vue    |  4 +++-
 src/menu/index.js.REMOVED.git-id              |  2 +-
 .../components/container/ghost-header.vue     | 19 +++++++++++++++++++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/components/container/ghost-header.vue

diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index ac8122fc..ea7df202 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -7,7 +7,9 @@
     </el-card>
     <!-- [ghost] 隐形的容器 -->
     <div v-if="type === 'ghost'" class="d2-container-ghost">
-      <slot name="header"/>
+      <el-card v-if="$slots.header">
+        <slot name="header"/>
+      </el-card>
       <slot/>
     </div>
     <!-- [container-full] 填充 -->
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index e43ab11a..9d7a5b2d 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-29e192f50a90764c273aab5cb84c7d6fd0f91c68
\ No newline at end of file
+2d3e492f0292e6cd7fcf39d98a7e99b72e7e82a9
\ No newline at end of file
diff --git a/src/pages/demo/components/container/ghost-header.vue b/src/pages/demo/components/container/ghost-header.vue
new file mode 100644
index 00000000..49ac04cc
--- /dev/null
+++ b/src/pages/demo/components/container/ghost-header.vue
@@ -0,0 +1,19 @@
+<template>
+  <d2-container type="ghost">
+    <template slot="header">header</template>
+    <el-card shadow="never" class="d2-mt" style="width: 50%;">
+      <d2-markdown :source="doc"/>
+    </el-card>
+  </d2-container>
+</template>
+
+<script>
+import doc from './md/doc-ghost.md'
+export default {
+  data () {
+    return {
+      doc
+    }
+  }
+}
+</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index f8109dbf..e67f5aa5 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-ffe496e6ad1cc8ce892d32163b8312a4d525aeed
\ No newline at end of file
+0e1a920511ec4883219ee769e78996943f2925ea
\ No newline at end of file

From 54ee4d9db3f688fb2884f7d9602068c7c84e8792 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:07:44 +0800
Subject: [PATCH 082/128] no message

Former-commit-id: 96250187c533034716b9e2bcba61d3b3ee75c5de [formerly 96250187c533034716b9e2bcba61d3b3ee75c5de [formerly 96250187c533034716b9e2bcba61d3b3ee75c5de [formerly 96250187c533034716b9e2bcba61d3b3ee75c5de [formerly 5d5f3951bf5ce9bed72bba857d5efc7be28d0d0f [formerly d51ea59b08fe986a2a3bf20ecaf80d39f73d226c]]]]]
Former-commit-id: c65de2b5ba48292ae13ddfe7887ed785df9a0706
Former-commit-id: 7af23ce341995319ff8e438109a5f731f5dd575a
Former-commit-id: d598da797839b94a32d143bac7844611fa9643cd [formerly 0e1163b74e2561173fa4b368f8cba552132f9b3e]
Former-commit-id: 7bb3c63887ea19e35b6c53754f0aad4aa7cca198
Former-commit-id: b64f421901a8e5448b1d73985117d3bd58024337
Former-commit-id: e000fd19bce74cc3580f50073b3ede2a0eff1a4b
Former-commit-id: 8fc3d52f3d7f60423f9f1ad22d2a182b198b71ff
Former-commit-id: 43812b0cfb692dc05964da5d4bc70d88b55df5aa
---
 src/main.js                            | 8 +++++---
 src/pages/demo/plugins/build/index.vue | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main.js b/src/main.js
index ad0b5975..55579401 100755
--- a/src/main.js
+++ b/src/main.js
@@ -75,7 +75,7 @@ Vue.use(bigdataTable)
 
 Vue.config.productionTip = false
 
-Vue.prototype.$env = process.env.NODE_ENV === 'development'
+Vue.prototype.$env = process.env.NODE_ENV
 
 Vue.prototype.$assetsPublicPath = process.env.NODE_ENV === 'development' ? buildConfig.dev.assetsPublicPath : buildConfig.build.assetsPublicPath
 
@@ -92,8 +92,10 @@ new Vue({
     this.getAllTagFromRoutes()
   },
   mounted () {
-    // D2Admin 检查更新
-    util.checkUpdate(this)
+    // D2Admin 开发环境检查更新
+    if (this.$env === 'development') {
+      util.checkUpdate(this)
+    }
   },
   methods: {
     /**
diff --git a/src/pages/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/index.vue
index efd29a22..34640cad 100644
--- a/src/pages/demo/plugins/build/index.vue
+++ b/src/pages/demo/plugins/build/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
     <template slot="header">环境区分</template>
-    <p>当前是{{$env ? '开发' : '生产'}}环境</p>
+    <p>当前是{{$env === 'development' ? '开发' : '生产'}}环境</p>
   </d2-container>
 </template>
\ No newline at end of file

From 1df2f7138fc37444489b872c58f497f7edff394c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:10:42 +0800
Subject: [PATCH 083/128] no message

Former-commit-id: 858e2d5ef98694b59511d714bf844afc9fb04790 [formerly e9a081cc0b7429c73808fac2896364c370238fe0] [formerly 858e2d5ef98694b59511d714bf844afc9fb04790 [formerly e9a081cc0b7429c73808fac2896364c370238fe0] [formerly 858e2d5ef98694b59511d714bf844afc9fb04790 [formerly e9a081cc0b7429c73808fac2896364c370238fe0] [formerly e9a081cc0b7429c73808fac2896364c370238fe0 [formerly 8f9439deed37259059b6750bb6ae1d8af7404053 [formerly e5498f8a7684ff0513d80c547396cf0c8b09f35e]]]]]
Former-commit-id: 1bfc068337c62a9fb47703fb403d9eb024e68656
Former-commit-id: bfa1706c05fdbf84fbaa16b10896fb011f4f1466
Former-commit-id: 2214e4ef9c8f425604c169ac6bc19e1df63d0728 [formerly 75b454ad79b6d1df52b6f80619f07a08bb329427]
Former-commit-id: c639326d303eb761a76eb5b00d8d32b08c1e5af7
Former-commit-id: 274a39a6d36427950542e1e5e60bfef838b11f48
Former-commit-id: f4a08b05e61191ab30e2c285df860708a53ab80f
Former-commit-id: ff1bb808e383bea57079673bf93b9d71f7b1b3d5
Former-commit-id: 944c17c4d9159a98eede89c19d3bee66a8f869ba
---
 docs/zh/guide/change-log.md | 1 +
 src/libs/util.js            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 0f9fb78d..9de62b31 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -12,6 +12,7 @@
 * [ 新增 ] `d2-container` 填充模式自定义滚动条
 * [ 新增 ] `d2-container` 组件卡片和隐形模式自定义滚动条
 * [ 新增 ] 现在页面标题可以根据路由做出对应变化了
+* [ 新增 ] 版本检查机制
 
 ## v1.1.3
 
diff --git a/src/libs/util.js b/src/libs/util.js
index b7da4b60..20d2d54e 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -117,7 +117,8 @@ util.checkUpdate = function (vm) {
             duration: 0,
             dangerouslyUseHTMLString: true,
             message: `
-              <p>${dayjs(res.created_at).format('YYYY年M月D日')}更新 版本号:${res.tag_name}</p>
+              <p>当前版本: ${packJson.version}</p>
+              <p>${dayjs(res.created_at).format('YYYY年M月D日')}更新 版本号: ${res.tag_name}</p>
               <p>
                 <a
                   href="${res.html_url}"

From 56639abd2a3e7e8c76444ffe4abc893c40d16031 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:18:28 +0800
Subject: [PATCH 084/128] no message

Former-commit-id: d9b50b6b08043b9b449c6392b0cab848c9a5fbc8 [formerly d9b50b6b08043b9b449c6392b0cab848c9a5fbc8 [formerly d9b50b6b08043b9b449c6392b0cab848c9a5fbc8 [formerly d9b50b6b08043b9b449c6392b0cab848c9a5fbc8 [formerly ad7a53e54d05dcb48700216515bef0dd32789511 [formerly bc2f59bfb15741447f8e7a83dc9806467eb09f1e]]]]]
Former-commit-id: bd6947a1b20b754e419768ffee511158cfcb7354
Former-commit-id: 74cdfe5579829904c45b640440d085e8643ca20f
Former-commit-id: 367dfc8824044e95586af9f192f173afceb82bf9 [formerly 3ea29514c4b5636d9db3822d1a7749f57f3f0204]
Former-commit-id: e21a02ca87a955df333e56b0ac6b1f9844ca83ad
Former-commit-id: ae1bc5a41a25ff2cea737d81db377566045b4bf5
Former-commit-id: 9d07c4e755a5e7543c0ec7363236db5233b892f9
Former-commit-id: b14b7c7596dc964a3353b29715abf06aea93f75e
Former-commit-id: 71489b1e665291b16e24b6b6617d26d6db13efce
---
 src/libs/util.js | 3 ++-
 src/main.js      | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index 20d2d54e..917066e0 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -110,7 +110,7 @@ util.checkUpdate = function (vm) {
     .then(res => {
       let version = res.tag_name
       const update = semver.lt(packJson.version, version)
-      if (update) {
+      if (vm.$env === 'development' && update) {
         vm.$nextTick(() => {
           vm.$notify({
             title: `D2Admin 新版本 ${res.name}`,
@@ -119,6 +119,7 @@ util.checkUpdate = function (vm) {
             message: `
               <p>当前版本: ${packJson.version}</p>
               <p>${dayjs(res.created_at).format('YYYY年M月D日')}更新 版本号: ${res.tag_name}</p>
+              <p style="color: #CCC;">此信息只在开发环境提示</p>
               <p>
                 <a
                   href="${res.html_url}"
diff --git a/src/main.js b/src/main.js
index 55579401..7c45e63d 100755
--- a/src/main.js
+++ b/src/main.js
@@ -93,9 +93,7 @@ new Vue({
   },
   mounted () {
     // D2Admin 开发环境检查更新
-    if (this.$env === 'development') {
-      util.checkUpdate(this)
-    }
+    util.checkUpdate(this)
   },
   methods: {
     /**

From d908042712fab46a137da747c36077ab0704402b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:26:40 +0800
Subject: [PATCH 085/128] no message

Former-commit-id: 68af86c9032cbaa2b389f08c1df647725f6bc123 [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8] [formerly 68af86c9032cbaa2b389f08c1df647725f6bc123 [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8] [formerly 68af86c9032cbaa2b389f08c1df647725f6bc123 [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8] [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8 [formerly 588c55a9b3ac1572edd0bbb6138371a73c789863 [formerly b6b4304d4ca85bdbd43b1fecc769862c14576ab2]]]]]
Former-commit-id: 981b04291e9cc68583637f48cdf8a59f4a113963
Former-commit-id: 8af6a0ccd853085ebe08b6d4b26a198da1b58e8d
Former-commit-id: 966e733ac9698ac12ae75fb61c45ff820b395c8e [formerly d9992bf6c3f2009a01e1d984125cc987b59549a9]
Former-commit-id: b299c3722e4abb3cf1a1412971e268ac2824dfd0
Former-commit-id: 673d89b46b073169c60b655baefda4b4e78a05b8
Former-commit-id: 3c6bfac047adb007132947b99890a9a94169084c
Former-commit-id: 988f9ff01c1a70a11bff5217fc68426a754f9752
Former-commit-id: 4ca827fbb3632ba7430e4c80cc550fa2463b081d
---
 src/assets/style/theme/theme-base.scss               | 8 +++++++-
 src/assets/style/theme/theme.scss                    | 9 +++++++++
 src/components/core/d2-container/index.vue           | 2 +-
 src/pages/demo/components/container/ghost-header.vue | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index cf8423eb..d427046e 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -213,10 +213,16 @@
               border-top-left-radius: 0px;
               border-top-right-radius: 0px;
             }
-            // 隐形布局组件 这个组件不建议在有多页面导航的时候使用 不美观
+            // 隐形布局组件
             .d2-container-ghost {
               margin-right: 20px;
               margin-bottom: 20px;
+              .d2-container-ghost-header {
+                border-top: none;
+                border-top-left-radius: 0px;
+                border-top-right-radius: 0px;
+                margin-bottom: 20px;
+              }
             }
           }
         }
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index c09a7e93..d5cd96d7 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -281,6 +281,15 @@
               background: $theme-container-background-color;
             }
           }
+          // 隐形布局组件
+          .d2-container-ghost {
+            .d2-container-ghost-header {
+              border: $theme-container-border-outer;
+              &>.el-card__body {
+                background: $theme-container-header-footer-background-color;
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index ea7df202..1dafcf6c 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -7,7 +7,7 @@
     </el-card>
     <!-- [ghost] 隐形的容器 -->
     <div v-if="type === 'ghost'" class="d2-container-ghost">
-      <el-card v-if="$slots.header">
+      <el-card v-if="$slots.header" shadow="never" class="d2-container-ghost-header">
         <slot name="header"/>
       </el-card>
       <slot/>
diff --git a/src/pages/demo/components/container/ghost-header.vue b/src/pages/demo/components/container/ghost-header.vue
index 49ac04cc..bf4d2f21 100644
--- a/src/pages/demo/components/container/ghost-header.vue
+++ b/src/pages/demo/components/container/ghost-header.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container type="ghost">
     <template slot="header">header</template>
-    <el-card shadow="never" class="d2-mt" style="width: 50%;">
+    <el-card shadow="never" style="width: 50%;">
       <d2-markdown :source="doc"/>
     </el-card>
   </d2-container>

From b363dbd42c78e1974232b58ac6d09fa13240ab42 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:27:26 +0800
Subject: [PATCH 086/128] no message

Former-commit-id: 6789c09ce91c3ba231acfa47b505ed7a98144030 [formerly 5867989842577d225d6119885e5090fdddf644a6] [formerly 6789c09ce91c3ba231acfa47b505ed7a98144030 [formerly 5867989842577d225d6119885e5090fdddf644a6] [formerly 6789c09ce91c3ba231acfa47b505ed7a98144030 [formerly 5867989842577d225d6119885e5090fdddf644a6] [formerly 5867989842577d225d6119885e5090fdddf644a6 [formerly 3fd54fd98fc20ea74d7be2a5be04cded96e4d99e [formerly 7ea415b58c39cd0529f7ec22c0fe813a18fb6d03]]]]]
Former-commit-id: 3d5c01e920632f5628e07e844c2265b2983f75ad
Former-commit-id: 8b70ed47d4e9f6d6e333f9d3727ca7114c307b80
Former-commit-id: 4d1cbf395ebb17692001c5f19d102cd195d40572 [formerly 73ad0ba6c47c8c54d24907beb39876d775c5f9ae]
Former-commit-id: 4894c48f82105b6dd827e2d01484e74dd8bc5317
Former-commit-id: 3c35fb2945a9025a3ce697f44e5b0a9e5e4e70ad
Former-commit-id: 6a3d7030c4442030147c9552d9c695274c8596a4
Former-commit-id: d164c19038519dfdf14fe88de3f0ef9fc59c02ee
Former-commit-id: 8c6b66b7e6728dbab43c23fd0222ba537527f7c0
---
 docs/zh/guide/change-log.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 9de62b31..15c0f2bd 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -13,6 +13,7 @@
 * [ 新增 ] `d2-container` 组件卡片和隐形模式自定义滚动条
 * [ 新增 ] 现在页面标题可以根据路由做出对应变化了
 * [ 新增 ] 版本检查机制
+* [ 新增 ] `d2-container` 隐形模式支持 header 插槽
 
 ## v1.1.3
 

From aff9db82e86d5f07ac54921b2921cfa2a077c420 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 13:35:55 +0800
Subject: [PATCH 087/128] no message

Former-commit-id: de59617ae0f743f40790191c53c53551a285e995 [formerly de59617ae0f743f40790191c53c53551a285e995 [formerly de59617ae0f743f40790191c53c53551a285e995 [formerly de59617ae0f743f40790191c53c53551a285e995 [formerly 311e1d1d5d4ce7a2211690db3bf108d956be8add [formerly 7a55e6de7d0c6c052af536c280c1212d5d40ff2e]]]]]
Former-commit-id: fd88cea666838130b52dad6c37a81830086239d5
Former-commit-id: d37f6aae704b57c86b48cabea15bbd4f747f1ee7
Former-commit-id: 038f1ad8ef03c59567ecf61f3d4712f240c492fc [formerly fc115183c0c24ff1cd92bc4df14a1905324d6b4c]
Former-commit-id: 69901b56f7a63c9856ff95ad0672f786ab597a17
Former-commit-id: ad4eb6123ef7eaaef41d234711e538fd7ae2156f
Former-commit-id: 662931733c7e4ba802fc705b69ffd570a5cf6282
Former-commit-id: 66d1a927c63a9efad1953532dd928074a62a016f
Former-commit-id: a0675824063355b1f1083406ee07ebd8226e69f5
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 854ba75b..014d7e3b 100755
--- a/README.md
+++ b/README.md
@@ -152,4 +152,5 @@ npm run dev
 
 // 打包
 npm run build
-```
\ No newline at end of file
+```
+

From 79e09a9ffb79fbfb57eba041291e75bc20bc130d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 13:44:09 +0800
Subject: [PATCH 088/128] no message

Former-commit-id: 1f9c27b785a72709a35821c187f1301e97e8ecb5 [formerly 1f9c27b785a72709a35821c187f1301e97e8ecb5 [formerly 1f9c27b785a72709a35821c187f1301e97e8ecb5 [formerly 1f9c27b785a72709a35821c187f1301e97e8ecb5 [formerly 7093765c555781529312eadc3750ca2350c52a64 [formerly 3a870c33d645f66ad693c1833a2d1328dda8eb89]]]]]
Former-commit-id: 39a133c0405cca5498cb0c5106ba25f09f5a9beb
Former-commit-id: 8d9b78a36c303ff3c075484d53d73d7137698db5
Former-commit-id: 3f7613a1ec1cb68d59fe2f4af6060da1bf1be7c8 [formerly b341c3fba10fe67a53beaa0cdc86064e924c87ae]
Former-commit-id: 05fc721162972449770e7f9acff7c3ba3616ca6f
Former-commit-id: 2069a0a1c8f7a6bf915c1764a97eb00625d94159
Former-commit-id: d2b0887c8fdefaf633e8017f8eb6c440fb264397
Former-commit-id: bb7c660693fe7e252aaee2a7c8e86571941faf15
Former-commit-id: 9c4540ef8f94288811692dbf470464c56a12da58
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 014d7e3b..e2dd143f 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 介绍
 
-D2Admin 是一个开源的管理系统前端集成方案
+D2Admin 是一个开源的管理系统前端集成方案 
 
 [Github仓库](https://github.com/FairyEver/d2-admin) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 

From 398fca8159f6cf86ebf4ef754e0655490216f511 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 13:49:50 +0800
Subject: [PATCH 089/128] no message

Former-commit-id: 75a183740c6e2847a883b9e4d5755dd3b71f3599 [formerly 75a183740c6e2847a883b9e4d5755dd3b71f3599 [formerly 75a183740c6e2847a883b9e4d5755dd3b71f3599 [formerly 75a183740c6e2847a883b9e4d5755dd3b71f3599 [formerly 0c6ecf79877fb43c64562523ead85f25879e2bb7 [formerly 70df2a1a8a1d09b44cdc5b1f7e3a09277af7aa54]]]]]
Former-commit-id: 77712a1dab647f54afc41dca3803d04856237e10
Former-commit-id: 26ea9464839b3508cfd25c438e83f3ff926a78b9
Former-commit-id: b1f22679a022e19f3de8f099b3efc2feb625be7e [formerly 89d1673c13802318548772c0b7fb2c5fdb0f7f4c]
Former-commit-id: 5cf102661f35e3a4dbc9d172fd0fab65c37136a8
Former-commit-id: f1b9435812b5521ad4b0fdad39aef32a3773d5d4
Former-commit-id: 7d95c17132733374dde187556e5a0a2647be542e
Former-commit-id: b2befc7b5231c5c8555c68cd46034b210bb16e0c
Former-commit-id: b17873441983f182f76fc9f7e02ac2b0138816de
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e2dd143f..74e774b6 100755
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # 介绍
 
-D2Admin 是一个开源的管理系统前端集成方案 
+D2Admin 是一个开源的管理系统前端集成方案
 
 [Github仓库](https://github.com/FairyEver/d2-admin) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 
-因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件。
+因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件
 
 ## 功能
 

From b4c4b38fd8920beb70e49a2687e6c7ee7d493b94 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 14:02:08 +0800
Subject: [PATCH 090/128] no message

Former-commit-id: 42a881264ab44c352b5ef70b37f53bb63480bd69 [formerly e534589555cce5e01e68872b050e1f48c6b278c1] [formerly 42a881264ab44c352b5ef70b37f53bb63480bd69 [formerly e534589555cce5e01e68872b050e1f48c6b278c1] [formerly 42a881264ab44c352b5ef70b37f53bb63480bd69 [formerly e534589555cce5e01e68872b050e1f48c6b278c1] [formerly e534589555cce5e01e68872b050e1f48c6b278c1 [formerly 8fced8ea8f9f382e9b6ead0907cf723b8ae877d6 [formerly 766b963544bfa65ddc0d80570b60aed126d62cde]]]]]
Former-commit-id: c05343ad2424249b6fde2b73c7bc245700fd8776
Former-commit-id: d6b99760299556b9db31432862c317e380a0135e
Former-commit-id: f3b86222cc37779ce61836ef21b267f63b832aee [formerly d682119da6ed042d37966b2f394e5b0f06af79ca]
Former-commit-id: bafde65dfb7eba76eeb404da5d65f85178991ee0
Former-commit-id: 893a3aed293356471ab422ff47495711769dd95c
Former-commit-id: e8009974cd7a8a1f7382f4a3838f42eb6498fa77
Former-commit-id: ab96ef07a9996511bd63b32e2da037830bd24526
Former-commit-id: 644d90e0b96c81f8209e965b6fa847103594fa6e
---
 src/pages/demo/components/container/ghost-header.vue |  4 ++--
 .../demo/components/container/md/doc-ghost-header.md | 12 ++++++++++++
 src/pages/demo/components/container/md/doc-ghost.md  |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/components/container/md/doc-ghost-header.md

diff --git a/src/pages/demo/components/container/ghost-header.vue b/src/pages/demo/components/container/ghost-header.vue
index bf4d2f21..b757c0ff 100644
--- a/src/pages/demo/components/container/ghost-header.vue
+++ b/src/pages/demo/components/container/ghost-header.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container type="ghost">
-    <template slot="header">header</template>
+    <template slot="header">隐形页面容器头部</template>
     <el-card shadow="never" style="width: 50%;">
       <d2-markdown :source="doc"/>
     </el-card>
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import doc from './md/doc-ghost.md'
+import doc from './md/doc-ghost-header.md'
 export default {
   data () {
     return {
diff --git a/src/pages/demo/components/container/md/doc-ghost-header.md b/src/pages/demo/components/container/md/doc-ghost-header.md
new file mode 100644
index 00000000..8ba0f53e
--- /dev/null
+++ b/src/pages/demo/components/container/md/doc-ghost-header.md
@@ -0,0 +1,12 @@
+## 隐形页面容器 带有头部
+
+不显示任何背景色和边框，但是有一个和分页组件效果融合的头部
+
+```
+<d2-container type="ghost">
+  <template slot="header">隐形页面容器头部</template>
+  主体内容
+</d2-container>
+```
+
+> 注意 如果设置了 header 插槽的内容，header 部分会自动具有 20px 的下外边距
\ No newline at end of file
diff --git a/src/pages/demo/components/container/md/doc-ghost.md b/src/pages/demo/components/container/md/doc-ghost.md
index af284fb9..f538c175 100644
--- a/src/pages/demo/components/container/md/doc-ghost.md
+++ b/src/pages/demo/components/container/md/doc-ghost.md
@@ -1,6 +1,6 @@
 ## 隐形页面容器
 
-不显示任何背景色和边框，通常这个模式只有在极少情况下会使用
+不显示任何背景色和边框
 
 ```
 <d2-container type="ghost">

From 02bd54730d335f7973ff0330bd8f9560094352d1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 14:49:59 +0800
Subject: [PATCH 091/128] no message

Former-commit-id: 8875eda5374e7b3c28ace4a86298367611e34413 [formerly 48f7a1f44e9064bd34184017bea4267fad874753] [formerly 8875eda5374e7b3c28ace4a86298367611e34413 [formerly 48f7a1f44e9064bd34184017bea4267fad874753] [formerly 8875eda5374e7b3c28ace4a86298367611e34413 [formerly 48f7a1f44e9064bd34184017bea4267fad874753] [formerly 48f7a1f44e9064bd34184017bea4267fad874753 [formerly 6fcd5f0b6ae9cea49ec04173ccb90897abc23ffe [formerly 24f77ec2b60ff4ac3ae47e91aa49f7677b661a09]]]]]
Former-commit-id: b3dd073014052677834363034eccf3eb0344983a
Former-commit-id: ce0a7cf1053f2b4017a059cf4b93f0da9053d760
Former-commit-id: 24ced890882910d15d528f7fa40dc818b962b00a [formerly bd0692e26ad2820be577fa523e562c05de53c1ba]
Former-commit-id: 4952dc574ff9f704e58d0b94f7476a8a6e78ad7f
Former-commit-id: 86da3b969dd2f6dc82cba05da5c1bb033df24dec
Former-commit-id: 1372d798ba96c6aee0b2135c0909670c542dada9
Former-commit-id: 0f0980fe60ee071cecf80b6fa007980913ba9545
Former-commit-id: 003076fbf8df8cd2f7d86d69ea270ab0f8c30304
---
 src/menu/index.js.REMOVED.git-id              |  2 +-
 src/pages/core/setting/releases/index.vue     | 71 +++++++++++++++++++
 .../core/setting/releases/md/up-to-date.md    |  9 +++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 src/store/modules/d2admin.js                  | 16 +++++
 5 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/core/setting/releases/index.vue
 create mode 100644 src/pages/core/setting/releases/md/up-to-date.md

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 9d7a5b2d..4ee765dc 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-2d3e492f0292e6cd7fcf39d98a7e99b72e7e82a9
\ No newline at end of file
+8c23b4baa3bcba23bf62a363520ab0cbabbd2a3b
\ No newline at end of file
diff --git a/src/pages/core/setting/releases/index.vue b/src/pages/core/setting/releases/index.vue
new file mode 100644
index 00000000..4f4d34f3
--- /dev/null
+++ b/src/pages/core/setting/releases/index.vue
@@ -0,0 +1,71 @@
+<template>
+  <d2-container type="full" class="page">
+    <template slot="header">D2Admin 版本检查</template>
+    <div class="banner">
+      <img :src="`${$assetsPublicPath}static/image/icon/500/d2admin.png`">
+    </div>
+    <div v-if="update" class="releases">
+      <h1>有新版本 {{releases.tag_name}}</h1>
+      <p>更新日期 {{dayjs(releases.created_at).format('YYYY年M月D日')}}</p>
+      <a :href="releases.html_url" class="el-button el-button--primary d2-mb">{{releases.html_url}}</a>
+      <d2-markdown key="update" :source="releases.body"/>
+    </div>
+    <div v-else class="up2date">
+      <d2-markdown key="noupdate" :source="up2date"/>
+    </div>
+    <template slot="footer">
+      <el-button type="primary" size="mini" @click="d2adminUpdateNotifySet(!updateNotify)">
+        {{updateNotify ? '关闭更新提醒' : '打开更新提醒'}}
+      </el-button>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import up2date from './md/up-to-date.md'
+import dayjs from 'dayjs'
+import { mapState, mapMutations } from 'vuex'
+export default {
+  data () {
+    return {
+      dayjs,
+      up2date
+    }
+  },
+  computed: {
+    ...mapState({
+      version: state => state.d2admin.version,
+      releases: state => state.d2admin.releases,
+      update: state => state.d2admin.update,
+      updateNotify: state => state.d2admin.updateNotify
+    })
+  },
+  methods: {
+    ...mapMutations([
+      'd2adminUpdateNotifySet'
+    ])
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.page {
+  .banner {
+    text-align: center;
+    img {
+      width: 250px;
+    }
+  }
+  .releases {
+    padding: 20px;
+    border-radius: 4px;
+    background-color: $color-bg;
+  }
+  .up2date {
+    padding: 20px;
+    border-radius: 4px;
+    background-color: $color-bg;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/core/setting/releases/md/up-to-date.md b/src/pages/core/setting/releases/md/up-to-date.md
new file mode 100644
index 00000000..b4b7fa6c
--- /dev/null
+++ b/src/pages/core/setting/releases/md/up-to-date.md
@@ -0,0 +1,9 @@
+已经是最新版本
+
+[Github仓库](https://github.com/FairyEver/d2-admin)
+
+[码云仓库](https://gitee.com/fairyever/d2-admin)
+
+[中文文档](https://fairyever.gitee.io/d2-admin-doc/zh/)
+
+[预览地址](https://fairyever.gitee.io/d2-admin-preview)
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index e67f5aa5..bf1b6cdc 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-0e1a920511ec4883219ee769e78996943f2925ea
\ No newline at end of file
+cee29f1fa988c380dbe32f3090e012852aa1f703
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index b7a5ce86..3b5b9525 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -2,12 +2,19 @@ import util from '@/libs/util.js'
 import db from '@/libs/db.js'
 import themeList from '@/assets/style/theme/list.js'
 
+// 获取项目信息
+import packJson from '../../../package.json'
+
 export default {
   state: {
     // 拉取的最新版本信息
     releases: {},
+    // D2Admin 版本
+    version: packJson.version,
     // 有更新
     update: false,
+    // 更新提醒弹窗
+    updateNotify: true,
     // 全屏
     isFullScreen: false,
     // 灰度
@@ -74,6 +81,15 @@ export default {
     d2adminUpdateSet (state, update) {
       state.update = update
     },
+    /**
+     * @description 设置是否有更新的时候显示弹窗
+     * @class updateNotify
+     * @param {state} state vuex state
+     * @param {boolean} update updateNotify value
+     */
+    d2adminUpdateNotifySet (state, updateNotify) {
+      state.updateNotify = updateNotify
+    },
     /**
      * @class pageCurrent
      * @description 设置当前激活的页面 name

From 4be7cb92122e5724ae9eaaa71785c4f16c9a9c47 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 14:54:33 +0800
Subject: [PATCH 092/128] no message

Former-commit-id: 52432e8e488879fe42ad6eda46e0a000d97fc93b [formerly 52432e8e488879fe42ad6eda46e0a000d97fc93b [formerly 52432e8e488879fe42ad6eda46e0a000d97fc93b [formerly 52432e8e488879fe42ad6eda46e0a000d97fc93b [formerly 30d738eb8a3c65675447970f6f8d9ccb9ae3e161 [formerly 6b36a6323a4c908ef5e26fdebe9986ff09717763]]]]]
Former-commit-id: 9074dba6872fd059e13e2b05a4eda8a12b703145
Former-commit-id: 78b46ece06add9e1f1166560734ed43d544dfc51
Former-commit-id: 708001f5130c79ed31611823b6e537d534d58f0e [formerly 915848ce4f5f498fae83d0bf35ae70800f0928a8]
Former-commit-id: ad681e26a1ba8a80a46d11196f83a609503c70ab
Former-commit-id: 79ac91bb10055a800b0010e52206a74234f7b96d
Former-commit-id: fffae9662b1f9daad7da184b7bdddf4fd1e41218
Former-commit-id: 096014aeb2c3a031d298592dfa838b27f5ef9268
Former-commit-id: 7795403b9bacd7fc2d69bde981e2f3ffa6470466
---
 src/libs/util.js                          | 2 +-
 src/pages/core/setting/releases/index.vue | 5 ++++-
 src/store/modules/d2admin.js              | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index 917066e0..75d7fc6d 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -110,7 +110,7 @@ util.checkUpdate = function (vm) {
     .then(res => {
       let version = res.tag_name
       const update = semver.lt(packJson.version, version)
-      if (vm.$env === 'development' && update) {
+      if (vm.$env === 'development' && update && vm.$store.state.d2admin.updateNotify) {
         vm.$nextTick(() => {
           vm.$notify({
             title: `D2Admin 新版本 ${res.name}`,
diff --git a/src/pages/core/setting/releases/index.vue b/src/pages/core/setting/releases/index.vue
index 4f4d34f3..151eac97 100644
--- a/src/pages/core/setting/releases/index.vue
+++ b/src/pages/core/setting/releases/index.vue
@@ -14,7 +14,10 @@
       <d2-markdown key="noupdate" :source="up2date"/>
     </div>
     <template slot="footer">
-      <el-button type="primary" size="mini" @click="d2adminUpdateNotifySet(!updateNotify)">
+      <el-button
+        :type="updateNotify ? 'primary' : 'default'"
+        size="mini"
+        @click="d2adminUpdateNotifySet(!updateNotify)">
         {{updateNotify ? '关闭更新提醒' : '打开更新提醒'}}
       </el-button>
     </template>
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 3b5b9525..63b06188 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -14,7 +14,7 @@ export default {
     // 有更新
     update: false,
     // 更新提醒弹窗
-    updateNotify: true,
+    updateNotify: false,
     // 全屏
     isFullScreen: false,
     // 灰度

From 508721d80948766d82cd68d71546b2453b86e940 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 14:57:46 +0800
Subject: [PATCH 093/128] no message

Former-commit-id: 128a2228a59970be5f0da99ca899a073fccc1db1 [formerly 128a2228a59970be5f0da99ca899a073fccc1db1 [formerly 128a2228a59970be5f0da99ca899a073fccc1db1 [formerly 128a2228a59970be5f0da99ca899a073fccc1db1 [formerly 2116c12aeb474caf48b65b8083be7afb96dd0ba0 [formerly ca04947609f55ababcd4a645e6bbd4ba5023b8df]]]]]
Former-commit-id: 981fa7559bd053f3dc14f6b9d6613eddbf705036
Former-commit-id: 493371e298d61022d12ad82d6e298ce285118ecc
Former-commit-id: b3b67960c88870126ba8c8534f3152935df31bb2 [formerly df0d241cadbe58f6024f2c4b8194e7642625679d]
Former-commit-id: f2982fb8ec9796b21a77892af2e94726e8acec64
Former-commit-id: 01dc5532089891c1e45814afb526121733f3fc6a
Former-commit-id: 4fd3f2e5a1bcacd714097f2e9d488c7947f4771a
Former-commit-id: f89e3a2501109287372109f63ceeff17e14da417
Former-commit-id: 147c8432cee67da070d60d56cb8b2f7d8fe06e49
---
 src/main.js                  |  5 +++++
 src/store/modules/d2admin.js | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main.js b/src/main.js
index 7c45e63d..94130acb 100755
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,11 @@
+// polyfill
 import 'babel-polyfill'
 
+// Vue
 import Vue from 'vue'
 import App from './App'
+
+// 多国语
 import i18n from './i18n'
 
 // 工具
@@ -15,6 +19,7 @@ import router from './router'
 // 框架内的路由
 import { frameInRoutes } from '@/router/routes'
 
+// ElementUI
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 63b06188..83bb7aec 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -52,7 +52,7 @@ export default {
      * @description 将 state 中某一项存储到数据库
      * @param {state} state vuex state
      */
-    d2adminVuex2Db (state, key) {
+    d2adminVuex2DbByUuid (state, key) {
       const setting = db.get(key).find({uuid: util.uuid()})
       if (setting.value()) {
         setting.assign({value: state[key]}).write()
@@ -121,7 +121,7 @@ export default {
       page.query = query || page.query
       state.pageOpenedList.splice(index, 1, page)
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -138,7 +138,7 @@ export default {
       // 添加进当前显示的页面数组
       state.pageOpenedList.push(newPage)
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -153,7 +153,7 @@ export default {
         state.pageOpenedList.splice(index, 1)
       }
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -171,7 +171,7 @@ export default {
         state.pageOpenedList.splice(1, currentIndex - 1)
       }
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -187,7 +187,7 @@ export default {
       })
       state.pageOpenedList.splice(currentIndex + 1)
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -208,7 +208,7 @@ export default {
         state.pageOpenedList.splice(1, currentIndex - 1)
       }
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class pageOpenedList
@@ -218,7 +218,7 @@ export default {
     d2adminTagCloseAll (state) {
       state.pageOpenedList.splice(1)
       // 更新设置到数据库
-      this.commit('d2adminVuex2Db', 'pageOpenedList')
+      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
     /**
      * @class isFullScreen
@@ -270,7 +270,7 @@ export default {
       // 设置 dom
       document.body.className = `theme-${state.themeActiveName}`
       // 保存到数据库
-      this.commit('d2adminVuex2Db', 'themeActiveName')
+      this.commit('d2adminVuex2DbByUuid', 'themeActiveName')
     },
     /**
      * @class themeActiveName

From cd4797fe283333d22cc1badc2f78aa70572c216d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 15:52:24 +0800
Subject: [PATCH 094/128] no message

Former-commit-id: 1f5fb4a5ab475fe7dd56856584fb707a4d3e592c [formerly 42022ffdfb79f64e99138580e2beed163901c564] [formerly 1f5fb4a5ab475fe7dd56856584fb707a4d3e592c [formerly 42022ffdfb79f64e99138580e2beed163901c564] [formerly 1f5fb4a5ab475fe7dd56856584fb707a4d3e592c [formerly 42022ffdfb79f64e99138580e2beed163901c564] [formerly 42022ffdfb79f64e99138580e2beed163901c564 [formerly e91f0f80d6ae8812daafccb9894d16802b4ec84a [formerly ad0ac5553bc253c6ca0c2fdd56763c41780c08b5]]]]]
Former-commit-id: 0f71add838f001bb9577585ec13fb587e3b1f8c7
Former-commit-id: 3b78c5f0e9802244e08acaffe53bafb8560bed0a
Former-commit-id: 3177c463b7500a1369f5bafb33407d3b9f0aceec [formerly 6f766445766d6a3f90a483d94385e853a70e7c26]
Former-commit-id: 359167b65e9ee6ae60c8e0c4a24cc763d6e61405
Former-commit-id: bb02e75c6ca35089ddf5fc5fa2ee3ccfb28162a8
Former-commit-id: 1586321951fb1f2ad9052f52557e45fbdf75a3fa
Former-commit-id: 5738fcbf97f9f50c5e12c576a9719873fbc44cb0
Former-commit-id: 032247d5689d80e0d7c16ae75b2e16e0dea6b73b
---
 src/pages/core/setting/releases/index.vue |  2 +-
 src/store/modules/d2admin.js              | 44 ++++++++++++++++-------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/pages/core/setting/releases/index.vue b/src/pages/core/setting/releases/index.vue
index 151eac97..6780b085 100644
--- a/src/pages/core/setting/releases/index.vue
+++ b/src/pages/core/setting/releases/index.vue
@@ -18,7 +18,7 @@
         :type="updateNotify ? 'primary' : 'default'"
         size="mini"
         @click="d2adminUpdateNotifySet(!updateNotify)">
-        {{updateNotify ? '关闭更新提醒' : '打开更新提醒'}}
+        {{updateNotify ? '关闭更新提醒 (当前:打开)' : '打开更新提醒 (当前:关闭)'}}
       </el-button>
     </template>
   </d2-container>
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 83bb7aec..724210e4 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -49,13 +49,14 @@ export default {
   mutations: {
     /**
      * @class 通用工具
-     * @description 将 state 中某一项存储到数据库
+     * @description 将 state 中某一项存储到数据库 需要 uuid
      * @param {state} state vuex state
+     * @param {string} key key name
      */
     d2adminVuex2DbByUuid (state, key) {
-      const setting = db.get(key).find({uuid: util.uuid()})
-      if (setting.value()) {
-        setting.assign({value: state[key]}).write()
+      const row = db.get(key).find({uuid: util.uuid()})
+      if (row.value()) {
+        row.assign({value: state[key]}).write()
       } else {
         db.get(key).push({
           uuid: util.uuid(),
@@ -63,6 +64,21 @@ export default {
         }).write()
       }
     },
+    /**
+     * @class 通用工具
+     * @description 将数据库中的某项数据拿到 vuex 需要 uuid
+     * @param {state} state vuex state
+     * @param {string} key key name
+     * @param {*} defaultValue default value
+     */
+    d2adminDb2VuexByUuid (state, key, defaultValue) {
+      const row = db.get(key).find({uuid: util.uuid()}).value()
+      if (row) {
+        state[key] = row.value
+      } else {
+        state[key] = defaultValue
+      }
+    },
     /**
      * @description 更新远端的版本信息
      * @class releases
@@ -267,23 +283,27 @@ export default {
         // 设置为列表第一个主题
         state.themeActiveName = state.themeList[0].name
       }
-      // 设置 dom
-      document.body.className = `theme-${state.themeActiveName}`
+      // 将 vuex 中的主题应用到 dom
+      this.commit('d2adminTheme2dom')
       // 保存到数据库
       this.commit('d2adminVuex2DbByUuid', 'themeActiveName')
     },
+    /**
+     * @class themeActiveName
+     * @description 将 vuex 中的主题应用到 dom
+     * @param {state} state vuex state
+     */
+    d2adminTheme2dom (state) {
+      document.body.className = `theme-${state.themeActiveName}`
+    },
     /**
      * @class themeActiveName
      * @description 从数据库加载主题设置
      * @param {state} state vuex state
      */
     d2adminThemeLoad (state) {
-      const themeActiveName = db.get('themeActiveName').find({uuid: util.uuid()}).value()
-      if (themeActiveName) {
-        this.commit('d2adminThemeSet', themeActiveName.value)
-      } else {
-        this.commit('d2adminThemeSet', state.themeList[0].name)
-      }
+      this.commit('d2adminDb2VuexByUuid', 'themeActiveName', state.themeList[0].name)
+      this.commit('d2adminTheme2dom')
     }
   }
 }

From d5685a5dfd9e75711cedf6540b8878c24fd60863 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 16:10:32 +0800
Subject: [PATCH 095/128] no message

Former-commit-id: f737ab133d503db38c2e2b37f6d1ffbe07106dee [formerly f737ab133d503db38c2e2b37f6d1ffbe07106dee [formerly f737ab133d503db38c2e2b37f6d1ffbe07106dee [formerly f737ab133d503db38c2e2b37f6d1ffbe07106dee [formerly 4f4e526f5ba1eacd4afa5acf9bfd08ec74ca342f [formerly 437bcf303376951edf5fd8a1578f9893d1f4d2b8]]]]]
Former-commit-id: bb014705280c3fc219c70dd429f46caf378c2984
Former-commit-id: fd7f67ae8e8a209062af6529ac9695c995de6804
Former-commit-id: 181b09c3f02078e99c2973dbe46da67d4fe022dd [formerly fe52a459d4ae43c1465e43e5318637f9a003ec19]
Former-commit-id: 2fe301f7401a73a52beb3140d3bceb6a5f86f580
Former-commit-id: 9c6b46ffc2652a7bdb3053eedd49147f9b8cafb9
Former-commit-id: 06d9453842efab0af42a76e6f5aa2d8da25f3346
Former-commit-id: 60a296ea822e09b702c8661371afef29f2d6b454
Former-commit-id: 6129460e4745f7657ee024e217d055186a46bdcb
---
 src/libs/util.js             |  2 +-
 src/main.js                  |  1 +
 src/store/modules/d2admin.js | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index 75d7fc6d..959ed886 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -75,7 +75,7 @@ util.openNewPage = function (vm, name, argu, query) {
   })
   if (pageOpend) {
     // 页面以前打开过 但是新的页面可能 name 一样，参数不一样
-    vm.$store.commit('d2adminpageOpenedListUpdateItem', { index: pageOpendIndex, argu, query })
+    vm.$store.commit('d2adminPageOpenedListUpdateItem', { index: pageOpendIndex, argu, query })
   } else {
     // 页面以前没有打开过
     const tagPool = vm.$store.state.d2admin.tagPool
diff --git a/src/main.js b/src/main.js
index 94130acb..7f75d8c0 100755
--- a/src/main.js
+++ b/src/main.js
@@ -97,6 +97,7 @@ new Vue({
     this.getAllTagFromRoutes()
   },
   mounted () {
+    this.$store.commit('d2adminPageOpenedListLoad')
     // D2Admin 开发环境检查更新
     util.checkUpdate(this)
   },
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 724210e4..364c4117 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -130,7 +130,7 @@ export default {
      * @param {state} state vuex state
      * @param {info} param1 new page info
      */
-    d2adminpageOpenedListUpdateItem (state, { index, argu, query }) {
+    d2adminPageOpenedListUpdateItem (state, { index, argu, query }) {
       // 更新页面列表某一项
       let page = state.pageOpenedList[index]
       page.argu = argu || page.argu
@@ -139,6 +139,14 @@ export default {
       // 更新设置到数据库
       this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
     },
+    /**
+     * @class pageOpenedList
+     * @description 从数据库载入分页列表
+     * @param {state} state vuex state
+     */
+    d2adminPageOpenedListLoad (state) {
+      this.commit('d2adminDb2VuexByUuid', 'pageOpenedList', state.pageOpenedList)
+    },
     /**
      * @class pageOpenedList
      * @description 新增一个 tag (打开一个页面)

From cd4ffd40ee6de33997d039502730ee7a28e4848a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 16:30:32 +0800
Subject: [PATCH 096/128] no message

Former-commit-id: e4cddce22b77cce9272db50784bec6f65d436e1c [formerly e4cddce22b77cce9272db50784bec6f65d436e1c [formerly e4cddce22b77cce9272db50784bec6f65d436e1c [formerly e4cddce22b77cce9272db50784bec6f65d436e1c [formerly fd9e060be9dcd544a03898f52870c75bff426ea8 [formerly 473a2358ee44c1b87e6ee1d00a1a7e19e3e12819]]]]]
Former-commit-id: b51f6f065b1cc8a1a355344acc8fa08aa6182c75
Former-commit-id: ec8463f5a7f62ae1e071b469917e43330afcfde0
Former-commit-id: 4bfff65c75cb8e5114a89c078f48cfa153cbe706 [formerly 669d106d5745198c87f621ff9e96d9f4d9c74e19]
Former-commit-id: 54c7d47caa9891fe38ae6a579f40bbd5404720c4
Former-commit-id: 8445355687bf75530d17472caa5ae6c02fd9afda
Former-commit-id: 90db684d4f5dcafca3878dacecd324f805a0e873
Former-commit-id: d00f2808825956c14badf04aedf487481ec22c79
Former-commit-id: e611a922d08c6143e25b036242c452f4e543a4f0
---
 src/store/modules/d2admin.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 364c4117..363ba162 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -66,18 +66,13 @@ export default {
     },
     /**
      * @class 通用工具
-     * @description 将数据库中的某项数据拿到 vuex 需要 uuid
+     * @description 从数据库取值到 vuex 需要 uuid
      * @param {state} state vuex state
-     * @param {string} key key name
-     * @param {*} defaultValue default value
+     * @param {object} param1 key and default value
      */
-    d2adminDb2VuexByUuid (state, key, defaultValue) {
+    d2adminDb2VuexByUuid (state, { key, defaultValue }) {
       const row = db.get(key).find({uuid: util.uuid()}).value()
-      if (row) {
-        state[key] = row.value
-      } else {
-        state[key] = defaultValue
-      }
+      state[key] = row ? row.value : defaultValue
     },
     /**
      * @description 更新远端的版本信息
@@ -145,7 +140,10 @@ export default {
      * @param {state} state vuex state
      */
     d2adminPageOpenedListLoad (state) {
-      this.commit('d2adminDb2VuexByUuid', 'pageOpenedList', state.pageOpenedList)
+      this.commit('d2adminDb2VuexByUuid', {
+        key: 'pageOpenedList',
+        defaultValue: state.pageOpenedList
+      })
     },
     /**
      * @class pageOpenedList
@@ -310,7 +308,10 @@ export default {
      * @param {state} state vuex state
      */
     d2adminThemeLoad (state) {
-      this.commit('d2adminDb2VuexByUuid', 'themeActiveName', state.themeList[0].name)
+      this.commit('d2adminDb2VuexByUuid', {
+        key: 'themeActiveName',
+        defaultValue: state.themeList[0].name
+      })
       this.commit('d2adminTheme2dom')
     }
   }

From 79f67d01f77683bb5b28aad79b34c7b2afeecae3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 21:06:49 +0800
Subject: [PATCH 097/128] no message

Former-commit-id: 86641e06246eee6230e425f2de372774302ad095 [formerly 86641e06246eee6230e425f2de372774302ad095 [formerly 86641e06246eee6230e425f2de372774302ad095 [formerly 86641e06246eee6230e425f2de372774302ad095 [formerly aa12c90582ddacd24c9b7c0b31917f9a15d7a5fa [formerly b67777124f65a396fb979ebe674d9c427d64f16e]]]]]
Former-commit-id: 353d2173a7ec2194a9f7427c1ffdea679205f90f
Former-commit-id: e39e2489e3be0e54edca9bee378ae9601af08aba
Former-commit-id: 545dd5a81193ddbca8d66dd19f1a7c2bd27ada6a [formerly 22aef27df106a7e14206e78ba3b5dbbbf37b508f]
Former-commit-id: 80a1a59b3d3beaa5d3e98913a3d1f16154323354
Former-commit-id: cc9075569623726e0124430bbbdf69b7c839ecf5
Former-commit-id: 680a961a0a16aee4fb33259d6d02514560cdae84
Former-commit-id: e02085849693350dd3d02221d416f9069a25c069
Former-commit-id: 356b7e72930f5c8c791c9147a239ee3a508848c5
---
 design.sketch.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id
index 79561a15..6a952f10 100644
--- a/design.sketch.REMOVED.git-id
+++ b/design.sketch.REMOVED.git-id
@@ -1 +1 @@
-471d1d7f715345325951f4b26ad14275b4c3e745
\ No newline at end of file
+6a5c83d50f23558fd07642b7445ac467a31d9354
\ No newline at end of file

From 6802a01eab3c8dc2f9c78e3d055ae3ae08da7187 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 21:42:55 +0800
Subject: [PATCH 098/128] no message

Former-commit-id: b0058a9a5942e4f8fe9e3fc659b2abd929bd3b12 [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2] [formerly b0058a9a5942e4f8fe9e3fc659b2abd929bd3b12 [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2] [formerly b0058a9a5942e4f8fe9e3fc659b2abd929bd3b12 [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2] [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2 [formerly c85fe449ed36774edbdf96ea300fa1287e82d209 [formerly 83fa54598eae7d5a7d036c03e13bcc6c185a2809]]]]]
Former-commit-id: dc063d52056be4cc1f9b186480e97c914843568f
Former-commit-id: cd1dd2fcb136aec37d4dff5886603d3031b76d1b
Former-commit-id: 66139b38849748671cf667f86a0676b49b17e6ea [formerly 0679f85f1d81eef8575e9fe37eabff6cbe357a34]
Former-commit-id: 3ec2fdbf620d6d7279b0d03a8a4dbedef9453f0f
Former-commit-id: 5bad9dfe3a995d7444f79018cc2d72253b2fbd1c
Former-commit-id: 549d901c2ce1a951968769e7bb27dd46cc6c4a7f
Former-commit-id: 817efa3a49754a9df8a60ee97f96b6eaf9b02541
Former-commit-id: 7fabb89165e53083accba505542175f273f8a23e
---
 src/components/core/d2-layout-main/index.vue |  11 +-
 src/libs/db.js                               |   3 +-
 src/main.js                                  |   5 +
 src/store/modules/d2admin.js                 | 318 -------------------
 src/store/modules/d2admin.js.REMOVED.git-id  |   1 +
 5 files changed, 9 insertions(+), 329 deletions(-)
 delete mode 100644 src/store/modules/d2admin.js
 create mode 100644 src/store/modules/d2admin.js.REMOVED.git-id

diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 3e4e25d4..5a2f5cb2 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters, mapMutations } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 export default {
   name: 'd2-layout-main',
   components: {
@@ -97,15 +97,6 @@ export default {
       }
       return false
     }
-  },
-  mounted () {
-    // 加载主题
-    this.d2adminThemeLoad()
-  },
-  methods: {
-    ...mapMutations([
-      'd2adminThemeLoad'
-    ])
   }
 }
 </script>
diff --git a/src/libs/db.js b/src/libs/db.js
index 8d403104..1c9db368 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -6,7 +6,8 @@ const db = low(adapter)
 
 db.defaults({
   themeActiveName: [],
-  pageOpenedList: []
+  pageOpenedList: [],
+  updateNotify: []
 })
   .write()
 
diff --git a/src/main.js b/src/main.js
index 7f75d8c0..817065af 100755
--- a/src/main.js
+++ b/src/main.js
@@ -97,6 +97,11 @@ new Vue({
     this.getAllTagFromRoutes()
   },
   mounted () {
+    // DB -> store 加载版本更新弹窗的设置
+    this.$store.commit('d2adminUpdateNotifyLoad')
+    // DB -> store 加载主题
+    this.$store.commit('d2adminThemeLoad')
+    // DB -> store 数据库加载上次退出时的多页列表
     this.$store.commit('d2adminPageOpenedListLoad')
     // D2Admin 开发环境检查更新
     util.checkUpdate(this)
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
deleted file mode 100644
index 363ba162..00000000
--- a/src/store/modules/d2admin.js
+++ /dev/null
@@ -1,318 +0,0 @@
-import util from '@/libs/util.js'
-import db from '@/libs/db.js'
-import themeList from '@/assets/style/theme/list.js'
-
-// 获取项目信息
-import packJson from '../../../package.json'
-
-export default {
-  state: {
-    // 拉取的最新版本信息
-    releases: {},
-    // D2Admin 版本
-    version: packJson.version,
-    // 有更新
-    update: false,
-    // 更新提醒弹窗
-    updateNotify: false,
-    // 全屏
-    isFullScreen: false,
-    // 灰度
-    isGrayMode: false,
-    // 主题
-    themeList,
-    themeActiveName: themeList[0].name, // 这应该是一个名字 不是对象
-    // 可以在多页 tab 模式下显示的页面
-    tagPool: [],
-    // 当前显示的多页面列表
-    pageOpenedList: [
-      {
-        name: 'index',
-        meta: {
-          title: '首页',
-          requiresAuth: false
-        }
-      }
-    ],
-    // 当前页面
-    pageCurrent: ''
-  },
-  getters: {
-    /**
-     * @description 返回当前的主题信息 不是一个名字 而是所有的主题数据
-     * @param {state} state vuex state
-     */
-    themeActiveSetting (state) {
-      return state.themeList.find(theme => theme.name === state.themeActiveName)
-    }
-  },
-  mutations: {
-    /**
-     * @class 通用工具
-     * @description 将 state 中某一项存储到数据库 需要 uuid
-     * @param {state} state vuex state
-     * @param {string} key key name
-     */
-    d2adminVuex2DbByUuid (state, key) {
-      const row = db.get(key).find({uuid: util.uuid()})
-      if (row.value()) {
-        row.assign({value: state[key]}).write()
-      } else {
-        db.get(key).push({
-          uuid: util.uuid(),
-          value: state[key]
-        }).write()
-      }
-    },
-    /**
-     * @class 通用工具
-     * @description 从数据库取值到 vuex 需要 uuid
-     * @param {state} state vuex state
-     * @param {object} param1 key and default value
-     */
-    d2adminDb2VuexByUuid (state, { key, defaultValue }) {
-      const row = db.get(key).find({uuid: util.uuid()}).value()
-      state[key] = row ? row.value : defaultValue
-    },
-    /**
-     * @description 更新远端的版本信息
-     * @class releases
-     * @param {state} state vuex state
-     * @param {object} releases info
-     */
-    d2adminReleasesSet (state, releases) {
-      state.releases = releases
-    },
-    /**
-     * @description 设置是否有更新
-     * @class update
-     * @param {state} state vuex state
-     * @param {boolean} update update value
-     */
-    d2adminUpdateSet (state, update) {
-      state.update = update
-    },
-    /**
-     * @description 设置是否有更新的时候显示弹窗
-     * @class updateNotify
-     * @param {state} state vuex state
-     * @param {boolean} update updateNotify value
-     */
-    d2adminUpdateNotifySet (state, updateNotify) {
-      state.updateNotify = updateNotify
-    },
-    /**
-     * @class pageCurrent
-     * @description 设置当前激活的页面 name
-     * @param {state} state vuex state
-     * @param {string} name new name
-     */
-    d2adminPageCurrentSet (state, name) {
-      state.pageCurrent = name
-    },
-    /**
-     * @class tagPool
-     * @description 保存 tagPool (候选池)
-     * @param {state} state vuex state
-     * @param {Array} tagPool tags
-     */
-    d2adminTagPoolSet (state, tagPool) {
-      state.tagPool = tagPool
-    },
-    /**
-     * @class pageOpenedList
-     * @description 更新页面列表上的某一项
-     * @param {state} state vuex state
-     * @param {info} param1 new page info
-     */
-    d2adminPageOpenedListUpdateItem (state, { index, argu, query }) {
-      // 更新页面列表某一项
-      let page = state.pageOpenedList[index]
-      page.argu = argu || page.argu
-      page.query = query || page.query
-      state.pageOpenedList.splice(index, 1, page)
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class pageOpenedList
-     * @description 从数据库载入分页列表
-     * @param {state} state vuex state
-     */
-    d2adminPageOpenedListLoad (state) {
-      this.commit('d2adminDb2VuexByUuid', {
-        key: 'pageOpenedList',
-        defaultValue: state.pageOpenedList
-      })
-    },
-    /**
-     * @class pageOpenedList
-     * @description 新增一个 tag (打开一个页面)
-     * @param {state} state vuex state
-     * @param {object} param1 new tag info
-     */
-    d2adminTagIncreate (state, { tag, argu, query }) {
-      // 设置新的 tag 在新打开一个以前没打开过的页面时使用
-      let newPage = tag
-      newPage.argu = argu || newPage.argu
-      newPage.query = query || newPage.query
-      newPage.argu = argu || newPage.argu
-      // 添加进当前显示的页面数组
-      state.pageOpenedList.push(newPage)
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class pageOpenedList
-     * @description 关闭一个 tag (关闭一个页面)
-     * @param {state} state vuex state
-     * @param {string} name close tag name
-     */
-    d2adminTagClose (state, name) {
-      // 找到这个页面在已经打开的数据里是第几个
-      const index = state.pageOpenedList.findIndex(page => page.name === name)
-      if (index >= 0) {
-        state.pageOpenedList.splice(index, 1)
-      }
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class pageOpenedList
-     * @description 关闭当前标签左边的标签
-     * @param {state} state vuex state
-     */
-    d2adminTagCloseLeft (state) {
-      let currentIndex = 0
-      state.pageOpenedList.forEach((page, index) => {
-        if (page.name === state.pageCurrent) {
-          currentIndex = index
-        }
-      })
-      if (currentIndex > 0) {
-        state.pageOpenedList.splice(1, currentIndex - 1)
-      }
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class pageOpenedList
-     * @description 关闭当前标签右边的标签
-     * @param {state} state vuex state
-     */
-    d2adminTagCloseRight (state) {
-      let currentIndex = 0
-      state.pageOpenedList.forEach((page, index) => {
-        if (page.name === state.pageCurrent) {
-          currentIndex = index
-        }
-      })
-      state.pageOpenedList.splice(currentIndex + 1)
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class pageOpenedList
-     * @description 关闭当前激活之外的 tag
-     * @param {state} state vuex state
-     */
-    d2adminTagCloseOther (state) {
-      let currentIndex = 0
-      state.pageOpenedList.forEach((page, index) => {
-        if (page.name === state.pageCurrent) {
-          currentIndex = index
-        }
-      })
-      if (currentIndex === 0) {
-        state.pageOpenedList.splice(1)
-      } else {
-        state.pageOpenedList.splice(currentIndex + 1)
-        state.pageOpenedList.splice(1, currentIndex - 1)
-      }
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class pageOpenedList
-     * @description 关闭所有 tag
-     * @param {state} state vuex state
-     */
-    d2adminTagCloseAll (state) {
-      state.pageOpenedList.splice(1)
-      // 更新设置到数据库
-      this.commit('d2adminVuex2DbByUuid', 'pageOpenedList')
-    },
-    /**
-     * @class isFullScreen
-     * @description 切换全屏
-     * @param {state} state vuex state
-     */
-    d2adminFullScreenToggle (state) {
-      if (state.isFullScreen) {
-        util.exitFullScreen()
-        state.isFullScreen = false
-      } else {
-        util.openFullScreen()
-        state.isFullScreen = true
-      }
-    },
-    /**
-     * @class isGrayMode
-     * @description 切换灰度状态
-     * @param {state} state vuex state
-     */
-    d2adminGrayModeToggle (state) {
-      state.isGrayMode = !state.isGrayMode
-    },
-    /**
-     * @class isGrayMode
-     * @description 设置灰度模式
-     * @param {state} state vuex state
-     * @param {boolean} value new value
-     */
-    d2adminGrayModeSet (state, value) {
-      state.isGrayMode = value
-    },
-    /**
-     * @class themeActiveName
-     * @description 激活一个主题（应用到dom上）
-     * @param {state} state vuex state
-     * @param {string} themeValue 需要激活的主题名称
-     */
-    d2adminThemeSet (state, themeName) {
-      // 检查这个主题在主题列表里是否存在
-      const theme = state.themeList.find(e => e.name === themeName)
-      if (theme) {
-        // 设置 state
-        state.themeActiveName = themeName
-      } else {
-        // 设置为列表第一个主题
-        state.themeActiveName = state.themeList[0].name
-      }
-      // 将 vuex 中的主题应用到 dom
-      this.commit('d2adminTheme2dom')
-      // 保存到数据库
-      this.commit('d2adminVuex2DbByUuid', 'themeActiveName')
-    },
-    /**
-     * @class themeActiveName
-     * @description 将 vuex 中的主题应用到 dom
-     * @param {state} state vuex state
-     */
-    d2adminTheme2dom (state) {
-      document.body.className = `theme-${state.themeActiveName}`
-    },
-    /**
-     * @class themeActiveName
-     * @description 从数据库加载主题设置
-     * @param {state} state vuex state
-     */
-    d2adminThemeLoad (state) {
-      this.commit('d2adminDb2VuexByUuid', {
-        key: 'themeActiveName',
-        defaultValue: state.themeList[0].name
-      })
-      this.commit('d2adminTheme2dom')
-    }
-  }
-}
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
new file mode 100644
index 00000000..1a8e9199
--- /dev/null
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -0,0 +1 @@
+9cb5ae65d8c8b6c41644e115280f0d3e8ef38d33
\ No newline at end of file

From a40d811478ce61eadae20d2709a50fb314c2fa93 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 22:07:53 +0800
Subject: [PATCH 099/128] no message

Former-commit-id: 8a2320703fe374a1a6f168594029b5d059d2b658 [formerly 8a2320703fe374a1a6f168594029b5d059d2b658 [formerly 8a2320703fe374a1a6f168594029b5d059d2b658 [formerly 8a2320703fe374a1a6f168594029b5d059d2b658 [formerly 4968bd4e96b04a12d5f11e8c3e86b26d1e1c1d58 [formerly 9151b703c583b6571c0e42cadae57a83d81f8a28]]]]]
Former-commit-id: 003174b17e25317300868dac16aa62200aa5ed0d
Former-commit-id: 08c80a57cd50b0f5eed9540e3d34ed14bf3eb11c
Former-commit-id: 78c612e01f2a491aee73e5b091a450f53583a68e [formerly 1ca65f2d6d05a6c68ab578a9e3d2dcdd700fa6e1]
Former-commit-id: ea3fae48083d426e9ea188df31dacc9e7fa4aef9
Former-commit-id: 3cdb05dc12819e42837432032bf3997781aa1ef0
Former-commit-id: 257146cea365af132b7b58ca9cc7bb0b685570b9
Former-commit-id: 475aaba1906e6071afc1dd8fa3d0e5242677917a
Former-commit-id: 1668921032ba1a7fc9662bd2dc7f4f4923b3b95d
---
 src/menu/index.js.REMOVED.git-id             |  2 +-
 src/pages/demo/playground/page-argu/get.vue  | 14 ++++++
 src/pages/demo/playground/page-argu/send.vue | 49 ++++++++++++++++++++
 src/router/routes.js.REMOVED.git-id          |  2 +-
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/playground/page-argu/get.vue
 create mode 100644 src/pages/demo/playground/page-argu/send.vue

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 4ee765dc..6028302c 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-8c23b4baa3bcba23bf62a363520ab0cbabbd2a3b
\ No newline at end of file
+eb4d0c37a891d0cf1e9451f92f116f0ae7f24499
\ No newline at end of file
diff --git a/src/pages/demo/playground/page-argu/get.vue b/src/pages/demo/playground/page-argu/get.vue
new file mode 100644
index 00000000..fa3a6a61
--- /dev/null
+++ b/src/pages/demo/playground/page-argu/get.vue
@@ -0,0 +1,14 @@
+<template>
+  <d2-container type="full">
+    <h1>$route.params.username: {{$route.params.username}}</h1>
+    <h1>$route.query: {{$route.query}}</h1>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {}
+  }
+}
+</script>
diff --git a/src/pages/demo/playground/page-argu/send.vue b/src/pages/demo/playground/page-argu/send.vue
new file mode 100644
index 00000000..c0934e8f
--- /dev/null
+++ b/src/pages/demo/playground/page-argu/send.vue
@@ -0,0 +1,49 @@
+<template>
+  <d2-container type="full">
+    <el-form :model="sendForm" :rules="rules" label-position="top" ref="sendForm">
+      <el-form-item label="username 通过动态路由匹配发送" prop="username">
+        <el-input v-model="sendForm.username"></el-input>
+      </el-form-item>
+      <el-form-item label="userid 通过参数发送" prop="userid">
+        <el-input v-model="sendForm.userid"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSubmit('sendForm')">跳转</el-button>
+      </el-form-item>
+    </el-form>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      sendForm: {
+        username: 'FairyEver',
+        userid: '001'
+      },
+      rules: {
+        username: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        userid: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  methods: {
+    handleSubmit (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          alert('submit!')
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index bf1b6cdc..ed6f49f3 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-cee29f1fa988c380dbe32f3090e012852aa1f703
\ No newline at end of file
+6aad8f65fcc71569df2969b2d39a121bcdec2aa6
\ No newline at end of file

From df69a41545c2221ca5ff17becee01546a07bdd48 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 22:14:22 +0800
Subject: [PATCH 100/128] no message

Former-commit-id: 251e710f9f3e4343b8287ca5809f6a4195adf20a [formerly 251e710f9f3e4343b8287ca5809f6a4195adf20a [formerly 251e710f9f3e4343b8287ca5809f6a4195adf20a [formerly 251e710f9f3e4343b8287ca5809f6a4195adf20a [formerly 88fb702f3106f37c9ecf5b9f2c787218f98586ee [formerly 417d992ebdf3c39a92d6f040dd39494139d017d5]]]]]
Former-commit-id: a11b4c930ed813aeab83632607993702e7ff76bd
Former-commit-id: 31e16d452fd398a4f5e1d6fc5c6367a3738ad853
Former-commit-id: af38a749e5eaa2fb0372bc3146bc90e20478eabe [formerly 137c545cdd83018bb6e3929699ac1dea6de29817]
Former-commit-id: a8f00d28e92268329a80284d4b83999161a8c181
Former-commit-id: dccc128dde2c697bb0bcc62e676cc51df23e5bab
Former-commit-id: 0aabbb01803c3c60421e2c24efa2346d963ef1f7
Former-commit-id: 55ef0ee33c43f29c7451759cd22ebf7175cb397d
Former-commit-id: 5886658cc3f680b3c0cf5780e7547989c1a39be9
---
 src/menu/index.js.REMOVED.git-id             |  2 +-
 src/pages/demo/playground/page-argu/get.vue  |  5 +++--
 src/pages/demo/playground/page-argu/send.vue | 20 +++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 6028302c..a9877f11 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-eb4d0c37a891d0cf1e9451f92f116f0ae7f24499
\ No newline at end of file
+094903b1e629e596be720ff155ff60a312127a92
\ No newline at end of file
diff --git a/src/pages/demo/playground/page-argu/get.vue b/src/pages/demo/playground/page-argu/get.vue
index fa3a6a61..69158aaf 100644
--- a/src/pages/demo/playground/page-argu/get.vue
+++ b/src/pages/demo/playground/page-argu/get.vue
@@ -1,7 +1,8 @@
 <template>
   <d2-container type="full">
-    <h1>$route.params.username: {{$route.params.username}}</h1>
-    <h1>$route.query: {{$route.query}}</h1>
+    <h1 class="d2-mt-0">$route.params.username: {{$route.params.username}}</h1>
+    <h1>$route.query.userid: {{$route.query.userid}}</h1>
+    <p>你可以尝试返回发送数据页面修改数据重新发送，或者切换到其它页面后刷新浏览器再返回本业观察参数保留</p>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/playground/page-argu/send.vue b/src/pages/demo/playground/page-argu/send.vue
index c0934e8f..e4da5def 100644
--- a/src/pages/demo/playground/page-argu/send.vue
+++ b/src/pages/demo/playground/page-argu/send.vue
@@ -8,7 +8,7 @@
         <el-input v-model="sendForm.userid"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleSubmit('sendForm')">跳转</el-button>
+        <el-button type="primary" @click="handleSubmit('sendForm')">跳转到接收页面</el-button>
       </el-form-item>
     </el-form>
   </d2-container>
@@ -24,21 +24,27 @@ export default {
       },
       rules: {
         username: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          { required: true, message: '请输入要发送的用户名', trigger: 'blur' }
         ],
         userid: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          { required: true, message: '请输入要发送的用户ID', trigger: 'blur' }
         ]
       }
-    };
+    }
   },
   methods: {
     handleSubmit (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          alert('submit!')
+          this.$router.push({
+            name: 'demo-playground-page-argu-get',
+            params: {
+              username: this.sendForm.username
+            },
+            query: {
+              userid: this.sendForm.userid
+            }
+          })
         } else {
           return false
         }

From da6751cd492dae26b36756ed799c4b03a6cd28b3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 22:42:56 +0800
Subject: [PATCH 101/128] no message

Former-commit-id: f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly ba17af8d6e4ab1deb21e6bbf2c9ca6a4d2dd75c9 [formerly 44b073ce1fe4addef18298c3f941cf569c216393]]]]]
Former-commit-id: e10e949848ec08b0bb678b16b396539a7debf803
Former-commit-id: 205a81acd245e104e1fdf9e6c06bcd2020f6267c
Former-commit-id: 10c321ed9464c675d82209bb9684bd27dfda99b4 [formerly 91f33d6b05ee82995ee2fd844b8e829851e2c7dc]
Former-commit-id: 3e87f4f0e4a961fb42287ae74c6635f881c2e3d4
Former-commit-id: 6a800214a61fa686f8ae1a70a9cb84a8af871970
Former-commit-id: 76bb32d5779efd63d1ba70c3cd676a054ea40b3e
Former-commit-id: 0725bb5934012f799fffe69df7adb12ccece71b3
Former-commit-id: e6b787b50bfc00896b833168f4b3ad48da0be68a
---
 docs/zh/guide/change-log.md                   |  1 +
 package.json                                  |  1 +
 src/main.js                                   |  3 ++
 src/menu/index.js.REMOVED.git-id              |  2 +-
 .../container/md/doc-ghost-header.md          |  2 +-
 src/pages/demo/components/json-tree/index.vue | 30 +++++++++++++++++++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 7 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/components/json-tree/index.vue

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 15c0f2bd..8f907500 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -14,6 +14,7 @@
 * [ 新增 ] 现在页面标题可以根据路由做出对应变化了
 * [ 新增 ] 版本检查机制
 * [ 新增 ] `d2-container` 隐形模式支持 header 插槽
+* [ 新增 ] 版本检查可以设置为不显示提示框
 
 ## v1.1.3
 
diff --git a/package.json b/package.json
index ee1b73e6..d770d4e8 100755
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "vue": "^2.5.2",
     "vue-grid-layout": "^2.1.11",
     "vue-i18n": "^7.4.2",
+    "vue-json-tree-view": "^2.1.4",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
     "vuex": "^3.0.1",
diff --git a/src/main.js b/src/main.js
index 817065af..87900b6e 100755
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,8 @@ import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
 // 插件 支持百万级数据的表格
 import bigdataTable from '@/plugin/vue-bigdata-table'
+// 插件 json 展示
+import vueJsonTreeView from 'vue-json-tree-view'
 
 // 打包的设置 用户获取路径
 import buildConfig from '../config/index'
@@ -77,6 +79,7 @@ Vue.use(pluginExport)
 Vue.use(pluginLog)
 Vue.use(pluginOpen)
 Vue.use(bigdataTable)
+Vue.use(vueJsonTreeView)
 
 Vue.config.productionTip = false
 
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index a9877f11..bab80261 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-094903b1e629e596be720ff155ff60a312127a92
\ No newline at end of file
+6a871cd88b3b63f275668bcd3c20c6bfa0716909
\ No newline at end of file
diff --git a/src/pages/demo/components/container/md/doc-ghost-header.md b/src/pages/demo/components/container/md/doc-ghost-header.md
index 8ba0f53e..d11ba747 100644
--- a/src/pages/demo/components/container/md/doc-ghost-header.md
+++ b/src/pages/demo/components/container/md/doc-ghost-header.md
@@ -1,6 +1,6 @@
 ## 隐形页面容器 带有头部
 
-不显示任何背景色和边框，但是有一个和分页组件效果融合的头部
+不显示任何背景色和边框，但是有一个和分页组件效果融合的头部，看起来更舒服一点
 
 ```
 <d2-container type="ghost">
diff --git a/src/pages/demo/components/json-tree/index.vue b/src/pages/demo/components/json-tree/index.vue
new file mode 100644
index 00000000..372df6ac
--- /dev/null
+++ b/src/pages/demo/components/json-tree/index.vue
@@ -0,0 +1,30 @@
+<template>
+  <d2-container class="page">
+    <tree-view :data="packJson" :options="options"></tree-view>
+  </d2-container>
+</template>
+
+<script>
+import packJson from '../../../../../package.json'
+export default {
+  data () {
+    return {
+      options: {
+        maxDepth: 10,
+        rootObjectKey: 'package.json',
+        modifiable: false
+      },
+      packJson
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.page {
+  // Your page style here
+  // Do not use empty rulesets
+  // If empty, delete it
+}
+</style>
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index ed6f49f3..1ac5e80a 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-6aad8f65fcc71569df2969b2d39a121bcdec2aa6
\ No newline at end of file
+a83598d185531f4f568ff58da2a51ad426f050e4
\ No newline at end of file

From 12edcdf1afd79d740b2416d77537ca347cd5f3ea Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 23:53:05 +0800
Subject: [PATCH 102/128] no message

Former-commit-id: 74667cae8625741a8fb2d8dc0fd78706fa306696 [formerly 74667cae8625741a8fb2d8dc0fd78706fa306696 [formerly 74667cae8625741a8fb2d8dc0fd78706fa306696 [formerly 74667cae8625741a8fb2d8dc0fd78706fa306696 [formerly 09170b1ab370de46e61b5cce03559fa5602374a9 [formerly 113123709db1c2aa7dc249885d6aebb7292c750a]]]]]
Former-commit-id: 244749bbf2ddea23a2db610f3d4d5266320b6cff
Former-commit-id: ad493f9e3d304ae235c2e2ad58b99ff4021d1df7
Former-commit-id: 7fa603d6070e2d679834ed1a114b658c2b08d64f [formerly 6d06ef267b0c36f60612c0e28f522bb8d4bbde93]
Former-commit-id: 5742feea2bb326fb34cc582bde638f78560c8b5c
Former-commit-id: 253509319a8d38eddea1758a511c1b6de4376b8c
Former-commit-id: a5c0414d10a702a500f6fce2778acc817d7f3d07
Former-commit-id: cc09cc098ea300a630ec20d070ea4095ee2ed2b7
Former-commit-id: c25d2623a8658c7384a88b674905b7b6a6f3d824
---
 src/pages/demo/components/json-tree/index.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/pages/demo/components/json-tree/index.vue b/src/pages/demo/components/json-tree/index.vue
index 372df6ac..88de83c0 100644
--- a/src/pages/demo/components/json-tree/index.vue
+++ b/src/pages/demo/components/json-tree/index.vue
@@ -19,12 +19,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
-.page {
-  // Your page style here
-  // Do not use empty rulesets
-  // If empty, delete it
-}
-</style>
\ No newline at end of file

From 6d05724e8829788d914d86876648fd45f0ee22fe Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 23:54:37 +0800
Subject: [PATCH 103/128] no message

Former-commit-id: 763251e16d747b2f013858f3cbb28980386d0610 [formerly a3365b4c4c5a515c7a70c4a92fbaf2a78ccaf2d6] [formerly 763251e16d747b2f013858f3cbb28980386d0610 [formerly a3365b4c4c5a515c7a70c4a92fbaf2a78ccaf2d6] [formerly 763251e16d747b2f013858f3cbb28980386d0610 [formerly a3365b4c4c5a515c7a70c4a92fbaf2a78ccaf2d6] [formerly a3365b4c4c5a515c7a70c4a92fbaf2a78ccaf2d6 [formerly 9a482218ba89783929b350d425ad46587e3ecfdc [formerly a0c0a626a3717abf408ef4d1938aa85285a2bb40]]]]]
Former-commit-id: 96b1936d62f3bc346198793e2fcbe1c288844057
Former-commit-id: f38a40d4ef4197e31559306a1c50fadece7049d2
Former-commit-id: 51f39039d181d73dae25678d7624a9256f6dcd82 [formerly aa319b8b1ffdb8379ef1d63608df37ff58decc1e]
Former-commit-id: 9f25941e0f5cf5159124f3672a6c7171f7cf65b6
Former-commit-id: e07a1630bb539332177cebd85e20082fce5fab45
Former-commit-id: 32b700908566ddc09ee8ba6c49fb9b9135e7f8df
Former-commit-id: 86b6466f677aa3ca6e7d4d048f180c06478a2ec9
Former-commit-id: 899cf9cf7b5f7885d5a1d4aa82bf360296c9efb9
---
 docs/zh/guide/change-log.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 8f907500..2aae1b5c 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -15,6 +15,7 @@
 * [ 新增 ] 版本检查机制
 * [ 新增 ] `d2-container` 隐形模式支持 header 插槽
 * [ 新增 ] 版本检查可以设置为不显示提示框
+* [ 新增 ] 集成 json 查看组件
 
 ## v1.1.3
 

From 8edc35e4dc78ed20070cf41f4fe88d6c8df403f7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 23:57:16 +0800
Subject: [PATCH 104/128] no message

Former-commit-id: e4a987009234299ca1ce0323290991a74bba65d8 [formerly e4a987009234299ca1ce0323290991a74bba65d8 [formerly e4a987009234299ca1ce0323290991a74bba65d8 [formerly e4a987009234299ca1ce0323290991a74bba65d8 [formerly ae92ac9a01d5630d8690dfb22f884b60fa7976f2 [formerly 3de7aefcdb5053caaf8198a00b33c70008060831]]]]]
Former-commit-id: 6eb41eee6c1e83e3355352292c14cc6a9b539b3d
Former-commit-id: dc8483fc7d5dc2151f685687ab51bbc3b1a90e65
Former-commit-id: 9711fa7872da91923330d6cd60fac9845b320f36 [formerly bfff3ab3397c7c3e6abc674f1a5ea311d5b293ff]
Former-commit-id: 2d2acb61eeb431677a1d507b95ab5361afa1f01d
Former-commit-id: 2e98ea0982a451814edcd400c1f102ddaa4711a2
Former-commit-id: 6e399a650f8d3471171d444409426ed159e64176
Former-commit-id: 23f7cb0929f469deb4ccbb5c18bcfa4ef543dabe
Former-commit-id: 74ffe4083ba287220ead8ff8338fe7cf873c5d0f
---
 .../core/d2-layout-main/components/-menu-side/index.vue          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index bd7206e4..480eb8fa 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -80,6 +80,7 @@ export default {
 </script>
 
 <style lang="scss">
+// TODO: 兼容火狐浏览器需要改这里
 .d2-layout-main-menu-side {
   position: relative;
   height: 100%;

From 17b0294951ff2099a3d0e05c283910e24945500e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 09:48:23 +0800
Subject: [PATCH 105/128] no message

Former-commit-id: 13af02b4d4c4033582b2762f14fbe8802ec5fc02 [formerly 13af02b4d4c4033582b2762f14fbe8802ec5fc02 [formerly 13af02b4d4c4033582b2762f14fbe8802ec5fc02 [formerly 13af02b4d4c4033582b2762f14fbe8802ec5fc02 [formerly b9712ed794d1db939f9b2bdbb67c8a69d71f89a8 [formerly b6115665f5243c3103684226e0bde661d55597f7]]]]]
Former-commit-id: e3cc9b0aad9cacee0133f5f4c85d43cde717cc9c
Former-commit-id: 63d819826ff2aeb0ca7a811f8b7ddfbe2df048d1
Former-commit-id: 7ebe1bb886125ee3de1c15cd5cbf14c392480af8 [formerly 8df52d9a84afa8e50895c9611ab439b58bfa1d90]
Former-commit-id: ccf6ecbd64a1a2fd5283effabd054bcebc799b6d
Former-commit-id: afde6581b46898bbb98e299ebd7194dc0577f934
Former-commit-id: 8278de89c188805da05d81e10c7aba77bb64c336
Former-commit-id: 89a57f2fae80b360ab76a9d3f2bc99540adaf519
Former-commit-id: 03bf8adadfa169fee5cb039818e415ceb92fd787
---
 .../d2-layout-main-group.xmind.REMOVED.git-id |   1 +
 src/assets/style/theme/theme-base.scss        | 120 ++++++++++++------
 src/assets/style/theme/theme.scss             |   6 +-
 .../components/-menu-side/index.vue           |   9 --
 src/components/core/d2-layout-main/index.vue  |  20 +--
 5 files changed, 98 insertions(+), 58 deletions(-)
 create mode 100644 design/d2-layout-main-group.xmind.REMOVED.git-id

diff --git a/design/d2-layout-main-group.xmind.REMOVED.git-id b/design/d2-layout-main-group.xmind.REMOVED.git-id
new file mode 100644
index 00000000..ba2b8b21
--- /dev/null
+++ b/design/d2-layout-main-group.xmind.REMOVED.git-id
@@ -0,0 +1 @@
+f6ee530a7841eb687cae7821453739533292ddd6
\ 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 d427046e..6226317d 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -1,3 +1,82 @@
+// 整体框架结构
+.d2-layout-main-group {
+  height: 100%;
+  width: 100%;
+  background-size: cover;
+  background-position: center;
+  overflow: hidden;
+  position: relative;
+  // 背景上面的半透明遮罩
+  .d2-layout-main-mask {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+    left: 0px;
+  }
+  // 内容层
+  .d2-layout-main-content {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+    left: 0px;
+    $d2-theme-header-height: 60px;
+    .d2-theme-header {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      right: 0px;
+      height: $d2-theme-header-height;
+    }
+    .d2-theme-container {
+      position: absolute;
+      top: $d2-theme-header-height;
+      bottom: 0px;
+      left: 0px;
+      right: 0px;
+      display: flex;
+      flex-direction: row;
+      .d2-theme-container-aside {
+        transition: width .3s;
+        flex-grow: 0;
+        position: relative;
+        .d2-layout-main-menu-side {
+          position: absolute;
+          top: 0px;
+          bottom: 0px;
+          left: 0px;
+          right: 0px;
+          overflow: hidden;
+        }
+      }
+      .d2-theme-container-main {
+        flex-grow: 1;
+        padding: 0px;
+        position: relative;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        .d2-theme-container-main-header {
+          flex-grow: 0;
+        }
+        .d2-theme-container-main-body {
+          flex-grow: 1;
+          margin-top: 1px;
+          position: relative;
+        }
+      }
+    }
+  }
+}
+
+
+
+
+
+
+
+
 // 主题公用
 .d2-layout-main-group {
   &.grayMode {
@@ -8,30 +87,10 @@
     filter: grayscale(100%);
     filter: gray;
   }
-  height: 100%;
-  width: 100%;
-  background-size: cover;
-  background-position: center;
-  overflow: hidden;
-  position: relative;
-  // 背景上面的半透明遮罩
-  .layout-main-mask {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
-  }
   // 主体
-  .el-container.d2-layout-main-content {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
+  .d2-layout-main-content {
     // [布局] 顶栏
-    .el-header.d2-theme-header {
-      padding: 0px;
+    .d2-theme-header {
       // logo区域
       .logo-group {
         transition: width .3s;
@@ -96,11 +155,9 @@
       }
     }
     // [布局] 顶栏下面
-    .el-container.d2-theme-container {
+    .d2-theme-container {
       // 侧边栏
-      .el-aside.d2-theme-container-aside {
-        transition: width .3s;
-        overflow: auto;
+      .d2-theme-container-aside {
         // [菜单] 正常状态
         .el-menu {
           @extend %unable-select;
@@ -155,15 +212,9 @@
         }
       }
       // 右下 主体
-      .el-main.d2-theme-container-main {
-        padding: 0px;
-        position: relative;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
+      .d2-theme-container-main {
         // 主体部分分为多页面控制器 和主体
         .d2-theme-container-main-header {
-          flex-grow: 0;
           // 多页面控制器
           .d2-multiple-page-control-group {
             display: flex;
@@ -203,9 +254,6 @@
         }
         // 主体
         .d2-theme-container-main-body {
-          flex-grow: 1;
-          margin-top: 1px;
-          position: relative;
           // 布局组件
           .container-component {
             // 卡片布局组件
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index d5cd96d7..d1d22f2d 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -115,9 +115,9 @@
     }
   }
   // [布局] 顶栏下面
-  .el-container.d2-theme-container {
+  .d2-theme-container {
     // 侧边栏
-    .el-aside.d2-theme-container-aside {
+    .d2-theme-container-aside {
       // 菜单为空的时候显示的信息
       .menu-empty {
         background: $theme-aside-menu-empty-background-color;
@@ -191,7 +191,7 @@
         }
       }
     }
-    .el-main.d2-theme-container-main {
+    .d2-theme-container-main {
       // 主体部分分为多页面控制器 和主体
       .d2-theme-container-main-header {
         // 多页面控制器
diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index 480eb8fa..673e1e6f 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -78,12 +78,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-// TODO: 兼容火狐浏览器需要改这里
-.d2-layout-main-menu-side {
-  position: relative;
-  height: 100%;
-  overflow: hidden;
-}
-</style>
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 5a2f5cb2..60025cb2 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -6,9 +6,9 @@
     <!-- 半透明遮罩 -->
     <div class="d2-layout-main-mask"></div>
     <!-- 主体内容 -->
-    <el-container class="d2-layout-main-content">
+    <div class="d2-layout-main-content">
       <!-- 顶栏 -->
-      <el-header class="d2-theme-header">
+      <div class="d2-theme-header">
         <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
           <img v-if="collapse" :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
           <img v-else :src="`${$assetsPublicPath}static/image/theme/${themeActiveSetting.name}/logo/all.png`">
@@ -25,15 +25,15 @@
           <d2-layout-main-header-theme/>
           <d2-layout-main-header-user/>
         </div>
-      </el-header>
+      </div>
       <!-- 下面 主体 -->
-      <el-container class="d2-theme-container">
+      <div class="d2-theme-container">
         <!-- 主体 侧边栏 -->
-        <el-aside ref="aside" class="d2-theme-container-aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
+        <div ref="aside" class="d2-theme-container-aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
           <d2-layout-main-menu-side :collapse="collapse"/>
-        </el-aside>
+        </div>
         <!-- 主体 -->
-        <el-main class="d2-theme-container-main">
+        <div class="d2-theme-container-main">
           <div class="d2-theme-container-main-header">
             <d2-multiple-page-control/>
           </div>
@@ -47,9 +47,9 @@
               <router-view v-if="!alive"/>
             </transition>
           </div>
-        </el-main>
-      </el-container>
-    </el-container>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 

From b422a8464dd40a90662cfefc7100ae4427193228 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 10:04:54 +0800
Subject: [PATCH 106/128] no message

Former-commit-id: c716d8898113e6e31cf821e142321676a0044e9b [formerly c716d8898113e6e31cf821e142321676a0044e9b [formerly c716d8898113e6e31cf821e142321676a0044e9b [formerly c716d8898113e6e31cf821e142321676a0044e9b [formerly 22c749da297ba2d409e49f0d54a74b2e7d0fe1e7 [formerly de11ac64f89ebc3bb1ce79acdf1c36b15bfd2ecb]]]]]
Former-commit-id: 1777666f0ed7b13e47fd19cbde226c581e39344c
Former-commit-id: 99506973b138f37589bcc483bba01969995f2ee0
Former-commit-id: a3ea8c97f1a245fc618de0b7eacd108f66abd928 [formerly ef53f6c834a5e7d47b86134952437996cae2f177]
Former-commit-id: 50e3b066a1815959ed460976fcf4662e59a5af4a
Former-commit-id: abe5f4bc9e84aa19d4a90b7b3b6d2c8e7ff79e17
Former-commit-id: 2f478f3b022f2ef178580b91bf3681b0179c7259
Former-commit-id: c1091d94bd8785464f54768498cdaee47e0b8987
Former-commit-id: 95872751e37b9b50513ba8c9f6898a4e9b9530b4
---
 .../components/-menu-side/index.vue           | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index 673e1e6f..b76dbb3e 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -52,6 +52,13 @@ export default {
     }
   },
   watch: {
+    // 折叠和展开菜单的时候销毁 better scroll
+    collapse (val) {
+      this.scrollDestroy()
+      setTimeout(() => {
+        this.scrollInit()
+      }, 500)
+    },
     '$route.matched': {
       handler (val) {
         const path = val[0].path
@@ -68,13 +75,26 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$el, {
-      mouseWheel: true,
-      scrollbar: {
-        fade: true,
-        interactive: false
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
+      this.BS = new BScroll(this.$el, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
       }
-    })
+    }
   }
 }
 </script>

From 5c05145fe1815ae0816d784ef309ab2cd6a5a6e8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 10:12:53 +0800
Subject: [PATCH 107/128] no message

Former-commit-id: 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly da4a0e20c08e61357028360b6bf7089bf993e4cb [formerly 12b48ab460ac02f425b5387f10a8101af098043b]]]]]
Former-commit-id: b2a6a28fa5f30666249632d14555d15e02598113
Former-commit-id: cdb10cdb7b850965491c6696dc5deb44124d6a46
Former-commit-id: 512e4a19aaf79bd8cbd75bf72ba00ce759a50f1a [formerly 762ba74e5b7ca343da83694283f669dffad32308]
Former-commit-id: 2a0feaadbf3bc3dd381bcd513b767221095e07f0
Former-commit-id: 2e83cc4ef3c21767fcfd305ab01504223245528b
Former-commit-id: 276a5ebcbd0d2e25eae2d165c2bffce434cfea24
Former-commit-id: e13f9da9ccb136df2068abbe3fe6e744a0ec874e
Former-commit-id: e6423429e3b8c2625a128d4fad48bb73dd52378e
---
 .../components/d2-container-full-bs.vue       | 27 ++++++++++++++-----
 src/components/core/d2-container/index.vue    | 13 ++++++++-
 src/pages/demo/plugins/better-scroll/base.vue | 23 +++++++++++++---
 src/pages/demo/plugins/better-scroll/to.vue   | 23 +++++++++++++---
 4 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
index 81019358..ee1235b1 100644
--- a/src/components/core/d2-container/components/d2-container-full-bs.vue
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -15,7 +15,9 @@
 </template>
 
 <script>
+// 插件
 import BScroll from 'better-scroll'
+
 export default {
   name: 'd2-container-full',
   data () {
@@ -24,13 +26,26 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.wrapper, {
-      mouseWheel: true,
-      scrollbar: {
-        fade: true,
-        interactive: false
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
       }
-    })
+    }
   }
 }
 </script>
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 1dafcf6c..46ebf47c 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -65,7 +65,13 @@ export default {
     }
   },
   mounted () {
-    if (this.type !== 'full') {
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
       this.BS = new BScroll(this.$refs.container, {
         mouseWheel: true,
         scrollbar: {
@@ -73,6 +79,11 @@ export default {
           interactive: false
         }
       })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
     }
   }
 }
diff --git a/src/pages/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue
index 701c58ab..f9a77950 100644
--- a/src/pages/demo/plugins/better-scroll/base.vue
+++ b/src/pages/demo/plugins/better-scroll/base.vue
@@ -18,9 +18,26 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.wrapper, {
-      mouseWheel: true
-    })
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
+    }
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/better-scroll/to.vue b/src/pages/demo/plugins/better-scroll/to.vue
index 93e085d9..9077545b 100644
--- a/src/pages/demo/plugins/better-scroll/to.vue
+++ b/src/pages/demo/plugins/better-scroll/to.vue
@@ -42,7 +42,9 @@
 </template>
 
 <script>
+// 插件
 import BScroll from 'better-scroll'
+
 export default {
   data () {
     return {
@@ -51,9 +53,10 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.wrapper, {
-      mouseWheel: true
-    })
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
   },
   methods: {
     handleScrollTo (y) {
@@ -64,6 +67,20 @@ export default {
     },
     handleScrollToElement (n) {
       this.BS.scrollToElement(`#demo-bs-item-${n}`, this.time)
+    },
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
     }
   }
 }

From d1cfeff9a6868b8ac3ba05949d9c80d77d0e3386 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 10:16:38 +0800
Subject: [PATCH 108/128] no message

Former-commit-id: 0f51ed96d3d035fb65df2a8e8bcf29665da0f60d [formerly eea54ade2be555c1094e44dfd7ef93b86f7f5740] [formerly 0f51ed96d3d035fb65df2a8e8bcf29665da0f60d [formerly eea54ade2be555c1094e44dfd7ef93b86f7f5740] [formerly 0f51ed96d3d035fb65df2a8e8bcf29665da0f60d [formerly eea54ade2be555c1094e44dfd7ef93b86f7f5740] [formerly eea54ade2be555c1094e44dfd7ef93b86f7f5740 [formerly 5431f88f4a92875646f216f5c2ff022c4031128e [formerly 4f829599fc0e05f104858087bb5e7d42eb6d99d9]]]]]
Former-commit-id: befd5f5f03880420419242126bbaa847b6cd481d
Former-commit-id: d90c47b420da7469dc3b58e12243b4af366db204
Former-commit-id: 36b94e62b8a28a0b05b852c0aeeb53ec8c073015 [formerly b15eb7ada7a07fcbc62ff649e0d1befecad073c4]
Former-commit-id: 6dab34cef29e83daab2cca05588a30802e495685
Former-commit-id: d677f73b1d178d25b77e7352460b601326634512
Former-commit-id: 2720ea31d08aa479dd2702db067255e51c5b7c02
Former-commit-id: 3991118fa6025457d5ca064c2114b9719364a4bd
Former-commit-id: 4937e738196850421ca0f6c03c62a6bb65cdab1c
---
 src/components/core/d2-container/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 46ebf47c..a42704dc 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -65,7 +65,9 @@ export default {
     }
   },
   mounted () {
-    this.scrollInit()
+    if (this.type === 'card' || this.type === 'ghost') {
+      this.scrollInit()
+    }
   },
   beforeDestroy () {
     this.scrollDestroy()

From 6b6f0659b55e7c9e796fffcdcd48e6dd75fda043 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 10:17:06 +0800
Subject: [PATCH 109/128] no message

Former-commit-id: 045f042ae9b25e4c1993f09003b20dfe177c6e33 [formerly 42b780418f910bfaee2f31c08c67fd4183ec162a] [formerly 045f042ae9b25e4c1993f09003b20dfe177c6e33 [formerly 42b780418f910bfaee2f31c08c67fd4183ec162a] [formerly 045f042ae9b25e4c1993f09003b20dfe177c6e33 [formerly 42b780418f910bfaee2f31c08c67fd4183ec162a] [formerly 42b780418f910bfaee2f31c08c67fd4183ec162a [formerly 8b9c4d267ad3c8e551d405c0f8b97e600145b257 [formerly b4b33b113691d26a9b028353923c561f6e926783]]]]]
Former-commit-id: 2945ed38c05330b613cae63312ffdb33cc19efd9
Former-commit-id: c0bfec17a15c7d6facb3c9c3b6240b629dae40da
Former-commit-id: 5910a09aa89fac4ce5ac1c4178b755e316a7ed7b [formerly 922b875729c88081e6d6b88e8c2eb4d3b47d25ee]
Former-commit-id: 58cab52da79ed37726e8995ec8c9990383b216df
Former-commit-id: 2736d66e44684dd706763e4271f71e0a864f591a
Former-commit-id: b7243cd8a81fec6cf8c3cce7bc8316ab870cc9b8
Former-commit-id: 91acd6bfd0e4fec76285115db33fb5a20cdc7222
Former-commit-id: a9c3d5d44dffa6522fbb1ce007d597b1ee3149d4
---
 src/components/core/d2-container/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index a42704dc..fe566049 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -70,7 +70,9 @@ export default {
     }
   },
   beforeDestroy () {
-    this.scrollDestroy()
+    if (this.type === 'card' || this.type === 'ghost') {
+      this.scrollDestroy()
+    }
   },
   methods: {
     scrollInit () {

From eb83fff18a2789909f0d80261fc43491c48c2bb7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 10:19:16 +0800
Subject: [PATCH 110/128] no message

Former-commit-id: 2ef0b651092dab0fd7f6825478974c1b66f04ec9 [formerly 2ef0b651092dab0fd7f6825478974c1b66f04ec9 [formerly 2ef0b651092dab0fd7f6825478974c1b66f04ec9 [formerly 2ef0b651092dab0fd7f6825478974c1b66f04ec9 [formerly b6499f6ab1ff37a6904dd0ae97e652102ee5885d [formerly 0b3e32ba9ba0c753acbbcb63a227600ce7d1743d]]]]]
Former-commit-id: 3c80b99944e73d028c3248bee467a91455ddd2bc
Former-commit-id: 0450fd62ba2d6dbe5b6c4e0f8dd19b11d5eb7314
Former-commit-id: 7b0b7f6fa5dddc7f39f5d9885cf01f8b98c7f78b [formerly fe7acd0667aeb0e5811809d1620f31f84a8d93c5]
Former-commit-id: 13e5304b68e833603ec3efad5ab87e12124252b7
Former-commit-id: 2e313ef80e26e1716c6ae5a9ec556a98f06fe623
Former-commit-id: 4cc1e13ca2f93711277bdae65d7205203c90523d
Former-commit-id: dd6e6099eec01f9edc6903b4478218102cd5e227
Former-commit-id: 9c35b0d92eb67aa8aa90768d1993f33a22d5a334
---
 src/assets/style/theme/theme.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index d1d22f2d..6677f9fa 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -39,7 +39,7 @@
   }
   
   // 顶栏
-  .el-header.d2-theme-header {
+  .d2-theme-header {
     // 切换按钮
     .toggle-aside-btn {
       i {

From 4c567a126f28cf32a10c07a0ace60d189b0fa61f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 12:36:22 +0800
Subject: [PATCH 111/128] no message

Former-commit-id: 5736b537b80522974d00a7086d4acfc8a0d83d6f [formerly 5736b537b80522974d00a7086d4acfc8a0d83d6f [formerly 5736b537b80522974d00a7086d4acfc8a0d83d6f [formerly 5736b537b80522974d00a7086d4acfc8a0d83d6f [formerly d5a50f370faea7529cfe5c8e81df9d9b383da219 [formerly d2511cd85dd9f4641cb06715fc7e697b6de496a2]]]]]
Former-commit-id: e5da464e7ed7892cd3b874f350cbfd95f80a66c4
Former-commit-id: c23f670851d81787f70c3da8e1efd36c218a5d2c
Former-commit-id: c92cd8fda84ab8a6cf89e6c1eafe828dac2c96e3 [formerly 277bb06065ff0371dd6e8ab11a13ed0d9a82a93a]
Former-commit-id: c48ead6d4c5214286cf545ca93f98eccc91da427
Former-commit-id: fdedbcfc8a0f4f1fdd62e6965e057a3b502842fc
Former-commit-id: fc8ebc6a3a504a4e88d7da2c509f2096daafdc56
Former-commit-id: 51e87cc6d508caabd90f8520a56235a7f881a85c
Former-commit-id: e1f06ac6b5d54f353ce329d02599e3bd8b973b90
---
 docs/zh/components/container.md                       | 2 +-
 src/pages/demo/components/container/full-bs.vue       | 2 +-
 src/pages/demo/components/container/md/doc-full-bs.md | 2 +-
 src/pages/demo/components/icon/list.vue               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 27cfc424..1e1efe29 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -81,7 +81,7 @@ export default {
 
 `v1.1.4` 新增
 
-你可以通过设置 `:scroll="true"` 来启用自定义滚动条，看起来更美观一些
+你可以通过设置 `scroll` 来启用自定义滚动条，看起来更美观一些
 
 ### 隐形页面容器
 
diff --git a/src/pages/demo/components/container/full-bs.vue b/src/pages/demo/components/container/full-bs.vue
index cc50b43f..3fa1a164 100644
--- a/src/pages/demo/components/container/full-bs.vue
+++ b/src/pages/demo/components/container/full-bs.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container type="full" :scroll="true">
+  <d2-container type="full" scroll>
     <template slot="header">
       我是插入到 header 中的内容
     </template>
diff --git a/src/pages/demo/components/container/md/doc-full-bs.md b/src/pages/demo/components/container/md/doc-full-bs.md
index 8b319183..e292a4eb 100644
--- a/src/pages/demo/components/container/md/doc-full-bs.md
+++ b/src/pages/demo/components/container/md/doc-full-bs.md
@@ -6,7 +6,7 @@
 
 ```
 <template>
-  <d2-container type="full" :scroll="true">
+  <d2-container type="full" scroll>
     <template slot="header">
       可选的 header 内容 ...
     </template>
diff --git a/src/pages/demo/components/icon/list.vue b/src/pages/demo/components/icon/list.vue
index c4bae2cb..ff4ade16 100644
--- a/src/pages/demo/components/icon/list.vue
+++ b/src/pages/demo/components/icon/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container type="full">
+  <d2-container type="full" scroll>
     <template slot="header">
       <el-radio-group v-model="showIndex" size="mini">
         <el-radio-button

From b4104528dd22ce3ada6002e0c02d07dff7a825ff Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:15:27 +0800
Subject: [PATCH 112/128] no message

Former-commit-id: c1a46a85e7da5b917bf0765a55924be448246b8a [formerly c1a46a85e7da5b917bf0765a55924be448246b8a [formerly c1a46a85e7da5b917bf0765a55924be448246b8a [formerly c1a46a85e7da5b917bf0765a55924be448246b8a [formerly 407ca5f0352478eadd082f4f23f40617781abd05 [formerly 6264aaab411fe762118dc3a86318ba515ccf678b]]]]]
Former-commit-id: 05609ca8fec10fe16b65f743d52caebb718b06a6
Former-commit-id: 7b8138b2a2f66aea72012bc66a4a190677979ccb
Former-commit-id: 4d6b93246f996a24bbec7662c9194cd5862a1e4d [formerly acf2702bc0b064c853445ac40e7c2c4d89057093]
Former-commit-id: 171b0c2eafa427fbcbb8cfae77e7765a13c7821f
Former-commit-id: 9a52544a8e33f7847d4f92679a27d15e6fc71a88
Former-commit-id: c48487da85aca0235ab55e26d55a0c82e095bbe4
Former-commit-id: 9d608d82eb7c5c0573982a72c18b36751a5f2dee
Former-commit-id: 1c66fe32e6692d7b153484f0d0904bbcf556921f
---
 src/menu/index.js.REMOVED.git-id              |   2 +-
 .../demo/charts/list/candle/demo1/index.vue   |  77 +++++++++++
 .../demo/charts/list/candle/demo2/index.vue   |  81 +++++++++++
 .../demo/charts/list/candle/demo3/index.vue   |  88 ++++++++++++
 .../demo/charts/list/funnel/demo1/index.vue   |  43 ++++++
 .../demo/charts/list/funnel/demo2/index.vue   |  46 +++++++
 .../demo/charts/list/gauge/demo1/index.vue    |  40 ++++++
 .../demo/charts/list/heatmap/demo1/index.vue  |  49 +++++++
 .../demo/charts/list/heatmap/demo2/index.vue  |  69 ++++++++++
 .../demo/charts/list/map/demo1/index.vue      |  43 ++++++
 .../demo/charts/list/map/demo2/index.vue      |  46 +++++++
 .../demo/charts/list/map/demo3/index.vue      |  53 ++++++++
 .../demo/charts/list/radar/demo1/index.vue    |  45 +++++++
 .../demo/charts/list/sankey/demo1/index.vue   |  56 ++++++++
 .../demo/charts/list/scatter/demo1/index.vue  |  45 +++++++
 .../demo/charts/list/scatter/demo2/index.vue  |  63 +++++++++
 .../demo/charts/list/tree/demo1/index.vue     | 126 ++++++++++++++++++
 .../charts/list/waterfall/demo1/index.vue     |  42 ++++++
 src/router/routes.js.REMOVED.git-id           |   2 +-
 19 files changed, 1014 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/charts/list/candle/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/candle/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/candle/demo3/index.vue
 create mode 100644 src/pages/demo/charts/list/funnel/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/funnel/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/gauge/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/heatmap/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/heatmap/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/map/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/map/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/map/demo3/index.vue
 create mode 100644 src/pages/demo/charts/list/radar/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/sankey/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/scatter/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/scatter/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/tree/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/waterfall/demo1/index.vue

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index bab80261..4d5381ac 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-6a871cd88b3b63f275668bcd3c20c6bfa0716909
\ No newline at end of file
+65f20381a0a82b4a59eaab437558aecd7ebb0556
\ No newline at end of file
diff --git a/src/pages/demo/charts/list/candle/demo1/index.vue b/src/pages/demo/charts/list/candle/demo1/index.vue
new file mode 100644
index 00000000..9e0cb613
--- /dev/null
+++ b/src/pages/demo/charts/list/candle/demo1/index.vue
@@ -0,0 +1,77 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-candle :data="chartData" v-bind="pubSetting"></ve-candle>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['日期', 'open', 'close', 'lowest', 'highest', 'vol'],
+        rows: [
+          { '日期': '2004-01-05', open: 10411.85, close: 10544.07, lowest: 10411.85, highest: 10575.92, vol: 221290000 },
+          { '日期': '2004-01-06', open: 10543.85, close: 10538.66, lowest: 10454.37, highest: 10584.07, vol: 191460000 },
+          { '日期': '2004-01-07', open: 10535.46, close: 10529.03, lowest: 10432.12, highest: 10587.55, vol: 225490000 },
+          { '日期': '2004-01-08', open: 10530.07, close: 10592.44, lowest: 10480.59, highest: 10651.99, vol: 237770000 },
+          { '日期': '2004-01-09', open: 10589.25, close: 10458.89, lowest: 10420.52, highest: 10603.48, vol: 223250000 },
+          { '日期': '2004-01-12', open: 10461.55, close: 10485.18, lowest: 10389.85, highest: 10543.03, vol: 197960000 },
+          { '日期': '2004-01-13', open: 10485.18, close: 10427.18, lowest: 10341.19, highest: 10539.25, vol: 197310000 },
+          { '日期': '2004-01-14', open: 10428.67, close: 10538.37, lowest: 10426.89, highest: 10573.85, vol: 186280000 },
+          { '日期': '2004-01-15', open: 10534.52, close: 10553.85, lowest: 10454.52, highest: 10639.03, vol: 260090000 },
+          { '日期': '2004-01-16', open: 10556.37, close: 10600.51, lowest: 10503.71, highest: 10666.88, vol: 254170000 },
+          { '日期': '2004-01-20', open: 10601.42, close: 10528.66, lowest: 10447.92, highest: 10676.96, vol: 224300000 },
+          { '日期': '2004-01-21', open: 10522.77, close: 10623.62, lowest: 10453.11, highest: 10665.72, vol: 214920000 },
+          { '日期': '2004-01-22', open: 10624.22, close: 10623.18, lowest: 10545.03, highest: 10717.41, vol: 219720000 },
+          { '日期': '2004-01-23', open: 10625.25, close: 10568.29, lowest: 10490.14, highest: 10691.77, vol: 234260000 },
+          { '日期': '2004-01-26', open: 10568.12, close: 10702.51, lowest: 10510.44, highest: 10725.18, vol: 186170000 },
+          { '日期': '2004-01-27', open: 10701.11, close: 10609.92, lowest: 10579.33, highest: 10748.81, vol: 206560000 },
+          { '日期': '2004-01-28', open: 10610.07, close: 10468.37, lowest: 10412.44, highest: 10703.25, vol: 247660000 },
+          { '日期': '2004-01-29', open: 10467.41, close: 10510.29, lowest: 10369.92, highest: 10611.56, vol: 273970000 },
+          { '日期': '2004-01-30', open: 10510.22, close: 10488.07, lowest: 10385.56, highest: 10551.03, vol: 208990000 },
+          { '日期': '2004-02-02', open: 10487.78, close: 10499.18, lowest: 10395.55, highest: 10614.44, vol: 224800000 },
+          { '日期': '2004-02-03', open: 10499.48, close: 10505.18, lowest: 10414.15, highest: 10571.48, vol: 183810000 },
+          { '日期': '2004-02-04', open: 10503.11, close: 10470.74, lowest: 10394.81, highest: 10567.85, vol: 227760000 },
+          { '日期': '2004-02-05', open: 10469.33, close: 10495.55, lowest: 10399.92, highest: 10566.37, vol: 187810000 },
+          { '日期': '2004-02-06', open: 10494.89, close: 10593.03, lowest: 10433.74, highest: 10634.81, vol: 182880000 },
+          { '日期': '2004-02-09', open: 10592.41, close: 10579.03, lowest: 10433.72, highest: 10634.81, vol: 160720000 },
+          { '日期': '2004-02-10', open: 10578.74, close: 10613.85, lowest: 10511.18, highest: 10667.03, vol: 160590000 },
+          { '日期': '2004-02-11', open: 10605.48, close: 10737.72, lowest: 10561.55, highest: 10779.41, vol: 277850000 },
+          { '日期': '2004-02-12', open: 10735.18, close: 10694.07, lowest: 10636.44, highest: 10775.03, vol: 197560000 },
+          { '日期': '2004-02-13', open: 10696.22, close: 10627.85, lowest: 10578.66, highest: 10755.47, vol: 208340000 },
+          { '日期': '2004-02-17', open: 10628.88, close: 10714.88, lowest: 10628.88, highest: 10762.07, vol: 169730000 },
+          { '日期': '2004-02-18', open: 10706.68, close: 10671.99, lowest: 10623.62, highest: 10764.36, vol: 164370000 },
+          { '日期': '2004-02-19', open: 10674.59, close: 10664.73, lowest: 10626.44, highest: 10794.95, vol: 219890000 },
+          { '日期': '2004-02-20', open: 10666.29, close: 10619.03, lowest: 10559.11, highest: 10722.77, vol: 220560000 },
+          { '日期': '2004-02-23', open: 10619.55, close: 10609.62, lowest: 10508.89, highest: 10711.84, vol: 229950000 },
+          { '日期': '2004-02-24', open: 10609.55, close: 10566.37, lowest: 10479.33, highest: 10681.41, vol: 225670000 },
+          { '日期': '2004-02-25', open: 10566.59, close: 10601.62, lowest: 10509.42, highest: 10660.73, vol: 192420000 },
+          { '日期': '2004-02-26', open: 10598.14, close: 10580.14, lowest: 10493.71, highest: 10652.96, vol: 223230000 },
+          { '日期': '2004-02-27', open: 10581.55, close: 10583.92, lowest: 10519.03, highest: 10689.55, vol: 200050000 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/candle/demo2/index.vue b/src/pages/demo/charts/list/candle/demo2/index.vue
new file mode 100644
index 00000000..436938e0
--- /dev/null
+++ b/src/pages/demo/charts/list/candle/demo2/index.vue
@@ -0,0 +1,81 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">显示 MA VOL</template>
+    <div class="inner">
+      <ve-candle :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-candle>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      showMA: true,
+      showVol: true
+    }
+    return {
+      chartData: {
+        columns: ['日期', 'open', 'close', 'lowest', 'highest', 'vol'],
+        rows: [
+          { '日期': '2004-01-05', open: 10411.85, close: 10544.07, lowest: 10411.85, highest: 10575.92, vol: 221290000 },
+          { '日期': '2004-01-06', open: 10543.85, close: 10538.66, lowest: 10454.37, highest: 10584.07, vol: 191460000 },
+          { '日期': '2004-01-07', open: 10535.46, close: 10529.03, lowest: 10432.12, highest: 10587.55, vol: 225490000 },
+          { '日期': '2004-01-08', open: 10530.07, close: 10592.44, lowest: 10480.59, highest: 10651.99, vol: 237770000 },
+          { '日期': '2004-01-09', open: 10589.25, close: 10458.89, lowest: 10420.52, highest: 10603.48, vol: 223250000 },
+          { '日期': '2004-01-12', open: 10461.55, close: 10485.18, lowest: 10389.85, highest: 10543.03, vol: 197960000 },
+          { '日期': '2004-01-13', open: 10485.18, close: 10427.18, lowest: 10341.19, highest: 10539.25, vol: 197310000 },
+          { '日期': '2004-01-14', open: 10428.67, close: 10538.37, lowest: 10426.89, highest: 10573.85, vol: 186280000 },
+          { '日期': '2004-01-15', open: 10534.52, close: 10553.85, lowest: 10454.52, highest: 10639.03, vol: 260090000 },
+          { '日期': '2004-01-16', open: 10556.37, close: 10600.51, lowest: 10503.71, highest: 10666.88, vol: 254170000 },
+          { '日期': '2004-01-20', open: 10601.42, close: 10528.66, lowest: 10447.92, highest: 10676.96, vol: 224300000 },
+          { '日期': '2004-01-21', open: 10522.77, close: 10623.62, lowest: 10453.11, highest: 10665.72, vol: 214920000 },
+          { '日期': '2004-01-22', open: 10624.22, close: 10623.18, lowest: 10545.03, highest: 10717.41, vol: 219720000 },
+          { '日期': '2004-01-23', open: 10625.25, close: 10568.29, lowest: 10490.14, highest: 10691.77, vol: 234260000 },
+          { '日期': '2004-01-26', open: 10568.12, close: 10702.51, lowest: 10510.44, highest: 10725.18, vol: 186170000 },
+          { '日期': '2004-01-27', open: 10701.11, close: 10609.92, lowest: 10579.33, highest: 10748.81, vol: 206560000 },
+          { '日期': '2004-01-28', open: 10610.07, close: 10468.37, lowest: 10412.44, highest: 10703.25, vol: 247660000 },
+          { '日期': '2004-01-29', open: 10467.41, close: 10510.29, lowest: 10369.92, highest: 10611.56, vol: 273970000 },
+          { '日期': '2004-01-30', open: 10510.22, close: 10488.07, lowest: 10385.56, highest: 10551.03, vol: 208990000 },
+          { '日期': '2004-02-02', open: 10487.78, close: 10499.18, lowest: 10395.55, highest: 10614.44, vol: 224800000 },
+          { '日期': '2004-02-03', open: 10499.48, close: 10505.18, lowest: 10414.15, highest: 10571.48, vol: 183810000 },
+          { '日期': '2004-02-04', open: 10503.11, close: 10470.74, lowest: 10394.81, highest: 10567.85, vol: 227760000 },
+          { '日期': '2004-02-05', open: 10469.33, close: 10495.55, lowest: 10399.92, highest: 10566.37, vol: 187810000 },
+          { '日期': '2004-02-06', open: 10494.89, close: 10593.03, lowest: 10433.74, highest: 10634.81, vol: 182880000 },
+          { '日期': '2004-02-09', open: 10592.41, close: 10579.03, lowest: 10433.72, highest: 10634.81, vol: 160720000 },
+          { '日期': '2004-02-10', open: 10578.74, close: 10613.85, lowest: 10511.18, highest: 10667.03, vol: 160590000 },
+          { '日期': '2004-02-11', open: 10605.48, close: 10737.72, lowest: 10561.55, highest: 10779.41, vol: 277850000 },
+          { '日期': '2004-02-12', open: 10735.18, close: 10694.07, lowest: 10636.44, highest: 10775.03, vol: 197560000 },
+          { '日期': '2004-02-13', open: 10696.22, close: 10627.85, lowest: 10578.66, highest: 10755.47, vol: 208340000 },
+          { '日期': '2004-02-17', open: 10628.88, close: 10714.88, lowest: 10628.88, highest: 10762.07, vol: 169730000 },
+          { '日期': '2004-02-18', open: 10706.68, close: 10671.99, lowest: 10623.62, highest: 10764.36, vol: 164370000 },
+          { '日期': '2004-02-19', open: 10674.59, close: 10664.73, lowest: 10626.44, highest: 10794.95, vol: 219890000 },
+          { '日期': '2004-02-20', open: 10666.29, close: 10619.03, lowest: 10559.11, highest: 10722.77, vol: 220560000 },
+          { '日期': '2004-02-23', open: 10619.55, close: 10609.62, lowest: 10508.89, highest: 10711.84, vol: 229950000 },
+          { '日期': '2004-02-24', open: 10609.55, close: 10566.37, lowest: 10479.33, highest: 10681.41, vol: 225670000 },
+          { '日期': '2004-02-25', open: 10566.59, close: 10601.62, lowest: 10509.42, highest: 10660.73, vol: 192420000 },
+          { '日期': '2004-02-26', open: 10598.14, close: 10580.14, lowest: 10493.71, highest: 10652.96, vol: 223230000 },
+          { '日期': '2004-02-27', open: 10581.55, close: 10583.92, lowest: 10519.03, highest: 10689.55, vol: 200050000 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/candle/demo3/index.vue b/src/pages/demo/charts/list/candle/demo3/index.vue
new file mode 100644
index 00000000..b93aa503
--- /dev/null
+++ b/src/pages/demo/charts/list/candle/demo3/index.vue
@@ -0,0 +1,88 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">修改指标名和图例文字</template>
+    <div class="inner">
+      <ve-candle :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-candle>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      showMA: true,
+      showVol: true,
+      labelMap: {
+        MA5: 'ma5'
+      },
+      legendName: {
+        '日K': 'day k'
+      },
+      showDataZoom: true
+    }
+    return {
+      chartData: {
+        columns: ['日期', 'open', 'close', 'lowest', 'highest', 'vol'],
+        rows: [
+          { '日期': '2004-01-05', open: 10411.85, close: 10544.07, lowest: 10411.85, highest: 10575.92, vol: 221290000 },
+          { '日期': '2004-01-06', open: 10543.85, close: 10538.66, lowest: 10454.37, highest: 10584.07, vol: 191460000 },
+          { '日期': '2004-01-07', open: 10535.46, close: 10529.03, lowest: 10432.12, highest: 10587.55, vol: 225490000 },
+          { '日期': '2004-01-08', open: 10530.07, close: 10592.44, lowest: 10480.59, highest: 10651.99, vol: 237770000 },
+          { '日期': '2004-01-09', open: 10589.25, close: 10458.89, lowest: 10420.52, highest: 10603.48, vol: 223250000 },
+          { '日期': '2004-01-12', open: 10461.55, close: 10485.18, lowest: 10389.85, highest: 10543.03, vol: 197960000 },
+          { '日期': '2004-01-13', open: 10485.18, close: 10427.18, lowest: 10341.19, highest: 10539.25, vol: 197310000 },
+          { '日期': '2004-01-14', open: 10428.67, close: 10538.37, lowest: 10426.89, highest: 10573.85, vol: 186280000 },
+          { '日期': '2004-01-15', open: 10534.52, close: 10553.85, lowest: 10454.52, highest: 10639.03, vol: 260090000 },
+          { '日期': '2004-01-16', open: 10556.37, close: 10600.51, lowest: 10503.71, highest: 10666.88, vol: 254170000 },
+          { '日期': '2004-01-20', open: 10601.42, close: 10528.66, lowest: 10447.92, highest: 10676.96, vol: 224300000 },
+          { '日期': '2004-01-21', open: 10522.77, close: 10623.62, lowest: 10453.11, highest: 10665.72, vol: 214920000 },
+          { '日期': '2004-01-22', open: 10624.22, close: 10623.18, lowest: 10545.03, highest: 10717.41, vol: 219720000 },
+          { '日期': '2004-01-23', open: 10625.25, close: 10568.29, lowest: 10490.14, highest: 10691.77, vol: 234260000 },
+          { '日期': '2004-01-26', open: 10568.12, close: 10702.51, lowest: 10510.44, highest: 10725.18, vol: 186170000 },
+          { '日期': '2004-01-27', open: 10701.11, close: 10609.92, lowest: 10579.33, highest: 10748.81, vol: 206560000 },
+          { '日期': '2004-01-28', open: 10610.07, close: 10468.37, lowest: 10412.44, highest: 10703.25, vol: 247660000 },
+          { '日期': '2004-01-29', open: 10467.41, close: 10510.29, lowest: 10369.92, highest: 10611.56, vol: 273970000 },
+          { '日期': '2004-01-30', open: 10510.22, close: 10488.07, lowest: 10385.56, highest: 10551.03, vol: 208990000 },
+          { '日期': '2004-02-02', open: 10487.78, close: 10499.18, lowest: 10395.55, highest: 10614.44, vol: 224800000 },
+          { '日期': '2004-02-03', open: 10499.48, close: 10505.18, lowest: 10414.15, highest: 10571.48, vol: 183810000 },
+          { '日期': '2004-02-04', open: 10503.11, close: 10470.74, lowest: 10394.81, highest: 10567.85, vol: 227760000 },
+          { '日期': '2004-02-05', open: 10469.33, close: 10495.55, lowest: 10399.92, highest: 10566.37, vol: 187810000 },
+          { '日期': '2004-02-06', open: 10494.89, close: 10593.03, lowest: 10433.74, highest: 10634.81, vol: 182880000 },
+          { '日期': '2004-02-09', open: 10592.41, close: 10579.03, lowest: 10433.72, highest: 10634.81, vol: 160720000 },
+          { '日期': '2004-02-10', open: 10578.74, close: 10613.85, lowest: 10511.18, highest: 10667.03, vol: 160590000 },
+          { '日期': '2004-02-11', open: 10605.48, close: 10737.72, lowest: 10561.55, highest: 10779.41, vol: 277850000 },
+          { '日期': '2004-02-12', open: 10735.18, close: 10694.07, lowest: 10636.44, highest: 10775.03, vol: 197560000 },
+          { '日期': '2004-02-13', open: 10696.22, close: 10627.85, lowest: 10578.66, highest: 10755.47, vol: 208340000 },
+          { '日期': '2004-02-17', open: 10628.88, close: 10714.88, lowest: 10628.88, highest: 10762.07, vol: 169730000 },
+          { '日期': '2004-02-18', open: 10706.68, close: 10671.99, lowest: 10623.62, highest: 10764.36, vol: 164370000 },
+          { '日期': '2004-02-19', open: 10674.59, close: 10664.73, lowest: 10626.44, highest: 10794.95, vol: 219890000 },
+          { '日期': '2004-02-20', open: 10666.29, close: 10619.03, lowest: 10559.11, highest: 10722.77, vol: 220560000 },
+          { '日期': '2004-02-23', open: 10619.55, close: 10609.62, lowest: 10508.89, highest: 10711.84, vol: 229950000 },
+          { '日期': '2004-02-24', open: 10609.55, close: 10566.37, lowest: 10479.33, highest: 10681.41, vol: 225670000 },
+          { '日期': '2004-02-25', open: 10566.59, close: 10601.62, lowest: 10509.42, highest: 10660.73, vol: 192420000 },
+          { '日期': '2004-02-26', open: 10598.14, close: 10580.14, lowest: 10493.71, highest: 10652.96, vol: 223230000 },
+          { '日期': '2004-02-27', open: 10581.55, close: 10583.92, lowest: 10519.03, highest: 10689.55, vol: 200050000 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/funnel/demo1/index.vue b/src/pages/demo/charts/list/funnel/demo1/index.vue
new file mode 100644
index 00000000..aba329a3
--- /dev/null
+++ b/src/pages/demo/charts/list/funnel/demo1/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-funnel :data="chartData" v-bind="pubSetting"></ve-funnel>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['状态', '数值'],
+        rows: [
+          { '状态': '展示', '数值': 900 },
+          { '状态': '访问', '数值': 600 },
+          { '状态': '点击', '数值': 300 },
+          { '状态': '订单', '数值': 100 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/funnel/demo2/index.vue b/src/pages/demo/charts/list/funnel/demo2/index.vue
new file mode 100644
index 00000000..84d650c8
--- /dev/null
+++ b/src/pages/demo/charts/list/funnel/demo2/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">金字塔</template>
+    <div class="inner">
+      <ve-funnel :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-funnel>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      ascending: true
+    }
+    return {
+      chartData: {
+        columns: ['状态', '数值'],
+        rows: [
+          { '状态': '展示', '数值': 900 },
+          { '状态': '访问', '数值': 600 },
+          { '状态': '点击', '数值': 300 },
+          { '状态': '订单', '数值': 100 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/gauge/demo1/index.vue b/src/pages/demo/charts/list/gauge/demo1/index.vue
new file mode 100644
index 00000000..befe7ea5
--- /dev/null
+++ b/src/pages/demo/charts/list/gauge/demo1/index.vue
@@ -0,0 +1,40 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-gauge :data="chartData" v-bind="pubSetting"></ve-gauge>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['type', 'a', 'b', 'value'],
+        rows: [
+          { type: '速度', value: 80, a: 1, b: 2 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/heatmap/demo1/index.vue b/src/pages/demo/charts/list/heatmap/demo1/index.vue
new file mode 100644
index 00000000..c6d8965a
--- /dev/null
+++ b/src/pages/demo/charts/list/heatmap/demo1/index.vue
@@ -0,0 +1,49 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-heatmap :data="chartData" v-bind="pubSetting"></ve-heatmap>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['时间', '地点', '人数'],
+        rows: [
+          { '时间': '星期一', '地点': '北京', '人数': 1000 },
+          { '时间': '星期二', '地点': '上海', '人数': 400 },
+          { '时间': '星期三', '地点': '杭州', '人数': 800 },
+          { '时间': '星期二', '地点': '深圳', '人数': 200 },
+          { '时间': '星期三', '地点': '长春', '人数': 100 },
+          { '时间': '星期五', '地点': '南京', '人数': 300 },
+          { '时间': '星期四', '地点': '江苏', '人数': 800 },
+          { '时间': '星期一', '地点': '北京', '人数': 700 },
+          { '时间': '星期三', '地点': '上海', '人数': 300 },
+          { '时间': '星期二', '地点': '杭州', '人数': 500 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/heatmap/demo2/index.vue b/src/pages/demo/charts/list/heatmap/demo2/index.vue
new file mode 100644
index 00000000..3d963c5d
--- /dev/null
+++ b/src/pages/demo/charts/list/heatmap/demo2/index.vue
@@ -0,0 +1,69 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">地图热力图</template>
+    <div class="inner">
+      <ve-heatmap :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-heatmap>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      position: 'china',
+      type: 'map',
+      geo: {
+        label: {
+          emphasis: {
+            show: false
+          }
+        },
+        itemStyle: {
+          normal: {
+            areaColor: '#323c48',
+            borderColor: '#111'
+          },
+          emphasis: {
+            areaColor: '#2a333d'
+          }
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['lat', 'lng', '人数'],
+        rows: [
+          { 'lat': 115.892151, 'lng': 28.676493, '人数': 1000 },
+          { 'lat': 117.000923, 'lng': 36.675807, '人数': 400 },
+          { 'lat': 113.665412, 'lng': 34.757975, '人数': 800 },
+          { 'lat': 114.298572, 'lng': 30.584355, '人数': 200 },
+          { 'lat': 112.982279, 'lng': 28.19409, '人数': 100 },
+          { 'lat': 113.280637, 'lng': 23.125178, '人数': 300 },
+          { 'lat': 110.33119, 'lng': 20.031971, '人数': 800 },
+          { 'lat': 104.065735, 'lng': 30.659462, '人数': 700 },
+          { 'lat': 108.948024, 'lng': 34.263161, '人数': 300 },
+          { 'lat': 103.823557, 'lng': 36.058039, '人数': 500 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/map/demo1/index.vue b/src/pages/demo/charts/list/map/demo1/index.vue
new file mode 100644
index 00000000..2ec65090
--- /dev/null
+++ b/src/pages/demo/charts/list/map/demo1/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-map :data="chartData" v-bind="pubSetting"></ve-map>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['位置', '税收', '人口', '面积'],
+        rows: [
+          { '位置': '吉林', '税收': 123, '人口': 123, '面积': 92134 },
+          { '位置': '北京', '税收': 1223, '人口': 2123, '面积': 29234 },
+          { '位置': '上海', '税收': 2123, '人口': 1243, '面积': 94234 },
+          { '位置': '浙江', '税收': 4123, '人口': 5123, '面积': 29234 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/map/demo2/index.vue b/src/pages/demo/charts/list/map/demo2/index.vue
new file mode 100644
index 00000000..2beb0737
--- /dev/null
+++ b/src/pages/demo/charts/list/map/demo2/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">设置城市</template>
+    <div class="inner">
+      <ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      position: 'province/beijing'
+    }
+    return {
+      chartData: {
+        columns: ['位置', '人口'],
+        rows: [
+          { '位置': '延庆区', '人口': 123 },
+          { '位置': '密云区', '人口': 1223 },
+          { '位置': '平谷区', '人口': 2123 },
+          { '位置': '海淀区', '人口': 4123 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/map/demo3/index.vue b/src/pages/demo/charts/list/map/demo3/index.vue
new file mode 100644
index 00000000..af1b741d
--- /dev/null
+++ b/src/pages/demo/charts/list/map/demo3/index.vue
@@ -0,0 +1,53 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">设置样式</template>
+    <div class="inner">
+      <ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      position: 'china',
+      label: false,
+      itemStyle: {
+        normal: {
+          borderColor: '#00f'
+        }
+      },
+      zoom: 1.2
+    }
+    return {
+      chartData: {
+        columns: ['位置', '人口'],
+        rows: [
+          { '位置': '吉林', ' 人口': 123 },
+          { '位置': '北京', ' 人口': 1223 },
+          { '位置': '上海', ' 人口': 2123 },
+          { '位置': '浙江', ' 人口': 4123 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/radar/demo1/index.vue b/src/pages/demo/charts/list/radar/demo1/index.vue
new file mode 100644
index 00000000..c014c41a
--- /dev/null
+++ b/src/pages/demo/charts/list/radar/demo1/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-radar :data="chartData" v-bind="pubSetting"></ve-radar>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/sankey/demo1/index.vue b/src/pages/demo/charts/list/sankey/demo1/index.vue
new file mode 100644
index 00000000..cce4bcd2
--- /dev/null
+++ b/src/pages/demo/charts/list/sankey/demo1/index.vue
@@ -0,0 +1,56 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-sankey :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-sankey>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      links: [
+        { source: '首页', target: '列表页a', value: 0.5 },
+        { source: '首页', target: '列表页b', value: 0.5 },
+        { source: '列表页a', target: '内容页a-1', value: 0.1 },
+        { source: '列表页a', target: '内容页a-2', value: 0.4 },
+        { source: '列表页b', target: '内容页b-1', value: 0.2 },
+        { source: '列表页b', target: '内容页b-2', value: 0.3 }
+      ]
+    }
+    return {
+      chartData: {
+        columns: ['页面', '访问量'],
+        rows: [
+          { '页面': '首页', '访问量': 100000 },
+          { '页面': '列表页a', '访问量': 20000 },
+          { '页面': '列表页b', '访问量': 80000 },
+          { '页面': '内容页a-1', '访问量': 10000 },
+          { '页面': '内容页a-2', '访问量': 10000 },
+          { '页面': '内容页b-1', '访问量': 60000 },
+          { '页面': '内容页b-2', '访问量': 20000 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/scatter/demo1/index.vue b/src/pages/demo/charts/list/scatter/demo1/index.vue
new file mode 100644
index 00000000..2d0d56a0
--- /dev/null
+++ b/src/pages/demo/charts/list/scatter/demo1/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">单维度多指标</template>
+    <div class="inner">
+      <ve-scatter :data="chartData" v-bind="pubSetting"></ve-scatter>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '年龄'],
+        rows: [
+          { '日期': '1/1', '访问用户': 123, '年龄': 3, '下单用户': 1244 },
+          { '日期': '1/2', '访问用户': 1223, '年龄': 6, '下单用户': 2344 },
+          { '日期': '1/3', '访问用户': 7123, '年龄': 9, '下单用户': 3245 },
+          { '日期': '1/4', '访问用户': 4123, '年龄': 12, '下单用户': 4355 },
+          { '日期': '1/5', '访问用户': 3123, '年龄': 15, '下单用户': 4564 },
+          { '日期': '1/6', '访问用户': 2323, '年龄': 20, '下单用户': 6537 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/scatter/demo2/index.vue b/src/pages/demo/charts/list/scatter/demo2/index.vue
new file mode 100644
index 00000000..043fb646
--- /dev/null
+++ b/src/pages/demo/charts/list/scatter/demo2/index.vue
@@ -0,0 +1,63 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">双维度多指标</template>
+    <div class="inner">
+      <ve-scatter :data="chartData" v-bind="pubSetting"></ve-scatter>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '年龄'],
+        rows: {
+          '上海': [
+            { '日期': '1/1', '访问用户': 123, '年龄': 3, '下单用户': 1244 },
+            { '日期': '1/2', '访问用户': 1223, '年龄': 6, '下单用户': 2344 },
+            { '日期': '1/3', '访问用户': 7123, '年龄': 9, '下单用户': 3245 },
+            { '日期': '1/4', '访问用户': 4123, '年龄': 12, '下单用户': 4355 },
+            { '日期': '1/5', '访问用户': 3123, '年龄': 15, '下单用户': 4564 },
+            { '日期': '1/6', '访问用户': 2323, '年龄': 20, '下单用户': 6537 }
+          ],
+          '北京': [
+            { '日期': '1/1', '访问用户': 123, '年龄': 3, '下单用户': 1244 },
+            { '日期': '1/2', '访问用户': 1273, '年龄': 6, '下单用户': 2344 },
+            { '日期': '1/3', '访问用户': 3123, '年龄': 15, '下单用户': 4564 },
+            { '日期': '1/4', '访问用户': 2123, '年龄': 9, '下单用户': 3245 },
+            { '日期': '1/5', '访问用户': 4103, '年龄': 12, '下单用户': 4355 },
+            { '日期': '1/6', '访问用户': 7123, '年龄': 10, '下单用户': 3567 }
+          ],
+          '广州': [
+            { '日期': '1/1', '访问用户': 123, '年龄': 3, '下单用户': 1244 },
+            { '日期': '1/2', '访问用户': 1223, '年龄': 6, '下单用户': 2344 },
+            { '日期': '1/3', '访问用户': 2123, '年龄': 30, '下单用户': 3245 },
+            { '日期': '1/5', '访问用户': 4123, '年龄': 12, '下单用户': 4355 },
+            { '日期': '1/4', '访问用户': 5123, '年龄': 18, '下单用户': 4564 },
+            { '日期': '1/6', '访问用户': 3843, '年龄': 30, '下单用户': 4850 }
+          ]
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/tree/demo1/index.vue b/src/pages/demo/charts/list/tree/demo1/index.vue
new file mode 100644
index 00000000..6da59bcb
--- /dev/null
+++ b/src/pages/demo/charts/list/tree/demo1/index.vue
@@ -0,0 +1,126 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">径向树图</template>
+    <div class="inner">
+      <ve-tree :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-tree>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      seriesMap: {
+        tree1: {
+          layout: 'radial'
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['name', 'value'],
+        rows: [
+          {
+            name: 'tree1',
+            value: [
+              {
+                name: 'f',
+                value: 1,
+                link: 'https://ele.me',
+                children: [
+                  {
+                    name: 'a',
+                    value: 1,
+                    link: 'https://ele.me',
+                    children: [
+                      {
+                        name: 'a-a',
+                        link: 'https://ele.me',
+                        value: 2
+                      },
+                      {
+                        name: 'a-b',
+                        link: 'https://ele.me',
+                        value: 2
+                      }
+                    ]
+                  },
+                  {
+                    name: 'b',
+                    value: 1,
+                    link: 'https://ele.me',
+                    children: [
+                      {
+                        name: 'b-a',
+                        link: 'https://ele.me',
+                        value: 2
+                      },
+                      {
+                        name: 'b-b',
+                        link: 'https://ele.me',
+                        value: 2
+                      }
+                    ]
+                  },
+                  {
+                    name: 'c',
+                    value: 3,
+                    link: 'https://ele.me',
+                    children: [
+                      {
+                        name: 'c-a',
+                        link: 'https://ele.me',
+                        value: 4
+                      },
+                      {
+                        name: 'c-b',
+                        link: 'https://ele.me',
+                        value: 2
+                      }
+                    ]
+                  },
+                  {
+                    name: 'd',
+                    value: 3,
+                    link: 'https://ele.me',
+                    children: [
+                      {
+                        name: 'd-a',
+                        link: 'https://ele.me',
+                        value: 4
+                      },
+                      {
+                        name: 'd-b',
+                        link: 'https://ele.me',
+                        value: 2
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/waterfall/demo1/index.vue b/src/pages/demo/charts/list/waterfall/demo1/index.vue
new file mode 100644
index 00000000..51ed42e0
--- /dev/null
+++ b/src/pages/demo/charts/list/waterfall/demo1/index.vue
@@ -0,0 +1,42 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">一般</template>
+    <div class="inner">
+      <ve-waterfall :data="chartData" v-bind="pubSetting"></ve-waterfall>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['活动', '时间'],
+        rows: [
+          { '活动': '吃饭', '时间': 4 },
+          { '活动': '睡觉', '时间': 10 },
+          { '活动': '打豆豆', '时间': 5 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 1ac5e80a..1164342e 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-a83598d185531f4f568ff58da2a51ad426f050e4
\ No newline at end of file
+6d5004ccfe9ca9fae43eba1bde2d376cb9d5b4fe
\ No newline at end of file

From 9c8213585fcd675f8ca805109d41c2af449d8852 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:27:17 +0800
Subject: [PATCH 113/128] no message

Former-commit-id: bb27f8e9df3a7b35a587d981add79d4fad923f6a [formerly bb27f8e9df3a7b35a587d981add79d4fad923f6a [formerly bb27f8e9df3a7b35a587d981add79d4fad923f6a [formerly bb27f8e9df3a7b35a587d981add79d4fad923f6a [formerly e6ef617b8c826081009caaab34fb3bf51c13c109 [formerly 6967710a5bce6fc0a1246a7606b8bf825f0264ff]]]]]
Former-commit-id: 3aeebbe98fa9d23bea2c6f87a1c14daff986f709
Former-commit-id: 5ec7e9a1c7ed5ecdaa0c3634581d4999302a0738
Former-commit-id: e6c2dfbfc097ea30cd85f4edb41ccfc1c393a07b [formerly 0e00e4a62566382fd0cc72aa9877cf338084d991]
Former-commit-id: 2034a9331a30c8fc40b4b76a2b4afde4937be198
Former-commit-id: ed88dbbd2ea11bf078560c86973ea8dfccb1ad8b
Former-commit-id: 08f086ca70d4331dec1e7ded7fa4159eec161419
Former-commit-id: 01a470f2c62a8c1ec3591d3660d8192c239d897e
Former-commit-id: e65b9e3d7659e1c7d8aba1a7f0fb24d5a0205440
---
 src/pages/demo/charts/list/map/demo1/index.vue | 5 +++--
 src/pages/demo/charts/list/map/demo2/index.vue | 5 +++--
 src/pages/demo/charts/list/map/demo3/index.vue | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/demo/charts/list/map/demo1/index.vue b/src/pages/demo/charts/list/map/demo1/index.vue
index 2ec65090..dcf13147 100644
--- a/src/pages/demo/charts/list/map/demo1/index.vue
+++ b/src/pages/demo/charts/list/map/demo1/index.vue
@@ -1,9 +1,10 @@
 <template>
   <d2-container type="full">
     <template slot="header">一般</template>
-    <div class="inner">
+    <!-- <div class="inner">
       <ve-map :data="chartData" v-bind="pubSetting"></ve-map>
-    </div>
+    </div> -->
+    大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示
     <template slot="footer">
       <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
     </template>
diff --git a/src/pages/demo/charts/list/map/demo2/index.vue b/src/pages/demo/charts/list/map/demo2/index.vue
index 2beb0737..efba9f19 100644
--- a/src/pages/demo/charts/list/map/demo2/index.vue
+++ b/src/pages/demo/charts/list/map/demo2/index.vue
@@ -1,9 +1,10 @@
 <template>
   <d2-container type="full">
     <template slot="header">设置城市</template>
-    <div class="inner">
+    <!-- <div class="inner">
       <ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
-    </div>
+    </div> -->
+    大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示
     <template slot="footer">
       <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
     </template>
diff --git a/src/pages/demo/charts/list/map/demo3/index.vue b/src/pages/demo/charts/list/map/demo3/index.vue
index af1b741d..f62a6864 100644
--- a/src/pages/demo/charts/list/map/demo3/index.vue
+++ b/src/pages/demo/charts/list/map/demo3/index.vue
@@ -1,9 +1,10 @@
 <template>
   <d2-container type="full">
     <template slot="header">设置样式</template>
-    <div class="inner">
+    <!-- <div class="inner">
       <ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
-    </div>
+    </div> -->
+    <!-- 大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示 -->
     <template slot="footer">
       <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
     </template>

From 0339307b071a5865df5deafd46105b44fa01ea7f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:30:16 +0800
Subject: [PATCH 114/128] no message

Former-commit-id: c605856731453124889ae981f8ba9c5a4e7e008c [formerly cdc4f60924ff4e06fe1e64ab5fbdd4d39017134a] [formerly c605856731453124889ae981f8ba9c5a4e7e008c [formerly cdc4f60924ff4e06fe1e64ab5fbdd4d39017134a] [formerly c605856731453124889ae981f8ba9c5a4e7e008c [formerly cdc4f60924ff4e06fe1e64ab5fbdd4d39017134a] [formerly cdc4f60924ff4e06fe1e64ab5fbdd4d39017134a [formerly c8c5155125e1552537b91452929a06b931517e96 [formerly c2e7a44b103fbbccea54010294e7e236af699686]]]]]
Former-commit-id: 62ade090fc1eae0d96d054c92f248dba1fe9e3c0
Former-commit-id: a4bcf763f264b1f960550247ec732cef0652aae7
Former-commit-id: 44358c29ad3ab7d5fd8a3008031622800adbc28a [formerly 27357f894873a4ab8cb56d6b01d7e2cdbdb6e1ef]
Former-commit-id: 6a22bc96fbf23fc24c01e2bb183d9ebaeef7f058
Former-commit-id: 1a4d8a69da895b1efb4bba9e2f1a86631de08390
Former-commit-id: 131348180d463976e841e8a7be2c79e36b688aa9
Former-commit-id: e9f9dea91462157806a1de9f228c4c4645d7c4e1
Former-commit-id: aef76ba28e952b34dd2237df1ea08f621646c2c2
---
 docs/zh/guide/change-log.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 2aae1b5c..4de45f17 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -16,6 +16,8 @@
 * [ 新增 ] `d2-container` 隐形模式支持 header 插槽
 * [ 新增 ] 版本检查可以设置为不显示提示框
 * [ 新增 ] 集成 json 查看组件
+* [ 新增 ] 添加了所有图表种类的演示页面
+* [ 修改 ] 修改布局方式，解决了在 Firefox 上 better-scroll 初始化拿不到正确高度的 bug
 
 ## v1.1.3
 

From 6ff914fd42a11864c1004fdb92481ee486738cf9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:33:30 +0800
Subject: [PATCH 115/128] no message

Former-commit-id: a22b2390a5972390d882536130f22bad01fd1a88 [formerly a22b2390a5972390d882536130f22bad01fd1a88 [formerly a22b2390a5972390d882536130f22bad01fd1a88 [formerly a22b2390a5972390d882536130f22bad01fd1a88 [formerly 8cce48548aa6c9c1d61b7db0675271532bafc53d [formerly 786aebc8003c8490b04863c23b6c30c97985ea26]]]]]
Former-commit-id: fb0b9c360ffcc17f8bc711698abdf733eeae4a18
Former-commit-id: 1f223114c1a83a8312c29f68ede1eb8ca6cb01f2
Former-commit-id: 46740e01087534d24ba49ef064f347040225bb30 [formerly 83675948b4292d4a59e6a44d89fd8dd2eb0a9cb9]
Former-commit-id: ddf49cf7ec33c02d6266bc113d6e3046ac766a95
Former-commit-id: ba551afe3f7f02874d47a4c03e2b193a2f917106
Former-commit-id: 2e935780fe776ee6b2f4267f177751fc18f6bf04
Former-commit-id: c4312483e0ad931044791afe891bba2e0f7959f9
Former-commit-id: a17dae6f7e5c583641d8d7a5d90cbf9c147264a6
---
 src/assets/style/theme/theme-base.scss        | 28 +++++++++++++++++++
 .../components/d2-container-full-bs.vue       | 26 -----------------
 .../components/d2-container-full.vue          | 26 -----------------
 src/components/core/d2-container/index.vue    |  8 ------
 4 files changed, 28 insertions(+), 60 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 6226317d..e82bf601 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -256,6 +256,34 @@
         .d2-theme-container-main-body {
           // 布局组件
           .container-component {
+            position: absolute;
+            top: 0px;
+            bottom: 0px;
+            left: 0px;
+            right: 0px;
+            overflow: hidden;
+            .d2-container-full {
+              position: absolute;
+              top: 0px;
+              right: 20px;
+              bottom: 0px;
+              left: 0px;
+              display: flex;
+              flex-direction: column;
+              overflow: hidden;
+              .d2-container-full__header {
+                padding: 20px;
+              }
+              .d2-container-full__body {
+                flex-grow: 1;
+                padding: 0px 20px;
+                overflow: hidden;
+                position: relative;
+              }
+              .d2-container-full__footer {
+                padding: 20px;
+              }
+            }
             // 卡片布局组件
             .d2-container-card {
               border-top-left-radius: 0px;
diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
index ee1235b1..c40c62bc 100644
--- a/src/components/core/d2-container/components/d2-container-full-bs.vue
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -49,29 +49,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-// [组件] d2-container-full
-.d2-container-full {
-  position: absolute;
-  top: 0px;
-  right: 20px;
-  bottom: 0px;
-  left: 0px;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  .d2-container-full__header {
-    padding: 20px;
-  }
-  .d2-container-full__body {
-    flex-grow: 1;
-    padding: 0px 20px;
-    overflow: hidden;
-    position: relative;
-  }
-  .d2-container-full__footer {
-    padding: 20px;
-  }
-}
-</style>
diff --git a/src/components/core/d2-container/components/d2-container-full.vue b/src/components/core/d2-container/components/d2-container-full.vue
index 2311589d..e789a244 100644
--- a/src/components/core/d2-container/components/d2-container-full.vue
+++ b/src/components/core/d2-container/components/d2-container-full.vue
@@ -17,29 +17,3 @@ export default {
   name: 'd2-container-full'
 }
 </script>
-
-<style lang="scss" scoped>
-// [组件] d2-container-full
-.d2-container-full {
-  position: absolute;
-  top: 0px;
-  right: 20px;
-  bottom: 0px;
-  left: 0px;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  .d2-container-full__header {
-    padding: 20px;
-  }
-  .d2-container-full__body {
-    flex-grow: 1;
-    padding: 20px;
-    overflow: auto;
-    position: relative;
-  }
-  .d2-container-full__footer {
-    padding: 20px;
-  }
-}
-</style>
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index fe566049..0d6922ae 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -95,14 +95,6 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
-.container-component {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
-}
 @media (min-width: 576px) {
   // 根据你的需要在这里添加样式
 }

From 5633c034907ea7cd12c19aebe9e79d0541743a10 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:38:55 +0800
Subject: [PATCH 116/128] no message

Former-commit-id: 9453d5f2aec357104f056dba6f47ef1b8f29f572 [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e] [formerly 9453d5f2aec357104f056dba6f47ef1b8f29f572 [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e] [formerly 9453d5f2aec357104f056dba6f47ef1b8f29f572 [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e] [formerly d9e824592155ed8d18f26cfa0b22079faf7c5b1e [formerly f181fac0f6e6d14e2f2ab53d081cb8771ec22a74 [formerly efa2861264c4a7ba2f9479dc9dfe439211570c3d]]]]]
Former-commit-id: a5eb299ad9a63bb41d13d00e6c115c05f93456de
Former-commit-id: 13e2931de82d9632571d29b7373f7e3eb73cbb89
Former-commit-id: 0feda7b58c86749acf39aea9143b6dc839344b6f [formerly bf194142fcfa5475ad71167cd5c6f6853b1aceb0]
Former-commit-id: 11e1c8af7eefe11a82a7e7fe46f548b83af8fa2a
Former-commit-id: 2682716f9983411625913f6fb042ca854e67fd32
Former-commit-id: fc65c1e1e36f2fb1ec058ea5c4ab1730b942561d
Former-commit-id: 35511812c19b71fbed5e3be31c5753a022c6194a
Former-commit-id: 5c7ef7d715b06c67df5e49b61e1eed21d194bb39
---
 src/assets/style/theme/theme-base.scss        | 26 ++++++++++++++++++-
 src/assets/style/theme/theme.scss             | 18 +++++++++++++
 .../components/d2-container-full-bs.vue       | 10 +++----
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index e82bf601..c8fe7be1 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -262,6 +262,7 @@
             left: 0px;
             right: 0px;
             overflow: hidden;
+            // 填充式布局组件
             .d2-container-full {
               position: absolute;
               top: 0px;
@@ -277,13 +278,36 @@
               .d2-container-full__body {
                 flex-grow: 1;
                 padding: 0px 20px;
-                overflow: hidden;
+                overflow: auto;
                 position: relative;
               }
               .d2-container-full__footer {
                 padding: 20px;
               }
             }
+            // 填充式布局组件 - 滚动优化
+            .d2-container-full-bs {
+              position: absolute;
+              top: 0px;
+              right: 20px;
+              bottom: 0px;
+              left: 0px;
+              display: flex;
+              flex-direction: column;
+              overflow: hidden;
+              .d2-container-full-bs__header {
+                padding: 20px;
+              }
+              .d2-container-full-bs__body {
+                flex-grow: 1;
+                padding: 0px 20px;
+                overflow: hidden;
+                position: relative;
+              }
+              .d2-container-full-bs__footer {
+                padding: 20px;
+              }
+            }
             // 卡片布局组件
             .d2-container-card {
               border-top-left-radius: 0px;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 6677f9fa..b01c49f1 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -268,6 +268,24 @@
             }
           }
           // [组件]
+          // d2-container-full-bs 填充型 滚动优化
+          .d2-container-full-bs {
+            border: $theme-container-border-outer;
+            border-top: none;
+            border-bottom: none;
+            .d2-container-full-bs__header {
+              border-bottom: $theme-container-border-inner;
+              background: $theme-container-header-footer-background-color;
+            }
+            .d2-container-full-bs__body {
+              background: $theme-container-background-color;
+            }
+            .d2-container-full-bs__footer {
+              border-top: $theme-container-border-inner;
+              background: $theme-container-header-footer-background-color;
+            }
+          }
+          // [组件]
           // d2-container-card 卡片型
           .d2-container-card {
             border: $theme-container-border-outer;
diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
index c40c62bc..f54c6e7f 100644
--- a/src/components/core/d2-container/components/d2-container-full-bs.vue
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -1,14 +1,14 @@
 <template>
-  <div class="d2-container-full">
-    <div v-if="$slots.header" class="d2-container-full__header" ref="header">
+  <div class="d2-container-full-bs">
+    <div v-if="$slots.header" class="d2-container-full-bs__header" ref="header">
       <slot name="header"/>
     </div>
-    <div class="d2-container-full__body" ref="wrapper">
+    <div class="d2-container-full-bs__body" ref="wrapper">
       <div style="padding: 20px 0px;">
         <slot/>
       </div>
     </div>
-    <div v-if="$slots.footer" class="d2-container-full__footer" ref="footer">
+    <div v-if="$slots.footer" class="d2-container-full-bs__footer" ref="footer">
       <slot name="footer"/>
     </div>
   </div>
@@ -19,7 +19,7 @@
 import BScroll from 'better-scroll'
 
 export default {
-  name: 'd2-container-full',
+  name: 'd2-container-full-bs',
   data () {
     return {
       BS: null

From eab54ec181d979ad4226dd605a16bd0c44b7c43d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:50:55 +0800
Subject: [PATCH 117/128] no message

Former-commit-id: c4b695bee4d14d76c1eee6d8d39e7ad46bec6fdd [formerly ba067ceb27b77d14c17243882eb59b79dbd051aa] [formerly c4b695bee4d14d76c1eee6d8d39e7ad46bec6fdd [formerly ba067ceb27b77d14c17243882eb59b79dbd051aa] [formerly c4b695bee4d14d76c1eee6d8d39e7ad46bec6fdd [formerly ba067ceb27b77d14c17243882eb59b79dbd051aa] [formerly ba067ceb27b77d14c17243882eb59b79dbd051aa [formerly c5efeaf7222d74c0ee834483f7bcf6574b5cf139 [formerly c979e40983ad9bb4da9db7d22925b0b78339913b]]]]]
Former-commit-id: 3f107f780ea2fb3af01869eddfcd4ff86676e430
Former-commit-id: ab50a694f24d3ee749ab7d2b7e84893a5856bfd8
Former-commit-id: 1da893e24daa7d7683ca87b2b26ed1613e6e7f0d [formerly e5d2eb1f9f8dfa039f1472679923214573fc35ad]
Former-commit-id: 0026d03c6a9d49596e74d032650567edaeb9c15d
Former-commit-id: 307a442d6578126eb7d76ca91400039d15c9a117
Former-commit-id: 31c7d28427e8c646db469a5082b6ca96230bbfbb
Former-commit-id: 60cfe2551fc6d12838c62725e621949659607563
Former-commit-id: bced963931b2cb0b65d3261992f00c9d24822702
---
 src/assets/style/theme/theme-base.scss    | 2 +-
 src/pages/demo/components/layout/grid.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index c8fe7be1..e5d62ae5 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -277,7 +277,7 @@
               }
               .d2-container-full__body {
                 flex-grow: 1;
-                padding: 0px 20px;
+                padding: 20px 20px;
                 overflow: auto;
                 position: relative;
               }
diff --git a/src/pages/demo/components/layout/grid.vue b/src/pages/demo/components/layout/grid.vue
index abdb5d0c..79308e6f 100644
--- a/src/pages/demo/components/layout/grid.vue
+++ b/src/pages/demo/components/layout/grid.vue
@@ -1,5 +1,6 @@
 <template>
   <d2-container type="ghost" class="demo-layout-grid">
+    <template slot="header">网格布局</template>
     <d2-grid-layout
       v-bind="layout"
       @layout-updated="layoutUpdatedHandler">

From 07c4a4b41ed413c53b1fc47e82ccbb24392d4c0d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 14:20:20 +0800
Subject: [PATCH 118/128] no message

Former-commit-id: 89b1d200979f9d5769b1e23d6d3e31a705a8cb62 [formerly 89b1d200979f9d5769b1e23d6d3e31a705a8cb62 [formerly 89b1d200979f9d5769b1e23d6d3e31a705a8cb62 [formerly 89b1d200979f9d5769b1e23d6d3e31a705a8cb62 [formerly b8d019e634f80d8cbea119343f06b21c82e063db [formerly 4249be06b17c28c0513d0e76f0f4c08ce70fc8ec]]]]]
Former-commit-id: 48f6478acd8f27da0ffd5d66b76414323019e320
Former-commit-id: a0b6170d07813cf6bdf9251b45c663a0f082b3f5
Former-commit-id: df5cb76dcddb37d6890b20217ee5ba4a1c13c45d [formerly adfade80563bb63e5a83c94ac6c689d5cc1adf61]
Former-commit-id: e3770a6e2bbfa423e29640e51b6763c493241495
Former-commit-id: dc74b082b618ab6299fe05c3eba93de1271f1de7
Former-commit-id: a8b44f1e79a54a1e766711b7e6781b97e0955a94
Former-commit-id: a527077dd4ca19e0d87e6473df0cf8e450f48928
Former-commit-id: 308043b07342cca6c391ec344d7b0a23eeb8cecd
---
 src/menu/index.js.REMOVED.git-id       |  2 +-
 src/pages/demo/playground/db/index.vue | 32 ++++++++++++++++++++++++++
 src/router/routes.js.REMOVED.git-id    |  2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/playground/db/index.vue

diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 4d5381ac..378c39ea 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-65f20381a0a82b4a59eaab437558aecd7ebb0556
\ No newline at end of file
+2033bbd20e953d52d9c21146b8048ee1a1f8aa5b
\ No newline at end of file
diff --git a/src/pages/demo/playground/db/index.vue b/src/pages/demo/playground/db/index.vue
new file mode 100644
index 00000000..c7eaf72b
--- /dev/null
+++ b/src/pages/demo/playground/db/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <d2-container type="full" class="page">
+    <template slot="header">本地数据</template>
+    <tree-view :data="dbData" :options="options"></tree-view>
+  </d2-container>
+</template>
+
+<script>
+// 插件
+import db from '@/libs/db.js'
+
+export default {
+  data () {
+    return {
+      dbData: {},
+      options: {
+        maxDepth: 10,
+        rootObjectKey: 'db.value()',
+        modifiable: false
+      }
+    }
+  },
+  mounted () {
+    this.load()
+  },
+  methods: {
+    load () {
+      this.dbData = db.value()
+    }
+  }
+}
+</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 1164342e..04a4d750 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-6d5004ccfe9ca9fae43eba1bde2d376cb9d5b4fe
\ No newline at end of file
+2d74dce7e65ff946e5955a0914be28cbceb8989f
\ No newline at end of file

From 50e0aaedb20d0a7fc176adad18a8b076024830d2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 14:28:18 +0800
Subject: [PATCH 119/128] no message

Former-commit-id: 19ac2bf5c9fcb0c7c0a8793c26c359b3f670cfc7 [formerly 1a0e79e324b4669848d544d94269369d5262a9e3] [formerly 19ac2bf5c9fcb0c7c0a8793c26c359b3f670cfc7 [formerly 1a0e79e324b4669848d544d94269369d5262a9e3] [formerly 19ac2bf5c9fcb0c7c0a8793c26c359b3f670cfc7 [formerly 1a0e79e324b4669848d544d94269369d5262a9e3] [formerly 1a0e79e324b4669848d544d94269369d5262a9e3 [formerly e58b976ab874ea13f93e434482bca18b7a51c8b3 [formerly f102db88434e29fc2cb5a6a4e6874022bf678df1]]]]]
Former-commit-id: 89cd72bdfcc139807b85f84a56adbeef3481af7a
Former-commit-id: ce0848823b35c638e7adec1b26eb99e77b8d6ad0
Former-commit-id: 9d9c9c1006f2638d1231e2de03779ec4cc603841 [formerly a3594f8959072a8e0a6ecb43773a2612f1599997]
Former-commit-id: 4cfac561a26e74c3ba3a05ffe06c2db802bb31b4
Former-commit-id: 5cd4afb6d2f19421bc115254225d92ab5c4a4077
Former-commit-id: afb54b9abe891d3bcaa46e960f007df1e113bd6f
Former-commit-id: ad837ce4e593e415d7bd1c30914912d12fbde650
Former-commit-id: c60112de09ab1c6f14f7a013d1454f65210404ab
---
 src/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 87900b6e..4c3fed76 100755
--- a/src/main.js
+++ b/src/main.js
@@ -121,7 +121,8 @@ new Vue({
           if (route.children) {
             push(route.children)
           } else {
-            tagPool.push(route)
+            const { meta, name, path } = route
+            tagPool.push({ meta, name, path })
           }
         })
       }

From 8631b700b922632aa18440c1d9c8a0bc098923eb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 14:44:21 +0800
Subject: [PATCH 120/128] no message

Former-commit-id: 35071c1302ac5d4279e0ab4edf460cde13cd994b [formerly ba2db66a29af14ddeb5a392e4608e350b26a7bda] [formerly 35071c1302ac5d4279e0ab4edf460cde13cd994b [formerly ba2db66a29af14ddeb5a392e4608e350b26a7bda] [formerly 35071c1302ac5d4279e0ab4edf460cde13cd994b [formerly ba2db66a29af14ddeb5a392e4608e350b26a7bda] [formerly ba2db66a29af14ddeb5a392e4608e350b26a7bda [formerly b6abd1445c67c876495ebe4b6887427c78dd6786 [formerly 833dd77e38207bdf1261f968dd3a285a2d37fb1b]]]]]
Former-commit-id: c14529c311fb0dad94521300343de80f0b798532
Former-commit-id: 6db5c591b8b731e4ef0ba0efe9d687141c946335
Former-commit-id: a2ce1ab217dacb503c90fa8b08826a5b98097156 [formerly be8ad8d8282f23787eea76ad8c2f41bae694cc6d]
Former-commit-id: d6d4d6da4994e33860528dbfa454d4ccb37fce2f
Former-commit-id: 4f9870d99281a465f010544d452620be9fe6806e
Former-commit-id: 7a6ddf839d235746904d847fd700dba006678256
Former-commit-id: 02cc942928009ffff8934ae67803d972fe49aaf8
Former-commit-id: 8806f4a6673479dd51acfadc0a9e0cf4fcadb7ac
---
 src/pages/demo/playground/page-argu/get.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/demo/playground/page-argu/get.vue b/src/pages/demo/playground/page-argu/get.vue
index 69158aaf..720e99e4 100644
--- a/src/pages/demo/playground/page-argu/get.vue
+++ b/src/pages/demo/playground/page-argu/get.vue
@@ -3,6 +3,7 @@
     <h1 class="d2-mt-0">$route.params.username: {{$route.params.username}}</h1>
     <h1>$route.query.userid: {{$route.query.userid}}</h1>
     <p>你可以尝试返回发送数据页面修改数据重新发送，或者切换到其它页面后刷新浏览器再返回本业观察参数保留</p>
+    <el-button type="primary" @click="$router.push({ name: 'demo-playground-page-argu-send' })">返回发送数据的页面</el-button>
   </d2-container>
 </template>
 

From 1a8334058bd312e85d7384e499d7cbd9090d8754 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:11:52 +0800
Subject: [PATCH 121/128] no message

Former-commit-id: fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly 343afc4dcaafa419ac669d402a897531de023220 [formerly ee190663eea91b7c43fa0950ca5e599c121f227f]]]]]
Former-commit-id: b963a285c043a8f87f235b4a3d79798dc862a62e
Former-commit-id: ff681ca1d0bfd0f3487ef6f74b658e031a58db2f
Former-commit-id: ac3d0795933f1508b956b2c6a039ead7e6fb3d4a [formerly b3c5b462d69758026cef3cc29eccc1f04d454e2f]
Former-commit-id: 8a73105b1e6dee21d61cf13dd661546f13f203f2
Former-commit-id: 976f312c74cf1833ef92dd7a6c7fa36b4da6e925
Former-commit-id: 87a343d87b25969aa8bcc12665cc7e63044c8bf2
Former-commit-id: a34ef0de27cc6992af1e3c12f7ec7df6dc1618aa
Former-commit-id: 7edde307d869292feb955b4bfbf90fc03c128bd0
---
 .../core/d2-layout-main/components/-user/index.vue    | 11 ++++++++++-
 src/pages/core/login/index.vue                        |  8 ++++++++
 src/store/modules/d2admin.js.REMOVED.git-id           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-user/index.vue b/src/components/core/d2-layout-main/components/-user/index.vue
index b937e9c7..18616d3c 100644
--- a/src/components/core/d2-layout-main/components/-user/index.vue
+++ b/src/components/core/d2-layout-main/components/-user/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown class="d2-mr">
-    <span class="btn-text">你好</span>
+    <span class="btn-text">你好 {{username}}</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff"><d2-icon name="power-off"/> 注销</el-dropdown-item>
       <el-dropdown-item><d2-icon name="user-circle-o"/> 个人中心</el-dropdown-item>
@@ -9,8 +9,16 @@
 </template>
 
 <script>
+// 插件
 import Cookies from 'js-cookie'
+import { mapState } from 'vuex'
+
 export default {
+  computed: {
+    ...mapState({
+      username: state => state.d2admin.username
+    })
+  },
   methods: {
     logOff () {
       this.$confirm('注销此账户吗?', '注销', {
@@ -20,6 +28,7 @@ export default {
       }).then(() => {
         // 删除cookie
         Cookies.remove('token')
+        Cookies.remove('uuid')
         // 跳转路由
         this.$router.push({
           name: 'login'
diff --git a/src/pages/core/login/index.vue b/src/pages/core/login/index.vue
index c84b6c6b..512703e3 100644
--- a/src/pages/core/login/index.vue
+++ b/src/pages/core/login/index.vue
@@ -48,6 +48,8 @@ require('particles.js')
 // https://vincentgarreau.com/particles.js/#default
 import config from './config/default'
 import Cookies from 'js-cookie'
+import { mapMutations } from 'vuex'
+
 export default {
   data () {
     return {
@@ -74,6 +76,9 @@ export default {
     particlesJS('login', config)
   },
   methods: {
+    ...mapMutations([
+      'd2adminUsernameSet'
+    ]),
     // 提交登陆信息
     submit () {
       this.$refs.loginForm.validate((valid) => {
@@ -93,8 +98,11 @@ export default {
               const setting = {
                 expires: 1
               }
+              // 设置 cookie
               Cookies.set('uuid', res.uuid, setting)
               Cookies.set('token', res.token, setting)
+              // 设置 vuex
+              this.d2adminUsernameSet(res.name)
               // 跳转路由
               this.$router.push({
                 name: 'index'
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 1a8e9199..13527a7d 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-9cb5ae65d8c8b6c41644e115280f0d3e8ef38d33
\ No newline at end of file
+d778c730422f7b1f5003b5674b98394d12362a90
\ No newline at end of file

From 705b4d211e1870b97ac4e192ca1e49db2c00bdf0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:17:18 +0800
Subject: [PATCH 122/128] no message

Former-commit-id: 68dea21e733fc5dd0a21e337b32056716795ddc4 [formerly c5b6708b1aee61071ad8913153a586c08b0395ff] [formerly 68dea21e733fc5dd0a21e337b32056716795ddc4 [formerly c5b6708b1aee61071ad8913153a586c08b0395ff] [formerly 68dea21e733fc5dd0a21e337b32056716795ddc4 [formerly c5b6708b1aee61071ad8913153a586c08b0395ff] [formerly c5b6708b1aee61071ad8913153a586c08b0395ff [formerly 29390733e8255cea7a07a0ed0ce550f648d26592 [formerly dd0586bf4b5e003230748817542b12d504381cbe]]]]]
Former-commit-id: 254ab7cd96db4709af365df134021e62a931acfb
Former-commit-id: 1ec1ab09f8708f0e47d59586872e0a20df5581be
Former-commit-id: 40678d3ee9795976375819d03ebefe2744826b5c [formerly 1320125c368ac54c4e4ca61b76e6073050162f5a]
Former-commit-id: 4f28c58e27394826d703aabac5aa23048f5bec84
Former-commit-id: abab84242db5e055ea9ef43b27a7593939d55e66
Former-commit-id: c2ea5e61e347bcf48fab479cc46c9f22ae9fcdbe
Former-commit-id: a643cfeb468deb1628965a5a047e71ad933129c4
Former-commit-id: 706b40e1f252d5b0332158e8852e702800f732e3
---
 src/libs/db.js                              | 3 ++-
 src/main.js                                 | 2 ++
 src/store/modules/d2admin.js.REMOVED.git-id | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libs/db.js b/src/libs/db.js
index 1c9db368..5f007739 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -7,7 +7,8 @@ const db = low(adapter)
 db.defaults({
   themeActiveName: [],
   pageOpenedList: [],
-  updateNotify: []
+  updateNotify: [],
+  username: []
 })
   .write()
 
diff --git a/src/main.js b/src/main.js
index 4c3fed76..c26f5080 100755
--- a/src/main.js
+++ b/src/main.js
@@ -100,6 +100,8 @@ new Vue({
     this.getAllTagFromRoutes()
   },
   mounted () {
+    // DB -> store 加载用户名
+    this.$store.commit('d2adminUsernameLoad')
     // DB -> store 加载版本更新弹窗的设置
     this.$store.commit('d2adminUpdateNotifyLoad')
     // DB -> store 加载主题
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 13527a7d..f30f3c91 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-d778c730422f7b1f5003b5674b98394d12362a90
\ No newline at end of file
+ef14650e0f14b8ee44068a90cf999ca7494864e6
\ No newline at end of file

From 5efe59d7f171061a99500876a93d3e188eb80695 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:19:22 +0800
Subject: [PATCH 123/128] no message

Former-commit-id: 19c33e0c0a333fa9437c11d531eeaf15358a62a1 [formerly 0ccc9d5ab39dc6d84c4e83aeb9c9c3a8157acd47] [formerly 19c33e0c0a333fa9437c11d531eeaf15358a62a1 [formerly 0ccc9d5ab39dc6d84c4e83aeb9c9c3a8157acd47] [formerly 19c33e0c0a333fa9437c11d531eeaf15358a62a1 [formerly 0ccc9d5ab39dc6d84c4e83aeb9c9c3a8157acd47] [formerly 0ccc9d5ab39dc6d84c4e83aeb9c9c3a8157acd47 [formerly 6abaa97415a5eb5dff4c6effcf08a00f4984356c [formerly ee8ed1f38fc3a8517c1031df463335adfdd1ed15]]]]]
Former-commit-id: 8df6ee7f086355a3e612b02da98274d91454a7e7
Former-commit-id: 4a302723979f05378aea4414eb59a54ac960af5d
Former-commit-id: 1df0c1b749bea8324eb15510d7ebb24fe800665c [formerly 28ebab8068af385915fe2ae9a5a9dd885244a562]
Former-commit-id: d0ed98df0164e416cda0edda772afee15730adbf
Former-commit-id: 71ff88806231c6926f187ccbf5bd6d690e423c2d
Former-commit-id: 368b010e9ddcd907594ec0f4b54838b7b11a4923
Former-commit-id: ac31bea456553525b078ac47501f690eaa6fabf8
Former-commit-id: 28a39c91ae6bbd644bde61c3122391485aaeae6d
---
 docs/zh/guide/change-log.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 4de45f17..b93de3f0 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -18,6 +18,7 @@
 * [ 新增 ] 集成 json 查看组件
 * [ 新增 ] 添加了所有图表种类的演示页面
 * [ 修改 ] 修改布局方式，解决了在 Firefox 上 better-scroll 初始化拿不到正确高度的 bug
+* [ 新增 ] 右上角显示用户名，用户名持久存储
 
 ## v1.1.3
 

From 01509eca0e4ae6dfcc5382024aa374880b2088f7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:32:09 +0800
Subject: [PATCH 124/128] no message

Former-commit-id: 74f9285eb470e68b8b78c597dbfd18283ee6246f [formerly 74f9285eb470e68b8b78c597dbfd18283ee6246f [formerly 74f9285eb470e68b8b78c597dbfd18283ee6246f [formerly 74f9285eb470e68b8b78c597dbfd18283ee6246f [formerly 05e5b1b004919d88516d8c75edc680316cbbe0bc [formerly 8aa4e5f62ad1e69bf3a9f017e797e0b7f16cfd21]]]]]
Former-commit-id: 9edb641f00492881001b439ca4f183834aca6a09
Former-commit-id: 556a889587a8cce28e36abb7b86f6533e9eed4e6
Former-commit-id: 5a0f7797a2a9ff54c6552cd80f5d89df3ceeb5d8 [formerly 2105b9ed6d99a09ed0d884641180f98c2fd8f4fb]
Former-commit-id: ebc3b8cfb90750db827b0afe767a5df92e3e5865
Former-commit-id: 3fe7656a29e1159bbd48f6e2099b4d8eb3c9584e
Former-commit-id: 8edd1646d8995a266a18679e99de43cf8f43ce3d
Former-commit-id: f15ae065b8ad16a2c0a90b80415f2df3d61ee924
Former-commit-id: 357621f1ca7ab2ad50388df96e685823ffb27aa5
---
 .../core/d2-layout-main/components/-user/index.vue     | 10 +++++++++-
 src/store/modules/d2admin.js.REMOVED.git-id            |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-user/index.vue b/src/components/core/d2-layout-main/components/-user/index.vue
index 18616d3c..81d10b63 100644
--- a/src/components/core/d2-layout-main/components/-user/index.vue
+++ b/src/components/core/d2-layout-main/components/-user/index.vue
@@ -11,7 +11,7 @@
 <script>
 // 插件
 import Cookies from 'js-cookie'
-import { mapState } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 
 export default {
   computed: {
@@ -20,12 +20,20 @@ export default {
     })
   },
   methods: {
+    ...mapMutations([
+      'd2adminDbRemoveByUuid'
+    ]),
     logOff () {
       this.$confirm('注销此账户吗?', '注销', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        // 删除用户名
+        this.d2adminDbRemoveByUuid({
+          key: 'username',
+          emptyValue: ''
+        })
         // 删除cookie
         Cookies.remove('token')
         Cookies.remove('uuid')
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index f30f3c91..6b7ef5dd 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-ef14650e0f14b8ee44068a90cf999ca7494864e6
\ No newline at end of file
+2ecdea5daed762cc83ca1601a95bb7a0526a1998
\ No newline at end of file

From d476925bad7b8f8046c01c3afa847644ac02e8fd Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:39:27 +0800
Subject: [PATCH 125/128] no message

Former-commit-id: a600876b889f46e1aad0c9941eccdd76e76c65ef [formerly a600876b889f46e1aad0c9941eccdd76e76c65ef [formerly a600876b889f46e1aad0c9941eccdd76e76c65ef [formerly a600876b889f46e1aad0c9941eccdd76e76c65ef [formerly 63d2b9446c6f45af321b6c854b0662a93517113a [formerly 2322ef9f72a133c470671e6a94db2b1e4ba6c94d]]]]]
Former-commit-id: 5295789ced056b29cea9135dec06f85d46b35bee
Former-commit-id: a58467e0d1aa684cb1b192a006591fbf0ea22a1a
Former-commit-id: 6384061dc3e560957cc3d4d506513461440f9e5d [formerly 42b9a53c3df9b1bd65518e69d55c5847dc9decb7]
Former-commit-id: 8566dae6f4fc0763b19cd587186bca0a0e87ae91
Former-commit-id: f84c0168c1d8f7e09bd2db5fed4f968ab2aaef88
Former-commit-id: cd17c8cbccca171688dc6414d0673b5cba7e1402
Former-commit-id: 99747574ea5dc59a5347724750079ce10dfbfdac
Former-commit-id: fcc021a62a2c6e132026eeea98d77438bca8c982
---
 src/store/modules/d2admin.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 6b7ef5dd..cdcef160 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-2ecdea5daed762cc83ca1601a95bb7a0526a1998
\ No newline at end of file
+151df8419f384f17f5ccd7a9df8cb5dd16e8c255
\ No newline at end of file

From 47a00f369bc82f517f8b2cda5dee36ad6b8c34c5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:46:48 +0800
Subject: [PATCH 126/128] no message

Former-commit-id: 862f3d2ffda807e03e1ee1b74c8ae1848194bfc4 [formerly 6dca1a6e6f97862e875054ae63cadef42b115a58] [formerly 862f3d2ffda807e03e1ee1b74c8ae1848194bfc4 [formerly 6dca1a6e6f97862e875054ae63cadef42b115a58] [formerly 862f3d2ffda807e03e1ee1b74c8ae1848194bfc4 [formerly 6dca1a6e6f97862e875054ae63cadef42b115a58] [formerly 6dca1a6e6f97862e875054ae63cadef42b115a58 [formerly 9cf2fc33a5bce9f258c56b2c6bcb918372115a29 [formerly 816f92e3f5c48338d11cb2345a77dda32d991667]]]]]
Former-commit-id: 2340406c6eaa3af82aaa43f6729b1e2699c54483
Former-commit-id: e62f20a1bc95ac5203d43eb044657468042b6be6
Former-commit-id: 13a85759645c9427b70f64182ed35309cb145e14 [formerly 8e7e9266a3aab3bda5f69bb905e04a33a72f8f75]
Former-commit-id: 9d834ab9525e4723089216358416076daf166fcf
Former-commit-id: 82ada9461461b9ae27ab07b9c514d213adff22fe
Former-commit-id: 2e906d4f9e36e9368f5269c39711806b9b6da656
Former-commit-id: 98f15e1e398ee4fe9ffefc3cf6372516f525f3f5
Former-commit-id: 593a176fdab58acca5b83b2f7e19f56a0a37955d
---
 index.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index fc7313e2..04b6a4da 100755
--- a/index.html
+++ b/index.html
@@ -39,12 +39,18 @@
       .d2-app-loading-sub-title {
         color: #FFF;
         font-size: 10px;
+        margin-bottom: 10px;
+      }
+      .d2-app-loading-sub-info {
+        color: #FFF;
+        font-size: 10px;
+        opacity: .8;
+        margin-bottom: 4px;
       }
       .d2-app-loading-grid {
         width: 30px;
         height: 30px;
       }
-
       .d2-app-loading-grid .d2-app-loading {
         width: 10px;
         height: 10px;
@@ -121,7 +127,8 @@
           <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>
+        <div class="d2-app-loading-sub-title">本示例项目加载了大量的组件，初次加载会比较慢，请耐心等待</div>
+        <div class="d2-app-loading-sub-info">如果很久很久都没有加载成功，请清空缓存重新加载页面</div>
       </div>
     </div>
   </body>

From de7383b73925a3ddcef646abc854fffbfaa0fe20 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 16:09:48 +0800
Subject: [PATCH 127/128] no message

Former-commit-id: 059ed7d58b3c488375846077097379862402d726 [formerly 059ed7d58b3c488375846077097379862402d726 [formerly 059ed7d58b3c488375846077097379862402d726 [formerly 059ed7d58b3c488375846077097379862402d726 [formerly f9d20a743a59963c7030ee2bb3687e67cd7e2f77 [formerly d0423d102ad5e8d239dfa81b759def26723e9a18]]]]]
Former-commit-id: 978419dc6a5104bd0b62208aa196ae559addf276
Former-commit-id: c528a955665e1948e0f00a92bc8bc48150593a0a
Former-commit-id: 5302260354464937a1b6148cb1caca6d269bc8d1 [formerly 2babee13937d41adb934f13e58cc289a93be6fcb]
Former-commit-id: 4489dc13cf7a1835acfe11f73120b3a28bf823a8
Former-commit-id: 23bd3b9d4c99092f16d1e242828f6843b9197f35
Former-commit-id: 4475b3a0276b87da789cf8a36d245ea805165fcb
Former-commit-id: 3aaeabed60aa694bc6925fbff05559cbfeeff86c
Former-commit-id: 95637f510a4c313f571865cf2d96dd437f568706
---
 docs/zh/components/container.md | 16 ++++++++++++++
 docs/zh/guide/README.md         |  1 +
 index.html                      | 38 +++++++++++++++++++++++++++------
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 1e1efe29..ca365897 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -83,6 +83,22 @@ export default {
 
 你可以通过设置 `scroll` 来启用自定义滚动条，看起来更美观一些
 
+示例：
+
+``` vue
+<template>
+  <d2-container type="full" scroll>
+    <template slot="header">
+      可选的 header 内容 ...
+    </template>
+    主体内容 ...
+    <template slot="footer">
+      可选的 footer 内容 ...
+    </template>
+  </d2-container>
+</template>
+```
+
 ### 隐形页面容器
 
 不显示任何背景色和边框，通常这个模式只有在极少情况下会使用
diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index 7de55c32..e21fda5a 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -76,6 +76,7 @@ D2Admin 创建于2018年1月14日零点51分，在2018年5月26日正式发布
 * 提供“试验台”功能 方便展示系统功能调用方法 `1.1.4 +`
 * 多标签页模式 `1.1.4 +`
 * 美化滚动条 `1.1.4 +`
+* json view `1.1.4 +`
 
 ## TODO
 
diff --git a/index.html b/index.html
index 04b6a4da..a9dbc96b 100755
--- a/index.html
+++ b/index.html
@@ -18,12 +18,6 @@
         justify-content: center;
         align-items: center;
         flex-direction: column;
-        /* background: #8e9eab;
-        background: -webkit-linear-gradient(to right, #eef2f3, #8e9eab);
-        background: linear-gradient(to right, #eef2f3, #8e9eab); */
-        /* background: #4b6cb7;
-        background: -webkit-linear-gradient(to right, #182848, #4b6cb7);
-        background: linear-gradient(to right, #182848, #4b6cb7); */
         background: #757F9A;
         background: -webkit-linear-gradient(to top, #D7DDE8, #757F9A);
         background: linear-gradient(to top, #D7DDE8, #757F9A);
@@ -47,6 +41,34 @@
         opacity: .8;
         margin-bottom: 4px;
       }
+      .d2-app-loading-btn {
+        text-decoration: none;
+        display: inline-block;
+        line-height: 1;
+        white-space: nowrap;
+        cursor: pointer;
+        background: #fff;
+        border: 1px solid #dcdfe6;
+        border-color: #dcdfe6;
+        color: #606266;
+        -webkit-appearance: none;
+        text-align: center;
+        box-sizing: border-box;
+        outline: none;
+        margin: 0;
+        transition: .1s;
+        font-weight: 500;
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+        padding: 12px 20px;
+        font-size: 14px;
+        border-radius: 4px;
+        /* 圆角 */
+        padding: 7px 15px;
+        border-radius: 20px;
+        font-size: 12px;
+      }
       .d2-app-loading-grid {
         width: 30px;
         height: 30px;
@@ -129,6 +151,10 @@
         <div class="d2-app-loading-title">加载中</div>
         <div class="d2-app-loading-sub-title">本示例项目加载了大量的组件，初次加载会比较慢，请耐心等待</div>
         <div class="d2-app-loading-sub-info">如果很久很久都没有加载成功，请清空缓存重新加载页面</div>
+        <div style="margin-top: 10px;">
+          <a class="d2-app-loading-btn" href="https://github.com/FairyEver/d2-admin" target="blank">Github仓库</a>
+          <a class="d2-app-loading-btn" href="https://fairyever.gitee.io/d2-admin-doc/zh/" target="blank">中文文档</a>
+        </div>
       </div>
     </div>
   </body>

From 9c6f8f13b34db083f38783bef2c22f2d1e74a608 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 16:13:15 +0800
Subject: [PATCH 128/128] no message

Former-commit-id: 9557f0a22cb189bb5813ece51f8a5765d921443a [formerly 9557f0a22cb189bb5813ece51f8a5765d921443a [formerly 9557f0a22cb189bb5813ece51f8a5765d921443a [formerly 9557f0a22cb189bb5813ece51f8a5765d921443a [formerly cad4d56724aff20e4c316ffdadb92dbd3109146c [formerly 4f7e18b7eef84f3cd6ee4a3dc56358d4aad8a1a4]]]]]
Former-commit-id: 043fd476781c51310c57a60bd9ebd3a0ee0ba2ae
Former-commit-id: 1b77c6ea5d4f283b90e42111a3d71649c0bdb9c9
Former-commit-id: 7c317eb379fd6e1dc7fec311ee143a1491d168f3 [formerly 319392d6ce89c5b8aa985422759db98bc7815696]
Former-commit-id: 44b5bf6d08e9faddbd9b624531a4a4c87c2287c2
Former-commit-id: 6533ad089267a093adcb7a48712fd61d5d51576b
Former-commit-id: 5fdf6e2fd1f107c2ce52c9cc04ed2107a46a8fcd
Former-commit-id: b521414a783e3227ecf373551f0802417186eab7
Former-commit-id: eaf710afeebe7884bfad6293773567ad875607b8
---
 README.md    | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 74e774b6..e903e83a 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 D2Admin 是一个开源的管理系统前端集成方案
 
-[Github仓库](https://github.com/FairyEver/d2-admin) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
+[中文文档](https://fairyever.gitee.io/d2-admin-doc/zh/) - [码云仓库](https://gitee.com/fairyever/d2-admin) - [预览地址](https://fairyever.gitee.io/d2-admin-preview)
 
 因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件
 
@@ -51,6 +51,7 @@ D2Admin 是一个开源的管理系统前端集成方案
 * 提供“试验台”功能 方便展示系统功能调用方法 `1.1.4 +`
 * 多标签页模式 `1.1.4 +`
 * 美化滚动条 `1.1.4 +`
+* 持久化存储 `1.1.4 +`
 
 ## 加入小组
 
@@ -153,4 +154,3 @@ npm run dev
 // 打包
 npm run build
 ```
-
diff --git a/package.json b/package.json
index d770d4e8..5b283220 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "A management system framework based on element",
   "author": "李杨 <1711467488@qq.com>",
   "private": true,