From 1b4c19b7d477adcd996aca77f5c847bd529facff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=BD=E5=A4=9A=E5=A4=A7=E7=B1=B3?= Date: Fri, 15 Jan 2021 19:58:14 +0800 Subject: [PATCH] feat: add change log 2.15.0 (#20692) --- CHANGELOG.en-US.md | 21 +++++++++++++++++++++ CHANGELOG.es.md | 20 ++++++++++++++++++++ CHANGELOG.fr-FR.md | 21 +++++++++++++++++++++ CHANGELOG.zh-CN.md | 21 +++++++++++++++++++++ build/bin/version.js | 4 ++-- build/deploy-ci.sh | 2 +- build/deploy-faas.sh | 2 +- package.json | 2 +- 8 files changed, 88 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index efef2f07ed4..d6c17429b5f 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,26 @@ ## Changelog +### 2.15.0 + +*2021-01-15* + +#### Bug fixes + +- Select + - Fix placeholder i18n bug (#17644 by @nzh63) +- Popconfirm + - Popconfirm i18n bug by @iamkun) +- Drawer + - Fix focus bug (#20626 by @cs1707) +- Image + - Preview optimization (#20652 by @cs1707) + +#### Optimization + +- Doc + - Fix typo in french translation of datetime-picker.md (#20543 by @lonk) + - Add format attribute description to the progress component (#20641 by @cs1707) + ### 2.14.1 *2020-11-11* diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md index cfc25dc9873..8915a2c545b 100644 --- a/CHANGELOG.es.md +++ b/CHANGELOG.es.md @@ -1,4 +1,24 @@ ## Changelog +### 2.15.0 + +*2021-01-15* + +#### Bug fixes + +- Select + - Fix placeholder i18n bug (#17644 by @nzh63) +- Popconfirm + - Popconfirm i18n bug by @iamkun +- Drawer + - Fix focus bug (#20626 by @cs1707) +- Image + - Preview optimization (#20652 by @cs1707) + +#### Optimization + +- Doc + - Fix typo in french translation of datetime-picker.md (#20543 by @lonk) + - Add format attribute description to the progress component (#20641 by @cs1707) ### 2.14.1 diff --git a/CHANGELOG.fr-FR.md b/CHANGELOG.fr-FR.md index 1d42848db8c..de4eec25138 100644 --- a/CHANGELOG.fr-FR.md +++ b/CHANGELOG.fr-FR.md @@ -1,5 +1,26 @@ ## Changelog +### 2.15.0 + +*2021-01-15* + +#### Bug fixes + +- Select + - Fix placeholder i18n bug (#17644 by @nzh63) +- Popconfirm + - Popconfirm i18n bug by @iamkun +- Drawer + - Fix focus bug (#20626 by @cs1707) +- Image + - Preview optimization (#20652 by @cs1707) + +#### Optimization + +- Doc + - Fix typo in french translation of datetime-picker.md (#20543 by @lonk) + - Add format attribute description to the progress component (#20641 by @cs1707) + ### 2.14.1 *2020-11-11* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 89b19e44682..811fe871344 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,26 @@ ## 更新日志 +### 2.15.0 + +*2021-01-15* + +#### Bug 修复 + +- Select + - 修复 placeholder 国际化 bug (#17644 by @nzh63) +- Popconfirm + - 修复 Popconfirm 国际化 bug by @iamkun +- Drawer + - 修复 focus bug (#20626 by @cs1707) +- Image + - 图片预览优化 (#20652 by @cs1707) + +#### 优化 + +- Doc + - 更新法语文档 datetime-picker.md (#20543 by @lonk) + - 更新 Progress 组件文档 (#20641 by @cs1707) + ### 2.14.1 *2020-11-11* diff --git a/build/bin/version.js b/build/bin/version.js index e11970b84f1..94584b78e7e 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', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9', '2.10.1': '2.10', '2.11.1': '2.11', '2.12.0': '2.12', '2.13.2': '2.13' }; -if (!content[version]) content[version] = '2.14'; +var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9', '2.10.1': '2.10', '2.11.1': '2.11', '2.12.0': '2.12', '2.13.2': '2.13', '2.14.1': '2.14' }; +if (!content[version]) content[version] = '2.15'; fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index 34549b11dbb..cf76f0df5f3 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.14' + SUB_FOLDER='2.15' 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 fe17136d0bf..699bcf8d41d 100644 --- a/build/deploy-faas.sh +++ b/build/deploy-faas.sh @@ -6,7 +6,7 @@ cd temp_web git clone --depth 1 -b gh-pages --single-branch https://github.com/ElemeFE/element.git && cd element # build sub folder -SUB_FOLDER='2.14' +SUB_FOLDER='2.15' mkdir -p $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** diff --git a/package.json b/package.json index 7390afa88c1..ca261266f23 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "dist": "npm run clean && npm run build:file && npm run lint && webpack --config build/webpack.conf.js && webpack --config build/webpack.common.js && webpack --config build/webpack.component.js && npm run build:utils && npm run build:umd && npm run build:theme", "i18n": "node build/bin/i18n.js", "lint": "eslint src/**/* test/**/* packages/**/* build/**/* --quiet", - "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh && node build/bin/gen-indices.js && sh build/deploy-faas.sh", + "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh && node build/bin/gen-indices.js", "test": "npm run lint && npm run build:theme && cross-env CI_ENV=/dev/ BABEL_ENV=test karma start test/unit/karma.conf.js --single-run", "test:watch": "npm run build:theme && cross-env BABEL_ENV=test karma start test/unit/karma.conf.js" },