From 4b1425c0046c412c297799b7dfbfaaf92aa81c81 Mon Sep 17 00:00:00 2001
From: zcating <zcating@qq.com>
Date: Sat, 18 Dec 2021 11:37:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(modal=20&=20button):=20dLoading=20?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8D=95=E7=8B=AC=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/devui/button/src/button.tsx | 10 +++++++++-
 packages/devui-vue/devui/modal/src/modal.tsx   |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/devui-vue/devui/button/src/button.tsx b/packages/devui-vue/devui/button/src/button.tsx
index 554a99b2a6..a132922eb4 100644
--- a/packages/devui-vue/devui/button/src/button.tsx
+++ b/packages/devui-vue/devui/button/src/button.tsx
@@ -1,11 +1,15 @@
 import { computed, defineComponent, ref } from 'vue';
 import { Icon } from '../../icon';
+import loadingDirective from '../../loading/src/directive';
 import { buttonProps } from './button-types';
 
 import './button.scss';
 
 export default defineComponent({
   name: 'DButton',
+  directives: {
+    devLoading: loadingDirective
+  },
   props: buttonProps,
   setup(props, ctx) {
     const buttonContent = ref<HTMLSpanElement | null>(null);
@@ -49,13 +53,17 @@ export default defineComponent({
         width
       } = props;
       return (
-        <div class="devui-btn-host" {...ctx.attrs} v-dLoading={showLoading}>
+        <div 
+          class="devui-btn-host" 
+          {...ctx.attrs} 
+        >
           <button
             class={btnClass.value}
             type={type}
             disabled={disabled}
             style={{ width }}
             onClick={onClick}
+            v-devLoading={showLoading}
           >
             {!!icon ? (
               <Icon name={icon} class={iconClass.value} />
diff --git a/packages/devui-vue/devui/modal/src/modal.tsx b/packages/devui-vue/devui/modal/src/modal.tsx
index 82002416f2..3545007fe4 100644
--- a/packages/devui-vue/devui/modal/src/modal.tsx
+++ b/packages/devui-vue/devui/modal/src/modal.tsx
@@ -2,7 +2,6 @@ import {
   computed,
   defineComponent,
   Transition,
-  watch
 } from 'vue'
 import { modalProps, ModalProps } from './modal-types'
 import { FixedOverlay } from '../../overlay'

From 9f8b0177b3a48433d8383c78e2094a32060fabac Mon Sep 17 00:00:00 2001
From: zcating <zcating@qq.com>
Date: Sat, 18 Dec 2021 11:53:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(modal):=20modal=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=EF=BC=8C=E7=82=B9=E5=87=BB=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E5=8F=AF=E5=85=B3=E9=97=ADmodal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/devui/modal/src/dialog-types.ts | 2 +-
 packages/devui-vue/devui/modal/src/modal-types.ts  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/devui-vue/devui/modal/src/dialog-types.ts b/packages/devui-vue/devui/modal/src/dialog-types.ts
index dbae5c5eae..75c09d49c6 100644
--- a/packages/devui-vue/devui/modal/src/dialog-types.ts
+++ b/packages/devui-vue/devui/modal/src/dialog-types.ts
@@ -54,7 +54,7 @@ export const dialogProps = {
   },
   backdropCloseable: {
     type: Boolean,
-    default: false
+    default: true
   },
   bodyScrollable: {
     type: Boolean,
diff --git a/packages/devui-vue/devui/modal/src/modal-types.ts b/packages/devui-vue/devui/modal/src/modal-types.ts
index 897eae827a..cb3a269af9 100644
--- a/packages/devui-vue/devui/modal/src/modal-types.ts
+++ b/packages/devui-vue/devui/modal/src/modal-types.ts
@@ -42,7 +42,7 @@ export const modalProps = {
   },
   backdropCloseable: {
     type: Boolean,
-    default: false
+    default: true
   },
   bodyScrollable: {
     type: Boolean,
@@ -58,7 +58,7 @@ export const modalProps = {
     type: Function as PropType<() => void>,
   },
   beforeHidden: {
-    type: [Object, Function] as PropType<Promise<boolean> | (() => boolean| Promise<boolean>)>
+    type: [Object, Function] as PropType<Promise<boolean> | (() => boolean | Promise<boolean>)>
   },
 
   modelValue: {