From ae7821e29690bea8934ea724bfd0ae4e2cf30c77 Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Tue, 13 Jul 2021 22:44:49 +0800
Subject: [PATCH] fix(modal): ensure that props are passed correctly,fix #897

---
 CHANGELOG.zh_CN.md                              | 1 +
 src/components/Modal/src/BasicModal.vue         | 6 +++---
 src/views/demo/comp/modal/Modal1.vue            | 2 +-
 src/views/demo/comp/modal/Modal2.vue            | 3 +--
 src/views/demo/system/account/AccountDetail.vue | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 176d3114fb9..1791488502f 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -26,6 +26,7 @@
   - 修复菜单默认折叠的配置不起作用的问题
   - 修复`safari`浏览器报错导致网站打不开
   - 修复在 window 上，拉取代码后 eslint 因 endOfLine 而保错问题
+- **Modal** 确保 props 正确被传递
 
 ### 🎫 Chores
 
diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue
index 03cede18bab..7b0192651b0 100644
--- a/src/components/Modal/src/BasicModal.vue
+++ b/src/components/Modal/src/BasicModal.vue
@@ -18,7 +18,7 @@
     </template>
 
     <template #footer v-if="!$slots.footer">
-      <ModalFooter v-bind="getProps" @ok="handleOk" @cancel="handleCancel">
+      <ModalFooter v-bind="getBindValue" @ok="handleOk" @cancel="handleCancel">
         <template #[item]="data" v-for="item in Object.keys($slots)">
           <slot :name="item" v-bind="data"></slot>
         </template>
@@ -82,7 +82,7 @@
     setup(props, { emit, attrs }) {
       const visibleRef = ref(false);
       const propsRef = ref<Partial<ModalProps> | null>(null);
-      const modalWrapperRef = ref<ComponentRef>(null);
+      const modalWrapperRef = ref<any>(null);
 
       // modal   Bottom and top height
       const extHeightRef = ref(0);
@@ -133,7 +133,7 @@
       });
 
       const getBindValue = computed((): Recordable => {
-        const attr = { ...attrs, ...unref(getProps) };
+        const attr = { ...attrs, ...unref(getMergeProps), visible: unref(visibleRef) };
         if (unref(fullScreenRef)) {
           return omit(attr, 'height');
         }
diff --git a/src/views/demo/comp/modal/Modal1.vue b/src/views/demo/comp/modal/Modal1.vue
index c824de13e06..a49ceb21533 100644
--- a/src/views/demo/comp/modal/Modal1.vue
+++ b/src/views/demo/comp/modal/Modal1.vue
@@ -8,7 +8,7 @@
     @visible-change="handleShow"
   >
     <template #insertFooter>
-      <a-button type="danger" @click="setLines" :disabled="loading">点我更新内容</a-button>
+      <a-button type="primary" danger @click="setLines" :disabled="loading">点我更新内容</a-button>
     </template>
     <template v-if="loading">
       <div class="empty-tips"> 加载中，稍等3秒…… </div>
diff --git a/src/views/demo/comp/modal/Modal2.vue b/src/views/demo/comp/modal/Modal2.vue
index 77e5d86360c..1446b18b17c 100644
--- a/src/views/demo/comp/modal/Modal2.vue
+++ b/src/views/demo/comp/modal/Modal2.vue
@@ -1,12 +1,11 @@
 <template>
   <BasicModal
-    v-bind="$attrs"
     @register="register"
     title="Modal Title"
     :helpMessage="['提示1', '提示2']"
+    :okButtonProps="{ disabled: true }"
   >
     <a-button type="primary" @click="closeModal" class="mr-2"> 从内部关闭弹窗 </a-button>
-
     <a-button type="primary" @click="setModalProps"> 从内部修改title </a-button>
   </BasicModal>
 </template>
diff --git a/src/views/demo/system/account/AccountDetail.vue b/src/views/demo/system/account/AccountDetail.vue
index 914dabba4a4..150cc8b58eb 100644
--- a/src/views/demo/system/account/AccountDetail.vue
+++ b/src/views/demo/system/account/AccountDetail.vue
@@ -6,7 +6,7 @@
     @back="goBack"
   >
     <template #extra>
-      <a-button type="danger"> 禁用账号 </a-button>
+      <a-button type="primary" danger> 禁用账号 </a-button>
       <a-button type="primary"> 修改密码 </a-button>
     </template>
     <template #footer>