From 033a515d14249027e7b53c4b1190d560662b13e2 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 29 Jun 2018 10:10:55 +0800 Subject: [PATCH] no message Former-commit-id: 10f2006db58d9ffbcdc81414c8b33d42d884457f [formerly 10f2006db58d9ffbcdc81414c8b33d42d884457f [formerly 10f2006db58d9ffbcdc81414c8b33d42d884457f [formerly 10f2006db58d9ffbcdc81414c8b33d42d884457f [formerly 4b01cf39e23d49e268566835439c47dcf0d0fcb7 [formerly cc2d2a6ebe25cad4cbd8b60b5bc958d3e5ef73a9]]]]] Former-commit-id: 4ab7b7661f41a74631eb9a08cf4bf6fe9b10f148 Former-commit-id: ef266d0c906bb4a196c4e4a8969a24ea3be4c2e7 Former-commit-id: 3615f6cf0b640606ac0ad4dff34c0ffe8e416265 [formerly 549137f960f19f9918a184e42e06b660a89c58ee] Former-commit-id: b7db30355f5dfaace21f8079b36d4c6df2b92b43 Former-commit-id: 299562e0bd55e16cf6eec16d29a7cab3492c5c69 Former-commit-id: bf02b1bae1991c6b8efdf6444312114e0c13969c Former-commit-id: e8cd6e67b71d438071b44b643be775004c957c00 Former-commit-id: 61f50eea216f1197fd6968e61ba9ab76521587eb --- src/libs/util.js | 32 +++++++++++++++++++------------- src/store/modules/d2admin.js | 8 ++++++-- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/libs/util.js b/src/libs/util.js index 3005d779..0e8ce5ae 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -1,18 +1,9 @@ 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 () { +/** + * 打开全屏 + */ +util.openFullScreen = function () { const body = document.body if (body.requestFullscreen) { body.requestFullscreen() @@ -25,4 +16,19 @@ util.fullScreen = function () { } } +/** + * 关闭全屏 + */ +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() + } +} + export default util diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js index bcf62c64..50073951 100644 --- a/src/store/modules/d2admin.js +++ b/src/store/modules/d2admin.js @@ -8,12 +8,16 @@ export default { isFullScreen: false }, mutations: { + /** + * 切换全屏 + * @param {state} state + */ toggleFullScreen (state) { if (state.isFullScreen) { - util.closeFullScreen() + util.exitFullScreen() state.isFullScreen = false } else { - util.fullScreen() + util.openFullScreen() state.isFullScreen = true } }