From e44ba4d4ad96ce8e3d3decb3a5afc2cf19931405 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 28 Jun 2018 14:58:38 +0800
Subject: [PATCH] Modal support global setting

---
 examples/main.js               |  2 +-
 examples/routers/modal.vue     | 41 ++++++++++++++++-------------------------
 src/components/modal/modal.vue |  4 +++-
 src/index.js                   |  2 +-
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/examples/main.js b/examples/main.js
index 9661399..332dfab 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -12,7 +12,7 @@ import locale from '../src/locale/lang/zh-CN';
 Vue.use(VueRouter);
 Vue.use(iView, {
     locale,
-    transfer: true,
+    transfer: false,
     size: 'small'
 });
 
diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index 8d3ab40..58a893b 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -1,39 +1,30 @@
 <template>
     <div>
-        <p>
-            Name: {{ value }}
-    </p>
-        <p>
-            <Button @click="handleRender">Custom content</Button>
-        </p>
+        <Button type="primary" @click="modal1 = true">Display dialog box</Button>
+        <Modal
+                v-model="modal1"
+                title="Common Modal dialog box title"
+                @on-ok="ok"
+                @on-cancel="cancel">
+            <p>Content of dialog</p>
+            <p>Content of dialog</p>
+            <p>Content of dialog</p>
+        </Modal>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                value: ''
+                modal1: false
             }
         },
         methods: {
-            handleRender () {
-                this.$Modal.confirm({
-                    title: '真不错呀',
-                    render: (h) => {
-                        return h('Input', {
-                            props: {
-                                value: this.value,
-                                autofocus: true,
-                                placeholder: 'Please enter your name...'
-                            },
-                            on: {
-                                input: (val) => {
-                                    this.value = val;
-                                }
-                            }
-                        })
-                    }
-                })
+            ok () {
+                this.$Message.info('Clicked ok');
+            },
+            cancel () {
+                this.$Message.info('Clicked cancel');
             }
         }
     }
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index a928422..4f37a95 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -99,7 +99,9 @@
             },
             transfer: {
                 type: Boolean,
-                default: true
+                default () {
+                    return this.$IVIEW.transfer === '' ? true : this.$IVIEW.transfer;
+                }
             },
             fullscreen: {
                 type: Boolean,
diff --git a/src/index.js b/src/index.js
index 05cf930..b9d837a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -166,7 +166,7 @@ const install = function(Vue, opts = {}) {
 
     Vue.prototype.$IVIEW = {
         size: opts.size || '',
-        transfer: opts.transfer || ''
+        transfer: 'transfer' in opts ? opts.transfer : ''
     };
 
     Vue.prototype.$Loading = LoadingBar;
--
libgit2 0.21.4