提交 67a7a76b 作者: Vben

fix(table-action): ensure that the click event is not triggered, fix #441

上级 64b6313b
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
@click="handleClickMenu(item)" @click="handleClickMenu(item)"
:disabled="item.disabled" :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" /> <Icon :icon="item.icon" v-if="item.icon" />
<span class="ml-1">{{ item.text }}</span> <span class="ml-1">{{ item.text }}</span>
</Popconfirm> </Popconfirm>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
}, },
}, },
dropMenuList: { dropMenuList: {
type: Array as PropType<DropMenu[]>, type: Array as PropType<(DropMenu & Recordable)[]>,
default: () => [], default: () => [],
}, },
selectedKeys: { selectedKeys: {
......
...@@ -285,9 +285,16 @@ ...@@ -285,9 +285,16 @@
display: flex; display: flex;
} }
.ant-form-item-control {
margin-top: 4px;
}
.suffix { .suffix {
display: inline-block; display: inline-flex;
padding-left: 6px; padding-left: 6px;
margin-top: 1px;
line-height: 1;
align-items: center;
} }
} }
} }
......
...@@ -82,6 +82,8 @@ ...@@ -82,6 +82,8 @@
return { return {
...action, ...action,
...popConfirm, ...popConfirm,
onConfirm: popConfirm?.confirm,
onCancel: popConfirm?.cancel,
text: label, text: label,
divider: index < props.dropDownActions.length - 1 ? props.divider : false, divider: index < props.dropDownActions.length - 1 ? props.divider : false,
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论