From 1166e0d98f21642454a3adc66adbd1f64dec31e9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 13 Sep 2018 23:14:40 +0800
Subject: [PATCH 01/13] account user

Former-commit-id: 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 26eec1dacb860262e4e7a81946d6d44739441da3 [formerly 8b6ff706f6abb1771924571087264230424f32d2]]]]]
Former-commit-id: a9006cb1d0b08630344ae3148efc45bda1fae8f3
Former-commit-id: 209b2c0fe35119ed4319dac1a1b9c553e15c4522
Former-commit-id: 493b0705c65043774efc00cdcfbf3ad97ed54a52 [formerly acb407878497fbc86b0bbfa7470d43455a7944f2]
Former-commit-id: 39e40e3c3e4313c35eac57b87caea57fbf0c245d
Former-commit-id: 8873735485e0c6836cf2d8e1717f9e94a5de814e
Former-commit-id: 78d64eb4d6132adec46158bccf3c7d06576bce6d
Former-commit-id: 39429a1692c5c34c87bdff344622a752c06619f4
Former-commit-id: 6726ad62ee8fdb8e952920f8f5ffad86a7d4fa04
---
 package-lock.json.REMOVED.git-id             |  2 +-
 src/main.js                                  |  2 +-
 src/store/modules/d2admin/modules/account.js | 46 ++++++++++----------
 src/store/modules/d2admin/modules/user.js    | 42 ++++++++++--------
 4 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
