From 67a7a76b735aafe2e1a8258c75c4a3c5dd657de6 Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Thu, 8 Apr 2021 00:17:34 +0800
Subject: [PATCH] fix(table-action): ensure that the click event is not
 triggered, fix #441

---
 src/components/Dropdown/src/Dropdown.vue            | 4 ++--
 src/components/Form/src/BasicForm.vue               | 9 ++++++++-
 src/components/Table/src/components/TableAction.vue | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/Dropdown/src/Dropdown.vue b/src/components/Dropdown/src/Dropdown.vue
index af51ffb2a..e6bd94515 100644
--- a/src/components/Dropdown/src/Dropdown.vue
+++ b/src/components/Dropdown/src/Dropdown.vue
@@ -11,7 +11,7 @@
             @click="handleClickMenu(item)"
             :disabled="item.disabled"
           >
-            <Popconfirm v-if="popconfirm" v-bind="item">
+            <Popconfirm v-if="popconfirm && item.popConfirm" v-bind="item">
               <Icon :icon="item.icon" v-if="item.icon" />
               <span class="ml-1">{{ item.text }}</span>
             </Popconfirm>
@@ -59,7 +59,7 @@
         },
       },
       dropMenuList: {
-        type: Array as PropType<DropMenu[]>,
+        type: Array as PropType<(DropMenu & Recordable)[]>,
         default: () => [],
       },
       selectedKeys: {
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 99e4c62fe..209ebaf0f 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -285,9 +285,16 @@
           display: flex;
         }
 
+        .ant-form-item-control {
+          margin-top: 4px;
+        }
+
         .suffix {
-          display: inline-block;
+          display: inline-flex;
           padding-left: 6px;
+          margin-top: 1px;
+          line-height: 1;
+          align-items: center;
         }
       }
     }
diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue
index 87b54a89a..62093cc1f 100644
--- a/src/components/Table/src/components/TableAction.vue
+++ b/src/components/Table/src/components/TableAction.vue
@@ -82,6 +82,8 @@
           return {
             ...action,
             ...popConfirm,
+            onConfirm: popConfirm?.confirm,
+            onCancel: popConfirm?.cancel,
             text: label,
             divider: index < props.dropDownActions.length - 1 ? props.divider : false,
           };