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 @@ + + 默认 + - 大 + - 中 + - 小 + 最小 @@ -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"> 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 @@
- + 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 }) }