Merge branch 'hotfix/pr-129' into develop

Former-commit-id: 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly bea376e15d3762c526d1b749f4aca5d8fcf7f5de [formerly e8bdbb8b800713bb86581fa85bb809ef7fe4cee4]]]]]
Former-commit-id: 32b20e4ca8a907eee144b015e75e47eab61a3e53
Former-commit-id: 86823621d8d0bbe10ec50599907da452a35bd804
Former-commit-id: 58bd7e8fb9213ed6af279c5ef5917a1c985d751f [formerly cb090d3151869b3a109cf253c918b3caaa5b3c45]
Former-commit-id: aa4bf0e133cf48e433a9436e4331f86a73628663
Former-commit-id: 2623a21cb87cbb23ea382c2b95aa57a929e715cd
Former-commit-id: 44db2b4a850b57db67dfc32b3380b37a86fcdb99
Former-commit-id: b528d0bba8e90d6635020033c24c8d7c72a01ad7
Former-commit-id: bab1efc39968945b9fe9a45976a90b608fff8257

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",

src/layout/header-aside/components/header-size/index.vue

@@ -33,14 +33,18 @@ export default {
     // 注意 这里是关键
     // 因为需要访问 this.$ELEMENT 所以只能在这里使用这种方式
     value: {
-      handler (val) {
-        if (this.$ELEMENT.size !== val) {
-          // 设置 element 全局尺寸
+      handler (val, oldVal) {
+        // 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