Merge remote-tracking branch 'origin/develop'

Former-commit-id: 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 933ec55 [formerly 72e651cc8ce92aa7e50fafe5f12d509e5e15b78c]]]]]
Former-commit-id: e85058c
Former-commit-id: 8eeed91
Former-commit-id: a34dbd28211fe87c83efd9ecdc07ffe51c335037 [formerly 5ca5d85a142c755454c7dc2084b8115de47a2bcf]
Former-commit-id: 4dc8e397f374914f2eb4d9eee6c6599224df946e
Former-commit-id: 9d56e2a187d18d0baa485d867cffe85bd0f668ae
Former-commit-id: 50a7bad07be4e397b4f91b74d5aa9f2e04ef1602
Former-commit-id: c1ab4eb8cd1dd51a9adb9f7848279d5158185a7b
Former-commit-id: 36c56b92d2acdccd437c5489ee584e58f0122153

Author: FairyEver

package-lock.json.REMOVED.git-id

@@ -60,8 +60,8 @@ export default {
       title: '全局状态管理',
       icon: 'bolt',
       children: [
-        { path: `${pre}store/sys`, title: '系统状态', icon: 'microchip' },
         { path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' },
+        { path: `${pre}store/size`, title: '全局尺寸', icon: 'font' },
         { path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' },
         { path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' },
         { path: `${pre}store/fullscreen`, title: '全屏', icon: 'arrows-alt' },

src/menu/modules/demo-playground.js

@@ -0,0 +1,39 @@
+<template>
+  <d2-container type="card">
+    <el-radio-group v-model="currentValue" @change="sizeSet">
+      <el-radio-button label="default"></el-radio-button>
+      <el-radio-button label="medium"></el-radio-button>
+      <el-radio-button label="small"></el-radio-button>
+      <el-radio-button label="mini"></el-radio-button>
+    </el-radio-group>
+  </d2-container>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+  data () {
+    return {
+      currentValue: ''
+    }
+  },
+  computed: {
+    ...mapState('d2admin/size', [
+      'value'
+    ])
+  },
+  watch: {
+    value: {
+      handler (val) {
+        this.currentValue = val
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    ...mapMutations({
+      sizeSet: 'd2admin/size/set'
+    })
+  }
+}
+</script>

src/pages/demo/playground/store/size/index.vue

@@ -25,7 +25,6 @@ export default {
       defaultValue: '',
       user: true
     })
-    console.log('size: ', size)
     // Element
     Vue.use(ElementUI, {
       size

src/pages/demo/playground/store/sys/index.vue

@@ -1 +1 @@
-58069f63d26f33421df3d333c4aa58af52c87aaa
+c62802e4146a602e5c498cdb99205b56768d4047