Merge remote-tracking branch 'baidu/master'

This commit is contained in:
liaoxuezhi 2020-05-18 22:13:20 +08:00
commit 8c7439e173

View File

@ -122,7 +122,7 @@ export function expandValue(
value &&
value.hasOwnProperty(valueField || 'value')
) {
value = (value as Option)[valueField || 'value'] || '';
value = (value as Option)[valueField || 'value'] ?? '';
}
return findTree(
@ -280,6 +280,8 @@ export class Select extends React.Component<SelectProps, SelectState> {
this.handleEditClick = this.handleEditClick.bind(this);
this.handleDeleteClick = this.handleDeleteClick.bind(this);
// console.log('props.value', props.value);
this.state = {
isOpen: props.defaultOpen || false,
isFocused: false,
@ -547,6 +549,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
} = this.props;
const selection = this.state.selection;
// console.log('selection', selection);
if (!selection.length) {
return (