fix: delet garbage code and change invoke place

hug-sun · Nov 28, 2020 · c6aa979 · c6aa979
1 parent 884d2a3
commit c6aa979
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/message-box/src/MessageBox.js b/packages/message-box/src/MessageBox.js
@@ -1,5 +1,6 @@
 // #todo
-import { render, defineComponent, h, isVNode } from 'vue'
+import { defineComponent, isVNode } from 'vue'
+import { createComponent } from '../../../src/use/component'
 import msgboxVue from './MessageBox.vue'
 import merge from '../../../src/utils/merge'
 const messageBoxConstructor = defineComponent(msgboxVue)
@@ -49,9 +50,9 @@ const defaultCallback = (action) => {
   if (currentMsg) {
     if (currentMsg.resolve) {
       if (action === 'confirm') {
-        if (instance.component.vnode.props.showInput) {
+        if (instance.vnode.props.showInput) {
           currentMsg.resolve({
-            value: instance.component.setupState.state.inputValue,
+            value: instance.setupState.state.inputValue,
             action
           })
         } else {
@@ -69,8 +70,7 @@ const defaultCallback = (action) => {
 
 const initInstance = (currentMsg, VNode = null) => {
   defaults.callback = defaultCallback
-  instance = h(messageBoxConstructor, currentMsg.options, VNode)
-  render(instance, document.createElement('div'))
+  instance = createComponent(messageBoxConstructor, currentMsg.options, VNode)
 }
 
 const showNextMsg = () => {
@@ -102,7 +102,7 @@ const showNextMsg = () => {
         options[prop] = true
       }
     })
-    document.body.appendChild(instance.el)
+    document.body.appendChild(instance.vnode.el)
   }
   // }
 }

diff --git a/packages/message-box/src/MessageBox.vue b/packages/message-box/src/MessageBox.vue
@@ -363,7 +363,6 @@ export default {
       state.action = action
       if (typeof unref(beforeClose) === 'function') {
         const close = getSafeClose()
-        console.log(instance.vnode)
         unref(beforeClose)(action, instance.vnode, close)
       } else {
         doClose()
@@ -425,7 +424,6 @@ export default {
         })
       }
       const focusAfterClosed = document.activeElement
-      console.log(instance)
       messageBox = new Dialog(
         instance.vnode.el,
         focusAfterClosed,