From d5620b0994d6130523834312db92c0f63da23075 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Thu, 13 Oct 2016 20:05:42 +0800
Subject: [PATCH] add lock modifier on loading

---
 CHANGELOG.md                      | 8 ++++++++
 examples/docs/zh-cn/loading.md    | 4 ++--
 packages/loading/src/directive.js | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5fd59025..327a4a178 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## 更新日志
 
+### 1.0.0-rc.8（待发布）
+
+*2016-XX-XX*
+
+#### 非兼容性更新
+
+- 全屏 Loading 现在默认不再锁定屏幕滚动。如果需要的话，可添加 `lock` 修饰符
+
 ### 1.0.0-rc.7
 
 *2016-10-13*
diff --git a/examples/docs/zh-cn/loading.md b/examples/docs/zh-cn/loading.md
index 932ec42a9..c51108432 100644
--- a/examples/docs/zh-cn/loading.md
+++ b/examples/docs/zh-cn/loading.md
@@ -57,14 +57,14 @@
 
 页面数据加载时显示。
 
-:::demo 当需要全屏遮罩时，可使用`fullscreen`修饰符（此时遮罩会插入至 body 上）
+:::demo 当需要全屏遮罩时，可使用`fullscreen`修饰符（此时遮罩会插入至 body 上）。此时若需要锁定屏幕的滚动，可以使用`lock`修饰符。
 
 ```html
 <template>
   <el-button
     type="primary"
     @click.native="openFullScreen"
-    v-loading.fullscreen="fullscreenLoading">
+    v-loading.fullscreen.lock="fullscreenLoading">
     显示整页加载，3 秒后消失
   </el-button>
 </template>
diff --git a/packages/loading/src/directive.js b/packages/loading/src/directive.js
index a60dcffc5..5eb191352 100644
--- a/packages/loading/src/directive.js
+++ b/packages/loading/src/directive.js
@@ -68,7 +68,7 @@ exports.install = Vue => {
       if (directive.originalPosition !== 'absolute') {
         parent.style.position = 'relative';
       }
-      if (binding.modifiers.fullscreen) {
+      if (binding.modifiers.fullscreen && binding.modifiers.lock) {
         parent.style.overflow = 'hidden';
       }
       directive.mask.style.display = 'block';