diff --git a/src/components/alert/nz-alert.component.ts b/src/components/alert/nz-alert.component.ts index 2315fec000..24cb826e48 100644 --- a/src/components/alert/nz-alert.component.ts +++ b/src/components/alert/nz-alert.component.ts @@ -5,6 +5,7 @@ import { Output, EventEmitter, OnChanges, OnInit } from '@angular/core'; +import { toBoolean } from '../util/convert'; import { FadeAnimation } from '../core/animation/fade-animations'; @Component({ @@ -52,18 +53,45 @@ import { FadeAnimation } from '../core/animation/fade-animations'; './style/patch.less' ] }) - export class NzAlertComponent implements OnChanges { + private _banner = false; + private _closeable = false; + private _showIcon = false; _display = true; antAlert = 'ant-alert'; @Input() nzType = 'info'; - @Input() nzBanner = false; - @Input() nzCloseable = false; @Input() nzDescription: string; - @Input() nzShowIcon = false; @Input() nzCloseText: string; @Input() nzMessage: string; @Output() nzOnClose: EventEmitter = new EventEmitter(); + + @Input() + set nzBanner(value: boolean) { + this._banner = toBoolean(value); + } + + get nzBanner(): boolean { + return this._banner; + } + + @Input() + set nzCloseable(value: boolean) { + this._closeable = toBoolean(value); + } + + get nzCloseable(): boolean { + return this._closeable; + } + + @Input() + set nzShowIcon(value: boolean) { + this._showIcon = toBoolean(value); + } + + get nzShowIcon(): boolean { + return this._showIcon; + } + _classMap = { [`${this.antAlert}`] : true, [`${this.antAlert}-${this.nzType}`] : true, @@ -86,8 +114,4 @@ export class NzAlertComponent implements OnChanges { [`${this.antAlert}-with-description`]: !!this.nzDescription }; } - - constructor() { - } - } diff --git a/src/components/avatar/nz-avatar.module.ts b/src/components/avatar/nz-avatar.module.ts index 51d95759a1..97c38d8043 100644 --- a/src/components/avatar/nz-avatar.module.ts +++ b/src/components/avatar/nz-avatar.module.ts @@ -7,6 +7,5 @@ import { NzAvatarComponent } from './nz-avatar.component'; exports : [ NzAvatarComponent ], imports : [ CommonModule ] }) - export class NzAvatarModule { } diff --git a/src/components/badge/nz-badge.component.ts b/src/components/badge/nz-badge.component.ts index 8f62abfc0e..87f70e8973 100644 --- a/src/components/badge/nz-badge.component.ts +++ b/src/components/badge/nz-badge.component.ts @@ -15,6 +15,8 @@ import { animate } from '@angular/animations'; +import { toBoolean } from '../util/convert'; + @Component({ selector : 'nz-badge', encapsulation: ViewEncapsulation.None, @@ -60,7 +62,8 @@ import { ] }) export class NzBadgeComponent implements OnInit { - _showZero = false; + private _showDot = false; + private _showZero = false; count: number; maxNumberArray; countArray = []; @@ -76,19 +79,23 @@ export class NzBadgeComponent implements OnInit { @Input() nzOverflowCount = 99; @Input() - set nzShowZero(value: boolean | string) { - if (value === '') { - this._showZero = true; - } else { - this._showZero = value as boolean; - } + set nzShowZero(value: boolean) { + this._showZero = toBoolean(value); } - get nzShowZero() { + get nzShowZero(): boolean { return this._showZero; } - @Input() nzDot = false; + @Input() + set nzDot(value: boolean) { + this._showDot = toBoolean(value); + } + + get nzDot(): boolean { + return this._showDot; + } + @Input() nzText: string; @Input() nzStyle; @Input() @HostBinding('class.ant-badge-status') nzStatus: string; diff --git a/src/components/breadcrumb/nz-breadcrumb.component.ts b/src/components/breadcrumb/nz-breadcrumb.component.ts index 26f1bd7849..67bd4d2952 100755 --- a/src/components/breadcrumb/nz-breadcrumb.component.ts +++ b/src/components/breadcrumb/nz-breadcrumb.component.ts @@ -18,8 +18,4 @@ import { export class NzBreadCrumbComponent { @Input() nzSeparator = '/'; @HostBinding('class.ant-breadcrumb') _nzBreadcrumb = true; - - constructor() { - } - } diff --git a/src/components/button/nz-button-group.component.ts b/src/components/button/nz-button-group.component.ts index 67c4a759aa..aaa6e6f682 100644 --- a/src/components/button/nz-button-group.component.ts +++ b/src/components/button/nz-button-group.component.ts @@ -25,7 +25,7 @@ export class NzButtonGroupComponent implements AfterContentInit { @Input() get nzSize(): NzButtonGroupSize { return this._size; - }; + } set nzSize(value: NzButtonGroupSize) { this._size = value; @@ -35,10 +35,6 @@ export class NzButtonGroupComponent implements AfterContentInit { }; } - - constructor() { - } - ngAfterContentInit() { /** trim text node between button */ Array.from(this._groupWrapper.nativeElement.childNodes).forEach((node: HTMLElement) => { diff --git a/src/components/button/nz-button.component.spec.ts b/src/components/button/nz-button.component.spec.ts index d07fb3ce65..66a9ec6c78 100644 --- a/src/components/button/nz-button.component.spec.ts +++ b/src/components/button/nz-button.component.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed, ComponentFixtureAutoDetect } from '@angular/core/testing'; -import { Component, DebugElement } from '@angular/core'; +import { async, fakeAsync, tick, ComponentFixture, TestBed, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { Component, DebugElement, ViewChild } from '@angular/core'; import { By } from '@angular/platform-browser'; import { NzButtonModule } from './nz-button.module'; import { NzButtonComponent } from './nz-button.component'; @@ -123,13 +123,12 @@ describe('NzButton', () => { expect(buttonDebugElement.nativeElement.classList.contains('custom-class')).toBe(true); }); - it('should handle a click on the button', () => { + it('should handle a click on the button', fakeAsync(() => { buttonDebugElement.nativeElement.click(); expect(testComponent.isLoading).toBe(true); - setTimeout(_ => { - expect(testComponent.isLoading).toBe(false); - }, 5000); - }); + tick(5000); + expect(testComponent.isLoading).toBe(false); + })); }); describe('NzButton with disabled', () => { @@ -185,6 +184,35 @@ describe('NzButton', () => { }); }); + describe('NzButton with literal boolean attributes', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports : [ NzButtonModule ], + declarations: [ TestAppLiteral ], + providers : [] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TestAppLiteral); + testComponent = fixture.debugElement.componentInstance; + }); + + it('should treat empty attibutes as truthy', async(() => { + fixture.detectChanges(); + const component = testComponent as TestAppLiteral; + expect(component.truthyButton.nzLoading).toBe(true); + expect(component.truthyButton.nzGhost).toBe(true); + })); + + it('should treat non-exist attributes as falsy', async(() => { + fixture.detectChanges(); + const component = testComponent as TestAppLiteral; + expect(component.falsyButton.nzLoading).toBe(false); + expect(component.falsyButton.nzGhost).toBe(false); + })); + }); + }); /** Test component that contains an nzButton. */ @@ -261,4 +289,14 @@ class TestAppGroup { size = 'small'; } - +@Component({ + selector: 'test-app-literal', + template: ` + + + ` +}) +class TestAppLiteral { + @ViewChild('truthy') truthyButton: NzButtonComponent + @ViewChild('falsy') falsyButton: NzButtonComponent +} diff --git a/src/components/button/nz-button.component.ts b/src/components/button/nz-button.component.ts index 5ea27413d7..995e3307f7 100644 --- a/src/components/button/nz-button.component.ts +++ b/src/components/button/nz-button.component.ts @@ -7,6 +7,7 @@ import { AfterContentInit, Renderer2 } from '@angular/core'; +import { toBoolean } from '../util/convert'; export type NzButtonType = 'primary' | 'dashed' | 'danger'; export type NzButtonShape = 'circle' | null ; @@ -24,6 +25,8 @@ export type NzButtonSize = 'small' | 'large' | 'default' ; ] }) export class NzButtonComponent implements AfterContentInit { + private _ghost = false; + private _loading = false; _el: HTMLElement; nativeElement: HTMLElement; _iconElement: HTMLElement; @@ -32,15 +35,13 @@ export class NzButtonComponent implements AfterContentInit { _size: NzButtonSize; _classList: Array = []; _iconOnly = false; - _loading = false; _clicked = false; - _ghost = false; _prefixCls = 'ant-btn'; _sizeMap = { large: 'lg', small: 'sm' }; @Input() set nzGhost(value: boolean) { - this._ghost = value; + this._ghost = toBoolean(value); this._setClassMap(); } @@ -51,7 +52,7 @@ export class NzButtonComponent implements AfterContentInit { @Input() get nzType(): NzButtonType { return this._type; - }; + } set nzType(value: NzButtonType) { this._type = value; @@ -61,7 +62,7 @@ export class NzButtonComponent implements AfterContentInit { @Input() get nzShape(): NzButtonShape { return this._shape; - }; + } set nzShape(value: NzButtonShape) { this._shape = value; @@ -76,18 +77,18 @@ export class NzButtonComponent implements AfterContentInit { get nzSize(): NzButtonSize { return this._size; - }; + } @Input() set nzLoading(value: boolean) { - this._loading = value; + this._loading = toBoolean(value); this._setClassMap(); this._setIconDisplay(value); } get nzLoading(): boolean { return this._loading; - }; + } /** toggle button clicked animation */ @HostListener('click') @@ -98,7 +99,7 @@ export class NzButtonComponent implements AfterContentInit { this._clicked = false; this._setClassMap(); }, 300); - }; + } _setIconDisplay(value: boolean) { diff --git a/src/components/button/nz-button.module.ts b/src/components/button/nz-button.module.ts index 5c10abafc1..42fdf0251a 100644 --- a/src/components/button/nz-button.module.ts +++ b/src/components/button/nz-button.module.ts @@ -8,6 +8,5 @@ import { CommonModule } from '@angular/common'; exports : [ NzButtonComponent, NzButtonGroupComponent ], imports : [ CommonModule ] }) - export class NzButtonModule { } diff --git a/src/components/calendar/nz-calendar.component.ts b/src/components/calendar/nz-calendar.component.ts index 9a13633642..e0a7c9fa6a 100644 --- a/src/components/calendar/nz-calendar.component.ts +++ b/src/components/calendar/nz-calendar.component.ts @@ -14,6 +14,7 @@ import * as moment from 'moment'; import { Moment } from 'moment'; // import 'moment/locale/zh-cn'; import { NzLocaleService } from '../locale/index'; +import { toBoolean } from '../util/convert'; export interface MonthInterface { index: number; @@ -199,6 +200,11 @@ export interface WeekInterface { ] }) export class NzCalendarComponent implements OnInit { + private _clearTime = true; + private _datePicker = false; + private _fullScreen = true; + private _showHeader = true; + _el: HTMLElement; _weeksCalendar: Array = []; _quartersCalendar: Array = []; @@ -217,17 +223,39 @@ export class NzCalendarComponent implements OnInit { @Output() nzClickDay: EventEmitter = new EventEmitter(); @Output() nzClickMonth: EventEmitter = new EventEmitter(); @Input() nzClearTime = true; - @Input() @HostBinding('class.ant-patch-full-height') nzDatePicker = false; @Input() nzMode = 'year'; - @Input() nzFullScreen = true; - @Input() nzShowHeader = true; + + @Input() + set nzFullScreen(value: boolean) { + this._fullScreen = toBoolean(value); + } + + get nzFullScreen(): boolean { + return this._fullScreen; + } + + @Input() + set nzShowHeader(value: boolean) { + this._showHeader = toBoolean(value); + } + + get nzShowHeader(): boolean { + return this._showHeader; + } + @Input() nzDisabledDate: Function; @Input() - get nzValue(): Date { - return this._value || new Date(); + @HostBinding('class.ant-patch-full-height') + set nzDatePicker(value: boolean) { + this._datePicker = toBoolean(value); + } + + get nzDatePicker(): boolean { + return this._datePicker; } + @Input() set nzValue(value: Date) { if (this._value === value) { return; @@ -238,43 +266,47 @@ export class NzCalendarComponent implements OnInit { this._buildCalendar(); } - @Input() - get nzShowYear() { - return this._showYear; + get nzValue(): Date { + return this._value || new Date(); } + @Input() set nzShowYear(value) { this._showYear = value; this._buildCalendar(); } - @Input() - get nzShowMonth() { - return this._showMonth; + get nzShowYear() { + return this._showYear; } + @Input() set nzShowMonth(value) { this._showMonth = value; this._buildCalendar(); } - @Input() - get nzLocale(): string { - return this._locale; + get nzShowMonth() { + return this._showMonth; } + @Input() set nzLocale(value: string) { this._locale = value; moment.locale(this._locale); } + get nzLocale(): string { + return this._locale; + } + _removeTime(date) { if (this.nzClearTime) { return date.hour(0).minute(0).second(0).millisecond(0); } else { return date; } - }; + } _clickDay($event, day) { $event.preventDefault(); @@ -283,7 +315,7 @@ export class NzCalendarComponent implements OnInit { return; } this.nzClickDay.emit(day); - }; + } _clickMonth($event, month) { $event.preventDefault(); @@ -292,7 +324,7 @@ export class NzCalendarComponent implements OnInit { return; } this.nzClickMonth.emit(month); - }; + } _buildMonth(d: Moment): Array { const weeks: Array = []; @@ -310,7 +342,7 @@ export class NzCalendarComponent implements OnInit { monthIndex = date.month(); } return weeks; - }; + } _buildWeek(date: Moment, month: Moment): Array { const days: Array = []; @@ -331,7 +363,7 @@ export class NzCalendarComponent implements OnInit { date.add(1, 'd'); } return days; - }; + } _buildYears(date: Moment) { const quarters = []; @@ -351,7 +383,7 @@ export class NzCalendarComponent implements OnInit { } } return quarters; - }; + } _buildCalendar() { moment.locale(this._locale); @@ -369,7 +401,7 @@ export class NzCalendarComponent implements OnInit { const date = moment(this.nzValue).year(this._showYear).month(this._showMonth); this._weeksCalendar = this._buildMonth(date); this._quartersCalendar = this._buildYears(date); - }; + } _generateYears(year) { const listOfYears = []; @@ -377,7 +409,7 @@ export class NzCalendarComponent implements OnInit { listOfYears.push(i - 10 + year); } return listOfYears; - }; + } constructor(private _elementRef: ElementRef, private _localeService: NzLocaleService) { this._el = this._elementRef.nativeElement; diff --git a/src/components/calendar/nz-calendar.module.ts b/src/components/calendar/nz-calendar.module.ts index b823d6789e..8f0877697b 100644 --- a/src/components/calendar/nz-calendar.module.ts +++ b/src/components/calendar/nz-calendar.module.ts @@ -11,9 +11,5 @@ import { NzLocaleModule } from '../locale/index'; declarations: [ NzCalendarComponent ], exports : [ NzCalendarComponent ] }) - export class NzCalendarModule { } - - - diff --git a/src/components/card/nz-card.component.ts b/src/components/card/nz-card.component.ts index 282147d387..b08b1e865f 100755 --- a/src/components/card/nz-card.component.ts +++ b/src/components/card/nz-card.component.ts @@ -6,6 +6,7 @@ import { TemplateRef, ViewEncapsulation } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-card', @@ -51,11 +52,41 @@ import { ] }) export class NzCardComponent { - @Input() @HostBinding('class.ant-card-bordered') nzBordered = true; - @Input() nzLoading = false; - @Input() @HostBinding('class.ant-card-no-hovering') nzNoHovering = false; + private _borderd = true; + private _loading = false; + private _noHovering = false; + + @Input() + @HostBinding('class.ant-card-bordered') + set nzBordered(value: boolean) { + this._borderd = toBoolean(value); + } + + get nzBordered(): boolean { + return this._borderd; + } + @ContentChild('title') title: TemplateRef; @ContentChild('extra') extra: TemplateRef; @ContentChild('body') body: TemplateRef; @HostBinding('class.ant-card') _nzCard = true; + + @Input() + set nzLoading(value: boolean) { + this._loading = toBoolean(value); + } + + get nzLoading(): boolean { + return this._loading; + } + + @Input() + @HostBinding('class.ant-card-no-hovering') + set nzNoHovering(value: boolean) { + this._noHovering = toBoolean(value); + } + + get nzNoHovering(): boolean { + return this._noHovering; + } } diff --git a/src/components/carousel/nz-carousel-content.directive.ts b/src/components/carousel/nz-carousel-content.directive.ts index eb0658cc2b..457ce85d6e 100755 --- a/src/components/carousel/nz-carousel-content.directive.ts +++ b/src/components/carousel/nz-carousel-content.directive.ts @@ -15,7 +15,6 @@ export class NzCarouselContentDirective { fadeMode = false nativeElement: HTMLElement; - @HostBinding('class.slick-slide') _nzSlickSlide = true; @HostBinding('class.slick-active') diff --git a/src/components/carousel/nz-carousel.component.ts b/src/components/carousel/nz-carousel.component.ts index 7a0df5ccad..eb527ac11c 100755 --- a/src/components/carousel/nz-carousel.component.ts +++ b/src/components/carousel/nz-carousel.component.ts @@ -11,6 +11,7 @@ import { ViewEncapsulation } from '@angular/core'; import { NzCarouselContentDirective } from './nz-carousel-content.directive'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-carousel', @@ -34,6 +35,9 @@ import { NzCarouselContentDirective } from './nz-carousel-content.directive'; ] }) export class NzCarouselComponent implements AfterViewInit, OnDestroy { + private _autoPlay = false; + private _dots = true; + private _vertical = false; activeIndex = 0; transform = 'translate3d(0px, 0px, 0px)'; interval; @@ -47,12 +51,37 @@ export class NzCarouselComponent implements AfterViewInit, OnDestroy { @ViewChild('slickList') slickList: ElementRef; @ViewChild('slickTrack') slickTrack: ElementRef; - @Input() nzAutoPlay = false; - @Input() nzDots = true; @Input() nzEffect = 'scrollx'; - @Input() @HostBinding('class.ant-carousel-vertical') nzVertical = false; @HostBinding('class.ant-carousel') _nzCarousel = true; + @Input() + set nzDots(value: boolean) { + this._dots = toBoolean(value); + } + + get nzDots(): boolean { + return this._dots; + } + + @Input() + set nzAutoPlay(value: boolean) { + this._autoPlay = toBoolean(value); + } + + get nzAutoPlay(): boolean { + return this._autoPlay; + } + + @Input() + @HostBinding('class.ant-carousel-vertical') + set nzVertical(value: boolean) { + this._vertical = toBoolean(value); + } + + get nzVertical(): boolean { + return this._vertical; + } + constructor(public hostElement: ElementRef, private _renderer: Renderer2) { } @@ -109,7 +138,7 @@ export class NzCarouselComponent implements AfterViewInit, OnDestroy { this._renderer.removeStyle(this.slickTrack.nativeElement, 'width'); this._renderer.setStyle(this.slickTrack.nativeElement, 'width', `${this.slideContents.length * this.hostElement.nativeElement.offsetWidth}px`); } - }) + }); } createInterval() { diff --git a/src/components/carousel/nz-carousel.module.ts b/src/components/carousel/nz-carousel.module.ts index e1128b5d72..f66ddc5655 100644 --- a/src/components/carousel/nz-carousel.module.ts +++ b/src/components/carousel/nz-carousel.module.ts @@ -7,6 +7,5 @@ import { CommonModule } from '@angular/common'; exports : [ NzCarouselComponent, NzCarouselContentDirective ], imports : [ CommonModule ] }) - export class NzCarouselModule { } diff --git a/src/components/cascader/nz-cascader.component.ts b/src/components/cascader/nz-cascader.component.ts index 79370a2359..ffcb356517 100644 --- a/src/components/cascader/nz-cascader.component.ts +++ b/src/components/cascader/nz-cascader.component.ts @@ -31,6 +31,7 @@ import { const ESC = 27; import { DropDownAnimation } from '../core/animation/dropdown-animations'; +import { toBoolean } from '../util/convert'; import { ConnectionPositionPair } from '@angular/cdk/overlay'; function noop(): void { } @@ -164,6 +165,13 @@ export interface CascaderOption { ] }) export class NzCascaderComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit, ControlValueAccessor { + private _allowClear = true; + private _disabled = false; + private _enableCache = true; + private _showArrow = true; + private _showInput = true; + private _showSearch = false; + private _changeOnSelect = false; _el: HTMLElement; _prefixCls = 'ant-cascader'; _inputPrefixCls = 'ant-input'; @@ -208,7 +216,14 @@ export class NzCascaderComponent implements OnInit, OnDestroy, OnChanges, AfterV onTouched: any = Function.prototype; /** Whether is disabled */ - @Input() nzDisabled = false; + @Input() + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); + } + + get nzDisabled(): boolean { + return this._disabled; + } /** Input size, one of `large` `default` `small` */ @Input() nzSize: 'large' | 'default' | 'small' = 'default'; @@ -217,19 +232,47 @@ export class NzCascaderComponent implements OnInit, OnDestroy, OnChanges, AfterV @Input() nzPlaceHolder = 'Please select'; /** Whether show input box. Defaults to `true`. */ - @Input() nzShowInput = true; + @Input() + set nzShowInput(value: boolean) { + this._showInput = toBoolean(value); + } + + get nzShowInput(): boolean { + return this._showInput; + } /** Whether can search. Defaults to `false`. */ - @Input() nzShowSearch = false; + @Input() + set nzShowSearch(value: boolean) { + this._showSearch = toBoolean(value); + } + + get nzShowSearch(): boolean { + return this._showSearch; + } /** Whether allow clear. Defaults to `true`. */ - @Input() nzAllowClear = true; + @Input() + set nzAllowClear(value: boolean) { + this._allowClear = toBoolean(value); + } + + get nzAllowClear(): boolean { + return this._allowClear; + } /** Hover text for the clear icon */ @Input() nzClearText = 'Clear'; /** Whether to show arrow */ - @Input() nzShowArrow = true; + @Input() + set nzShowArrow(value: boolean) { + this._showArrow = toBoolean(value); + } + + get nzShowArrow(): boolean { + return this._showArrow; + } /** Specify content to show when no result matches. */ @Input() nzNotFoundContent = 'Not Found'; @@ -244,13 +287,27 @@ export class NzCascaderComponent implements OnInit, OnDestroy, OnChanges, AfterV @Input() nzOptions: CascaderOption[]; /** Whether cache children when they were loaded asych */ - @Input() nzEnableCache = true; + @Input() + set nzEnableCache(value: boolean) { + this._enableCache = toBoolean(value); + } + + get nzEnableCache(): boolean { + return this._enableCache; + } /** Expand column item when click or hover, one of 'click' 'hover' */ @Input() nzExpandTrigger: CascaderExpandTrigger = 'click'; /** Change value on each selection if set to true */ - @Input() nzChangeOnSelect = false; + @Input() + set nzChangeOnSelect(value: boolean) { + this._changeOnSelect = toBoolean(value); + } + + get nzChangeOnSelect(): boolean { + return this._changeOnSelect; + } /** Change value on selection only if this function returns `true` */ @Input() nzChangeOn: (option: CascaderOption, level: number) => boolean; diff --git a/src/components/cascader/nz-cascader.module.ts b/src/components/cascader/nz-cascader.module.ts index e1f8cd34c3..33b030404a 100644 --- a/src/components/cascader/nz-cascader.module.ts +++ b/src/components/cascader/nz-cascader.module.ts @@ -14,6 +14,5 @@ import { NzInputModule } from '../input/nz-input.module'; NzCascaderComponent ] }) - export class NzCascaderModule { } diff --git a/src/components/checkbox/nz-checkbox-group.component.ts b/src/components/checkbox/nz-checkbox-group.component.ts index f9d9697b16..db6bd1eca7 100644 --- a/src/components/checkbox/nz-checkbox-group.component.ts +++ b/src/components/checkbox/nz-checkbox-group.component.ts @@ -9,6 +9,7 @@ import { forwardRef } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-checkbox-group', @@ -34,16 +35,25 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; './style/index.less' ] }) -export class NzCheckboxGroupComponent implements OnInit, AfterContentInit, ControlValueAccessor { +export class NzCheckboxGroupComponent implements ControlValueAccessor { + private _disabled = false; _el: HTMLElement; _options: Array; _prefixCls = 'ant-checkbox-group'; // ngModel Access onChange: any = Function.prototype; onTouched: any = Function.prototype; - @Input() nzDisabled = false; @Input() nzType: string; + @Input() + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); + } + + get nzDisabled(): boolean { + return this._disabled; + } + _optionChange() { this.onChange(this._options); } @@ -53,9 +63,6 @@ export class NzCheckboxGroupComponent implements OnInit, AfterContentInit, Contr this._render.setElementClass(this._el, `${this._prefixCls}`, true); } - ngAfterContentInit() { - } - writeValue(value: any): void { this._options = value; } @@ -71,7 +78,4 @@ export class NzCheckboxGroupComponent implements OnInit, AfterContentInit, Contr setDisabledState(isDisabled: boolean): void { this.nzDisabled = isDisabled; } - - ngOnInit() { - } } diff --git a/src/components/checkbox/nz-checkbox.component.ts b/src/components/checkbox/nz-checkbox.component.ts index ee3365e6ae..a555fc00a6 100644 --- a/src/components/checkbox/nz-checkbox.component.ts +++ b/src/components/checkbox/nz-checkbox.component.ts @@ -9,6 +9,7 @@ import { forwardRef, OnChanges } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { toBoolean } from '../util/convert'; @Component({ selector : '[nz-checkbox]', @@ -36,6 +37,8 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; ] }) export class NzCheckboxComponent implements OnInit, ControlValueAccessor, OnChanges { + private _disabled = false; + private _indeterminate = false; _el: HTMLElement; _prefixCls = 'ant-checkbox'; _innerPrefixCls = `${this._prefixCls}-inner`; @@ -45,8 +48,25 @@ export class NzCheckboxComponent implements OnInit, ControlValueAccessor, OnChan // ngModel Access onChange: any = Function.prototype; onTouched: any = Function.prototype; - @Input() nzDisabled = false; - @Input() nzIndeterminate = false; + + @Input() + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); + } + + get nzDisabled(): boolean { + return this._disabled; + } + + @Input() + set nzIndeterminate(value: boolean) { + this._indeterminate = toBoolean(value); + } + + get nzIndeterminate(): boolean { + return this._indeterminate; + } + _classMap = { [this._prefixCls] : true, [`${this._prefixCls}-checked`] : this._checked && (!this.nzIndeterminate), @@ -58,7 +78,7 @@ export class NzCheckboxComponent implements OnInit, ControlValueAccessor, OnChan @Input() get nzChecked(): boolean { return this._checked; - }; + } @HostListener('click', [ '$event' ]) onClick(e) { diff --git a/src/components/checkbox/nz-checkbox.module.ts b/src/components/checkbox/nz-checkbox.module.ts index eaafc1cd00..ec92899d54 100644 --- a/src/components/checkbox/nz-checkbox.module.ts +++ b/src/components/checkbox/nz-checkbox.module.ts @@ -15,6 +15,5 @@ import { FormsModule } from '@angular/forms'; NzCheckboxGroupComponent ] }) - export class NzCheckboxModule { } diff --git a/src/components/collapse/nz-collapse.component.ts b/src/components/collapse/nz-collapse.component.ts index d1d6a3fc3e..5c33a3a915 100644 --- a/src/components/collapse/nz-collapse.component.ts +++ b/src/components/collapse/nz-collapse.component.ts @@ -11,7 +11,8 @@ import { animate, transition } from '@angular/animations'; -import { NzCollapsesetComponent } from './nz-collapseset.component' +import { NzCollapsesetComponent } from './nz-collapseset.component'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-collapse', @@ -48,22 +49,28 @@ import { NzCollapsesetComponent } from './nz-collapseset.component' }) export class NzCollapseComponent { + private _disabled = false; + _active = false; + _el; - _active: boolean; @HostBinding('class.ant-collapse-item') _nzCollapseItem = true; @Input() nzTitle: string; + @Input() @HostBinding('class.ant-collapse-item-disabled') - nzDisabled = false; + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); + } - @Input() - get nzActive(): boolean { - return this._active; + get nzDisabled(): boolean { + return this._disabled; } - set nzActive(active: boolean) { + @Input() + set nzActive(value: boolean) { + const active = toBoolean(value); if (this._active === active) { return; } @@ -72,6 +79,10 @@ export class NzCollapseComponent { } } + get nzActive(): boolean { + return this._active; + } + clickHeader($event) { this.nzActive = !this.nzActive; /** trigger host collapseSet click event */ diff --git a/src/components/collapse/nz-collapseset.component.ts b/src/components/collapse/nz-collapseset.component.ts index 5e0244b2e5..d7c7f627db 100644 --- a/src/components/collapse/nz-collapseset.component.ts +++ b/src/components/collapse/nz-collapseset.component.ts @@ -4,6 +4,7 @@ import { Input } from '@angular/core'; import { NzCollapseComponent } from './nz-collapse.component'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-collapseset', @@ -18,15 +19,29 @@ import { NzCollapseComponent } from './nz-collapse.component'; './style/patch.less' ] }) - - export class NzCollapsesetComponent { + private _accordion = false; + private _bordered = true; // all child collapse panels: Array = []; - @Input() nzAccordion = false; + @Input() + set nzAccordion(value: boolean) { + this._accordion = toBoolean(value); + } + + get nzAccordion(): boolean { + return this._accordion; + } + + @Input() + set nzBordered(value: boolean) { + this._bordered = toBoolean(value); + } - @Input() nzBordered = true; + get nzBordered(): boolean { + return this._bordered; + } nzClick(collapse) { if (this.nzAccordion) { @@ -42,7 +57,4 @@ export class NzCollapsesetComponent { addTab(collapse: NzCollapseComponent) { this.panels.push(collapse); } - - constructor() { - } } diff --git a/src/components/datepicker/nz-datepicker.component.ts b/src/components/datepicker/nz-datepicker.component.ts index 1045502bc3..3af871ca6a 100644 --- a/src/components/datepicker/nz-datepicker.component.ts +++ b/src/components/datepicker/nz-datepicker.component.ts @@ -13,6 +13,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { DropDownAnimation } from '../core/animation/dropdown-animations'; import { NzTimePickerInnerComponent } from '../time-picker/nz-timepicker-inner.component'; import { DEFAULT_DATEPICKER_POSITIONS } from '../core/overlay/overlay-position-map'; +import { toBoolean } from '../util/convert'; import { ConnectionPositionPair } from '@angular/cdk/overlay'; import { NzLocaleService } from '../locale/index'; @@ -108,7 +109,7 @@ import { NzLocaleService } from '../locale/index'; [nzMode]="'month'" [nzFullScreen]="false" [nzShowHeader]="false" - [nzDatePicker]="true"> + nzDatePicker> @@ -156,7 +157,7 @@ import { NzLocaleService } from '../locale/index'; [ngModel]="_value" (ngModelChange)="_changeTime($event)" *ngIf="nzShowTime&&(_mode == 'time')">
- +
@@ -183,13 +184,14 @@ import { NzLocaleService } from '../locale/index'; ] }) export class NzDatePickerComponent implements ControlValueAccessor, OnInit { + private _allowClear = true; + private _disabled = false; _el: HTMLElement; _open = false; _mode = 'year'; _dropDownPosition = 'bottom'; _triggerWidth = 0; _value = null; - _disabled = false; _disabledDate; _today = new Date(); _selectedMonth = moment(this.nzValue).month(); @@ -203,7 +205,6 @@ export class NzDatePickerComponent implements ControlValueAccessor, OnInit { // ngModel Access onChange: any = Function.prototype; onTouched: any = Function.prototype; - @Input() nzAllowClear = true; @Input() nzShowTime: any = null; @Input() nzPlaceHolder = this._locale.translate('DateTime.chooseDatePlease'); @Input() nzFormat = 'YYYY-MM-DD'; @@ -214,28 +215,36 @@ export class NzDatePickerComponent implements ControlValueAccessor, OnInit { @HostBinding('class.ant-calendar-picker') _nzCalendarPicker = true; @Input() - get nzDisabled(): boolean { - return this._disabled; - }; + set nzAllowClear(value: boolean) { + this._allowClear = toBoolean(value); + } + + get nzAllowClear(): boolean { + return this._allowClear; + } + @Input() set nzDisabled(value: boolean) { - this._disabled = value; + this._disabled = toBoolean(value); this._closeCalendar(); } + get nzDisabled(): boolean { + return this._disabled; + } + @Input() + set nzDisabledDate(value: Function) { + this._disabledDate = value; + } + get nzDisabledDate(): Function { if (this._mode === 'month' && this.nzMode === 'day') { return; } return this._disabledDate; - }; - - set nzDisabledDate(value: Function) { - this._disabledDate = value; } - get _disabledToday() { if (this._disabledDate) { return this._disabledDate(new Date()); @@ -259,11 +268,11 @@ export class NzDatePickerComponent implements ControlValueAccessor, OnInit { get nzValue(): Date { return this._value || new Date(); - }; + } set nzValue(value: Date) { this._updateValue(value); - }; + } _changeTime($event) { this._value = $event; diff --git a/src/components/datepicker/nz-datepicker.module.ts b/src/components/datepicker/nz-datepicker.module.ts index 320df80271..0c06acce54 100644 --- a/src/components/datepicker/nz-datepicker.module.ts +++ b/src/components/datepicker/nz-datepicker.module.ts @@ -14,6 +14,5 @@ import { NzLocaleModule } from '../locale/index'; declarations: [ NzDatePickerComponent ], exports : [ NzDatePickerComponent ] }) - export class NzDatePickerModule { } diff --git a/src/components/dropdown/nz-dropdown-button.component.ts b/src/components/dropdown/nz-dropdown-button.component.ts index e67561ac39..97c08ca4dd 100644 --- a/src/components/dropdown/nz-dropdown-button.component.ts +++ b/src/components/dropdown/nz-dropdown-button.component.ts @@ -10,6 +10,7 @@ import { AfterViewInit } from '@angular/core'; import { DropDownAnimation } from '../core/animation/dropdown-animations'; +import { toBoolean } from '../util/convert'; import { NzDropDownDirective } from './nz-dropdown.directive'; import { NzDropDownComponent } from './nz-dropdown.component'; @@ -24,7 +25,7 @@ import { NzDropDownComponent } from './nz-dropdown.component';
` }) - export class NzSiderComponent { + private _collapsed = false; + private _collapsible = false; + private _trigger = true; + _dimensionMap = { xl: '1600px', lg: '1200px', @@ -37,25 +41,37 @@ export class NzSiderComponent { }; _below = false; @Input() nzWidth = '200'; - @Input() nzTrigger = true; @Input() nzCollapsedWidth = 64; @Input() nzBreakpoint: NzBreakPoinit; - @Input() @HostBinding('class.ant-layout-sider-collapsed') nzCollapsed = false; - _collapsible = false; @Input() - set nzCollapsible(value: boolean | string) { - if (value === '') { - this._collapsible = true; - } else { - this._collapsible = value as boolean; - } + set nzTrigger(value: boolean) { + this._trigger = toBoolean(value); + } + + get nzTrigger() { + return this._trigger; + } + + @Input() + set nzCollapsible(value: boolean) { + this._collapsible = toBoolean(value); } get nzCollapsible() { return this._collapsible; } + @Input() + @HostBinding('class.ant-layout-sider-collapsed') + set nzCollapsed(value: boolean) { + this._collapsed = toBoolean(value); + } + + get nzCollapsed() { + return this._collapsed; + } + @Output() nzCollapsedChange = new EventEmitter(); @HostBinding('class.ant-layout-sider') _nzLayoutSider = true; diff --git a/src/components/menu/nz-menu-divider.component.ts b/src/components/menu/nz-menu-divider.component.ts index d06e0a965c..814e91f403 100644 --- a/src/components/menu/nz-menu-divider.component.ts +++ b/src/components/menu/nz-menu-divider.component.ts @@ -5,7 +5,6 @@ import { Component, HostBinding } from '@angular/core'; template : ` `, }) - export class NzMenuDividerComponent { @HostBinding('class.ant-dropdown-menu-item-divider') _nzDropdownMenuItemDivider = true; } diff --git a/src/components/menu/nz-menu-group.component.ts b/src/components/menu/nz-menu-group.component.ts index 46ad4b071d..9bb3e85a24 100644 --- a/src/components/menu/nz-menu-group.component.ts +++ b/src/components/menu/nz-menu-group.component.ts @@ -12,7 +12,6 @@ import { `, }) - export class NzMenuGroupComponent { @HostBinding('class.ant-menu-item-group') _nzMenuItemGroup = true; } diff --git a/src/components/menu/nz-menu-item.component.ts b/src/components/menu/nz-menu-item.component.ts index 374c503631..01cc7719eb 100644 --- a/src/components/menu/nz-menu-item.component.ts +++ b/src/components/menu/nz-menu-item.component.ts @@ -11,6 +11,7 @@ import { } from '@angular/core'; import { NzMenuComponent } from './nz-menu.component'; import { NzSubMenuComponent } from './nz-submenu.component'; +import { toBoolean } from '../util/convert'; export const PADDING_BASE = 24; @@ -19,18 +20,27 @@ export const PADDING_BASE = 24; template: ` `, }) - export class NzMenuItemComponent implements AfterViewInit { + private _disabled = false; + private _selected = false; + level = 0; padding = null; isInDropDown = false; - selected = false; - @Input() nzDisable = false; + + @Input() + set nzDisable(value: boolean) { + this._disabled = toBoolean(value); + } + + get nzDisable() { + return this._disabled; + } @Input() set nzSelected(value: boolean) { - this.selected = value; - if (value) { + this._selected = toBoolean(value); + if (this._selected) { this._renderer.addClass(this.hostElement.nativeElement, this.isInDropDown ? 'ant-dropdown-menu-item-selected' : 'ant-menu-item-selected') } else { this._renderer.removeClass(this.hostElement.nativeElement, this.isInDropDown ? 'ant-dropdown-menu-item-selected' : 'ant-menu-item-selected') @@ -38,7 +48,7 @@ export class NzMenuItemComponent implements AfterViewInit { } get nzSelected() { - return this.selected; + return this._selected; } /** clear all item selected status except this */ diff --git a/src/components/menu/nz-menu.component.ts b/src/components/menu/nz-menu.component.ts index 6c3973d1fb..69c84fb49c 100644 --- a/src/components/menu/nz-menu.component.ts +++ b/src/components/menu/nz-menu.component.ts @@ -1,6 +1,9 @@ import { Component, ViewEncapsulation, HostBinding, Input, OnChanges, SimpleChanges, AfterViewInit } from '@angular/core'; +import { toBoolean } from '../util/convert'; +import { NzMenuItemComponent } from './nz-menu-item.component'; +import { NzSubMenuComponent } from './nz-submenu.component'; export type NzMode = 'vertical' | 'horizontal' | 'inline'; @@ -15,38 +18,44 @@ export type NzMode = 'vertical' | 'horizontal' | 'inline'; }) export class NzMenuComponent implements OnChanges, AfterViewInit { + private _clickActive = true; + private _inlineCollapsed = false; + /** set when has submenu component */ hasSubMenu = false; /** set when in dropdown component */ isInDropDown = false; /** collection of menu item */ - menuItems = []; + menuItems: NzMenuItemComponent[] = []; /** collection of sub menu */ - subMenus = []; + subMenus: NzSubMenuComponent[] = []; /** view init flat */ isInit = false; /** temporary mode */ _tempMode: NzMode; /** opened index of array */ _subMenusOpenIndex = []; - /** nzInlineCollapsed */ - _nzInlineCollapsed = false; @Input() nzMode: NzMode = 'vertical'; @Input() nzTheme: 'light' | 'dark' = 'light'; - @Input() nzClickActive = true; @Input() - get nzInlineCollapsed(): boolean { - return this._nzInlineCollapsed; + set nzClickActive(value: boolean) { + this._clickActive = toBoolean(value); } - set nzInlineCollapsed(state: boolean) { - this._nzInlineCollapsed = state; + get nzClickActive(): boolean { + return this._clickActive; + } + + @Input() + set nzInlineCollapsed(value: boolean) { + const state = toBoolean(value); + this._inlineCollapsed = state; if (!this.isInit) { return } - if (this._nzInlineCollapsed) { + if (this._inlineCollapsed) { this.hideSubMenus(); // after the animation is over setTimeout(() => this.nzMode = 'vertical', 150) @@ -57,6 +66,10 @@ export class NzMenuComponent implements OnChanges, AfterViewInit { } + get nzInlineCollapsed(): boolean { + return this._inlineCollapsed; + } + /** define host class */ @HostBinding('class.ant-dropdown-menu') @HostBinding('class.ant-menu-dropdown-vertical') @@ -138,7 +151,7 @@ export class NzMenuComponent implements OnChanges, AfterViewInit { this._subMenusOpenIndex = []; this.subMenus.forEach((submenu, index) => { if (submenu.nzOpen) { - this._subMenusOpenIndex.push(index) + this._subMenusOpenIndex.push(index); } submenu.nzOpen = false; }); @@ -161,6 +174,6 @@ export class NzMenuComponent implements OnChanges, AfterViewInit { setHasSubMenu(value: boolean) { setTimeout(_ => { this.hasSubMenu = value; - }) + }); } } diff --git a/src/components/menu/nz-submenu.component.ts b/src/components/menu/nz-submenu.component.ts index 508c857bd0..f4dd4f62ba 100644 --- a/src/components/menu/nz-submenu.component.ts +++ b/src/components/menu/nz-submenu.component.ts @@ -6,6 +6,7 @@ import { style, animate, state, transition, trigger } from '@angular/animations' import { NzMenuComponent } from './nz-menu.component'; import { Subject } from 'rxjs/Subject'; import { debounceTime } from 'rxjs/operators/debounceTime'; +import { toBoolean } from '../util/convert'; @Component({ selector : '[nz-submenu]', @@ -58,26 +59,35 @@ import { debounceTime } from 'rxjs/operators/debounceTime'; }) export class NzSubMenuComponent implements OnInit, OnDestroy, AfterViewInit { + private _open = false; isInDropDown = false; level = 1; _$mouseSubject = new Subject(); @ContentChildren(NzSubMenuComponent) subMenus; - @Input() nzOpen = false; @Output() nzOpenChange: EventEmitter = new EventEmitter(); + @Input() + set nzOpen(value: boolean) { + this._open = toBoolean(value); + } + + get nzOpen(): boolean { + return this._open; + } + get subItemSelected(): boolean { - return !!this.nzMenuComponent.menuItems.find(e => e.selected && e.nzSubMenuComponent === this); + return !!this.nzMenuComponent.menuItems.find(e => e.nzSelected && e.nzSubMenuComponent === this); } get submenuSelected(): boolean { - return !!this.subMenus._results.find(e => e !== this && e.subItemSelected) + return !!this.subMenus._results.find(e => e !== this && e.subItemSelected); } get expandState() { if (this.nzOpen && this.nzMenuComponent.nzMode === 'inline') { return 'expand'; } else if (this.nzOpen && this.nzMenuComponent.nzMode !== 'inline') { - return 'fade' + return 'fade'; } return null; } diff --git a/src/components/message/nz-message-container.component.ts b/src/components/message/nz-message-container.component.ts index 60b90527be..11e649ea2c 100644 --- a/src/components/message/nz-message-container.component.ts +++ b/src/components/message/nz-message-container.component.ts @@ -14,7 +14,7 @@ import { NZ_MESSAGE_CONFIG, NZ_MESSAGE_DEFAULT_CONFIG, NzMessageConfig } from '. './style/index.less' ] }) -export class NzMessageContainerComponent implements OnInit { +export class NzMessageContainerComponent { messages: NzMessageDataFilled[] = []; config: NzMessageConfig; @@ -23,8 +23,6 @@ export class NzMessageContainerComponent implements OnInit { this.config = Object.assign({}, defaultConfig, config) as NzMessageConfig; } - ngOnInit() { } - // Create a new message createMessage(message: NzMessageDataFilled): void { if (this.messages.length >= this.config.nzMaxStack) { diff --git a/src/components/message/nz-message.component.ts b/src/components/message/nz-message.component.ts index 1b04720c29..2264b8108b 100644 --- a/src/components/message/nz-message.component.ts +++ b/src/components/message/nz-message.component.ts @@ -15,6 +15,7 @@ import { transition, animate } from '@angular/animations'; + @Component({ selector : 'nz-message', encapsulation: ViewEncapsulation.None, diff --git a/src/components/modal/nz-confirm.component.ts b/src/components/modal/nz-confirm.component.ts index 21863e8646..400f00d76d 100644 --- a/src/components/modal/nz-confirm.component.ts +++ b/src/components/modal/nz-confirm.component.ts @@ -12,6 +12,7 @@ import { import { NzModalSubject } from './nz-modal-subject.service'; import nzGlobalMonitor from '../util/nz-global-monitor'; +import { toBoolean } from '../util/convert'; import { NzLocaleService } from '../locale/index'; interface Position { @@ -73,38 +74,36 @@ interface Position { ] }) export class NzConfirmComponent implements OnInit, OnDestroy { + private _maskClosable = true; + _confirmLoading = false; + _visible = false; + _prefixCls = 'ant-modal'; _prefixConfirmCls = 'ant-confirm'; _maskClassMap; _bodyClassMap; _bodyStyleMap; - _visible = false; _width = '416px'; _zIndex = 1000; _iconTypeCls = 'anticon anticon-question-circle'; _title = ''; _titleTpl: TemplateRef; _content = ''; - _maskClosable = true; _contentTpl: TemplateRef; _okText = this._locale.translate('Modal.understood'); _cancelText = ''; _animationStatus = ''; - _confirmLoading = false; _customClass = ''; _typeCls = `${this._prefixConfirmCls}-confirm`; @ViewChild('confirm_content') private contentEl: ElementRef; @Input() - public get nzVisible(): boolean { - return this._visible; - }; - - public set nzVisible(value: boolean) { - if (this._visible === value) { + set nzVisible(value: boolean) { + const visible = toBoolean(value); + if (this._visible === visible) { return; } - if (value) { + if (visible) { this.anmiateFade('enter'); this.subject.next('onShow'); // 每次触发点击事件的时候，通过全局监听的类，记录下点击的位置，计算动画的origin @@ -118,9 +117,13 @@ export class NzConfirmComponent implements OnInit, OnDestroy { this.anmiateFade('leave'); this.subject.next('onHide'); } - this._visible = value; + this._visible = visible; // 设置全局的overflow样式 - nzGlobalMonitor.setDocumentOverflowHidden(value); + nzGlobalMonitor.setDocumentOverflowHidden(visible); + } + + get nzVisible(): boolean { + return this._visible; } @Input() @@ -158,7 +161,7 @@ export class NzConfirmComponent implements OnInit, OnDestroy { @Input() set nzMaskClosable(value: boolean) { - this._maskClosable = value; + this._maskClosable = toBoolean(value); } @Input() @@ -187,7 +190,7 @@ export class NzConfirmComponent implements OnInit, OnDestroy { @Input() set nzConfirmLoading(value: boolean) { - this._confirmLoading = value; + this._confirmLoading = toBoolean(value); } @HostListener('keydown.esc', [ '$event' ]) diff --git a/src/components/modal/nz-modal.component.ts b/src/components/modal/nz-modal.component.ts index bbbd39a62e..d14611c856 100644 --- a/src/components/modal/nz-modal.component.ts +++ b/src/components/modal/nz-modal.component.ts @@ -19,6 +19,7 @@ import { import { NzModalSubject } from './nz-modal-subject.service'; import nzGlobalMonitor from '../util/nz-global-monitor'; +import { toBoolean } from '../util/convert'; import { NzLocaleService } from '../locale/index'; interface Position { @@ -81,16 +82,17 @@ interface Position { ] }) export class NzModalComponent implements OnInit, OnDestroy, AfterViewInit { + private _confirmLoading = false; + private _maskClosable = true; + _footerHide = false; + _closable = true; + _visible = false; _prefixCls = 'ant-modal'; _maskClassMap; _bodyClassMap; _bodyStyleMap; - _visible = false; - _confirmLoading = false; - _closable = true; _width = '520px'; _zIndex = 1000; - _maskClosable = true; _title = ''; _titleTpl: TemplateRef; _content = ''; @@ -104,22 +106,17 @@ export class NzModalComponent implements OnInit, OnDestroy, AfterViewInit { _animationStatus = ''; _bodyComponent: ComponentFactory; _componentParams: Object = {}; - _footerHide = false; modalId = `nzModal${nzGlobalMonitor.getGlobalCount()}`; @ViewChild('modal_content') contentEl: ElementRef; @ViewChild('modal_component', { read: ViewContainerRef }) bodyEl: ViewContainerRef; @Input() - get nzVisible(): boolean { - return this._visible; - }; - set nzVisible(value: boolean) { - // debugger - if (this._visible === value) { + const visible = toBoolean(value); + if (this._visible === visible) { return; } - if (value) { + if (visible) { this.anmiateFade('enter'); this.subject.next('onShow'); // 每次触发点击事件的时候，通过全局监听的类，记录下点击的位置，计算动画的origin @@ -133,20 +130,24 @@ export class NzModalComponent implements OnInit, OnDestroy, AfterViewInit { this.anmiateFade('leave'); this.subject.next('onHide'); } - this._visible = value; + this._visible = visible; this.nzVisibleChange.emit(this._visible); // 设置全局的overflow样式 - nzGlobalMonitor.setDocumentOverflowHidden(value); + nzGlobalMonitor.setDocumentOverflowHidden(visible); + } + + get nzVisible(): boolean { + return this._visible; } @Input() set nzConfirmLoading(value: boolean) { - this._confirmLoading = value; + this._confirmLoading = toBoolean(value); } @Input() set nzClosable(value: boolean) { - this._closable = value; + this._closable = toBoolean(value); } @Input() @@ -195,7 +196,7 @@ export class NzModalComponent implements OnInit, OnDestroy, AfterViewInit { if (value instanceof TemplateRef) { this._footerTpl = value; } else { - this._footerHide = !value; + this._footerHide = !toBoolean(value); } } @@ -211,7 +212,7 @@ export class NzModalComponent implements OnInit, OnDestroy, AfterViewInit { @Input() set nzMaskClosable(value: boolean) { - this._maskClosable = value; + this._maskClosable = toBoolean(value); } @Input() diff --git a/src/components/pagination/nz-pagination.component.ts b/src/components/pagination/nz-pagination.component.ts index e87fdebf85..b55bd7c69e 100644 --- a/src/components/pagination/nz-pagination.component.ts +++ b/src/components/pagination/nz-pagination.component.ts @@ -6,6 +6,7 @@ import { EventEmitter, Output } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-pagination', @@ -113,6 +114,10 @@ import { ] }) export class NzPaginationComponent { + private _showSizeChanger = false; + private _showTotal = false; + private _showQuickJumper = false; + private _simple = false; _el: HTMLElement; _current = 1; _total: number; @@ -121,46 +126,28 @@ export class NzPaginationComponent { _lastIndex = Infinity; _pages = []; _options = [ 10, 20, 30, 40, 50 ]; - _showSizeChanger = false; - _showQuickJumper = false; - _showTotal = false; - _simple = false; @Input() - set nzShowSizeChanger(value: boolean|string) { - if (value === '') { - this._showSizeChanger = true; - } else { - this._showSizeChanger = value as boolean; - } + set nzShowSizeChanger(value: boolean) { + this._showSizeChanger = toBoolean(value); } - get nzShowSizeChanger() { + get nzShowSizeChanger(): boolean { return this._showSizeChanger; } - @Input() - set nzShowQuickJumper(value: boolean|string) { - if (value === '') { - this._showQuickJumper = true; - } else { - this._showQuickJumper = value as boolean; - } + set nzShowQuickJumper(value: boolean) { + this._showQuickJumper = toBoolean(value); } get nzShowQuickJumper() { return this._showQuickJumper; } - @Input() - set nzShowTotal(value: boolean|string) { - if (value === '') { - this._showTotal = true; - } else { - this._showTotal = value as boolean; - } + set nzShowTotal(value: boolean) { + this._showTotal = toBoolean(value); } get nzShowTotal() { @@ -168,12 +155,8 @@ export class NzPaginationComponent { } @Input() - set nzSimple(value: boolean|string) { - if (value === '') { - this._simple = true; - } else { - this._simple = value as boolean; - } + set nzSimple(value: boolean) { + this._simple = toBoolean(value); } get nzSimple() { @@ -202,12 +185,7 @@ export class NzPaginationComponent { } } - @Input() - get nzPageIndex(): number { - return this._current; - }; - set nzPageIndex(value: number) { if (this._current === value) { return; @@ -217,13 +195,13 @@ export class NzPaginationComponent { } this._current = Number(value); this._buildIndexes(); - }; + } - @Input() - get nzPageSize(): number { - return this._pageSize; - }; + get nzPageIndex(): number { + return this._current; + } + @Input() set nzPageSize(value: number) { if (value === this._pageSize) { return; @@ -231,20 +209,23 @@ export class NzPaginationComponent { this._pageSize = value; this.nzPageIndexChange.emit(this.nzPageIndex); this._buildIndexes(); - }; + } - @Input() - get nzTotal(): number { - return this._total; - }; + get nzPageSize(): number { + return this._pageSize; + } + @Input() set nzTotal(value: number) { if (value === this._total) { return; } this._total = value; this._buildIndexes(); + } + get nzTotal(): number { + return this._total; } diff --git a/src/components/popconfirm/nz-popconfirm.component.ts b/src/components/popconfirm/nz-popconfirm.component.ts index cad91f995f..3bfaca85bb 100644 --- a/src/components/popconfirm/nz-popconfirm.component.ts +++ b/src/components/popconfirm/nz-popconfirm.component.ts @@ -8,6 +8,7 @@ import { } from '@angular/core'; import { FadeAnimation } from '../core/animation/fade-animations'; import { NzToolTipComponent } from '../tooltip/nz-tooltip.component'; +import { toBoolean } from '../util/convert'; import { NzLocaleService } from '../locale/index'; @Component({ @@ -59,16 +60,16 @@ import { NzLocaleService } from '../locale/index'; ] }) export class NzPopconfirmComponent extends NzToolTipComponent { + private _condition = false; _prefix = 'ant-popover-placement'; _trigger = 'click'; - _hasBackdrop = true; - _condition = false; @Input() nzContent; @Input() nzOkText = this._locale.translate('Modal.okText'); @Input() nzCancelText = this._locale.translate('Modal.cancelText'); - @Input() set nzCondition(value) { - this._condition = value; + @Input() + set nzCondition(value: boolean) { + this._condition = toBoolean(value); } get nzCondition() { diff --git a/src/components/progress/nz-progress.component.ts b/src/components/progress/nz-progress.component.ts index e6586f2ff4..9cc090efd0 100644 --- a/src/components/progress/nz-progress.component.ts +++ b/src/components/progress/nz-progress.component.ts @@ -88,9 +88,6 @@ export class NzProgressComponent implements ControlValueAccessor, OnInit { }; } - constructor() { - } - writeValue(value: number): void { this._percent = value; if (this._percent === 100) { diff --git a/src/components/progress/nz-progress.module.ts b/src/components/progress/nz-progress.module.ts index d3e09e67a6..66eae00f06 100644 --- a/src/components/progress/nz-progress.module.ts +++ b/src/components/progress/nz-progress.module.ts @@ -7,6 +7,5 @@ import {CommonModule} from '@angular/common'; declarations: [NzProgressComponent], imports : [CommonModule] }) - export class NzProgressModule { } diff --git a/src/components/radio/nz-radio-button.component.ts b/src/components/radio/nz-radio-button.component.ts index e25eeb9fe1..5ce287a98d 100644 --- a/src/components/radio/nz-radio-button.component.ts +++ b/src/components/radio/nz-radio-button.component.ts @@ -6,6 +6,7 @@ import { HostBinding, } from '@angular/core'; +import { toBoolean } from '../util/convert'; import { NzRadioComponent } from './nz-radio.component'; @Component({ @@ -23,29 +24,31 @@ import { NzRadioComponent } from './nz-radio.component'; ] }) export class NzRadioButtonComponent extends NzRadioComponent implements OnInit { + private _radioButtonDisabled = false; + private _radioButtonChecked = false; _prefixCls = 'ant-radio-button'; _innerPrefixCls = `${this._prefixCls}-inner`; _inputPrefixCls = `${this._prefixCls}-input`; @Input() @HostBinding('class.ant-radio-button-wrapper-disabled') - get nzDisabled(): boolean { - return this._disabled; - }; - set nzDisabled(value: boolean) { - this._disabled = value; + this._radioButtonDisabled = toBoolean(value); this.setClassMap(); } + get nzDisabled(): boolean { + return this._radioButtonDisabled; + } + @Input() @HostBinding('class.ant-radio-button-wrapper-checked') - get nzChecked(): boolean { - return this._checked; - }; - set nzChecked(value: boolean) { - this._checked = value; + this._radioButtonChecked = toBoolean(value); this.setClassMap(); } + + get nzChecked(): boolean { + return this._radioButtonChecked; + } } diff --git a/src/components/radio/nz-radio-group.component.ts b/src/components/radio/nz-radio-group.component.ts index 0f34ee14fb..e28972c7fe 100644 --- a/src/components/radio/nz-radio-group.component.ts +++ b/src/components/radio/nz-radio-group.component.ts @@ -44,21 +44,21 @@ export class NzRadioGroupComponent implements OnInit, AfterContentInit, ControlV radios: (NzRadioComponent | NzRadioButtonComponent)[] = []; @Input() - get nzSize(): string { - return this._size; - }; - set nzSize(value: string) { this._size = value; } + get nzSize(): string { + return this._size; + } + @HostBinding('class.ant-radio-group-large') get isLarge() { return this._size === 'large'; - }; + } @HostBinding('class.ant-radio-group-small') get isSmall() { return this._size === 'small'; - }; + } addRadio(radio: NzRadioComponent | NzRadioButtonComponent) { diff --git a/src/components/radio/nz-radio.component.ts b/src/components/radio/nz-radio.component.ts index c20d7c7668..30de1e21ef 100644 --- a/src/components/radio/nz-radio.component.ts +++ b/src/components/radio/nz-radio.component.ts @@ -10,6 +10,7 @@ import { } from '@angular/core'; import { NzRadioGroupComponent } from './nz-radio-group.component'; +import { toBoolean } from '../util/convert'; @Component({ @@ -27,32 +28,32 @@ import { NzRadioGroupComponent } from './nz-radio-group.component'; ] }) export class NzRadioComponent implements OnInit { + private _checked = false; + private _disabled = false; + private _focused = false; _el: HTMLElement; _classMap; _value: string; _prefixCls = 'ant-radio'; _innerPrefixCls = `${this._prefixCls}-inner`; _inputPrefixCls = `${this._prefixCls}-input`; - _checked = false; - _focused = false; - _disabled = false; @Input() @HostBinding('class.ant-radio-wrapper-checked') set nzChecked(value: boolean) { - this._checked = value; + this._checked = toBoolean(value); this.setClassMap(); } get nzChecked(): boolean { return this._checked; - }; + } @Input() get nzValue(): string { return this._value; - }; + } set nzValue(value: string) { if (this._value === value) { @@ -64,15 +65,15 @@ export class NzRadioComponent implements OnInit { @Input() @HostBinding('class.ant-radio-wrapper-disabled') - get nzDisabled(): boolean { - return this._disabled; - }; - set nzDisabled(value: boolean) { - this._disabled = value; + this._disabled = toBoolean(value); this.setClassMap(); } + get nzDisabled(): boolean { + return this._disabled; + } + @HostListener('click', [ '$event' ]) onClick(e) { e.preventDefault(); diff --git a/src/components/radio/nz-radio.module.ts b/src/components/radio/nz-radio.module.ts index 5dd7a8f875..5f4c87df55 100644 --- a/src/components/radio/nz-radio.module.ts +++ b/src/components/radio/nz-radio.module.ts @@ -10,6 +10,5 @@ import { FormsModule } from '@angular/forms'; exports : [ NzRadioComponent, NzRadioButtonComponent, NzRadioGroupComponent ], declarations: [ NzRadioComponent, NzRadioButtonComponent, NzRadioGroupComponent ] }) - export class NzRadioModule { } diff --git a/src/components/rate/nz-rate.component.ts b/src/components/rate/nz-rate.component.ts index fce335e62d..1367689159 100644 --- a/src/components/rate/nz-rate.component.ts +++ b/src/components/rate/nz-rate.component.ts @@ -6,6 +6,7 @@ import { forwardRef, } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-rate', @@ -35,6 +36,10 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; ] }) export class NzRateComponent implements OnInit, ControlValueAccessor { + private _hasHalf = false; + private _allowHalf = false; + private _disabled = false; + _prefixCls = 'ant-rate'; _innerPrefixCls = `${this._prefixCls}-star`; _classMap; @@ -42,9 +47,6 @@ export class NzRateComponent implements OnInit, ControlValueAccessor { _count = 5; _value = 0; _hoverValue = 0; // 鼠标悬浮时的星数，为正整数，和_hasHalf配合使用 - _hasHalf = false; - _allowHalf = false; - _disabled = false; _floatReg: any = /^\d+(\.\d+)?$/; // ngModel Access @@ -57,12 +59,8 @@ export class NzRateComponent implements OnInit, ControlValueAccessor { } @Input() - set nzAllowHalf(value: boolean | string) { - if (value === '') { - this._allowHalf = true; - } else { - this._allowHalf = value as boolean; - } + set nzAllowHalf(value: boolean) { + this._allowHalf = toBoolean(value); } @Input() @@ -77,7 +75,7 @@ export class NzRateComponent implements OnInit, ControlValueAccessor { get nzValue(): number { return this._value; - }; + } set nzValue(value: number) { if (this._value === value) { @@ -93,7 +91,7 @@ export class NzRateComponent implements OnInit, ControlValueAccessor { @Input() set nzDisabled(value: boolean) { - this._disabled = value; + this._disabled = toBoolean(value); this.setClassMap(); } diff --git a/src/components/rate/nz-rate.module.ts b/src/components/rate/nz-rate.module.ts index e47c2ba258..702b5fd88b 100644 --- a/src/components/rate/nz-rate.module.ts +++ b/src/components/rate/nz-rate.module.ts @@ -7,6 +7,5 @@ import { CommonModule } from '@angular/common'; declarations: [ NzRateComponent ], imports : [ CommonModule ] }) - export class NzRateModule { } diff --git a/src/components/select/nz-option.component.ts b/src/components/select/nz-option.component.ts index b61602c344..962e7c5eb0 100644 --- a/src/components/select/nz-option.component.ts +++ b/src/components/select/nz-option.component.ts @@ -7,6 +7,7 @@ import { } from '@angular/core'; import { NzSelectComponent } from './nz-select.component'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-option', @@ -17,16 +18,12 @@ import { NzSelectComponent } from './nz-select.component'; styleUrls : [] }) export class NzOptionComponent implements OnDestroy, OnInit { + private _disabled = false; _value: string; _label: string; - _disabled = false; @Input() - get nzValue(): string { - return this._value; - }; - set nzValue(value: string) { if (this._value === value) { return; @@ -34,11 +31,11 @@ export class NzOptionComponent implements OnDestroy, OnInit { this._value = value; } - @Input() - get nzLabel(): string { - return this._label; - }; + get nzValue(): string { + return this._value; + } + @Input() set nzLabel(value: string) { if (this._label === value) { return; @@ -46,13 +43,17 @@ export class NzOptionComponent implements OnDestroy, OnInit { this._label = value; } + get nzLabel(): string { + return this._label; + } + @Input() + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); + } + get nzDisabled(): boolean { return this._disabled; - }; - - set nzDisabled(value: boolean) { - this._disabled = value; } constructor(private _nzSelect: NzSelectComponent) { diff --git a/src/components/select/nz-option.pipe.ts b/src/components/select/nz-option.pipe.ts index 77819e01a6..31fa98b55a 100644 --- a/src/components/select/nz-option.pipe.ts +++ b/src/components/select/nz-option.pipe.ts @@ -12,14 +12,14 @@ export class NzOptionPipe implements PipeTransform { if (_options.length) { return _options; } else { - return [ { + return [ { nzValue : value.value, _value : value.value, nzDisabled: value.disabled, _disabled : value.disabled, nzLabel : value.notFoundContent, _label : value.notFoundContent, - } ] + } as any as NzOptionComponent ] } } else { return options; diff --git a/src/components/select/nz-select.component.ts b/src/components/select/nz-select.component.ts index 4c759ddcb0..d4b2091c03 100644 --- a/src/components/select/nz-select.component.ts +++ b/src/components/select/nz-select.component.ts @@ -24,6 +24,7 @@ import { NzOptionPipe } from './nz-option.pipe'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { DropDownAnimation } from '../core/animation/dropdown-animations'; import { TagAnimation } from '../core/animation/tag-animations'; +import { toBoolean } from '../util/convert'; import { NzLocaleService } from '../locale/index'; @Component({ @@ -149,6 +150,13 @@ import { NzLocaleService } from '../locale/index'; ] }) export class NzSelectComponent implements OnInit, AfterContentInit, AfterContentChecked, ControlValueAccessor { + private _allowClear = false; + private _disabled = false; + _isOpen = false; + private _isTags = false; + private _isMultiple = false; + private _keepUnListOptions = false; + private _showSearch = false; _el: HTMLElement; _prefixCls = 'ant-select'; _classList: Array = []; @@ -160,10 +168,6 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent _value: Array | string; _placeholder = 'Placeholder'; _notFoundContent = this._locale.translate('Select.notFoundContent'); - _isOpen = false; - _disabled = false; - _showSearch = false; - _isTags = false; _searchText = ''; _triggerWidth = 0; _selectedOption: NzOptionComponent; @@ -176,11 +180,8 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent _activeFilterOption: NzOptionComponent; _isMultiInit = false; _dropDownPosition: 'top' | 'bottom' = 'bottom'; - _isMultiple = false; _composing = false; _mode; - _keepUnListOptions = false; - _allowClear = false; // ngModel Access onChange: any = Function.prototype; onTouched: any = Function.prototype; @@ -193,12 +194,8 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent @Input() nzMaxMultiple = Infinity; @Input() - set nzAllowClear(value: boolean | string) { - if (value === '') { - this._allowClear = true; - } else { - this._allowClear = value as boolean; - } + set nzAllowClear(value: boolean) { + this._allowClear = toBoolean(value); } get nzAllowClear() { @@ -206,12 +203,8 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent } @Input() - set nzKeepUnListOptions(value: boolean | string) { - if (value === '') { - this._keepUnListOptions = true; - } else { - this._keepUnListOptions = value as boolean; - } + set nzKeepUnListOptions(value: boolean) { + this._keepUnListOptions = toBoolean(value); } get nzKeepUnListOptions() { @@ -231,8 +224,8 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent } @Input() - set nzMultiple(value) { - this._isMultiple = value; + set nzMultiple(value: boolean) { + this._isMultiple = toBoolean(value); if (this._isMultiple) { this.nzShowSearch = true; } @@ -243,84 +236,85 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent } @Input() - get nzPlaceHolder(): string { - return this._placeholder; - }; - set nzPlaceHolder(value: string) { this._placeholder = value; } - @Input() - get nzNotFoundContent(): string { - return this._notFoundContent; - }; + get nzPlaceHolder(): string { + return this._placeholder; + } + @Input() set nzNotFoundContent(value: string) { this._notFoundContent = value; } - @Input() - get nzSize(): string { - return this._size; - }; + get nzNotFoundContent(): string { + return this._notFoundContent; + } + @Input() set nzSize(value: string) { this._size = { large: 'lg', small: 'sm' }[ value ]; this.setClassMap(); } - @Input() - get nzShowSearch(): boolean { - return this._showSearch; - }; + get nzSize(): string { + return this._size; + } + @Input() set nzShowSearch(value: boolean) { - this._showSearch = value; + this._showSearch = toBoolean(value); } + get nzShowSearch(): boolean { + return this._showSearch; + } @Input() + set nzTags(value: boolean) { + const isTags = toBoolean(value); + this._isTags = isTags; + this.nzMultiple = isTags; + } + get nzTags(): boolean { return this._isTags; - }; - - set nzTags(value: boolean) { - this._isTags = value; - this.nzMultiple = value; } @Input() - get nzDisabled(): boolean { - return this._disabled; - }; - set nzDisabled(value: boolean) { - this._disabled = value; + this._disabled = toBoolean(value); this.closeDropDown(); this.setClassMap(); } - @Input() - get nzOpen(): boolean { - return this._isOpen; - }; + get nzDisabled(): boolean { + return this._disabled; + } + @Input() set nzOpen(value: boolean) { - if (this._isOpen === value) { + const isOpen = toBoolean(value); + if (this._isOpen === isOpen) { return; } - if (value === true) { + if (isOpen) { this.scrollToActive(); if (!this._triggerWidth) { this._setTriggerWidth(); } } - this._isOpen = value; + this._isOpen = isOpen; this.nzOpenChange.emit(this._isOpen); this.setClassMap(); } + get nzOpen(): boolean { + return this._isOpen; + } + /** new nz-option insert or new tags insert */ addOption = (option) => { this._options.push(option); @@ -503,7 +497,7 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent get nzValue(): string | Array { return this._value; - }; + } set nzValue(value: Array | string) { this._updateValue(value); diff --git a/src/components/select/nz-select.module.ts b/src/components/select/nz-select.module.ts index a10f31cffc..85df7a4237 100644 --- a/src/components/select/nz-select.module.ts +++ b/src/components/select/nz-select.module.ts @@ -12,8 +12,5 @@ import { NzLocaleModule } from '../locale/index'; declarations: [ NzOptionPipe, NzOptionComponent, NzSelectComponent ], exports : [ NzOptionPipe, NzOptionComponent, NzSelectComponent ] }) - export class NzSelectModule { } - - diff --git a/src/components/slider/nz-slider-handle.component.ts b/src/components/slider/nz-slider-handle.component.ts index f8ba1ab549..002f2b0d5b 100644 --- a/src/components/slider/nz-slider-handle.component.ts +++ b/src/components/slider/nz-slider-handle.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit, ViewEncapsulation, OnChanges, SimpleChanges, ViewChild, HostListener } from '@angular/core'; import { NzToolTipComponent } from '../tooltip/nz-tooltip.component'; +import { toBoolean } from '../util/convert'; import { NzSliderComponent } from './nz-slider.component'; @Component({ @@ -12,7 +13,7 @@ import { NzSliderComponent } from './nz-slider.component';
` }) -export class NzSliderHandleComponent implements OnInit, OnChanges { +export class NzSliderHandleComponent implements OnChanges { // Static properties @Input() nzClassName: string; @@ -20,7 +21,8 @@ export class NzSliderHandleComponent implements OnInit, OnChanges { @Input() nzOffset: number; @Input() nzValue: number; // [For tooltip] @Input() nzTipFormatter: Function; // [For tooltip] - @Input() set nzActive(show: boolean) { // [For tooltip] + @Input() set nzActive(value: boolean) { // [For tooltip] + const show = toBoolean(value); if (this.tooltip) { if (show) { this.tooltip.show() @@ -37,9 +39,6 @@ export class NzSliderHandleComponent implements OnInit, OnChanges { constructor(private _slider: NzSliderComponent) { } - ngOnInit() { - } - ngOnChanges(changes: SimpleChanges) { if (changes.nzOffset) { this._updateStyle(); diff --git a/src/components/slider/nz-slider-marks.component.ts b/src/components/slider/nz-slider-marks.component.ts index bf8bdedd9d..59a940fe40 100644 --- a/src/components/slider/nz-slider-marks.component.ts +++ b/src/components/slider/nz-slider-marks.component.ts @@ -1,4 +1,5 @@ import { Component, Input, OnInit, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-slider-marks', @@ -10,6 +11,8 @@ import { Component, Input, OnInit, OnChanges, SimpleChanges, ViewEncapsulation } ` }) export class NzSliderMarksComponent implements OnInit, OnChanges { + private _vertical = false; + private _included = false; // Dynamic properties @Input() nzLowerBound: number = null; @@ -18,10 +21,26 @@ export class NzSliderMarksComponent implements OnInit, OnChanges { // Static properties @Input() nzClassName: string; - @Input() nzVertical: boolean; // Required @Input() nzMin: number; // Required @Input() nzMax: number; // Required - @Input() nzIncluded: boolean; + + @Input() + set nzVertical(value: boolean) { // Required + this._vertical = toBoolean(value); + } + + get nzVertical(): boolean { + return this._vertical; + } + + @Input() + set nzIncluded(value: boolean) { + this._included = toBoolean(value); + } + + get nzIncluded(): boolean { + return this._included; + } attrs; // points for inner use diff --git a/src/components/slider/nz-slider-step.component.ts b/src/components/slider/nz-slider-step.component.ts index 98a376eb75..562e894e24 100644 --- a/src/components/slider/nz-slider-step.component.ts +++ b/src/components/slider/nz-slider-step.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { NzSliderMarksComponent, Marks } from './nz-slider-marks.component'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-slider-step', @@ -11,6 +12,8 @@ import { NzSliderMarksComponent, Marks } from './nz-slider-marks.component'; ` }) export class NzSliderStepComponent implements OnInit, OnChanges { + private _vertical = false; + private _included = false; // Dynamic properties @Input() nzLowerBound: number = null; @@ -19,8 +22,24 @@ export class NzSliderStepComponent implements OnInit, OnChanges { // Static properties @Input() nzPrefixCls: string; - @Input() nzVertical: boolean; - @Input() nzIncluded: boolean; + + @Input() + set nzVertical(value: boolean) { // Required + this._vertical = toBoolean(value); + } + + get nzVertical(): boolean { + return this._vertical; + } + + @Input() + set nzIncluded(value: boolean) { + this._included = toBoolean(value); + } + + get nzIncluded(): boolean { + return this._included; + } attrs; diff --git a/src/components/slider/nz-slider-track.component.ts b/src/components/slider/nz-slider-track.component.ts index e79bd73aa9..c28b229976 100644 --- a/src/components/slider/nz-slider-track.component.ts +++ b/src/components/slider/nz-slider-track.component.ts @@ -1,4 +1,5 @@ import { Component, OnChanges, SimpleChanges, Input, ViewEncapsulation } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-slider-track', @@ -8,6 +9,8 @@ import { Component, OnChanges, SimpleChanges, Input, ViewEncapsulation } from '@ ` }) export class NzSliderTrackComponent implements OnChanges { + private _vertical = false; + private _included = false; // Dynamic properties @Input() nzOffset; @@ -15,8 +18,24 @@ export class NzSliderTrackComponent implements OnChanges { // Static properties @Input() nzClassName; - @Input() nzVertical; - @Input() nzIncluded; + + @Input() + set nzVertical(value: boolean) { // Required + this._vertical = toBoolean(value); + } + + get nzVertical(): boolean { + return this._vertical; + } + + @Input() + set nzIncluded(value: boolean) { + this._included = toBoolean(value); + } + + get nzIncluded(): boolean { + return this._included; + } style: any = {}; diff --git a/src/components/slider/nz-slider.component.ts b/src/components/slider/nz-slider.component.ts index dade58d82c..5886236246 100644 --- a/src/components/slider/nz-slider.component.ts +++ b/src/components/slider/nz-slider.component.ts @@ -23,6 +23,7 @@ import { map } from 'rxjs/operators/map'; import { pluck } from 'rxjs/operators/pluck'; import { takeUntil } from 'rxjs/operators/takeUntil'; import { filter } from 'rxjs/operators/filter'; +import { toBoolean } from '../util/convert'; import { NzSliderService } from './nz-slider.service'; import { Marks, MarksArray } from './nz-slider-marks.component'; @@ -91,26 +92,27 @@ export class NzSliderComponent implements ControlValueAccessor, OnInit, OnChange @Input() nzDebugId: number | string = null; // set this id will print debug informations to console // Dynamic property settings - @Input() nzDisabled = false; + @Input() + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); + } + + get nzDisabled() { + return this._disabled; + } // Static configurations (properties that can only specify once) @Input() nzStep = 1; @Input() nzMarks: Marks = null; - @Input() nzDots = false; @Input() nzMin = 0; @Input() nzMax = 100; - @Input() nzIncluded = true; @Input() nzDefaultValue: SliderValue = null; @Input() nzTipFormatter: Function; @Output() nzOnAfterChange = new EventEmitter(); @Input() - set nzVertical(value: boolean | string) { - if (value === '') { - this._vertical = true; - } else { - this._vertical = value as boolean; - } + set nzVertical(value: boolean) { + this._vertical = toBoolean(value); } get nzVertical() { @@ -118,23 +120,42 @@ export class NzSliderComponent implements ControlValueAccessor, OnInit, OnChange } @Input() - set nzRange(value: boolean | string) { - if (value === '') { - this._range = true; - } else { - this._range = value as boolean; - } + set nzRange(value: boolean) { + this._range = toBoolean(value); } get nzRange() { return this._range; } + @Input() + set nzDots(value: boolean) { + this._dots = toBoolean(value); + } + + get nzDots() { + return this._dots; + } + + @Input() + set nzIncluded(value: boolean) { + this._included = toBoolean(value); + } + + get nzIncluded() { + return this._included; + } + + // Inside properties - _range = false; - _vertical = false; + private _disabled = false; + private _dots = false; + private _included = true; + private _range = false; + private _vertical = false; + value: SliderValue = null; // CORE value state - @ViewChild('slider') private slider: ElementRef; + @ViewChild('slider') slider: ElementRef; sliderDOM: any; cacheSliderStart: number = null; cacheSliderLength: number = null; diff --git a/src/components/spin/nz-spin.component.ts b/src/components/spin/nz-spin.component.ts index b0895c68cd..c40beb74ce 100644 --- a/src/components/spin/nz-spin.component.ts +++ b/src/components/spin/nz-spin.component.ts @@ -8,6 +8,7 @@ import { ViewChild, Renderer2 } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-spin', @@ -27,23 +28,32 @@ import { ] }) export class NzSpinComponent implements AfterContentInit { - @Input() nzSpinning = true; + private _spinning = true; _tip: string; @Input() + set nzTip(value) { + this._tip = value || '加载中...'; + } + get nzTip() { return this._tip; } - set nzTip(value) { - this._tip = value || '加载中...'; + @Input() + set nzSpinning(value: boolean) { + this._spinning = toBoolean(value); + } + + get nzSpinning() { + return this._spinning; } @ViewChild('ref') _ref; @HostBinding('class.ant-spin-nested-loading') - private get isNested() { + get isNested() { return this.nzSpinning && (this._ref.nativeElement.childNodes.length !== 0); } @@ -51,14 +61,14 @@ export class NzSpinComponent implements AfterContentInit { _size: string; @Input() - get nzSize() { - return this._size; - } - set nzSize(value) { this._size = { large: 'lg', small: 'sm' }[ value ]; } + get nzSize() { + return this._size; + } + constructor(private _elementRef: ElementRef, private _renderer: Renderer2) { this._el = this._elementRef.nativeElement; } diff --git a/src/components/spin/nz-spin.module.ts b/src/components/spin/nz-spin.module.ts index 3894e40be4..747d495845 100644 --- a/src/components/spin/nz-spin.module.ts +++ b/src/components/spin/nz-spin.module.ts @@ -7,6 +7,5 @@ import { CommonModule } from '@angular/common'; declarations: [ NzSpinComponent ], imports : [ CommonModule ] }) - export class NzSpinModule { } diff --git a/src/components/steps/nz-step.component.ts b/src/components/steps/nz-step.component.ts index 41179bef56..b8851501dd 100644 --- a/src/components/steps/nz-step.component.ts +++ b/src/components/steps/nz-step.component.ts @@ -111,7 +111,7 @@ export class NzStepComponent implements AfterViewInit { } } this.initClassMap(); - }; + } initClassMap() { this.stepStatusClass = { diff --git a/src/components/steps/nz-steps.component.ts b/src/components/steps/nz-steps.component.ts index 53194b4272..809c8269d1 100644 --- a/src/components/steps/nz-steps.component.ts +++ b/src/components/steps/nz-steps.component.ts @@ -9,6 +9,7 @@ import { AfterViewInit } from '@angular/core'; import { NzStepComponent } from './nz-step.component'; +import { toBoolean } from '../util/convert'; export type NzDirection = 'horizontal' | 'vertical'; @@ -25,10 +26,10 @@ export type NzDirection = 'horizontal' | 'vertical'; ] }) export class NzStepsComponent implements OnInit, OnDestroy, AfterViewInit { + private _progressDot = false; _status = 'process'; _current = 0; _stepsClassMap: Object; - _progressDot = false; _afterViewInit = false; _direction: NzDirection = 'horizontal'; _stepsChanges; @@ -47,18 +48,14 @@ export class NzStepsComponent implements OnInit, OnDestroy, AfterViewInit { @Input() nzSize: 'default' | 'small'; @Input() - set nzProgressDot(value: boolean | string) { - if (value === '') { - this._progressDot = true as boolean; - } else { - this._progressDot = value as boolean; - } + set nzProgressDot(value: boolean) { + this._progressDot = toBoolean(value); this.updateChildrenSteps(); this.setDirectionClass(); } - get nzProgressDot() { - return this._progressDot as boolean | string; + get nzProgressDot(): boolean { + return this._progressDot; } @Input() @@ -116,9 +113,6 @@ export class NzStepsComponent implements OnInit, OnDestroy, AfterViewInit { }); } - constructor() { - } - ngOnInit() { this.setDirectionClass(); } diff --git a/src/components/switch/nz-switch.component.ts b/src/components/switch/nz-switch.component.ts index e6e0e23612..33bb2abb1c 100644 --- a/src/components/switch/nz-switch.component.ts +++ b/src/components/switch/nz-switch.component.ts @@ -7,6 +7,7 @@ import { forwardRef } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-switch', @@ -35,37 +36,37 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; ] }) export class NzSwitchComponent implements OnInit, ControlValueAccessor { + private _disabled = false; _prefixCls = 'ant-switch'; _innerPrefixCls = `${this._prefixCls}-inner`; _classMap; _size: string; _checked = false; - _disabled = false; // ngModel Access onChange: any = Function.prototype; onTouched: any = Function.prototype; @Input() - get nzSize(): string { - return this._size; - }; - set nzSize(value: string) { this._size = value; this.setClassMap(); } - @Input() - get nzDisabled(): boolean { - return this._disabled; - }; + get nzSize(): string { + return this._size; + } + @Input() set nzDisabled(value: boolean) { - this._disabled = value; + this._disabled = toBoolean(value); this.setClassMap(); } + get nzDisabled(): boolean { + return this._disabled; + } + @HostListener('click', [ '$event' ]) onClick(e) { e.preventDefault(); diff --git a/src/components/switch/nz-switch.module.ts b/src/components/switch/nz-switch.module.ts index 01effaa4e2..81afc2b0a3 100644 --- a/src/components/switch/nz-switch.module.ts +++ b/src/components/switch/nz-switch.module.ts @@ -7,6 +7,5 @@ import { CommonModule } from '@angular/common'; declarations: [ NzSwitchComponent ], imports : [ CommonModule ] }) - export class NzSwitchModule { } diff --git a/src/components/table/nz-row-expand-icon.component.ts b/src/components/table/nz-row-expand-icon.component.ts index 6eeba3d9ac..712b29b665 100644 --- a/src/components/table/nz-row-expand-icon.component.ts +++ b/src/components/table/nz-row-expand-icon.component.ts @@ -6,16 +6,36 @@ import { HostBinding, EventEmitter, } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector: 'nz-row-expand-icon', template: `` }) export class NzRowExpandIconComponent { - @Input() nzExpand = false; - @Input() nzShowExpand = true; + private _expand = false; + private _showExpand = true; + @Output() nzExpandChange = new EventEmitter(); + @Input() + set nzExpand(value: boolean) { + this._expand = toBoolean(value); + } + + get nzExpand(): boolean { + return this._expand; + } + + @Input() + set nzShowExpand(value: boolean) { + this._showExpand = toBoolean(value); + } + + get nzShowExpand(): boolean { + return this._showExpand; + } + @HostBinding('class.ant-table-row-spaced') get hidden() { return !this.nzShowExpand; @@ -39,7 +59,4 @@ export class NzRowExpandIconComponent { this.nzExpand = !this.nzExpand; this.nzExpandChange.emit(this.nzExpand); } - - constructor() { - } } diff --git a/src/components/table/nz-table-divider.directive.ts b/src/components/table/nz-table-divider.directive.ts index e37511f89d..3d18498c90 100644 --- a/src/components/table/nz-table-divider.directive.ts +++ b/src/components/table/nz-table-divider.directive.ts @@ -3,7 +3,6 @@ import { Directive, HostBinding } from '@angular/core'; @Directive({ selector: '[nz-table-divider]' }) - export class NzTableDividerDirective { @HostBinding(`class.ant-divider`) _nzDivider = true; } diff --git a/src/components/table/nz-table-sort.component.ts b/src/components/table/nz-table-sort.component.ts index cf3f5a5612..9f57083884 100644 --- a/src/components/table/nz-table-sort.component.ts +++ b/src/components/table/nz-table-sort.component.ts @@ -26,7 +26,7 @@ import { NzThDirective } from './nz-th.directive'; './style/index.less' ] }) -export class NzTableSortComponent implements OnInit { +export class NzTableSortComponent { _value = null; @Output() nzValueChange: EventEmitter = new EventEmitter(); @@ -61,7 +61,4 @@ export class NzTableSortComponent implements OnInit { constructor(@Host() @Optional() private nzThDirective: NzThDirective, private _renderer: Renderer2) { } - - ngOnInit() { - } } diff --git a/src/components/table/nz-table.component.ts b/src/components/table/nz-table.component.ts index 75d76552a3..c508f4e042 100644 --- a/src/components/table/nz-table.component.ts +++ b/src/components/table/nz-table.component.ts @@ -11,6 +11,7 @@ import { TemplateRef, OnInit, ContentChildren, QueryList } from '@angular/core'; import { measureScrollbar } from '../util/mesureScrollBar'; +import { toBoolean } from '../util/convert'; import { NzThDirective } from './nz-th.directive'; @Component({ @@ -86,6 +87,17 @@ import { NzThDirective } from './nz-th.directive'; ] }) export class NzTableComponent implements AfterViewInit, OnInit { + private _bordered = false; + private _customNoResult = false; + private _isPageIndexReset = true; + private _isPagination = true; + private _loading = false; + private _showSizeChanger = false; + private _showQuickJumper = false; + private _showTotal = false; + private _showFooter = false; + private _showTitle = false; + /** public data for ngFor tr */ data = []; _scroll; @@ -102,17 +114,98 @@ export class NzTableComponent implements AfterViewInit, OnInit { @Output() nzPageIndexChange: EventEmitter = new EventEmitter(); @Output() nzDataChange: EventEmitter = new EventEmitter(); @Output() nzPageIndexChangeClick: EventEmitter = new EventEmitter(); - @Input() nzBordered = false; @Input() nzSize: string; - @Input() nzCustomNoResult = false; - @Input() nzIsPagination = true; - @Input() nzLoading = false; - @Input() nzShowSizeChanger = false; - @Input() nzShowQuickJumper = false; - @Input() nzShowTotal = false; - @Input() nzShowFooter = false; - @Input() nzShowTitle = false; - @Input() nzIsPageIndexReset = true; + + @Input() + set nzBordered(value: boolean) { + this._bordered = toBoolean(value); + } + + get nzBordered(): boolean { + return this._bordered; + } + + @Input() + set nzCustomNoResult(value: boolean) { + this._customNoResult = toBoolean(value); + } + + get nzCustomNoResult(): boolean { + return this._customNoResult; + } + + @Input() + set nzIsPagination(value: boolean) { + this._isPagination = toBoolean(value); + } + + get nzIsPagination(): boolean { + return this._isPagination; + } + + @Input() + set nzLoading(value: boolean) { + this._loading = toBoolean(value); + } + + get nzLoading(): boolean { + return this._loading; + } + + @Input() + set nzShowSizeChanger(value: boolean) { + this._showSizeChanger = toBoolean(value); + } + + get nzShowSizeChanger(): boolean { + return this._showSizeChanger; + } + + @Input() + set nzShowQuickJumper(value: boolean) { + this._showQuickJumper = toBoolean(value); + } + + get nzShowQuickJumper(): boolean { + return this._showQuickJumper; + } + + @Input() + set nzShowTotal(value: boolean) { + this._showTotal = toBoolean(value); + } + + get nzShowTotal(): boolean { + return this._showTotal; + } + + @Input() + set nzShowFooter(value: boolean) { + this._showFooter = toBoolean(value); + } + + get nzShowFooter(): boolean { + return this._showFooter; + } + + @Input() + set nzShowTitle(value: boolean) { + this._showTitle = toBoolean(value); + } + + get nzShowTitle(): boolean { + return this._showTitle; + } + + @Input() + set nzIsPageIndexReset(value: boolean) { + this._isPageIndexReset = toBoolean(value); + } + + get nzIsPageIndexReset(): boolean { + return this._isPageIndexReset; + } + /** page size changer select values */ @Input() nzPageSizeSelectorValues = [10, 20, 30, 40, 50]; @ContentChild('nzFixedHeader') fixedHeader: TemplateRef; @@ -134,32 +227,28 @@ export class NzTableComponent implements AfterViewInit, OnInit { /** async data */ @Input() - get nzAjaxData() { - return this.data; - } - set nzAjaxData(data) { this._isAjax = true; this.data = data; } - /** sync data */ - @Input() - get nzDataSource() { - return this._dataSet; + get nzAjaxData() { + return this.data; } + /** sync data */ + @Input() set nzDataSource(value) { this._dataSet = value; this.nzTotal = this._dataSet.length; this._generateData(true); } - @Input() - get nzPageIndex() { - return this._current; - }; + get nzDataSource() { + return this._dataSet; + } + @Input() set nzPageIndex(value: number) { if (this._current === value) { return; @@ -167,17 +256,17 @@ export class NzTableComponent implements AfterViewInit, OnInit { this._current = value; this._generateData(); this.nzPageIndexChange.emit(this.nzPageIndex); - }; + } + + get nzPageIndex() { + return this._current; + } pageChangeClick(value) { this.nzPageIndexChangeClick.emit(value); } @Input() - get nzPageSize() { - return this._pageSize; - }; - set nzPageSize(value: number) { if (this._pageSize === value) { return; @@ -187,13 +276,13 @@ export class NzTableComponent implements AfterViewInit, OnInit { if (this._isInit) { this.nzPageSizeChange.emit(value); } - }; + } - @Input() - get nzTotal() { - return this._total; - }; + get nzPageSize() { + return this._pageSize; + } + @Input() set nzTotal(value: number) { if (this._total === value) { return; @@ -201,6 +290,10 @@ export class NzTableComponent implements AfterViewInit, OnInit { this._total = value; } + get nzTotal() { + return this._total; + } + _generateData(forceRefresh = false) { if (!this._isAjax) { if (this.nzIsPagination) { @@ -236,4 +329,3 @@ export class NzTableComponent implements AfterViewInit, OnInit { this._isInit = true; } } - diff --git a/src/components/table/nz-table.module.ts b/src/components/table/nz-table.module.ts index a358240d20..b9c8a15edc 100644 --- a/src/components/table/nz-table.module.ts +++ b/src/components/table/nz-table.module.ts @@ -20,7 +20,6 @@ import { NzLocaleModule } from '../locale/index'; exports : [ NzRowIndentComponent, NzRowExpandIconComponent, NzTableFilterComponent, NzTableComponent, NzThDirective, NzTdDirective, NzTheadDirective, NzTbodyDirective, NzTbodyTrDirective, NzTableDividerDirective, NzTableSortComponent ], imports : [ CommonModule, NzPaginationModule, NzSpinModule, NzLocaleModule ] }) - export class NzTableModule { } diff --git a/src/components/table/nz-td.directive.ts b/src/components/table/nz-td.directive.ts index 0c4b4934a3..89d7e59f55 100644 --- a/src/components/table/nz-td.directive.ts +++ b/src/components/table/nz-td.directive.ts @@ -4,14 +4,36 @@ import { ElementRef, HostBinding, } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Directive({ selector: '[nz-td]' }) export class NzTdDirective { + private _checkbox = false; + private _expand = false; + _el: HTMLElement; - @Input() @HostBinding(`class.ant-table-selection-column`) nzCheckbox; - @Input() @HostBinding(`class.ant-table-row-expand-icon-cell`) nzExpand; + + @Input() + @HostBinding(`class.ant-table-selection-column`) + set nzCheckbox(value: boolean) { + this._checkbox = toBoolean(value); + } + + get nzCheckbox(): boolean { + return this._checkbox; + } + + @Input() + @HostBinding(`class.ant-table-row-expand-icon-cell`) + set nzExpand(value: boolean) { + this._expand = toBoolean(value); + } + + get nzExpand(): boolean { + return this._expand; + } constructor(private _elementRef: ElementRef) { this._el = this._elementRef.nativeElement; diff --git a/src/components/table/nz-th.directive.ts b/src/components/table/nz-th.directive.ts index ad8494f9a8..a1dedc9907 100644 --- a/src/components/table/nz-th.directive.ts +++ b/src/components/table/nz-th.directive.ts @@ -4,15 +4,37 @@ import { HostBinding, ElementRef } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Directive({ selector: '[nz-th]' }) export class NzThDirective { + private _checkbox = false; + private _expand = false; + _el: HTMLElement; @Input() nzWidth; - @Input() @HostBinding(`class.ant-table-selection-column`) nzCheckbox; - @Input() @HostBinding(`class.ant-table-expand-icon-th`) nzExpand; + + @Input() + @HostBinding(`class.ant-table-selection-column`) + set nzCheckbox(value: boolean) { + this._checkbox = toBoolean(value); + } + + get nzCheckbox(): boolean { + return this._checkbox; + } + + @Input() + @HostBinding(`class.ant-table-expand-icon-th`) + set nzExpand(value: boolean) { + this._expand = toBoolean(value); + } + + get nzExpand(): boolean { + return this._expand; + } constructor(private _elementRef: ElementRef) { this._el = this._elementRef.nativeElement; diff --git a/src/components/table/nz-thead.directive.ts b/src/components/table/nz-thead.directive.ts index fff0ad969a..7a6679f725 100644 --- a/src/components/table/nz-thead.directive.ts +++ b/src/components/table/nz-thead.directive.ts @@ -1,12 +1,8 @@ import { Directive, HostBinding } from '@angular/core'; + @Directive({ selector: '[nz-thead]' }) - export class NzTheadDirective { @HostBinding(`class.ant-table-thead`) _nzTableThead = true; - - constructor() { - - } } diff --git a/src/components/tabs/nz-tab-label.directive.ts b/src/components/tabs/nz-tab-label.directive.ts index e2e2c6bf52..c4067f4e15 100644 --- a/src/components/tabs/nz-tab-label.directive.ts +++ b/src/components/tabs/nz-tab-label.directive.ts @@ -1,12 +1,23 @@ import { Directive, ElementRef, HostBinding, Input } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Directive({ selector: '[nz-tab-label]' }) export class NzTabLabelDirective { + private _disabled = false; + @HostBinding('class.ant-tabs-tab') _nzTabsTab = true; - @Input() @HostBinding('class.ant-tabs-tab-disabled') disabled = false; + @Input() + @HostBinding('class.ant-tabs-tab-disabled') + set disabled(value: boolean) { + this._disabled = toBoolean(value); + } + + get disabled(): boolean { + return this._disabled; + } constructor(public elementRef: ElementRef) { } diff --git a/src/components/tabs/nz-tab.component.ts b/src/components/tabs/nz-tab.component.ts index 0f86ecc753..66763b2add 100644 --- a/src/components/tabs/nz-tab.component.ts +++ b/src/components/tabs/nz-tab.component.ts @@ -9,6 +9,7 @@ import { Input, ViewChild, OnDestroy, OnInit } from '@angular/core'; +import { toBoolean } from '../util/convert'; @Component({ selector: 'nz-tab', @@ -20,13 +21,18 @@ import { styles : [] }) export class NzTabComponent implements OnDestroy, OnInit { + private disabled = false; + position: number | null = null; origin: number | null = null; - disabled = false; @Input() - set nzDisabled(value) { - this.disabled = value; + set nzDisabled(value: boolean) { + this.disabled = toBoolean(value); + } + + get nzDisabled(): boolean { + return this.disabled; } @Output() nzSelect = new EventEmitter(); diff --git a/src/components/tabs/nz-tabs-ink-bar.directive.ts b/src/components/tabs/nz-tabs-ink-bar.directive.ts index e75f3ebdf1..2a94f66bee 100755 --- a/src/components/tabs/nz-tabs-ink-bar.directive.ts +++ b/src/components/tabs/nz-tabs-ink-bar.directive.ts @@ -1,5 +1,6 @@ import { Directive, Renderer2, ElementRef, NgZone, HostBinding, Input } from '@angular/core'; import { reqAnimFrame } from '../core/polyfill/request-animation'; +import { toBoolean } from '../util/convert'; export type NzTabPositionMode = 'horizontal' | 'vertical'; @@ -7,8 +8,19 @@ export type NzTabPositionMode = 'horizontal' | 'vertical'; selector: '[nz-tabs-ink-bar]', }) export class NzTabsInkBarDirective { - @HostBinding('class.ant-tabs-ink-bar') _nzTabsInkBar = true - @Input() @HostBinding('class.ant-tabs-ink-bar-animated') nzAnimated: boolean; + private _animated = false; + + @HostBinding('class.ant-tabs-ink-bar') _nzTabsInkBar = true; + + @Input() + @HostBinding('class.ant-tabs-ink-bar-animated') + set nzAnimated(value: boolean) { + this._animated = toBoolean(value); + } + + get nzAnimated(): boolean { + return this._animated; + } @Input() nzPositionMode: NzTabPositionMode = 'horizontal'; diff --git a/src/components/tabs/nz-tabs-nav.component.ts b/src/components/tabs/nz-tabs-nav.component.ts index 8d7a20fbed..446904201c 100644 --- a/src/components/tabs/nz-tabs-nav.component.ts +++ b/src/components/tabs/nz-tabs-nav.component.ts @@ -18,16 +18,17 @@ import { } from '@angular/core'; import { Directionality, Direction } from '@angular/cdk/bidi'; import { Subscription } from 'rxjs/Subscription'; -import { NzTabsInkBarDirective } from './nz-tabs-ink-bar.directive'; -import { NzTabLabelDirective } from './nz-tab-label.directive'; - -const EXAGGERATED_OVERSCROLL = 64; -export type ScrollDirection = 'after' | 'before'; import { of as observableOf } from 'rxjs/observable/of'; import { merge } from 'rxjs/observable/merge'; import { fromEvent } from 'rxjs/observable/fromEvent'; import { auditTime } from 'rxjs/operators/auditTime'; import { startWith } from 'rxjs/operators/startWith'; +import { toBoolean } from '../util/convert'; +import { NzTabsInkBarDirective } from './nz-tabs-ink-bar.directive'; +import { NzTabLabelDirective } from './nz-tab-label.directive'; + +const EXAGGERATED_OVERSCROLL = 64; +export type ScrollDirection = 'after' | 'before'; /** duplicated defined https://github.com/angular/angular-cli/issues/2034 **/ export type NzTabPositionMode = 'horizontal' | 'vertical'; @@ -60,6 +61,10 @@ export type NzTabPositionMode = 'horizontal' | 'vertical'; ` }) export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit { + private _animated = true; + private _hideBar = false; + private _showPagination = true; + _showPaginationControls = false; _disableScrollAfter = true; _disableScrollBefore = true; @@ -70,11 +75,27 @@ export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit _scrollDistanceChanged: boolean; _selectedIndex = 0; _tabPositionMode: NzTabPositionMode = 'horizontal'; - @Input() nzAnimated = true; - @Input() nzHideBar = false; @Input() nzSize = 'default'; _type = 'line'; + @Input() + set nzAnimated(value: boolean) { + this._animated = toBoolean(value); + } + + get nzAnimated(): boolean { + return this._animated; + } + + @Input() + set nzHideBar(value: boolean) { + this._hideBar = toBoolean(value); + } + + get nzHideBar(): boolean { + return this._hideBar; + } + @Input() set nzType(value) { this._type = value; @@ -95,7 +116,15 @@ export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit @ViewChild('tabListContainer') _tabListContainer: ElementRef; @ViewChild('tabList') _tabList: ElementRef; @HostBinding('class.ant-tabs-bar') _nzTabsBar = true; - @Input() nzShowPagination = true; + + @Input() + set nzShowPagination(value: boolean) { + this._showPagination = toBoolean(value); + } + + get nzShowPagination(): boolean { + return this._showPagination; + } @Input() set nzPositionMode(value: NzTabPositionMode) { @@ -111,16 +140,16 @@ export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit } @Input() - get selectedIndex(): number { - return this._selectedIndex; - } - set selectedIndex(value: number) { this._selectedIndexChanged = this._selectedIndex !== value; this._selectedIndex = value; } + get selectedIndex(): number { + return this._selectedIndex; + } + constructor(public _elementRef: ElementRef, private _ngZone: NgZone, private _renderer: Renderer2, diff --git a/src/components/tabs/nz-tabs.module.ts b/src/components/tabs/nz-tabs.module.ts index af0da55fc6..8af0830185 100644 --- a/src/components/tabs/nz-tabs.module.ts +++ b/src/components/tabs/nz-tabs.module.ts @@ -14,6 +14,5 @@ import { ObserversModule } from '@angular/cdk/observers'; exports : [ NzTabComponent, NzTabSetComponent, NzTabsNavComponent, NzTabLabelDirective, NzTabsInkBarDirective, NzTabBodyComponent ], imports : [ CommonModule, ObserversModule ] }) - export class NzTabsModule { } diff --git a/src/components/tabs/nz-tabset.component.ts b/src/components/tabs/nz-tabset.component.ts index 2481fc769d..cedb746412 100644 --- a/src/components/tabs/nz-tabset.component.ts +++ b/src/components/tabs/nz-tabset.component.ts @@ -19,6 +19,7 @@ import { NzTabComponent } from './nz-tab.component'; import { NzTabsNavComponent } from './nz-tabs-nav.component'; import { Observable } from 'rxjs/Observable'; import { map } from 'rxjs/operators/map'; +import { toBoolean } from '../util/convert'; export interface NzAnimatedInterface { inkBar: boolean, @@ -121,10 +122,6 @@ export class NzTabSetComponent implements AfterContentChecked, OnInit, AfterView tabs: Array = []; @Input() - get nzTabPosition() { - return this._tabPosition; - }; - set nzTabPosition(value) { if (this._tabPosition === value) { return; @@ -139,11 +136,11 @@ export class NzTabSetComponent implements AfterContentChecked, OnInit, AfterView this._setClassMap(); } - @Input() - get nzType(): NzTabType { - return this._type; + get nzTabPosition() { + return this._tabPosition; } + @Input() set nzType(value: NzTabType) { if (this._type === value) { return; @@ -155,6 +152,10 @@ export class NzTabSetComponent implements AfterContentChecked, OnInit, AfterView this._setClassMap(); } + get nzType(): NzTabType { + return this._type; + } + _setPosition(value) { if (this._isViewInit) { if (value === 'bottom') { diff --git a/src/components/tag/nz-checkable-tag.component.ts b/src/components/tag/nz-checkable-tag.component.ts index b860bdc103..b274c71448 100644 --- a/src/components/tag/nz-checkable-tag.component.ts +++ b/src/components/tag/nz-checkable-tag.component.ts @@ -12,6 +12,7 @@ import { EventEmitter } from '@angular/core'; import { TagAnimation } from '../core/animation/tag-animations'; +import { toBoolean } from '../util/convert'; @Component({ @@ -35,15 +36,32 @@ import { TagAnimation } from '../core/animation/tag-animations'; './style/patch.less' ] }) -export class NzCheckableTagComponent implements OnInit, AfterViewInit { +export class NzCheckableTagComponent implements AfterViewInit { + private _checked = false; + private _closable = false; + _prefixCls = 'ant-tag'; _closed = false; /** Whether tag is checked */ - @Input() nzChecked = false; + @Input() + set nzChecked(value: boolean) { + this._checked = toBoolean(value); + } + + get nzChecked(): boolean { + return this._checked; + } /** Whether tag is closable */ - @Input() nzClosable = false; + @Input() + set nzClosable(value: boolean) { + this._closable = toBoolean(value); + } + + get nzClosable(): boolean { + return this._closable; + } /** The tag color */ @Input() nzColor: string; @@ -114,9 +132,6 @@ export class NzCheckableTagComponent implements OnInit, AfterViewInit { } - ngOnInit() { - } - ngAfterViewInit(): void { this._render.addClass(this._elementRef.nativeElement, `${this._prefixCls}-root`); } diff --git a/src/components/tag/nz-tag.component.ts b/src/components/tag/nz-tag.component.ts index 78d228fdf3..7fc23340cd 100644 --- a/src/components/tag/nz-tag.component.ts +++ b/src/components/tag/nz-tag.component.ts @@ -12,7 +12,7 @@ import { EventEmitter } from '@angular/core'; import { TagAnimation } from '../core/animation/tag-animations'; - +import { toBoolean } from '../util/convert'; @Component({ selector : 'nz-tag', @@ -35,12 +35,21 @@ import { TagAnimation } from '../core/animation/tag-animations'; './style/patch.less' ] }) -export class NzTagComponent implements OnInit, AfterViewInit { +export class NzTagComponent implements AfterViewInit { + private _closable = false; + _prefixCls = 'ant-tag'; _closed = false; /** Whether tag is closable */ - @Input() nzClosable = false; + @Input() + set nzClosable(value: boolean) { + this._closable = toBoolean(value); + } + + get nzClosable(): boolean { + return this._closable; + } /** The tag color */ @Input() nzColor: string; @@ -99,9 +108,6 @@ export class NzTagComponent implements OnInit, AfterViewInit { } - ngOnInit() { - } - ngAfterViewInit(): void { this._render.addClass(this._elementRef.nativeElement, `${this._prefixCls}-root`); } diff --git a/src/components/tag/nz-tag.module.ts b/src/components/tag/nz-tag.module.ts index db54117536..7ddb07ee20 100644 --- a/src/components/tag/nz-tag.module.ts +++ b/src/components/tag/nz-tag.module.ts @@ -14,6 +14,5 @@ import { FormsModule } from '@angular/forms'; NzTagComponent, NzCheckableTagComponent ] }) - export class NzTagModule { } diff --git a/src/components/time-picker/nz-timepicker-inner.component.ts b/src/components/time-picker/nz-timepicker-inner.component.ts index bbf1874a3e..48c7e5bc29 100644 --- a/src/components/time-picker/nz-timepicker-inner.component.ts +++ b/src/components/time-picker/nz-timepicker-inner.component.ts @@ -12,6 +12,7 @@ import * as moment from 'moment'; import { DropDownAnimation } from '../core/animation/dropdown-animations'; import { NzLocaleService } from '../locale/index'; import { reqAnimFrame } from '../core/polyfill/request-animation'; +import { toBoolean } from '../util/convert'; export interface TimeUnitInterface { index: number; @@ -117,6 +118,8 @@ export interface TimeUnitInterface { ] }) export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor { + private _disabled = false; + private _hideDisabledOptions = false; _now = new Date(); _el: HTMLElement; _open = false; @@ -132,7 +135,6 @@ export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor _showMinute = this._format.indexOf('mm') > -1; _showSecond = this._format.indexOf('ss') > -1; _width = ( +this._showHour + +this._showMinute + +this._showSecond) * 56 + 1 + 'px'; - _hideDisabledOptions = false; _nzDisabledHours: Function; // ngModel Access onChange: any = Function.prototype; @@ -144,15 +146,11 @@ export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor @ViewChild('secondListInstance') _secondListInstance; @Input() - set nzHideDisabledOptions(value: boolean | string) { - if (value === '') { - this._hideDisabledOptions = true; - } else { - this._hideDisabledOptions = value as boolean; - } + set nzHideDisabledOptions(value: boolean) { + this._hideDisabledOptions = toBoolean(value); } - get nzHideDisabledOptions() { + get nzHideDisabledOptions(): boolean { return this._hideDisabledOptions; } @@ -171,13 +169,17 @@ export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor @Input() nzDisabledMinutes; @Input() nzDisabledSeconds; - @Input() nzDisabled = false; @Input() - get nzFormat() { - return this._format; + set nzDisabled(value: boolean) { + this._disabled = toBoolean(value); } + get nzDisabled(): boolean { + return this._disabled; + } + + @Input() set nzFormat(value) { this._format = value; this._showHour = this._format.indexOf('HH') > -1; @@ -186,9 +188,13 @@ export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor this._width = ( +this._showHour + +this._showMinute + +this._showSecond) * 56 + 1 + 'px'; } + get nzFormat() { + return this._format; + } + get nzValue(): Date { return this._value || this._now; - }; + } set nzValue(value: Date) { if (this._value === value) { @@ -198,7 +204,7 @@ export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor this._selectedHour = moment(this.nzValue).hours(); this._selectedMinute = moment(this.nzValue).minutes(); this._selectedSecond = moment(this.nzValue).seconds(); - }; + } _scrollToSelected(instance, index, duration = 0, unit) { const _transIndex = this._translateIndex(index, unit); @@ -222,7 +228,7 @@ export class NzTimePickerInnerComponent implements OnInit, ControlValueAccessor } this.scrollTo(element, to, duration - 10); }); - }; + } _selectHour(instance, index, disabled) { if (disabled) { diff --git a/src/components/time-picker/nz-timepicker.component.ts b/src/components/time-picker/nz-timepicker.component.ts index d5c766d2aa..e38aa67ed0 100644 --- a/src/components/time-picker/nz-timepicker.component.ts +++ b/src/components/time-picker/nz-timepicker.component.ts @@ -10,6 +10,7 @@ import * as moment from 'moment'; import { DropDownAnimation } from '../core/animation/dropdown-animations'; import { NzTimePickerInnerComponent } from './nz-timepicker-inner.component'; import { DEFAULT_DATEPICKER_POSITIONS } from '../core/overlay/overlay-position-map'; +import { toBoolean } from '../util/convert'; import { ConnectionPositionPair } from '@angular/cdk/overlay'; @Component({ @@ -140,7 +141,7 @@ import { ConnectionPositionPair } from '@angular/cdk/overlay'; ] }) export class NzTimePickerComponent extends NzTimePickerInnerComponent { - _disabled = false; + private _timePickerDisabled = false; _dropDownPosition = 'bottom'; _triggerWidth = 0; _positions: ConnectionPositionPair[] = [ ...DEFAULT_DATEPICKER_POSITIONS ]; @@ -148,15 +149,15 @@ export class NzTimePickerComponent extends NzTimePickerInnerComponent { @ViewChild('trigger') trigger; @Input() - get nzDisabled(): boolean { - return this._disabled; - }; - set nzDisabled(value: boolean) { - this._disabled = value; + this._timePickerDisabled = toBoolean(value); this._closeCalendar(); } + get nzDisabled(): boolean { + return this._timePickerDisabled; + } + _setTriggerWidth(): void { this._triggerWidth = this.trigger.nativeElement.getBoundingClientRect().width; } diff --git a/src/components/time-picker/nz-timepicker.module.ts b/src/components/time-picker/nz-timepicker.module.ts index a975d16d1a..51cd9b106b 100644 --- a/src/components/time-picker/nz-timepicker.module.ts +++ b/src/components/time-picker/nz-timepicker.module.ts @@ -11,6 +11,5 @@ import { NzLocaleModule } from '../locale/index'; declarations: [ NzTimePickerComponent, NzTimePickerInnerComponent ], exports : [ NzTimePickerComponent, NzTimePickerInnerComponent ] }) - export class NzTimePickerModule { } diff --git a/src/components/timeline/nz-timeline-item.component.ts b/src/components/timeline/nz-timeline-item.component.ts index b18fae7b1e..4b2a57fec3 100644 --- a/src/components/timeline/nz-timeline-item.component.ts +++ b/src/components/timeline/nz-timeline-item.component.ts @@ -26,7 +26,6 @@ import { `, styleUrls : [] }) - export class NzTimelineItemComponent implements OnInit { itemHeadClass = { 'ant-timeline-item-head-blue': true }; _color = 'blue'; @@ -35,10 +34,6 @@ export class NzTimelineItemComponent implements OnInit { @ContentChild('custom') _customContent: TemplateRef; @Input() - get nzColor() { - return this._color; - } - set nzColor(color: string) { this._color = color; if (color === 'green') { @@ -50,10 +45,10 @@ export class NzTimelineItemComponent implements OnInit { } } - constructor() { + get nzColor() { + return this._color; } - ngOnInit() { if (this._customContent) { this._custom = true; diff --git a/src/components/timeline/nz-timeline.component.ts b/src/components/timeline/nz-timeline.component.ts index aea240e7b6..812182749a 100644 --- a/src/components/timeline/nz-timeline.component.ts +++ b/src/components/timeline/nz-timeline.component.ts @@ -26,16 +26,12 @@ import { NzTimelineItemComponent } from './nz-timeline-item.component'; `, styleUrls : [ './style/index.less' ] }) - export class NzTimelineComponent implements OnInit, AfterContentInit { _isPending = false; items: Array = []; @ContentChildren(NzTimelineItemComponent) _listOfTimeline: QueryList; @ContentChild('pending') _pendingContent: TemplateRef; - constructor() { - } - ngOnInit() { if (this._pendingContent) { this._isPending = true; diff --git a/src/components/timeline/nz-timeline.module.ts b/src/components/timeline/nz-timeline.module.ts index ae45653e31..14c5d56f2d 100644 --- a/src/components/timeline/nz-timeline.module.ts +++ b/src/components/timeline/nz-timeline.module.ts @@ -8,6 +8,5 @@ import { CommonModule } from '@angular/common'; exports : [ NzTimelineItemComponent, NzTimelineComponent ], imports : [ CommonModule ] }) - export class NzTimelineModule { } diff --git a/src/components/tooltip/nz-tooltip.component.ts b/src/components/tooltip/nz-tooltip.component.ts index 7c70d61f9c..08ee177a14 100644 --- a/src/components/tooltip/nz-tooltip.component.ts +++ b/src/components/tooltip/nz-tooltip.component.ts @@ -16,6 +16,7 @@ import { AnimationEvent, } from '@angular/animations'; import { FadeAnimation } from '../core/animation/fade-animations'; +import { toBoolean } from '../util/convert'; import { OverlayOrigin, ConnectionPositionPair, @@ -61,22 +62,25 @@ import { POSITION_MAP, DEFAULT_4_POSITIONS } from '../core/overlay/overlay-posit ] }) export class NzToolTipComponent { + _hasBackdrop = false; + @Input() nzTitle: string; @Input() nzOverlayClassName = ''; @Input() nzOverlayStyle = {}; - @Output() nzVisibleChange: EventEmitter = new EventEmitter(); + @Output() nzVisibleChange: EventEmitter = new EventEmitter(); @ContentChild('nzTemplate') nzTemplate: TemplateRef; @ViewChild('overlay') overlay: ConnectedOverlayDirective; overlayOrigin: OverlayOrigin; @Input() - set nzVisible(value) { - if (this.visibleSource.value !== value) { - this.visibleSource.next(value); - this.nzVisibleChange.emit(value); + set nzVisible(value: boolean) { + const visible = toBoolean(value); + if (this.visibleSource.value !== visible) { + this.visibleSource.next(visible); + this.nzVisibleChange.emit(visible); } - }; + } get nzVisible() { return this.visibleSource.value; @@ -99,13 +103,8 @@ export class NzToolTipComponent { _classMap = {}; _placement = 'top'; _trigger = 'hover'; - _hasBackdrop = false; @Input() - get nzPlacement() { - return this._placement; - } - set nzPlacement(value) { if (value !== this._placement) { this._placement = value; @@ -113,6 +112,10 @@ export class NzToolTipComponent { } } + get nzPlacement() { + return this._placement; + } + // Manually force updating current overlay's position updatePosition() { if (this.overlay && this.overlay.overlayRef) { diff --git a/src/components/tooltip/nz-tooltip.directive.ts b/src/components/tooltip/nz-tooltip.directive.ts index 849a1860b4..3de9c99fc8 100644 --- a/src/components/tooltip/nz-tooltip.directive.ts +++ b/src/components/tooltip/nz-tooltip.directive.ts @@ -19,15 +19,16 @@ export class NzTooltipDirective implements AfterViewInit { // [NOTE] Here hard coded, and nzTitle used only under NzTooltipDirective currently. // The inherited class such as NzPopconfirmDirective should override this property if want using this property. @Input('nz-tooltip') - get nzTitle() { - return this.tooltip.nzTitle; - } set nzTitle(title: string) { if (this.isDynamicTooltip) { this.tooltip.nzTitle = title; } } + get nzTitle() { + return this.tooltip.nzTitle; + } + @HostBinding('class.ant-tooltip-open') isTooltipOpen; private tooltip: NzToolTipComponent; diff --git a/src/components/tooltip/nz-tooltip.module.ts b/src/components/tooltip/nz-tooltip.module.ts index a709d8f8e1..1160e98c52 100644 --- a/src/components/tooltip/nz-tooltip.module.ts +++ b/src/components/tooltip/nz-tooltip.module.ts @@ -3,12 +3,12 @@ import { NzToolTipComponent } from './nz-tooltip.component'; import { NzTooltipDirective } from './nz-tooltip.directive'; import { CommonModule } from '@angular/common'; import { OverlayModule } from '@angular/cdk/overlay'; + @NgModule({ declarations : [ NzToolTipComponent, NzTooltipDirective ], exports : [ NzToolTipComponent, NzTooltipDirective ], imports : [ CommonModule, OverlayModule ], entryComponents: [ NzToolTipComponent ] }) - export class NzToolTipModule { } diff --git a/src/components/transfer/nz-transfer-list.component.ts b/src/components/transfer/nz-transfer-list.component.ts index c7aa8b5d43..2b2b723105 100644 --- a/src/components/transfer/nz-transfer-list.component.ts +++ b/src/components/transfer/nz-transfer-list.component.ts @@ -1,175 +1,185 @@ // tslint:disable:member-ordering import { Component, Input, ContentChild, TemplateRef, Renderer2, ElementRef, OnChanges, SimpleChanges, Output, EventEmitter, OnInit, DoCheck, IterableDiffers, IterableDiffer } from '@angular/core'; +import { toBoolean } from '../util/convert'; import { TransferItem } from './item'; @Component({ - selector: 'nz-transfer-list', - template: ` + selector: 'nz-transfer-list', + template: `
- - {{ (stat.checkCount > 0 ? stat.checkCount + '/' : '') + stat.shownCount}} {{dataSource.length > 1 ? itemsUnit : itemUnit}} - {{titleText}} - + + {{ (stat.checkCount > 0 ? stat.checkCount + '/' : '') + stat.shownCount}} {{dataSource.length > 1 ? itemsUnit : itemUnit}} + {{titleText}} +
-
- -
-
    - -
  • - -
    • -     -
-
{{notFoundContent}}
+ [ngClass]="{'ant-transfer__nodata': stat.shownCount === 0}"> +
+ +
+
    + +
  • + +
    • +     +
+
{{notFoundContent}}
- ` + ` }) export class NzTransferListComponent implements OnChanges, OnInit, DoCheck { + private _showSearch = false; - // region: fields + // region: fields - @Input() direction = ''; - @Input() titleText = ''; + @Input() direction = ''; + @Input() titleText = ''; - @Input() dataSource: TransferItem[] = []; + @Input() dataSource: TransferItem[] = []; - @Input() itemUnit = ''; - @Input() itemsUnit = ''; - @Input() filter = ''; - // search - @Input() showSearch: boolean; - @Input() searchPlaceholder: string; - @Input() notFoundContent: string; - @Input() filterOption: (inputValue: any, item: any) => boolean; + @Input() itemUnit = ''; + @Input() itemsUnit = ''; + @Input() filter = ''; + // search + @Input() + set showSearch(value: boolean) { + this._showSearch = toBoolean(value); + } - @Input() render: TemplateRef; - @Input() footer: TemplateRef; + get showSearch(): boolean { + return this._showSearch; + } - // events - @Output() handleSelectAll: EventEmitter = new EventEmitter(); - @Output() handleSelect: EventEmitter = new EventEmitter(); - @Output() filterChange: EventEmitter = new EventEmitter(); + @Input() searchPlaceholder: string; + @Input() notFoundContent: string; + @Input() filterOption: (inputValue: any, item: any) => boolean; - // endregion + @Input() render: TemplateRef; + @Input() footer: TemplateRef; - // region: styles + // events + @Output() handleSelectAll: EventEmitter = new EventEmitter(); + @Output() handleSelect: EventEmitter = new EventEmitter(); + @Output() filterChange: EventEmitter = new EventEmitter(); - _prefixCls = 'ant-transfer-list'; - _classList: string[] = []; + // endregion - _setClassMap() { - this._classList.forEach(cls => this._renderer.removeClass(this._el.nativeElement, cls)); + // region: styles - this._classList = [ - this._prefixCls, - !!this.footer && `${this._prefixCls}-with-footer` - ].filter(item => !!item); + _prefixCls = 'ant-transfer-list'; + _classList: string[] = []; - this._classList.forEach(cls => this._renderer.addClass(this._el.nativeElement, cls)); - } - - // endregion - - // region: select all - - stat = { - checkAll: false, - checkHalf: false, - checkCount: 0, - shownCount: 0 - }; - - onHandleSelectAll(status: boolean) { - this.dataSource.forEach(item => { - if (!item.disabled && !item._hiden) { - item.checked = status; - } - }); + _setClassMap() { + this._classList.forEach(cls => this._renderer.removeClass(this._el.nativeElement, cls)); - // ngModelChange 事件内对状态的变更会无效，因此使用延迟改变执行顺序 - setTimeout(() => this.updateCheckStatus()); + this._classList = [ + this._prefixCls, + !!this.footer && `${this._prefixCls}-with-footer` + ].filter(item => !!item); - this.handleSelectAll.emit(status); - } - - private updateCheckStatus() { - const validCount = this.dataSource.filter(w => !w.disabled).length; - this.stat.checkCount = this.dataSource.filter(w => w.checked && !w.disabled).length; - this.stat.shownCount = this.dataSource.filter(w => !w._hiden).length; - this.stat.checkAll = validCount > 0 && validCount === this.stat.checkCount; - this.stat.checkHalf = this.stat.checkCount > 0 && !this.stat.checkAll; - } + this._classList.forEach(cls => this._renderer.addClass(this._el.nativeElement, cls)); + } - // endregion + // endregion - // region: search - - handleFilter(value: string) { - this.filter = value; - this.dataSource.forEach(item => { - item._hiden = value.length > 0 && !this.matchFilter(value, item); - }); - this.stat.shownCount = this.dataSource.filter(w => !w._hiden).length; - this.filterChange.emit({ direction: this.direction, value }); - } + // region: select all - handleClear() { - this.handleFilter(''); - } + stat = { + checkAll: false, + checkHalf: false, + checkCount: 0, + shownCount: 0 + }; - private matchFilter(text: string, item: TransferItem) { - if (this.filterOption) { - return this.filterOption(text, item); + onHandleSelectAll(status: boolean) { + this.dataSource.forEach(item => { + if (!item.disabled && !item._hiden) { + item.checked = status; } - return item.title.includes(text); + }); + + // ngModelChange 事件内对状态的变更会无效，因此使用延迟改变执行顺序 + setTimeout(() => this.updateCheckStatus()); + + this.handleSelectAll.emit(status); + } + + private updateCheckStatus() { + const validCount = this.dataSource.filter(w => !w.disabled).length; + this.stat.checkCount = this.dataSource.filter(w => w.checked && !w.disabled).length; + this.stat.shownCount = this.dataSource.filter(w => !w._hiden).length; + this.stat.checkAll = validCount > 0 && validCount === this.stat.checkCount; + this.stat.checkHalf = this.stat.checkCount > 0 && !this.stat.checkAll; + } + + // endregion + + // region: search + + handleFilter(value: string) { + this.filter = value; + this.dataSource.forEach(item => { + item._hiden = value.length > 0 && !this.matchFilter(value, item); + }); + this.stat.shownCount = this.dataSource.filter(w => !w._hiden).length; + this.filterChange.emit({ direction: this.direction, value }); + } + + handleClear() { + this.handleFilter(''); + } + + private matchFilter(text: string, item: TransferItem) { + if (this.filterOption) { + return this.filterOption(text, item); } + return item.title.includes(text); + } - // endregion - - _listDiffer: IterableDiffer<{}>; - constructor(private _el: ElementRef, private _renderer: Renderer2, differs: IterableDiffers) { - this._listDiffer = differs.find([]).create(null); - } + // endregion - ngOnChanges(changes: SimpleChanges): void { - if ('footer' in changes) { - this._setClassMap(); - } - } + _listDiffer: IterableDiffer<{}>; + constructor(private _el: ElementRef, private _renderer: Renderer2, differs: IterableDiffers) { + this._listDiffer = differs.find([]).create(null); + } - ngOnInit() { + ngOnChanges(changes: SimpleChanges): void { + if ('footer' in changes) { this._setClassMap(); } + } - ngDoCheck(): void { - const change = this._listDiffer.diff(this.dataSource); - if (change) { - this.updateCheckStatus(); - } - } + ngOnInit() { + this._setClassMap(); + } - _handleSelect(item: TransferItem) { - if (item.disabled) { - return; - } - item.checked = !item.checked; + ngDoCheck(): void { + const change = this._listDiffer.diff(this.dataSource); + if (change) { this.updateCheckStatus(); - this.handleSelect.emit(item); } + } + + _handleSelect(item: TransferItem) { + if (item.disabled) { + return; + } + item.checked = !item.checked; + this.updateCheckStatus(); + this.handleSelect.emit(item); + } } diff --git a/src/components/transfer/nz-transfer-search.component.ts b/src/components/transfer/nz-transfer-search.component.ts index 7f029b0c79..4644044474 100644 --- a/src/components/transfer/nz-transfer-search.component.ts +++ b/src/components/transfer/nz-transfer-search.component.ts @@ -1,15 +1,15 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; @Component({ - selector: 'nz-transfer-search', - template: ` + selector: 'nz-transfer-search', + template: ` - ` + ` }) export class NzTransferSearchComponent { @@ -24,7 +24,7 @@ export class NzTransferSearchComponent { // endregion _handle() { - this.valueChanged.emit(this.value); + this.valueChanged.emit(this.value); } _clear() { diff --git a/src/components/transfer/nz-transfer.component.ts b/src/components/transfer/nz-transfer.component.ts index c5b0f0c5ba..a2bae82570 100644 --- a/src/components/transfer/nz-transfer.component.ts +++ b/src/components/transfer/nz-transfer.component.ts @@ -1,6 +1,7 @@ // tslint:disable:member-ordering import { Component, ViewEncapsulation, Input, Output, ContentChild, TemplateRef, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { NzLocaleService } from '../locale/index'; +import { toBoolean } from '../util/convert'; import { TransferItem } from './item'; @Component({ @@ -56,6 +57,7 @@ import { TransferItem } from './item'; } }) export class NzTransferComponent implements OnChanges { + private _showSearch = false; leftFilter = ''; rightFilter = ''; @@ -72,7 +74,15 @@ export class NzTransferComponent implements OnChanges { @ContentChild('footer') footer: TemplateRef; // search - @Input() nzShowSearch = false; + @Input() + set nzShowSearch(value: boolean) { + this._showSearch = toBoolean(value); + } + + get nzShowSearch(): boolean { + return this._showSearch; + } + @Input() nzFilterOption: (inputValue: any, item: any) => boolean; @Input() nzSearchPlaceholder = this._locale.translate('Transfer.searchPlaceholder'); @Input() nzNotFoundContent = this._locale.translate('Transfer.notFoundContent'); diff --git a/src/components/util/convert.ts b/src/components/util/convert.ts new file mode 100644 index 0000000000..2bfbe16e5d --- /dev/null +++ b/src/components/util/convert.ts @@ -0,0 +1,3 @@ +export function toBoolean(value: boolean | string) { + return value === '' || (value && value !== 'false'); +} diff --git a/src/components/util/nz-global-monitor.ts b/src/components/util/nz-global-monitor.ts index 08fc807235..4170c5f68f 100644 --- a/src/components/util/nz-global-monitor.ts +++ b/src/components/util/nz-global-monitor.ts @@ -20,7 +20,7 @@ export class NzGlobalMonitorService { setDocumentOverflowHidden(status: Boolean) { document.body.style.overflow = status ? 'hidden' : ''; - }; + } _observeGlobalEvents() { // 监听document的点击事件，记录点击坐标，并抛出 documentClick 事件 diff --git a/src/showcase/app.component.html b/src/showcase/app.component.html index b8c92073bc..b060788c69 100644 --- a/src/showcase/app.component.html +++ b/src/showcase/app.component.html @@ -20,7 +20,7 @@ @@ -34,7 +34,7 @@
  • {{intro.label}}
    • -
  • +

  • Components
    • diff --git a/src/showcase/nz-demo-affix/nz-demo-affix-basic.component.ts b/src/showcase/nz-demo-affix/nz-demo-affix-basic.component.ts index 2a0b3a5240..6017fb974a 100644 --- a/src/showcase/nz-demo-affix/nz-demo-affix-basic.component.ts +++ b/src/showcase/nz-demo-affix/nz-demo-affix-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-affix-basic', diff --git a/src/showcase/nz-demo-affix/nz-demo-affix-container.component.ts b/src/showcase/nz-demo-affix/nz-demo-affix-container.component.ts index e4b3f67232..c39dbc857a 100644 --- a/src/showcase/nz-demo-affix/nz-demo-affix-container.component.ts +++ b/src/showcase/nz-demo-affix/nz-demo-affix-container.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-affix-container', diff --git a/src/showcase/nz-demo-affix/nz-demo-affix-fixed.component.ts b/src/showcase/nz-demo-affix/nz-demo-affix-fixed.component.ts index a424955594..ce0a6ae1b9 100644 --- a/src/showcase/nz-demo-affix/nz-demo-affix-fixed.component.ts +++ b/src/showcase/nz-demo-affix/nz-demo-affix-fixed.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-affix-fixed', diff --git a/src/showcase/nz-demo-affix/nz-demo-affix.component.ts b/src/showcase/nz-demo-affix/nz-demo-affix.component.ts index 8ab17e72fd..32641cec91 100644 --- a/src/showcase/nz-demo-affix/nz-demo-affix.component.ts +++ b/src/showcase/nz-demo-affix/nz-demo-affix.component.ts @@ -1,18 +1,12 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'nz-demo-affix', templateUrl: './nz-demo-affix.html' }) -export class NzDemoAffixComponent implements OnInit { +export class NzDemoAffixComponent { NzDemoAffixBasicCode = require('!!raw-loader!./nz-demo-affix-basic.component') NzDemoAffixFixedCode = require('!!raw-loader!./nz-demo-affix-fixed.component') NzDemoAffixContainerCode = require('!!raw-loader!./nz-demo-affix-container.component') - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-affix/nz-demo-affix.module.ts b/src/showcase/nz-demo-affix/nz-demo-affix.module.ts index a385e1ff16..07b7342e85 100644 --- a/src/showcase/nz-demo-affix/nz-demo-affix.module.ts +++ b/src/showcase/nz-demo-affix/nz-demo-affix.module.ts @@ -15,7 +15,6 @@ import { NzDemoAffixRoutingModule } from './nz-demo-affix.routing.module'; declarations: [ NzDemoAffixComponent, NzDemoAffixBasicComponent, NzDemoAffixFixedComponent, NzDemoAffixContainerComponent ], imports : [ NzDemoAffixRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ] }) - export class NzDemoAffixModule { } diff --git a/src/showcase/nz-demo-alert/nz-demo-4-style.component.ts b/src/showcase/nz-demo-alert/nz-demo-4-style.component.ts index f6d3bbc37c..1ad66df3aa 100644 --- a/src/showcase/nz-demo-alert/nz-demo-4-style.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-4-style.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-4-style', @@ -25,11 +25,4 @@ import { Component, OnInit } from '@angular/core'; ` }) - -export class NzDemoAlert4TypeComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoAlert4TypeComponent { } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert-4-type-message.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert-4-type-message.component.ts index 5dd32b3fca..fd39243224 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert-4-type-message.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert-4-type-message.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-4-type-message', @@ -20,11 +20,4 @@ import { Component, OnInit } from '@angular/core'; ` }) - -export class NzDemoAlert4TypeMessageComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoAlert4TypeMessageComponent { } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert-basic.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert-basic.component.ts index a5e4fe3289..fc0c71816d 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert-basic.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-basic', @@ -10,12 +10,4 @@ import { Component, OnInit } from '@angular/core'; ` }) - -export class NzDemoAlertBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoAlertBasicComponent { } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert-closeable.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert-closeable.component.ts index 7aa9a87032..5aed910f6a 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert-closeable.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert-closeable.component.ts @@ -1,25 +1,18 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-closeable', template: ` - + - ` }) - -export class NzDemoAlertCloseableComponent implements OnInit { +export class NzDemoAlertCloseableComponent { afterClose() { console.log('close'); } - - constructor() { - }; - - ngOnInit() { - }; } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert-icon-close.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert-icon-close.component.ts index 0695d9ad8a..3e3f40edc4 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert-icon-close.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert-icon-close.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-icon-close', @@ -7,11 +7,4 @@ import { Component, OnInit } from '@angular/core'; ` }) - -export class NzDemoAlertIconCloseComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoAlertIconCloseComponent { } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert-icon.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert-icon.component.ts index 3e393ec6f5..4b2e4643ad 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert-icon.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert-icon.component.ts @@ -1,33 +1,25 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-icon', template: ` - + - + - + - + + [nzDescription]="'Detailed description and advices about successful copywriting.'" nzShowIcon> + [nzDescription]="'Additional description and informations about copywriting.'" nzShowIcon> + [nzDescription]="'This is a warning notice about copywriting.'" nzShowIcon> + [nzDescription]="'This is an error message about copywriting.'" nzShowIcon> ` }) - -export class NzDemoAlertIconComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoAlertIconComponent { } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert-self-close.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert-self-close.component.ts index 31ee82aefe..990ac6a990 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert-self-close.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert-self-close.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-alert-self-close', @@ -7,11 +7,4 @@ import { Component, OnInit } from '@angular/core'; ` }) - -export class NzDemoAlertSelfCloseComponent implements OnInit { - constructor() { - }; - - ngOnInit() { - }; -} +export class NzDemoAlertSelfCloseComponent { } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert.component.ts b/src/showcase/nz-demo-alert/nz-demo-alert.component.ts index 65bb081229..adf1369e45 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert.component.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'nz-demo-alert', @@ -11,18 +11,11 @@ import { Component, OnInit } from '@angular/core'; ` ] }) - -export class NzDemoAlertComponent implements OnInit { +export class NzDemoAlertComponent { NzDemoAlertBasicCode = require('!!raw-loader!./nz-demo-alert-basic.component') NzDemoAlert4TypeCode = require('!!raw-loader!./nz-demo-4-style.component') NzDemoAlertCloseableCode = require('!!raw-loader!./nz-demo-alert-closeable.component') NzDemoAlert4TypeMessageCode = require('!!raw-loader!./nz-demo-alert-4-type-message.component') NzDemoAlertIconCode = require('!!raw-loader!./nz-demo-alert-icon.component') NzDemoAlertIconSelfCode = require('!!raw-loader!./nz-demo-alert-self-close.component') - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-alert/nz-demo-alert.module.ts b/src/showcase/nz-demo-alert/nz-demo-alert.module.ts index acff399e7f..e61e88d751 100644 --- a/src/showcase/nz-demo-alert/nz-demo-alert.module.ts +++ b/src/showcase/nz-demo-alert/nz-demo-alert.module.ts @@ -20,7 +20,6 @@ import { NzDemoAlertRoutingModule } from './nz-demo-alert.routing.module'; declarations: [ NzDemoAlertComponent, NzDemoAlertBasicComponent, NzDemoAlert4TypeComponent, NzDemoAlertCloseableComponent, NzDemoAlert4TypeMessageComponent, NzDemoAlertIconCloseComponent, NzDemoAlertSelfCloseComponent, NzDemoAlertIconComponent ], imports : [ NzDemoAlertRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ] }) - export class NzDemoAlertModule { } diff --git a/src/showcase/nz-demo-anchor/nz-demo-anchor-basic.component.ts b/src/showcase/nz-demo-anchor/nz-demo-anchor-basic.component.ts index 638ee9da55..ca18d4d6b2 100644 --- a/src/showcase/nz-demo-anchor/nz-demo-anchor-basic.component.ts +++ b/src/showcase/nz-demo-anchor/nz-demo-anchor-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-anchor-basic', @@ -13,5 +13,4 @@ import { Component, OnInit } from '@angular/core'; ` }) - export class NzDemoAnchorBasicComponent { } diff --git a/src/showcase/nz-demo-anchor/nz-demo-anchor-fixed.component.ts b/src/showcase/nz-demo-anchor/nz-demo-anchor-fixed.component.ts index 62a0c38e14..fde640678a 100644 --- a/src/showcase/nz-demo-anchor/nz-demo-anchor-fixed.component.ts +++ b/src/showcase/nz-demo-anchor/nz-demo-anchor-fixed.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-anchor-fixed', @@ -23,5 +23,4 @@ import { Component, OnInit } from '@angular/core'; ` ] }) - export class NzDemoAnchorFixedComponent { } diff --git a/src/showcase/nz-demo-anchor/nz-demo-anchor.component.ts b/src/showcase/nz-demo-anchor/nz-demo-anchor.component.ts index b06ac96da6..88cbb3bcb5 100644 --- a/src/showcase/nz-demo-anchor/nz-demo-anchor.component.ts +++ b/src/showcase/nz-demo-anchor/nz-demo-anchor.component.ts @@ -1,17 +1,10 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'nz-demo-anchor', templateUrl: './nz-demo-anchor.html' }) - -export class NzDemoAnchorComponent implements OnInit { +export class NzDemoAnchorComponent { NzDemoAnchorFixedCode = require('!!raw-loader!./nz-demo-anchor-fixed.component') NzDemoAnchorBasicCode = require('!!raw-loader!./nz-demo-anchor-basic.component') - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-anchor/nz-demo-anchor.module.ts b/src/showcase/nz-demo-anchor/nz-demo-anchor.module.ts index 790481a1ec..be673ce672 100644 --- a/src/showcase/nz-demo-anchor/nz-demo-anchor.module.ts +++ b/src/showcase/nz-demo-anchor/nz-demo-anchor.module.ts @@ -15,7 +15,6 @@ import { NzDemoAnchorRoutingModule } from './nz-demo-anchor.routing.module'; declarations: [ NzDemoAnchorComponent, NzDemoAnchorBasicComponent, NzDemoAnchorFixedComponent ], imports : [ NzDemoAnchorRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ] }) - export class NzDemoAnchorModule { } diff --git a/src/showcase/nz-demo-avatar/nz-demo-avatar-badge.component.ts b/src/showcase/nz-demo-avatar/nz-demo-avatar-badge.component.ts index 6fa7c31616..fa57170eec 100644 --- a/src/showcase/nz-demo-avatar/nz-demo-avatar-badge.component.ts +++ b/src/showcase/nz-demo-avatar/nz-demo-avatar-badge.component.ts @@ -6,7 +6,7 @@ import { Component } from '@angular/core'; - + ` diff --git a/src/showcase/nz-demo-back-top/nz-demo-back-top-basic.component.ts b/src/showcase/nz-demo-back-top/nz-demo-back-top-basic.component.ts index d5e2e691a7..0accc83092 100644 --- a/src/showcase/nz-demo-back-top/nz-demo-back-top-basic.component.ts +++ b/src/showcase/nz-demo-back-top/nz-demo-back-top-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-back-top-basic', @@ -14,11 +14,4 @@ import { Component, OnInit } from '@angular/core'; } `] }) - -export class NzDemoBackTopBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBackTopBasicComponent { } diff --git a/src/showcase/nz-demo-back-top/nz-demo-back-top-custom.component.ts b/src/showcase/nz-demo-back-top/nz-demo-back-top-custom.component.ts index 7304202445..db5360870c 100644 --- a/src/showcase/nz-demo-back-top/nz-demo-back-top-custom.component.ts +++ b/src/showcase/nz-demo-back-top/nz-demo-back-top-custom.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-back-top-custom', @@ -31,14 +31,7 @@ import { Component, OnInit } from '@angular/core'; } `] }) - -export class NzDemoBackTopCustomComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } - +export class NzDemoBackTopCustomComponent { notify() { console.log('notify'); } diff --git a/src/showcase/nz-demo-back-top/nz-demo-back-top-target.component.ts b/src/showcase/nz-demo-back-top/nz-demo-back-top-target.component.ts index aca25a68ea..62fcf10fae 100644 --- a/src/showcase/nz-demo-back-top/nz-demo-back-top-target.component.ts +++ b/src/showcase/nz-demo-back-top/nz-demo-back-top-target.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-back-top-target', @@ -31,11 +31,4 @@ import { Component, OnInit } from '@angular/core'; } `] }) - -export class NzDemoBackTopTargetComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBackTopTargetComponent { } diff --git a/src/showcase/nz-demo-back-top/nz-demo-back-top.component.ts b/src/showcase/nz-demo-back-top/nz-demo-back-top.component.ts index ccb98b6628..12b5d8fb74 100644 --- a/src/showcase/nz-demo-back-top/nz-demo-back-top.component.ts +++ b/src/showcase/nz-demo-back-top/nz-demo-back-top.component.ts @@ -1,18 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector : 'nz-demo-back-top', templateUrl: './nz-demo-back-top.html' }) - -export class NzDemoBackTopComponent implements OnInit { +export class NzDemoBackTopComponent { NzDemoBackTopBasicCode = require('!!raw-loader!./nz-demo-back-top-basic.component') NzDemoBackTopCustomCode = require('!!raw-loader!./nz-demo-back-top-custom.component') NzDemoBackTopTargetCode = require('!!raw-loader!./nz-demo-back-top-target.component') - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-back-top/nz-demo-back-top.module.ts b/src/showcase/nz-demo-back-top/nz-demo-back-top.module.ts index 7ab9f8577f..eba8da1fd5 100644 --- a/src/showcase/nz-demo-back-top/nz-demo-back-top.module.ts +++ b/src/showcase/nz-demo-back-top/nz-demo-back-top.module.ts @@ -16,7 +16,6 @@ import { NzDemoBackTopRoutingModule } from './nz-demo-back-top.routing.module'; declarations: [ NzDemoBackTopComponent, NzDemoBackTopBasicComponent, NzDemoBackTopCustomComponent, NzDemoBackTopTargetComponent ], imports : [ NzDemoBackTopRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ] }) - export class NzDemoBackTopModule { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-animate.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-animate.component.ts index 7c1fdb0c95..305e147e8a 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-animate.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-animate.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-animate', @@ -45,18 +45,11 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeAnimateComponent implements OnInit { +export class NzDemoBadgeAnimateComponent { count = 5; dot = true; - constructor() { - } - - ngOnInit() { - } - addCount(): void { this.count++; } @@ -69,4 +62,3 @@ export class NzDemoBadgeAnimateComponent implements OnInit { this.dot = !this.dot; } } - diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-basic.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-basic.component.ts index 0ca3028f83..acc9f72e74 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-basic.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-basic', @@ -23,13 +23,4 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeBasicComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoBadgeBasicComponent { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-clickable.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-clickable.component.ts index bec9b2839f..289ac3eede 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-clickable.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-clickable.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-clickable', @@ -25,13 +25,5 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeClickAbleComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBadgeClickAbleComponent { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-dot.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-dot.component.ts index aac3b7a8ce..6f98413db0 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-dot.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-dot.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-dot', template: ` - + - + 一个链接 @@ -28,13 +28,5 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeDotComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBadgeDotComponent { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-myceil.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-myceil.component.ts index 8132f2bb29..c0aa58d010 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-myceil.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-myceil.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-myceil', @@ -38,13 +38,4 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeMyCeilComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoBadgeMyCeilComponent { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-overflow.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-overflow.component.ts index 1153721aa1..829e9c9aca 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-overflow.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-overflow.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-overflow', @@ -40,13 +40,4 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeOverFlowComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoBadgeOverFlowComponent { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-standalones.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-standalones.component.ts index 636ad6df84..14935e0443 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-standalones.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-standalones.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-standalones', @@ -13,8 +13,7 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeStandAlonesComponent implements OnInit { +export class NzDemoBadgeStandAlonesComponent { style1 = {}; @@ -25,11 +24,4 @@ export class NzDemoBadgeStandAlonesComponent implements OnInit { style3 = { backgroundColor: '#87d068' }; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-badge/nz-demo-badge-status.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge-status.component.ts index b4fff35516..66a12190f6 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge-status.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge-status.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-status', @@ -33,13 +33,4 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) - -export class NzDemoBadgeStatusComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoBadgeStatusComponent { } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge.component.ts b/src/showcase/nz-demo-badge/nz-demo-badge.component.ts index 2d5384b9a5..c83aeedbe5 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge.component.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-badge', @@ -6,7 +6,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; templateUrl : './nz-demo-badge.html' }) -export class NzDemoBadgeComponent implements OnInit { +export class NzDemoBadgeComponent { NzDemoBadgeBasicCode = require('!!raw-loader!./nz-demo-badge-basic.component'); NzDemoBadgeStandAlonesCode = require('!!raw-loader!./nz-demo-badge-standalones.component'); NzDemoBadgeClickAbleCode = require('!!raw-loader!./nz-demo-badge-clickable.component'); @@ -14,10 +14,4 @@ export class NzDemoBadgeComponent implements OnInit { NzDemoBadgeAnimateCode = require('!!raw-loader!./nz-demo-badge-animate.component'); NzDemoBadgeMyCeilCode = require('!!raw-loader!./nz-demo-badge-myceil.component'); NzDemoBadgeStatusCode = require('!!raw-loader!./nz-demo-badge-status.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-badge/nz-demo-badge.module.ts b/src/showcase/nz-demo-badge/nz-demo-badge.module.ts index 0b29c54990..813c33a475 100644 --- a/src/showcase/nz-demo-badge/nz-demo-badge.module.ts +++ b/src/showcase/nz-demo-badge/nz-demo-badge.module.ts @@ -20,7 +20,6 @@ import { NzDemoBadgeRoutingModule } from './nz-demo-badge.routing.module'; imports : [ NzDemoBadgeRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoBadgeComponent, NzDemoBadgeComponent, NzDemoBadgeBasicComponent, NzDemoBadgeStandAlonesComponent, NzDemoBadgeOverFlowComponent, NzDemoBadgeClickAbleComponent, NzDemoBadgeDotComponent, NzDemoBadgeAnimateComponent, NzDemoBadgeMyCeilComponent, NzDemoBadgeStatusComponent ] }) - export class NzDemoBadgeModule { } diff --git a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-basic.component.ts b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-basic.component.ts index ada050ab52..65a8afc5f6 100644 --- a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-basic.component.ts +++ b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-breadcrumb-basic', @@ -19,10 +19,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoBreadCrumbBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBreadCrumbBasicComponent { } diff --git a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-icon.component.ts b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-icon.component.ts index f23b4fed8e..aa6abe44d4 100644 --- a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-icon.component.ts +++ b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-icon.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-breadcrumb-icon', @@ -16,10 +16,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoBreadCrumbIconComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBreadCrumbIconComponent { } diff --git a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-separator.component.ts b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-separator.component.ts index 7740659188..52cfde89cc 100644 --- a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-separator.component.ts +++ b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb-separator.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-breadcrumb-separator', @@ -19,10 +19,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoBreadCrumbSeparatorComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoBreadCrumbSeparatorComponent { } diff --git a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.component.ts b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.component.ts index 6fdc9088ef..3b30eb9736 100644 --- a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.component.ts +++ b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-breadcrumb', @@ -8,15 +8,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-breadcrumb.less' ] }) -export class NzDemoBreadCrumbComponent implements OnInit { +export class NzDemoBreadCrumbComponent { NzDemoBreadCrumbBasicCode = require('!!raw-loader!./nz-demo-breadcrumb-basic.component'); NzDemoBreadCrumbIconCode = require('!!raw-loader!./nz-demo-breadcrumb-icon.component'); NzDemoBreadCrumbSeparatorCode = require('!!raw-loader!./nz-demo-breadcrumb-separator.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.module.ts b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.module.ts index 1e9e7c1a5f..fac43a0bb3 100644 --- a/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.module.ts +++ b/src/showcase/nz-demo-breadcrumb/nz-demo-breadcrumb.module.ts @@ -25,7 +25,6 @@ import { NzDemoBreadCrumbRoutingModule } from './nz-demo-breadcrumb.routing.modu NzDemoBreadCrumbSeparatorComponent ] }) - export class NzDemoBreadCrumbModule { } diff --git a/src/showcase/nz-demo-button/nz-demo-button-disabled.component.ts b/src/showcase/nz-demo-button/nz-demo-button-disabled.component.ts index 3d59f21359..36614724fd 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-disabled.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-disabled.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-disabled', @@ -17,10 +17,10 @@ import { Component, OnInit } from '@angular/core'; Default(disabled)
      - -
      @@ -32,10 +32,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoButtonDisabledComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoButtonDisabledComponent { } diff --git a/src/showcase/nz-demo-button/nz-demo-button-ghost.component.ts b/src/showcase/nz-demo-button/nz-demo-button-ghost.component.ts index 56108f9ed4..d7a85f17b1 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-ghost.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-ghost.component.ts @@ -1,30 +1,23 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-ghost', template: `
      - - - -
      `, styles : [] }) -export class NzDemoButtonGhostComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoButtonGhostComponent { } diff --git a/src/showcase/nz-demo-button/nz-demo-button-group.component.ts b/src/showcase/nz-demo-button/nz-demo-button-group.component.ts index e681b8bcf4..35af3c1b28 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-group.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-group.component.ts @@ -67,10 +67,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoButtonGroupComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoButtonGroupComponent{ } diff --git a/src/showcase/nz-demo-button/nz-demo-button-icon.component.ts b/src/showcase/nz-demo-button/nz-demo-button-icon.component.ts index bb42ac3b87..3f9279db18 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-icon.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-icon.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-icon', @@ -19,10 +19,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoButtonIconComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoButtonIconComponent { } diff --git a/src/showcase/nz-demo-button/nz-demo-button-loading.component.ts b/src/showcase/nz-demo-button/nz-demo-button-loading.component.ts index e33d75e34a..cdb21fce0e 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-loading.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-loading.component.ts @@ -3,10 +3,10 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'nz-demo-button-loading', template: ` - -
      @@ -18,12 +18,12 @@ import { Component, OnInit } from '@angular/core'; Click me!
      - - + + `, styles : [] }) -export class NzDemoButtonLoadingComponent implements OnInit { +export class NzDemoButtonLoadingComponent { isLoadingOne = false; isLoadingTwo = false; loadOne = (value) => { @@ -38,10 +38,4 @@ export class NzDemoButtonLoadingComponent implements OnInit { this.isLoadingTwo = false; }, 5000); }; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-button/nz-demo-button-multiple.component.ts b/src/showcase/nz-demo-button/nz-demo-button-multiple.component.ts index 62abfa1057..1b4d00ef87 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-multiple.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-multiple.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-multiple', @@ -26,11 +26,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoButtonMultipleComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoButtonMultipleComponent { } diff --git a/src/showcase/nz-demo-button/nz-demo-button-size.component.ts b/src/showcase/nz-demo-button/nz-demo-button-size.component.ts index 183955f767..02dc9f1664 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-size.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-size', @@ -31,12 +31,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoButtonSizeComponent implements OnInit { +export class NzDemoButtonSizeComponent { size = 'default'; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-button/nz-demo-button-type.component.ts b/src/showcase/nz-demo-button/nz-demo-button-type.component.ts index af67bd10b6..bb00efdffe 100644 --- a/src/showcase/nz-demo-button/nz-demo-button-type.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button-type.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-type', @@ -17,11 +17,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoButtonTypeComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoButtonTypeComponent { } diff --git a/src/showcase/nz-demo-button/nz-demo-button.component.ts b/src/showcase/nz-demo-button/nz-demo-button.component.ts index cdb40a752e..1fdba65c9f 100644 --- a/src/showcase/nz-demo-button/nz-demo-button.component.ts +++ b/src/showcase/nz-demo-button/nz-demo-button.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-button', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-button.less' ] }) -export class NzDemoButtonComponent implements OnInit { +export class NzDemoButtonComponent { NzDemoButtonTypeCode = require('!!raw-loader!./nz-demo-button-type.component'); NzDemoButtonSizeCode = require('!!raw-loader!./nz-demo-button-size.component'); NzDemoButtonLoadingCode = require('!!raw-loader!./nz-demo-button-loading.component'); @@ -17,11 +17,4 @@ export class NzDemoButtonComponent implements OnInit { NzDemoButtonDisabledCode = require('!!raw-loader!./nz-demo-button-disabled.component'); NzDemoButtonGhostCode = require('!!raw-loader!./nz-demo-button-ghost.component'); NzDemoButtonMultipleCode = require('!!raw-loader!./nz-demo-button-multiple.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-button/nz-demo-button.module.ts b/src/showcase/nz-demo-button/nz-demo-button.module.ts index 34e1c879c9..6254561a0d 100644 --- a/src/showcase/nz-demo-button/nz-demo-button.module.ts +++ b/src/showcase/nz-demo-button/nz-demo-button.module.ts @@ -35,7 +35,6 @@ import { NzDemoButtonRoutingModule } from './nz-demo-button.routing.module'; NzDemoButtonMultipleComponent ] }) - export class NzDemoButtonModule { } diff --git a/src/showcase/nz-demo-calendar/nz-demo-calendar-basic.component.ts b/src/showcase/nz-demo-calendar/nz-demo-calendar-basic.component.ts index 2080de2f35..f6945144d8 100644 --- a/src/showcase/nz-demo-calendar/nz-demo-calendar-basic.component.ts +++ b/src/showcase/nz-demo-calendar/nz-demo-calendar-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-calendar-basic', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCalendarBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoCalendarBasicComponent { } diff --git a/src/showcase/nz-demo-calendar/nz-demo-calendar-card.component.ts b/src/showcase/nz-demo-calendar/nz-demo-calendar-card.component.ts index b264df8074..7d43eb0565 100644 --- a/src/showcase/nz-demo-calendar/nz-demo-calendar-card.component.ts +++ b/src/showcase/nz-demo-calendar/nz-demo-calendar-card.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-calendar-card', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCalendarCardComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoCalendarCardComponent { } diff --git a/src/showcase/nz-demo-calendar/nz-demo-calendar-content.component.ts b/src/showcase/nz-demo-calendar/nz-demo-calendar-content.component.ts index a5922b4a45..279f66e747 100644 --- a/src/showcase/nz-demo-calendar/nz-demo-calendar-content.component.ts +++ b/src/showcase/nz-demo-calendar/nz-demo-calendar-content.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-calendar-content', @@ -14,11 +14,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCalendarContentComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoCalendarContentComponent { } diff --git a/src/showcase/nz-demo-calendar/nz-demo-calendar-locale.component.ts b/src/showcase/nz-demo-calendar/nz-demo-calendar-locale.component.ts index c7f6b65fa4..d58b418573 100644 --- a/src/showcase/nz-demo-calendar/nz-demo-calendar-locale.component.ts +++ b/src/showcase/nz-demo-calendar/nz-demo-calendar-locale.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-calendar-locale', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCalendarLocaleComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoCalendarLocaleComponent { } diff --git a/src/showcase/nz-demo-calendar/nz-demo-calendar.component.ts b/src/showcase/nz-demo-calendar/nz-demo-calendar.component.ts index b0a92e9cf0..9952702d2d 100644 --- a/src/showcase/nz-demo-calendar/nz-demo-calendar.component.ts +++ b/src/showcase/nz-demo-calendar/nz-demo-calendar.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-calendar', @@ -8,15 +8,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-calendar.less', ] }) -export class NzDemoCalendarComponent implements OnInit { +export class NzDemoCalendarComponent { NzDemoCalendarBasicCode = require('!!raw-loader!./nz-demo-calendar-basic.component'); NzDemoCalendarLocaleCode = require('!!raw-loader!./nz-demo-calendar-locale.component'); NzDemoCalendarCardCode = require('!!raw-loader!./nz-demo-calendar-card.component'); NzDemoCalendarContentCode = require('!!raw-loader!./nz-demo-calendar-content.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-calendar/nz-demo-calendar.module.ts b/src/showcase/nz-demo-calendar/nz-demo-calendar.module.ts index 00109a172f..edcebc2e60 100644 --- a/src/showcase/nz-demo-calendar/nz-demo-calendar.module.ts +++ b/src/showcase/nz-demo-calendar/nz-demo-calendar.module.ts @@ -17,7 +17,6 @@ import { NzDemoCalendarRoutingModule } from './nz-demo-calendar.routing.module'; imports : [ NzDemoCalendarRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoCalendarComponent, NzDemoCalendarBasicComponent, NzDemoCalendarCardComponent, NzDemoCalendarLocaleComponent, NzDemoCalendarContentComponent ] }) - export class NzDemoCalendarModule { } diff --git a/src/showcase/nz-demo-card/nz-demo-card-basic.component.ts b/src/showcase/nz-demo-card/nz-demo-card-basic.component.ts index 43ee318630..84f67ed88d 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-basic.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-card-basic', template: ` @@ -18,7 +18,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCardBasicComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoCardBasicComponent { } diff --git a/src/showcase/nz-demo-card/nz-demo-card-border.component.ts b/src/showcase/nz-demo-card/nz-demo-card-border.component.ts index 701bf482d2..dfe7b2397d 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-border.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-border.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-card-border', template: ` @@ -21,7 +21,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCardBorderComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoCardBorderComponent { } diff --git a/src/showcase/nz-demo-card/nz-demo-card-flex.component.ts b/src/showcase/nz-demo-card/nz-demo-card-flex.component.ts index 912cfe1a4d..c582d228a6 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-flex.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-flex.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-card-flex', template: ` @@ -33,9 +33,6 @@ import { Component, OnInit } from '@angular/core'; }` ] }) -export class NzDemoCardFlexComponent implements OnInit { +export class NzDemoCardFlexComponent { bodyStyle = { padding: 0 }; - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-card/nz-demo-card-grid.component.ts b/src/showcase/nz-demo-card/nz-demo-card-grid.component.ts index b6e5b8c3fe..2a99795a4d 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-grid.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-grid.component.ts @@ -40,7 +40,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCardGridComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoCardGridComponent { } diff --git a/src/showcase/nz-demo-card/nz-demo-card-inner.component.ts b/src/showcase/nz-demo-card/nz-demo-card-inner.component.ts index 13a8fb5dc8..aed8986ead 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-inner.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-inner.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-card-inner', template: ` - + 卡片标题
      卡片内容
      @@ -18,11 +18,9 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCardInnerComponent implements OnInit { +export class NzDemoCardInnerComponent { gridStyle = { width: '25%', textAlign: 'center', }; - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-card/nz-demo-card-loading.component.ts b/src/showcase/nz-demo-card/nz-demo-card-loading.component.ts index 4a98eb6d86..7cdcc1c131 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-loading.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-loading.component.ts @@ -1,8 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-card-loading', template: ` - + Card title @@ -13,7 +13,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCardLoadingComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoCardLoadingComponent { } diff --git a/src/showcase/nz-demo-card/nz-demo-card-simple.component.ts b/src/showcase/nz-demo-card/nz-demo-card-simple.component.ts index ff5f97516e..c1cb4449fb 100644 --- a/src/showcase/nz-demo-card/nz-demo-card-simple.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card-simple.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-card-simple', template: ` @@ -12,7 +12,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCardSimpleComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoCardSimpleComponent { } diff --git a/src/showcase/nz-demo-card/nz-demo-card.component.ts b/src/showcase/nz-demo-card/nz-demo-card.component.ts index 02907fd526..4f8563b0db 100644 --- a/src/showcase/nz-demo-card/nz-demo-card.component.ts +++ b/src/showcase/nz-demo-card/nz-demo-card.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-card', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-card.less' ] }) -export class NzDemoCardComponent implements OnInit { +export class NzDemoCardComponent { NzDemoCardBasicCode = require('!!raw-loader!./nz-demo-card-basic.component'); NzDemoCardBorderCode = require('!!raw-loader!./nz-demo-card-border.component'); NzDemoCardSimpleCode = require('!!raw-loader!./nz-demo-card-simple.component'); @@ -16,10 +16,4 @@ export class NzDemoCardComponent implements OnInit { NzDemoCardGridCode = require('!!raw-loader!./nz-demo-card-grid.component'); NzDemoCardLoadingCode = require('!!raw-loader!./nz-demo-card-loading.component'); NzDemoCardInnerCode = require('!!raw-loader!./nz-demo-card-inner.component'); - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-card/nz-demo-card.module.ts b/src/showcase/nz-demo-card/nz-demo-card.module.ts index 9b1ba072f4..74c0374a6a 100644 --- a/src/showcase/nz-demo-card/nz-demo-card.module.ts +++ b/src/showcase/nz-demo-card/nz-demo-card.module.ts @@ -33,7 +33,6 @@ import { NzDemoCardRoutingModule } from './nz-demo-card.routing.module'; NzDemoCardInnerComponent ] }) - export class NzDemoCardModule { } diff --git a/src/showcase/nz-demo-carousel/nz-demo-carousel-auto.component.ts b/src/showcase/nz-demo-carousel/nz-demo-carousel-auto.component.ts index 961bf763b9..12072dd879 100644 --- a/src/showcase/nz-demo-carousel/nz-demo-carousel-auto.component.ts +++ b/src/showcase/nz-demo-carousel/nz-demo-carousel-auto.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'nz-demo-carousel-auto', template: ` - +

      {{index}}

      `, styles : [ @@ -25,12 +25,9 @@ import { Component, OnInit } from '@angular/core'; export class NzDemoCarouselAutoComponent implements OnInit { array = [ 1 ]; - constructor() { - } - ngOnInit() { setTimeout(_ => { this.array = [ 1, 2, 3, 4 ]; - }, 500) + }, 500); } } diff --git a/src/showcase/nz-demo-carousel/nz-demo-carousel-basic.component.ts b/src/showcase/nz-demo-carousel/nz-demo-carousel-basic.component.ts index 657f9a12c1..b2675bc707 100644 --- a/src/showcase/nz-demo-carousel/nz-demo-carousel-basic.component.ts +++ b/src/showcase/nz-demo-carousel/nz-demo-carousel-basic.component.ts @@ -25,12 +25,9 @@ import { Component, OnInit } from '@angular/core'; export class NzDemoCarouselBasicComponent implements OnInit { array = [ 1, 2, 3 ]; - constructor() { - } - ngOnInit() { setTimeout(_ => { this.array = [ 1, 2, 3, 4 ]; - }, 500) + }, 500); } } diff --git a/src/showcase/nz-demo-carousel/nz-demo-carousel-fade.component.ts b/src/showcase/nz-demo-carousel/nz-demo-carousel-fade.component.ts index 398ef8e260..fb4a1305f1 100644 --- a/src/showcase/nz-demo-carousel/nz-demo-carousel-fade.component.ts +++ b/src/showcase/nz-demo-carousel/nz-demo-carousel-fade.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; + @Component({ selector: 'nz-demo-carousel-fade', template: ` @@ -22,12 +23,10 @@ import { Component, OnInit } from '@angular/core'; }) export class NzDemoCarouselFadeComponent implements OnInit { array = []; - constructor() { - } ngOnInit() { setTimeout(_ => { this.array = [ 1, 2, 3, 4 ]; - }, 500) + }, 500); } } diff --git a/src/showcase/nz-demo-carousel/nz-demo-carousel-vertical.component.ts b/src/showcase/nz-demo-carousel/nz-demo-carousel-vertical.component.ts index eba122b654..3868911cb9 100644 --- a/src/showcase/nz-demo-carousel/nz-demo-carousel-vertical.component.ts +++ b/src/showcase/nz-demo-carousel/nz-demo-carousel-vertical.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'nz-demo-carousel-vertical', template: ` - +

      {{index}}

      `, styles : [ @@ -25,12 +25,9 @@ import { Component, OnInit } from '@angular/core'; export class NzDemoCarouselVerticalComponent implements OnInit { array = [ 1, 2, 3 ]; // try dynamic change the array - constructor() { - } - ngOnInit() { setTimeout(() => { this.array = [ 1, 2, 3, 4 ]; - }, 500) + }, 500); } } diff --git a/src/showcase/nz-demo-carousel/nz-demo-carousel.component.ts b/src/showcase/nz-demo-carousel/nz-demo-carousel.component.ts index 20394eba23..80d73fce7c 100644 --- a/src/showcase/nz-demo-carousel/nz-demo-carousel.component.ts +++ b/src/showcase/nz-demo-carousel/nz-demo-carousel.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-carousel', @@ -8,16 +8,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-carousel.less' ] }) -export class NzDemoCarouselComponent implements OnInit { +export class NzDemoCarouselComponent { NzDemoCarouselBasicCode = require('!!raw-loader!./nz-demo-carousel-basic.component'); NzDemoCarouselVerticalCode = require('!!raw-loader!./nz-demo-carousel-vertical.component'); NzDemoCarouselFadeCode = require('!!raw-loader!./nz-demo-carousel-fade.component'); NzDemoCarouselAutoCode = require('!!raw-loader!./nz-demo-carousel-auto.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-carousel/nz-demo-carousel.module.ts b/src/showcase/nz-demo-carousel/nz-demo-carousel.module.ts index 45dd60bec5..2da8fd0992 100644 --- a/src/showcase/nz-demo-carousel/nz-demo-carousel.module.ts +++ b/src/showcase/nz-demo-carousel/nz-demo-carousel.module.ts @@ -27,7 +27,6 @@ import { NzDemoCarouselRoutingModule } from './nz-demo-carousel.routing.module'; NzDemoCarouselAutoComponent ] }) - export class NzDemoCarouselModule { } diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-basic.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-basic.component.ts index 0c6ccd0e61..bb1402e190 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-basic.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-basic.component.ts @@ -91,9 +91,6 @@ export class NzDemoCascaderBasicComponent implements OnInit { console.log(value); } - constructor() { - } - ngOnInit() { // let's set nzOptions in a asynchronous way setTimeout(() => { diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-change-on-select.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-change-on-select.component.ts index 0b4da2466a..55464306bd 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-change-on-select.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-change-on-select.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -35,7 +35,7 @@ const options = [{ selector: 'nz-demo-cascader-change-on-select', template: ` `, styles : [] }) -export class NzDemoCascaderChangeOnSelectComponent implements OnInit { +export class NzDemoCascaderChangeOnSelectComponent { /** init data */ _options = options; @@ -52,11 +52,4 @@ export class NzDemoCascaderChangeOnSelectComponent implements OnInit { _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-render.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-render.component.ts index 4515364dbb..6222e7268a 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-render.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-render.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewChild, TemplateRef} from '@angular/core'; +import {Component, ViewChild, TemplateRef} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -54,7 +54,7 @@ const options = [{       `, styles : [] }) -export class NzDemoCascaderCustomRenderComponent implements OnInit { +export class NzDemoCascaderCustomRenderComponent { /** init data */ _options = options; @@ -66,12 +66,6 @@ export class NzDemoCascaderCustomRenderComponent implements OnInit { console.log(value); } - constructor() { - } - - ngOnInit() { - } - get _displayRender(): Function { return this.displayRender.bind(this); } @@ -85,6 +79,4 @@ export class NzDemoCascaderCustomRenderComponent implements OnInit { e.stopPropagation(); console.log('clicked', label, option); } - } - diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-trigger.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-trigger.component.ts index 87ae55631f..0dc59cbbb2 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-trigger.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-custom-trigger.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -47,7 +47,7 @@ const options = [{ `, styles : [] }) -export class NzDemoCascaderCustomTriggerComponent implements OnInit { +export class NzDemoCascaderCustomTriggerComponent { /** init data */ _options = options; @@ -62,11 +62,5 @@ export class NzDemoCascaderCustomTriggerComponent implements OnInit { onSelectionChange(selectedOptions: any[]): void { this._text = selectedOptions.map(o => o.label).join(', '); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-default-value.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-default-value.component.ts index 608ce17e26..71f430bff9 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-default-value.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-default-value.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -42,7 +42,7 @@ const options = [{ `, styles : [] }) -export class NzDemoCascaderDefaultValueComponent implements OnInit { +export class NzDemoCascaderDefaultValueComponent { /** init data */ _options = options; @@ -62,11 +62,5 @@ export class NzDemoCascaderDefaultValueComponent implements OnInit { _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-disabled.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-disabled.component.ts index a7c310f8c1..e66fe60dd6 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-disabled.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-disabled.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -43,7 +43,7 @@ const options = [{ `, styles : [] }) -export class NzDemoCascaderDisabledComponent implements OnInit { +export class NzDemoCascaderDisabledComponent { /** init data */ _options = options; @@ -52,11 +52,5 @@ export class NzDemoCascaderDisabledComponent implements OnInit { _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-hover.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-hover.component.ts index c73d745a6d..ca830841d3 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-hover.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-hover.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -43,7 +43,7 @@ const options = [{ `, styles : [] }) -export class NzDemoCascaderHoverComponent implements OnInit { +export class NzDemoCascaderHoverComponent { /** init data */ _options = options; @@ -52,11 +52,5 @@ export class NzDemoCascaderHoverComponent implements OnInit { _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-lazy.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-lazy.component.ts index ceeed274c6..c5ba4e625b 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-lazy.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-lazy.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const provinces = [{ value: 'zhejiang', @@ -48,7 +48,7 @@ const scenicspots = { `, styles : [] }) -export class NzDemoCascaderLazyComponent implements OnInit { +export class NzDemoCascaderLazyComponent { _value: any[] = null; @@ -56,12 +56,6 @@ export class NzDemoCascaderLazyComponent implements OnInit { console.log(value); } - constructor() { - } - - ngOnInit() { - } - /** load data async */ loadData(e: {option: any, index: number, resolve: Function, reject: Function}): void { if (e.index === -1) { diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader-size.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader-size.component.ts index 4a76d559b5..ab99445ccc 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader-size.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader-size.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const options = [{ value: 'zhejiang', @@ -59,7 +59,7 @@ const options = [{ `, styles : [] }) -export class NzDemoCascaderSizeComponent implements OnInit { +export class NzDemoCascaderSizeComponent { /** init data */ _options = options; @@ -70,11 +70,5 @@ export class NzDemoCascaderSizeComponent implements OnInit { _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader.component.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader.component.ts index 9824c9054c..3705fa9868 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader.component.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ @@ -9,7 +9,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-cascader.less', ] }) -export class NzDemoCascaderComponent implements OnInit { +export class NzDemoCascaderComponent { NzDemoCascaderBasicCode = require('!!raw-loader!./nz-demo-cascader-basic.component'); NzDemoCascaderCustomTriggerCode = require('!!raw-loader!./nz-demo-cascader-custom-trigger.component'); NzDemoCascaderDisabledCode = require('!!raw-loader!./nz-demo-cascader-disabled.component'); @@ -20,11 +20,4 @@ export class NzDemoCascaderComponent implements OnInit { NzDemoCascaderCustomRenderCode = require('!!raw-loader!./nz-demo-cascader-custom-render.component'); NzDemoCascaderLazyCode = require('!!raw-loader!./nz-demo-cascader-lazy.component'); NzDemoCascaderReactiveFormCode = require('!!raw-loader!./nz-demo-cascader-reactive-form.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-cascader/nz-demo-cascader.module.ts b/src/showcase/nz-demo-cascader/nz-demo-cascader.module.ts index 9fc3d4a4f1..7daf992e19 100644 --- a/src/showcase/nz-demo-cascader/nz-demo-cascader.module.ts +++ b/src/showcase/nz-demo-cascader/nz-demo-cascader.module.ts @@ -34,7 +34,6 @@ import { NzDemoCascaderRoutingModule } from './nz-demo-cascader.routing.module'; NzDemoCascaderReactiveFormComponent ] }) - export class NzDemoCascaderModule { } diff --git a/src/showcase/nz-demo-checkbox/nz-demo-checkbox-basic.component.ts b/src/showcase/nz-demo-checkbox/nz-demo-checkbox-basic.component.ts index 6b206cd434..6d32218236 100644 --- a/src/showcase/nz-demo-checkbox/nz-demo-checkbox-basic.component.ts +++ b/src/showcase/nz-demo-checkbox/nz-demo-checkbox-basic.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-checkbox-basic', @@ -8,17 +8,11 @@ import {Component, OnInit} from '@angular/core'; `, styles : [] }) -export class NzDemoCheckboxBasicComponent implements OnInit { +export class NzDemoCheckboxBasicComponent { _checked = true; _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-checkbox/nz-demo-checkbox-controller.component.ts b/src/showcase/nz-demo-checkbox/nz-demo-checkbox-controller.component.ts index 2b78579334..b54e6c6739 100644 --- a/src/showcase/nz-demo-checkbox/nz-demo-checkbox-controller.component.ts +++ b/src/showcase/nz-demo-checkbox/nz-demo-checkbox-controller.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-checkbox-controller', @@ -19,7 +19,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoCheckboxControllerComponent implements OnInit { +export class NzDemoCheckboxControllerComponent { isCheckedButton = true; isDisabledButton = false; checkButton = () => { @@ -28,11 +28,4 @@ export class NzDemoCheckboxControllerComponent implements OnInit { disableButton = () => { this.isDisabledButton = !this.isDisabledButton; }; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-checkbox/nz-demo-checkbox-disabled.component.ts b/src/showcase/nz-demo-checkbox/nz-demo-checkbox-disabled.component.ts index 870d18f032..a3e3a42dd8 100644 --- a/src/showcase/nz-demo-checkbox/nz-demo-checkbox-disabled.component.ts +++ b/src/showcase/nz-demo-checkbox/nz-demo-checkbox-disabled.component.ts @@ -1,20 +1,14 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-checkbox-disabled', template: ` -
    - + DropDown
    • @@ -62,14 +62,8 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoDropDownButtonComponent implements OnInit { +export class NzDemoDropDownButtonComponent { log(e) { console.log('click dropdown button'); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-cascading.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-cascading.component.ts index 0e59d35bd2..af5cb6a2cd 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-cascading.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-cascading.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-dropdown-cascading', template: ` @@ -20,10 +20,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoDropDownCascadingComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoDropDownCascadingComponent { } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-click.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-click.component.ts index 8e88298b89..446400332e 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-click.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-click.component.ts @@ -15,10 +15,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoDropDownClickComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoDropDownClickComponent { } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-hide.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-hide.component.ts index e7aa591ed7..80de029698 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-hide.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-hide.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-dropdown-hide', @@ -15,12 +15,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoDropDownHideComponent implements OnInit { +export class NzDemoDropDownHideComponent { visible = false; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-other.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-other.component.ts index 0f2a2db2e9..07f72bc661 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-other.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-other.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-dropdown-other', @@ -15,15 +15,9 @@ import { Component, OnInit } from '@angular/core'; 2nd menu item
    • -
    • 3rd menu item（disabled）
      • +
    • 3rd menu item（disabled）
    `, styles : [] }) -export class NzDemoDropDownOtherComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoDropDownOtherComponent { } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-position.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-position.component.ts index 43c446249f..3c2addced5 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-position.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-position.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-dropdown-position', @@ -91,10 +91,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoDropDownPositionComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoDropDownPositionComponent { } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-trigger.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-trigger.component.ts index ecabff297a..7eab6be029 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown-trigger.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown-trigger.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-dropdown-trigger', template: ` @@ -14,14 +14,8 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoDropDownTriggerComponent implements OnInit { +export class NzDemoDropDownTriggerComponent { log(data) { console.log(data); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown.component.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown.component.ts index a0c34e7f00..a6e82627e5 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown.component.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-dropdown', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-dropdown.less' ] }) -export class NzDemoDropDownComponent implements OnInit { +export class NzDemoDropDownComponent { NzDemoDropDownBasicCode = require('!!raw-loader!./nz-demo-dropdown-basic.component'); NzDemoDropDownOtherCode = require('!!raw-loader!./nz-demo-dropdown-other.component'); NzDemoDropDownTriggerCode = require('!!raw-loader!./nz-demo-dropdown-trigger.component'); @@ -17,11 +17,5 @@ export class NzDemoDropDownComponent implements OnInit { NzDemoDropDownClickCode = require('!!raw-loader!./nz-demo-dropdown-click.component'); NzDemoDropDownHideCode = require('!!raw-loader!./nz-demo-dropdown-hide.component'); NzDemoDropDownButtonCode = require('!!raw-loader!./nz-demo-dropdown-button.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-dropdown/nz-demo-dropdown.module.ts b/src/showcase/nz-demo-dropdown/nz-demo-dropdown.module.ts index 65be74b0d2..8f3a88401e 100644 --- a/src/showcase/nz-demo-dropdown/nz-demo-dropdown.module.ts +++ b/src/showcase/nz-demo-dropdown/nz-demo-dropdown.module.ts @@ -35,7 +35,6 @@ import { NzDemoDropDownRoutingModule } from './nz-demo-dropdown.routing.module'; NzDemoDropDownButtonComponent ] }) - export class NzDemoDropDownModule { } diff --git a/src/showcase/nz-demo-form/nz-demo-form-horizontal.component.ts b/src/showcase/nz-demo-form/nz-demo-form-horizontal.component.ts index 9a91e2e432..1008c3bd55 100644 --- a/src/showcase/nz-demo-form/nz-demo-form-horizontal.component.ts +++ b/src/showcase/nz-demo-form/nz-demo-form-horizontal.component.ts @@ -59,7 +59,7 @@ import {
    - + diff --git a/src/showcase/nz-demo-form/nz-demo-form-validate-dynamic.component.ts b/src/showcase/nz-demo-form/nz-demo-form-validate-dynamic.component.ts index 294e225995..71dcceb813 100644 --- a/src/showcase/nz-demo-form/nz-demo-form-validate-dynamic.component.ts +++ b/src/showcase/nz-demo-form/nz-demo-form-validate-dynamic.component.ts @@ -159,7 +159,7 @@ export class NzDemoFormValidateDynamicComponent implements OnInit { passwordConfirmation: [ '', [ this.passwordConfirmationValidator ] ], comment : [ '', [ Validators.required ] ] }); - }; + } ngOnInit() { } diff --git a/src/showcase/nz-demo-form/nz-demo-form.component.ts b/src/showcase/nz-demo-form/nz-demo-form.component.ts index 4e4d81b4c2..60f57e714b 100644 --- a/src/showcase/nz-demo-form/nz-demo-form.component.ts +++ b/src/showcase/nz-demo-form/nz-demo-form.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-form', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-form.less', ] }) -export class NzDemoFormComponent implements OnInit { +export class NzDemoFormComponent { NzDemoFormInlineCode = require('!!raw-loader!./nz-demo-form-inline.component'); NzDemoFormLayoutCode = require('!!raw-loader!./nz-demo-form-layout.component'); NzDemoFormHorizontalCode = require('!!raw-loader!./nz-demo-form-horizontal.component'); @@ -18,10 +18,4 @@ export class NzDemoFormComponent implements OnInit { NzDemoFormAdvancedCode = require('!!raw-loader!./nz-demo-form-advanced.component'); NzDemoFormDynamicCode = require('!!raw-loader!./nz-demo-form-dynamic.component'); NzDemoFormLoginCode = require('!!raw-loader!./nz-demo-form-login.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-form/nz-demo-form.module.ts b/src/showcase/nz-demo-form/nz-demo-form.module.ts index 3160a8b8e7..cfeba6efff 100644 --- a/src/showcase/nz-demo-form/nz-demo-form.module.ts +++ b/src/showcase/nz-demo-form/nz-demo-form.module.ts @@ -23,7 +23,6 @@ import { NzDemoFormRoutingModule } from './nz-demo-form.routing.module'; imports : [ NzDemoFormRoutingModule, CommonModule, ReactiveFormsModule, FormsModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoFormLayoutComponent, NzDemoFormDynamicComponent, NzDemoFormLoginComponent, NzDemoFormComponent, NzDemoFormInlineComponent, NzDemoFormHorizontalComponent, NzDemoFormMixComponent, NzDemoFormValidateComponent, NzDemoFormValidateDynamicComponent, NzDemoFormAdvancedComponent ] }) - export class NzDemoFormModule { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-basic.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-basic.component.ts index 134448bb4b..2b0f503d05 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-basic.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-basic', @@ -38,11 +38,4 @@ import { Component, OnInit } from '@angular/core';
    `, styles : [] }) -export class NzDemoGridBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridBasicComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-flex-align.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-flex-align.component.ts index fa1eed9b71..6c55d17e82 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-flex-align.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-flex-align.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-flex-align', @@ -52,11 +52,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoGridFlexAlignComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridFlexAlignComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-flex-order.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-flex-order.component.ts index 8273e33098..b00c926ec5 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-flex-order.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-flex-order.component.ts @@ -14,13 +14,9 @@ import { Component, OnInit } from '@angular/core'; export class NzDemoGridFlexOrderComponent implements OnInit { orderList = [ 1, 2, 3, 4 ]; - constructor() { - } - ngOnInit() { setTimeout(_ => { this.orderList = [ ...this.orderList.reverse() ]; }, 10000) } } - diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-flex.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-flex.component.ts index 814ccb98ba..d711b7dc6d 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-flex.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-flex.component.ts @@ -82,11 +82,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoGridFlexComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridFlexComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-gutter-config.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-gutter-config.component.ts index b9602287cf..672a8cfba5 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-gutter-config.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-gutter-config.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-gutter-config', @@ -33,7 +33,7 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoGridGutterConfigComponent implements OnInit { +export class NzDemoGridGutterConfigComponent { gutter = 16; count = 4; marksGutter = { @@ -56,12 +56,4 @@ export class NzDemoGridGutterConfigComponent implements OnInit { generateArray(value) { return new Array(value); } - - constructor() { - } - - ngOnInit() { - } - } - diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-gutter.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-gutter.component.ts index fdf3e70625..0526a949ab 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-gutter.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-gutter.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-gutter', @@ -27,11 +27,4 @@ import { Component, OnInit } from '@angular/core'; }` ] }) -export class NzDemoGridGutterComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridGutterComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-offset.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-offset.component.ts index 989fd5afa0..3d2bfafb1c 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-offset.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-offset.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-offset', @@ -27,11 +27,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoGridOffsetComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridOffsetComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-responsive-more.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-responsive-more.component.ts index aff3901538..2061719d07 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-responsive-more.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-responsive-more.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-responsive-more', @@ -16,11 +16,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoGridResponsiveMoreComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridResponsiveMoreComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-responsive.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-responsive.component.ts index 935836b61a..5e1d0f2860 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-responsive.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-responsive.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-responsive', @@ -16,11 +16,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoGridResponsiveComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridResponsiveComponent { } \ No newline at end of file diff --git a/src/showcase/nz-demo-grid/nz-demo-grid-sort.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid-sort.component.ts index 24581f0085..189a7b4ac4 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid-sort.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid-sort.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-grid-sort', @@ -14,11 +14,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoGridSortComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoGridSortComponent { } diff --git a/src/showcase/nz-demo-grid/nz-demo-grid.component.ts b/src/showcase/nz-demo-grid/nz-demo-grid.component.ts index a92eacf7cd..9c17a59856 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid.component.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-grid', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-grid.less', ] }) -export class NzDemoGridComponent implements OnInit { +export class NzDemoGridComponent { NzDemoGridBasicCode = require('!!raw-loader!./nz-demo-grid-basic.component'); NzDemoGridGutterCode = require('!!raw-loader!./nz-demo-grid-gutter.component'); NzDemoGridGutterConfigCode = require('!!raw-loader!./nz-demo-grid-gutter-config.component'); @@ -19,11 +19,4 @@ export class NzDemoGridComponent implements OnInit { NzDemoGridFlexOrderCode = require('!!raw-loader!./nz-demo-grid-flex-order.component'); NzDemoGridResponsiveCode = require('!!raw-loader!./nz-demo-grid-responsive.component'); NzDemoGridResponsiveMoreCode = require('!!raw-loader!./nz-demo-grid-responsive-more.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-grid/nz-demo-grid.module.ts b/src/showcase/nz-demo-grid/nz-demo-grid.module.ts index dec3db80f6..cda8e5a2a9 100644 --- a/src/showcase/nz-demo-grid/nz-demo-grid.module.ts +++ b/src/showcase/nz-demo-grid/nz-demo-grid.module.ts @@ -23,7 +23,6 @@ import { NzDemoGridRoutingModule } from './nz-demo-grid.routing.module'; imports : [ NzDemoGridRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoGridResponsiveMoreComponent, NzDemoGridGutterConfigComponent, NzDemoGridFlexOrderComponent, NzDemoGridBasicComponent, NzDemoGridGutterComponent, NzDemoGridOffsetComponent, NzDemoGridSortComponent, NzDemoGridFlexComponent, NzDemoGridFlexAlignComponent, NzDemoGridResponsiveComponent, NzDemoGridComponent ] }) - export class NzDemoGridModule { } diff --git a/src/showcase/nz-demo-icon/nz-demo-icon.component.ts b/src/showcase/nz-demo-icon/nz-demo-icon.component.ts index baefa258b6..fa7bcb4f9d 100644 --- a/src/showcase/nz-demo-icon/nz-demo-icon.component.ts +++ b/src/showcase/nz-demo-icon/nz-demo-icon.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ChangeDetectionStrategy } from '@angular/core'; @Component({ selector : 'nz-demo-icon', @@ -8,7 +8,7 @@ import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; './nz-demo-icon.less', ] }) -export class NzDemoIconComponent implements OnInit { +export class NzDemoIconComponent { _markdownCode = require('!!raw-loader!./README.md'); _icons = { direction : [ 'step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrows-alt', 'down', 'up', 'left', 'right', 'caret-up', 'caret-down', 'caret-left', 'caret-right', 'up-circle', 'down-circle', 'left-circle', 'right-circle', 'up-circle-o', 'down-circle-o', 'right-circle-o', 'left-circle-o', 'double-right', 'double-left', 'verticle-left', 'verticle-right', 'forward', 'backward', 'rollback', 'enter', 'retweet', 'swap', 'swap-left', 'swap-right', 'arrow-up', 'arrow-down', 'arrow-left', 'arrow-right', 'play-circle', 'play-circle-o', 'up-square', 'down-square', 'left-square', 'right-square', 'up-square-o', 'down-square-o', 'left-square-o', 'right-square-o', 'login', 'logout', 'menu-fold', 'menu-unfold' ], @@ -16,10 +16,4 @@ export class NzDemoIconComponent implements OnInit { logo : [ 'android', 'android-o', 'apple', 'apple-o', 'windows', 'windows-o', 'ie', 'chrome', 'github', 'aliwangwang', 'aliwangwang-o', 'dingding', 'dingding-o' ], other : [ 'lock', 'unlock', 'area-chart', 'pie-chart', 'bar-chart', 'dot-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'code-o', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'edit', 'ellipsis', 'file', 'file-text', 'file-unknown', 'file-pdf', 'file-excel', 'file-jpg', 'file-ppt', 'file-add', 'folder', 'folder-open', 'folder-add', 'hdd', 'frown', 'frown-o', 'meh', 'meh-o', 'smile', 'smile-o', 'inbox', 'laptop', 'appstore-o', 'appstore', 'line-chart', 'link', 'mail', 'mobile', 'notification', 'paper-clip', 'picture', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'tablet', 'tag', 'tag-o', 'tags', 'tags-o', 'to-top', 'upload', 'user', 'video-camera', 'home', 'loading', 'loading-3-quarters', 'cloud-upload-o', 'cloud-download-o', 'cloud-upload', 'cloud-o', 'star-o', 'star', 'heart-o', 'heart', 'environment', 'environment-o', 'eye', 'eye-o', 'camera', 'camera-o', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customer-service', 'qrcode', 'scan', 'like', 'like-o', 'dislike', 'dislike-o', 'message', 'pay-circle', 'pay-circle-o', 'calculator', 'pushpin', 'pushpin-o', 'bulb', 'select', 'switcher', 'rocket', 'bell', 'disconnect', 'database', 'compass', 'barcode', 'hourglass', 'key', 'flag', 'layout', 'printer', 'sound', 'usb', 'skin', 'tool', 'sync', 'wifi', 'car', 'schedule', 'user-add', 'user-delete', 'usergroup-add', 'usergroup-delete', 'man', 'woman', 'shop', 'gift', 'idcard', 'medicine-box', 'red-envelope', 'coffee', 'copyright', 'trademark', 'safety', 'wallet', 'bank', 'trophy', 'contacts', 'global', 'shake', 'api', 'fork' ], }; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-icon/nz-demo-icon.module.ts b/src/showcase/nz-demo-icon/nz-demo-icon.module.ts index 59e17ef174..4ede5ba01f 100644 --- a/src/showcase/nz-demo-icon/nz-demo-icon.module.ts +++ b/src/showcase/nz-demo-icon/nz-demo-icon.module.ts @@ -14,7 +14,6 @@ import { NgZorroAntdModule } from '../../../index.showcase'; imports : [ NzDemoIconRoutingModule, NzMarkdownModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoIconComponent, NzIconCopyDirective ] }) - export class NzDemoIconModule { } diff --git a/src/showcase/nz-demo-input-number/nz-demo-input-number-basic.component.ts b/src/showcase/nz-demo-input-number/nz-demo-input-number-basic.component.ts index 6df914ff25..674f506fcd 100644 --- a/src/showcase/nz-demo-input-number/nz-demo-input-number-basic.component.ts +++ b/src/showcase/nz-demo-input-number/nz-demo-input-number-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-number-basic', @@ -8,13 +8,7 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputNumberBasicComponent implements OnInit { +export class NzDemoInputNumberBasicComponent { demoValue = 3; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-input-number/nz-demo-input-number-digit.component.ts b/src/showcase/nz-demo-input-number/nz-demo-input-number-digit.component.ts index dec23af699..085763d1e0 100644 --- a/src/showcase/nz-demo-input-number/nz-demo-input-number-digit.component.ts +++ b/src/showcase/nz-demo-input-number/nz-demo-input-number-digit.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-number-digit', @@ -7,13 +7,6 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputNumberDigitComponent implements OnInit { +export class NzDemoInputNumberDigitComponent { demoValue: number; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input-number/nz-demo-input-number-disabled.component.ts b/src/showcase/nz-demo-input-number/nz-demo-input-number-disabled.component.ts index 95b2be8575..ae760f7c96 100644 --- a/src/showcase/nz-demo-input-number/nz-demo-input-number-disabled.component.ts +++ b/src/showcase/nz-demo-input-number/nz-demo-input-number-disabled.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-number-disabled', @@ -12,17 +12,11 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputNumberDisabledComponent implements OnInit { +export class NzDemoInputNumberDisabledComponent { demoValue = 3; isDisabled = false; toggleDisabled = () => { this.isDisabled = !this.isDisabled; - } - - constructor() { - } - - ngOnInit() { - } + }; } diff --git a/src/showcase/nz-demo-input-number/nz-demo-input-number-size.component.ts b/src/showcase/nz-demo-input-number/nz-demo-input-number-size.component.ts index d93d54c7ac..41288cee47 100644 --- a/src/showcase/nz-demo-input-number/nz-demo-input-number-size.component.ts +++ b/src/showcase/nz-demo-input-number/nz-demo-input-number-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-number-size', @@ -9,13 +9,6 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputNumberSizeComponent implements OnInit { +export class NzDemoInputNumberSizeComponent { demoValue = 3; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input-number/nz-demo-input-number.component.ts b/src/showcase/nz-demo-input-number/nz-demo-input-number.component.ts index 0fed996aaf..d4951f3e78 100644 --- a/src/showcase/nz-demo-input-number/nz-demo-input-number.component.ts +++ b/src/showcase/nz-demo-input-number/nz-demo-input-number.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-input-number', @@ -8,15 +8,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-input-number.less', ] }) -export class NzDemoInputNumberComponent implements OnInit { +export class NzDemoInputNumberComponent { NzDemoInputNumberBasicCode = require('!!raw-loader!./nz-demo-input-number-basic.component'); NzDemoInputNumberDigitCode = require('!!raw-loader!./nz-demo-input-number-digit.component'); NzDemoInputNumberSizeCode = require('!!raw-loader!./nz-demo-input-number-size.component'); NzDemoInputNumberDisabledCode = require('!!raw-loader!./nz-demo-input-number-disabled.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-input-number/nz-demo-input-number.module.ts b/src/showcase/nz-demo-input-number/nz-demo-input-number.module.ts index b23c47f98f..828f0d316c 100644 --- a/src/showcase/nz-demo-input-number/nz-demo-input-number.module.ts +++ b/src/showcase/nz-demo-input-number/nz-demo-input-number.module.ts @@ -17,7 +17,6 @@ import { NzDemoInputNumberRoutingModule } from './nz-demo-input-number.routing.m imports : [ NzDemoInputNumberRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoInputNumberBasicComponent, NzDemoInputNumberSizeComponent, NzDemoInputNumberDisabledComponent, NzDemoInputNumberDigitComponent, NzDemoInputNumberComponent ] }) - export class NzDemoInputNumberModule { } diff --git a/src/showcase/nz-demo-input/nz-demo-input-add-on.component.ts b/src/showcase/nz-demo-input/nz-demo-input-add-on.component.ts index 21995cece4..214eff93b4 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-add-on.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-add-on.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-add-on', @@ -33,13 +33,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoInputAddOnComponent implements OnInit { +export class NzDemoInputAddOnComponent { siteName = 'mysite'; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input-affix.component.ts b/src/showcase/nz-demo-input/nz-demo-input-affix.component.ts index 837497443c..67353772a6 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-affix.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-affix.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-affix', @@ -11,11 +11,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoInputAffixComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoInputAffixComponent { } diff --git a/src/showcase/nz-demo-input/nz-demo-input-basic.component.ts b/src/showcase/nz-demo-input/nz-demo-input-basic.component.ts index e07901b87a..8fe3af0b0d 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-basic.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-basic', @@ -8,17 +8,10 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputBasicComponent implements OnInit { +export class NzDemoInputBasicComponent { inputValue: string; _console(value) { console.log(value); } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input-group.component.ts b/src/showcase/nz-demo-input/nz-demo-input-group.component.ts index bad889c976..d5c248dec9 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-group.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-group.component.ts @@ -12,12 +12,12 @@ import { Component, OnInit } from '@angular/core';
    - +
    - + @@ -25,7 +25,7 @@ import { Component, OnInit } from '@angular/core';
    - + @@ -34,12 +34,12 @@ import { Component, OnInit } from '@angular/core';
    - +
    - + @@ -50,7 +50,7 @@ import { Component, OnInit } from '@angular/core';
    - + @@ -60,7 +60,7 @@ import { Component, OnInit } from '@angular/core';
    - + @@ -71,15 +71,8 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputGroupComponent implements OnInit { +export class NzDemoInputGroupComponent { _valueOne = '0571'; _valueTwo = '26888888'; date = new Date(); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input-search.component.ts b/src/showcase/nz-demo-input/nz-demo-input-search.component.ts index 1367682359..be9432f495 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-search.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-search.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-search', @@ -8,13 +8,6 @@ import { Component, OnInit } from '@angular/core'; styles: [] }) -export class NzDemoInputSearchComponent implements OnInit { +export class NzDemoInputSearchComponent { _value: string; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input-size.component.ts b/src/showcase/nz-demo-input/nz-demo-input-size.component.ts index 95c82f7b7d..9c0c0fd217 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-size.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-size', @@ -18,13 +18,6 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoInputSizeComponent implements OnInit { +export class NzDemoInputSizeComponent { inputValue: string; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input-textarea-auot-size.component.ts b/src/showcase/nz-demo-input/nz-demo-input-textarea-auot-size.component.ts index abdd1e5bf0..01f9801642 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-textarea-auot-size.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-textarea-auot-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-textarea-auot-size', @@ -10,18 +10,11 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoInputTextareaAutoSizeComponent implements OnInit { +export class NzDemoInputTextareaAutoSizeComponent { inputValueOne: string; inputValueTwo: string; autosize = { minRows: 2, maxRows: 6 }; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input-textarea.component.ts b/src/showcase/nz-demo-input/nz-demo-input-textarea.component.ts index 23c455a091..5af1d7c96d 100644 --- a/src/showcase/nz-demo-input/nz-demo-input-textarea.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input-textarea.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-input-textarea', @@ -6,13 +6,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoInputTextareaComponent implements OnInit { +export class NzDemoInputTextareaComponent { inputValue: string; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-input/nz-demo-input.component.ts b/src/showcase/nz-demo-input/nz-demo-input.component.ts index f7e6627241..e3fe135568 100644 --- a/src/showcase/nz-demo-input/nz-demo-input.component.ts +++ b/src/showcase/nz-demo-input/nz-demo-input.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-input', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-input.less', ] }) -export class NzDemoInputComponent implements OnInit { +export class NzDemoInputComponent { test; NzDemoInputBasicCode = require('!!raw-loader!./nz-demo-input-basic.component'); NzDemoInputSizeCode = require('!!raw-loader!./nz-demo-input-size.component'); @@ -18,10 +18,4 @@ export class NzDemoInputComponent implements OnInit { NzDemoInputTextareaCode = require('!!raw-loader!./nz-demo-input-textarea.component'); NzDemoInputTextareaAutoSizeCode = require('!!raw-loader!./nz-demo-input-textarea-auot-size.component'); NzDemoInputAffixCode = require('!!raw-loader!./nz-demo-input-affix.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-input/nz-demo-input.module.ts b/src/showcase/nz-demo-input/nz-demo-input.module.ts index 4526e84317..8035793f85 100644 --- a/src/showcase/nz-demo-input/nz-demo-input.module.ts +++ b/src/showcase/nz-demo-input/nz-demo-input.module.ts @@ -21,7 +21,6 @@ import { NzDemoInputRoutingModule } from './nz-demo-input.routing.module'; imports : [ NzDemoInputRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoInputComponent, NzDemoInputBasicComponent, NzDemoInputSizeComponent, NzDemoInputAddOnComponent, NzDemoInputGroupComponent, NzDemoInputSearchComponent, NzDemoInputTextareaComponent, NzDemoInputTextareaAutoSizeComponent, NzDemoInputAffixComponent ] }) - export class NzDemoInputModule { } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-basic.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-basic.component.ts index 7990be1a08..3018123a6b 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-basic.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-basic', @@ -65,10 +65,4 @@ import { Component, OnInit } from '@angular/core'; } ` ] }) -export class NzDemoLayoutBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoLayoutBasicComponent { } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-responsive.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-responsive.component.ts index 2bf16eeb56..9277ee7b7b 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-responsive.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-responsive.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-responsive', @@ -35,12 +35,6 @@ import { Component, OnInit } from '@angular/core'; }` ] }) -export class NzDemoLayoutResponsiveComponent implements OnInit { +export class NzDemoLayoutResponsiveComponent { isCollapsed = false; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-side.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-side.component.ts index 4fcb65b6b7..4a3603ed95 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-side.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-side.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-side', @@ -64,12 +64,6 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoLayoutSideComponent implements OnInit { +export class NzDemoLayoutSideComponent { isCollapsed = true; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-top-side-2.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-top-side-2.component.ts index 542601f529..cbc438c7d0 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-top-side-2.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-top-side-2.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-top-side-2', @@ -66,10 +66,4 @@ import { Component, OnInit } from '@angular/core'; }` ] }) -export class NzDemoLayoutTopSide2Component implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoLayoutTopSide2Component { } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-top-side.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-top-side.component.ts index b46842679d..10166adbc2 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-top-side.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-top-side.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-top-side', @@ -67,11 +67,4 @@ import { Component, OnInit } from '@angular/core'; }` ] }) -export class NzDemoLayoutTopSideComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoLayoutTopSideComponent { } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-top.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-top.component.ts index 5a6e7a6a86..750cd6f669 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-top.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-top.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-top', @@ -35,10 +35,4 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoLayoutTopComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoLayoutTopComponent { } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout-trigger.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout-trigger.component.ts index 00aabf8c7b..32eb3c2784 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout-trigger.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout-trigger.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-layout-trigger', @@ -78,12 +78,6 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoLayoutTriggerComponent implements OnInit { +export class NzDemoLayoutTriggerComponent { isCollapsed = false; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-layout/nz-demo-layout.component.ts b/src/showcase/nz-demo-layout/nz-demo-layout.component.ts index bbdfc9e681..eb280991b8 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout.component.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-layout', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-layout.less' ] }) -export class NzDemoLayoutComponent implements OnInit { +export class NzDemoLayoutComponent { NzDemoLayoutBasicCode = require('!!raw-loader!./nz-demo-layout-basic.component'); NzDemoLayoutTopCode = require('!!raw-loader!./nz-demo-layout-top.component'); NzDemoLayoutTopSide2Code = require('!!raw-loader!./nz-demo-layout-top-side-2.component'); @@ -16,11 +16,4 @@ export class NzDemoLayoutComponent implements OnInit { NzDemoLayoutSideCode = require('!!raw-loader!./nz-demo-layout-side.component'); NzDemoLayoutTriggerCode = require('!!raw-loader!./nz-demo-layout-trigger.component'); NzDemoLayoutResponsiveCode = require('!!raw-loader!./nz-demo-layout-responsive.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-layout/nz-demo-layout.module.ts b/src/showcase/nz-demo-layout/nz-demo-layout.module.ts index ae293f45d7..d23db5fc1e 100644 --- a/src/showcase/nz-demo-layout/nz-demo-layout.module.ts +++ b/src/showcase/nz-demo-layout/nz-demo-layout.module.ts @@ -33,7 +33,6 @@ import { NzDemoLayoutRoutingModule } from './nz-demo-layout.routing.module'; NzDemoLayoutResponsiveComponent ] }) - export class NzDemoLayoutModule { } diff --git a/src/showcase/nz-demo-locale/nz-demo-locale-all.component.ts b/src/showcase/nz-demo-locale/nz-demo-locale-all.component.ts index 1bae7f2c60..3480e3b845 100644 --- a/src/showcase/nz-demo-locale/nz-demo-locale-all.component.ts +++ b/src/showcase/nz-demo-locale/nz-demo-locale-all.component.ts @@ -55,7 +55,7 @@ export class NzDemoLocaleAllComponent implements OnInit {
    - + diff --git a/src/showcase/nz-demo-locale/nz-demo-locale.component.ts b/src/showcase/nz-demo-locale/nz-demo-locale.component.ts index 8fc063fb19..b45ac21c36 100644 --- a/src/showcase/nz-demo-locale/nz-demo-locale.component.ts +++ b/src/showcase/nz-demo-locale/nz-demo-locale.component.ts @@ -1,17 +1,12 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-locale', templateUrl: 'nz-demo-locale.component.html' }) -export class NzDemoLocaleComponent implements OnInit { +export class NzDemoLocaleComponent { markdownContent = require('!!raw-loader!./README.md'); NzDemoLocaleAllCode = require('!!raw-loader!./nz-demo-locale-all.component'); - - constructor() { } - - ngOnInit() { } - } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-basic.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-basic.component.ts index 6fd9ab1c10..64e7056e06 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-basic.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-basic.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-basic', template: `
    • Navigation One
      • -
    • Navigation Two
      • +
    • Navigation Two
    • Navigation Three - Submenu
        @@ -28,10 +28,4 @@ import { Component, OnInit } from '@angular/core';
      `, styles : [] }) -export class NzDemoMenuBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoMenuBasicComponent { } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-collapsed.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-collapsed.component.ts index 5b23afd982..3e88d3acf9 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-collapsed.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-collapsed.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-collapsed', @@ -52,15 +52,9 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoMenuCollapsedComponent implements OnInit { +export class NzDemoMenuCollapsedComponent { isCollapsed = false; - constructor() { - } - - ngOnInit() { - } - toggleCollapsed() { this.isCollapsed = !this.isCollapsed; } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-dynamic.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-dynamic.component.ts index f7961b1354..64e53bc583 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-dynamic.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-dynamic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-dynamic', template: ` @@ -51,12 +51,6 @@ import { Component, OnInit } from '@angular/core';
    `, styles : [] }) -export class NzDemoMenuDynamicComponent implements OnInit { +export class NzDemoMenuDynamicComponent { mode = false; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-expand.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-expand.component.ts index fb0bc10d01..41028984e0 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-expand.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-expand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-expand', template: ` @@ -47,7 +47,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoMenuExpandComponent implements OnInit { +export class NzDemoMenuExpandComponent { isOpenOne = true; isOpenTwo = false; isOpenThree = false; @@ -65,10 +65,4 @@ export class NzDemoMenuExpandComponent implements OnInit { } } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-inline.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-inline.component.ts index f317ea3795..fa7ce4df57 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-inline.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-inline.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-inline', template: ` @@ -48,10 +48,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoMenuInlineComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoMenuInlineComponent { } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-theme.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-theme.component.ts index 4959952acc..7b98a6928a 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-theme.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-theme.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-theme', template: ` @@ -9,7 +9,7 @@ import { Component, OnInit } from '@angular/core';

      -
    • +
    • Navigation One
      • @@ -53,12 +53,6 @@ import { Component, OnInit } from '@angular/core';
      `, styles : [] }) -export class NzDemoMenuThemeComponent implements OnInit { +export class NzDemoMenuThemeComponent { theme = true; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu-vertical.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu-vertical.component.ts index 61bb6d4012..2c74419a06 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu-vertical.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu-vertical.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-menu-vertical', template: ` @@ -47,10 +47,4 @@ import { Component, OnInit } from '@angular/core';
    `, styles : [] }) -export class NzDemoMenuVerticalComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoMenuVerticalComponent { } diff --git a/src/showcase/nz-demo-menu/nz-demo-menu.component.ts b/src/showcase/nz-demo-menu/nz-demo-menu.component.ts index 9983f7299e..951e8ed517 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu.component.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-menu', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-menu.less' ] }) -export class NzDemoMenuComponent implements OnInit { +export class NzDemoMenuComponent { NzDemoMenuBasicCode = require('!!raw-loader!./nz-demo-menu-basic.component'); NzDemoMenuInlineCode = require('!!raw-loader!./nz-demo-menu-inline.component'); NzDemoMenuCollapsedCode = require('!!raw-loader!./nz-demo-menu-collapsed.component'); @@ -16,11 +16,4 @@ export class NzDemoMenuComponent implements OnInit { NzDemoMenuThemeCode = require('!!raw-loader!./nz-demo-menu-theme.component'); NzDemoMenuVerticalCode = require('!!raw-loader!./nz-demo-menu-vertical.component'); NzDemoMenuDynamicCode = require('!!raw-loader!./nz-demo-menu-dynamic.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-menu/nz-demo-menu.module.ts b/src/showcase/nz-demo-menu/nz-demo-menu.module.ts index 2fbe470786..bd679519a2 100644 --- a/src/showcase/nz-demo-menu/nz-demo-menu.module.ts +++ b/src/showcase/nz-demo-menu/nz-demo-menu.module.ts @@ -33,7 +33,6 @@ import { NzDemoMenuRoutingModule } from './nz-demo-menu.routing.module'; NzDemoMenuDynamicComponent ] }) - export class NzDemoMenuModule { } diff --git a/src/showcase/nz-demo-message/nz-demo-message-basic.component.ts b/src/showcase/nz-demo-message/nz-demo-message-basic.component.ts index 0206693eec..cd22f79a3f 100644 --- a/src/showcase/nz-demo-message/nz-demo-message-basic.component.ts +++ b/src/showcase/nz-demo-message/nz-demo-message-basic.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzMessageService} from '../../../index.showcase'; @Component({ @@ -8,14 +8,11 @@ import {NzMessageService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoMessageBasicComponent implements OnInit { +export class NzDemoMessageBasicComponent { constructor(private _message: NzMessageService) { } - ngOnInit() { - } - createBasicMessage() { this._message.info('这是一条普通的提醒'); } diff --git a/src/showcase/nz-demo-message/nz-demo-message-duration.component.ts b/src/showcase/nz-demo-message/nz-demo-message-duration.component.ts index ca0a4438d3..53b0f61466 100644 --- a/src/showcase/nz-demo-message/nz-demo-message-duration.component.ts +++ b/src/showcase/nz-demo-message/nz-demo-message-duration.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzMessageService} from '../../../index.showcase'; @Component({ @@ -8,14 +8,11 @@ import {NzMessageService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoMessageDurationComponent implements OnInit { +export class NzDemoMessageDurationComponent { createBasicMessage = () => { this._message.success('这是一条成功的提示,并将于10秒后消失', {nzDuration: 10000}); }; constructor(private _message: NzMessageService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-message/nz-demo-message-icon.component.ts b/src/showcase/nz-demo-message/nz-demo-message-icon.component.ts index dc35b08428..53428cad0c 100644 --- a/src/showcase/nz-demo-message/nz-demo-message-icon.component.ts +++ b/src/showcase/nz-demo-message/nz-demo-message-icon.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzMessageService} from '../../../index.showcase'; @Component({ @@ -10,14 +10,11 @@ import {NzMessageService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoMessageIconComponent implements OnInit { +export class NzDemoMessageIconComponent { createMessage = (type, text) => { this._message.create(type, `这是一条${text}提示`); }; constructor(private _message: NzMessageService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-message/nz-demo-message-loading.component.ts b/src/showcase/nz-demo-message/nz-demo-message-loading.component.ts index d08e949fc2..2d2b906053 100644 --- a/src/showcase/nz-demo-message/nz-demo-message-loading.component.ts +++ b/src/showcase/nz-demo-message/nz-demo-message-loading.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzMessageService} from '../../../index.showcase'; @Component({ @@ -8,7 +8,7 @@ import {NzMessageService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoMessageLoadingComponent implements OnInit { +export class NzDemoMessageLoadingComponent { _id; createBasicMessage = () => { this._id = this._message.loading('正在执行中', { nzDuration: 0 }).messageId; @@ -18,8 +18,5 @@ export class NzDemoMessageLoadingComponent implements OnInit { }; constructor(private _message: NzMessageService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-message/nz-demo-message.component.ts b/src/showcase/nz-demo-message/nz-demo-message.component.ts index a27283f941..a5de102126 100644 --- a/src/showcase/nz-demo-message/nz-demo-message.component.ts +++ b/src/showcase/nz-demo-message/nz-demo-message.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewEncapsulation} from '@angular/core'; +import {Component, ViewEncapsulation} from '@angular/core'; @Component({ selector : 'nz-demo-message', @@ -8,15 +8,9 @@ import {Component, OnInit, ViewEncapsulation} from '@angular/core'; './nz-demo-message.less', ] }) -export class NzDemoMessageComponent implements OnInit { +export class NzDemoMessageComponent { NzDemoMessageBasicCode = require('!!raw-loader!./nz-demo-message-basic.component'); NzDemoMessageDurationCode = require('!!raw-loader!./nz-demo-message-duration.component'); NzDemoMessageIconCode = require('!!raw-loader!./nz-demo-message-icon.component'); NzDemoMessageLoadingCode = require('!!raw-loader!./nz-demo-message-loading.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-message/nz-demo-message.module.ts b/src/showcase/nz-demo-message/nz-demo-message.module.ts index 9d18411124..9334e00647 100644 --- a/src/showcase/nz-demo-message/nz-demo-message.module.ts +++ b/src/showcase/nz-demo-message/nz-demo-message.module.ts @@ -16,7 +16,6 @@ import { NzDemoMessageRoutingModule } from './nz-demo-message.routing.module'; imports : [ NzDemoMessageRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoMessageBasicComponent, NzDemoMessageDurationComponent, NzDemoMessageIconComponent, NzDemoMessageLoadingComponent, NzDemoMessageComponent ] }) - export class NzDemoMessageModule { } diff --git a/src/showcase/nz-demo-modal/nz-demo-confirm-async.component.ts b/src/showcase/nz-demo-modal/nz-demo-confirm-async.component.ts index 65f0103bd1..28767dfa85 100644 --- a/src/showcase/nz-demo-modal/nz-demo-confirm-async.component.ts +++ b/src/showcase/nz-demo-modal/nz-demo-confirm-async.component.ts @@ -25,7 +25,7 @@ export class NzDemoConfirmAsyncComponent { onCancel() { } }); - } + }; constructor(private confirmServ: NzModalService) { } diff --git a/src/showcase/nz-demo-modal/nz-demo-confirm-basic.component.ts b/src/showcase/nz-demo-modal/nz-demo-confirm-basic.component.ts index d52e7e6cac..965462bed5 100644 --- a/src/showcase/nz-demo-modal/nz-demo-confirm-basic.component.ts +++ b/src/showcase/nz-demo-modal/nz-demo-confirm-basic.component.ts @@ -22,7 +22,7 @@ export class NzDemoConfirmBasicComponent { onCancel() { } }); - } + }; constructor(private confirmServ: NzModalService) { } diff --git a/src/showcase/nz-demo-modal/nz-demo-confirm-destroy.component.ts b/src/showcase/nz-demo-modal/nz-demo-confirm-destroy.component.ts index 56e62d9a8d..5daddb40b6 100644 --- a/src/showcase/nz-demo-modal/nz-demo-confirm-destroy.component.ts +++ b/src/showcase/nz-demo-modal/nz-demo-confirm-destroy.component.ts @@ -19,7 +19,7 @@ export class NzDemoConfirmDestroyComponent { }); setTimeout(() => modal.destroy(), 1000); - } + }; constructor(private confirmServ: NzModalService) {} } diff --git a/src/showcase/nz-demo-modal/nz-demo-modal-async.component.ts b/src/showcase/nz-demo-modal/nz-demo-modal-async.component.ts index b918344dea..ef1286250b 100644 --- a/src/showcase/nz-demo-modal/nz-demo-modal-async.component.ts +++ b/src/showcase/nz-demo-modal/nz-demo-modal-async.component.ts @@ -21,7 +21,7 @@ export class NzDemoModalAsyncComponent { showModal = () => { this.isVisible = true; - } + }; handleOk = (e) => { this.isConfirmLoading = true; @@ -29,11 +29,9 @@ export class NzDemoModalAsyncComponent { this.isVisible = false; this.isConfirmLoading = false; }, 3000); - } + }; handleCancel = (e) => { this.isVisible = false; - } - - constructor() {} + }; } diff --git a/src/showcase/nz-demo-modal/nz-demo-modal-style.component.ts b/src/showcase/nz-demo-modal/nz-demo-modal-style.component.ts index 4ae330aa6d..194bd4abb3 100644 --- a/src/showcase/nz-demo-modal/nz-demo-modal-style.component.ts +++ b/src/showcase/nz-demo-modal/nz-demo-modal-style.component.ts @@ -46,32 +46,29 @@ export class NzDemoModalStyleComponent { showModalTop = () => { this.isVisibleTop = true; - } + }; showModalMiddle = () => { this.isVisibleMiddle = true; - } + }; handleOkTop = (e) => { console.log('点击了确定'); this.isVisibleTop = false; - } + }; handleCancelTop = (e) => { console.log(e); this.isVisibleTop = false; - } + }; handleOkMiddle = (e) => { console.log('点击了确定'); this.isVisibleMiddle = false; - } + }; handleCancelMiddle = (e) => { console.log(e); this.isVisibleMiddle = false; - } - - constructor() { - } + }; } diff --git a/src/showcase/nz-demo-modal/nz-demo-modal.module.ts b/src/showcase/nz-demo-modal/nz-demo-modal.module.ts index e875fad64c..83128baea7 100644 --- a/src/showcase/nz-demo-modal/nz-demo-modal.module.ts +++ b/src/showcase/nz-demo-modal/nz-demo-modal.module.ts @@ -25,7 +25,6 @@ import { NzDemoModalRoutingModule } from './nz-demo-modal.routing.module'; declarations : [ NzDemoModalComponent, NzDemoModalBasicComponent, NzDemoModalCustomizeComponent, NzDemoModalAsyncComponent, NzDemoConfirmBasicComponent, NzDemoConfirmAsyncComponent, NzDemoConfirmInfoComponent, NzDemoModalLocaleComponent, NzDemoModalStyleComponent, NzDemoConfirmDestroyComponent, NzDemoModalServiceComponent, NzModalCustomizeComponent ], entryComponents: [ NzModalCustomizeComponent ] }) - export class NzDemoModalModule { } diff --git a/src/showcase/nz-demo-modal/nz-modal-customize.component.ts b/src/showcase/nz-demo-modal/nz-modal-customize.component.ts index 0e2a8cda6c..58d9ec3024 100644 --- a/src/showcase/nz-demo-modal/nz-modal-customize.component.ts +++ b/src/showcase/nz-demo-modal/nz-modal-customize.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { NzModalSubject } from '../../../index.showcase'; @Component({ @@ -30,7 +30,7 @@ import { NzModalSubject } from '../../../index.showcase'; ` ] }) -export class NzModalCustomizeComponent implements OnInit { +export class NzModalCustomizeComponent { _name: string; @Input() @@ -51,7 +51,4 @@ export class NzModalCustomizeComponent implements OnInit { console.log('destroy'); }); } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-notification/nz-demo-notification-basic.component.ts b/src/showcase/nz-demo-notification/nz-demo-notification-basic.component.ts index 32ef68a889..ff8e7f9085 100644 --- a/src/showcase/nz-demo-notification/nz-demo-notification-basic.component.ts +++ b/src/showcase/nz-demo-notification/nz-demo-notification-basic.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzNotificationService} from '../../../index.showcase'; @Component({ @@ -8,12 +8,10 @@ import {NzNotificationService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoNotificationBasicComponent implements OnInit { +export class NzDemoNotificationBasicComponent { constructor(private _notification: NzNotificationService) { } - ngOnInit() { } - createBasicNotification() { this._notification.blank('这是标题', '这是提示框的文案这是提示框的文案这是提示框的文案这是提示框的文案这是提示框的文案这是提示框的文案这是提示框的文案'); } diff --git a/src/showcase/nz-demo-notification/nz-demo-notification-duration.component.ts b/src/showcase/nz-demo-notification/nz-demo-notification-duration.component.ts index 2c38295e5f..109d0632dd 100644 --- a/src/showcase/nz-demo-notification/nz-demo-notification-duration.component.ts +++ b/src/showcase/nz-demo-notification/nz-demo-notification-duration.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzNotificationService} from '../../../index.showcase'; @Component({ @@ -8,14 +8,11 @@ import {NzNotificationService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoNotificationDurationComponent implements OnInit { +export class NzDemoNotificationDurationComponent { createBasicNotification = () => { this._notification.blank('这是标题', '我不会自动关闭，我不会自动关闭，我不会自动关闭，我不会自动关闭，我不会自动关闭，我不会自动关闭，我不会自动关闭', {nzDuration: 0}); }; constructor(private _notification: NzNotificationService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-notification/nz-demo-notification-html.component.ts b/src/showcase/nz-demo-notification/nz-demo-notification-html.component.ts index 41335ca07f..cad600ca44 100644 --- a/src/showcase/nz-demo-notification/nz-demo-notification-html.component.ts +++ b/src/showcase/nz-demo-notification/nz-demo-notification-html.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzNotificationService} from '../../../index.showcase'; @Component({ @@ -8,14 +8,11 @@ import {NzNotificationService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoNotificationHtmlComponent implements OnInit { +export class NzDemoNotificationHtmlComponent { createBasicNotification = () => { this._notification.html('自定义通知栏内HTML

    HTML

    '); }; constructor(private _notification: NzNotificationService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-notification/nz-demo-notification-icon.component.ts b/src/showcase/nz-demo-notification/nz-demo-notification-icon.component.ts index c59d5eb911..944d55b7f8 100644 --- a/src/showcase/nz-demo-notification/nz-demo-notification-icon.component.ts +++ b/src/showcase/nz-demo-notification/nz-demo-notification-icon.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NzNotificationService} from '../../../index.showcase'; @Component({ @@ -11,14 +11,11 @@ import {NzNotificationService} from '../../../index.showcase'; `, styles : [] }) -export class NzDemoNotificationIconComponent implements OnInit { +export class NzDemoNotificationIconComponent { createNotification = (type) => { this._notification.create(type, '这是标题', '这是提示框的文案这是提示框示框的文案这是提示是提示框的文案这是提示框的文案'); }; constructor(private _notification: NzNotificationService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-notification/nz-demo-notification.component.ts b/src/showcase/nz-demo-notification/nz-demo-notification.component.ts index 1bd500421d..26a90c8f98 100644 --- a/src/showcase/nz-demo-notification/nz-demo-notification.component.ts +++ b/src/showcase/nz-demo-notification/nz-demo-notification.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewEncapsulation} from '@angular/core'; +import {Component, ViewEncapsulation} from '@angular/core'; @Component({ selector : 'nz-demo-notification', encapsulation: ViewEncapsulation.None, @@ -7,15 +7,9 @@ import {Component, OnInit, ViewEncapsulation} from '@angular/core'; './nz-demo-notification.less' ] }) -export class NzDemoNotificationComponent implements OnInit { +export class NzDemoNotificationComponent { NzDemoNotificationBasicCode = require('!!raw-loader!./nz-demo-notification-basic.component'); NzDemoNotificationDurationCode = require('!!raw-loader!./nz-demo-notification-duration.component'); NzDemoNotificationIconCode = require('!!raw-loader!./nz-demo-notification-icon.component'); NzDemoNotificationHtmlCode = require('!!raw-loader!./nz-demo-notification-html.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-notification/nz-demo-notification.module.ts b/src/showcase/nz-demo-notification/nz-demo-notification.module.ts index f51e783cdc..55c1941a07 100644 --- a/src/showcase/nz-demo-notification/nz-demo-notification.module.ts +++ b/src/showcase/nz-demo-notification/nz-demo-notification.module.ts @@ -16,7 +16,6 @@ import { NzDemoNotificationRoutingModule } from './nz-demo-notification.routing. imports : [ NzDemoNotificationRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoNotificationBasicComponent, NzDemoNotificationDurationComponent, NzDemoNotificationIconComponent, NzDemoNotificationHtmlComponent, NzDemoNotificationComponent ] }) - export class NzDemoNotificationModule { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-basic.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-basic.component.ts index 51792f5233..75506211e0 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-basic.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-pagination-basic', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoPaginationBasicComponent { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-changer.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-changer.component.ts index 0b11d5a0e0..b446ebf9c5 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-changer.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-changer.component.ts @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationChangerComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoPaginationChangerComponent { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-jump.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-jump.component.ts index 75f3ad4c85..0617b770c9 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-jump.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-jump.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-pagination-jump', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationJumpComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoPaginationJumpComponent { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-mini.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-mini.component.ts index 19179c21a3..5a4e387377 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-mini.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-mini.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-pagination-mini', @@ -10,13 +10,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationMiniComponent implements OnInit { +export class NzDemoPaginationMiniComponent { _current = 1; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-more.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-more.component.ts index e869624538..22d9306202 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-more.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-more.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-pagination-more', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationMoreComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoPaginationMoreComponent { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-simple.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-simple.component.ts index 5fa9fb256e..e293069676 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-simple.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-simple.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-pagination-simple', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationSimpleComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoPaginationSimpleComponent { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination-total.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination-total.component.ts index 9e41b577ca..4f8e35c2f0 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination-total.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination-total.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-pagination-total', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoPaginationTotalComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoPaginationTotalComponent { } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination.component.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination.component.ts index 7ac3d4048c..1d666e7fdf 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination.component.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-pagination', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-pagination.less', ] }) -export class NzDemoPaginationComponent implements OnInit { +export class NzDemoPaginationComponent { NzDemoPaginationBasicCode = require('!!raw-loader!./nz-demo-pagination-basic.component'); NzDemoPaginationMoreCode = require('!!raw-loader!./nz-demo-pagination-more.component'); NzDemoPaginationChangerCode = require('!!raw-loader!./nz-demo-pagination-changer.component'); @@ -16,10 +16,4 @@ export class NzDemoPaginationComponent implements OnInit { NzDemoPaginationMiniCode = require('!!raw-loader!./nz-demo-pagination-mini.component'); NzDemoPaginationSimpleCode = require('!!raw-loader!./nz-demo-pagination-simple.component'); NzDemoPaginationTotalCode = require('!!raw-loader!./nz-demo-pagination-total.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-pagination/nz-demo-pagination.module.ts b/src/showcase/nz-demo-pagination/nz-demo-pagination.module.ts index d65a0e635b..d5417ad816 100644 --- a/src/showcase/nz-demo-pagination/nz-demo-pagination.module.ts +++ b/src/showcase/nz-demo-pagination/nz-demo-pagination.module.ts @@ -18,7 +18,6 @@ import { NzDemoPaginationRoutingModule } from './nz-demo-pagination.routing.modu imports : [ NzDemoPaginationRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoPaginationBasicComponent, NzDemoPaginationMoreComponent, NzDemoPaginationChangerComponent, NzDemoPaginationJumpComponent, NzDemoPaginationMiniComponent, NzDemoPaginationSimpleComponent, NzDemoPaginationTotalComponent, NzDemoPaginationComponent ] }) - export class NzDemoPaginationModule { } diff --git a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-basic.component.ts b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-basic.component.ts index 87281f1464..8bf9551ebe 100644 --- a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-basic.component.ts +++ b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NzMessageService } from '../../../index.showcase'; @@ -10,21 +10,17 @@ import { NzMessageService } from '../../../index.showcase'; ` }) - -export class NzDemoPopconfirmBasicComponent implements OnInit { +export class NzDemoPopconfirmBasicComponent { constructor(private message: NzMessageService) { } - ngOnInit() { - } - cancel = function () { this.message.info('click cancel') - } + }; confirm = () => { this.message.info('click confirm') - } + }; } diff --git a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-kick.component.ts b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-kick.component.ts index 4a70c3c4e8..de5a756869 100644 --- a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-kick.component.ts +++ b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-kick.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NzMessageService } from '../../../index.showcase'; @@ -15,7 +15,7 @@ import { NzMessageService } from '../../../index.showcase'; ` }) -export class NzDemoPopconfirmKickComponent implements OnInit { +export class NzDemoPopconfirmKickComponent { switchValue = false; cancel = function () { @@ -31,7 +31,4 @@ export class NzDemoPopconfirmKickComponent implements OnInit { constructor(private message: NzMessageService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-locale.component.ts b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-locale.component.ts index 435001ebd5..ca0a3bc211 100644 --- a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-locale.component.ts +++ b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-locale.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NzMessageService } from '../../../index.showcase'; @@ -11,18 +11,15 @@ import { NzMessageService } from '../../../index.showcase'; ` }) -export class NzDemoPopconfirmLocalComponent implements OnInit { +export class NzDemoPopconfirmLocalComponent { constructor(private message: NzMessageService) { } - ngOnInit() { - } - cancel = function () { this.message.info('click cancel'); - } + }; confirm = () => { this.message.info('click confirm') - } + }; } diff --git a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-location.component.ts b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-location.component.ts index c714f84cd5..84e26a798a 100644 --- a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-location.component.ts +++ b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm-location.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NzMessageService } from '../../../index.showcase'; @@ -62,18 +62,15 @@ import { NzMessageService } from '../../../index.showcase'; ` ] }) -export class NzDemoPopconfirmLocationComponent implements OnInit { +export class NzDemoPopconfirmLocationComponent { constructor(private message: NzMessageService) { } - ngOnInit() { - } - cancel = function () { this.message.info('click cancel') - } + }; confirm = () => { this.message.info('click confirm') - } + }; } diff --git a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.component.ts b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.component.ts index f234207a1c..295e7a5f69 100644 --- a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.component.ts +++ b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; @Component({ selector : 'nz-demo-popconfirm', @@ -7,15 +7,9 @@ import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@ templateUrl : './nz-demo-popconfirm.html' }) -export class NzDemoPopconfirmComponent implements OnInit { +export class NzDemoPopconfirmComponent { NzDemoPopconfirmBasicCode = require('!!raw-loader!./nz-demo-popconfirm-basic.component'); NzDemoPopconfirmLocalCode = require('!!raw-loader!./nz-demo-popconfirm-locale.component'); NzDemoPopconfirmLocationCode = require('!!raw-loader!./nz-demo-popconfirm-location.component'); NzDemoPopconfirmKickCode = require('!!raw-loader!./nz-demo-popconfirm-kick.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.module.ts b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.module.ts index ebb791e7e5..b952ccd9c3 100644 --- a/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.module.ts +++ b/src/showcase/nz-demo-popconfirm/nz-demo-popconfirm.module.ts @@ -17,7 +17,6 @@ import { NzDemoPopconfirmRoutingModule } from './nz-demo-popconfirm.routing.modu imports : [ NzDemoPopconfirmRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoPopconfirmBasicComponent, NzDemoPopconfirmLocalComponent, NzDemoPopconfirmLocationComponent, NzDemoPopconfirmKickComponent, NzDemoPopconfirmComponent ] }) - export class NzDemoPopconfirmModule { } diff --git a/src/showcase/nz-demo-popover/nz-demo-popover-basic.component.ts b/src/showcase/nz-demo-popover/nz-demo-popover-basic.component.ts index 00e4703370..e9e45b2aa0 100644 --- a/src/showcase/nz-demo-popover/nz-demo-popover-basic.component.ts +++ b/src/showcase/nz-demo-popover/nz-demo-popover-basic.component.ts @@ -15,11 +15,4 @@ import { ` }) -export class NzDemoPopoverBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - }; - -} +export class NzDemoPopoverBasicComponent { } diff --git a/src/showcase/nz-demo-popover/nz-demo-popover-trigger.component.ts b/src/showcase/nz-demo-popover/nz-demo-popover-trigger.component.ts index d28f027c8d..4188ad3e3b 100644 --- a/src/showcase/nz-demo-popover/nz-demo-popover-trigger.component.ts +++ b/src/showcase/nz-demo-popover/nz-demo-popover-trigger.component.ts @@ -26,10 +26,4 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoPopoverTriggerComponent implements OnInit { - constructor() { - } - - ngOnInit() { - }; -} +export class NzDemoPopoverTriggerComponent { } diff --git a/src/showcase/nz-demo-popover/nz-demo-popover.component.ts b/src/showcase/nz-demo-popover/nz-demo-popover.component.ts index c55b566d8e..06f8dc37df 100644 --- a/src/showcase/nz-demo-popover/nz-demo-popover.component.ts +++ b/src/showcase/nz-demo-popover/nz-demo-popover.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; @Component({ selector : 'nz-demo-popover', @@ -7,15 +7,9 @@ import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@ templateUrl : './nz-demo-popover.html' }) -export class NzDemoPopoverComponent implements OnInit { +export class NzDemoPopoverComponent { NzDemoPopoverBasicCode = require('!!raw-loader!./nz-demo-popover-basic.component'); NzDemoPonoverLocationCode = require('!!raw-loader!./nz-demo-popover-location.component'); NzDemoPopoverTriggerCode = require('!!raw-loader!./nz-demo-popover-trigger.component'); NzDemoPopoverClickHide = require('!!raw-loader!./nz-demo-popover-clickhide.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-popover/nz-demo-popover.module.ts b/src/showcase/nz-demo-popover/nz-demo-popover.module.ts index 7b40ab4c9e..b5b91e1103 100644 --- a/src/showcase/nz-demo-popover/nz-demo-popover.module.ts +++ b/src/showcase/nz-demo-popover/nz-demo-popover.module.ts @@ -15,7 +15,6 @@ import { NzDemoPopoverRoutingModule } from './nz-demo-popover.routing.module'; imports : [ NzDemoPopoverRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoPopoverBasicComponent, NzDemoPopoverLocationComponent, NzDemoPopoverTriggerComponent, NzDemoPopoverClickHideComponent, NzDemoPopoverComponent ] }) - export class NzDemoPopoverModule { } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-basic.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-basic.component.ts index 40e2c81955..bff6989961 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-basic.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-progress-basic', @@ -11,11 +11,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoProgressBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoProgressBasicComponent { } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-circle-dynamic.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-circle-dynamic.component.ts index 772d00d6aa..7bf2a00aee 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-circle-dynamic.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-circle-dynamic.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-progress-circle-dynamic', @@ -10,7 +10,7 @@ import {Component, OnInit} from '@angular/core'; `, styles : [] }) -export class NzDemoProgressCircleDynamicComponent implements OnInit { +export class NzDemoProgressCircleDynamicComponent { _percent = 0; increase() { @@ -26,11 +26,5 @@ export class NzDemoProgressCircleDynamicComponent implements OnInit { this._percent = 0; } } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-circle-mini.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-circle-mini.component.ts index 8fa4d85641..984cd79f65 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-circle-mini.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-circle-mini.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-progress-circle-mini', @@ -9,11 +9,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoProgressCircleMiniComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoProgressCircleMiniComponent { } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-circle.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-circle.component.ts index b90aa7e217..c1818b0ef6 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-circle.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-circle.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-progress-circle', @@ -9,11 +9,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoProgressCircleComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoProgressCircleComponent { } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-format.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-format.component.ts index ab92ea534a..f168fa4ea0 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-format.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-format.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-progress-format', @@ -8,14 +8,7 @@ import {Component, OnInit} from '@angular/core'; `, styles : [] }) -export class NzDemoProgressFormatComponent implements OnInit { +export class NzDemoProgressFormatComponent { _formatOne = percent => `${percent} Days`; _formatTwo = percent => `Done`; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-line-dynamic.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-line-dynamic.component.ts index a0d18f656c..a8c89a3be0 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-line-dynamic.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-line-dynamic.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-progress-line-dynamic', @@ -10,7 +10,7 @@ import {Component, OnInit} from '@angular/core'; `, styles : [] }) -export class NzDemoProgressLineDynamicComponent implements OnInit { +export class NzDemoProgressLineDynamicComponent { _percent = 0; increase() { @@ -26,11 +26,4 @@ export class NzDemoProgressLineDynamicComponent implements OnInit { this._percent = 0; } } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-progress/nz-demo-progress-line-mini.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress-line-mini.component.ts index e75fbd387e..0b06536497 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress-line-mini.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress-line-mini.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-progress-line-mini', @@ -13,11 +13,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoProgressLineMiniComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoProgressLineMiniComponent { } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress.component.ts b/src/showcase/nz-demo-progress/nz-demo-progress.component.ts index e19e3fa2ae..48cde5583a 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress.component.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-progress', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-progress.less', ] }) -export class NzDemoProgressComponent implements OnInit { +export class NzDemoProgressComponent { NzDemoProgressBasicCode = require('!!raw-loader!./nz-demo-progress-basic.component'); NzDemoProgressCircleCode = require('!!raw-loader!./nz-demo-progress-circle.component'); NzDemoProgressLineMiniCode = require('!!raw-loader!./nz-demo-progress-line-mini.component'); @@ -16,10 +16,4 @@ export class NzDemoProgressComponent implements OnInit { NzDemoProgressCircleDynamicCode = require('!!raw-loader!./nz-demo-progress-circle-dynamic.component'); NzDemoProgressLineDynamicCode = require('!!raw-loader!./nz-demo-progress-line-dynamic.component'); NzDemoProgressFormatCode = require('!!raw-loader!./nz-demo-progress-format.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-progress/nz-demo-progress.module.ts b/src/showcase/nz-demo-progress/nz-demo-progress.module.ts index 38484ae65a..243d7e20bf 100644 --- a/src/showcase/nz-demo-progress/nz-demo-progress.module.ts +++ b/src/showcase/nz-demo-progress/nz-demo-progress.module.ts @@ -19,7 +19,6 @@ import { NzDemoProgressRoutingModule } from './nz-demo-progress.routing.module'; imports : [ FormsModule, NzDemoProgressRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoProgressBasicComponent, NzDemoProgressCircleComponent, NzDemoProgressLineMiniComponent, NzDemoProgressCircleMiniComponent, NzDemoProgressCircleDynamicComponent, NzDemoProgressLineDynamicComponent, NzDemoProgressFormatComponent, NzDemoProgressComponent ] }) - export class NzDemoProgressModule { } diff --git a/src/showcase/nz-demo-radio/nz-demo-radio-button-group-size.component.ts b/src/showcase/nz-demo-radio/nz-demo-radio-button-group-size.component.ts index 183d9a19ea..c22b1b452d 100644 --- a/src/showcase/nz-demo-radio/nz-demo-radio-button-group-size.component.ts +++ b/src/showcase/nz-demo-radio/nz-demo-radio-button-group-size.component.ts @@ -54,13 +54,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoRadioButtonGroupSizeComponent implements OnInit { +export class NzDemoRadioButtonGroupSizeComponent { radioValue = 'A'; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-radio/nz-demo-radio-button-group.component.ts b/src/showcase/nz-demo-radio/nz-demo-radio-button-group.component.ts index a51109320c..4442beff77 100644 --- a/src/showcase/nz-demo-radio/nz-demo-radio-button-group.component.ts +++ b/src/showcase/nz-demo-radio/nz-demo-radio-button-group.component.ts @@ -24,7 +24,7 @@ import { Component, OnInit } from '@angular/core'; -
    - @@ -54,13 +54,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoRadioButtonGroupComponent implements OnInit { +export class NzDemoRadioButtonGroupComponent { radioValue = 'A'; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-radio/nz-demo-radio-group-disabled.component.ts b/src/showcase/nz-demo-radio/nz-demo-radio-group-disabled.component.ts index 5be23dad2c..91868837e4 100644 --- a/src/showcase/nz-demo-radio/nz-demo-radio-group-disabled.component.ts +++ b/src/showcase/nz-demo-radio/nz-demo-radio-group-disabled.component.ts @@ -23,17 +23,11 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoRadioGroupDisabledComponent implements OnInit { +export class NzDemoRadioGroupDisabledComponent { radioValue = 'A'; isDisabled = true; toggleDisabled = () => { this.isDisabled = !this.isDisabled; }; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-radio/nz-demo-radio-group.component.ts b/src/showcase/nz-demo-radio/nz-demo-radio-group.component.ts index b7a72571f7..1c4cae23c8 100644 --- a/src/showcase/nz-demo-radio/nz-demo-radio-group.component.ts +++ b/src/showcase/nz-demo-radio/nz-demo-radio-group.component.ts @@ -19,13 +19,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoRadioGroupComponent implements OnInit { +export class NzDemoRadioGroupComponent { radioValue = 'A'; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-radio/nz-demo-radio.component.ts b/src/showcase/nz-demo-radio/nz-demo-radio.component.ts index 1f36c73d96..65d2b89ce4 100644 --- a/src/showcase/nz-demo-radio/nz-demo-radio.component.ts +++ b/src/showcase/nz-demo-radio/nz-demo-radio.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-radio', @@ -8,16 +8,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-radio.less', ] }) -export class NzDemoRadioComponent implements OnInit { +export class NzDemoRadioComponent { NzDemoRadioGroupCode = require('!!raw-loader!./nz-demo-radio-group.component'); NzDemoRadioGroupDisabledCode = require('!!raw-loader!./nz-demo-radio-group-disabled.component'); NzDemoRadioButtonGroupCode = require('!!raw-loader!./nz-demo-radio-button-group.component'); NzDemoRadioButtonGroupSizeCode = require('!!raw-loader!./nz-demo-radio-button-group-size.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-radio/nz-demo-radio.module.ts b/src/showcase/nz-demo-radio/nz-demo-radio.module.ts index eb663f2814..1452e01913 100644 --- a/src/showcase/nz-demo-radio/nz-demo-radio.module.ts +++ b/src/showcase/nz-demo-radio/nz-demo-radio.module.ts @@ -16,7 +16,6 @@ import { NzDemoRadioRoutingModule } from './nz-demo-radio.routing.module'; imports : [ NzDemoRadioRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoRadioGroupComponent, NzDemoRadioButtonGroupComponent, NzDemoRadioButtonGroupSizeComponent, NzDemoRadioGroupDisabledComponent, NzDemoRadioComponent ] }) - export class NzDemoRadioModule { } diff --git a/src/showcase/nz-demo-rate/nz-demo-rate-basic.component.ts b/src/showcase/nz-demo-rate/nz-demo-rate-basic.component.ts index 4c37aac601..44de2dc0b5 100644 --- a/src/showcase/nz-demo-rate/nz-demo-rate-basic.component.ts +++ b/src/showcase/nz-demo-rate/nz-demo-rate-basic.component.ts @@ -1,15 +1,8 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-rate-basic', template: ``, styles : [] }) -export class NzDemoRateBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoRateBasicComponent { } diff --git a/src/showcase/nz-demo-rate/nz-demo-rate-disabled.component.ts b/src/showcase/nz-demo-rate/nz-demo-rate-disabled.component.ts index aea50fcb1b..4443126a99 100644 --- a/src/showcase/nz-demo-rate/nz-demo-rate-disabled.component.ts +++ b/src/showcase/nz-demo-rate/nz-demo-rate-disabled.component.ts @@ -1,15 +1,8 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-rate-disabled', - template: ``, + template: ``, styles : [] }) -export class NzDemoRateDisabledComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoRateDisabledComponent { } diff --git a/src/showcase/nz-demo-rate/nz-demo-rate-half.component.ts b/src/showcase/nz-demo-rate/nz-demo-rate-half.component.ts index 0fdb2812e4..94d025b268 100644 --- a/src/showcase/nz-demo-rate/nz-demo-rate-half.component.ts +++ b/src/showcase/nz-demo-rate/nz-demo-rate-half.component.ts @@ -1,15 +1,8 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-rate-half', template: ``, styles : [] }) -export class NzDemoRateHalfComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoRateHalfComponent { } diff --git a/src/showcase/nz-demo-rate/nz-demo-rate-text.component.ts b/src/showcase/nz-demo-rate/nz-demo-rate-text.component.ts index 5bbbab5530..a68a2e1e17 100644 --- a/src/showcase/nz-demo-rate/nz-demo-rate-text.component.ts +++ b/src/showcase/nz-demo-rate/nz-demo-rate-text.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-rate-text', @@ -8,13 +8,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoRateTextComponent implements OnInit { +export class NzDemoRateTextComponent { value = 3; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-rate/nz-demo-rate.component.ts b/src/showcase/nz-demo-rate/nz-demo-rate.component.ts index 0c7a837db0..e412270529 100644 --- a/src/showcase/nz-demo-rate/nz-demo-rate.component.ts +++ b/src/showcase/nz-demo-rate/nz-demo-rate.component.ts @@ -1,19 +1,13 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-rate', encapsulation: ViewEncapsulation.None, templateUrl : './nz-demo-rate.html' }) -export class NzDemoRateComponent implements OnInit { +export class NzDemoRateComponent { NzDemoRateBasicCode = require('!!raw-loader!./nz-demo-rate-basic.component'); NzDemoRateHalfCode = require('!!raw-loader!./nz-demo-rate-half.component'); NzDemoRateTextCode = require('!!raw-loader!./nz-demo-rate-text.component'); NzDemoRateDisabledCode = require('!!raw-loader!./nz-demo-rate-disabled.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-rate/nz-demo-rate.module.ts b/src/showcase/nz-demo-rate/nz-demo-rate.module.ts index 27f671b678..f0f2791982 100644 --- a/src/showcase/nz-demo-rate/nz-demo-rate.module.ts +++ b/src/showcase/nz-demo-rate/nz-demo-rate.module.ts @@ -16,7 +16,6 @@ import { NzDemoRateRoutingModule } from './nz-demo-rate.routing.module'; imports : [ NzDemoRateRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoRateBasicComponent, NzDemoRateDisabledComponent, NzDemoRateTextComponent, NzDemoRateHalfComponent, NzDemoRateComponent ] }) - export class NzDemoRateModule { } diff --git a/src/showcase/nz-demo-select/nz-demo-select-basic.component.ts b/src/showcase/nz-demo-select/nz-demo-select-basic.component.ts index 1405e7dbf3..d586d5e287 100644 --- a/src/showcase/nz-demo-select/nz-demo-select-basic.component.ts +++ b/src/showcase/nz-demo-select/nz-demo-select-basic.component.ts @@ -11,7 +11,7 @@ import { Component, OnInit } from '@angular/core'; [nzDisabled]="option.disabled"> - + { diff --git a/src/showcase/nz-demo-select/nz-demo-select-multiple-change.component.ts b/src/showcase/nz-demo-select/nz-demo-select-multiple-change.component.ts index 9f2d10a5f2..64f2e0c313 100644 --- a/src/showcase/nz-demo-select/nz-demo-select-multiple-change.component.ts +++ b/src/showcase/nz-demo-select/nz-demo-select-multiple-change.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { Jsonp, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; @@ -23,7 +23,7 @@ import 'rxjs/add/operator/map'; `, styles : [] }) -export class NzDemoSelectMultipleChangeComponent implements OnInit { +export class NzDemoSelectMultipleChangeComponent { searchOptions; selectedMultipleOption = []; @@ -36,8 +36,4 @@ export class NzDemoSelectMultipleChangeComponent implements OnInit { this.searchOptions = data.result; }); } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-select/nz-demo-select-multiple.component.ts b/src/showcase/nz-demo-select/nz-demo-select-multiple.component.ts index 81ccc8cbfd..a21a4dc904 100644 --- a/src/showcase/nz-demo-select/nz-demo-select-multiple.component.ts +++ b/src/showcase/nz-demo-select/nz-demo-select-multiple.component.ts @@ -22,9 +22,6 @@ export class NzDemoSelectMultipleComponent implements OnInit { searchOptions; selectedMultipleOption; - constructor() { - } - ngOnInit() { /*模拟服务器异步加载*/ this.selectedMultipleOption = [ 'tom', 'jack' ]; diff --git a/src/showcase/nz-demo-select/nz-demo-select-search-change.component.ts b/src/showcase/nz-demo-select/nz-demo-select-search-change.component.ts index 435e44fa71..41e5d8f51b 100644 --- a/src/showcase/nz-demo-select/nz-demo-select-search-change.component.ts +++ b/src/showcase/nz-demo-select/nz-demo-select-search-change.component.ts @@ -14,7 +14,7 @@ import 'rxjs/add/operator/map'; [(ngModel)]="selectedOption" (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'无法找到'" - [nzShowSearch]="true"> + nzShowSearch> + nzShowSearch> + nzShowSearch> { diff --git a/src/showcase/nz-demo-select/nz-demo-select-size.component.ts b/src/showcase/nz-demo-select/nz-demo-select-size.component.ts index 8b20edef7b..f22464707c 100644 --- a/src/showcase/nz-demo-select/nz-demo-select-size.component.ts +++ b/src/showcase/nz-demo-select/nz-demo-select-size.component.ts @@ -20,7 +20,7 @@ import { Component, OnInit } from '@angular/core';

    - + + nzShowSearch> { this.selectedMultipleOption = []; diff --git a/src/showcase/nz-demo-select/nz-demo-select.component.ts b/src/showcase/nz-demo-select/nz-demo-select.component.ts index f005ade06e..2c9a167230 100644 --- a/src/showcase/nz-demo-select/nz-demo-select.component.ts +++ b/src/showcase/nz-demo-select/nz-demo-select.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewEncapsulation} from '@angular/core'; +import {Component, ViewEncapsulation} from '@angular/core'; @Component({ selector : 'nz-demo-select', encapsulation: ViewEncapsulation.None, @@ -7,7 +7,7 @@ import {Component, OnInit, ViewEncapsulation} from '@angular/core'; './nz-demo-select.less', ] }) -export class NzDemoSelectComponent implements OnInit { +export class NzDemoSelectComponent { NzDemoSelectBasicCode = require('!!raw-loader!./nz-demo-select-basic.component'); NzDemoSelectSizeCode = require('!!raw-loader!./nz-demo-select-size.component'); NzDemoSelectSearchCode = require('!!raw-loader!./nz-demo-select-search.component'); @@ -15,10 +15,4 @@ export class NzDemoSelectComponent implements OnInit { NzDemoSelectMultipleChangeCode = require('!!raw-loader!./nz-demo-select-multiple-change.component'); NzDemoSelectTagCode = require('!!raw-loader!./nz-demo-select-tag.component'); NzDemoSelectSearchChangeCode = require('!!raw-loader!./nz-demo-select-search-change.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-select/nz-demo-select.module.ts b/src/showcase/nz-demo-select/nz-demo-select.module.ts index bb286b8738..c773dac2f3 100644 --- a/src/showcase/nz-demo-select/nz-demo-select.module.ts +++ b/src/showcase/nz-demo-select/nz-demo-select.module.ts @@ -20,7 +20,6 @@ import { NzDemoSelectRoutingModule } from './nz-demo-select.routing.module'; imports : [ NzDemoSelectRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule, JsonpModule ], declarations: [ NzDemoSelectBasicComponent, NzDemoSelectSizeComponent, NzDemoSelectSearchComponent, NzDemoSelectMultipleComponent, NzDemoSelectTagComponent, NzDemoSelectComponent, NzDemoSelectSearchChangeComponent, NzDemoSelectMultipleChangeComponent ], }) - export class NzDemoSelectModule { } diff --git a/src/showcase/nz-demo-slider/nz-demo-slider-mark.component.ts b/src/showcase/nz-demo-slider/nz-demo-slider-mark.component.ts index e0dd17650e..43414e0c6c 100644 --- a/src/showcase/nz-demo-slider/nz-demo-slider-mark.component.ts +++ b/src/showcase/nz-demo-slider/nz-demo-slider-mark.component.ts @@ -6,14 +6,14 @@ import { Component } from '@angular/core';

    included=true

    - +

    included=false

    marks & step

    step=null || dots=true

    - + Change nzMarks dynamically:
    `, diff --git a/src/showcase/nz-demo-spin/nz-demo-spin-basic.component.ts b/src/showcase/nz-demo-spin/nz-demo-spin-basic.component.ts index 61196ea35b..2b06d15af5 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin-basic.component.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-spin-basic', @@ -6,11 +6,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSpinBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoSpinBasicComponent { } diff --git a/src/showcase/nz-demo-spin/nz-demo-spin-inside.component.ts b/src/showcase/nz-demo-spin/nz-demo-spin-inside.component.ts index 699166730c..f6866b01c7 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin-inside.component.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin-inside.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-spin-inside', @@ -9,11 +9,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSpinInsideComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoSpinInsideComponent { } diff --git a/src/showcase/nz-demo-spin/nz-demo-spin-nested.component.ts b/src/showcase/nz-demo-spin/nz-demo-spin-nested.component.ts index 9e99f28fa3..bd690e73cb 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin-nested.component.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin-nested.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-spin-nested', @@ -11,13 +11,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSpinNestedComponent implements OnInit { +export class NzDemoSpinNestedComponent { _isSpinning = false; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-spin/nz-demo-spin-size.component.ts b/src/showcase/nz-demo-spin/nz-demo-spin-size.component.ts index 0f0b7d34bb..c8ec957698 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin-size.component.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-spin-size', @@ -13,11 +13,4 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoSpinSizeComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoSpinSizeComponent { } diff --git a/src/showcase/nz-demo-spin/nz-demo-spin-tip.component.ts b/src/showcase/nz-demo-spin/nz-demo-spin-tip.component.ts index e487442299..51b2a520a8 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin-tip.component.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin-tip.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-spin-tip', @@ -9,11 +9,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSpinTipComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoSpinTipComponent { } diff --git a/src/showcase/nz-demo-spin/nz-demo-spin.component.ts b/src/showcase/nz-demo-spin/nz-demo-spin.component.ts index 9b514539bb..c4185bb005 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin.component.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-spin', @@ -8,16 +8,10 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-spin.less', ] }) -export class NzDemoSpinComponent implements OnInit { +export class NzDemoSpinComponent { NzDemoSpinBasicCode = require('!!raw-loader!./nz-demo-spin-basic.component'); NzDemoSpinInsideCode = require('!!raw-loader!./nz-demo-spin-inside.component'); NzDemoSpinSizeCode = require('!!raw-loader!./nz-demo-spin-size.component'); NzDemoSpinTipCode = require('!!raw-loader!./nz-demo-spin-tip.component'); NzDemoSpinNestedCode = require('!!raw-loader!./nz-demo-spin-nested.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-spin/nz-demo-spin.module.ts b/src/showcase/nz-demo-spin/nz-demo-spin.module.ts index 91e46b2677..0b4085c427 100644 --- a/src/showcase/nz-demo-spin/nz-demo-spin.module.ts +++ b/src/showcase/nz-demo-spin/nz-demo-spin.module.ts @@ -18,7 +18,6 @@ import { NzDemoSpinRoutingModule } from './nz-demo-spin.routing.module'; imports : [ NzDemoSpinRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoSpinBasicComponent, NzDemoSpinInsideComponent, NzDemoSpinSizeComponent, NzDemoSpinTipComponent, NzDemoSpinNestedComponent, NzDemoSpinComponent ] }) - export class NzDemoSpinModule { } diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-basic.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-basic.component.ts index c7d0c4db77..2fbdf99bd7 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-basic.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-basic', @@ -15,13 +15,6 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsBasicComponent implements OnInit { +export class NzDemoStepsBasicComponent { current = 1; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-change.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-change.component.ts index 890edb63c9..57b62ad4ec 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-change.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-change.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NzMessageService } from '../../../index.showcase'; @Component({ @@ -41,7 +41,7 @@ import { NzMessageService } from '../../../index.showcase'; ` ] }) -export class NzDemoStepsChangeComponent implements OnInit { +export class NzDemoStepsChangeComponent { current = 0; index = 'First-content'; @@ -82,7 +82,4 @@ export class NzDemoStepsChangeComponent implements OnInit { constructor(private _message: NzMessageService) { } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-dotted.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-dotted.component.ts index 8c5c3f7d91..d43878df4a 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-dotted.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-dotted.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-dotted', @@ -10,13 +10,6 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsDottedComponent implements OnInit { +export class NzDemoStepsDottedComponent { current = 1; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-error.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-error.component.ts index fd5a7042c0..4dd4e17eb2 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-error.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-error.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-error', @@ -10,12 +10,6 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsErrorComponent implements OnInit { +export class NzDemoStepsErrorComponent { current = 1; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-icon.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-icon.component.ts index abaf3fd500..1321c83e9b 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-icon.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-icon.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-icon', @@ -27,10 +27,4 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsIconComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoStepsIconComponent { } diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-mini.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-mini.component.ts index 299dcb91e1..03c94da43d 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-mini.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-mini.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-mini', @@ -10,13 +10,6 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsMiniComponent implements OnInit { +export class NzDemoStepsMiniComponent { current = 1; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-vertical-mini.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-vertical-mini.component.ts index bf9052b0a4..f49416cc61 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-vertical-mini.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-vertical-mini.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-vertical-mini', @@ -10,12 +10,6 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsVerticalMiniComponent implements OnInit { +export class NzDemoStepsVerticalMiniComponent { current = 1; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-steps/nz-demo-steps-vertical.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps-vertical.component.ts index 796fcadf5c..09c178f883 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps-vertical.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps-vertical.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-steps-vertical', @@ -10,12 +10,6 @@ import { Component, OnInit } from '@angular/core'; ` }) -export class NzDemoStepsVerticalComponent implements OnInit { +export class NzDemoStepsVerticalComponent { current = 1; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-steps/nz-demo-steps.component.ts b/src/showcase/nz-demo-steps/nz-demo-steps.component.ts index 10f1a4aa14..e1bbd2c9ef 100644 --- a/src/showcase/nz-demo-steps/nz-demo-steps.component.ts +++ b/src/showcase/nz-demo-steps/nz-demo-steps.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ @@ -6,7 +6,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; encapsulation: ViewEncapsulation.None, templateUrl : './index.html' }) -export class NzDemoStepsComponent implements OnInit { +export class NzDemoStepsComponent { NzDemoStepsBasicCode = require('!!raw-loader!./nz-demo-steps-basic.component'); NzDemoStepsDottedCode = require('!!raw-loader!./nz-demo-steps-dotted.component'); NzDemoStepsChangeCode = require('!!raw-loader!./nz-demo-steps-change.component'); @@ -15,10 +15,4 @@ export class NzDemoStepsComponent implements OnInit { NzDemoStepsMiniCode = require('!!raw-loader!./nz-demo-steps-mini.component'); NzDemoStepsVerticalCode = require('!!raw-loader!./nz-demo-steps-vertical.component'); NzDemoStepsVerticalMiniCode = require('!!raw-loader!./nz-demo-steps-vertical-mini.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-switch/nz-demo-switch-basic.component.ts b/src/showcase/nz-demo-switch/nz-demo-switch-basic.component.ts index 954af3f552..f5c27c4880 100644 --- a/src/showcase/nz-demo-switch/nz-demo-switch-basic.component.ts +++ b/src/showcase/nz-demo-switch/nz-demo-switch-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-switch-basic', @@ -6,13 +6,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSwitchBasicComponent implements OnInit { +export class NzDemoSwitchBasicComponent { switchValue = false; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-switch/nz-demo-switch-disabled.component.ts b/src/showcase/nz-demo-switch/nz-demo-switch-disabled.component.ts index 08a3efb62f..406f5c074c 100644 --- a/src/showcase/nz-demo-switch/nz-demo-switch-disabled.component.ts +++ b/src/showcase/nz-demo-switch/nz-demo-switch-disabled.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-switch-disabled', @@ -9,17 +9,10 @@ import { Component, OnInit } from '@angular/core';
    `, styles : [] }) -export class NzDemoSwitchDisabledComponent implements OnInit { +export class NzDemoSwitchDisabledComponent { switchValue = false; isDisabled = true; toggleDisabled = () => { this.isDisabled = !this.isDisabled; } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-switch/nz-demo-switch-size.component.ts b/src/showcase/nz-demo-switch/nz-demo-switch-size.component.ts index bc0b306851..65bc3962d9 100644 --- a/src/showcase/nz-demo-switch/nz-demo-switch-size.component.ts +++ b/src/showcase/nz-demo-switch/nz-demo-switch-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-switch-size', @@ -10,11 +10,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSwitchSizeComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoSwitchSizeComponent { } diff --git a/src/showcase/nz-demo-switch/nz-demo-switch-text.component.ts b/src/showcase/nz-demo-switch/nz-demo-switch-text.component.ts index 009116e39b..35437c5216 100644 --- a/src/showcase/nz-demo-switch/nz-demo-switch-text.component.ts +++ b/src/showcase/nz-demo-switch/nz-demo-switch-text.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-switch-text', @@ -16,11 +16,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoSwitchTextComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoSwitchTextComponent { } diff --git a/src/showcase/nz-demo-switch/nz-demo-switch.component.ts b/src/showcase/nz-demo-switch/nz-demo-switch.component.ts index 9e72798532..c5c9287175 100644 --- a/src/showcase/nz-demo-switch/nz-demo-switch.component.ts +++ b/src/showcase/nz-demo-switch/nz-demo-switch.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-switch', @@ -8,15 +8,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-switch.less', ] }) -export class NzDemoSwitchComponent implements OnInit { +export class NzDemoSwitchComponent { NzDemoSwitchBasicCode = require('!!raw-loader!./nz-demo-switch-basic.component'); NzDemoSwitchDisabledCode = require('!!raw-loader!./nz-demo-switch-disabled.component'); NzDemoSwitchSizeCode = require('!!raw-loader!./nz-demo-switch-size.component'); NzDemoSwitchTextCode = require('!!raw-loader!./nz-demo-switch-text.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-switch/nz-demo-switch.module.ts b/src/showcase/nz-demo-switch/nz-demo-switch.module.ts index c590fa4cc6..573483f500 100644 --- a/src/showcase/nz-demo-switch/nz-demo-switch.module.ts +++ b/src/showcase/nz-demo-switch/nz-demo-switch.module.ts @@ -16,7 +16,6 @@ import { NzDemoSwitchRoutingModule } from './nz-demo-switch.routing.module'; imports : [ FormsModule, NzDemoSwitchRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoSwitchBasicComponent, NzDemoSwitchDisabledComponent, NzDemoSwitchTextComponent, NzDemoSwitchSizeComponent, NzDemoSwitchComponent ] }) - export class NzDemoSwitchModule { } diff --git a/src/showcase/nz-demo-table/nz-demo-table-ajax.component.ts b/src/showcase/nz-demo-table/nz-demo-table-ajax.component.ts index 0f7032f69e..2b3eb0cd2e 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-ajax.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-ajax.component.ts @@ -31,7 +31,7 @@ import { Component, OnInit } from '@angular/core'; template : ` `, styles : [] }) -export class NzDemoTableBasicComponent implements OnInit { +export class NzDemoTableBasicComponent { data = [ { key : '1', @@ -67,11 +67,5 @@ export class NzDemoTableBasicComponent implements OnInit { address: 'Sidney No. 1 Lake Park', } ]; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-table/nz-demo-table-colspan-rowspan.component.ts b/src/showcase/nz-demo-table/nz-demo-table-colspan-rowspan.component.ts index 4b68dbd623..6f95d552b4 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-colspan-rowspan.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-colspan-rowspan.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-table-colspan-rowspan', template: ` - + Name @@ -26,7 +26,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTableColspanRowspanComponent implements OnInit { +export class NzDemoTableColspanRowspanComponent { data = [ { key : '1', name : 'John Brown', @@ -63,11 +63,4 @@ export class NzDemoTableColspanRowspanComponent implements OnInit { phone : 18900010002, address: 'Dublin No. 2 Lake Park', } ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-table/nz-demo-table-custom-filter.component.ts b/src/showcase/nz-demo-table/nz-demo-table-custom-filter.component.ts index c2da33d6f4..e7faeed969 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-custom-filter.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-custom-filter.component.ts @@ -68,7 +68,7 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoTableCustomFilterComponent implements OnInit { +export class NzDemoTableCustomFilterComponent { searchValue = ''; filterAddressArray = [ { name: 'London', value: false }, @@ -139,11 +139,4 @@ export class NzDemoTableCustomFilterComponent implements OnInit { }); this.search(); } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-table/nz-demo-table-edit.component.ts b/src/showcase/nz-demo-table/nz-demo-table-edit.component.ts index 31e497f1b3..07b5ee0f50 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-edit.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-edit.component.ts @@ -71,9 +71,6 @@ export class NzDemoTableEditComponent implements OnInit { this.editRow = null; } - constructor() { - } - ngOnInit() { this.data.forEach(item => { this.tempEditObject[ item.key ] = {}; diff --git a/src/showcase/nz-demo-table/nz-demo-table-expand-tree.component.ts b/src/showcase/nz-demo-table/nz-demo-table-expand-tree.component.ts index 9c0566ff79..892696a833 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-expand-tree.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-expand-tree.component.ts @@ -123,9 +123,6 @@ export class NzDemoTableExpandTreeComponent implements OnInit { } } - constructor() { - } - ngOnInit() { this.data.forEach(item => { this.expandDataCache[ item.key ] = this.convertTreeToList(item); diff --git a/src/showcase/nz-demo-table/nz-demo-table-expand.component.ts b/src/showcase/nz-demo-table/nz-demo-table-expand.component.ts index 3c603ef773..3383e2c397 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-expand.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-expand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-table-expand', @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; - + Name Age Address @@ -16,7 +16,7 @@ import { Component, OnInit } from '@angular/core'; - + {{data.name}} @@ -39,7 +39,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTableExpandComponent implements OnInit { +export class NzDemoTableExpandComponent { data = [ { name : 'John Brown', @@ -63,11 +63,4 @@ export class NzDemoTableExpandComponent implements OnInit { description: 'My name is Joe Black, I am 32 years old, living in Sidney No. 1 Lake Park.' }, ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-table/nz-demo-table-fixed-header.component.ts b/src/showcase/nz-demo-table/nz-demo-table-fixed-header.component.ts index f5b1702c95..d57c260a8c 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-fixed-header.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-fixed-header.component.ts @@ -26,9 +26,6 @@ import { Component, OnInit } from '@angular/core'; export class NzDemoTableFixedHeaderComponent implements OnInit { data = []; - constructor() { - } - ngOnInit() { for (let i = 0; i < 100; i++) { this.data.push({ diff --git a/src/showcase/nz-demo-table/nz-demo-table-nopagination.component.ts b/src/showcase/nz-demo-table/nz-demo-table-nopagination.component.ts index 9d662a3ff1..ba1466dbf7 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-nopagination.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-nopagination.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-table-nopagination', @@ -21,7 +21,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTableNoPaginationComponent implements OnInit { +export class NzDemoTableNoPaginationComponent { data = [ { key : '1', name : 'John Brown', @@ -38,11 +38,4 @@ export class NzDemoTableNoPaginationComponent implements OnInit { age : 32, address: 'Sidney No. 1 Lake Park', } ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-table/nz-demo-table-paging.component.ts b/src/showcase/nz-demo-table/nz-demo-table-paging.component.ts index a6e482621b..054b96ee9c 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-paging.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-paging.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'nz-demo-table-paging', template: ` - + Name @@ -26,9 +26,6 @@ import { Component, OnInit } from '@angular/core'; export class NzDemoTablePagingComponent implements OnInit { _dataSet = []; - constructor() { - } - ngOnInit() { for (let i = 0; i < 46; i++) { this._dataSet.push({ diff --git a/src/showcase/nz-demo-table/nz-demo-table-reset-filter.component.ts b/src/showcase/nz-demo-table/nz-demo-table-reset-filter.component.ts index a3d27519ca..df077a3af8 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-reset-filter.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-reset-filter.component.ts @@ -75,7 +75,7 @@ import { Component, OnInit } from '@angular/core'; ` ] }) -export class NzDemoTableResetFilterComponent implements OnInit { +export class NzDemoTableResetFilterComponent { filterNameArray = [ { name: 'Joe', value: false }, { name: 'Jim', value: false }, @@ -150,11 +150,5 @@ export class NzDemoTableResetFilterComponent implements OnInit { }); this.search(); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-table/nz-demo-table-selection-and-operation.component.ts b/src/showcase/nz-demo-table/nz-demo-table-selection-and-operation.component.ts index 6866d3410c..eb58a61862 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-selection-and-operation.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-selection-and-operation.component.ts @@ -10,7 +10,7 @@ import { Component, OnInit } from '@angular/core'; - + @@ -21,7 +21,7 @@ import { Component, OnInit } from '@angular/core'; - + @@ -44,7 +44,7 @@ export class NzDemoTableSelectionAndOperationComponent implements OnInit { _displayDataChange($event) { this._displayData = $event; - }; + } _refreshStatus() { const allChecked = this._displayData.every(value => value.checked === true); @@ -53,7 +53,7 @@ export class NzDemoTableSelectionAndOperationComponent implements OnInit { this._indeterminate = (!allChecked) && (!allUnChecked); this._disabledButton = !this._dataSet.some(value => value.checked); this._checkedNumber = this._dataSet.filter(value => value.checked).length; - }; + } _checkAll(value) { if (value) { @@ -62,7 +62,7 @@ export class NzDemoTableSelectionAndOperationComponent implements OnInit { this._displayData.forEach(data => data.checked = false); } this._refreshStatus(); - }; + } _operateData() { this._operating = true; @@ -71,9 +71,6 @@ export class NzDemoTableSelectionAndOperationComponent implements OnInit { this._refreshStatus(); this._operating = false; }, 1000); - }; - - constructor() { } ngOnInit() { diff --git a/src/showcase/nz-demo-table/nz-demo-table-selection-props.component.ts b/src/showcase/nz-demo-table/nz-demo-table-selection-props.component.ts index dcc26e0d89..261efd9158 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-selection-props.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-selection-props.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-table-selection-props', @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; - + @@ -17,7 +17,7 @@ import { Component, OnInit } from '@angular/core'; - + @@ -31,7 +31,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTableSelectionPropsComponent implements OnInit { +export class NzDemoTableSelectionPropsComponent { _allChecked = false; _indeterminate = false; _displayData = []; @@ -56,14 +56,14 @@ export class NzDemoTableSelectionPropsComponent implements OnInit { _displayDataChange($event) { this._displayData = $event; this._refreshStatus(); - }; + } _refreshStatus() { const allChecked = this._displayData.every(value => value.disabled || value.checked); const allUnChecked = this._displayData.every(value => value.disabled || !value.checked); this._allChecked = allChecked; this._indeterminate = (!allChecked) && (!allUnChecked); - }; + } _checkAll(value) { if (value) { @@ -76,13 +76,5 @@ export class NzDemoTableSelectionPropsComponent implements OnInit { this._displayData.forEach(data => data.checked = false); } this._refreshStatus(); - }; - - - constructor() { - } - - ngOnInit() { } } - diff --git a/src/showcase/nz-demo-table/nz-demo-table-selection.component.ts b/src/showcase/nz-demo-table/nz-demo-table-selection.component.ts index 3259e4687d..2cfd883c47 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-selection.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-selection.component.ts @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; - + @@ -17,7 +17,7 @@ import { Component, OnInit } from '@angular/core'; - + @@ -31,7 +31,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTableSelectionComponent implements OnInit { +export class NzDemoTableSelectionComponent { _allChecked = false; _indeterminate = false; _displayData = []; @@ -55,14 +55,14 @@ export class NzDemoTableSelectionComponent implements OnInit { _displayDataChange($event) { this._displayData = $event; this._refreshStatus(); - }; + } _refreshStatus() { const allChecked = this._displayData.every(value => value.checked === true); const allUnChecked = this._displayData.every(value => !value.checked); this._allChecked = allChecked; this._indeterminate = (!allChecked) && (!allUnChecked); - }; + } _checkAll(value) { if (value) { @@ -75,12 +75,5 @@ export class NzDemoTableSelectionComponent implements OnInit { }); } this._refreshStatus(); - }; - - constructor() { - } - - ngOnInit() { } } - diff --git a/src/showcase/nz-demo-table/nz-demo-table-size.component.ts b/src/showcase/nz-demo-table/nz-demo-table-size.component.ts index ca8ac87827..b166933cab 100644 --- a/src/showcase/nz-demo-table/nz-demo-table-size.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table-size.component.ts @@ -160,9 +160,6 @@ export class NzDemoTableSizeComponent implements OnInit { _fixHeader = false; _size = 'small'; - constructor() { - } - ngOnInit() { for (let i = 1; i <= 10; i++) { this._dataSet.push({ diff --git a/src/showcase/nz-demo-table/nz-demo-table.component.ts b/src/showcase/nz-demo-table/nz-demo-table.component.ts index 6111813cbb..a0561430a1 100644 --- a/src/showcase/nz-demo-table/nz-demo-table.component.ts +++ b/src/showcase/nz-demo-table/nz-demo-table.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-table', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-table.less', ] }) -export class NzDemoTableComponent implements OnInit { +export class NzDemoTableComponent { NzDemoTableBasicCode = require('!!raw-loader!./nz-demo-table-basic.component'); NzDemoTableExpandCode = require('!!raw-loader!./nz-demo-table-expand.component'); NzDemoTableExpandTreeCode = require('!!raw-loader!./nz-demo-table-expand-tree.component'); @@ -24,10 +24,4 @@ export class NzDemoTableComponent implements OnInit { NzDemoTableAjaxCode = require('!!raw-loader!./nz-demo-table-ajax.component'); NzDemoTableNoPaginationCode = require('!!raw-loader!./nz-demo-table-nopagination.component'); NzDemoTableSizeCode = require('!!raw-loader!./nz-demo-table-size.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-table/nz-demo-table.module.ts b/src/showcase/nz-demo-table/nz-demo-table.module.ts index defe54a4bc..1126644168 100644 --- a/src/showcase/nz-demo-table/nz-demo-table.module.ts +++ b/src/showcase/nz-demo-table/nz-demo-table.module.ts @@ -28,7 +28,6 @@ import { NzDemoTableRoutingModule } from './nz-demo-table.routing.module'; imports : [ NzDemoTableRoutingModule, FormsModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule ], declarations: [ NzDemoTableExpandTreeComponent, NzDemoTableExpandComponent, NzDemoTableCustomFilterComponent, NzDemoTableEditComponent, NzDemoTableComponent, NzDemoTableFixedHeaderComponent, NzDemoTableColspanRowspanComponent, NzDemoTableBasicComponent, NzDemoTableResetFilterComponent, NzDemoTableSelectionComponent, NzDemoTableSelectionAndOperationComponent, NzDemoTableSelectionPropsComponent, NzDemoTablePagingComponent, NzDemoTableAjaxComponent, NzDemoTableNoPaginationComponent, NzDemoTableSizeComponent ] }) - export class NzDemoTableModule { } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-basic.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-basic.component.ts index 4da4aca444..c891075ade 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-basic.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-basic.component.ts @@ -29,13 +29,10 @@ export class NzDemoTabsBasicComponent implements OnInit { } ]; - constructor() { - } - ngOnInit() { setTimeout(_ => { this.tabs[ 0 ].content = 'Change Content'; - }, 10000) + }, 10000); } } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-card.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-card.component.ts index 1d46f3617d..1139fdbe5a 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-card.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-card.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-card', @@ -13,7 +13,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsCardComponent implements OnInit { +export class NzDemoTabsCardComponent { tabs = [ { index: 1 @@ -25,11 +25,5 @@ export class NzDemoTabsCardComponent implements OnInit { index: 3 } ]; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-disabled.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-disabled.component.ts index f681eb7ad1..dcf1ad63ad 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-disabled.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-disabled.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-disabled', @@ -14,7 +14,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsDisabledComponent implements OnInit { +export class NzDemoTabsDisabledComponent { selectedIndex = 0; tabs = [ { @@ -30,11 +30,5 @@ export class NzDemoTabsDisabledComponent implements OnInit { disabled: false } ]; - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-extra.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-extra.component.ts index 83490333c6..1b91ebc467 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-extra.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-extra.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-extra', @@ -16,7 +16,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsExtraComponent implements OnInit { +export class NzDemoTabsExtraComponent { tabs = [ { index: 1 @@ -28,11 +28,4 @@ export class NzDemoTabsExtraComponent implements OnInit { index: 3 } ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-icon.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-icon.component.ts index b4c19d1514..84d22d39f1 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-icon.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-icon.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-icon', @@ -14,7 +14,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsIconComponent implements OnInit { +export class NzDemoTabsIconComponent { tabs = [ { active: true, @@ -27,11 +27,4 @@ export class NzDemoTabsIconComponent implements OnInit { icon : 'anticon anticon-android' } ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-mini.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-mini.component.ts index b8afebeff7..633bae927e 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-mini.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-mini.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-mini', @@ -13,7 +13,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsMiniComponent implements OnInit { +export class NzDemoTabsMiniComponent { tabs = [ { index: 1 @@ -25,11 +25,4 @@ export class NzDemoTabsMiniComponent implements OnInit { index: 3 } ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-move.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-move.component.ts index 39071d443b..252faf5a6a 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-move.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-move.component.ts @@ -38,15 +38,12 @@ export class NzDemoTabsMoveComponent implements OnInit { console.log(args); } - constructor() { - } - ngOnInit() { for (let i = 0; i < 11; i++) { this.tabs.push({ name : `Tab ${i}`, content: `Content of tab ${i}` - }) + }); } } } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-operation.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-operation.component.ts index 2515639a7f..ec5a2ee183 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-operation.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-operation.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-operation', @@ -19,7 +19,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsOperationComponent implements OnInit { +export class NzDemoTabsOperationComponent { tabs = [ { name: 'Tab 1' @@ -31,18 +31,12 @@ export class NzDemoTabsOperationComponent implements OnInit { closeTab(tab) { this.tabs.splice(this.tabs.indexOf(tab), 1); - }; + } newTab() { this.tabs.push({ name: 'New Tab' }); - }; - - constructor() { - } - - ngOnInit() { } } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs-position.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs-position.component.ts index 2a69962ee7..80940e1098 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs-position.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs-position.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-tabs-position', @@ -23,7 +23,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTabsPositionComponent implements OnInit { +export class NzDemoTabsPositionComponent { _position = 'top'; tabs = [ { @@ -42,11 +42,4 @@ export class NzDemoTabsPositionComponent implements OnInit { { value: 'right', label: 'right' }, { value: 'bottom', label: 'bottom' } ]; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs.component.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs.component.ts index 6a8ebc68a7..7a82673857 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs.component.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewEncapsulation} from '@angular/core'; +import {Component, ViewEncapsulation} from '@angular/core'; @Component({ selector : 'nz-demo-tabs', @@ -8,7 +8,7 @@ import {Component, OnInit, ViewEncapsulation} from '@angular/core'; './nz-demo-tabs.less', ] }) -export class NzDemoTabsComponent implements OnInit { +export class NzDemoTabsComponent { NzDemoTabsBasicCode = require('!!raw-loader!./nz-demo-tabs-basic.component'); NzDemoTabsPositionCode = require('!!raw-loader!./nz-demo-tabs-position.component'); NzDemoTabsCardCode = require('!!raw-loader!./nz-demo-tabs-card.component'); @@ -18,10 +18,4 @@ export class NzDemoTabsComponent implements OnInit { NzDemoTabsMiniCode = require('!!raw-loader!./nz-demo-tabs-mini.component'); NzDemoTabsExtraCode = require('!!raw-loader!./nz-demo-tabs-extra.component'); NzDemoTabsOperationCode = require('!!raw-loader!./nz-demo-tabs-operation.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-tabs/nz-demo-tabs.module.ts b/src/showcase/nz-demo-tabs/nz-demo-tabs.module.ts index d3d37d4282..9aeb7b7765 100644 --- a/src/showcase/nz-demo-tabs/nz-demo-tabs.module.ts +++ b/src/showcase/nz-demo-tabs/nz-demo-tabs.module.ts @@ -37,7 +37,6 @@ import { NzDemoTabsRoutingModule } from './nz-demo-tabs.routing.module'; NzDemoTabsOperationComponent ] }) - export class NzDemoTabsModule { } diff --git a/src/showcase/nz-demo-tag/nz-demo-tag-basic.component.ts b/src/showcase/nz-demo-tag/nz-demo-tag-basic.component.ts index 13a2b0edd6..61fb26ee82 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag-basic.component.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag-basic.component.ts @@ -1,16 +1,16 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-tag-basic', template: ` Tag 1 Link - Tag 2 - Prevent Default + Tag 2 + Prevent Default `, styles : [] }) -export class NzDemoTagBasicComponent implements OnInit { +export class NzDemoTagBasicComponent { onClose(event: Event): void { console.log('tag was closed.'); @@ -20,11 +20,5 @@ export class NzDemoTagBasicComponent implements OnInit { event.preventDefault(); console.log('tag can not be closed.'); } - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-tag/nz-demo-tag-checkable.component.ts b/src/showcase/nz-demo-tag/nz-demo-tag-checkable.component.ts index 3c48366922..c4a7170804 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag-checkable.component.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag-checkable.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-my-tag', @@ -28,12 +28,4 @@ export class NzDemoMyTagComponent { `, styles : [] }) -export class NzDemoTagCheckableComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoTagCheckableComponent { } diff --git a/src/showcase/nz-demo-tag/nz-demo-tag-colorful.component.ts b/src/showcase/nz-demo-tag/nz-demo-tag-colorful.component.ts index 24678f1265..f060a0ab32 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag-colorful.component.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag-colorful.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-tag-colorful', @@ -29,12 +29,4 @@ import {Component, OnInit} from '@angular/core'; `, styles : [] }) -export class NzDemoTagColorfulComponent implements OnInit { - - constructor() { - } - - ngOnInit() { - } -} - +export class NzDemoTagColorfulComponent { } diff --git a/src/showcase/nz-demo-tag/nz-demo-tag-control.component.ts b/src/showcase/nz-demo-tag/nz-demo-tag-control.component.ts index 3a6059eced..a3ecdbcabf 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag-control.component.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag-control.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewChild, ElementRef} from '@angular/core'; +import {Component, ViewChild, ElementRef} from '@angular/core'; import { NzInputDirectiveComponent } from '../../components/input/nz-input.directive.component'; @Component({ @@ -20,7 +20,7 @@ import { NzInputDirectiveComponent } from '../../components/input/nz-input.direc `, styles : [] }) -export class NzDemoTagControlComponent implements OnInit { +export class NzDemoTagControlComponent { public tags = ['Unremovable', 'Tag 2', 'Tag 3']; public inputVisible = false; @@ -50,11 +50,4 @@ export class NzDemoTagControlComponent implements OnInit { this.inputValue = ''; this.inputVisible = false; } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tag/nz-demo-tag-hot-tags.component.ts b/src/showcase/nz-demo-tag/nz-demo-tag-hot-tags.component.ts index 30df766efe..78efe7c5f1 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag-hot-tags.component.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag-hot-tags.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; const tagsFromServer = ['Movie', 'Books', 'Music', 'Sports']; @@ -13,7 +13,7 @@ const tagsFromServer = ['Movie', 'Books', 'Music', 'Sports']; `, styles : [] }) -export class NzDemoTagHotTagsComponent implements OnInit { +export class NzDemoTagHotTagsComponent { public hotTags = tagsFromServer; public selectedTags = []; @@ -26,11 +26,4 @@ export class NzDemoTagHotTagsComponent implements OnInit { } console.log('You are interested in: ', this.selectedTags); } - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tag/nz-demo-tag.component.ts b/src/showcase/nz-demo-tag/nz-demo-tag.component.ts index 3ab28df7b3..d96fdb0878 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag.component.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ @@ -9,17 +9,10 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-tag.less', ] }) -export class NzDemoTagComponent implements OnInit { +export class NzDemoTagComponent { NzDemoTagBasicCode = require('!!raw-loader!./nz-demo-tag-basic.component'); NzDemoTagControlCode = require('!!raw-loader!./nz-demo-tag-control.component'); NzDemoTagHotTagsCode = require('!!raw-loader!./nz-demo-tag-hot-tags.component'); NzDemoTagColorfulCode = require('!!raw-loader!./nz-demo-tag-colorful.component'); NzDemoTagCheckableCode = require('!!raw-loader!./nz-demo-tag-checkable.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tag/nz-demo-tag.module.ts b/src/showcase/nz-demo-tag/nz-demo-tag.module.ts index 0d1cc4911c..41fd9b2d2c 100644 --- a/src/showcase/nz-demo-tag/nz-demo-tag.module.ts +++ b/src/showcase/nz-demo-tag/nz-demo-tag.module.ts @@ -25,7 +25,6 @@ import { NzDemoTagRoutingModule } from './nz-demo-tag.routing.module'; NzDemoTagCheckableComponent, NzDemoMyTagComponent ] }) - export class NzDemoTagModule { } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline-basic.component.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline-basic.component.ts index 73ba578b9c..6119aff6b9 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline-basic.component.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline-basic.component.ts @@ -1,4 +1,5 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; + @Component({ selector: 'nz-demo-timeline-basic', template: ` @@ -10,11 +11,4 @@ import {Component, OnInit} from '@angular/core'; `, styles: [] }) - -export class NzDemoTimelineBasicComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoTimelineBasicComponent { } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline-color.component.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline-color.component.ts index 877b4039dc..68f0ce9de5 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline-color.component.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline-color.component.ts @@ -1,4 +1,5 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; + @Component({ selector: 'nz-demo-timeline-color', template: ` @@ -10,11 +11,4 @@ import {Component, OnInit} from '@angular/core'; `, styles: [] }) - -export class NzDemoTimelineColorComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoTimelineColorComponent { } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline-custom.component.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline-custom.component.ts index f320055697..3dfd7d3d6f 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline-custom.component.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline-custom.component.ts @@ -1,4 +1,5 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; + @Component({ selector: 'nz-demo-timeline-custom', template: ` @@ -16,9 +17,4 @@ import {Component, OnInit} from '@angular/core'; styles: [] }) -export class NzDemoTimelineCustomComponent implements OnInit { - constructor() { - } - ngOnInit() { - } -} +export class NzDemoTimelineCustomComponent { } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline-pending.component.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline-pending.component.ts index fa69e2128a..83aaf90e3a 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline-pending.component.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline-pending.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'nz-demo-timeline-pending', template: ` @@ -14,10 +14,4 @@ import {Component, OnInit} from '@angular/core'; styles: [] }) -export class NzDemoTimelinePendingComponent implements OnInit { - constructor() { - } - - ngOnInit() { - } -} +export class NzDemoTimelinePendingComponent { } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline-routing.module.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline-routing.module.ts index 2abbc09370..2704c815f0 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline-routing.module.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline-routing.module.ts @@ -11,7 +11,6 @@ import {NzDemoTimelineComponent} from './nz-demo-timeline.component'; ])], exports: [RouterModule] }) - export class NzDemoTimelineRoutingModule { } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline.component.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline.component.ts index fa3324c1dd..b64324ce67 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline.component.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-timeline', @@ -6,16 +6,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; templateUrl : './nz-demo-timeline.html', styleUrls : [] }) - -export class NzDemoTimelineComponent implements OnInit { +export class NzDemoTimelineComponent { NzDemoTimelineBasicCode = require('!!raw-loader!./nz-demo-timeline-basic.component'); NzDemoTimelineColorCode = require('!!raw-loader!./nz-demo-timeline-color.component'); NzDemoTimelinePendingCode = require('!!raw-loader!./nz-demo-timeline-pending.component'); NzDemoTimelineCustomCode = require('!!raw-loader!./nz-demo-timeline-custom.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-timeline/nz-demo-timeline.module.ts b/src/showcase/nz-demo-timeline/nz-demo-timeline.module.ts index d3a4013569..b770ef3850 100644 --- a/src/showcase/nz-demo-timeline/nz-demo-timeline.module.ts +++ b/src/showcase/nz-demo-timeline/nz-demo-timeline.module.ts @@ -20,6 +20,5 @@ import {NzDemoTimelineCustomComponent} from './nz-demo-timeline-custom.component NzDemoTimelinePendingComponent, NzDemoTimelineCustomComponent] }) - export class NzDemoTimelineModule { } diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-basic.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-basic.component.ts index cca62bb1df..e4b4f5ea68 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-basic.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-basic.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-basic', @@ -6,13 +6,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTimePickerBasicComponent implements OnInit { +export class NzDemoTimePickerBasicComponent { _date = null; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-change.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-change.component.ts index 9fff8fa729..3e5233be99 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-change.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-change.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-change', @@ -6,17 +6,10 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTimePickerChangeComponent implements OnInit { +export class NzDemoTimePickerChangeComponent { _date = null; _console(value) { console.log(value); - }; - - constructor() { - } - - ngOnInit() { } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled-options.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled-options.component.ts index 01a030141b..dfbd43c7ad 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled-options.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled-options.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-disabled-options', @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTimePickerDisabledOptionsComponent implements OnInit { +export class NzDemoTimePickerDisabledOptionsComponent { _date = null; newArray = (start, end) => { const result = []; @@ -29,11 +29,4 @@ export class NzDemoTimePickerDisabledOptionsComponent implements OnInit { } return []; }; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled.component.ts index 1f7cb63d32..00a7f8f7c5 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-disabled.component.ts @@ -1,18 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-disabled', template: ` - `, + `, styles : [] }) -export class NzDemoTimePickerDisabledComponent implements OnInit { +export class NzDemoTimePickerDisabledComponent { _date = new Date(); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-hide-options.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-hide-options.component.ts index 86c74efdc6..c5cb2311cf 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-hide-options.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-hide-options.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-hide-options', @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTimePickerHideOptionsComponent implements OnInit { +export class NzDemoTimePickerHideOptionsComponent { _date = null; newArray = (start, end) => { const result = []; @@ -29,11 +29,4 @@ export class NzDemoTimePickerHideOptionsComponent implements OnInit { } return []; }; - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-size.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-size.component.ts index 534ae59fa0..a6cedc5fa1 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-size.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-size.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-size', @@ -8,13 +8,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTimePickerSizeComponent implements OnInit { +export class NzDemoTimePickerSizeComponent { _date = new Date(); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-without-seconds.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-without-seconds.component.ts index 41d66d5265..d54e2d0eac 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker-without-seconds.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker-without-seconds.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-timepicker-without-seconds', @@ -6,13 +6,6 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTimePickerWithoutSecondsComponent implements OnInit { +export class NzDemoTimePickerWithoutSecondsComponent { _date = new Date(); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker.component.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker.component.ts index ccd9950e48..47e2d53fae 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker.component.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector : 'nz-demo-timepicker', @@ -8,7 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; './nz-demo-timepicker.less', ] }) -export class NzDemoTimePickerComponent implements OnInit { +export class NzDemoTimePickerComponent { NzDemoTimePickerBasicCode = require('!!raw-loader!./nz-demo-timepicker-basic.component'); NzDemoTimePickerChangeCode = require('!!raw-loader!./nz-demo-timepicker-change.component'); NzDemoTimePickerSizeCode = require('!!raw-loader!./nz-demo-timepicker-size.component'); @@ -16,10 +16,4 @@ export class NzDemoTimePickerComponent implements OnInit { NzDemoTimePickerDisabledCode = require('!!raw-loader!./nz-demo-timepicker-disabled.component'); NzDemoTimePickerDisabledOptionsCode = require('!!raw-loader!./nz-demo-timepicker-disabled-options.component'); NzDemoTimePickerHideOptionsCode = require('!!raw-loader!./nz-demo-timepicker-hide-options.component'); - - constructor() { - } - - ngOnInit() { - } } diff --git a/src/showcase/nz-demo-timepicker/nz-demo-timepicker.module.ts b/src/showcase/nz-demo-timepicker/nz-demo-timepicker.module.ts index b7d5adb344..3883f4bf45 100644 --- a/src/showcase/nz-demo-timepicker/nz-demo-timepicker.module.ts +++ b/src/showcase/nz-demo-timepicker/nz-demo-timepicker.module.ts @@ -18,7 +18,6 @@ import { NzDemoTimePickerRoutingModule } from './nz-demo-timepicker.routing.modu imports : [ NzDemoTimePickerRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoTimePickerComponent, NzDemoTimePickerBasicComponent, NzDemoTimePickerChangeComponent, NzDemoTimePickerSizeComponent, NzDemoTimePickerWithoutSecondsComponent, NzDemoTimePickerDisabledComponent, NzDemoTimePickerDisabledOptionsComponent, NzDemoTimePickerHideOptionsComponent ], }) - export class NzDemoTimePickerModule { } diff --git a/src/showcase/nz-demo-tooltip/nz-demo-tooltip-basic.component.ts b/src/showcase/nz-demo-tooltip/nz-demo-tooltip-basic.component.ts index c2f9ce44c8..9f374de241 100644 --- a/src/showcase/nz-demo-tooltip/nz-demo-tooltip-basic.component.ts +++ b/src/showcase/nz-demo-tooltip/nz-demo-tooltip-basic.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + @Component({ selector: 'nz-demo-tooltip-basic', template: ` @@ -10,7 +11,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTooltipBasicComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoTooltipBasicComponent { } diff --git a/src/showcase/nz-demo-tooltip/nz-demo-tooltip-position.component.ts b/src/showcase/nz-demo-tooltip/nz-demo-tooltip-position.component.ts index 8324c4d23a..28fd1797d9 100644 --- a/src/showcase/nz-demo-tooltip/nz-demo-tooltip-position.component.ts +++ b/src/showcase/nz-demo-tooltip/nz-demo-tooltip-position.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + @Component({ selector: 'nz-demo-tooltip-position', template: ` @@ -62,7 +63,4 @@ import { Component, OnInit } from '@angular/core'; }` ] }) -export class NzDemoTooltipPositionComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoTooltipPositionComponent { } diff --git a/src/showcase/nz-demo-tooltip/nz-demo-tooltip-template.component.ts b/src/showcase/nz-demo-tooltip/nz-demo-tooltip-template.component.ts index dd938eb1f7..6fe27e34b2 100644 --- a/src/showcase/nz-demo-tooltip/nz-demo-tooltip-template.component.ts +++ b/src/showcase/nz-demo-tooltip/nz-demo-tooltip-template.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; + @Component({ selector: 'nz-demo-tooltip-template', template: ` @@ -11,7 +12,4 @@ import { Component, OnInit } from '@angular/core'; `, styles : [] }) -export class NzDemoTooltipTemplateComponent implements OnInit { - ngOnInit() { - } -} +export class NzDemoTooltipTemplateComponent { } diff --git a/src/showcase/nz-demo-tooltip/nz-demo-tooltip.component.ts b/src/showcase/nz-demo-tooltip/nz-demo-tooltip.component.ts index 2ffd3ff1b5..9d0c82abd7 100644 --- a/src/showcase/nz-demo-tooltip/nz-demo-tooltip.component.ts +++ b/src/showcase/nz-demo-tooltip/nz-demo-tooltip.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; + @Component({ selector : 'nz-demo-tooltip', encapsulation: ViewEncapsulation.None, @@ -8,15 +9,8 @@ import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@ './nz-demo-tooltip.less', ] }) -export class NzDemoTooltipComponent implements OnInit { +export class NzDemoTooltipComponent { NzDemoTooltipBasicCode = require('!!raw-loader!./nz-demo-tooltip-basic.component'); NzDemoTooltipPositionCode = require('!!raw-loader!./nz-demo-tooltip-position.component'); NzDemoTooltipTemplateCode = require('!!raw-loader!./nz-demo-tooltip-template.component'); - - constructor() { - } - - ngOnInit() { - } } - diff --git a/src/showcase/nz-demo-tooltip/nz-demo-tooltip.module.ts b/src/showcase/nz-demo-tooltip/nz-demo-tooltip.module.ts index 6599bda96e..641c87ce29 100644 --- a/src/showcase/nz-demo-tooltip/nz-demo-tooltip.module.ts +++ b/src/showcase/nz-demo-tooltip/nz-demo-tooltip.module.ts @@ -15,7 +15,6 @@ import { NzDemoTooltipRoutingModule } from './nz-demo-tooltip.routing.module'; imports : [ NzDemoTooltipRoutingModule, CommonModule, NzCodeBoxModule, NgZorroAntdModule, FormsModule ], declarations: [ NzDemoTooltipBasicComponent, NzDemoTooltipComponent, NzDemoTooltipPositionComponent, NzDemoTooltipTemplateComponent ] }) - export class NzDemoTooltipModule { } diff --git a/src/showcase/nz-demo-transfer/nz-demo-transfer-advanced.component.ts b/src/showcase/nz-demo-transfer/nz-demo-transfer-advanced.component.ts index dceb35eb44..3f6495c717 100644 --- a/src/showcase/nz-demo-transfer/nz-demo-transfer-advanced.component.ts +++ b/src/showcase/nz-demo-transfer/nz-demo-transfer-advanced.component.ts @@ -6,7 +6,7 @@ import { NzMessageService } from '../../../index.showcase'; template: `