added scrollable property to modal instance

Rijn
1 parent 59872199
Showing 2 changed files with 16 additions and 2 deletions Show diff stats
src/components/modal/confirm.js
test/routers/more.vue
@@ -17,7 +17,7 @@ Modal.newInstance = properties =&gt; {
     const div = document.createElement('div');
     div.innerHTML = `
-        <Modal${props} :visible.sync="visible" :width="width">
+        <Modal${props} :visible.sync="visible" :width="width" :scrollable.sync="scrollable">
             <div class="${prefixCls}">
                 <div class="${prefixCls}-head">
                     <div class="${prefixCls}-head-title">{{{ title }}}</div>
@@ -49,7 +49,8 @@ Modal.newInstance = properties =&gt; {
             cancelText: t('i.modal.cancelText'),
             showCancel: false,
             loading: false,
-            buttonLoading: false
+            buttonLoading: false,
+            scrollable: false
         }),
         computed: {
             iconTypeCls () {
@@ -153,6 +154,10 @@ Modal.newInstance = properties =&gt; {
                 modal.$parent.loading = props.loading;
             }
+            if ('scrollable' in props) {
+                modal.$parent.scrollable = props.scrollable;
+            }
+
             // notice when component destroy
             modal.$parent.onRemove = props.onRemove;
@@ -18,6 +18,8 @@
         <p>对话框内容</p>
         <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
     </Modal>
+    <i-button @click="instance(true)">Create Instance Scrollable</i-button>
+    <i-button @click="instance(false)">Create Instance Non-scrollable</i-button>
 </template>
 <script>
     export default {
@@ -34,6 +36,13 @@
             },
             cancel () {
                 this.$Message.info('点击了取消');
+            },
+            instance (scrollable) {
+                this.$Modal.info({
+                    title: 'test',
+                    content: 'test',
+                    scrollable: scrollable
+                });
             }
         }
     }