From d11095cc6c49e597acc95497488d95a34e4ac388 Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Thu, 30 Nov 2017 13:46:06 +0800 Subject: [PATCH] Changelog: update for 1.4.12 --- CHANGELOG.en-US.md | 6 ++++++ CHANGELOG.zh-CN.md | 5 +++++ examples/app.vue | 9 +++++++++ 3 files changed, 20 insertions(+) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 4051ae377..7efc8fbac 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,11 @@ ## Changelog +### 1.4.12 + +*2017-11-30* + +- Fixed input height error of Select when `size` is not assigned, #8460 + ### 1.4.11 *2017-11-24* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 9902c5627..41ee95d67 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,10 @@ ## 更新日志 +### 1.4.12 +*2017-11-30* + +- 修复未指定 `size` 的 Select 输入框高度错误,#8460 + ### 1.4.11 *2017-11-24* diff --git a/examples/app.vue b/examples/app.vue index 0087eaab5..8c1b8bf03 100644 --- a/examples/app.vue +++ b/examples/app.vue @@ -199,6 +199,15 @@ this.localize(); this.renderAnchorHref(); this.goAnchor(); + setTimeout(() => { + const title = this.lang === 'zh-CN' ? '提示' : 'Notice'; + const message = this.lang === 'zh-CN' ? 'Element 1.x 已停止维护,请升级至 2.x' : 'Element 1.x is no longer maintained. Please upgrade to 2.x'; + this.$notify({ + title, + message, + duration: 0 + }); + }, 3000); }, created() {