fix(pop-confirm): fix event working unexpected

无木
1 parent 4d8e3985
Showing 2 changed files with 19 additions and 3 deletions
CHANGELOG.zh_CN.md
src/components/Dropdown/src/Dropdown.vue
@@ -4,6 +4,7 @@
  
 - **Table** 修复分页抖动问题
 - **Upload** 确保携带自定义参数
+- **Dropdown** 修复 popConfirm 的图标显示问题
  
 ## 2.5.0(2021-06-20)
  
@@ -11,7 +11,10 @@
             @click="handleClickMenu(item)"
             :disabled="item.disabled"
           >
-            <Popconfirm v-if="popconfirm && item.popConfirm" v-bind="omit(item.popConfirm, 'icon')">
+            <Popconfirm
+              v-if="popconfirm && item.popConfirm"
+              v-bind="getPopConfirmAttrs(item.popConfirm)"
+            >
               <template #icon v-if="item.popConfirm.icon">
                 <Icon :icon="item.popConfirm.icon" />
               </template>
@@ -33,13 +36,14 @@
 </template>
  
 <script lang="ts">
-  import type { PropType } from 'vue';
+  import { computed, PropType } from 'vue';
   import type { DropMenu } from './typing';
  
   import { defineComponent } from 'vue';
   import { Dropdown, Menu, Popconfirm } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
   import { omit } from 'lodash-es';
+  import { isFunction } from '/@/utils/is';
  
   export default defineComponent({
     name: 'BasicDropdown',
@@ -82,9 +86,20 @@
         item.onClick?.();
       }
  
+      const getPopConfirmAttrs = computed(() => {
+        return (attrs) => {
+          const originAttrs = omit(attrs, ['confirm', 'cancel', 'icon']);
+          if (!attrs.onConfirm && attrs.confirm && isFunction(attrs.confirm))
+            originAttrs['onConfirm'] = attrs.confirm;
+          if (!attrs.onCancel && attrs.cancel && isFunction(attrs.cancel))
+            originAttrs['onCancel'] = attrs.cancel;
+          return originAttrs;
+        };
+      });
+
       return {
         handleClickMenu,
-        omit,
+        getPopConfirmAttrs,
         getAttr: (key: string | number) => ({ key }),
       };
     },