From 7fdad3a3cae95658f0f5e0e998a51c9d301d2f59 Mon Sep 17 00:00:00 2001 From: 梁灏 Date: Sun, 24 Sep 2017 15:36:14 +0800 Subject: [PATCH] update $Spin and release 2.4.0-beta.2 --- examples/routers/spin.vue | 16 ++-------------- package.json | 2 +- src/components/spin/spin.js | 2 +- src/styles/components/spin.less | 7 +++++++ 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/examples/routers/spin.vue b/examples/routers/spin.vue index 5500eb3..24ce442 100644 --- a/examples/routers/spin.vue +++ b/examples/routers/spin.vue @@ -159,7 +159,7 @@ font-style: normal; font-size: 14px; } - .demo-spin-article p{ + .demo-spin-article p { font-size: 16px; } @@ -194,19 +194,7 @@ }, methods: { show () { - this.$Spin.show({ - render: (h) => { - return h('div', [ - h('Icon', { - props: { - type: 'load-c', - size: 24 - } - }), - h('div', 'Loading') - ]) - } - }); + this.$Spin.show(); setTimeout(() => { this.$Spin.hide(); }, 3000) diff --git a/package.json b/package.json index e911064..7280ac3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iview", - "version": "2.4.0-beta.1", + "version": "2.4.0-beta.2", "title": "iView", "description": "A high quality UI components Library with Vue.js", "homepage": "http://www.iviewui.com", diff --git a/src/components/spin/spin.js b/src/components/spin/spin.js index 619a326..b1ca2fd 100644 --- a/src/components/spin/spin.js +++ b/src/components/spin/spin.js @@ -27,7 +27,7 @@ Spin.newInstance = properties => { }); } return h('div', { - 'class': 'ivu-spin-fullscreen' + 'class': 'ivu-spin-fullscreen ivu-spin-fullscreen-wrapper' }, [vnode]); } }); diff --git a/src/styles/components/spin.less b/src/styles/components/spin.less index 9207cf1..a5e0a1c 100644 --- a/src/styles/components/spin.less +++ b/src/styles/components/spin.less @@ -35,6 +35,13 @@ } &-fullscreen{ z-index: @zindex-spin-fullscreen; + &-wrapper{ + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + } } &-fix &-main { -- libgit2 0.21.4