index 298e7b3f..f90e2089 100644
--- a/package-lock.json.REMOVED.git-id
+++ b/package-lock.json.REMOVED.git-id
@@ -1 +1 @@
-4d463a54f93007210c2e07a05d8f012c386a0023
\ No newline at end of file
+b322c0027c15926f73f03ec142269e3512c5cc14
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 2ac579e2..f9c5628b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -62,7 +62,7 @@ new Vue({
     // 检查最新版本
     this.$store.dispatch('d2admin/releases/checkUpdate')
     // 用户登录后从数据库加载一系列的设置
-    this.$store.commit('d2admin/account/load')
+    this.$store.dispatch('d2admin/account/load')
     // 获取并记录用户 UA
     this.$store.commit('d2admin/ua/get')
     // 初始化全屏监听
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 78569bd9..133cba32 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -12,9 +12,7 @@ export default {
      * @param {Object} param password {String} 密码
      * @param {Object} param route {Object} 登录成功后定向的路由对象
      */
-    login ({
-      commit
-    }, {
+    login ({ dispatch }, {
       vm,
       username,
       password,
@@ -27,7 +25,7 @@ export default {
         username,
         password
       })
-        .then(res => {
+        .then(async res => {
           // 设置 cookie 一定要存 uuid 和 token 两个 cookie
           // 整个系统依赖这两个数据进行校验和存储
           // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
@@ -36,11 +34,11 @@ export default {
           util.cookies.set('uuid', res.uuid)
           util.cookies.set('token', res.token)
           // 设置 vuex 用户信息
-          commit('d2admin/user/set', {
+          await dispatch('d2admin/user/set', {
             name: res.name
           }, { root: true })
           // 用户登录后从持久化数据加载一系列的设置
-          commit('load')
+          await dispatch('load')
           // 更新路由 尝试去获取 cookie 里保存的需要重定向的页面完整地址
           const path = util.cookies.get('redirect')
           // 根据是否存有重定向页面判断如何重定向
@@ -49,9 +47,7 @@ export default {
           util.cookies.remove('redirect')
         })
         .catch(err => {
-          console.group('登录结果')
           console.log('err: ', err)
-          console.groupEnd()
         })
     },
     /**
@@ -92,26 +88,28 @@ export default {
       } else {
         logout()
       }
-    }
-  },
-  mutations: {
+    },
     /**
      * @description 用户登录后从持久化数据加载一系列的设置
      * @param {Object} state vuex state
      */
-    load (state) {
-      // DB -> store 加载用户名
-      this.commit('d2admin/user/load')
-      // DB -> store 加载主题
-      this.commit('d2admin/theme/load')
-      // DB -> store 加载页面过渡效果设置
-      this.commit('d2admin/transition/load')
-      // DB -> store 持久化数据加载上次退出时的多页列表
-      this.commit('d2admin/page/openedLoad')
-      // DB -> store 持久化数据加载侧边栏折叠状态
-      this.commit('d2admin/menu/asideCollapseLoad')
-      // DB -> store 持久化数据加载全局尺寸
-      this.commit('d2admin/size/load')
+    load ({ commit, dispatch }) {
+      return new Promise(async resolve => {
+        // DB -> store 加载用户名
+        await dispatch('d2admin/user/load', null, { root: true })
+        // DB -> store 加载主题
+        commit('d2admin/theme/load', null, { root: true })
+        // DB -> store 加载页面过渡效果设置
+        commit('d2admin/transition/load', null, { root: true })
+        // DB -> store 持久化数据加载上次退出时的多页列表
+        commit('d2admin/page/openedLoad', null, { root: true })
+        // DB -> store 持久化数据加载侧边栏折叠状态
+        commit('d2admin/menu/asideCollapseLoad', null, { root: true })
+        // DB -> store 持久化数据加载全局尺寸
+        commit('d2admin/size/load', null, { root: true })
+        // end
+        resolve()
+      })
     }
   }
 }
diff --git a/src/store/modules/d2admin/modules/user.js b/src/store/modules/d2admin/modules/user.js
index add8a466..ff19e64b 100644
--- a/src/store/modules/d2admin/modules/user.js
+++ b/src/store/modules/d2admin/modules/user.js
@@ -7,34 +7,42 @@ export default {
     // 用户信息
     info: setting.user.info
   },
-  mutations: {
+  actions: {
     /**
      * @description 设置用户数据
      * @param {Object} state vuex state
      * @param {*} info info
      */
-    set (state, info) {
-      // store 赋值
-      state.info = info
-      // 持久化
-      this.dispatch('d2admin/db/set', {
-        dbName: 'sys',
-        path: 'user.info',
-        value: info,
-        user: true
+    set ({ state, dispatch }, info) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.info = info
+        // 持久化
+        await dispatch('d2admin/db/set', {
+          dbName: 'sys',
+          path: 'user.info',
+          value: info,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     },
     /**
      * @description 从数据库取用户数据
      * @param {Object} state vuex state
      */
-    async load (state) {
-      // store 赋值
-      state.info = await this.dispatch('d2admin/db/get', {
-        dbName: 'sys',
-        path: 'user.info',
-        defaultValue: setting.user.info,
-        user: true
+    load ({ state, dispatch }) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.info = await dispatch('d2admin/db/get', {
+          dbName: 'sys',
+          path: 'user.info',
+          defaultValue: setting.user.info,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     }
   }

From a057d7ddd4a636ee680fb47301457f1e5e4193f0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 14 Sep 2018 08:49:43 +0800
Subject: [PATCH 02/13] theme

Former-commit-id: 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 6f73a709ba4288f514deb2d74eb8603180b60b08 [formerly 28415f3ce8f01f9f26a0752a5f08d855bc4c56e2]]]]]
Former-commit-id: f199fcac91cb1b3aeef843974db74d0f9d622699
Former-commit-id: eec00c4f5e48c1a19ac096d3a8900bbb7ae361db
Former-commit-id: 9c7eb4c2f9115fda9b7d69e1c53444c99aeadb90 [formerly aac10159598f69b5c31ab136beb5ae11686ed2d6]
Former-commit-id: d38da464fd9a05e1ec2defc27ac4d8d4bed05ec3
Former-commit-id: eadfd85257cb054017000aca8100e5e68b359e2d
Former-commit-id: 9ce4b0a7b75a4ea9b9e24e96161a515bcadc6f04
Former-commit-id: ed40880ed8dda9601d859d5db5f19ab7bd42ade7
Former-commit-id: 3cbf4301dd98c44d8c4f1da0432922511ba9c7e3
---
 .../components/d2-theme-list/index.vue        |  4 +-
 .../demo/playground/store/theme/index.vue     |  4 +-
 src/store/modules/d2admin/modules/account.js  |  2 +-
 src/store/modules/d2admin/modules/theme.js    | 54 +++++++++++--------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue b/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
index efe3e343..e3d3e503 100644
--- a/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
+++ b/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: 'd2-theme-list',
   data () {
@@ -36,7 +36,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/theme', [
+    ...mapActions('d2admin/theme', [
       'set'
     ]),
     handleSelectTheme (name) {
diff --git a/src/pages/demo/playground/store/theme/index.vue b/src/pages/demo/playground/store/theme/index.vue
index cf214423..34468d20 100644
--- a/src/pages/demo/playground/store/theme/index.vue
+++ b/src/pages/demo/playground/store/theme/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   data () {
     return {
@@ -48,7 +48,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/theme', [
+    ...mapActions('d2admin/theme', [
       'set'
     ]),
     handleSelectTheme (name) {
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 133cba32..867e3896 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -98,7 +98,7 @@ export default {
         // DB -> store 加载用户名
         await dispatch('d2admin/user/load', null, { root: true })
         // DB -> store 加载主题
-        commit('d2admin/theme/load', null, { root: true })
+        await dispatch('d2admin/theme/load', null, { root: true })
         // DB -> store 加载页面过渡效果设置
         commit('d2admin/transition/load', null, { root: true })
         // DB -> store 持久化数据加载上次退出时的多页列表
diff --git a/src/store/modules/d2admin/modules/theme.js b/src/store/modules/d2admin/modules/theme.js
index e12b1439..c2460310 100644
--- a/src/store/modules/d2admin/modules/theme.js
+++ b/src/store/modules/d2admin/modules/theme.js
@@ -18,40 +18,50 @@ export default {
       return state.list.find(theme => theme.name === state.activeName)
     }
   },
-  mutations: {
+  actions: {
     /**
      * @description 激活一个主题
      * @param {Object} state vuex state
      * @param {String} themeValue 需要激活的主题名称
      */
-    set (state, themeName) {
-      // 检查这个主题在主题列表里是否存在
-      state.activeName = state.list.find(e => e.name === themeName) ? themeName : state.list[0].name
-      // 将 vuex 中的主题应用到 dom
-      this.commit('d2admin/theme/dom')
-      // 持久化
-      this.dispatch('d2admin/db/set', {
-        dbName: 'sys',
-        path: 'theme.activeName',
-        value: state.activeName,
-        user: true
+    set ({ state, commit, dispatch }, themeName) {
+      return new Promise(async resolve => {
+        // 检查这个主题在主题列表里是否存在
+        state.activeName = state.list.find(e => e.name === themeName) ? themeName : state.list[0].name
+        // 将 vuex 中的主题应用到 dom
+        commit('dom')
+        // 持久化
+        await dispatch('d2admin/db/set', {
+          dbName: 'sys',
+          path: 'theme.activeName',
+          value: state.activeName,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     },
     /**
      * @description 从持久化数据加载主题设置
      * @param {Object} state vuex state
      */
-    async load (state) {
-      // store 赋值
-      state.activeName = await this.dispatch('d2admin/db/get', {
-        dbName: 'sys',
-        path: 'theme.activeName',
-        defaultValue: state.list[0].name,
-        user: true
+    load ({ state, commit, dispatch }) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.activeName = await dispatch('d2admin/db/get', {
+          dbName: 'sys',
+          path: 'theme.activeName',
+          defaultValue: state.list[0].name,
+          user: true
+        }, { root: true })
+        // 将 vuex 中的主题应用到 dom
+        commit('dom')
+        // end
+        resolve()
       })
-      // 更新到页面
-      this.commit('d2admin/theme/dom')
-    },
+    }
+  },
+  mutations: {
     /**
      * @description 将 vuex 中的主题应用到 dom
      * @param {Object} state vuex state

From 8c3c2f81eb4f31ecd0ed4e93ff9555052f8e40b2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 14 Sep 2018 09:02:49 +0800
Subject: [PATCH 03/13] transition

Former-commit-id: 02bd7f913030974f8fea14eca765da453cad40f1 [formerly 02bd7f913030974f8fea14eca765da453cad40f1 [formerly 02bd7f913030974f8fea14eca765da453cad40f1 [formerly 02bd7f913030974f8fea14eca765da453cad40f1 [formerly c80358c9fd4064bdcbb3e8208cdae8960ad29c76 [formerly 339084b596728ca59169ccee025cd5cfb04cc0ea]]]]]
Former-commit-id: 0eca34a7cefeac571a42b089b7b606bb0b58321e
Former-commit-id: 66da672644dbfbe7ced81383b12a48db14eef43e
Former-commit-id: 6580885c5fc24b70ab60017af72f33a9a17a7816 [formerly e217ea71e67a326b82c2dead714fd845af6451d5]
Former-commit-id: c8f62875e94b755e14caff6e1f43fada83b5cadf
Former-commit-id: 54e5871a85ecbb0e8e23c9359fab455f4d096457
Former-commit-id: 4e15d8fa611c28e7750c974cfd95e43ef6031f7a
Former-commit-id: ab1da431925c17c7ff42f73d54897e72a98aa092
Former-commit-id: 6f8297b77f9bf5d960a74cbc6ac787e58241b42f
---
 .../playground/store/transition/index.vue     |  4 +-
 src/store/modules/d2admin/modules/account.js  |  2 +-
 .../modules/d2admin/modules/transition.js     | 42 +++++++++++--------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/pages/demo/playground/store/transition/index.vue b/src/pages/demo/playground/store/transition/index.vue
index 9e4df340..f74f3d42 100644
--- a/src/pages/demo/playground/store/transition/index.vue
+++ b/src/pages/demo/playground/store/transition/index.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   computed: {
     ...mapState('d2admin/transition', [
@@ -18,7 +18,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/transition', [
+    ...mapActions('d2admin/transition', [
       'set'
     ])
   }
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 867e3896..66b385db 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -100,7 +100,7 @@ export default {
         // DB -> store 加载主题
         await dispatch('d2admin/theme/load', null, { root: true })
         // DB -> store 加载页面过渡效果设置
-        commit('d2admin/transition/load', null, { root: true })
+        await dispatch('d2admin/transition/load', null, { root: true })
         // DB -> store 持久化数据加载上次退出时的多页列表
         commit('d2admin/page/openedLoad', null, { root: true })
         // DB -> store 持久化数据加载侧边栏折叠状态
diff --git a/src/store/modules/d2admin/modules/transition.js b/src/store/modules/d2admin/modules/transition.js
index 2f46a355..f4802bff 100644
--- a/src/store/modules/d2admin/modules/transition.js
+++ b/src/store/modules/d2admin/modules/transition.js
@@ -7,34 +7,42 @@ export default {
     // 是否开启页面过度动画
     active: setting.transition.active
   },
-  mutations: {
+  actions: {
     /**
      * @description 设置开启状态
      * @param {Object} state vuex state
      * @param {Boolean} active 新的状态
      */
-    set (state, active) {
-      // store 赋值
-      state.active = active
-      // 持久化
-      this.dispatch('d2admin/db/set', {
-        dbName: 'sys',
-        path: 'transition.active',
-        value: state.active,
-        user: true
+    set ({ state, dispatch }, active) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.active = active
+        // 持久化
+        await dispatch('d2admin/db/set', {
+          dbName: 'sys',
+          path: 'transition.active',
+          value: state.active,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     },
     /**
      * 从数据库读取页面过渡动画设置
      * @param {Object} state vuex state
      */
-    async load (state) {
-      // store 赋值
-      state.active = await this.dispatch('d2admin/db/get', {
-        dbName: 'sys',
-        path: 'transition.active',
-        defaultValue: setting.transition.active,
-        user: true
+    load ({ state, dispatch }) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.active = await dispatch('d2admin/db/get', {
+          dbName: 'sys',
+          path: 'transition.active',
+          defaultValue: setting.transition.active,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     }
   }

From e5fe71d955dfa11fd87e45b6cfe1ce47112c76e7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 14 Sep 2018 09:45:23 +0800
Subject: [PATCH 04/13] menu

Former-commit-id: f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly a63c247d1756615695e4cd743c8b9ff1bb30f297 [formerly 7e5f49d341a9037b2dd77ac6c7ea0bfb8998f307]]]]]
Former-commit-id: 6d11cf118e7916d07ac08c51706469046011968b
Former-commit-id: fb85bcdd39e82f5b4567d8e8c712d2499555eb3e
Former-commit-id: aa74cf284d58e2671677e911a61babee0a36932e [formerly 50dce6ce583a14ad116c7ebadd7d835ac8be03c5]
Former-commit-id: e7085366dbe0ca59b31077537d6499eb49e5ae1b
Former-commit-id: 77117d4838bdc9680f45d0c534dbefdb957ef778
Former-commit-id: e4e8f0bd37dfc653561b928abf473b3cc32850df
Former-commit-id: 01ac1a30c777399eaff801ab5b4ebbc2c617cdbf
Former-commit-id: 2a651e242aba08678d20696759de7e022a3f35de
---
 src/layout/header-aside/layout.vue           |  10 +-
 src/store/modules/d2admin/modules/account.js |   2 +-
 src/store/modules/d2admin/modules/menu.js    | 102 +++++++++++--------
 3 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index abaf4afc..8b6ba72f 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters, mapMutations } from 'vuex'
+import { mapState, mapGetters, mapActions } from 'vuex'
 import mixinSearch from './mixins/search'
 export default {
   name: 'd2-layout-header-aside',
@@ -128,14 +128,14 @@ export default {
     }
   },
   methods: {
-    ...mapMutations({
-      menuAsideCollapseToggle: 'd2admin/menu/asideCollapseToggle'
-    }),
+    ...mapActions('d2admin/menu', [
+      'asideCollapseToggle'
+    ]),
     /**
      * 接收点击切换侧边栏的按钮
      */
     handleToggleAside () {
-      this.menuAsideCollapseToggle()
+      this.asideCollapseToggle()
     }
   }
 }
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 66b385db..e8d16b9c 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -104,7 +104,7 @@ export default {
         // DB -> store 持久化数据加载上次退出时的多页列表
         commit('d2admin/page/openedLoad', null, { root: true })
         // DB -> store 持久化数据加载侧边栏折叠状态
-        commit('d2admin/menu/asideCollapseLoad', null, { root: true })
+        await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
         // DB -> store 持久化数据加载全局尺寸
         commit('d2admin/size/load', null, { root: true })
         // end
diff --git a/src/store/modules/d2admin/modules/menu.js b/src/store/modules/d2admin/modules/menu.js
index 99db6e8e..38ab3cd7 100644
--- a/src/store/modules/d2admin/modules/menu.js
+++ b/src/store/modules/d2admin/modules/menu.js
@@ -11,6 +11,64 @@ export default {
     // 侧边栏收缩
     asideCollapse: setting.menu.asideCollapse
   },
+  actions: {
+    /**
+     * 设置侧边栏展开或者收缩
+     * @param {Object} state vuex state
+     * @param {Boolean} collapse is collapse
+     */
+    asideCollapseSet ({ state, dispatch }, collapse) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.asideCollapse = collapse
+        // 持久化
+        await dispatch('d2admin/db/set', {
+          dbName: 'sys',
+          path: 'menu.asideCollapse',
+          value: state.asideCollapse,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
+      })
+    },
+    /**
+     * 切换侧边栏展开和收缩
+     * @param {Object} state vuex state
+     */
+    asideCollapseToggle ({ state, dispatch }) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.asideCollapse = !state.asideCollapse
+        // 持久化
+        await dispatch('d2admin/db/set', {
+          dbName: 'sys',
+          path: 'menu.asideCollapse',
+          value: state.asideCollapse,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
+      })
+    },
+    /**
+     * 从持久化数据读取侧边栏展开或者收缩
+     * @param {Object} state vuex state
+     */
+    asideCollapseLoad ({ state, dispatch }) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.asideCollapse = await dispatch('d2admin/db/get', {
+          dbName: 'sys',
+          path: 'menu.asideCollapse',
+          defaultValue: setting.menu.asideCollapse,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
+      })
+    }
+  },
   mutations: {
     /**
      * @description 设置顶栏菜单
@@ -29,50 +87,6 @@ export default {
     asideSet (state, menu) {
       // store 赋值
       state.aside = menu
-    },
-    /**
-     * 设置侧边栏展开或者收缩
-     * @param {Object} state vuex state
-     * @param {Boolean} collapse is collapse
-     */
-    asideCollapseSet (state, collapse) {
-      // store 赋值
-      state.asideCollapse = collapse
-      // 持久化
-      this.dispatch('d2admin/db/set', {
-        dbName: 'sys',
-        path: 'menu.asideCollapse',
-        value: state.asideCollapse,
-        user: true
-      })
-    },
-    /**
-     * 切换侧边栏展开和收缩
-     * @param {Object} state vuex state
-     */
-    asideCollapseToggle (state) {
-      // store 赋值
-      state.asideCollapse = !state.asideCollapse
-      // 持久化
-      this.dispatch('d2admin/db/set', {
-        dbName: 'sys',
-        path: 'menu.asideCollapse',
-        value: state.asideCollapse,
-        user: true
-      })
-    },
-    /**
-     * 从持久化数据读取侧边栏展开或者收缩
-     * @param {Object} state vuex state
-     */
-    async asideCollapseLoad (state) {
-      // store 赋值
-      state.asideCollapse = await this.dispatch('d2admin/db/get', {
-        dbName: 'sys',
-        path: 'menu.asideCollapse',
-        defaultValue: setting.menu.asideCollapse,
-        user: true
-      })
     }
   }
 }

From b08fe0fc3798d9fe713e8f857285cb810ea48f36 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 14 Sep 2018 10:06:46 +0800
Subject: [PATCH 05/13] size

Former-commit-id: 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly d4f506d1081f7073019db760921eb46132c3b0ef [formerly 8739959da40c0bb125b6d54e8eebd40bdbb289e0]]]]]
Former-commit-id: dd1ebd76877a12270738d07f4ad1b2a740738424
Former-commit-id: 31f092bdb4429c2821231385fe49544992b39c53
Former-commit-id: edaee9c02fa155ae126d72da323a5e4976db9b0a [formerly 7e407f62941d07994d32ef351c43b14ac8b8bea6]
Former-commit-id: b2348abfddfd93fe005b5cf2c98e8a2d7d807edd
Former-commit-id: 7c838eacbffac28bc9e4ed2898e7527d843cf0d1
Former-commit-id: f417c10eb84acbe70bcb7e34c2a569720a3c9f0c
Former-commit-id: f7aa3d5f2e78ca5cef82c82ffef1f62f9126d3f0
Former-commit-id: 010b19eafb2042f6247522f7f1b3bbcb044eb311
---
 .../components/header-size/index.vue          | 16 +++----
 .../demo/playground/store/size/index.vue      | 10 ++---
 src/store/modules/d2admin/modules/account.js  |  2 +-
 src/store/modules/d2admin/modules/size.js     | 42 +++++++++++--------
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index 731e5c37..2ed28cc7 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapMutations, mapActions } from 'vuex'
 export default {
   name: 'd2-header-size',
   computed: {
@@ -38,7 +38,7 @@ export default {
           // 设置 element 全局尺寸
           this.$ELEMENT.size = val
           // 清空缓存设置
-          this.pageKeepAliveClean()
+          this.keepAliveClean()
           // 刷新此页面
           const { path, query } = this.$route
           this.$router.replace({
@@ -50,12 +50,14 @@ export default {
     }
   },
   methods: {
-    ...mapMutations({
-      sizeSet: 'd2admin/size/set',
-      pageKeepAliveClean: 'd2admin/page/keepAliveClean'
-    }),
+    ...mapMutations('d2admin/page', [
+      'keepAliveClean'
+    ]),
+    ...mapActions('d2admin/size', [
+      'set'
+    ]),
     handleChange (value) {
-      this.sizeSet(value)
+      this.set(value)
     },
     iconName (name) {
       return name === this.value ? 'dot-circle-o' : 'circle-o'
diff --git a/src/pages/demo/playground/store/size/index.vue b/src/pages/demo/playground/store/size/index.vue
index 37524f72..ab853410 100644
--- a/src/pages/demo/playground/store/size/index.vue
+++ b/src/pages/demo/playground/store/size/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container type="card">
-    <el-radio-group v-model="currentValue" @change="sizeSet">
+    <el-radio-group v-model="currentValue" @change="set">
       <el-radio-button label="default"></el-radio-button>
       <el-radio-button label="medium"></el-radio-button>
       <el-radio-button label="small"></el-radio-button>
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   data () {
     return {
@@ -31,9 +31,9 @@ export default {
     }
   },
   methods: {
-    ...mapMutations({
-      sizeSet: 'd2admin/size/set'
-    })
+    ...mapActions('d2admin/size', [
+      'set'
+    ])
   }
 }
 </script>
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index e8d16b9c..493130a9 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -106,7 +106,7 @@ export default {
         // DB -> store 持久化数据加载侧边栏折叠状态
         await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
         // DB -> store 持久化数据加载全局尺寸
-        commit('d2admin/size/load', null, { root: true })
+        await dispatch('d2admin/size/load', null, { root: true })
         // end
         resolve()
       })
diff --git a/src/store/modules/d2admin/modules/size.js b/src/store/modules/d2admin/modules/size.js
index b500e033..a7d3416b 100644
--- a/src/store/modules/d2admin/modules/size.js
+++ b/src/store/modules/d2admin/modules/size.js
@@ -4,34 +4,42 @@ export default {
     // 尺寸
     value: '' // medium small mini
   },
-  mutations: {
+  actions: {
     /**
      * @description 设置尺寸
      * @param {Object} state vuex state
      * @param {String} size 尺寸
      */
-    set (state, size) {
-      // store 赋值
-      state.value = size
-      // 持久化
-      this.dispatch('d2admin/db/set', {
-        dbName: 'sys',
-        path: 'size.value',
-        value: state.value,
-        user: true
+    set ({ state, dispatch }, size) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.value = size
+        // 持久化
+        await dispatch('d2admin/db/set', {
+          dbName: 'sys',
+          path: 'size.value',
+          value: state.value,
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     },
     /**
      * @description 从持久化数据读取尺寸设置
      * @param {Object} state vuex state
      */
-    async load (state) {
-      // store 赋值
-      state.value = await this.dispatch('d2admin/db/get', {
-        dbName: 'sys',
-        path: 'size.value',
-        defaultValue: 'default',
-        user: true
+    load ({ state, dispatch }) {
+      return new Promise(async resolve => {
+        // store 赋值
+        state.value = await dispatch('d2admin/db/get', {
+          dbName: 'sys',
+          path: 'size.value',
+          defaultValue: 'default',
+          user: true
+        }, { root: true })
+        // end
+        resolve()
       })
     }
   }

From a7af1acbf4d4dc6a82ca57e8edf58235f7854d07 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 14 Sep 2018 15:09:58 +0800
Subject: [PATCH 06/13] no message

Former-commit-id: a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly f244e1fdd164c1b79a79bb5a6b747ee86b9d8589 [formerly 9a88fe535b9d40bff1dcca1e9c312ab81c0961b5]]]]]
Former-commit-id: 80f45f42407a12231dcb32861eae95da8b8f27d5
Former-commit-id: 294d0beb7890b73dd462900f6634b9ed43dda50b
Former-commit-id: f639bbc1de8e27b18262e84545ff22b8556c402a [formerly 0f01b98c3d1b41eaa511bb56813d860105da930f]
Former-commit-id: 9a33c6b83d309a76711c4fad397c149dac55a8b5
Former-commit-id: f556363312d2e505acc24ec531e787fc3863f9fc
Former-commit-id: 4433f382bc7c25d437eabfab96e4a7b0dbca28b5
Former-commit-id: eb558eb22372f558e8d93ae8dac07c40016e2644
Former-commit-id: 963b8effbe52965ae14a77172a37c50dcfd6cf56
---
 .../components/header-size/index.vue             | 16 +++++++---------
 .../header-aside/components/tabs/index.vue       |  6 ++----
 src/router/index.js                              |  2 +-
 src/store/modules/d2admin/modules/account.js     |  2 +-
 .../d2admin/modules/page.js.REMOVED.git-id       |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index 2ed28cc7..a8a6f234 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: 'd2-header-size',
   computed: {
@@ -38,7 +38,7 @@ export default {
           // 设置 element 全局尺寸
           this.$ELEMENT.size = val
           // 清空缓存设置
-          this.keepAliveClean()
+          this.pageKeepAliveClean()
           // 刷新此页面
           const { path, query } = this.$route
           this.$router.replace({
@@ -50,14 +50,12 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('d2admin/page', [
-      'keepAliveClean'
-    ]),
-    ...mapActions('d2admin/size', [
-      'set'
-    ]),
+    ...mapActions({
+      pageKeepAliveClean: 'd2admin/page/keepAliveClean',
+      sizeSet: 'd2admin/size/set'
+    }),
     handleChange (value) {
-      this.set(value)
+      this.sizeSet(value)
     },
     iconName (name) {
       return name === this.value ? 'dot-circle-o' : 'circle-o'
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index b1a0c01e..d1a77676 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   components: {
     D2Contextmenu: () => import('../contextmenu'),
@@ -89,7 +89,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/page', [
+    ...mapActions('d2admin/page', [
       'close',
       'closeLeft',
       'closeRight',
@@ -101,7 +101,6 @@ export default {
      */
     handleContextmenu (event) {
       let target = event.target
-
       // 解决 https://github.com/d2-projects/d2-admin/issues/54
       let flag = false
       if (target.className.indexOf('el-tabs__item') > -1) flag = true
@@ -109,7 +108,6 @@ export default {
         target = target.parentNode
         flag = true
       }
-
       if (flag) {
         event.preventDefault()
         event.stopPropagation()
diff --git a/src/router/index.js b/src/router/index.js
index 244d44db..4cf7d272 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@ router.afterEach(to => {
   const app = router.app
   const { name, params, query } = to
   // 多页控制 打开新的页面
-  app.$store.commit('d2admin/page/open', { name, params, query })
+  app.$store.dispatch('d2admin/page/open', { name, params, query })
   // 更改标题
   util.title(to.meta.title)
 })
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 493130a9..f213b960 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -102,7 +102,7 @@ export default {
         // DB -> store 加载页面过渡效果设置
         await dispatch('d2admin/transition/load', null, { root: true })
         // DB -> store 持久化数据加载上次退出时的多页列表
-        commit('d2admin/page/openedLoad', null, { root: true })
+        await dispatch('d2admin/page/openedLoad', null, { root: true })
         // DB -> store 持久化数据加载侧边栏折叠状态
         await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
         // DB -> store 持久化数据加载全局尺寸
diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
index a85c9a13..682a8b12 100644
--- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
@@ -1 +1 @@
-9abf067fc9ee38d5c28f4b1450b9df450c2583bc
\ No newline at end of file
+3cac6fb289611555b60a92937c3b5ba99e7b9ec1
\ No newline at end of file

From 40b508bda802f0eb9b61e057855a9fe757ae8cf9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 17 Sep 2018 09:44:46 +0800
Subject: [PATCH 07/13] no message

Former-commit-id: 333139d4a53a1f904c1b869e882849b8b3eb2827 [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f] [formerly 333139d4a53a1f904c1b869e882849b8b3eb2827 [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f] [formerly 333139d4a53a1f904c1b869e882849b8b3eb2827 [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f] [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f [formerly 43851ea42b4406d2090813a0ae239e17c008cbec [formerly 17743573baa14404bef2c8498f1f4bdeb8eb4fed]]]]]
Former-commit-id: d7d425fd5f12873937f3011a193fecc340e22e4b
Former-commit-id: 190ccaccd5dc1d20df13eccc335be960067bb75c
Former-commit-id: ed2090a558c9fd303b0d124932b486be4ac4f432 [formerly 5189d7bc300e41387c1e1a85d34c66d1db2528aa]
Former-commit-id: 245ce33805193704eb23f363735975d2c901aed2
Former-commit-id: 222176cae5165f847398a263b4d51961cea937e6
Former-commit-id: 427b07b46144fb14c23ac9fe9ea5f5cfaebe9f0b
Former-commit-id: 3bf5d4f2d473a6b35074ff0c3e497624349ffffc
Former-commit-id: bb3351e6c47392b78cb1c9d1e25a5f6d39d00c8a
---
 src/store/modules/d2admin/modules/fullscreen.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/d2admin/modules/fullscreen.js b/src/store/modules/d2admin/modules/fullscreen.js
index 3ee45fc2..ed8dcb53 100644
--- a/src/store/modules/d2admin/modules/fullscreen.js
+++ b/src/store/modules/d2admin/modules/fullscreen.js
@@ -14,7 +14,7 @@ export default {
       if (screenfull.enabled) {
         screenfull.on('change', () => {
           if (!screenfull.isFullscreen) {
-            this.commit('d2admin/fullscreen/set', false)
+            this.commit('set', false)
           }
         })
       }
@@ -25,10 +25,10 @@ export default {
     toggle () {
       if (screenfull.isFullscreen) {
         screenfull.exit()
-        this.commit('d2admin/fullscreen/set', false)
+        this.commit('set', false)
       } else {
         screenfull.request()
-        this.commit('d2admin/fullscreen/set', true)
+        this.commit('set', true)
       }
     },
     /**

From 5776e013a8b3a70d8f23914448ab635a45b6705a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 17 Sep 2018 16:17:34 +0800
Subject: [PATCH 08/13] pageKeepAliveClean

Former-commit-id: ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly f7f44bfb8cd1dd731d69176083538554bbb94e8c [formerly 72f4b2ffe8936fa551667cdfbc1ce5c88c49b467]]]]]
Former-commit-id: 032cc1e37c902d9d936e48437e126e2247c6be69
Former-commit-id: 82f32731d6aa4e146a3550b02177a96d8e1c3e0f
Former-commit-id: 661e658d01ff0568436ec998544f27ac74e5f5b2 [formerly c20d8c52df9985521230246e6bc500fa88d33991]
Former-commit-id: c79b7b69cdba7e002a02e296c444af9402afe2ed
Former-commit-id: cae4f106ba68364a925f15896afa15633601242e
Former-commit-id: 8a5d2b15e3f262d9f1f526f0ea009aafcf2ee535
Former-commit-id: 29918980b561a29e8805e29c3c041f793a911f6f
Former-commit-id: 190a7724a7779f5f0e4e6baf8b6a91f8638c41c4
---
 src/layout/header-aside/components/header-size/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index a8a6f234..1f14e0cf 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex'
+import { mapState, mapMutations, mapActions } from 'vuex'
 export default {
   name: 'd2-header-size',
   computed: {
@@ -50,8 +50,10 @@ export default {
     }
   },
   methods: {
+    ...mapMutations({
+      pageKeepAliveClean: 'd2admin/page/keepAliveClean'
+    }),
     ...mapActions({
-      pageKeepAliveClean: 'd2admin/page/keepAliveClean',
       sizeSet: 'd2admin/size/set'
     }),
     handleChange (value) {

From ded0f48e02996692fde5ad96a4153a0f9ddece3e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 18 Sep 2018 09:44:55 +0800
Subject: [PATCH 09/13] fullscreen

Former-commit-id: 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8f6580957550c9c8d530b71ab430aaa07cd07413 [formerly 77cbd9e33dc270afdf0d71d9c5b06bdb286650d3]]]]]
Former-commit-id: a4b60763db9904803c2e307ce890e8b2e2764fa8
Former-commit-id: dc642785a8bfe603fdc5cda7ff02c494ae2dc8f4
Former-commit-id: d5da1f86afc2e8525d2f4036f1d13fd26e7e0a6c [formerly c355a17a90a32446e69c91f110417df0b16614fe]
Former-commit-id: 822d0836dea34d84516a60ece8f1787c4ac15f4e
Former-commit-id: 2e903eeb5d15357643c3618cea0e87db7fe99209
Former-commit-id: c6b50b28ef54513fcd796c97173ccdc988284d17
Former-commit-id: 239c00dc8d3190e64957c80faf838905414b3719
Former-commit-id: ae1482194ac6b24e445207a84ef446a1151136ad
---
 .../components/header-fullscreen/index.vue    |  4 +-
 src/main.js                                   |  2 +-
 .../modules/d2admin/modules/fullscreen.js     | 47 ++++++++++++-------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/layout/header-aside/components/header-fullscreen/index.vue b/src/layout/header-aside/components/header-fullscreen/index.vue
index 8ee8e184..2fda4a5a 100644
--- a/src/layout/header-aside/components/header-fullscreen/index.vue
+++ b/src/layout/header-aside/components/header-fullscreen/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   computed: {
     ...mapState('d2admin/fullscreen', [
@@ -19,7 +19,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/fullscreen', [
+    ...mapActions('d2admin/fullscreen', [
       'toggle'
     ])
   }
diff --git a/src/main.js b/src/main.js
index f9c5628b..7e417ae4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@ new Vue({
     // 获取并记录用户 UA
     this.$store.commit('d2admin/ua/get')
     // 初始化全屏监听
-    this.$store.commit('d2admin/fullscreen/listen')
+    this.$store.dispatch('d2admin/fullscreen/listen')
   },
   watch: {
     // 监听路由 控制侧边栏显示
diff --git a/src/store/modules/d2admin/modules/fullscreen.js b/src/store/modules/d2admin/modules/fullscreen.js
index ed8dcb53..3a48da54 100644
--- a/src/store/modules/d2admin/modules/fullscreen.js
+++ b/src/store/modules/d2admin/modules/fullscreen.js
@@ -6,31 +6,42 @@ export default {
     // 全屏激活
     active: false
   },
-  mutations: {
+  actions: {
     /**
      * @description 初始化监听
      */
-    listen () {
-      if (screenfull.enabled) {
-        screenfull.on('change', () => {
-          if (!screenfull.isFullscreen) {
-            this.commit('set', false)
-          }
-        })
-      }
+    listen ({ commit }) {
+      return new Promise(resolve => {
+        if (screenfull.enabled) {
+          screenfull.on('change', () => {
+            console.log('1')
+            if (!screenfull.isFullscreen) {
+              commit('set', false)
+            }
+          })
+        }
+        // end
+        resolve()
+      })
     },
     /**
      * @description 切换全屏
      */
-    toggle () {
-      if (screenfull.isFullscreen) {
-        screenfull.exit()
-        this.commit('set', false)
-      } else {
-        screenfull.request()
-        this.commit('set', true)
-      }
-    },
+    toggle ({ commit }) {
+      return new Promise(resolve => {
+        if (screenfull.isFullscreen) {
+          screenfull.exit()
+          commit('set', false)
+        } else {
+          screenfull.request()
+          commit('set', true)
+        }
+        // end
+        resolve()
+      })
+    }
+  },
+  mutations: {
     /**
      * @description 设置 store 里的全屏状态
      * @param {Object} state vuex state

From e50c58d8a2bad60eead3d92f3f4f8945a1e179de Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 18 Sep 2018 10:04:36 +0800
Subject: [PATCH 10/13] no message

Former-commit-id: 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 0479091286ca61f30b123810db0a87196eb3dac1 [formerly 61ec8193c62099b658488bb91d60dd1abeddb91e]]]]]
Former-commit-id: 273d4d2602874c9604866d0a9af1ec8d5fe9cd3c
Former-commit-id: 8b55642a785c01930f42ff8fe14ba4dd88b7d4aa
Former-commit-id: 671e44d2cd87e2c454fe1c302e6ce760dedb12f6 [formerly 143ea9e6283c5f3106ee3b9beaa46c6eb046dc45]
Former-commit-id: 0a5cc3c3446d71c20881750235c6427238f620cf
Former-commit-id: 8c8b365399c92d91d971505edcbaa080e8fed779
Former-commit-id: 35e40f3cf4ce652c06583f715736cb7bab335e23
Former-commit-id: f5e3930b893573dcfc82aa8d5d663db56d7656a4
Former-commit-id: f4728a96b3be4e92709c1e5b813fe155be5d1bfd
---
 src/store/modules/d2admin/modules/log.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/store/modules/d2admin/modules/log.js b/src/store/modules/d2admin/modules/log.js
index e6517cc3..cabe8130 100644
--- a/src/store/modules/d2admin/modules/log.js
+++ b/src/store/modules/d2admin/modules/log.js
@@ -24,16 +24,6 @@ export default {
       return state.list.filter(l => l.type === 'error').length
     }
   },
-  mutations: {
-    /**
-     * @description 清空日志
-     * @param {Object} state vuex state
-     */
-    clean (state) {
-      // store 赋值
-      state.list = []
-    }
-  },
   actions: {
     /**
      * @description 添加一个日志
@@ -70,5 +60,15 @@ export default {
         info: toString(info)
       }))
     }
+  },
+  mutations: {
+    /**
+     * @description 清空日志
+     * @param {Object} state vuex state
+     */
+    clean (state) {
+      // store 赋值
+      state.list = []
+    }
   }
 }

From 12aabd1d585787fe12a72961cc24943b83d6dd22 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 18 Sep 2018 11:16:19 +0800
Subject: [PATCH 11/13] no message

Former-commit-id: 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 8d0683612bf0b8cdb70b21b6badc69cfd620df5a [formerly dafeae1d99aae939a8d74ff7136e3cb20187f9b5]]]]]
Former-commit-id: 74d80f9cdcc0e0b715301fc9dc2e1c60b5d6584f
Former-commit-id: fb8ae970044e24416eb4ed5845c8c8f7686732d7
Former-commit-id: 1970627df90cd7afaef7ceaae479c78f8f1a1271 [formerly 867fa683b162cd05b0cd62eb93cad7e04db59193]
Former-commit-id: b280766dae7b983a49a8f5e76ce8299edb3686f9
Former-commit-id: 8ef7dabe9284e66b07da42de959f2efbd0629f90
Former-commit-id: ad38ec7743de387e3448e721d22f81320a5450aa
Former-commit-id: 7054fc758430ce204c932ba521831b3cf418a469
Former-commit-id: 48556d369d24e25344cd1ee8a50fefda6922779f
---
 package.json                                         | 2 +-
 src/pages/demo/playground/store/fullscreen/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 09953cba..93ac554b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
diff --git a/src/pages/demo/playground/store/fullscreen/index.vue b/src/pages/demo/playground/store/fullscreen/index.vue
index f041ca8d..a8b59b77 100644
--- a/src/pages/demo/playground/store/fullscreen/index.vue
+++ b/src/pages/demo/playground/store/fullscreen/index.vue
@@ -8,10 +8,10 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapActions } from 'vuex'
 export default {
   methods: {
-    ...mapMutations('d2admin/fullscreen', [
+    ...mapActions('d2admin/fullscreen', [
       'toggle'
     ])
   }

From 6a6e55725e20778bae4a6b665e5c259e59d876b6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 19 Sep 2018 10:43:09 +0800
Subject: [PATCH 12/13] todo

Former-commit-id: 29daf43a4c5a2880afb881b89479995902ef221f [formerly 29daf43a4c5a2880afb881b89479995902ef221f [formerly 29daf43a4c5a2880afb881b89479995902ef221f [formerly 29daf43a4c5a2880afb881b89479995902ef221f [formerly 1f1cb8ef29aee93038d5aec13490c811a8222d6a [formerly 3ba540e68ea5d9602ec23c0a06d7a476c00f51f8]]]]]
Former-commit-id: 79ed55021316e9228ec756e8fe894213f3a58e32
Former-commit-id: bd5e1b313495e83811affe78c5a9f4ebf1f335ff
Former-commit-id: 2975426f142339416bc32b3878d2f1868e1ddc97 [formerly 5aa09ed7ea5b181fa228d63cdd04bc0934918c63]
Former-commit-id: c7ca16ecb7aff9687a36ce99f0d1be1eb0f30f0a
Former-commit-id: 89ff202bdf2c2b6bdfaa444ec596695f5d46a591
Former-commit-id: 7b68d1f2b8ae2a8e57746ebc52b2033412a0992a
Former-commit-id: ab65ff77a9b69411d89ccf4cd8ce1b69b2dfb024
Former-commit-id: 004f338f6aeeb65d65459e5e50e3ff43ac0f966f
---
 README.md                          |   6 ++
 doc/CH.md                          | 133 -----------------------------
 doc/image/we@2x.png.REMOVED.git-id |   1 -
 3 files changed, 6 insertions(+), 134 deletions(-)
 delete mode 100644 doc/CH.md
 delete mode 100644 doc/image/we@2x.png.REMOVED.git-id

diff --git a/README.md b/README.md
index d55f2900..ee867d21 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,12 @@
 * 全局菜单搜索 `1.3.0 +`
 * 自定义登录重定向 `1.3.0 +`
 
+## TODO
+
+* 可以折叠后显示一行输入控件的的表格搜索栏组件
+* 用户管理示例界面（用户管理、权限管理、角色管理等）方便对接后台
+* 更多的错误信息页面以及美化错误页面（404、401...）
+
 ## 其它版本
 
 | 名称 | Github / 主页  | 预览 | 介绍 |
diff --git a/doc/CH.md b/doc/CH.md
deleted file mode 100644
index 1e2f03b2..00000000
--- a/doc/CH.md
+++ /dev/null
@@ -1,133 +0,0 @@
-![banner](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/banner.png)
-
-<p align="center">
-  <a><img src="https://img.shields.io/github/release/d2-projects/d2-admin.svg"/></a>
-  <a><img src="https://img.shields.io/npm/v/@d2-admin/ice-scaffold.svg"/></a>
-  <a href="https://www.travis-ci.org/d2-projects/d2-admin"><img src="https://www.travis-ci.org/d2-projects/d2-admin.svg?branch=master"/></a>
-  <a><img src="https://img.shields.io/github/last-commit/d2-projects/d2-admin.svg"/></a>
-  <a><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg"/></a>
-</p>
-
-<p align="center">
-	<a><img src="https://img.shields.io/github/issues/d2-projects/d2-admin.svg"/></a>
-	<a><img src="https://img.shields.io/github/issues-closed/d2-projects/d2-admin.svg"/></a>
-	<a><img src="https://img.shields.io/github/issues-pr/d2-projects/d2-admin.svg"/></a>
-	<a><img src="https://img.shields.io/github/issues-pr-closed/d2-projects/d2-admin.svg"/></a>
-	<a><img src="https://img.shields.io/github/forks/d2-projects/d2-admin.svg"/></a>
-	<a><img src="https://img.shields.io/github/stars/d2-projects/d2-admin.svg"/></a>
-</p>
-
-[D2Admin](https://github.com/d2-projects/d2-admin) 是一个完全**开源免费**的管理系统前端集成方案，为您做好大部分项目前期准备工作，提供大量示例代码，方便快速进行管理系统开发。
-
-## 文档
-
-[中文文档](https://d2-projects.github.io/d2-admin-doc/zh/)
-
-## 预览
-
-[预览地址](https://d2-projects.github.io/d2-admin/)
-
-> 预览部署在 Github Page ，如果您访问时由于网络原因卡在载入界面或者白屏，请克隆或者下载本仓库在本地运行查看效果。
-
-## 码云镜像
-
-[码云](https://gitee.com/fairyever/d2-admin)
-
-## 功能
-
-* 使用 vue-cli3 构建
-* 首屏加载等待动画
-* 五款主题
-* 详细的文档
-* 登录和注销
-* 分离的路由和菜单设置
-* 可折叠侧边栏
-* 多国语
-* 富文本编辑器
-* Markdown 编辑器
-* 全屏
-* Fontawesome 图标库
-* 图标选择器
-* 自动注册 SVG 图标
-* 模拟数据
-* 剪贴板封装
-* 图表库
-* 时间日期计算工具
-* 导入 Excel （ xlsx + csv ）
-* 数据导出 Excel （ xlsx + csv ）
-* 数据导出文本
-* 数字动画
-* 可拖拽调整大小的区块布局
-* 可拖拽调整大小和位置的网格布局
-* 开箱即用的页面布局组件
-* 加载并解析 markdown 文件
-* GitHub 样式的 markdown 显示组件
-* markdown 内代码高亮
-* 为 markdown 扩展了百度云链接解析和优化显示
-* 右键菜单组件
-* 自定义滚动条和滚动控制
-* 公用样式抽离，方便的主题定制
-* 支持临时菜单配置
-* 系统功能展示模块 `1.1.4 +`
-* 多标签页模式 `1.1.4 +`
-* 美化滚动条 `1.1.4 +`
-* json view `1.1.4 +`
-* cookie 封装 `1.1.5 +`
-* 多标签页全局控制 API `1.1.5 +`
-* 菜单全局控制 API `1.1.5 +`
-* 多标签页关闭控制支持右键菜单 `1.1.10 +`
-* 模块化全局状态管理 `1.2.0 +`
-* 多种数据持久化方式：区分用户，区分路由，页面数据快照功能 `1.2.0 +`
-* 支持跳出外部链接的菜单系统 `1.2.0 +`
-* 支持菜单 svg 图标 `1.3.0 +`
-* 日志记录和错误捕捉 `1.3.0 +`
-* 全局菜单搜索 `1.3.0 +`
-* 自定义登录重定向 `1.3.0 +`
-
-## 其它版本
-
-| 名称 | Github / 主页  | 预览 | 介绍 |
-| --- | --- | --- | --- |
-| 简化版模板 | [Github](https://github.com/d2-projects/d2-admin-start-kit) | [预览](https://d2-projects.github.io/d2-admin-start-kit) | 无 |
-| 飞冰脚手架 | [飞冰](https://alibaba.github.io/ice/scaffold?type=vue) | [预览](https://d2-projects.github.io/d2-admin-ice) | [介绍](https://juejin.im/post/5b6349716fb9a04f834669d6) |
-
-## 生态
-
-| 名称 | Github / 主页 | 预览 | 介绍 |
-| --- | --- | --- | --- |
-| D2 CRUD | [Github](https://github.com/d2-projects/d2-crud) | [预览](https://d2-projects.github.io/d2-admin/#/demo/d2-crud/index) | 表格常用操作封装 |
-| D2 Ribbons | [Github](https://github.com/d2-projects/d2-ribbons) | [预览](https://github.com/d2-projects/d2-ribbons) | 开源项目徽标库 |
-
-## 徽章
-
-如果您的开源项目基于 D2Admin 开发，请在您的 README 添加下面的徽章：
-
-<a href="https://github.com/d2-projects/d2-admin" target="_blank">
-	<img src="https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/d2-admin@2x.png" width="200">
-</a>
-
-复制下面代码加入到 README 中即可：
-
-``` html
-<a href="https://github.com/d2-projects/d2-admin" target="_blank"><img src="https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/d2-admin@2x.png" width="200"></a>
-```
-
-同时您可以将您的项目汇报给我们，优秀项目我们会放置在 D2Admin 相关位置并帮助您宣传。
-
-## 加入我们
-
-D2Admin 是完全开源免费的项目，旨在帮助开发者更方便地进行管理系统开发，同时也提供 2000 人的 QQ 交流群和微信群，前后端的朋友可以相互答疑，项目组成员全部在内，所有 D2 相关项目使用问题欢迎在群内提问。
-
-> 隐性福利：重要通知会发群红包
-
-![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/join@2x.png)
-
-## 支持
-
-D2 Projects 相关项目全部完全免费，但是也有相关的费用支出，比如七牛图床、码云付费 page 服务（已经废弃）、服务器和域名（现已全部转至 Github）、QQ 群扩容、群内红包福利等，现已花费数百元。所以如果您喜欢这些项目欢迎小额捐助一下，十分感谢。
-
-![reward-me](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/reward-me@2x.png)
-
-如果希望您的博客或者网站出现在 [D2 Projects](https://github.com/d2-projects) 项目的 README 以及文档中，请联系作者。
-
-![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/give-a-star@2x.png)
\ No newline at end of file
diff --git a/doc/image/we@2x.png.REMOVED.git-id b/doc/image/we@2x.png.REMOVED.git-id
deleted file mode 100644
index 5748278d..00000000
--- a/doc/image/we@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-2ef12d88b2011063784c37f8b8490336503a5f88
\ No newline at end of file

From 4aaab112c61c9417521048339d3205bd2e81748f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com>
Date: Wed, 19 Sep 2018 10:58:28 +0800
Subject: [PATCH 13/13] crud example

Former-commit-id: e345e832b7f55adfa312e0972693939953150e46 [formerly e345e832b7f55adfa312e0972693939953150e46 [formerly e345e832b7f55adfa312e0972693939953150e46 [formerly e345e832b7f55adfa312e0972693939953150e46 [formerly b836828ea96a2163653f09cfd4c39c1fe537b4ac [formerly 030702be43d00a35d004f13dff3bb74dd089f14a]]]]]
Former-commit-id: 5c0961245ea5c8d68bc8a5b647c251340e47c98e
Former-commit-id: 7c0668c675d4339929de35632a278bb2c7c1e62d
Former-commit-id: 75cef2b779bafae654cbd5044cc5eca8eceec67c [formerly 07c3860026c0a560111de35fcf6546dcd0fcd27d]
Former-commit-id: 39d1e5aecd1c0fb8140d3bb348457834a69aa27f
Former-commit-id: d4802ee50b46b8747a9431b60b07016ad8c5c900
Former-commit-id: 5996d6cc294f4232189f181b2b75eeafb11c7eb6
Former-commit-id: 50b5c8a0b27073ab09fa4bdde677c0a249a33a7c
Former-commit-id: 09c6958edf70626c1f1f48b683ca54dcd8131c40
---
 package.json                            |   2 +-
 src/menu/modules/demo-d2-crud.js        |   3 +
 src/pages/demo/d2-crud/demo27/code.js   |  54 ++++++++++
 src/pages/demo/d2-crud/demo27/doc.md    |   1 +
 src/pages/demo/d2-crud/demo27/index.vue |  76 ++++++++++++++
 src/pages/demo/d2-crud/demo28/code.js   |  60 +++++++++++
 src/pages/demo/d2-crud/demo28/doc.md    |   1 +
 src/pages/demo/d2-crud/demo28/index.vue |  82 +++++++++++++++
 src/pages/demo/d2-crud/demo29/code.js   | 113 +++++++++++++++++++++
 src/pages/demo/d2-crud/demo29/doc.md    |   1 +
 src/pages/demo/d2-crud/demo29/index.vue | 128 ++++++++++++++++++++++++
 src/router/routes.js.REMOVED.git-id     |   2 +-
 yarn.lock.REMOVED.git-id                |   2 +-
 13 files changed, 522 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/d2-crud/demo27/code.js
 create mode 100644 src/pages/demo/d2-crud/demo27/doc.md
 create mode 100644 src/pages/demo/d2-crud/demo27/index.vue
 create mode 100644 src/pages/demo/d2-crud/demo28/code.js
 create mode 100644 src/pages/demo/d2-crud/demo28/doc.md
 create mode 100644 src/pages/demo/d2-crud/demo28/index.vue
 create mode 100644 src/pages/demo/d2-crud/demo29/code.js
 create mode 100644 src/pages/demo/d2-crud/demo29/doc.md
 create mode 100644 src/pages/demo/d2-crud/demo29/index.vue

diff --git a/package.json b/package.json
index 93ac554b..97041907 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@d2-projects/d2-crud": "^1.1.0",
+    "@d2-projects/d2-crud": "^1.2.0",
     "axios": "^0.17.1",
     "babel-polyfill": "^6.26.0",
     "better-scroll": "^1.12.1",
diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js
index 6eed0d36..1d86836a 100644
--- a/src/menu/modules/demo-d2-crud.js
+++ b/src/menu/modules/demo-d2-crud.js
@@ -8,6 +8,8 @@ export default {
       title: '基础功能',
       children: [
         { path: `${pre}demo1`, title: '基础表格' },
+        { path: `${pre}demo27`, title: '加载状态' },
+        { path: `${pre}demo28`, title: '自定义加载状态' },
         { path: `${pre}demo2`, title: '带斑马纹表格' },
         { path: `${pre}demo3`, title: '带边框表格' },
         { path: `${pre}demo4`, title: '带状态表格' },
@@ -28,6 +30,7 @@ export default {
     {
       title: '数据操作',
       children: [
+        { path: `${pre}demo29`, title: '分页' },
         { path: `${pre}demo16`, title: '新增数据' },
         { path: `${pre}demo17`, title: '修改数据' },
         { path: `${pre}demo18`, title: '删除数据' },
diff --git a/src/pages/demo/d2-crud/demo27/code.js b/src/pages/demo/d2-crud/demo27/code.js
new file mode 100644
index 00000000..4045eed0
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo27/code.js
@@ -0,0 +1,54 @@
+export default `<template>
+  <div>
+  <d2-crud
+    :columns="columns"
+    :data="data"
+    :loading="loading"/>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      columns: [
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '地址',
+          key: 'address'
+        }
+      ],
+      data: [
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ],
+      loading: true
+    }
+  }
+}
+</script>`
diff --git a/src/pages/demo/d2-crud/demo27/doc.md b/src/pages/demo/d2-crud/demo27/doc.md
new file mode 100644
index 00000000..b256dd9a
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo27/doc.md
@@ -0,0 +1 @@
+在 `D2 Crud` 组件中传入 `loading` ，即可控制表格加载状态，`loading` 的可选值为 `true` 和 `false`。代码如下：
diff --git a/src/pages/demo/d2-crud/demo27/index.vue b/src/pages/demo/d2-crud/demo27/index.vue
new file mode 100644
index 00000000..41b0f7c7
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo27/index.vue
@@ -0,0 +1,76 @@
+<template>
+  <d2-container>
+    <template slot="header">加载状态</template>
+    <el-button @click="handleLoading">点我切换加载状态</el-button>
+    <d2-crud
+      style="margin-top: 10px"
+      :columns="columns"
+      :data="data"
+      :loading="loading"/>
+    <el-card shadow="never" class="d2-mb">
+      <d2-markdown :source="doc"/>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <d2-highlight :code="code"/>
+    </el-card>
+    <template slot="footer">
+      <d2-link-btn title="文档" link="https://d2-projects.github.io/d2-admin-doc/zh/ecosystem-d2-crud/"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import doc from './doc.md'
+import code from './code.js'
+
+export default {
+  data () {
+    return {
+      doc,
+      code,
+      columns: [
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '地址',
+          key: 'address'
+        }
+      ],
+      data: [
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ],
+      loading: true
+    }
+  },
+  methods: {
+    handleLoading () {
+      this.loading = !this.loading
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/d2-crud/demo28/code.js b/src/pages/demo/d2-crud/demo28/code.js
new file mode 100644
index 00000000..c606ecc3
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo28/code.js
@@ -0,0 +1,60 @@
+export default `<template>
+  <div>
+  <d2-crud
+    :columns="columns"
+    :data="data"
+    :loading="loading"
+    :loading-options="loadingOptions"/>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      columns: [
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '地址',
+          key: 'address'
+        }
+      ],
+      data: [
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ],
+      loading: true,
+      loadingOptions: {
+        text: '拼命加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.8)'
+      }
+    }
+  }
+}
+</script>`
diff --git a/src/pages/demo/d2-crud/demo28/doc.md b/src/pages/demo/d2-crud/demo28/doc.md
new file mode 100644
index 00000000..da309d42
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo28/doc.md
@@ -0,0 +1 @@
+在 `D2 Crud` 组件中传入 `loading-options` ，即可自定义表格加载状态。代码如下：
diff --git a/src/pages/demo/d2-crud/demo28/index.vue b/src/pages/demo/d2-crud/demo28/index.vue
new file mode 100644
index 00000000..6105df68
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo28/index.vue
@@ -0,0 +1,82 @@
+<template>
+  <d2-container>
+    <template slot="header">自定义加载状态</template>
+    <el-button @click="handleLoading">点我切换加载状态</el-button>
+    <d2-crud
+      style="margin-top: 10px"
+      :columns="columns"
+      :data="data"
+      :loading="loading"
+      :loading-options="loadingOptions"/>
+    <el-card shadow="never" class="d2-mb">
+      <d2-markdown :source="doc"/>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <d2-highlight :code="code"/>
+    </el-card>
+    <template slot="footer">
+      <d2-link-btn title="文档" link="https://d2-projects.github.io/d2-admin-doc/zh/ecosystem-d2-crud/"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import doc from './doc.md'
+import code from './code.js'
+
+export default {
+  data () {
+    return {
+      doc,
+      code,
+      columns: [
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '地址',
+          key: 'address'
+        }
+      ],
+      data: [
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ],
+      loading: true,
+      loadingOptions: {
+        text: '拼命加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.8)'
+      }
+    }
+  },
+  methods: {
+    handleLoading () {
+      this.loading = !this.loading
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/d2-crud/demo29/code.js b/src/pages/demo/d2-crud/demo29/code.js
new file mode 100644
index 00000000..a8a10b8d
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo29/code.js
@@ -0,0 +1,113 @@
+export default `<template>
+  <div>
+  <d2-crud
+    :columns="columns"
+    :data="data"
+    :pagination="pagination"/>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      columns: [
+        {
+          title: 'ID',
+          key: 'id'
+        },
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '地址',
+          key: 'address'
+        }
+      ],
+      data: [
+        {
+          id: 1,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          id: 2,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          id: 3,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          id: 4,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        },
+        {
+          id: 5,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          id: 6,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          id: 7,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          id: 8,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        },
+        {
+          id: 9,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          id: 10,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          id: 11,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          id: 12,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ],
+      pagination: {
+        pageSize: 5,
+        layout: 'prev, pager, next, total'
+      }
+    }
+  }
+}
+</script>`
diff --git a/src/pages/demo/d2-crud/demo29/doc.md b/src/pages/demo/d2-crud/demo29/doc.md
new file mode 100644
index 00000000..f5ccb271
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo29/doc.md
@@ -0,0 +1 @@
+在 `D2 Crud` 组件中传入 `pagination` 对象，即可开启分页。代码如下：
diff --git a/src/pages/demo/d2-crud/demo29/index.vue b/src/pages/demo/d2-crud/demo29/index.vue
new file mode 100644
index 00000000..b543e7e5
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo29/index.vue
@@ -0,0 +1,128 @@
+<template>
+  <d2-container>
+    <template slot="header">分页</template>
+    <d2-crud
+      :columns="columns"
+      :data="data"
+      :pagination="pagination"/>
+    <el-card shadow="never" class="d2-mb">
+      <d2-markdown :source="doc"/>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <d2-highlight :code="code"/>
+    </el-card>
+    <template slot="footer">
+      <d2-link-btn title="文档" link="https://d2-projects.github.io/d2-admin-doc/zh/ecosystem-d2-crud/"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import doc from './doc.md'
+import code from './code.js'
+
+export default {
+  data () {
+    return {
+      doc,
+      code,
+      columns: [
+        {
+          title: 'ID',
+          key: 'id'
+        },
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '地址',
+          key: 'address'
+        }
+      ],
+      data: [
+        {
+          id: 1,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          id: 2,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          id: 3,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          id: 4,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        },
+        {
+          id: 5,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          id: 6,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          id: 7,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          id: 8,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        },
+        {
+          id: 9,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          id: 10,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          id: 11,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        },
+        {
+          id: 12,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ],
+      pagination: {
+        pageSize: 5,
+        layout: 'prev, pager, next, total'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 3d2a77b8..fdb073b8 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-c62802e4146a602e5c498cdb99205b56768d4047
\ No newline at end of file
+b2bf5f06d7bc6fbdb1464a1eea0e2eae737ea6af
\ No newline at end of file
diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id
index f27b6ed1..6be17d28 100644
--- a/yarn.lock.REMOVED.git-id
+++ b/yarn.lock.REMOVED.git-id
@@ -1 +1 @@
-98d7a73c1fb484dbcca94b8f6a41f916b8a30c20
\ No newline at end of file
+9f0de1b1283741f3ab3b7a925f9b96808cfb51e5
\ No newline at end of file