Merge branch 'hotfix/pr-129'

Former-commit-id: 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 081d8b5e161c2a59d053c15d6c1b1b6fe997c0c5 [formerly 5a0ddc43326c4f6eb2f1af23f59931c5f2bb0e8a]]]]]
Former-commit-id: 3380e5c983c16a8fa254e4312ab2c8c2b0bc370c
Former-commit-id: ba0f031113c2b8c74114a6466ea72d80667346dd
Former-commit-id: 2a92f7ddb02138c4f40975540b13136502e415ac [formerly 1fbe995c22d5d86f75a309a894d651c603528691]
Former-commit-id: 40a8e4587938320e1017ace0da488db49917877e
Former-commit-id: 11703b5e5908010d4e9f91fbd67254dd4dc616c2
Former-commit-id: 11fafcac9598222074507772993cb35e0fc7fe90
Former-commit-id: 9b282a4ea21e651a29b98f7b7b5512cf816af88d
Former-commit-id: af335eb320ea5bf299b09d682b46b5ed7afb85cc
This commit is contained in:
liyang
2018-11-08 10:07:35 +08:00
2 changed files with 10 additions and 6 deletions

View File

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

View File

@@ -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