From cce0061e563b06dcc3c47733d2de6fe0290dc50f Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Sat, 13 May 2017 22:34:50 +0800
Subject: [PATCH] some bug fixes

---
 packages/message-box/src/main.js        | 2 ++
 packages/message-box/src/main.vue       | 3 +--
 packages/theme-default/src/checkbox.css | 2 +-
 packages/theme-default/src/dropdown.css | 3 +++
 src/utils/popup/popup-manager.js        | 5 +++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/message-box/src/main.js b/packages/message-box/src/main.js
index 19af6624c..52c17002b 100644
--- a/packages/message-box/src/main.js
+++ b/packages/message-box/src/main.js
@@ -101,6 +101,8 @@ const showNextMsg = () => {
       if (isVNode(instance.message)) {
         instance.$slots.default = [instance.message];
         instance.message = null;
+      } else {
+        delete instance.$slots.default;
       }
       ['modal', 'showClose', 'closeOnClickModal', 'closeOnPressEscape'].forEach(prop => {
         if (instance[prop] === undefined) {
diff --git a/packages/message-box/src/main.vue b/packages/message-box/src/main.vue
index 47ca76354..73c6e2125 100644
--- a/packages/message-box/src/main.vue
+++ b/packages/message-box/src/main.vue
@@ -129,8 +129,7 @@
 
       handleWrapperClick() {
         if (this.closeOnClickModal) {
-          this.action = '';
-          this.doClose();
+          this.handleAction('cancel');
         }
       },
 
diff --git a/packages/theme-default/src/checkbox.css b/packages/theme-default/src/checkbox.css
index 0546320cc..d5c9e0c17 100644
--- a/packages/theme-default/src/checkbox.css
+++ b/packages/theme-default/src/checkbox.css
@@ -134,7 +134,7 @@
       outline: none;
       position: absolute;
       margin: 0;
-      visibility: hidden;
+      size: 0;
       left: -999px;
     }
 
diff --git a/packages/theme-default/src/dropdown.css b/packages/theme-default/src/dropdown.css
index fef3333ea..796cca7d4 100644
--- a/packages/theme-default/src/dropdown.css
+++ b/packages/theme-default/src/dropdown.css
@@ -11,6 +11,9 @@
 
     .el-button-group {
       display: block;
+      .el-button {
+        float: none;
+      }
     }
 
     & .el-dropdown__caret-button {
diff --git a/src/utils/popup/popup-manager.js b/src/utils/popup/popup-manager.js
index 59b1c7939..50bec49a6 100644
--- a/src/utils/popup/popup-manager.js
+++ b/src/utils/popup/popup-manager.js
@@ -156,8 +156,9 @@ const PopupManager = {
       if (!topItem) return;
       const instance = PopupManager.getInstance(topItem.id);
       if (instance.closeOnPressEscape) {
-        instance.$emit('update:visible', false);
-        (instance.handleClose) ? instance.handleClose() : (instance.handleAction ? instance.handleAction('cancel') : instance.close());
+        instance.handleClose
+          ? instance.handleClose()
+          : (instance.handleAction ? instance.handleAction('cancel') : instance.close());
       }
     }
   }