From 9f3f174ad3d2934d16e0689d30d5326bb9d51421 Mon Sep 17 00:00:00 2001 From: VTHINKXIE Date: Mon, 25 Jun 2018 14:59:02 +0800 Subject: [PATCH] release(1.1.0): release 1.1.0 (#1713) --- CHANGELOG.md | 25 ++++++++++++++++++- docs/changelog.en-US.md | 25 ++++++++++++++++++- docs/changelog.zh-CN.md | 24 ++++++++++++++++++ package.json | 4 +-- site_scripts/_site/src/app/app.component.ts | 2 +- .../share/nz-codebox/nz-codebox.component.ts | 2 +- .../replace-scope-prefix.js | 2 +- 7 files changed, 77 insertions(+), 7 deletions(-) rename {scripts/changelog => site_scripts}/replace-scope-prefix.js (79%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9df6c3c5b..1c656365cec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ + +# [1.1.0](https://github.com/NG-ZORRO/ng-zorro-antd/compare/1.0.0...1.1.0) (2018-06-25) + + +### Bug Fixes + +* ** cascader:** fix custom render with nzClear ([#1676](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1676)) ([c683bc3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/c683bc3)), closes [#1646](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1646) +* **autocomplete:** AOT compiler requires public properties ([#1686](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1686)) ([a1f326d](https://github.com/NG-ZORRO/ng-zorro-antd/commit/a1f326d)), closes [#1683](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1683) +* **card:** fix card loading style ([#1696](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1696)) ([70cb591](https://github.com/NG-ZORRO/ng-zorro-antd/commit/70cb591)), closes [#1695](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1695) +* **date-picker:** fix date display of the end part is not as expected ([#1709](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1709)) ([b1a1235](https://github.com/NG-ZORRO/ng-zorro-antd/commit/b1a1235)), closes [#1693](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1693) +* **nz-alert:** emit close after fade animation is done ([#1667](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1667)) ([6b31ca3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/6b31ca3)), closes [#1666](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1666) +* **select:** move select ovarlay to the last of container ([#1673](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1673)) ([442e3f3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/442e3f3)), closes [#1672](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1672) [#1643](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1643) +* **th:** fix table th filter & style bug ([#1674](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1674)) ([1a4332a](https://github.com/NG-ZORRO/ng-zorro-antd/commit/1a4332a)), closes [#1671](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1671) [#1660](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1660) +* **tree-select:** position error when in the modal-box ([#1687](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1687)) ([43910f9](https://github.com/NG-ZORRO/ng-zorro-antd/commit/43910f9)), closes [#1681](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1681) +* **ng-add:** remove compiled css from styles when use custom theme ([#1655](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1655)) ([fc67ce5](https://github.com/NG-ZORRO/ng-zorro-antd/commit/fc67ce5)) +* **showcase:** use differenceInCalendarDays to do judgement with days for date-picker's demo ([#1648](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1648)) ([7d593e6](https://github.com/NG-ZORRO/ng-zorro-antd/commit/7d593e6)) + + +### Features + +* **table:** support nzSimple option ([#1699](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1699)) ([4868c41](https://github.com/NG-ZORRO/ng-zorro-antd/commit/4868c41)), closes [#1599](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1599) + + + # [1.0.0](https://github.com/NG-ZORRO/ng-zorro-antd/compare/0.7.1...1.0.0) (2018-06-11) @@ -589,4 +613,3 @@ And the default value of "nzShowExpand" has changed to "true". # 0.5.0-rc.0 (2017-08-15) - diff --git a/docs/changelog.en-US.md b/docs/changelog.en-US.md index 0eeb523bb8d..95542c7d9fe 100755 --- a/docs/changelog.en-US.md +++ b/docs/changelog.en-US.md @@ -14,8 +14,31 @@ timeline: true --- +## 1.1.0 +`2018-06-25` + +### Bug Fixes + +* ** cascader:** fix custom render with nzClear ([#1676](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1676)) ([c683bc3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/c683bc3)), closes [#1646](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1646) +* **autocomplete:** AOT compiler requires public properties ([#1686](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1686)) ([a1f326d](https://github.com/NG-ZORRO/ng-zorro-antd/commit/a1f326d)), closes [#1683](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1683) +* **card:** fix card loading style ([#1696](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1696)) ([70cb591](https://github.com/NG-ZORRO/ng-zorro-antd/commit/70cb591)), closes [#1695](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1695) +* **date-picker:** fix date display of the end part is not as expected ([#1709](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1709)) ([b1a1235](https://github.com/NG-ZORRO/ng-zorro-antd/commit/b1a1235)), closes [#1693](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1693) +* **nz-alert:** emit close after fade animation is done ([#1667](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1667)) ([6b31ca3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/6b31ca3)), closes [#1666](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1666) +* **select:** move select ovarlay to the last of container ([#1673](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1673)) ([442e3f3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/442e3f3)), closes [#1672](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1672) [#1643](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1643) +* **table:** fix table th filter & style bug ([#1674](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1674)) ([1a4332a](https://github.com/NG-ZORRO/ng-zorro-antd/commit/1a4332a)), closes [#1671](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1671) [#1660](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1660) +* **tree-select:** position error when in the modal-box ([#1687](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1687)) ([43910f9](https://github.com/NG-ZORRO/ng-zorro-antd/commit/43910f9)), closes [#1681](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1681) +* **ng-add:** remove compiled css from styles when use custom theme ([#1655](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1655)) ([fc67ce5](https://github.com/NG-ZORRO/ng-zorro-antd/commit/fc67ce5)) +* **showcase:** use differenceInCalendarDays to do judgement with days for date-picker's demo ([#1648](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1648)) ([7d593e6](https://github.com/NG-ZORRO/ng-zorro-antd/commit/7d593e6)) + + +### Features + +* **table:** support nzSimple option ([#1699](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1699)) ([4868c41](https://github.com/NG-ZORRO/ng-zorro-antd/commit/4868c41)), closes [#1599](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1599) + + + ## 1.0.0 -`2018 06-11` +`2018-06-11` We released the first version of ng-zorro-antd 10 months ago. In those 10 months we received PRs from more than 35 contributors. Underwent about 386 commits and 35 [releases](https://github.com/NG-ZORRO/ng-zorro-antd/releases). diff --git a/docs/changelog.zh-CN.md b/docs/changelog.zh-CN.md index 7c31446cc0c..7683bf866a2 100755 --- a/docs/changelog.zh-CN.md +++ b/docs/changelog.zh-CN.md @@ -14,6 +14,30 @@ timeline: true --- +## 1.1.0 +`2018-06-25` + + +### Bug Fixes + +* ** cascader:** 修复 nzClear 后不生效的问题 ([#1676](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1676)) ([c683bc3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/c683bc3)), closes [#1646](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1646) +* **autocomplete:** 修复 AutoComplete 在 AoT 编译下的问题 ([#1686](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1686)) ([a1f326d](https://github.com/NG-ZORRO/ng-zorro-antd/commit/a1f326d)), closes [#1683](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1683) +* **card:** 修复 Card 的 loading 样式问题 ([#1696](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1696)) ([70cb591](https://github.com/NG-ZORRO/ng-zorro-antd/commit/70cb591)), closes [#1695](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1695) +* **date-picker:** 修复 DatePicker 在跨日期选择下的时间展示问题 ([#1709](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1709)) ([b1a1235](https://github.com/NG-ZORRO/ng-zorro-antd/commit/b1a1235)), closes [#1693](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1693) +* **nz-alert:** 修复 close 事件的逻辑 ([#1667](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1667)) ([6b31ca3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/6b31ca3)), closes [#1666](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1666) +* **select:** 修复 select 在弹出框中的顺序问题 ([#1673](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1673)) ([442e3f3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/442e3f3)), closes [#1672](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1672) [#1643](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1643) +* **table:** 修复 table 中 重置 filter 及 表头滚动条样式问题 ([#1674](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1674)) ([1a4332a](https://github.com/NG-ZORRO/ng-zorro-antd/commit/1a4332a)), closes [#1671](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1671) [#1660](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1660) +* **tree-select:** 修复 TreeSelect 在弹出框中的下拉菜单定位问题 ([#1687](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1687)) ([43910f9](https://github.com/NG-ZORRO/ng-zorro-antd/commit/43910f9)), closes [#1681](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1681) +* **ng-add:** 修复使用 ng add 多次执行后的样式导入问题 ([#1655](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1655)) ([fc67ce5](https://github.com/NG-ZORRO/ng-zorro-antd/commit/fc67ce5)) +* **showcase:** 修复文档中 DatePicker 禁止时间范围的问题 ([#1648](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1648)) ([7d593e6](https://github.com/NG-ZORRO/ng-zorro-antd/commit/7d593e6)) + + +### Features + +* **table:** 支持 pagination 的 nzSimple 选项 ([#1699](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1699)) ([4868c41](https://github.com/NG-ZORRO/ng-zorro-antd/commit/4868c41)), closes [#1599](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1599) + + + ## 1.0.0 `2018-06-11` diff --git a/package.json b/package.json index 776409d5134..1aafe75aa53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng-zorro-antd", - "version": "1.0.0", + "version": "1.1.0", "license": "MIT", "description": "An enterprise-class UI components based on Ant Design and Angular", "scripts": { @@ -23,7 +23,7 @@ "integration-webpack": "npm run generate && cd integration/webpack && npm run integration", "integration-rollup": "npm run generate && cd integration/rollup && npm run integration", "lint": "tslint -c tslint.json 'components/*/*.ts'", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s && node scripts/changelog/replace-scope-prefix.js" + "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s && node site_scripts/replace-scope-prefix.js" }, "main": "./bundles/antd.umd.js", "module": "./esm5/antd.js", diff --git a/site_scripts/_site/src/app/app.component.ts b/site_scripts/_site/src/app/app.component.ts index dd6341bf969..f642cf656bf 100644 --- a/site_scripts/_site/src/app/app.component.ts +++ b/site_scripts/_site/src/app/app.component.ts @@ -20,7 +20,7 @@ export class AppComponent implements OnInit { '0.6.x', '0.7.x' ]; - currentVersion = '1.0.0'; + currentVersion = '1.1.0'; switchLanguage(language) { const url = this.router.url.split('/'); diff --git a/site_scripts/_site/src/app/share/nz-codebox/nz-codebox.component.ts b/site_scripts/_site/src/app/share/nz-codebox/nz-codebox.component.ts index 0461ce9e6ad..76e17b2f9db 100644 --- a/site_scripts/_site/src/app/share/nz-codebox/nz-codebox.component.ts +++ b/site_scripts/_site/src/app/share/nz-codebox/nz-codebox.component.ts @@ -393,7 +393,7 @@ export class AppModule { } '@angular/router' : '^6.0.0', '@angular/animations' : '^6.0.0', 'date-fns' : '^1.29.0', - 'ng-zorro-antd' : '^1.0.0' + 'ng-zorro-antd' : '^1.1.0' }, tags : [ 'stackblitz', 'sdk' ] }); diff --git a/scripts/changelog/replace-scope-prefix.js b/site_scripts/replace-scope-prefix.js similarity index 79% rename from scripts/changelog/replace-scope-prefix.js rename to site_scripts/replace-scope-prefix.js index 1a47d359a91..1b855c052ac 100644 --- a/scripts/changelog/replace-scope-prefix.js +++ b/site_scripts/replace-scope-prefix.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); const path = require('path'); -const changelogPath = path.resolve(__dirname, `../../CHANGELOG.md`); +const changelogPath = path.resolve(__dirname, `../CHANGELOG.md`); async function replace(path) { const content = await fs.readFile(path, 'utf8');