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] 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