From f9a2e6114d4085e104658243a7316d926e2c2d1f Mon Sep 17 00:00:00 2001
From: Rijn <bxbian951122@gmail.com>
Date: Tue, 24 Jan 2017 13:36:13 -0600
Subject: [PATCH 1/3] added scrolling property to toggle CSS for creating or
 hiding scrollbars

---
 src/components/modal/modal.vue | 15 ++++++++++++++-
 test/routers/more.vue          |  7 ++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 63cf6eee..9b39b4d8 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -76,6 +76,10 @@
             footerHide: {
                 type: Boolean,
                 default: false
+            },
+            scrolling: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
@@ -204,13 +208,22 @@
                 } else {
                     if (this.timer) clearTimeout(this.timer);
                     this.wrapShow = true;
-                    this.addScrollEffect();
+                    if (!this.scrolling) {
+                        this.addScrollEffect();
+                    }
                 }
             },
             loading (val) {
                 if (!val) {
                     this.buttonLoading = false;
                 }
+            },
+            scrolling (val) {
+                if (!this.scrolling) {
+                    this.addScrollEffect();
+                } else {
+                    this.removeScrollEffect();
+                }
             }
         }
     };
diff --git a/test/routers/more.vue b/test/routers/more.vue
index 3c351b41..db17c446 100644
--- a/test/routers/more.vue
+++ b/test/routers/more.vue
@@ -5,21 +5,26 @@
 </style>
 <template>
     <i-button type="primary" @click="modal1 = true">显示对话框</i-button>
+    <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
+    Scrolling:{{scrolling}}
     <Modal
             :visible.sync="modal1"
             title="普通的Modal对话框标题"
+            :scrolling="scrolling"
             @on-ok="ok"
             @on-cancel="cancel">
         <p>对话框内容</p>
         <p>对话框内容</p>
         <p>对话框内容</p>
+        <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
     </Modal>
 </template>
 <script>
     export default {
         data () {
             return {
-                modal1: false
+                modal1: false,
+                scrolling: false
             }
         },
         methods: {

From f346ce4bd9dce13ee45011baee1876d08d79e814 Mon Sep 17 00:00:00 2001
From: Rijn <bxbian951122@gmail.com>
Date: Tue, 24 Jan 2017 13:37:35 -0600
Subject: [PATCH 2/3] lint fix

---
 src/components/modal/modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 9b39b4d8..baf0f530 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -219,7 +219,7 @@
                 }
             },
             scrolling (val) {
-                if (!this.scrolling) {
+                if (!val) {
                     this.addScrollEffect();
                 } else {
                     this.removeScrollEffect();

From 5d0b89ced828df801b3206dac3367ca048772116 Mon Sep 17 00:00:00 2001
From: Rijn <bxbian951122@gmail.com>
Date: Sun, 5 Feb 2017 22:58:34 -0600
Subject: [PATCH 3/3] change scrolling to scrollable

---
 src/components/modal/modal.vue |  6 +++---
 test/routers/more.vue          | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index baf0f530..82265d2a 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -77,7 +77,7 @@
                 type: Boolean,
                 default: false
             },
-            scrolling: {
+            scrollable: {
                 type: Boolean,
                 default: false
             }
@@ -208,7 +208,7 @@
                 } else {
                     if (this.timer) clearTimeout(this.timer);
                     this.wrapShow = true;
-                    if (!this.scrolling) {
+                    if (!this.scrollable) {
                         this.addScrollEffect();
                     }
                 }
@@ -218,7 +218,7 @@
                     this.buttonLoading = false;
                 }
             },
-            scrolling (val) {
+            scrollable (val) {
                 if (!val) {
                     this.addScrollEffect();
                 } else {
diff --git a/test/routers/more.vue b/test/routers/more.vue
index db17c446..9a702f2a 100644
--- a/test/routers/more.vue
+++ b/test/routers/more.vue
@@ -5,18 +5,18 @@
 </style>
 <template>
     <i-button type="primary" @click="modal1 = true">显示对话框</i-button>
-    <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
-    Scrolling:{{scrolling}}
+    <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
+    scrollable:{{scrollable}}
     <Modal
             :visible.sync="modal1"
             title="普通的Modal对话框标题"
-            :scrolling="scrolling"
+            :scrollable="scrollable"
             @on-ok="ok"
             @on-cancel="cancel">
         <p>对话框内容</p>
         <p>对话框内容</p>
         <p>对话框内容</p>
-        <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
+        <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
     </Modal>
 </template>
 <script>
@@ -24,7 +24,7 @@
         data () {
             return {
                 modal1: false,
-                scrolling: false
+                scrollable: false
             }
         },
         methods: {