diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js
index 469f835e2..75777458f 100644
--- a/src/dialog/Dialog.js
+++ b/src/dialog/Dialog.js
@@ -1,5 +1,8 @@
+// Utils
 import { createNamespace, addUnit, pick } from '../utils';
 import { BORDER_TOP, BORDER_LEFT } from '../utils/constant';
+
+// Components
 import Popup from '../popup';
 import Button from '../button';
 import ActionBar from '../action-bar';
@@ -19,11 +22,12 @@ export default createComponent({
     lazyRender: Boolean,
     beforeClose: Function,
     messageAlign: String,
+    showCancelButton: Boolean,
     cancelButtonText: String,
     cancelButtonColor: String,
     confirmButtonText: String,
     confirmButtonColor: String,
-    showCancelButton: Boolean,
+    closeOnClickOverlay: Boolean,
     overlay: {
       type: Boolean,
       default: true,
@@ -44,10 +48,6 @@ export default createComponent({
       type: Boolean,
       default: true,
     },
-    closeOnClickOverlay: {
-      type: Boolean,
-      default: false,
-    },
   },
 
   emits: ['confirm', 'cancel', 'update:show'],
@@ -204,13 +204,13 @@ export default createComponent({
 
     return (
       <Popup
-        show={this.show}
         role="dialog"
         class={[bem([this.theme]), this.className]}
         style={{ width: addUnit(this.width) }}
         aria-labelledby={this.title || message}
         {...{
           ...pick(this, [
+            'show',
             'overlay',
             'transition',
             'lazyRender',
diff --git a/src/toast/Toast.js b/src/toast/Toast.js
index 672529a14..72f18edeb 100644
--- a/src/toast/Toast.js
+++ b/src/toast/Toast.js
@@ -1,3 +1,5 @@
+import { watch, onMounted, onUnmounted } from 'vue';
+
 // Utils
 import { createNamespace, isDef } from '../utils';
 import { lockClick } from './lock-click';
@@ -6,7 +8,6 @@ import { lockClick } from './lock-click';
 import Icon from '../icon';
 import Popup from '../popup';
 import Loading from '../loading';
-import { watch, onMounted, onUnmounted } from 'vue';
 
 const [createComponent, bem] = createNamespace('toast');