From dce5a3ea6b3e600a2973d0e7b4c17de14615bf68 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 1 Jun 2017 19:00:37 +0800
Subject: [PATCH] update Modal

---
 examples/routers/modal.vue     | 21 +++++++++++++++++++++
 src/components/modal/modal.vue |  2 +-
 src/directives/transfer-dom.js |  6 +++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index 335473d..2dd9086 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -3,11 +3,32 @@
         <Button @click="confirm">标准</Button>
         <Button @click="custom">自定义按钮文字</Button>
         <Button @click="async">异步关闭</Button>
+        <Button type="primary" @click="modal1 = true">显示对话框</Button>
+        <Modal
+                v-model="modal1"
+                title="普通的Modal对话框标题"
+                @on-ok="ok"
+                @on-cancel="cancel">
+            <p>对话框内容</p>
+            <p>对话框内容</p>
+            <p>对话框内容</p>
+        </Modal>
     </div>
 </template>
 <script>
     export default {
+        data () {
+            return {
+                modal1: false
+            }
+        },
         methods: {
+            ok () {
+                this.$Message.info('点击了确定');
+            },
+            cancel () {
+                this.$Message.info('点击了取消');
+            },
             confirm () {
                 this.$Modal.confirm({
                     title: '确认对话框标题',
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 7840e9b..b27b6ac 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-transfer-dom>
         <transition :name="transitionNames[1]">
             <div :class="maskClasses" v-show="visible" @click="mask"></div>
         </transition>
diff --git a/src/directives/transfer-dom.js b/src/directives/transfer-dom.js
index d1357b9..76e6012 100644
--- a/src/directives/transfer-dom.js
+++ b/src/directives/transfer-dom.js
@@ -18,6 +18,7 @@ const directive = {
     inserted (el, { value }, vnode) {
         el.className = el.className ? el.className + ' v-transfer-dom' : 'v-transfer-dom';
         const parentNode = el.parentNode;
+        if (!parentNode) return;
         const home = document.createComment('');
         let hasMovedOut = false;
 
@@ -38,6 +39,7 @@ const directive = {
     componentUpdated (el, { value }) {
         // need to make sure children are done updating (vs. `update`)
         const ref$1 = el.__transferDomData;
+        if (!ref$1) return;
         // homes.get(el)
         const parentNode = ref$1.parentNode;
         const home = ref$1.home;
@@ -59,7 +61,9 @@ const directive = {
         }
     },
     unbind: function unbind (el, binding) {
-        el.className = el.className.replace('v-transfer-dom', '')
+        el.className = el.className.replace('v-transfer-dom', '');
+        const ref$1 = el.__transferDomData;
+        if (!ref$1) return;
         if (el.__transferDomData.hasMovedOut === true) {
             el.__transferDomData.parentNode && el.__transferDomData.parentNode.appendChild(el)
         }
--
libgit2 0.21.4