diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue index e423e8c54..cdb18813e 100644 --- a/packages/select/src/select.vue +++ b/packages/select/src/select.vue @@ -26,6 +26,7 @@ class="el-select__input" :class="`is-${ size }`" @focus="visible = true" + :disabled="disabled" @keyup="managePlaceholder" @keydown="resetInputState" @keydown.down.prevent="navigateOptions('next')" @@ -364,10 +365,11 @@ getOption(value) { let option; - for (let i = 0, len = this.cachedOptions.length; i < len; i++) { + for (let i = this.cachedOptions.length - 1; i >= 0; i--) { const cachedOption = this.cachedOptions[i]; if (cachedOption.value === value) { option = cachedOption; + break; } } if (option) return option; @@ -513,8 +515,8 @@ if (option.created) { this.query = ''; this.inputLength = 20; - this.$refs.input.focus(); } + if (this.filterable) this.$refs.input.focus(); } }, diff --git a/packages/theme-default/src/common/var.css b/packages/theme-default/src/common/var.css index 50155f20c..c919fdd36 100644 --- a/packages/theme-default/src/common/var.css +++ b/packages/theme-default/src/common/var.css @@ -515,7 +515,7 @@ --steps-border-radius: 4px; --steps-padding: 20px; - /* Steps + /* Menu --------------------------*/ --menu-item-color: var(--link-color); --menu-item-fill: var(--color-extra-light-gray); diff --git a/packages/theme-default/src/date-picker.css b/packages/theme-default/src/date-picker.css index de90342d9..e4f8e6821 100644 --- a/packages/theme-default/src/date-picker.css +++ b/packages/theme-default/src/date-picker.css @@ -8,3 +8,4 @@ @import "./date-picker/time-range-picker.css"; @import "./date-picker/time-picker.css"; @import "./input.css"; +@import "./scrollbar.css"; \ No newline at end of file diff --git a/packages/theme-default/src/select.css b/packages/theme-default/src/select.css index b056564a4..47cd92a68 100644 --- a/packages/theme-default/src/select.css +++ b/packages/theme-default/src/select.css @@ -5,6 +5,7 @@ @import "./tag.css"; @import "./option.css"; @import "./option-group.css"; +@import "./scrollbar.css"; @component-namespace el { diff --git a/packages/theme-default/src/time-picker.css b/packages/theme-default/src/time-picker.css index 935b8046c..357bb8414 100644 --- a/packages/theme-default/src/time-picker.css +++ b/packages/theme-default/src/time-picker.css @@ -2,3 +2,4 @@ @import "./date-picker/time-spinner.css"; @import "./date-picker/time-picker.css"; @import "./input.css"; +@import "./scrollbar.css"; diff --git a/packages/theme-default/src/time-select.css b/packages/theme-default/src/time-select.css index d257f6110..701b20207 100644 --- a/packages/theme-default/src/time-select.css +++ b/packages/theme-default/src/time-select.css @@ -1,6 +1,7 @@ @import "./date-picker/picker.css"; @import "./date-picker/date-picker.css"; @import "./common/var.css"; +@import "./scrollbar.css"; .time-select { margin: 5px 0;