diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index b171174e9..081937f3c 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,42 @@ ## Changelog +### 2.3.0 Diamond + +*2018-03-28* + +#### New features +- Table + - Now `formatter` of TableColumn can be dynamically updated, #10184 (by @elfman) + - Added `select-on-indeterminate` attribute, #9924 (by @syn-zeta) +- Menu + - Added `collapse-transition` attribute, #8809 (by @limichange) +- Input + - Added `select` method, #10229 + - Added `blur` method, #10356 +- ColorPicker + - Added `predefine` attribute, #10170 (by @elfman) +- Tree + - Added `draggable`, `allow-drop` and `allow-drag` attributes, and `node-drag-start`, `node-drag-enter`, `node-drag-leave`, `node-drag-over`, `node-drag-end` and `node-drop` events, #9251 #10372 (by @elfman) +- Form + - `validate` method now has a second parameter, containing information of form items that failed the validation, #10279 + - Added `validate` event, #10351 +- Progress + - Added `color` attribute, #10352 (by @YunYouJun) +- Button + - Added `circle` attribute, #10359 (by @YunYouJun) + +#### Bug fixes +- Form + - Fixed label of FormItem not align with mixed Input, #10189 +- Menu + - Now collapsed Menu will only show the Tooltip when the `title` slot of MenuItem is set, #10193 (by @PanJiaChen) +- Pagination + - Fixed `current-change` event wrongly triggering without user interaction, #10247 +- DatePicker + - Now the date and time value in the dropdown panel are correctly formatted based on the `format` attribute, #10174(by @remizovvv) +- Upload + - Fixed `accept` attribute not working when `drag` is true, #10278 + ### 2.2.2 *2018-03-14* diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md index 5c336633c..440ee7f45 100644 --- a/CHANGELOG.es.md +++ b/CHANGELOG.es.md @@ -1,5 +1,42 @@ ## Changelog +### 2.3.0 Diamond + +*2018-03-28* + +#### New features +- Table + - Now `formatter` of TableColumn can be dynamically updated, #10184 (by @elfman) + - Added `select-on-indeterminate` attribute, #9924 (by @syn-zeta) +- Menu + - Added `collapse-transition` attribute, #8809 (by @limichange) +- Input + - Added `select` method, #10229 + - Added `blur` method, #10356 +- ColorPicker + - Added `predefine` attribute, #10170 (by @elfman) +- Tree + - Added `draggable`, `allow-drop` and `allow-drag` attributes, and `node-drag-start`, `node-drag-enter`, `node-drag-leave`, `node-drag-over`, `node-drag-end` and `node-drop` events, #9251 #10372 (by @elfman) +- Form + - `validate` method now has a second parameter, containing information of form items that failed the validation, #10279 + - Added `validate` event, #10351 +- Progress + - Added `color` attribute, #10352 (by @YunYouJun) +- Button + - Added `circle` attribute, #10359 (by @YunYouJun) + +#### Bug fixes +- Form + - Fixed label of FormItem not align with mixed Input, #10189 +- Menu + - Now collapsed Menu will only show the Tooltip when the `title` slot of MenuItem is set, #10193 (by @PanJiaChen) +- Pagination + - Fixed `current-change` event wrongly triggering without user interaction, #10247 +- DatePicker + - Now the date and time value in the dropdown panel are correctly formatted based on the `format` attribute, #10174(by @remizovvv) +- Upload + - Fixed `accept` attribute not working when `drag` is true, #10278 + ### 2.2.2 *2018-03-14* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 91db70033..c6d66a700 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,42 @@ ## 更新日志 +### 2.3.0 Diamond + +*2018-03-28* + +#### 新特性 +- Table + - 现在 TableColumn 的 `formatter` 属性可以是动态的,#10184(by @elfman) + - 新增 `select-on-indeterminate` 属性,#9924(by @syn-zeta) +- Menu + - 新增 `collapse-transition` 属性,#8809(by @limichange) +- Input + - 新增 `select` 方法,#10229 + - 新增 `blur` 方法,#10356 +- ColorPicker + - 新增 `predefine` 属性,#10170(by @elfman) +- Tree + - 新增 `draggable`、`allow-drop` 和 `allow-drag` 属性,以及 `node-drag-start`、`node-drag-enter`、`node-drag-leave`、`node-drag-over`、`node-drag-end` 和 `node-drop` 事件,#9251 #10372(by @elfman) +- Form + - `validate` 方法新增第二个参数,包含未通过本次校验的表单项信息,#10279 + - 新增 `validate` 事件,#10351 +- Progress + - 新增 `color` 属性,#10352(by @YunYouJun) +- Button + - 新增 `circle` 属性,#10359(by @YunYouJun) + +#### 修复 +- Form + - 修复嵌套复合型 Input 时,FormItem 标签与输入框未对齐的问题,#10189 +- Menu + - 现在折叠状态的菜单项仅在传入 `title` slot 时才显示 Tooltip,#10193(by @PanJiaChen) +- Pagination + - 修复 `current-change` 在未发生用户交互时错误触发的问题,#10247 +- DatePicker + - 现在时间日期选择器下拉面板中的值能够正确地从 `format` 属性中获取对应格式了,#10174(by @remizovvv) +- Upload + - 现在拖拽上传会拦截不在 `accept` 属性范围内的文件,#10278 + ### 2.2.2 *2018-03-14* diff --git a/build/bin/version.js b/build/bin/version.js index 2e9c61ffd..5f6518313 100644 --- a/build/bin/version.js +++ b/build/bin/version.js @@ -1,6 +1,6 @@ var fs = require('fs'); var path = require('path'); var version = process.env.VERSION || require('../../package.json').version; -var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1' }; -if (!content[version]) content[version] = '2.2'; +var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2' }; +if (!content[version]) content[version] = '2.3'; fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index 7a926e28b..126d9f342 100644 --- a/build/deploy-ci.sh +++ b/build/deploy-ci.sh @@ -40,7 +40,7 @@ if [ "$TRAVIS_TAG" ]; then # build sub folder echo $TRAVIS_TAG - SUB_FOLDER='2.2' + SUB_FOLDER='2.3' mkdir $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh index d15c6776e..331d44f4a 100644 --- a/build/deploy-faas.sh +++ b/build/deploy-faas.sh @@ -5,7 +5,7 @@ cd temp_web git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element # build sub folder -SUB_FOLDER='2.2' +SUB_FOLDER='2.3' mkdir $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/**