diff --git a/package.json b/package.json index c4d0639971e..882b7e7046c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng-zorro-antd", - "version": "0.6.4", + "version": "0.6.5", "license": "MIT", "description": "An enterprise-class UI components based on Ant Design and Angular", "scripts": { diff --git a/src/components/calendar/nz-calendar.component.ts b/src/components/calendar/nz-calendar.component.ts index 513a54b36bc..42adb0dc9a8 100644 --- a/src/components/calendar/nz-calendar.component.ts +++ b/src/components/calendar/nz-calendar.component.ts @@ -212,7 +212,7 @@ export class NzCalendarComponent implements OnInit { _quartersCalendar: QuartersType[] = []; _listOfWeekName: string[] = []; _listOfMonthName: string[] = []; - _listOfYearName: string[] = []; + _listOfYearName: number[] = []; _yearUnit = '年'; _monthUnit = '月'; _showMonth = moment(new Date()).month(); @@ -397,7 +397,7 @@ export class NzCalendarComponent implements OnInit { this._monthUnit = moment.duration(4, 'week').humanize().split(' ')[ 1 ][ 0 ].toUpperCase() + moment.duration(4, 'week').humanize().split(' ')[ 1 ].slice(1, moment.duration(4, 'week').humanize().split(' ')[ 1 ].length); } catch (e) { } } - this._listOfYearName = this._generateYears(this._showYear).map(x => `${x}`); + this._listOfYearName = this._generateYears(this._showYear); this._listOfWeekName = moment.weekdaysMin(); this._listOfMonthName = moment.months(); const date = moment(this.nzValue).year(this._showYear).month(this._showMonth); diff --git a/src/components/locale/nz-locale.service.ts b/src/components/locale/nz-locale.service.ts index d932726e1d4..2b552ae6289 100644 --- a/src/components/locale/nz-locale.service.ts +++ b/src/components/locale/nz-locale.service.ts @@ -17,11 +17,10 @@ export class NzLocaleService { // TODO: cache more deeply paths for performance translate(path: string, data?: any): string { this._logger.debug(`[NzLocaleService] Translating(${this._locale.locale}): ${path}`); - const content = this._getObjectPath(this._locale, path); - let res = content; + let content = this._getObjectPath(this._locale, path) as string; if (typeof content === 'string') { if (data) { - Object.keys(data).forEach((key) => res = content.replace(new RegExp(`%${key}%`, 'g'), data[key])); + Object.keys(data).forEach((key) => content = content.replace(new RegExp(`%${key}%`, 'g'), data[key])); } return content; } diff --git a/src/components/modal/nz-modal-subject.service.ts b/src/components/modal/nz-modal-subject.service.ts index f68d8f5f2ff..9c5e564849f 100644 --- a/src/components/modal/nz-modal-subject.service.ts +++ b/src/components/modal/nz-modal-subject.service.ts @@ -13,7 +13,7 @@ const enum modalEvent { } @Injectable() -export class NzModalSubject extends Subject { +export class NzModalSubject extends Subject { modalId: string; eventsQueue = {}; diff --git a/src/showcase/nz-intro-changelog/README.md b/src/showcase/nz-intro-changelog/README.md index ebbc487d6ce..87b2867ec91 100644 --- a/src/showcase/nz-intro-changelog/README.md +++ b/src/showcase/nz-intro-changelog/README.md @@ -9,6 +9,13 @@ 更新日志也可以在[Github](https://github.com/NG-ZORRO/ng-zorro-antd/releases)查看 +## 0.6.5 +`2017-12-10` + +### Bug Fixes +* 修复 `Modal` 类型兼容问题 [#722](https://github.com/NG-ZORRO/ng-zorro-antd/pull/722) +* 修复 `i18n` 替换问题 [#722](https://github.com/NG-ZORRO/ng-zorro-antd/pull/722) + ## 0.6.4 `2017-12-10`