diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 53c042472..b91ce7d86 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,18 @@
## Changelog
+### 1.4.3
+
+*2017-08-25*
+
+- Fixed style bug when Progress's `percentage` is `0`, #6551 @Kingwl
+- Fixed Carousel items flashing when switching, #6394
+- Fixed disabled Button not prevent event propagation when clicked on its text area, #6421
+- Fixed disabled dates calculation in DatePicker's month view, #6363
+- Fixed key enter event being stopped propagation in Autocomplete, #6499 @leezng
+- Fixed `amPm` not supported in DatePicker i18n, #6574
+- Fixed clicking or dragging error of Slider when it switches from invisible to visible, #6593
+- Fixed Alert using small icons when its `description` is passed via default slot, #6612 @leezng
+
### 1.4.2
*2017-08-09*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 7432f586d..51ebef618 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,17 @@
## 更新日志
+### 1.4.3
+*2017-08-25*
+
+- 修复 Progress 百分比为 `0` 时的样式问题,#6551 @Kingwl
+- 修复 Carousel 在切换时幻灯片闪烁的问题,#6394
+- 修复禁用的 Button 在点击文字部分时未阻止事件传播的问题,#6421
+- 修复 DatePicker 的月视图错误计算禁用日期的问题,#6363
+- 修复 Autocomplete 键盘回车被阻止传播的问题,#6499 @leezng
+- 修复 DatePicker 的 i18n 不支持 `amPm` 的问题,#6574
+- 修复 Slider 由隐藏变为可见时交互错误的问题,#6593
+- 修复通过默认 slot 传递 `description` 的 Alert 错误地使用小图标的问题,#6612 @leezng
+
### 1.4.2
*2017-08-09*
diff --git a/FAQ.md b/FAQ.md
index a52f03bc7..63d93daa2 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -22,7 +22,7 @@
使用 [Scoped slot](https://vuejs.org/v2/guide/components.html#Scoped-Slots) 即可:
```html
-
+
查看详情
@@ -115,7 +115,7 @@ For other components, the `.native` modifier is still mandatory.
Just use [Scoped slot](https://vuejs.org/v2/guide/components.html#Scoped-Slots):
```html
-
+
Details
diff --git a/examples/docs/en-US/icon.md b/examples/docs/en-US/icon.md
index 6c72c9313..db92dd76c 100644
--- a/examples/docs/en-US/icon.md
+++ b/examples/docs/en-US/icon.md
@@ -12,7 +12,6 @@
-
-
diff --git a/examples/play/index.vue b/examples/play/index.vue
index d0e6856e7..a1b8e0c85 100644
--- a/examples/play/index.vue
+++ b/examples/play/index.vue
@@ -1,14 +1,8 @@
diff --git a/examples/versions.json b/examples/versions.json
index 7d6f05af6..95f66bd5b 100644
--- a/examples/versions.json
+++ b/examples/versions.json
@@ -1 +1 @@
-{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.2":"1.4"}
\ No newline at end of file
+{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.3":"1.4"}
\ No newline at end of file
diff --git a/package.json b/package.json
index 65dc434ff..ff4a82e69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "element-ui",
- "version": "1.4.2",
+ "version": "1.4.3",
"description": "A Component Library for Vue.js.",
"main": "lib/element-ui.common.js",
"files": [
diff --git a/packages/alert/src/main.vue b/packages/alert/src/main.vue
index faee131e1..de8609386 100644
--- a/packages/alert/src/main.vue
+++ b/packages/alert/src/main.vue
@@ -78,11 +78,11 @@
},
isBigIcon() {
- return this.description ? 'is-big' : '';
+ return this.description || this.$slots.default ? 'is-big' : '';
},
isBoldTitle() {
- return this.description ? 'is-bold' : '';
+ return this.description || this.$slots.default ? 'is-bold' : '';
}
}
};
diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index 3abba29f2..6dc87bb98 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -11,7 +11,7 @@
@blur="handleBlur"
@keydown.up.native.prevent="highlight(highlightedIndex - 1)"
@keydown.down.native.prevent="highlight(highlightedIndex + 1)"
- @keydown.enter.native.prevent="handleKeyEnter"
+ @keydown.enter.native="handleKeyEnter"
@keydown.native.tab="close"
>
@@ -138,8 +138,9 @@
close(e) {
this.activated = false;
},
- handleKeyEnter() {
+ handleKeyEnter(e) {
if (this.suggestionVisible && this.highlightedIndex >= 0 && this.highlightedIndex < this.suggestions.length) {
+ e.preventDefault();
this.select(this.suggestions[this.highlightedIndex]);
}
},
diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue
index dc3e0a416..2bc7d3fde 100644
--- a/packages/button/src/button.vue
+++ b/packages/button/src/button.vue
@@ -15,9 +15,9 @@
}
]"
>
-
-
-
+
+
+