diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index df777aff6..497b52d20 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,15 @@ ## Changelog +### 2.0.4 + +*2017-11-10* + +- Improved accessibility for Cascader, Dropdown, Message, Notification, Popover, Tooltip and Tree +- Fixed Container resize when the width of viewport decreases, #8042 +- Fixed Tree's `updateKeyChildren` incorrectly deleting child nodes, #8100 +- Fixed bordered CheckboxButton's height when nested in a Form, #8100 +- Fixed Menu's parsing error for custom colors, #8153 (by @zhouyixiang) + ### 2.0.3 *2017-11-03* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index d713059db..1e21c98a4 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,15 @@ ## 更新日志 +### 2.0.4 + +*2017-11-10* + +- 提升 Cascader、Dropdown、Message、Notification、Popover、Tooltip、Tree 的可访问性 +- 修复当视口变窄时 Container 无法同步更新其宽度的问题,#8042 +- 修复 Tree 的 `updateKeyChildren` 在删除子节点时的行为错误,#8100 +- 修复带有边框的 CheckboxButton 在 Form 中高度错误的问题,#8100 +- 修复 Menu 在解析自定义颜色时的错误,#8153(by @zhouyixiang) + ### 2.0.3 *2017-11-03* diff --git a/packages/upload/src/ajax.js b/packages/upload/src/ajax.js index 0d62e0855..470505ae4 100644 --- a/packages/upload/src/ajax.js +++ b/packages/upload/src/ajax.js @@ -1,9 +1,9 @@ function getError(action, option, xhr) { let msg; if (xhr.response) { - msg = `${xhr.status} ${xhr.response.error || xhr.response}`; + msg = `${xhr.response.error || xhr.response}`; } else if (xhr.responseText) { - msg = `${xhr.status} ${xhr.responseText}`; + msg = `${xhr.responseText}`; } else { msg = `fail to post ${action} ${xhr.status}`; } diff --git a/test/unit/specs/upload.spec.js b/test/unit/specs/upload.spec.js index 5d191a18b..a1c6134b1 100644 --- a/test/unit/specs/upload.spec.js +++ b/test/unit/specs/upload.spec.js @@ -41,7 +41,7 @@ describe('ajax', () => { }); it('40x code should be error', done => { option.onError = e => { - expect(e.toString()).to.contain('404 Not found'); + expect(e.toString()).to.contain('Not found'); done(); };