sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update

Browse Source 
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
This commit is contained in:
liyang
2018-11-08 10:07:26 +08:00
parent 7bff3e594b
commit 99e602a2fc
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "d2-admin", "name": "d2-admin",
"version": "1.5.8", "version": "1.5.9",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",

16
src/layout/header-aside/components/header-size/index.vue
View File

@@ -34,17 +34,17 @@ export default {
// 因为需要访问 this.$ELEMENT 所以只能在这里使用这种方式 // 因为需要访问 this.$ELEMENT 所以只能在这里使用这种方式
value: { value: {
handler (val, oldVal) { handler (val, oldVal) {
if (!oldVal) { // https://github.com/d2-projects/d2-admin/pull/129
// 旧值为空是时设置 element 全局尺寸 if (oldVal) {
this.$ELEMENT.size = this.value // 这个情况在已经加载完页面 用户改变了尺寸时触发
}
if (this.$ELEMENT.size !== val) {
// 设置 element 全局尺寸
this.$ELEMENT.size = val this.$ELEMENT.size = val
// 清空缓存设置 // 由于已经加载过设置 需要清空缓存设置
this.pageKeepAliveClean() this.pageKeepAliveClean()
// 刷新此页面 // 由于已经加载过设置 需要刷新此页面
this.$router.replace('/refresh') this.$router.replace('/refresh')
} else {
// 这个情况在刷新页面时触发
this.$ELEMENT.size = val
} }
}, },
immediate: true immediate: true