From 3d9e55aa1be782b2d63d7cb37ad5dad59a5ae35c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 29 Jun 2018 10:06:02 +0800
Subject: [PATCH] no message

Former-commit-id: 62f72e1267f878047fea26816238c56f2fc35e4b [formerly 62f72e1267f878047fea26816238c56f2fc35e4b [formerly 62f72e1267f878047fea26816238c56f2fc35e4b [formerly 62f72e1267f878047fea26816238c56f2fc35e4b [formerly 430fa2064324b61574ade51583f387995c465096 [formerly e1c1db85b2652803a7a91442c4911d3f0af5838d]]]]]
Former-commit-id: fa23a694fcae47e29bc15792d4abc5d63e8919d1
Former-commit-id: 162a6960fb8bc873d47ab883df0d7a612ca1251d
Former-commit-id: c5a349d609af97ef70b1f200891670dd35d12c66 [formerly eca40ad7517d16d6d8cc771fa092a3e9ff6aa17b]
Former-commit-id: 93ea41c72357b129d34b6684b078f2eab77e0291
Former-commit-id: bc306a17d14e06cb4198ea134c49ab4ac055ff5b
Former-commit-id: ced921ae612cbfdf6def5ed57e870b29a7bd6d3c
Former-commit-id: 4d8126dea156857a9d9687c2da2e88b93be0d457
Former-commit-id: 4fd9ffb4ee2ca5020c1fdcec620bd7fafd03aeaf
---
 .../components/-full-screen/index.vue         |  2 +-
 src/libs/util.js                              | 28 +++++++++++++
 src/store/index.js                            |  2 -
 src/store/modules/d2admin.js                  | 12 +++++-
 src/store/modules/fullScreen.js               | 40 -------------------
 5 files changed, 39 insertions(+), 45 deletions(-)
 create mode 100644 src/libs/util.js
 delete mode 100644 src/store/modules/fullScreen.js

diff --git a/src/components/core/d2-layout-main/components/-full-screen/index.vue b/src/components/core/d2-layout-main/components/-full-screen/index.vue
index 7f877d71..c411f9b9 100644
--- a/src/components/core/d2-layout-main/components/-full-screen/index.vue
+++ b/src/components/core/d2-layout-main/components/-full-screen/index.vue
@@ -15,7 +15,7 @@ import { mapState, mapMutations } from 'vuex'
 export default {
   computed: {
     ...mapState({
-      isFullScreen: state => state.fullScreen.isFullScreen
+      isFullScreen: state => state.d2admin.isFullScreen
     })
   },
   methods: {
diff --git a/src/libs/util.js b/src/libs/util.js
new file mode 100644
index 00000000..3005d779
--- /dev/null
+++ b/src/libs/util.js
@@ -0,0 +1,28 @@
+let util = {}
+
+util.closeFullScreen = function () {
+  if (document.exitFullscreen) {
+    document.exitFullscreen()
+  } else if (document.mozCancelFullScreen) {
+    document.mozCancelFullScreen()
+  } else if (document.webkitCancelFullScreen) {
+    document.webkitCancelFullScreen()
+  } else if (document.msExitFullscreen) {
+    document.msExitFullscreen()
+  }
+}
+
+util.fullScreen = function () {
+  const body = document.body
+  if (body.requestFullscreen) {
+    body.requestFullscreen()
+  } else if (body.mozRequestFullScreen) {
+    body.mozRequestFullScreen()
+  } else if (body.webkitRequestFullScreen) {
+    body.webkitRequestFullScreen()
+  } else if (body.msRequestFullscreen) {
+    body.msRequestFullscreen()
+  }
+}
+
+export default util
diff --git a/src/store/index.js b/src/store/index.js
index 0705327a..f05e5eee 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -4,7 +4,6 @@ import Vuex from 'vuex'
 import d2admin from './modules/d2admin'
 
 import menu from './modules/menu'
-import fullScreen from './modules/fullScreen'
 import theme from './modules/theme'
 
 Vue.use(Vuex)
@@ -13,7 +12,6 @@ export default new Vuex.Store({
   modules: {
     d2admin,
     menu,
-    fullScreen,
     theme
   }
 })
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index f7684ed2..bcf62c64 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -1,3 +1,5 @@
+import util from '@/libs/util.js'
+
 export default {
   state: {
     // 系统
@@ -6,8 +8,14 @@ export default {
     isFullScreen: false
   },
   mutations: {
-    alertAppName (state) {
-      alert(state.appName)
+    toggleFullScreen (state) {
+      if (state.isFullScreen) {
+        util.closeFullScreen()
+        state.isFullScreen = false
+      } else {
+        util.fullScreen()
+        state.isFullScreen = true
+      }
     }
   }
 }
diff --git a/src/store/modules/fullScreen.js b/src/store/modules/fullScreen.js
deleted file mode 100644
index 7fa7ddda..00000000
--- a/src/store/modules/fullScreen.js
+++ /dev/null
@@ -1,40 +0,0 @@
-export default {
-  state: {
-    isFullScreen: false
-  },
-  mutations: {
-    toggleFullScreen (state) {
-      const d = document
-      const body = d.body
-      const closeFullScreen = () => {
-        if (d.exitFullscreen) {
-          d.exitFullscreen()
-        } else if (d.mozCancelFullScreen) {
-          d.mozCancelFullScreen()
-        } else if (d.webkitCancelFullScreen) {
-          d.webkitCancelFullScreen()
-        } else if (d.msExitFullscreen) {
-          d.msExitFullscreen()
-        }
-        state.isFullScreen = false
-      }
-      const fullScreen = () => {
-        if (body.requestFullscreen) {
-          body.requestFullscreen()
-        } else if (body.mozRequestFullScreen) {
-          body.mozRequestFullScreen()
-        } else if (body.webkitRequestFullScreen) {
-          body.webkitRequestFullScreen()
-        } else if (body.msRequestFullscreen) {
-          body.msRequestFullscreen()
-        }
-        state.isFullScreen = true
-      }
-      if (state.isFullScreen) {
-        closeFullScreen()
-      } else {
-        fullScreen()
-      }
-    }
-  }
-}