diff --git a/components/vc-menu/MenuItem.vue b/components/vc-menu/MenuItem.vue
index 52c548ec5..60afb9550 100644
--- a/components/vc-menu/MenuItem.vue
+++ b/components/vc-menu/MenuItem.vue
@@ -15,6 +15,7 @@ const props = {
level: PropTypes.number.def(1),
mode: PropTypes.oneOf(['horizontal', 'vertical', 'vertical-left', 'vertical-right', 'inline']).def('vertical'),
parentMenu: PropTypes.object,
+ multiple: PropTypes.bool,
// clearSubMenuTimers: PropTypes.func.def(noop),
}
const MenuItem = {
diff --git a/components/vc-select/Select.vue b/components/vc-select/Select.vue
index 7dd4d2296..be6f76c33 100644
--- a/components/vc-select/Select.vue
+++ b/components/vc-select/Select.vue
@@ -1361,13 +1361,14 @@ export default {
// component='ul'
// transitionName={choiceTransitionName}
{...transitionProps}
+ onClick={this.muitipleContainerClick}
>
{selectedValueNodes}
)
} else {
innerNode = (
-
+
)
@@ -1380,7 +1381,11 @@ export default {
)
},
-
+ muitipleContainerClick (e) {
+ if (this.openStatus) {
+ e.stopPropagation()
+ }
+ },
renderClear () {
const { prefixCls, allowClear, sValue, inputValue } = this
const clear = (
@@ -1447,6 +1452,7 @@ export default {
render () {
const props = this.$props
const multiple = isMultipleOrTags(props)
+ const preOptions = this._options || []
const { options, open: openStatus } = this.getOptionsAndOpenStatus()
const { disabled, prefixCls, inputValue, sValue, $listeners } = this
const { mouseenter = noop, mouseleave = noop, popupScroll = noop } = $listeners
@@ -1494,7 +1500,7 @@ export default {
dropdownStyle={props.dropdownStyle}
combobox={props.combobox}
showSearch={props.showSearch}
- options={options}
+ options={options.length || openStatus ? options : preOptions}
multiple={multiple}
disabled={disabled}
visible={openStatus}
diff --git a/components/vc-select/SelectTrigger.vue b/components/vc-select/SelectTrigger.vue
index daef4a756..932a75da1 100644
--- a/components/vc-select/SelectTrigger.vue
+++ b/components/vc-select/SelectTrigger.vue
@@ -50,6 +50,8 @@ export default {
// children: PropTypes.any,
showAction: PropTypes.arrayOf(PropTypes.string),
combobox: PropTypes.bool,
+ animation: PropTypes.string,
+ transitionName: PropTypes.string,
},
data () {
return {