From e011898cc72ab1fb3eed5c2f40690449d055a8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 13 Jan 2017 15:35:38 +0800
Subject: [PATCH] fixed #197

fixed #197
---
 src/components/modal/modal.vue |  3 ++-
 test/routers/more.vue          | 32 ++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 00b8d1d8..63cf6eee 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -197,11 +197,12 @@
             visible (val) {
                 if (val === false) {
                     this.buttonLoading = false;
-                    setTimeout(() => {
+                    this.timer = setTimeout(() => {
                         this.wrapShow = false;
                         this.removeScrollEffect();
                     }, 300);
                 } else {
+                    if (this.timer) clearTimeout(this.timer);
                     this.wrapShow = true;
                     this.addScrollEffect();
                 }
diff --git a/test/routers/more.vue b/test/routers/more.vue
index fa1445a1..3c351b41 100644
--- a/test/routers/more.vue
+++ b/test/routers/more.vue
@@ -4,16 +4,32 @@
     }
 </style>
 <template>
-    <Tabs active-key="key1">
-        <Tab-pane label="标签一" key="key1">
-            <Date-picker type="date" placeholder="选择日期" style="width: 200px"></Date-picker>
-        </Tab-pane>
-        <Tab-pane label="标签二" key="key2">标签二的内容</Tab-pane>
-        <Tab-pane label="标签三" key="key3">标签三的内容</Tab-pane>
-    </Tabs>
+    <i-button type="primary" @click="modal1 = true">显示对话框</i-button>
+    <Modal
+            :visible.sync="modal1"
+            title="普通的Modal对话框标题"
+            @on-ok="ok"
+            @on-cancel="cancel">
+        <p>对话框内容</p>
+        <p>对话框内容</p>
+        <p>对话框内容</p>
+    </Modal>
 </template>
 <script>
     export default {
-
+        data () {
+            return {
+                modal1: false
+            }
+        },
+        methods: {
+            ok () {
+                this.$nextTick(() => this.modal1 = true);
+                this.$Message.info('点击了确定');
+            },
+            cancel () {
+                this.$Message.info('点击了取消');
+            }
+        }
     }
 </script>