github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Loading: use getStyle

pull/6591/head
Leopoldthecoder 2017-08-18 16:58:18 +08:00 committed by 杨奕
parent a0f0602f4c
commit 93910da173
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/loading/src/directive.js
View File

@ -8,8 +8,8 @@ exports.install = Vue => {
if (binding.value) {
Vue.nextTick(() => {
if (binding.modifiers.fullscreen) {
el.originalPosition = document.body.style.position;
el.originalOverflow = document.body.style.overflow;
el.originalPosition = getStyle(document.body, 'position');
el.originalOverflow = getStyle(document.body, 'overflow');
addClass(el.mask, 'is-fullscreen');
insertDom(document.body, el, binding);
@ -17,7 +17,7 @@ exports.install = Vue => {
removeClass(el.mask, 'is-fullscreen');
if (binding.modifiers.body) {
el.originalPosition = document.body.style.position;
el.originalPosition = getStyle(document.body, 'position');
['top', 'left'].forEach(property => {
let scroll = property === 'top' ? 'scrollTop' : 'scrollLeft';
@ -29,7 +29,7 @@ exports.install = Vue => {
insertDom(document.body, el, binding);
} else {
el.originalPosition = el.style.position;
el.originalPosition = getStyle(el, 'position');
insertDom(el, el, binding);
}
}
@ -57,7 +57,7 @@ exports.install = Vue => {
el.mask.style[property] = el.maskStyle[property];
});
if (el.originalPosition !== 'absolute') {
if (el.originalPosition !== 'absolute' && el.originalPosition !== 'fixed') {
parent.style.position = 'relative';
}
if (binding.modifiers.fullscreen && binding.modifiers.lock) {

11
packages/loading/src/index.js
View File

@ -1,5 +1,6 @@
import Vue from 'vue';
import loadingVue from './loading.vue';
import { getStyle } from 'element-ui/src/utils/dom';
import merge from 'element-ui/src/utils/merge';
const LoadingConstructor = Vue.extend(loadingVue);
@ -41,10 +42,10 @@ LoadingConstructor.prototype.close = function() {
const addStyle = (options, parent, instance) => {
let maskStyle = {};
if (options.fullscreen) {
instance.originalPosition = document.body.style.position;
instance.originalOverflow = document.body.style.overflow;
instance.originalPosition = getStyle(document.body, 'position');
instance.originalOverflow = getStyle(document.body, 'overflow');
} else if (options.body) {
instance.originalPosition = document.body.style.position;
instance.originalPosition = getStyle(document.body, 'position');
['top', 'left'].forEach(property => {
let scroll = property === 'top' ? 'scrollTop' : 'scrollLeft';
maskStyle[property] = options.target.getBoundingClientRect()[property] +
@ -56,7 +57,7 @@ const addStyle = (options, parent, instance) => {
maskStyle[property] = options.target.getBoundingClientRect()[property] + 'px';
});
} else {
instance.originalPosition = parent.style.position;
instance.originalPosition = getStyle(parent, 'position');
}
Object.keys(maskStyle).forEach(property => {
instance.$el.style[property] = maskStyle[property];
@ -86,7 +87,7 @@ const Loading = (options = {}) => {
});
addStyle(options, parent, instance);
if (instance.originalPosition !== 'absolute') {
if (instance.originalPosition !== 'absolute' && instance.originalPosition !== 'fixed') {
parent.style.position = 'relative';
}
if (options.fullscreen && options.lock) {