From 49f1826a0714010bec9cedf55435a92b791f50e5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 16:12:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly fda58ba8fa5c3cdfae1de4366df5d1b3d22507b3 [formerly 481965dd045bdd23f0f3c652adb796565ecbac05]]]]]
Former-commit-id: 00db3f5c336c4f30dca75b8f99781d93633cf153
Former-commit-id: d7ce382da9d9f9d2cd11942c4a2af168a4e6c56b
Former-commit-id: 0fb053cd87d684266aca8b4853697b1c1053368a [formerly acb361a704ea067cf9d8e301d32ae556fce40bbe]
Former-commit-id: 0d527215fb720240156f1c0463134c6ed362133d
Former-commit-id: 227fe2db815a7d560fd526129b7756270f00b2ec
Former-commit-id: 6db371b0ba8b11fb9f71aa1e852cc51bc649c88d
Former-commit-id: 460c5ef5fadb48c1ae6885e145612c73da958735
Former-commit-id: 1de24c9653769294fcf3bf096f5a40b317370c7e
---
 .../components/header-size/index.vue          | 23 +++++++++++++++----
 .../header-aside/components/tabs/index.vue    |  1 +
 src/pages/login/page.vue                      |  2 +-
 src/plugin/d2admin/index.js                   | 16 +++++++++++--
 src/store/modules/d2admin/modules/account.js  |  4 +++-
 src/store/modules/d2admin/modules/size.js     |  6 ++---
 6 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index d08f1f48..96135019 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -4,14 +4,17 @@
       <d2-icon name="font" style="font-size: 16px;"/>
     </el-button>
     <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item command="">
+        <d2-icon :name="iconName('default')" class="d2-mr-5"/>默认
+      </el-dropdown-item>
       <el-dropdown-item command="medium">
-        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>大
+        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>中
       </el-dropdown-item>
       <el-dropdown-item command="small">
-        <d2-icon :name="iconName('small')" class="d2-mr-5"/>中
+        <d2-icon :name="iconName('small')" class="d2-mr-5"/>小
       </el-dropdown-item>
       <el-dropdown-item command="mini">
-        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>小
+        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>最小
       </el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
@@ -26,13 +29,25 @@ export default {
       'value'
     ])
   },
+  watch: {
+    value: {
+      handler (val) {
+        console.log('handler')
+        this.$ELEMENT.size = val
+      },
+      immediate: true
+    }
+  },
   methods: {
     ...mapMutations('d2admin/size', [
       'set'
     ]),
     handleChange (value) {
-      this.$ELEMENT.size = value
       this.set(value)
+      this.$message({
+        message: `设置尺寸成功 ${value}`,
+        type: 'success'
+      })
     },
     iconName (name) {
       return name === this.value ? 'dot-circle-o' : 'circle-o'
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 7f093e0c..b1a0c01e 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -30,6 +30,7 @@
       class="d2-multiple-page-control-btn"
       flex-box="0">
       <el-dropdown
+        size="default"
         split-button
         @click="handleControlBtnClick"
         @command="command => handleControlItemClick(command)">
diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue
index c7b46bef..c0a08c96 100644
--- a/src/pages/login/page.vue
+++ b/src/pages/login/page.vue
@@ -9,7 +9,7 @@
       <!-- 表单部分 -->
       <div class="form-group">
         <el-card>
-          <el-form ref="loginForm" label-position="top" :rules="rules" :model="formLogin">
+          <el-form ref="loginForm" label-position="top" :rules="rules" :model="formLogin" size="default">
             <el-form-item  prop="username">
               <el-input type="text" v-model="formLogin.username" placeholder="用户名">
                 <i slot="prepend" class="fa fa-user-circle-o"></i>
diff --git a/src/plugin/d2admin/index.js b/src/plugin/d2admin/index.js
index c27d7f42..6af7047b 100644
--- a/src/plugin/d2admin/index.js
+++ b/src/plugin/d2admin/index.js
@@ -3,6 +3,8 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // flex 布局库
 import 'flex.css'
+// store
+import store from '@/store/index'
 // 组件
 import '@/components'
 // svg 图标
@@ -15,9 +17,19 @@ import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
 
 export default {
-  install (Vue, options) {
+  async install (Vue, options) {
+    // 获得用户设置的全局尺寸
+    const size = await store.dispatch('d2admin/db/get', {
+      dbName: 'sys',
+      path: 'size.value',
+      defaultValue: '',
+      user: true
+    })
+    console.log('size: ', size)
     // Element
-    Vue.use(ElementUI)
+    Vue.use(ElementUI, {
+      size
+    })
     // 插件
     Vue.use(pluginError)
     Vue.use(pluginExport)
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 9aab7091..78569bd9 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -108,8 +108,10 @@ export default {
       this.commit('d2admin/transition/load')
       // DB -> store 持久化数据加载上次退出时的多页列表
       this.commit('d2admin/page/openedLoad')
-      // DB -> store 持久化数据加载这个用户之前设置的侧边栏折叠状态
+      // DB -> store 持久化数据加载侧边栏折叠状态
       this.commit('d2admin/menu/asideCollapseLoad')
+      // DB -> store 持久化数据加载全局尺寸
+      this.commit('d2admin/size/load')
     }
   }
 }
diff --git a/src/store/modules/d2admin/modules/size.js b/src/store/modules/d2admin/modules/size.js
index ebc13b8f..b500e033 100644
--- a/src/store/modules/d2admin/modules/size.js
+++ b/src/store/modules/d2admin/modules/size.js
@@ -2,7 +2,7 @@ export default {
   namespaced: true,
   state: {
     // 尺寸
-    value: 'medium' // small mini
+    value: '' // medium small mini
   },
   mutations: {
     /**
@@ -25,12 +25,12 @@ export default {
      * @description 从持久化数据读取尺寸设置
      * @param {Object} state vuex state
      */
-    async asideCollapseLoad (state) {
+    async load (state) {
       // store 赋值
       state.value = await this.dispatch('d2admin/db/get', {
         dbName: 'sys',
         path: 'size.value',
-        defaultValue: 'medium',
+        defaultValue: 'default',
         user: true
       })
     }