diff --git a/components/lib/autocomplete/AutoComplete.vue b/components/lib/autocomplete/AutoComplete.vue index f88f43699..5b262baad 100755 --- a/components/lib/autocomplete/AutoComplete.vue +++ b/components/lib/autocomplete/AutoComplete.vue @@ -765,7 +765,7 @@ export default { return this.isValidOption(option) && this.getOptionLabel(option).toLocaleLowerCase(this.searchLocale) === value.toLocaleLowerCase(this.searchLocale); }, isValidOption(option) { - return option && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); + return ObjectUtils.isNotEmpty(option) && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); }, isValidSelectedOption(option) { return this.isValidOption(option) && this.isSelected(option); diff --git a/components/lib/cascadeselect/CascadeSelect.vue b/components/lib/cascadeselect/CascadeSelect.vue index a5c94ba1d..865eb139e 100644 --- a/components/lib/cascadeselect/CascadeSelect.vue +++ b/components/lib/cascadeselect/CascadeSelect.vue @@ -528,7 +528,7 @@ export default { return this.isValidOption(processedOption) && this.getProccessedOptionLabel(processedOption).toLocaleLowerCase(this.searchLocale).startsWith(this.searchValue.toLocaleLowerCase(this.searchLocale)); }, isValidOption(processedOption) { - return !!processedOption && !this.isOptionDisabled(processedOption.option); + return ObjectUtils.isNotEmpty(processedOption) && !this.isOptionDisabled(processedOption.option); }, isValidSelectedOption(processedOption) { return this.isValidOption(processedOption) && this.isSelected(processedOption); diff --git a/components/lib/dropdown/Dropdown.vue b/components/lib/dropdown/Dropdown.vue index 8ddebed14..94c434d60 100755 --- a/components/lib/dropdown/Dropdown.vue +++ b/components/lib/dropdown/Dropdown.vue @@ -711,7 +711,7 @@ export default { return this.isValidOption(option) && this.getOptionLabel(option).toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale)); }, isValidOption(option) { - return option && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); + return ObjectUtils.isNotEmpty(option) && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); }, isValidSelectedOption(option) { return this.isValidOption(option) && this.isSelected(option); diff --git a/components/lib/listbox/Listbox.vue b/components/lib/listbox/Listbox.vue index b8c6a2aa4..a56080855 100755 --- a/components/lib/listbox/Listbox.vue +++ b/components/lib/listbox/Listbox.vue @@ -511,7 +511,7 @@ export default { return this.isValidOption(option) && this.getOptionLabel(option).toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale)); }, isValidOption(option) { - return option && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); + return ObjectUtils.isNotEmpty(option) && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); }, isValidSelectedOption(option) { return this.isValidOption(option) && this.isSelected(option); diff --git a/components/lib/multiselect/MultiSelect.vue b/components/lib/multiselect/MultiSelect.vue index 37e044700..6f274f829 100755 --- a/components/lib/multiselect/MultiSelect.vue +++ b/components/lib/multiselect/MultiSelect.vue @@ -804,7 +804,7 @@ export default { return this.isValidOption(option) && this.getOptionLabel(option).toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale)); }, isValidOption(option) { - return option && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); + return ObjectUtils.isNotEmpty(option) && !(this.isOptionDisabled(option) || this.isOptionGroup(option)); }, isValidSelectedOption(option) { return this.isValidOption(option) && this.isSelected(option);