From f0aa8a600ecd09be7e47be1762a88dada8744dd9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 12 Sep 2018 09:44:13 +0800
Subject: [PATCH 1/2] remove sys page

Former-commit-id: f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly 5d34221abf83c3a4075867e5250cceccc87ed5f2 [formerly 377c63c9ed64bd4d844fc847a4abd91cd85e0cc7]]]]]
Former-commit-id: 509465d465f44ced64dbcb80739123c9601b8f2b
Former-commit-id: 3e3ad33268a5d8f9b43f00ecce9f38ad2a1f85b6
Former-commit-id: 5e4267d4e01b1fbe1ac54e3b7b4e972b0cba3de9 [formerly aa4c6b47934baf0da1c4f0fd1e3eba706b1e393b]
Former-commit-id: ebe7073116283b080c02b0779a1a201894a445ab
Former-commit-id: 8af25c2d1cfeb6614a51eac3828bc49c74003701
Former-commit-id: 6daa09cbdce17045aea484e7f5fec6b3f388f5e4
Former-commit-id: 0532f9553a65e5ba81ee157b23f0f163fff6fa76
Former-commit-id: 58204a1ae07090e3356ef23f0d117a9e776354e3
---
 src/menu/modules/demo-playground.js           |   1 -
 src/pages/demo/playground/store/sys/index.vue | 172 ------------------
 src/router/routes.js.REMOVED.git-id           |   2 +-
 3 files changed, 1 insertion(+), 174 deletions(-)
 delete mode 100644 src/pages/demo/playground/store/sys/index.vue

diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index 75037b95..571cee06 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -60,7 +60,6 @@ export default {
       title: '全局状态管理',
       icon: 'bolt',
       children: [
-        { path: `${pre}store/sys`, title: '系统状态', icon: 'microchip' },
         { path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' },
         { path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' },
         { path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' },
diff --git a/src/pages/demo/playground/store/sys/index.vue b/src/pages/demo/playground/store/sys/index.vue
deleted file mode 100644
index a4846fbb..00000000
--- a/src/pages/demo/playground/store/sys/index.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <d2-container type="ghost">
-    <template slot="header">version {{releasesVersion}} [ {{releasesUpdate ? '有新版本' : '已经是最新版本'}} ]</template>
-    <div class="d2-mt d2-mr">
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">顶栏菜单数据</template>
-            <div style="height: 260px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="menuHeader"
-                :options="{ rootObjectKey: 'menuHeader', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="12">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">侧边栏菜单数据</template>
-            <div style="height: 260px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="menuAside"
-                :options="{ rootObjectKey: 'menuAside', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">全屏模式</template>
-            <el-switch v-model="fullscreenActive" active-text="打开" inactive-text="关闭" disabled/>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">灰度模式</template>
-            <el-switch v-model="grayActive" active-text="打开" inactive-text="关闭" disabled/>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">侧边栏折叠</template>
-            <el-switch v-model="menuAsideCollapse" active-text="收缩" inactive-text="展开" disabled/>
-          </el-card>
-        </el-col>
-        <el-col :span="6">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">全局尺寸</template>
-            {{sizeValue}}
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">当前主题</template>
-            <div style="height: 300px; overflow: auto;">
-              {{themeActiveName}}
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="8">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">已经注册的主题</template>
-            <div style="height: 300px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="themeList"
-                :options="{ rootObjectKey: 'themeList', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="8">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">当前主题信息</template>
-            <div style="height: 300px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="themeActiveSetting"
-                :options="{ rootObjectKey: 'themeActiveSetting', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-card shadow="never" class="d2-card d2-mb">
-        <template slot="header">当前页面</template>
-        {{pageCurrent}}
-      </el-card>
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">支持多页显示的页面列表</template>
-            <div style="height: 300px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="pagePool"
-                :options="{ rootObjectKey: 'pagePool', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="8">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">打开的标签页</template>
-            <div style="height: 300px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="pageopened"
-                :options="{ rootObjectKey: 'pageopened', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="8">
-          <el-card shadow="never" class="d2-card d2-mb">
-            <template slot="header">缓存页面</template>
-            <div style="height: 300px; overflow: auto;">
-              <tree-view
-                class="tree-view-small"
-                :data="keepAlive"
-                :options="{ rootObjectKey: 'keepAlive', maxDepth: 1 }"/>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-card shadow="never" class="d2-card d2-mb">
-        <template slot="header">最新版本数据 [ {{releasesUpdate ? '有新版本' : '已经是最新版本'}} ]</template>
-        <tree-view
-          class="tree-view-small"
-          :data="releasesLatest"
-          :options="{ rootObjectKey: 'releasesLatest', maxDepth: 1 }"/>
-      </el-card>
-    </div>
-  </d2-container>
-</template>
-
-<script>
-import { mapState, mapGetters } from 'vuex'
-export default {
-  computed: {
-    ...mapState('d2admin', {
-      // 用户信息
-      userInfo: state => state.user.info,
-      // 版本
-      releasesVersion: state => state.releases.version,
-      releasesLatest: state => state.releases.latest,
-      releasesUpdate: state => state.releases.update,
-      // 菜单
-      menuHeader: state => state.menu.header,
-      menuAside: state => state.menu.aside,
-      menuAsideCollapse: state => state.menu.asideCollapse,
-      // 主题
-      themeList: state => state.theme.list,
-      themeActiveName: state => state.theme.activeName,
-      // 全屏
-      fullscreenActive: state => state.fullscreen.active,
-      // 灰度模式
-      grayActive: state => state.gray.active,
-      // tag 池
-      pagePool: state => state.page.pool,
-      pageCurrent: state => state.page.current,
-      pageopened: state => state.page.opened,
-      // 全局尺寸
-      sizeValue: state => state.size.value
-    }),
-    ...mapGetters('d2admin', {
-      keepAlive: 'page/keepAlive',
-      themeActiveSetting: 'theme/activeSetting'
-    })
-  }
-}
-</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 6a61f620..28d91126 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-58069f63d26f33421df3d333c4aa58af52c87aaa
\ No newline at end of file
+496110b25d96991d627a36afd39eefaab552561b
\ No newline at end of file

From f535d7163f74d6bea299b68ced4773e9b7703149 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 12 Sep 2018 10:31:16 +0800
Subject: [PATCH 2/2] no message

Former-commit-id: 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 78de87c4262aff3a4c314eba6308e80bc4b94568 [formerly af05d745c14160b7c5d74645c04b52653af3d6a6]]]]]
Former-commit-id: 8d552fccc75f9e545862d3a0de474c1460b2b35b
Former-commit-id: 86c5771f8d752674e7a84468e0e0f79f8e311602
Former-commit-id: e876ce46ba02cb64874edd55fd4c2bbed529c30a [formerly b6f22036fb293f78cd12866d09d951f44bf0fae0]
Former-commit-id: aa944f9181fa0bbfd45041c63d52ce4cee4b6fcc
Former-commit-id: c9e2b70e8b207c6fce4764921ebea4922dec2988
Former-commit-id: a27f7a6b68419d2767d2c5bdcbdd82951831f87e
Former-commit-id: 78af6b9ccd824244e328beaae291056c77af0cab
Former-commit-id: 126348234a6e5fe0915a7c12be737e861b0ffbab
---
 src/menu/modules/demo-playground.js           |  1 +
 .../demo/playground/store/size/index.vue      | 39 +++++++++++++++++++
 src/plugin/d2admin/index.js                   |  1 -
 src/router/routes.js.REMOVED.git-id           |  2 +-
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/playground/store/size/index.vue

diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index 571cee06..5023625d 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -61,6 +61,7 @@ export default {
       icon: 'bolt',
       children: [
         { 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' },
diff --git a/src/pages/demo/playground/store/size/index.vue b/src/pages/demo/playground/store/size/index.vue
new file mode 100644
index 00000000..37524f72
--- /dev/null
+++ b/src/pages/demo/playground/store/size/index.vue
@@ -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>
diff --git a/src/plugin/d2admin/index.js b/src/plugin/d2admin/index.js
index 6af7047b..e906ce4c 100644
--- a/src/plugin/d2admin/index.js
+++ b/src/plugin/d2admin/index.js
@@ -25,7 +25,6 @@ export default {
       defaultValue: '',
       user: true
     })
-    console.log('size: ', size)
     // Element
     Vue.use(ElementUI, {
       size
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 28d91126..3d2a77b8 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-496110b25d96991d627a36afd39eefaab552561b
\ No newline at end of file
+c62802e4146a602e5c498cdb99205b56768d4047
\ No newline at end of file