github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: dropdown click close for contextmenu #4198

pull/4222/head
tangjinzhou 2021-06-11 21:48:12 +08:00
parent ce6f44f918
commit 0cf37b3f8e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/dropdown/dropdown.tsx
View File

@ -92,7 +92,7 @@ const Dropdown = defineComponent({
class: classNames(child?.props?.class, `${prefixCls}-trigger`), class: classNames(child?.props?.class, `${prefixCls}-trigger`),
disabled, disabled,
}); });
const triggerActions = disabled ? [] : trigger; const triggerActions = disabled ? [] : typeof trigger === 'string' ? [trigger] : trigger;
let alignPoint; let alignPoint;
if (triggerActions && triggerActions.indexOf('contextmenu') !== -1) { if (triggerActions && triggerActions.indexOf('contextmenu') !== -1) {
alignPoint = true; alignPoint = true;

5
components/vc-dropdown/src/Dropdown.jsx
View File

@ -29,8 +29,8 @@ export default defineComponent({
'hover', 'hover',
), ),
alignPoint: PropTypes.looseBool, alignPoint: PropTypes.looseBool,
showAction: PropTypes.array.def([]), showAction: PropTypes.array,
hideAction: PropTypes.array.def([]), hideAction: PropTypes.array,
getPopupContainer: PropTypes.func, getPopupContainer: PropTypes.func,
visible: PropTypes.looseBool, visible: PropTypes.looseBool,
defaultVisible: PropTypes.looseBool.def(false), defaultVisible: PropTypes.looseBool.def(false),
@ -177,7 +177,6 @@ export default defineComponent({
if (!triggerHideAction && trigger.indexOf('contextmenu') !== -1) { if (!triggerHideAction && trigger.indexOf('contextmenu') !== -1) {
triggerHideAction = ['click']; triggerHideAction = ['click'];
} }
const triggerProps = { const triggerProps = {
...otherProps, ...otherProps,
prefixCls, prefixCls,