diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index f4c34e85c..1d04d8bd2 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,14 @@ ## Changelog +### 2.0.10 + +*2017-12-29* + +- Fixed wrong max height calculation of Table when fixed column and summary row co-exist, #9026 +- Fixed uncompiled color style of empty text in Table, #9028 +- Now DatePicker only emits `change` event when value is truly changed, #9029 (by @remizovvv) +- Added `tabindex` attribute for Input, #9041 (by @dicklwm) + ### 2.0.9🎄 *2017-12-24* diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md index 26d3a9f4c..212d0373c 100644 --- a/CHANGELOG.es.md +++ b/CHANGELOG.es.md @@ -1,5 +1,14 @@ ## Changelog +### 2.0.10 + +*2017-12-29* + +- Fixed wrong max height calculation of Table when fixed column and summary row co-exist, #9026 +- Fixed uncompiled color style of empty text in Table, #9028 +- Now DatePicker only emits `change` event when value is truly changed, #9029 (by @remizovvv) +- Added `tabindex` attribute for Input, #9041 (by @dicklwm) + ### 2.0.9🎄 *2017-12-24* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index f42279ebd..7eb6584d4 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,14 @@ ## 更新日志 +### 2.0.10 + +*2017-12-29* + +- 修复了 Table 在固定列和合计行并存时的高度计算错误的问题,#9026 +- 修复了 Table 样式 SCSS 文件错误编译的问题,#9028 +- 现在 DatePicker 的 `change` 事件只会在 `value` 真正改变的时候触发,#9029(by @remizovvv) +- 新增 Input 的 `tabindex` 属性,#9041(by @dicklwm) + ### 2.0.9🎄 *2017-12-24* diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue index 7669bfa3b..cd84ca512 100644 --- a/packages/select/src/select.vue +++ b/packages/select/src/select.vue @@ -12,7 +12,7 @@ + {{ selected.length - 1 }} @@ -204,6 +204,12 @@ selectSize() { return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size; + }, + + collapseTagSize() { + return ['small', 'mini'].indexOf(this.selectSize) > -1 + ? 'mini' + : 'small'; } },