diff --git a/README.md b/README.md index eff29f4f8..bdd5e7ff7 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ - + diff --git a/packages/color-picker/src/main.vue b/packages/color-picker/src/main.vue index 53b7239d2..07307477c 100644 --- a/packages/color-picker/src/main.vue +++ b/packages/color-picker/src/main.vue @@ -96,14 +96,14 @@ } }, displayedColor(val) { - const outerColor = new Color({ + const currentValueColor = new Color({ enableAlpha: this.showAlpha, format: this.colorFormat }); - outerColor.fromString(this.value); + currentValueColor.fromString(this.value); - const outerColorRgb = this.displayedRgb(outerColor, this.showAlpha); - if (val !== outerColorRgb) { + const currentValueColorRgb = this.displayedRgb(currentValueColor, this.showAlpha); + if (val !== currentValueColorRgb) { this.$emit('active-change', val); } } diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue index 74f6cae7e..59833c0b7 100644 --- a/packages/select/src/select.vue +++ b/packages/select/src/select.vue @@ -78,7 +78,7 @@ :auto-complete="autoComplete" :size="selectSize" :disabled="selectDisabled" - :readonly="!filterable || multiple" + :readonly="readonly" :validate-event="false" :class="{ 'is-focus': visible }" @focus="handleFocus" @@ -183,6 +183,13 @@ _elFormItemSize() { return (this.elFormItem || {}).elFormItemSize; }, + + readonly() { + // trade-off for IE input readonly problem: https://github.com/ElemeFE/element/issues/10403 + const isIE = !this.$isServer && !isNaN(Number(document.documentMode)); + return !this.filterable || this.multiple || !isIE && !this.visible; + }, + iconClass() { let criteria = this.clearable && !this.selectDisabled &&