From 7bff3e594bd3d233d02e187c1af83b34ed9a4f35 Mon Sep 17 00:00:00 2001
From: rongxingsun <rongxing_sun@qq.com>
Date: Wed, 7 Nov 2018 17:00:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=87=8C=E6=B8=B2=E6=9F=93=E4=B8=A4=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly c3c3e3af6bba747484a96f423f3b1dbb9eeb9115 [formerly bcf3b474449ee0031efb6d8173bfbd8a71cbed08]]]]]
Former-commit-id: 41dfafacc8998d9db0c246df1f860e9762e9d2ca
Former-commit-id: 125a74f4f3b2aad510a2b2ce8f8e2cbb23637a7e
Former-commit-id: 6d76c99920b945296aaa0ee0f3018f6f39ffabdb [formerly 11e8e1223a26307590e997639339e6907502efae]
Former-commit-id: 35a88b883a2e26d5cb143dd31e760cd4c2fd3639
Former-commit-id: 8e37790a2ab2db52122446f3deaa0840f008c1ef
Former-commit-id: 810db9bb8f995d63c46e03502ca1266709022e99
Former-commit-id: e614b10d1cdeadd941277ee85ebc024f6f4f9ec8
Former-commit-id: a4526ef6d4db383b162e5be7eec9bd05827bf321
---
 src/layout/header-aside/components/header-size/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index 8ae96d81..206bc0ab 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -33,7 +33,11 @@ export default {
     // 注意 这里是关键
     // 因为需要访问 this.$ELEMENT 所以只能在这里使用这种方式
     value: {
-      handler (val) {
+      handler (val, oldVal) {
+        if (!oldVal) {
+          // 旧值为空是时设置 element 全局尺寸
+          this.$ELEMENT.size = this.value
+        }
         if (this.$ELEMENT.size !== val) {
           // 设置 element 全局尺寸
           this.$ELEMENT.size = val

From 99e602a2fc6251a90e89d247e5cc099a06ddcfd3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 8 Nov 2018 10:07:26 +0800
Subject: [PATCH 2/2] update

Former-commit-id: a40d521a5e6b4bacc1104087236eba111745b341 [formerly a40d521a5e6b4bacc1104087236eba111745b341 [formerly a40d521a5e6b4bacc1104087236eba111745b341 [formerly a40d521a5e6b4bacc1104087236eba111745b341 [formerly d54b29deaefca00f1d9104927aa2338f97a2c2e3 [formerly d8035dd97c5e4861c04bba643b4e2cd63fb1c6a1]]]]]
Former-commit-id: 256e15767e7c232c0a8c95ab2136d3a098e8c73b
Former-commit-id: 3d9a70257b2cc65985e6caafbf11f4dfc722b60c
Former-commit-id: 145bf9c7be9808aa4c01b9ce539da08cf6e5eae1 [formerly 2a28ebf86e795e7184ccb7c7572b26e01c6020ef]
Former-commit-id: 451ed69e42b9896a2ea02b438e69864febc12d2b
Former-commit-id: 3352c1c1d0edc2ce0134661e91b773090c387153
Former-commit-id: 6f36f0e3f8ec3f626f11a62ab4ee7b0df09a7649
Former-commit-id: e7675d80e742f817df2e93919c23d9e3d80750a8
Former-commit-id: 217b9e30d0b308cfaf8cb343df8949d28a1e389b
---
 package.json                                     |  2 +-
 .../components/header-size/index.vue             | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 124764c9..f5d7c7e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index 206bc0ab..2139767f 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -34,17 +34,17 @@ export default {
     // 因为需要访问 this.$ELEMENT 所以只能在这里使用这种方式
     value: {
       handler (val, oldVal) {
-        if (!oldVal) {
-          // 旧值为空是时设置 element 全局尺寸
-          this.$ELEMENT.size = this.value
-        }
-        if (this.$ELEMENT.size !== val) {
-          // 设置 element 全局尺寸
+        // https://github.com/d2-projects/d2-admin/pull/129
+        if (oldVal) {
+          // 这个情况在已经加载完页面 用户改变了尺寸时触发
           this.$ELEMENT.size = val
-          // 清空缓存设置
+          // 由于已经加载过设置 需要清空缓存设置
           this.pageKeepAliveClean()
-          // 刷新此页面
+          // 由于已经加载过设置 需要刷新此页面
           this.$router.replace('/refresh')
+        } else {
+          // 这个情况在刷新页面时触发
+          this.$ELEMENT.size = val
         }
       },
       immediate: true