From f78b7cf8d21992be57dd72dcfb90e75ad47281e5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 7 Jul 2018 08:35:30 +0800
Subject: [PATCH] bug fixed

Former-commit-id: cee2e84bf93a15902e054f7dcf9d423dd7a8cb7d [formerly a3e4670d8a128ddd2709d03a6ce386c06ccdb75e] [formerly cee2e84bf93a15902e054f7dcf9d423dd7a8cb7d [formerly a3e4670d8a128ddd2709d03a6ce386c06ccdb75e] [formerly cee2e84bf93a15902e054f7dcf9d423dd7a8cb7d [formerly a3e4670d8a128ddd2709d03a6ce386c06ccdb75e] [formerly a3e4670d8a128ddd2709d03a6ce386c06ccdb75e [formerly 010f1cfa84ee2bfe58b2127efd66ef7bfb3f1c52 [formerly 1f0832d66825cb9ec4426a43f4b62a7c9c6266ed]]]]]
Former-commit-id: 6c447d20ab042c5dab8bfc2641be5bc282d6e99e
Former-commit-id: aee978972a1c863b00fe22dfb1db645ebf04ae57
Former-commit-id: 276be3dffedd92185ec302f0c36ce3cf9ac7ae36 [formerly 1b2771c8fb15db40dafb075d25ede92ee8ab50eb]
Former-commit-id: 8afa5f03f430475749aae3d66014091a765e2333
Former-commit-id: 3d3d7c9d15922416bd12d8c61be12dd114e3453a
Former-commit-id: 9ba07ef04f76fb8e351803e91e45165145e3ba64
Former-commit-id: 452c3282ee5fa9a704a2bcbff2eafd8b28abc582
Former-commit-id: 09e7ebc77a8e1af4f5a1784971432c1953c8b3cb
---
 package.json                                |  1 +
 src/libs/util.js                            | 31 ---------------------
 src/main.js                                 | 11 ++++++++
 src/store/modules/d2admin.js.REMOVED.git-id |  2 +-
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 5b283220..7a17a7a8 100755
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "particles.js": "^2.0.0",
     "path-posix": "^1.0.0",
     "quill": "^1.3.4",
+    "screenfull": "^3.3.2",
     "simplemde": "^1.11.2",
     "v-charts": "^1.17.6",
     "v-contextmenu": "^2.7.0",
diff --git a/src/libs/util.js b/src/libs/util.js
index 959ed886..867e6bbf 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -25,37 +25,6 @@ util.title = function (title) {
   window.document.title = `${prefix}${title ? ` | ${title}` : ''}`
 }
 
-/**
- * @description 打开全屏
- */
-util.openFullScreen = 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()
-  }
-}
-
-/**
- * @description 关闭全屏
- */
-util.exitFullScreen = function () {
-  if (document.exitFullscreen) {
-    document.exitFullscreen()
-  } else if (document.mozCancelFullScreen) {
-    document.mozCancelFullScreen()
-  } else if (document.webkitCancelFullScreen) {
-    document.webkitCancelFullScreen()
-  } else if (document.msExitFullscreen) {
-    document.msExitFullscreen()
-  }
-}
-
 /**
  * @description 在每次打开新页面的时候调用 打开一个新的 tab
  * @param {object} vm vue
diff --git a/src/main.js b/src/main.js
index c26f5080..c0bda36a 100755
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,9 @@ import '@/assets/icons/index'
 // markdown主题
 import 'github-markdown-css'
 
+// 全屏控制
+import screenfull from 'screenfull'
+
 // 代码高亮主题
 import '@/assets/library/highlight/styles/atom-one-light.css'
 
@@ -110,6 +113,14 @@ new Vue({
     this.$store.commit('d2adminPageOpenedListLoad')
     // D2Admin 开发环境检查更新
     util.checkUpdate(this)
+    // 检测退出全屏
+    if (screenfull.enabled) {
+      screenfull.on('change', () => {
+        if (!screenfull.isFullscreen) {
+          this.$store.commit('d2adminFullScreenSet', false)
+        }
+      })
+    }
   },
   methods: {
     /**
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index cdcef160..cb5e761c 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-151df8419f384f17f5ccd7a9df8cb5dd16e8c255
\ No newline at end of file
+0c08503962c63595a288af254074e6dc5f7d22a6
\ No newline at end of file