Merge branch '1.x' of github.com:vueComponent/ant-design-vue into 1.x

vueComponent · Jul 14, 2021 · 74007fb · 74007fb
2 parents 833cd47 + 72ca67b
commit 74007fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/components/vc-tree-select/src/Select.jsx b/components/vc-tree-select/src/Select.jsx
@@ -141,7 +141,6 @@ const Select = {
     {
       prefixCls: 'rc-tree-select',
       prefixAria: 'rc-tree-select',
-      showArrow: true,
       showSearch: true,
       autoClearSearchValue: true,
       showCheckedStrategy: SHOW_CHILD,

diff --git a/components/vc-tree-select/src/Selector/MultipleSelector/index.jsx b/components/vc-tree-select/src/Selector/MultipleSelector/index.jsx
@@ -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,
           },

diff --git a/components/vc-tree-select/src/Selector/SingleSelector.jsx b/components/vc-tree-select/src/Selector/SingleSelector.jsx
@@ -42,9 +42,11 @@ const SingleSelector = {
   },
 
   render() {
+    const { showArrow = true } = this.$props;
     const props = {
       props: {
         ...getOptionProps(this),
+        showArrow,
         renderSelection: this.renderSelection,
       },
       on: getListeners(this),