Select: fix disabled multiple filterable bug, add missing scrollbar styles

pull/2540/head
Leopoldthecoder 2017-01-20 11:37:12 +08:00
parent a6fc0312de
commit 1c6c0cda45
6 changed files with 8 additions and 2 deletions

View File

@ -26,6 +26,7 @@
class="el-select__input" class="el-select__input"
:class="`is-${ size }`" :class="`is-${ size }`"
@focus="visible = true" @focus="visible = true"
:disabled="disabled"
@keyup="managePlaceholder" @keyup="managePlaceholder"
@keydown="resetInputState" @keydown="resetInputState"
@keydown.down.prevent="navigateOptions('next')" @keydown.down.prevent="navigateOptions('next')"
@ -364,10 +365,11 @@
getOption(value) { getOption(value) {
let option; 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]; const cachedOption = this.cachedOptions[i];
if (cachedOption.value === value) { if (cachedOption.value === value) {
option = cachedOption; option = cachedOption;
break;
} }
} }
if (option) return option; if (option) return option;

View File

@ -515,7 +515,7 @@
--steps-border-radius: 4px; --steps-border-radius: 4px;
--steps-padding: 20px; --steps-padding: 20px;
/* Steps /* Menu
--------------------------*/ --------------------------*/
--menu-item-color: var(--link-color); --menu-item-color: var(--link-color);
--menu-item-fill: var(--color-extra-light-gray); --menu-item-fill: var(--color-extra-light-gray);

View File

@ -8,3 +8,4 @@
@import "./date-picker/time-range-picker.css"; @import "./date-picker/time-range-picker.css";
@import "./date-picker/time-picker.css"; @import "./date-picker/time-picker.css";
@import "./input.css"; @import "./input.css";
@import "./scrollbar.css";

View File

@ -5,6 +5,7 @@
@import "./tag.css"; @import "./tag.css";
@import "./option.css"; @import "./option.css";
@import "./option-group.css"; @import "./option-group.css";
@import "./scrollbar.css";
@component-namespace el { @component-namespace el {

View File

@ -2,3 +2,4 @@
@import "./date-picker/time-spinner.css"; @import "./date-picker/time-spinner.css";
@import "./date-picker/time-picker.css"; @import "./date-picker/time-picker.css";
@import "./input.css"; @import "./input.css";
@import "./scrollbar.css";

View File

@ -1,6 +1,7 @@
@import "./date-picker/picker.css"; @import "./date-picker/picker.css";
@import "./date-picker/date-picker.css"; @import "./date-picker/date-picker.css";
@import "./common/var.css"; @import "./common/var.css";
@import "./scrollbar.css";
.time-select { .time-select {
margin: 5px 0; margin: 5px 0;