From f218ab7df8ddc35b6177005c385c52ede7c4a8b5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 15:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 659e4b42eec3fb5106a46f8c06c4b62170e4385e [formerly 33bd817d31a89ff29b25860e8e553198f426966b]]]]]
Former-commit-id: e9c520cc0f970cf63f834a8a4f1de806465e054c
Former-commit-id: 3ab6ec0c07d8739e484ebde242beebbf761e9a11
Former-commit-id: 44e9aaa39c1d5becbfab509fcb80b15c4e11bf18 [formerly 9bf3ab07eac16679f064a20af7b5483c36b11503]
Former-commit-id: 624cbcde01906949ce2ca04c7f522fe6c078bc62
Former-commit-id: 2f0ff3c6614b44b17fba9305acd199b145f07273
Former-commit-id: 8ff08e2826218d1a3f6276f367c81f628fe38970
Former-commit-id: 2bd544a5f39a5e8c3e88082d517f33ed3f49f7f2
Former-commit-id: 45586821281ab265e08b09b1af718d30964db101
---
package-lock.json.REMOVED.git-id | 1 +
.../theme/theme-base.scss.REMOVED.git-id | 2 +-
.../components/header-size/index.vue | 45 +++++++++++++++++++
.../components/header-user/index.vue | 2 +-
src/layout/header-aside/layout.vue | 2 +
src/store/modules/d2admin/index.js | 4 +-
src/store/modules/d2admin/modules/size.js | 38 ++++++++++++++++
7 files changed, 91 insertions(+), 3 deletions(-)
create mode 100644 package-lock.json.REMOVED.git-id
create mode 100644 src/layout/header-aside/components/header-size/index.vue
create mode 100644 src/store/modules/d2admin/modules/size.js
diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
new file mode 100644
index 00000000..09d4bdd0
--- /dev/null
+++ b/package-lock.json.REMOVED.git-id
@@ -0,0 +1 @@
+0db501622270146313d905a0a5f39854fb2494ac
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
index 0313b944..a92d8174 100644
--- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
@@ -1 +1 @@
-76c08deda5f3f6bd81e91aeb695cae984eab131e
\ No newline at end of file
+875522462ce00aa53ebb933ad8a70561bf30dfc5
\ No newline at end of file
diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
new file mode 100644
index 00000000..a59be8ee
--- /dev/null
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+ 大
+
+
+
+ 中
+
+
+
+ 小
+
+
+
+
+
+
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 735d6c90..9ad21d2b 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -1,5 +1,5 @@
-
+
你好 {{info.name}}
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 3a15413c..bc93c903 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -29,6 +29,7 @@
+
@@ -92,6 +93,7 @@ export default {
'd2-tabs': () => import('./components/tabs'),
'd2-header-fullscreen': () => import('./components/header-fullscreen'),
'd2-header-search': () => import('./components/header-search'),
+ 'd2-header-size': () => import('./components/header-size'),
'd2-header-theme': () => import('./components/header-theme'),
'd2-header-user': () => import('./components/header-user'),
'd2-header-error-log': () => import('./components/header-error-log')
diff --git a/src/store/modules/d2admin/index.js b/src/store/modules/d2admin/index.js
index 2cc2fbc3..3b844113 100644
--- a/src/store/modules/d2admin/index.js
+++ b/src/store/modules/d2admin/index.js
@@ -11,6 +11,7 @@ import gray from './modules/gray'
import page from './modules/page'
import transition from './modules/transition'
import search from './modules/search'
+import size from './modules/size'
export default {
namespaced: true,
@@ -27,6 +28,7 @@ export default {
gray,
page,
transition,
- search
+ search,
+ size
}
}
diff --git a/src/store/modules/d2admin/modules/size.js b/src/store/modules/d2admin/modules/size.js
new file mode 100644
index 00000000..ebc13b8f
--- /dev/null
+++ b/src/store/modules/d2admin/modules/size.js
@@ -0,0 +1,38 @@
+export default {
+ namespaced: true,
+ state: {
+ // 尺寸
+ value: 'medium' // small mini
+ },
+ mutations: {
+ /**
+ * @description 设置尺寸
+ * @param {Object} state vuex state
+ * @param {String} size 尺寸
+ */
+ set (state, size) {
+ // store 赋值
+ state.value = size
+ // 持久化
+ this.dispatch('d2admin/db/set', {
+ dbName: 'sys',
+ path: 'size.value',
+ value: state.value,
+ user: true
+ })
+ },
+ /**
+ * @description 从持久化数据读取尺寸设置
+ * @param {Object} state vuex state
+ */
+ async asideCollapseLoad (state) {
+ // store 赋值
+ state.value = await this.dispatch('d2admin/db/get', {
+ dbName: 'sys',
+ path: 'size.value',
+ defaultValue: 'medium',
+ user: true
+ })
+ }
+ }
+}