Merge branch '1.x' of github.com:vueComponent/ant-design-vue into 1.x
commit
74007fbb16
|
@ -141,7 +141,6 @@ const Select = {
|
|||
{
|
||||
prefixCls: 'rc-tree-select',
|
||||
prefixAria: 'rc-tree-select',
|
||||
showArrow: true,
|
||||
showSearch: true,
|
||||
autoClearSearchValue: true,
|
||||
showCheckedStrategy: SHOW_CHILD,
|
||||
|
|
|
@ -186,15 +186,16 @@ const MultipleSelector = {
|
|||
},
|
||||
|
||||
render() {
|
||||
const { $slots } = this;
|
||||
const { $slots, $props } = this;
|
||||
const listeners = getListeners(this);
|
||||
const { showArrow = false } = $props;
|
||||
return (
|
||||
<Selector
|
||||
{...{
|
||||
props: {
|
||||
...this.$props,
|
||||
showArrow,
|
||||
tabIndex: -1,
|
||||
showArrow: false,
|
||||
renderSelection: this.renderSelection,
|
||||
renderPlaceholder: this._renderPlaceholder,
|
||||
},
|
||||
|
|
|
@ -42,9 +42,11 @@ const SingleSelector = {
|
|||
},
|
||||
|
||||
render() {
|
||||
const { showArrow = true } = this.$props;
|
||||
const props = {
|
||||
props: {
|
||||
...getOptionProps(this),
|
||||
showArrow,
|
||||
renderSelection: this.renderSelection,
|
||||
},
|
||||
on: getListeners(this),
|
||||
|
|
Loading…
Reference in New Issue