From a5afbdd276e3da60fc7d54f01c14413b5d91b0d8 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 Aug 2018 08:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E7=9B=91=E5=90=AC=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=BD=AC=E7=A7=BB=E5=88=B0=20vuex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 2ed75d3e9260dfe60e349635b5e45be067537104 [formerly 2ed75d3e9260dfe60e349635b5e45be067537104 [formerly 2ed75d3e9260dfe60e349635b5e45be067537104 [formerly 2ed75d3e9260dfe60e349635b5e45be067537104 [formerly 3f49442068eec53a667d6f7209e9ee773874ba8f [formerly cbb2fa2684e85977cea096c2f032fbafd06e0645]]]]] Former-commit-id: e476bfdbc2162eb22086195d3650f0684920a88e Former-commit-id: c40fcdc5260348835bf5935351c71cddc9b0a3fa Former-commit-id: 9c0f55759897892c28b19744ffe0e0d92a4ade7e [formerly 873931f811fafd5412c4b66c6076120ede50f125] Former-commit-id: 5091786fea51acfe59acbd0455cdf64237b879dd Former-commit-id: 8ec2447d5c5a1d6ef8b9b8bca02215f6b88f314c Former-commit-id: e923a39727f81dbd0ec784a329cd5d6a84b8fea4 Former-commit-id: fa314bd094faf75a2a192fd8b813ba9076717425 Former-commit-id: 54dc0e649c391b44124a7ecfb8bdfb363068c393 --- src/main.js | 15 +-------------- src/store/modules/d2admin/modules/fullscreen.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main.js b/src/main.js index 7bb1f679..ed349395 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,6 @@ import 'flex.css' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import VCharts from 'v-charts' -import screenfull from 'screenfull' import contentmenu from 'v-contextmenu' import 'v-contextmenu/dist/index.css' import vueJsonTreeView from 'vue-json-tree-view' @@ -63,7 +62,7 @@ new Vue({ // 获取并记录用户 UA this.$store.commit('d2admin/ua/get') // 初始化全屏监听 - this.fullscreenListenerInit() + this.$store.commit('d2admin/fullscreen/listen') }, watch: { // 监听路由 控制侧边栏显示 @@ -73,18 +72,6 @@ new Vue({ } }, methods: { - /** - * 初始化全屏监听 - */ - fullscreenListenerInit () { - if (screenfull.enabled) { - screenfull.on('change', () => { - if (!screenfull.isFullscreen) { - this.$store.commit('d2admin/fullscreen/set', false) - } - }) - } - }, /** * 处理路由 得到所有的页面 */ diff --git a/src/store/modules/d2admin/modules/fullscreen.js b/src/store/modules/d2admin/modules/fullscreen.js index 04c09f82..3ee45fc2 100644 --- a/src/store/modules/d2admin/modules/fullscreen.js +++ b/src/store/modules/d2admin/modules/fullscreen.js @@ -7,6 +7,18 @@ export default { active: false }, mutations: { + /** + * @description 初始化监听 + */ + listen () { + if (screenfull.enabled) { + screenfull.on('change', () => { + if (!screenfull.isFullscreen) { + this.commit('d2admin/fullscreen/set', false) + } + }) + } + }, /** * @description 切换全屏 */