p96170835
/
amis
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-04-02 12:26:16 +08:00
parent a6735c19ed 5439bc6602
commit 0ad0223239
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/Select.tsx
View File

@ -597,12 +597,12 @@ export class Select extends React.Component<SelectProps, SelectState> {
let checkedAll = false;
let checkedPartial = false;
let filtedOptions: Array<Option> =
inputValue && isOpen && !loadOptions
? matchSorter(options, inputValue, {
keys: [labelField || 'label', valueField || 'value']
})
: options.concat();
let filtedOptions: Array<Option> = (inputValue && isOpen && !loadOptions
? matchSorter(options, inputValue, {
keys: [labelField || 'label', valueField || 'value']
})
: options.concat()
).filter((option: Option) => !option.hidden && option.visible !== false);
const selectionValues = selection.map(select => select[valueField]);
if (multiple && checkAll) {

5
src/renderers/Form/Select.tsx
View File

@ -166,7 +166,10 @@ export default class SelectControl extends React.Component<SelectProps, any> {
if (
!find(combinedOptions, (item: Option) => item.value == option.value)
) {
combinedOptions.push(option);
combinedOptions.push({
...option,
hidden: true
});
}
});
}