From 673081274fccce2eefb69a6519c78b74480c5713 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Wed, 26 Jun 2019 08:28:17 +0800 Subject: [PATCH] cr tree-select --- components/vc-tree-select/src/Base/BaseSelector.jsx | 1 - components/vc-tree-select/src/util.js | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/vc-tree-select/src/Base/BaseSelector.jsx b/components/vc-tree-select/src/Base/BaseSelector.jsx index 5074a45d1..26b89e737 100644 --- a/components/vc-tree-select/src/Base/BaseSelector.jsx +++ b/components/vc-tree-select/src/Base/BaseSelector.jsx @@ -27,7 +27,6 @@ export const selectorPropTypes = () => ({ inputIcon: PropTypes.any, clearIcon: PropTypes.any, removeIcon: PropTypes.any, - selectorValueList: PropTypes.array, placeholder: PropTypes.any, disabled: PropTypes.bool, focused: PropTypes.bool, diff --git a/components/vc-tree-select/src/util.js b/components/vc-tree-select/src/util.js index 81d7b52f6..dc2a36775 100644 --- a/components/vc-tree-select/src/util.js +++ b/components/vc-tree-select/src/util.js @@ -203,7 +203,7 @@ export function getFilterTree(h, treeNodes, searchValue, filterFunc, valueEntiti match = true; } const $slots = getSlots(node); - const children = toNodeArray($slots.default) + const children = $slots.default .map(mapFilteredNodeToData) .filter(n => n); delete $slots.default; @@ -299,7 +299,8 @@ export function formatSelectorValue(valueList, props, valueEntities) { value, }; }); - } else if (showCheckedStrategy === SHOW_CHILD) { + } + if (showCheckedStrategy === SHOW_CHILD) { // Only get the children checked value const targetValueList = [];