Merge pull request #242 from rijn/241

added scrolling property to toggle CSS for creating or hiding scrollbars
2017-02-06 15:17:12 +08:00 · 2017-02-06 15:17:12 +08:00 · a861963bd8
commit a861963bd8
parent 89f2ba8bad 5d0b89ced8
2 changed files with 20 additions and 2 deletions
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@ -76,6 +76,10 @@
            footerHide: {
                type: Boolean,
                default: false
+            },
+            scrollable: {
+                type: Boolean,
+                default: false
            }
        },
        data () {
@ -204,13 +208,22 @@
                } else {
                    if (this.timer) clearTimeout(this.timer);
                    this.wrapShow = true;
-                    this.addScrollEffect();
+                    if (!this.scrollable) {
+                        this.addScrollEffect();
+                    }
                }
            },
            loading (val) {
                if (!val) {
                    this.buttonLoading = false;
                }
+            },
+            scrollable (val) {
+                if (!val) {
+                    this.addScrollEffect();
+                } else {
+                    this.removeScrollEffect();
+                }
            }
        }
    };