diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index a42f430ee..afeaca5cc 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,34 @@ ## Changelog +### 2.2.0 Graphite + +*2018-02-12* + +### New features +- Menu + - Added `popper-class` and `disabled` attributes for SubMenu, #9604 #9771 + - Horizontal Menu now supports multi-layered SubMenu, #9741 +- Tree + - Added `node-contextmenu` event, #9678 + - Now you can customize node template using scoped slot, #9686 + - Added `getNode`, `remove`, `append`, `insertBefore`, `insertAfter`, `getCheckedKeys`, `getHalfCheckedNodes`, `getHalfCheckedKeys` methods and `check` event, #9718 #9730 +- Transfer + - Added `clearQuery` method, #9753 +- Select + - Added `popper-append-to-body` attribute, #9782 + +### Bug fixes +- Table + - Fixed clicking expanding icon of an expandable row triggers `row-click` event, #9654 + - Fixed layout not update when column width is changed by user dragging, #9668 + - Fixed style issue when summary row co-exists with fixed columns, #9667 +- Container + - Fixed container components not stretching in IE11, #9655 +- Loading + - Fixed Loading not showing when the value of `v-loading` is changed to true in the `mounted` hook, #9722 +- Switch + - Fixed two native click events are triggered when Switch is clicked, #9760 + ### 2.1.0 Charcoal *2018-01-31* diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md index 8dc818cc3..6b5905923 100644 --- a/CHANGELOG.es.md +++ b/CHANGELOG.es.md @@ -1,5 +1,34 @@ ## Changelog +### 2.2.0 Graphite + +*2018-02-12* + +### New features +- Menu + - Added `popper-class` and `disabled` attributes for SubMenu, #9604 #9771 + - Horizontal Menu now supports multi-layered SubMenu, #9741 +- Tree + - Added `node-contextmenu` event, #9678 + - Now you can customize node template using scoped slot, #9686 + - Added `getNode`, `remove`, `append`, `insertBefore`, `insertAfter`, `getCheckedKeys`, `getHalfCheckedNodes`, `getHalfCheckedKeys` methods and `check` event, #9718 #9730 +- Transfer + - Added `clearQuery` method, #9753 +- Select + - Added `popper-append-to-body` attribute, #9782 + +### Bug fixes +- Table + - Fixed clicking expanding icon of an expandable row triggers `row-click` event, #9654 + - Fixed layout not update when column width is changed by user dragging, #9668 + - Fixed style issue when summary row co-exists with fixed columns, #9667 +- Container + - Fixed container components not stretching in IE11, #9655 +- Loading + - Fixed Loading not showing when the value of `v-loading` is changed to true in the `mounted` hook, #9722 +- Switch + - Fixed two native click events are triggered when Switch is clicked, #9760 + ### 2.1.0 Charcoal *2018-01-31* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 672cfee8b..38274230f 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,34 @@ ## 更新日志 +### 2.2.0 Graphite + +*2018-02-12* + +#### 新特性 +- Menu + - SubMenu 新增 `popper-class` 和 `disabled` 属性,#9604 #9771 + - 现在水平模式下的 Menu 支持多级 SubMenu 了,#9741 +- Tree + - 新增 `node-contextmenu` 事件,#9678 + - 现在可以使用 scoped slot 自定义树节点的模板了,#9686 + - 新增 `getNode`、`remove`、`append`、`insertBefore`、`insertAfter`、`getCheckedKeys`、`getHalfCheckedNodes`、`getHalfCheckedKeys` 方法和 `check` 事件,#9718 #9730 +- Transfer + - 新增 `clearQuery` 方法,#9753 +- Select + - 新增 `popper-append-to-body` 属性,#9782 + +#### 修复 +- Table + - 修复点击可展开行的展开图标会触发 `row-click` 事件的问题,#9654 + - 修复某些情况下通过拖动改变列宽后,布局没有同步更新的问题,#9668 + - 修复合计行与固定列并存时的样式问题,#9667 +- Container + - 修复布局组件在 IE11 中无法自动填充可用空间的问题,#9655 +- Loading + - 修复在 `mounted` 中修改 `v-loading` 的值为 true 时不能正确显示 Loading 的问题,#9722 +- Switch + - 修复点击时会触发两次原生 click 事件的问题,#9760 + ### 2.1.0 Charcoal *2018-01-31* diff --git a/build/bin/version.js b/build/bin/version.js index ef51c38af..2e9c61ffd 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' }; -if (!content[version]) content[version] = '2.1'; +var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1' }; +if (!content[version]) content[version] = '2.2'; fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index 16fe64085..7a926e28b 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.1' + SUB_FOLDER='2.2' 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 16ae694a6..d15c6776e 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.1' +SUB_FOLDER='2.2' mkdir $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** diff --git a/examples/components/footer.vue b/examples/components/footer.vue index 0ab10bb3e..bc5090ec6 100644 --- a/examples/components/footer.vue +++ b/examples/components/footer.vue @@ -21,7 +21,7 @@ Awesome Element