diff --git a/src/layout/header-aside/components/header-fullscreen/index.vue b/src/layout/header-aside/components/header-fullscreen/index.vue
index 8e6ed7ea..8ee8e184 100644
--- a/src/layout/header-aside/components/header-fullscreen/index.vue
+++ b/src/layout/header-aside/components/header-fullscreen/index.vue
@@ -1,10 +1,10 @@
 <template>
   <el-tooltip
     effect="dark"
-    :content="isFullScreen ? '退出全屏' : '全屏'"
+    :content="active ? '退出全屏' : '全屏'"
     placement="bottom">
-    <el-button class="d2-mr btn-text can-hover" type="text" @click="fullScreenToggle">
-      <d2-icon v-if="isFullScreen" name="compress"/>
+    <el-button class="d2-mr btn-text can-hover" type="text" @click="toggle">
+      <d2-icon v-if="active" name="compress"/>
       <d2-icon v-else name="arrows-alt" style="font-size: 16px"/>
     </el-button>
   </el-tooltip>
@@ -14,13 +14,13 @@
 import { mapState, mapMutations } from 'vuex'
 export default {
   computed: {
-    ...mapState('d2admin', [
-      'isFullScreen'
+    ...mapState('d2admin/fullscreen', [
+      'active'
     ])
   },
   methods: {
-    ...mapMutations('d2admin', [
-      'fullScreenToggle'
+    ...mapMutations('d2admin/fullscreen', [
+      'toggle'
     ])
   }
 }
diff --git a/src/main.js b/src/main.js
index 8383fe04..a2214d24 100644
--- a/src/main.js
+++ b/src/main.js
@@ -81,7 +81,7 @@ new Vue({
       if (screenfull.enabled) {
         screenfull.on('change', () => {
           if (!screenfull.isFullscreen) {
-            this.$store.commit('d2admin/fullScreenSet', false)
+            this.$store.commit('d2admin/fullscreen/set', false)
           }
         })
       }
diff --git a/src/pages/demo/playground/store/fullscreen/index.vue b/src/pages/demo/playground/store/fullscreen/index.vue
index 1f464d34..f041ca8d 100644
--- a/src/pages/demo/playground/store/fullscreen/index.vue
+++ b/src/pages/demo/playground/store/fullscreen/index.vue
@@ -1,23 +1,18 @@
 <template>
   <d2-container type="card" class="page-demo-playground-fullscreen">
     <template slot="header">全屏</template>
-    <el-button type="primary" @click="fullScreenToggle">
-      fullScreenToggle 切换全屏
+    <el-button type="primary" @click="toggle">
+      toggle 切换全屏
     </el-button>
   </d2-container>
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapMutations } from 'vuex'
 export default {
-  computed: {
-    ...mapState('d2admin', [
-      'isFullScreen'
-    ])
-  },
   methods: {
-    ...mapMutations('d2admin', [
-      'fullScreenToggle'
+    ...mapMutations('d2admin/fullscreen', [
+      'toggle'
     ])
   }
 }
diff --git a/src/pages/demo/playground/store/sys/index.vue b/src/pages/demo/playground/store/sys/index.vue
index a82bf6cc..b69befb2 100644
--- a/src/pages/demo/playground/store/sys/index.vue
+++ b/src/pages/demo/playground/store/sys/index.vue
@@ -30,7 +30,7 @@
         <el-col :span="8">
           <el-card shadow="never" class="d2-card d2-mb">
             <template slot="header">全屏模式</template>
-            <el-switch v-model="isFullScreen" active-text="打开" inactive-text="关闭" disabled/>
+            <el-switch v-model="fullscreenActive" active-text="打开" inactive-text="关闭" disabled/>
           </el-card>
         </el-col>
         <el-col :span="8">
@@ -145,10 +145,11 @@ export default {
       menuAsideCollapse: state => state.menu.asideCollapse,
       // 主题
       themeList: state => state.theme.list,
-      themeActiveName: state => state.theme.activeName
+      themeActiveName: state => state.theme.activeName,
+      // 全屏
+      fullscreenActive: state => state.fullscreen.active
     }),
     ...mapState('d2admin', [
-      'isFullScreen',
       'isGrayMode',
       'pagePool',
       'pageOpenedList',
diff --git a/src/store/modules/d2admin/index.js.REMOVED.git-id b/src/store/modules/d2admin/index.js.REMOVED.git-id
index 801fe7b9..91f75821 100644
--- a/src/store/modules/d2admin/index.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/index.js.REMOVED.git-id
@@ -1 +1 @@
-4ece1c4e7a74f137bfa094cbb973d62c91bde205
\ No newline at end of file
+4d21835fa9e3352a4c11053634775c7e45774fae
\ No newline at end of file
diff --git a/src/store/modules/d2admin/modules/fullscreen.js b/src/store/modules/d2admin/modules/fullscreen.js
new file mode 100644
index 00000000..04c09f82
--- /dev/null
+++ b/src/store/modules/d2admin/modules/fullscreen.js
@@ -0,0 +1,31 @@
+import screenfull from 'screenfull'
+
+export default {
+  namespaced: true,
+  state: {
+    // 全屏激活
+    active: false
+  },
+  mutations: {
+    /**
+     * @description 切换全屏
+     */
+    toggle () {
+      if (screenfull.isFullscreen) {
+        screenfull.exit()
+        this.commit('d2admin/fullscreen/set', false)
+      } else {
+        screenfull.request()
+        this.commit('d2admin/fullscreen/set', true)
+      }
+    },
+    /**
+     * @description 设置 store 里的全屏状态
+     * @param {Object} state vuex state
+     * @param {Boolean} active active
+     */
+    set (state, active) {
+      state.active = active
+    }
+  }
+}