diff --git a/components/alert/alert.component.ts b/components/alert/alert.component.ts index 593744aa7f..b6c33d4dae 100644 --- a/components/alert/alert.component.ts +++ b/components/alert/alert.component.ts @@ -51,7 +51,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'alert'; (@slideAlertMotion.done)="onFadeAnimationDone()" > - +
@@ -72,7 +72,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'alert'; (click)="closeAlert()" > - + diff --git a/components/auto-complete/demo/certain-category.ts b/components/auto-complete/demo/certain-category.ts index e9078d42dc..317eff20a8 100644 --- a/components/auto-complete/demo/certain-category.ts +++ b/components/auto-complete/demo/certain-category.ts @@ -21,7 +21,7 @@ export interface AutocompleteOptionGroups { /> - + diff --git a/components/auto-complete/demo/uncertain-category.ts b/components/auto-complete/demo/uncertain-category.ts index 11a06ee2a5..3aa916cc17 100644 --- a/components/auto-complete/demo/uncertain-category.ts +++ b/components/auto-complete/demo/uncertain-category.ts @@ -16,7 +16,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; diff --git a/components/avatar/avatar.component.ts b/components/avatar/avatar.component.ts index e4a8cdb24b..369f7be5d5 100644 --- a/components/avatar/avatar.component.ts +++ b/components/avatar/avatar.component.ts @@ -33,7 +33,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'avatar'; selector: 'nz-avatar', exportAs: 'nzAvatar', template: ` - + {{ nzText }} `, diff --git a/components/back-top/back-top.component.ts b/components/back-top/back-top.component.ts index 1eaa3db027..1ad6b15b91 100644 --- a/components/back-top/back-top.component.ts +++ b/components/back-top/back-top.component.ts @@ -47,7 +47,7 @@ const passiveEventListenerOptions = normalizePassiveListenerOptions({ passive: t
- +
diff --git a/components/badge/demo/basic.ts b/components/badge/demo/basic.ts index 7322e0ebba..084ebb261b 100644 --- a/components/badge/demo/basic.ts +++ b/components/badge/demo/basic.ts @@ -13,7 +13,7 @@ import { Component } from '@angular/core'; - + `, styles: [ diff --git a/components/badge/demo/change.ts b/components/badge/demo/change.ts index 8458dbfdfe..422e79f0b3 100644 --- a/components/badge/demo/change.ts +++ b/components/badge/demo/change.ts @@ -8,8 +8,8 @@ import { Component } from '@angular/core'; - - + +

diff --git a/components/badge/demo/dot.ts b/components/badge/demo/dot.ts index 579afbcedd..8b71a68929 100644 --- a/components/badge/demo/dot.ts +++ b/components/badge/demo/dot.ts @@ -3,8 +3,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-badge-dot', template: ` - - + + Link something diff --git a/components/badge/demo/no-wrapper.ts b/components/badge/demo/no-wrapper.ts index 09dc3457b6..12f3e90cac 100644 --- a/components/badge/demo/no-wrapper.ts +++ b/components/badge/demo/no-wrapper.ts @@ -15,7 +15,7 @@ import { Component } from '@angular/core'; - + diff --git a/components/breadcrumb/breadcrumb-item.component.ts b/components/breadcrumb/breadcrumb-item.component.ts index e0a014ea30..5f0a4fcdc7 100644 --- a/components/breadcrumb/breadcrumb-item.component.ts +++ b/components/breadcrumb/breadcrumb-item.component.ts @@ -19,7 +19,7 @@ import { NzBreadcrumb } from './breadcrumb'; - + diff --git a/components/breadcrumb/demo/separator.ts b/components/breadcrumb/demo/separator.ts index 0809b78adb..10638d3f90 100644 --- a/components/breadcrumb/demo/separator.ts +++ b/components/breadcrumb/demo/separator.ts @@ -20,7 +20,7 @@ import { Component } from '@angular/core'; An Application - + `, styles: [ ` diff --git a/components/breadcrumb/demo/with-icon.ts b/components/breadcrumb/demo/with-icon.ts index 924ad026c0..95a8190789 100644 --- a/components/breadcrumb/demo/with-icon.ts +++ b/components/breadcrumb/demo/with-icon.ts @@ -5,11 +5,11 @@ import { Component } from '@angular/core'; template: ` - + - + Application List diff --git a/components/button/button.component.ts b/components/button/button.component.ts index 49cef36faa..16a1fce5ce 100644 --- a/components/button/button.component.ts +++ b/components/button/button.component.ts @@ -43,7 +43,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'button'; changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: ` - + `, host: { @@ -103,9 +103,22 @@ export class NzButtonComponent implements OnDestroy, OnChanges, AfterViewInit, A assertIconOnly(element: HTMLButtonElement, renderer: Renderer2): void { const listOfNode = Array.from(element.childNodes); - const iconCount = listOfNode.filter(node => node.nodeName === 'I').length; + const iconCount = listOfNode.filter(node => { + const iconChildNodes = Array.from(node.childNodes || []); + return node.nodeName === 'SPAN' && iconChildNodes.length > 0 && iconChildNodes.every(ic => ic.nodeName === 'svg'); + }).length; const noText = listOfNode.every(node => node.nodeName !== '#text'); - const noSpan = listOfNode.every(node => node.nodeName !== 'SPAN'); + // ignore icon + const noSpan = listOfNode + .filter(node => { + const iconChildNodes = Array.from(node.childNodes || []); + return !( + node.nodeName === 'SPAN' && + iconChildNodes.length > 0 && + iconChildNodes.every(ic => ic.nodeName === 'svg') + ); + }) + .every(node => node.nodeName !== 'SPAN'); const isIconOnly = noSpan && noText && iconCount >= 1; if (isIconOnly) { renderer.addClass(element, 'ant-btn-icon-only'); diff --git a/components/button/button.spec.ts b/components/button/button.spec.ts index d13566d2b9..e8314dfc16 100644 --- a/components/button/button.spec.ts +++ b/components/button/button.spec.ts @@ -246,7 +246,7 @@ export class TestButtonComponent { @Component({ template: ` ` @@ -263,7 +263,7 @@ export class TestButtonBindingComponent { template: ` ` }) @@ -277,7 +277,7 @@ export class TestButtonWithIconComponent implements OnInit { @Component({ template: ` ` }) @@ -286,7 +286,7 @@ export class TestButtonIconOnlyComponent {} @Component({ template: ` ` }) diff --git a/components/button/demo/button-group.ts b/components/button/demo/button-group.ts index 35374957de..494054cfa2 100644 --- a/components/button/demo/button-group.ts +++ b/components/button/demo/button-group.ts @@ -22,17 +22,17 @@ import { Component } from '@angular/core';

With Icon

- - + + `, styles: [ diff --git a/components/button/demo/icon.ts b/components/button/demo/icon.ts index a3af2fa8dc..d9671ad882 100644 --- a/components/button/demo/icon.ts +++ b/components/button/demo/icon.ts @@ -3,26 +3,26 @@ import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-button-icon', template: ` - + - +
- + - + `, diff --git a/components/button/demo/loading.ts b/components/button/demo/loading.ts index 83aef03e75..43eb23240e 100644 --- a/components/button/demo/loading.ts +++ b/components/button/demo/loading.ts @@ -4,14 +4,14 @@ import { Component } from '@angular/core'; selector: 'nz-demo-button-loading', template: `

diff --git a/components/button/demo/multiple.ts b/components/button/demo/multiple.ts index f234753cc2..e8df609a81 100644 --- a/components/button/demo/multiple.ts +++ b/components/button/demo/multiple.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; - + > diff --git a/components/layout/demo/fixed-sider.ts b/components/layout/demo/fixed-sider.ts index bd49d1ace7..8daf8c5689 100644 --- a/components/layout/demo/fixed-sider.ts +++ b/components/layout/demo/fixed-sider.ts @@ -8,35 +8,35 @@ import { Component } from '@angular/core';
  • - + nav 1
  • - + nav 2
  • - + nav 3
  • - + nav 4
  • - + nav 5
  • - + nav 6
  • - + nav 7
  • - + nav 8
diff --git a/components/layout/demo/responsive.ts b/components/layout/demo/responsive.ts index f9e5819eae..6889369584 100644 --- a/components/layout/demo/responsive.ts +++ b/components/layout/demo/responsive.ts @@ -8,19 +8,19 @@ import { Component } from '@angular/core';
  • - + nav 1
  • - + nav 2
  • - + nav 3
  • - + nav 4
diff --git a/components/layout/demo/side.ts b/components/layout/demo/side.ts index 2e54613ccb..a7897a4432 100644 --- a/components/layout/demo/side.ts +++ b/components/layout/demo/side.ts @@ -8,11 +8,11 @@ import { Component } from '@angular/core';
  • - + Option 1
  • - + Option 2
  • @@ -29,7 +29,7 @@ import { Component } from '@angular/core';
  • - + File
    • diff --git a/components/layout/layout.spec.ts b/components/layout/layout.spec.ts index 7afbe974af..3023ae0670 100644 --- a/components/layout/layout.spec.ts +++ b/components/layout/layout.spec.ts @@ -231,12 +231,12 @@ describe('layout', () => { - + >
    Bill is a cat.
    @@ -245,7 +245,7 @@ describe('layout', () => {     - + ` }) @@ -304,7 +304,7 @@ export class NzLayoutSideComponent { - + ` }) diff --git a/components/layout/sider-trigger.component.ts b/components/layout/sider-trigger.component.ts index 2da8876a80..eaeaf1b2cf 100644 --- a/components/layout/sider-trigger.component.ts +++ b/components/layout/sider-trigger.component.ts @@ -29,11 +29,11 @@ import { NzBreakpointKey } from 'ng-zorro-antd/core/services'; - - + + - + `, host: { diff --git a/components/list/demo/vertical.ts b/components/list/demo/vertical.ts index 468e485a06..c0f61c9f8e 100644 --- a/components/list/demo/vertical.ts +++ b/components/list/demo/vertical.ts @@ -25,15 +25,15 @@ interface ItemData { {{ item.content }}
      - + 156 - + 156 - + 2
    diff --git a/components/list/list.spec.ts b/components/list/list.spec.ts index 42111ab5a3..11fa581899 100644 --- a/components/list/list.spec.ts +++ b/components/list/list.spec.ts @@ -312,7 +312,7 @@ class TestListWithTemplateComponent { - + 156 diff --git a/components/mention/mention.component.ts b/components/mention/mention.component.ts index acfb37e5db..b5cd5dbf1a 100644 --- a/components/mention/mention.component.ts +++ b/components/mention/mention.component.ts @@ -93,7 +93,7 @@ export type MentionPlacement = 'top' | 'bottom'; class="ant-mentions-dropdown-menu-item ant-mentions-dropdown-menu-item-disabled" *ngIf="filteredSuggestions.length === 0" > - + diff --git a/components/menu/demo/horizontal.ts b/components/menu/demo/horizontal.ts index 285aaa5c7e..760c5bf17e 100755 --- a/components/menu/demo/horizontal.ts +++ b/components/menu/demo/horizontal.ts @@ -5,11 +5,11 @@ import { Component } from '@angular/core'; template: `
    • - + Navigation One
    • - + Navigation Two
    • diff --git a/components/menu/demo/inline-collapsed.ts b/components/menu/demo/inline-collapsed.ts index b6b8e4f461..8cb489c25f 100644 --- a/components/menu/demo/inline-collapsed.ts +++ b/components/menu/demo/inline-collapsed.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; template: `
      • - + Navigation One
      • diff --git a/components/menu/demo/recursive.ts b/components/menu/demo/recursive.ts index 90b8b12260..12ebb7e483 100644 --- a/components/menu/demo/recursive.ts +++ b/components/menu/demo/recursive.ts @@ -14,7 +14,7 @@ import { Component } from '@angular/core'; [nzDisabled]="menu.disabled" [nzSelected]="menu.selected" > - + {{ menu.title }}
      • -
      • SubTitle
        • +
      • SubTitle
      • -SubTitle +SubTitle ``` | Param | Description | Type | Default value | @@ -84,10 +84,10 @@ You can set the title of `[nz-menu-group]` in the following ways. ```html
      • -
      • SubTitle
        • +
      • SubTitle
      • -SubTitle +SubTitle ``` | Param | Description | Type | Default value | diff --git a/components/menu/doc/index.zh-CN.md b/components/menu/doc/index.zh-CN.md index e7d003dda4..daac8ef069 100755 --- a/components/menu/doc/index.zh-CN.md +++ b/components/menu/doc/index.zh-CN.md @@ -63,10 +63,10 @@ import { NzMenuModule } from 'ng-zorro-antd/menu'; ```html
      • -
      • SubTitle
        • +
      • SubTitle
      • -SubTitle +SubTitle ``` | 参数 | 说明 | 类型 | 默认值 | @@ -86,10 +86,10 @@ import { NzMenuModule } from 'ng-zorro-antd/menu'; ```html
      • -
      • SubTitle
        • +
      • SubTitle
      • -SubTitle +SubTitle ``` | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | diff --git a/components/menu/menu.spec.ts b/components/menu/menu.spec.ts index 459b33d056..3b6b7a1207 100644 --- a/components/menu/menu.spec.ts +++ b/components/menu/menu.spec.ts @@ -540,7 +540,7 @@ describe('menu', () => {
        • - + Navigation Three - Submenu
            @@ -592,7 +592,7 @@ export class NzTestMenuHorizontalComponent {
            • - + Navigation One
                @@ -616,7 +616,7 @@ export class NzTestMenuInlineComponent {
                • - + {{ l1.text }}
                    @@ -649,11 +649,11 @@ export class NzDemoMenuNgForComponent { template: `
                    • - + Navigation One
                    • - + Navigation Two
                    • @@ -765,7 +765,7 @@ export class NzTestNgIfMenuComponent { template: `
                      • - + Navigation One
                      • @@ -783,11 +783,11 @@ export class NzTestSubMenuSelectedComponent {} template: `
                        • - + Navigation One
                        • diff --git a/components/menu/submenu-title.component.ts b/components/menu/submenu-title.component.ts index 55729b2d95..c0d2cf7130 100644 --- a/components/menu/submenu-title.component.ts +++ b/components/menu/submenu-title.component.ts @@ -28,7 +28,7 @@ import { NzMenuModeType } from './menu.types'; encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, template: ` - + {{ nzTitle }} @@ -38,11 +38,11 @@ import { NzMenuModeType } from './menu.types'; *ngIf="isMenuInsideDropDown; else notDropdownTpl" class="ant-dropdown-menu-submenu-expand-icon" > - - + + - + `, host: { diff --git a/components/message/message.component.ts b/components/message/message.component.ts index b8e7fce071..d5c8d9308a 100644 --- a/components/message/message.component.ts +++ b/components/message/message.component.ts @@ -38,11 +38,11 @@ import { NzMessageData } from './typings';
                          - - - - - + + + + + diff --git a/components/modal/modal-close.component.ts b/components/modal/modal-close.component.ts index db00c1ca02..c421b0fd10 100644 --- a/components/modal/modal-close.component.ts +++ b/components/modal/modal-close.component.ts @@ -13,7 +13,7 @@ import { ModalOptions } from './modal-types'; template: ` - + `, diff --git a/components/modal/modal-confirm-container.component.ts b/components/modal/modal-confirm-container.component.ts index 77bc6edac4..e4a2a2977a 100644 --- a/components/modal/modal-confirm-container.component.ts +++ b/components/modal/modal-confirm-container.component.ts @@ -49,7 +49,7 @@ import { ModalOptions } from './modal-types';
                          - + diff --git a/components/notification/demo/custom-icon.ts b/components/notification/demo/custom-icon.ts index 06d13e9ef6..7490454f25 100644 --- a/components/notification/demo/custom-icon.ts +++ b/components/notification/demo/custom-icon.ts @@ -9,7 +9,7 @@ import { NzNotificationService } from 'ng-zorro-antd/notification';
                          - +
                          Notification Title
                          diff --git a/components/notification/demo/placement.ts b/components/notification/demo/placement.ts index 764154427d..ae8cfc6120 100644 --- a/components/notification/demo/placement.ts +++ b/components/notification/demo/placement.ts @@ -6,29 +6,29 @@ import { NzNotificationPlacement, NzNotificationService } from 'ng-zorro-antd/no selector: 'nz-demo-notification-placement', template: ` `, diff --git a/components/notification/notification.component.ts b/components/notification/notification.component.ts index 4c9b179c78..18d230a36d 100644 --- a/components/notification/notification.component.ts +++ b/components/notification/notification.component.ts @@ -34,30 +34,30 @@ import { NzNotificationData } from './typings'; >
                          - - + - + - + + >
                          @@ -73,11 +73,11 @@ import { NzNotificationData } from './typings'; - + - + diff --git a/components/page-header/demo/content.ts b/components/page-header/demo/content.ts index 920e5ea801..9fbc8c0e18 100644 --- a/components/page-header/demo/content.ts +++ b/components/page-header/demo/content.ts @@ -42,7 +42,7 @@ import { Component } from '@angular/core'; nzPlacement="bottomRight" style="border: none; padding: 0" > - + diff --git a/components/page-header/page-header.component.ts b/components/page-header/page-header.component.ts index 246c3d358f..1b6aa0fac9 100644 --- a/components/page-header/page-header.component.ts +++ b/components/page-header/page-header.component.ts @@ -44,7 +44,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'pageHeader';
                          - +
                          diff --git a/components/page-header/page-header.spec.ts b/components/page-header/page-header.spec.ts index 58b05bb1c3..2b197b905f 100644 --- a/components/page-header/page-header.spec.ts +++ b/components/page-header/page-header.spec.ts @@ -112,7 +112,7 @@ describe('NzPageHeaderComponent', () => { const fixture = TestBed.createComponent(NzDemoPageHeaderBasicComponent); const pageHeader = fixture.debugElement.query(By.directive(NzPageHeaderComponent)); fixture.detectChanges(); - expect(pageHeader.nativeElement.querySelector('.ant-page-header-back i.anticon-arrow-left')).toBeTruthy(); + expect(pageHeader.nativeElement.querySelector('.ant-page-header-back span.anticon-arrow-left')).toBeTruthy(); }); it('should does not have an default back icon', () => { @@ -161,7 +161,7 @@ describe('NzPageHeaderComponent', () => { it('should have an default back icon', () => { fixture.detectChanges(); - expect(pageHeader.nativeElement.querySelector('.ant-page-header-back i.anticon-arrow-right')).toBeTruthy(); + expect(pageHeader.nativeElement.querySelector('.ant-page-header-back span.anticon-arrow-right')).toBeTruthy(); }); }); }); diff --git a/components/pagination/pagination-item.component.ts b/components/pagination/pagination-item.component.ts index 6cc838fbbb..f82f59abf1 100644 --- a/components/pagination/pagination-item.component.ts +++ b/components/pagination/pagination-item.component.ts @@ -30,14 +30,14 @@ import { PaginationItemRenderContext, PaginationItemType } from './pagination.ty {{ page }} @@ -45,12 +45,12 @@ import { PaginationItemRenderContext, PaginationItemType } from './pagination.ty
                          - - + + - - + + ••• diff --git a/components/popconfirm/demo/custom-icon.ts b/components/popconfirm/demo/custom-icon.ts index e737945d75..350a6c6e9a 100644 --- a/components/popconfirm/demo/custom-icon.ts +++ b/components/popconfirm/demo/custom-icon.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; template: ` Delete - + ` }) diff --git a/components/popconfirm/popconfirm.ts b/components/popconfirm/popconfirm.ts index aaf8ecca52..06ff533ba7 100644 --- a/components/popconfirm/popconfirm.ts +++ b/components/popconfirm/popconfirm.ts @@ -168,7 +168,7 @@ export class NzPopconfirmDirective extends NzTooltipBaseDirective {
                          - +
                          {{ nzTitle }}
                           diff --git a/components/popover/demo/template.ts b/components/popover/demo/template.ts index 44b6d06ede..d74352d60d 100644 --- a/components/popover/demo/template.ts +++ b/components/popover/demo/template.ts @@ -7,11 +7,11 @@ import { Component } from '@angular/core'; Render Template - + Title - + Content ` diff --git a/components/progress/demo/circle-dynamic.ts b/components/progress/demo/circle-dynamic.ts index d7e1ad7a6b..60f21a21fe 100644 --- a/components/progress/demo/circle-dynamic.ts +++ b/components/progress/demo/circle-dynamic.ts @@ -5,8 +5,8 @@ import { Component } from '@angular/core'; template: ` - - + + `, styles: [ diff --git a/components/progress/demo/dynamic.ts b/components/progress/demo/dynamic.ts index d2c2299815..d5cfd1aa63 100644 --- a/components/progress/demo/dynamic.ts +++ b/components/progress/demo/dynamic.ts @@ -5,8 +5,8 @@ import { Component } from '@angular/core'; template: ` - - + + ` }) diff --git a/components/progress/progress.component.ts b/components/progress/progress.component.ts index d8165146f1..0bedec0067 100644 --- a/components/progress/progress.component.ts +++ b/components/progress/progress.component.ts @@ -61,7 +61,7 @@ const defaultFormatter: NzProgressFormatter = (p: number): string => `${p}%`; - + diff --git a/components/rate/demo/character.ts b/components/rate/demo/character.ts index e2b53d703d..0112b932bd 100644 --- a/components/rate/demo/character.ts +++ b/components/rate/demo/character.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core';
                          - + 好 A `, diff --git a/components/rate/demo/customize.ts b/components/rate/demo/customize.ts index b16da0bbfc..3f01c95bea 100644 --- a/components/rate/demo/customize.ts +++ b/components/rate/demo/customize.ts @@ -12,11 +12,11 @@ import { Component } from '@angular/core';                           - - - - - + + + + + `, diff --git a/components/rate/doc/index.en-US.md b/components/rate/doc/index.en-US.md index db5f030555..a39b2bfd50 100644 --- a/components/rate/doc/index.en-US.md +++ b/components/rate/doc/index.en-US.md @@ -25,7 +25,7 @@ import { NzRateModule } from 'ng-zorro-antd/rate'; | `[nzAllowClear]` | whether to allow clear when click again | `boolean` | `true` | ✅ | | `[nzAllowHalf]` | whether to allow semi selection | `boolean` | `false` | ✅ | | `[nzAutoFocus]` | get focus when component mounted | `boolean` | `false` | -| `[nzCharacter]` | custom character of rate | `TemplateRef` | `` | +| `[nzCharacter]` | custom character of rate | `TemplateRef` | `` | | `[nzCount]` | star count | `number` | `5` | | `[nzDisabled]` | read only, unable to interact | `boolean` | `false` | | `[nzTooltips]` | Customize tooltip by each character | `string[]` | `[]` | diff --git a/components/rate/doc/index.zh-CN.md b/components/rate/doc/index.zh-CN.md index 20cfce53c6..5fd94e7fd0 100644 --- a/components/rate/doc/index.zh-CN.md +++ b/components/rate/doc/index.zh-CN.md @@ -26,7 +26,7 @@ import { NzRateModule } from 'ng-zorro-antd/rate'; | `[nzAllowClear]` | 是否允许再次点击后清除 | `boolean` | `true` | ✅ | | `[nzAllowHalf]` | 是否允许半选 | `boolean` | `false` | ✅ | | `[nzAutoFocus]` | 自动获取焦点 | `boolean` | `false` | -| `[nzCharacter]` | 自定义字符 | `TemplateRef` | `` | +| `[nzCharacter]` | 自定义字符 | `TemplateRef` | `` | | `[nzCount]` | star 总数 | `number` | `5` | | `[nzDisabled]` | 只读，无法进行交互 | `boolean` | `false` | | `[nzTooltips]` | 自定义每项的提示信息 | `string[]` | `[]` | diff --git a/components/rate/rate-item.component.ts b/components/rate/rate-item.component.ts index f6703f2565..7d9364aa69 100644 --- a/components/rate/rate-item.component.ts +++ b/components/rate/rate-item.component.ts @@ -40,7 +40,7 @@ import { InputBoolean } from 'ng-zorro-antd/core/util';
                          - + ` }) diff --git a/components/resizable/demo/customize.ts b/components/resizable/demo/customize.ts index 64d35a274b..0f8d83c656 100644 --- a/components/resizable/demo/customize.ts +++ b/components/resizable/demo/customize.ts @@ -8,11 +8,11 @@ import { NzResizeEvent } from 'ng-zorro-antd/resizable';
                          content - +
                          - +
                          diff --git a/components/result/demo/error.ts b/components/result/demo/error.ts index 70a1346de3..4e525300ff 100644 --- a/components/result/demo/error.ts +++ b/components/result/demo/error.ts @@ -12,12 +12,12 @@ import { Component } from '@angular/core';

                          The content you submitted has the following error:

                          - + Your account has been frozen Thaw immediately >

                          - + Your account is not yet eligible to apply Apply immediately >

                          diff --git a/components/result/result.component.ts b/components/result/result.component.ts index 2658aa1c10..801a76ee75 100644 --- a/components/result/result.component.ts +++ b/components/result/result.component.ts @@ -41,7 +41,7 @@ const ExceptionStatus = ['404', '500', '403']; - + diff --git a/components/result/result.spec.ts b/components/result/result.spec.ts index 2b51c93408..b6dcbf1924 100644 --- a/components/result/result.spec.ts +++ b/components/result/result.spec.ts @@ -14,7 +14,7 @@ import { NzResultModule } from './result.module'; selector: 'nz-test-basic-result', template: ` - +
                          Content Title
                          Content SubTitle
                          Content
                          diff --git a/components/segmented/segmented.component.ts b/components/segmented/segmented.component.ts index acf74ef4d0..0b40183179 100644 --- a/components/segmented/segmented.component.ts +++ b/components/segmented/segmented.component.ts @@ -60,7 +60,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'segmented';
                          - + - + Windows - + Mac - + Android diff --git a/components/select/demo/custom-dropdown-menu.ts b/components/select/demo/custom-dropdown-menu.ts index 002bf11043..39e3df1748 100644 --- a/components/select/demo/custom-dropdown-menu.ts +++ b/components/select/demo/custom-dropdown-menu.ts @@ -11,7 +11,7 @@ import { Component } from '@angular/core';
                          - + Add item
                          diff --git a/components/select/demo/custom-template.ts b/components/select/demo/custom-template.ts index ae5f013a2c..45df2343a9 100644 --- a/components/select/demo/custom-template.ts +++ b/components/select/demo/custom-template.ts @@ -9,7 +9,7 @@ import { Component } from '@angular/core'; - + {{ selected.nzLabel }}
                          @@ -21,7 +21,7 @@ import { Component } from '@angular/core';
                          - + {{ selected.nzLabel }}
                          diff --git a/components/select/demo/select-users.ts b/components/select/demo/select-users.ts index ce841ce4f3..f395db5b7a 100644 --- a/components/select/demo/select-users.ts +++ b/components/select/demo/select-users.ts @@ -19,7 +19,7 @@ import { catchError, debounceTime, map, switchMap } from 'rxjs/operators';                           - + Loading Data... diff --git a/components/select/option-item.component.ts b/components/select/option-item.component.ts index 9b0102c9e1..926622723b 100644 --- a/components/select/option-item.component.ts +++ b/components/select/option-item.component.ts @@ -33,7 +33,7 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; {{ label }}
                          - +
                          `, changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/components/select/select-arrow.component.ts b/components/select/select-arrow.component.ts index f489bdc60b..74347e5a30 100644 --- a/components/select/select-arrow.component.ts +++ b/components/select/select-arrow.component.ts @@ -12,15 +12,15 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, template: ` - + - - + + - + diff --git a/components/select/select-clear.component.ts b/components/select/select-clear.component.ts index 0427f9d7b5..492b3cbaf1 100644 --- a/components/select/select-clear.component.ts +++ b/components/select/select-clear.component.ts @@ -20,13 +20,13 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, template: ` - + > `, host: { class: 'ant-select-clear', diff --git a/components/select/select-item.component.ts b/components/select/select-item.component.ts index 62272bfc1d..d9e1d5d078 100644 --- a/components/select/select-item.component.ts +++ b/components/select/select-item.component.ts @@ -25,7 +25,7 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; {{ label }}                           - + `, host: { diff --git a/components/skeleton/demo/list.ts b/components/skeleton/demo/list.ts index 9ca6a83415..107e79c87e 100644 --- a/components/skeleton/demo/list.ts +++ b/components/skeleton/demo/list.ts @@ -13,15 +13,15 @@ import { Component } from '@angular/core'; > - + 156 - + 156 - + 2 diff --git a/components/slider/demo/icon-slider.ts b/components/slider/demo/icon-slider.ts index 5706bb3ee3..ad64177924 100644 --- a/components/slider/demo/icon-slider.ts +++ b/components/slider/demo/icon-slider.ts @@ -4,9 +4,9 @@ import { Component, OnInit } from '@angular/core'; selector: 'nz-demo-slider-icon-slider', template: `
                          - + - +
                          `, styles: [ diff --git a/components/space/demo/basic.ts b/components/space/demo/basic.ts index 5f58b5365f..857ef484d5 100644 --- a/components/space/demo/basic.ts +++ b/components/space/demo/basic.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; diff --git a/components/spin/demo/custom-indicator.ts b/components/spin/demo/custom-indicator.ts index 6e06b9d0ff..e243634962 100644 --- a/components/spin/demo/custom-indicator.ts +++ b/components/spin/demo/custom-indicator.ts @@ -3,7 +3,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-spin-custom-indicator', template: ` - + `, styles: [ diff --git a/components/spin/spin.component.ts b/components/spin/spin.component.ts index 59a2b4ab86..3f2a2c4ef1 100644 --- a/components/spin/spin.component.ts +++ b/components/spin/spin.component.ts @@ -33,10 +33,10 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'spin'; template: ` - - - - + + + +
                          diff --git a/components/spin/spin.spec.ts b/components/spin/spin.spec.ts index 24e4f3945d..ce3a45fba2 100644 --- a/components/spin/spin.spec.ts +++ b/components/spin/spin.spec.ts @@ -155,7 +155,7 @@ describe('spin', () => { // eslint-disable-next-line selector: 'nz-test-basic-spin', template: ` - + - + @@ -26,7 +26,7 @@ import { Component } from '@angular/core'; [nzSuffix]="'%'" [nzValueStyle]="{ color: '#CF1322' }" > - + diff --git a/components/statistic/demo/unit.ts b/components/statistic/demo/unit.ts index 9b785c21d2..2f7e9a4626 100644 --- a/components/statistic/demo/unit.ts +++ b/components/statistic/demo/unit.ts @@ -6,7 +6,7 @@ import { Component } from '@angular/core'; - + diff --git a/components/steps/demo/icon.ts b/components/steps/demo/icon.ts index 88699087f4..6c22335705 100644 --- a/components/steps/demo/icon.ts +++ b/components/steps/demo/icon.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core'; - + ` }) diff --git a/components/steps/step.component.ts b/components/steps/step.component.ts index 3d11deec22..963783c3f8 100644 --- a/components/steps/step.component.ts +++ b/components/steps/step.component.ts @@ -48,14 +48,16 @@ import { NzProgressFormatter } from 'ng-zorro-antd/progress'; [nzStrokeWidth]="4" >
                          - - + + {{ index + 1 }} - + diff --git a/components/steps/steps.spec.ts b/components/steps/steps.spec.ts index 79a138d12f..7011410599 100644 --- a/components/steps/steps.spec.ts +++ b/components/steps/steps.spec.ts @@ -566,7 +566,7 @@ export class NzTestOuterStepsComponent { titleTemplate descriptionTemplate - + ` }) export class NzTestInnerStepStringComponent { @@ -589,7 +589,7 @@ export class NzTestInnerStepStringComponent { titleTemplate descriptionTemplate - + ` }) export class NzTestInnerStepTemplateComponent {} diff --git a/components/switch/demo/text.ts b/components/switch/demo/text.ts index 18ca76f72d..7ae0b6bb2f 100755 --- a/components/switch/demo/text.ts +++ b/components/switch/demo/text.ts @@ -14,8 +14,8 @@ import { Component } from '@angular/core'; [nzCheckedChildren]="checkedTemplate" [nzUnCheckedChildren]="unCheckedTemplate" > - - + + ` }) export class NzDemoSwitchTextComponent {} diff --git a/components/switch/switch.component.ts b/components/switch/switch.component.ts index 411ca2c0fc..d232917659 100644 --- a/components/switch/switch.component.ts +++ b/components/switch/switch.component.ts @@ -61,7 +61,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'switch'; [nzWaveExtraNode]="true" > - + diff --git a/components/switch/switch.spec.ts b/components/switch/switch.spec.ts index 6a77ecdbde..59b25ed6b9 100644 --- a/components/switch/switch.spec.ts +++ b/components/switch/switch.spec.ts @@ -293,8 +293,8 @@ describe('switch', () => { @Component({ template: ` - - + + - + + Name - + Age diff --git a/components/table/demo/nested-table.ts b/components/table/demo/nested-table.ts index 64e265c192..59c52e41b7 100644 --- a/components/table/demo/nested-table.ts +++ b/components/table/demo/nested-table.ts @@ -71,7 +71,7 @@ interface ChildrenItemData { Pause - +
                            diff --git a/components/table/src/addon/filter.component.ts b/components/table/src/addon/filter.component.ts index 3bc9cd0633..78ef44a858 100644 --- a/components/table/src/addon/filter.component.ts +++ b/components/table/src/addon/filter.component.ts @@ -48,7 +48,7 @@ interface NzThItemInterface { [nzDropdownMenu]="filterMenu" (nzVisibleChange)="onVisibleChange($event)" > - +
                            diff --git a/components/table/src/addon/selection.component.ts b/components/table/src/addon/selection.component.ts index 93d3afa730..653121f7fa 100644 --- a/components/table/src/addon/selection.component.ts +++ b/components/table/src/addon/selection.component.ts @@ -24,7 +24,7 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; >
                            - +
                              diff --git a/components/table/src/addon/sorters.component.ts b/components/table/src/addon/sorters.component.ts index 82e69d6804..68b016bcc7 100644 --- a/components/table/src/addon/sorters.component.ts +++ b/components/table/src/addon/sorters.component.ts @@ -26,20 +26,20 @@ import { NzTableSortOrder } from '../table.types'; - - + + > `, diff --git a/components/tabs/demo/icon.ts b/components/tabs/demo/icon.ts index 7c33bb7fae..1979289f53 100644 --- a/components/tabs/demo/icon.ts +++ b/components/tabs/demo/icon.ts @@ -6,7 +6,7 @@ import { Component } from '@angular/core'; - + {{ tab.name }} {{ tab.name }} diff --git a/components/tabs/tab-add-button.component.ts b/components/tabs/tab-add-button.component.ts index 4325aea455..2667f31853 100644 --- a/components/tabs/tab-add-button.component.ts +++ b/components/tabs/tab-add-button.component.ts @@ -11,7 +11,7 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; selector: 'nz-tab-add-button, button[nz-tab-add-button]', template: ` - + `, host: { diff --git a/components/tabs/tab-close-button.component.ts b/components/tabs/tab-close-button.component.ts index e7677a633f..a6af89d075 100644 --- a/components/tabs/tab-close-button.component.ts +++ b/components/tabs/tab-close-button.component.ts @@ -11,7 +11,7 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'; selector: 'nz-tab-close-button, button[nz-tab-close-button]', template: ` - + `, host: { diff --git a/components/tabs/tab-nav-operation.component.ts b/components/tabs/tab-nav-operation.component.ts index a0e8fec113..4b82ba4563 100644 --- a/components/tabs/tab-nav-operation.component.ts +++ b/components/tabs/tab-nav-operation.component.ts @@ -41,7 +41,7 @@ import { NzTabNavItemDirective } from './tab-nav-item.directive'; (nzVisibleChange)="menuVisChange($event)" (mouseenter)="showItems()" > - +
                                diff --git a/components/tag/demo/control.ts b/components/tag/demo/control.ts index a553b725fb..00bb4c0d17 100644 --- a/components/tag/demo/control.ts +++ b/components/tag/demo/control.ts @@ -11,7 +11,7 @@ import { Component, ElementRef, ViewChild } from '@angular/core'; {{ sliceTagName(tag) }} - + New Tag - + Twitter - + Youtube - + Facebook - + LinkedIn ` diff --git a/components/tag/demo/status.ts b/components/tag/demo/status.ts index 2aa51d28ca..905a393c93 100644 --- a/components/tag/demo/status.ts +++ b/components/tag/demo/status.ts @@ -14,23 +14,23 @@ import { Component } from '@angular/core';

                                With icon

                                - + success - + processing - + error - + warning - + default
                                diff --git a/components/tag/tag.component.ts b/components/tag/tag.component.ts index 39629a2ad4..9cfce2074a 100644 --- a/components/tag/tag.component.ts +++ b/components/tag/tag.component.ts @@ -40,14 +40,14 @@ import { InputBoolean } from 'ng-zorro-antd/core/util'; preserveWhitespaces: false, template: ` - + > `, changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, diff --git a/components/time-picker/time-picker.component.ts b/components/time-picker/time-picker.component.ts index 108e009973..da19108b70 100644 --- a/components/time-picker/time-picker.component.ts +++ b/components/time-picker/time-picker.component.ts @@ -65,12 +65,18 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'timePicker'; /> - + - +
                            diff --git a/components/timeline/demo/alternate.ts b/components/timeline/demo/alternate.ts index 0737c9855d..81872c7058 100644 --- a/components/timeline/demo/alternate.ts +++ b/components/timeline/demo/alternate.ts @@ -15,7 +15,7 @@ import { Component } from '@angular/core'; Technical testing 2015-09-01 - + ` }) diff --git a/components/timeline/demo/custom.ts b/components/timeline/demo/custom.ts index d7e3f8170e..19b987a2f3 100644 --- a/components/timeline/demo/custom.ts +++ b/components/timeline/demo/custom.ts @@ -10,7 +10,7 @@ import { Component } from '@angular/core'; Network problems being solved 2015-09-01 - + ` }) diff --git a/components/timeline/demo/right.ts b/components/timeline/demo/right.ts index 71e4933064..219b237d62 100644 --- a/components/timeline/demo/right.ts +++ b/components/timeline/demo/right.ts @@ -10,7 +10,7 @@ import { Component } from '@angular/core'; Network problems being solved 2015-09-01 - + ` }) diff --git a/components/timeline/doc/index.en-US.md b/components/timeline/doc/index.en-US.md index 7672698807..01334c44bb 100644 --- a/components/timeline/doc/index.en-US.md +++ b/components/timeline/doc/index.en-US.md @@ -34,7 +34,7 @@ Timeline | Property | Description | Type | Default | | -------- | ----------- | ---- | ------- | | `[nzPending]` | Set the last ghost node's existence or its content | `string\|boolean\|TemplateRef` | `false` | -| `[nzPendingDot]` | Set the dot of the last ghost node when pending is true | `string\|TemplateRef` | `` | +| `[nzPendingDot]` | Set the dot of the last ghost node when pending is true | `string\|TemplateRef` | `` | | `[nzReverse]` | Reverse nodes or not | `boolean` | `false` | | `[nzMode]` | By sending `alternate` the timeline will distribute the nodes to the left and right | `'left' \| 'alternate' \| 'right' \| 'custom'` | - | diff --git a/components/timeline/doc/index.zh-CN.md b/components/timeline/doc/index.zh-CN.md index 8d6685e546..17ed3902a8 100644 --- a/components/timeline/doc/index.zh-CN.md +++ b/components/timeline/doc/index.zh-CN.md @@ -35,7 +35,7 @@ import { NzTimelineModule } from 'ng-zorro-antd/timeline'; | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | | `[nzPending]` | 指定最后一个幽灵节点是否存在或内容 | `string \| boolean \| TemplateRef` | `false` | -| `[nzPendingDot]` | 当最后一个幽灵节点存在時，指定其时间图点 | `string \| TemplateRef` | `` | +| `[nzPendingDot]` | 当最后一个幽灵节点存在時，指定其时间图点 | `string \| TemplateRef` | `` | | `[nzReverse]` | 节点排序 | `boolean` | `false` | | `[nzMode]` | 可以改变时间轴和内容的相对位置 | `'left' \| 'alternate' \| 'right' \| 'custom'` | - | diff --git a/components/timeline/timeline.component.ts b/components/timeline/timeline.component.ts index 2528fbd387..a432eaa282 100644 --- a/components/timeline/timeline.component.ts +++ b/components/timeline/timeline.component.ts @@ -60,7 +60,7 @@ import { NzTimelineMode, NzTimelinePosition } from './typings';
                            {{ nzPendingDot }} - +
                            diff --git a/components/tooltip/demo/template.ts b/components/tooltip/demo/template.ts index d164135517..6cb9ce286f 100644 --- a/components/tooltip/demo/template.ts +++ b/components/tooltip/demo/template.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; >This Tooltip has an Icon - + Tooltip With {{ thing }} `, diff --git a/components/transfer/demo/custom-item.ts b/components/transfer/demo/custom-item.ts index 294c45cd17..afaec8e0fc 100644 --- a/components/transfer/demo/custom-item.ts +++ b/components/transfer/demo/custom-item.ts @@ -14,7 +14,7 @@ import { TransferItem } from 'ng-zorro-antd/transfer'; (nzChange)="change($event)" > - + {{ item.title }} diff --git a/components/transfer/transfer-search.component.ts b/components/transfer/transfer-search.component.ts index 34faf22651..9f3b38e32c 100644 --- a/components/transfer/transfer-search.component.ts +++ b/components/transfer/transfer-search.component.ts @@ -20,7 +20,7 @@ import { preserveWhitespaces: false, template: ` - + - + `, encapsulation: ViewEncapsulation.None, diff --git a/components/transfer/transfer.component.ts b/components/transfer/transfer.component.ts index b35c0bfa7c..58ed42f7f5 100644 --- a/components/transfer/transfer.component.ts +++ b/components/transfer/transfer.component.ts @@ -85,7 +85,7 @@ import { NzTransferListComponent } from './transfer-list.component'; [nzType]="'primary'" [nzSize]="'small'" > - + {{ nzOperations[1] }}
                            @@ -109,7 +109,7 @@ import { NzTransferListComponent } from './transfer-list.component'; [nzType]="'primary'" [nzSize]="'small'" > - + {{ nzOperations[0] }}
                            diff --git a/components/transfer/transfer.spec.ts b/components/transfer/transfer.spec.ts index 4d13b4ffc9..d79dde3dfc 100644 --- a/components/transfer/transfer.spec.ts +++ b/components/transfer/transfer.spec.ts @@ -624,7 +624,7 @@ class TestTransferComponent implements OnInit { template: ` - + {{ item.title }} diff --git a/components/tree-select/demo/customized-icon.ts b/components/tree-select/demo/customized-icon.ts index 241a077efd..624a68d71e 100644 --- a/components/tree-select/demo/customized-icon.ts +++ b/components/tree-select/demo/customized-icon.ts @@ -20,7 +20,7 @@ import { Component } from '@angular/core'; - + {{ node.title }} diff --git a/components/tree-select/tree-select.spec.ts b/components/tree-select/tree-select.spec.ts index fba7468da2..bafa8d8f0d 100644 --- a/components/tree-select/tree-select.spec.ts +++ b/components/tree-select/tree-select.spec.ts @@ -607,7 +607,7 @@ describe('tree-select component', () => { fixture.detectChanges(); flush(); fixture.detectChanges(); - expect(overlayContainerElement.querySelector('i.anticon.anticon-frown-o')).toBeTruthy(); + expect(overlayContainerElement.querySelector('span.anticon.anticon-frown-o')).toBeTruthy(); })); }); @@ -891,7 +891,7 @@ export class NzTestTreeSelectFormComponent { - + {{ node.title }} diff --git a/components/tree-view/demo/basic.ts b/components/tree-view/demo/basic.ts index 00eb3cc7dc..b1e2020427 100644 --- a/components/tree-view/demo/basic.ts +++ b/components/tree-view/demo/basic.ts @@ -51,7 +51,7 @@ interface FlatNode { - + - + - + {{ node.name }} - + - + {{ node.name }} diff --git a/components/tree-view/demo/dynamic.ts b/components/tree-view/demo/dynamic.ts index 8c44c9b799..b97fe4efa3 100644 --- a/components/tree-view/demo/dynamic.ts +++ b/components/tree-view/demo/dynamic.ts @@ -127,10 +127,10 @@ class DynamicDatasource implements DataSource { - + - + {{ node.label }} diff --git a/components/tree-view/demo/editable.ts b/components/tree-view/demo/editable.ts index 47b60abe81..610859d70f 100644 --- a/components/tree-view/demo/editable.ts +++ b/components/tree-view/demo/editable.ts @@ -57,7 +57,7 @@ interface FlatNode { {{ node.name }} @@ -69,11 +69,11 @@ interface FlatNode { - + {{ node.name }} diff --git a/components/tree-view/demo/line.ts b/components/tree-view/demo/line.ts index 7110628c47..d7ab26bc60 100644 --- a/components/tree-view/demo/line.ts +++ b/components/tree-view/demo/line.ts @@ -50,7 +50,7 @@ interface FlatNode { - + {{ node.name }} @@ -59,7 +59,11 @@ interface FlatNode { - + {{ node.name }} diff --git a/components/tree-view/demo/search.ts b/components/tree-view/demo/search.ts index b660e190e0..fe27b81721 100644 --- a/components/tree-view/demo/search.ts +++ b/components/tree-view/demo/search.ts @@ -71,7 +71,7 @@ function filterTreeData(data: TreeNode[], value: string): FilteredTreeResult { - + @@ -82,7 +82,7 @@ function filterTreeData(data: TreeNode[], value: string): FilteredTreeResult { - + diff --git a/components/tree-view/demo/virtual-scroll.ts b/components/tree-view/demo/virtual-scroll.ts index f92ac4ed98..2b858ee41a 100644 --- a/components/tree-view/demo/virtual-scroll.ts +++ b/components/tree-view/demo/virtual-scroll.ts @@ -45,7 +45,7 @@ interface ExampleFlatNode { - + {{ node.name }} diff --git a/components/tree/demo/customized-icon.ts b/components/tree/demo/customized-icon.ts index e684b220a7..8d0e29c05b 100644 --- a/components/tree/demo/customized-icon.ts +++ b/components/tree/demo/customized-icon.ts @@ -6,13 +6,13 @@ import { Component } from '@angular/core'; - - + > + ` diff --git a/components/tree/demo/directory.ts b/components/tree/demo/directory.ts index 6a965eb61b..92d03f455f 100644 --- a/components/tree/demo/directory.ts +++ b/components/tree/demo/directory.ts @@ -16,12 +16,12 @@ import { NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/tree'; - + {{ node.title }} created by {{ origin.author | lowercase }} - + {{ node.title }} modified by {{ origin.author | lowercase }} diff --git a/components/tree/demo/search.ts b/components/tree/demo/search.ts index 85690f9507..b65f6b3fc9 100644 --- a/components/tree/demo/search.ts +++ b/components/tree/demo/search.ts @@ -9,7 +9,7 @@ import { NzFormatEmitEvent } from 'ng-zorro-antd/tree'; - + - + > - - + > + - + `, changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/components/tree/tree-node-title.component.ts b/components/tree/tree-node-title.component.ts index c20d4aafc6..dde4459049 100644 --- a/components/tree/tree-node-title.component.ts +++ b/components/tree/tree-node-title.component.ts @@ -37,7 +37,7 @@ import { NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/core/tree'; [class.ant-tree-iconEle]="!selectMode" [class.ant-tree-icon__customize]="!selectMode" > - + diff --git a/components/tree/tree.spec.ts b/components/tree/tree.spec.ts index ff47f8d651..a9ffb9c0be 100644 --- a/components/tree/tree.spec.ts +++ b/components/tree/tree.spec.ts @@ -601,7 +601,7 @@ describe('tree', () => { (nzCheckBoxChange)="nzEvent($event)" > - + ` }) diff --git a/components/typography/demo/interactive.ts b/components/typography/demo/interactive.ts index c1858c7722..993e7e8598 100644 --- a/components/typography/demo/interactive.ts +++ b/components/typography/demo/interactive.ts @@ -22,7 +22,7 @@ import { Component } from '@angular/core'; [nzCopyIcons]="['meh', 'smile']" >

                            - + you clicked!!

                            diff --git a/components/typography/text-copy.component.ts b/components/typography/text-copy.component.ts index 3883dc9dd7..d8405134ec 100644 --- a/components/typography/text-copy.component.ts +++ b/components/typography/text-copy.component.ts @@ -38,7 +38,7 @@ import { NzI18nService, NzTextI18nInterface } from 'ng-zorro-antd/i18n'; (click)="onClick()" > - + `, diff --git a/components/typography/text-edit.component.ts b/components/typography/text-edit.component.ts index 1e54ecb54c..c139903676 100644 --- a/components/typography/text-edit.component.ts +++ b/components/typography/text-edit.component.ts @@ -32,7 +32,7 @@ import { NzAutosizeDirective } from 'ng-zorro-antd/input'; @@ -45,7 +45,7 @@ import { NzAutosizeDirective } from 'ng-zorro-antd/input'; (click)="onClick()" > - +                             diff --git a/components/upload/demo/avatar.ts b/components/upload/demo/avatar.ts index a191dd9ed4..18c5cc5cd4 100644 --- a/components/upload/demo/avatar.ts +++ b/components/upload/demo/avatar.ts @@ -17,7 +17,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; (nzChange)="handleChange($event)" > - +
                            Upload
                             diff --git a/components/upload/demo/basic.ts b/components/upload/demo/basic.ts index dd47113f3c..a938a5c65a 100644 --- a/components/upload/demo/basic.ts +++ b/components/upload/demo/basic.ts @@ -12,7 +12,7 @@ import { NzUploadChangeParam } from 'ng-zorro-antd/upload'; (nzChange)="handleChange($event)" > diff --git a/components/upload/demo/default-file-list.ts b/components/upload/demo/default-file-list.ts index 89814ddd3f..a63bdbd93c 100644 --- a/components/upload/demo/default-file-list.ts +++ b/components/upload/demo/default-file-list.ts @@ -7,7 +7,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; template: ` diff --git a/components/upload/demo/directory.ts b/components/upload/demo/directory.ts index 634ebb3428..b9247c532f 100644 --- a/components/upload/demo/directory.ts +++ b/components/upload/demo/directory.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; template: ` diff --git a/components/upload/demo/drag.ts b/components/upload/demo/drag.ts index b5d05038c0..46702c7dfd 100644 --- a/components/upload/demo/drag.ts +++ b/components/upload/demo/drag.ts @@ -13,7 +13,7 @@ import { NzUploadChangeParam } from 'ng-zorro-antd/upload'; (nzChange)="handleChange($event)" >

                            - +

                            Click or drag file to this area to upload

                            diff --git a/components/upload/demo/file-list.ts b/components/upload/demo/file-list.ts index 2fc2f102bd..aec66c148d 100644 --- a/components/upload/demo/file-list.ts +++ b/components/upload/demo/file-list.ts @@ -11,7 +11,7 @@ import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload'; (nzChange)="handleChange($event)" > diff --git a/components/upload/demo/picture-card.ts b/components/upload/demo/picture-card.ts index 8a90ff719d..fcee0c44a9 100644 --- a/components/upload/demo/picture-card.ts +++ b/components/upload/demo/picture-card.ts @@ -22,7 +22,7 @@ const getBase64 = (file: File): Promise => [nzPreview]="handlePreview" >

                            - +
                            Upload
                            diff --git a/components/upload/demo/picture-style.ts b/components/upload/demo/picture-style.ts index 32035fb576..690357a458 100644 --- a/components/upload/demo/picture-style.ts +++ b/components/upload/demo/picture-style.ts @@ -12,7 +12,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; [(nzFileList)]="fileList1" > @@ -28,7 +28,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; > diff --git a/components/upload/demo/preview-file.ts b/components/upload/demo/preview-file.ts index 80a82d32e9..e7e406e24b 100644 --- a/components/upload/demo/preview-file.ts +++ b/components/upload/demo/preview-file.ts @@ -15,7 +15,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; [nzPreviewFile]="previewFile" > diff --git a/components/upload/demo/transform-file.ts b/components/upload/demo/transform-file.ts index 896fa6d5df..7b4c677f1a 100644 --- a/components/upload/demo/transform-file.ts +++ b/components/upload/demo/transform-file.ts @@ -8,7 +8,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; template: ` diff --git a/components/upload/demo/upload-manually.ts b/components/upload/demo/upload-manually.ts index 92a3d40a60..bbdbbd39bd 100644 --- a/components/upload/demo/upload-manually.ts +++ b/components/upload/demo/upload-manually.ts @@ -10,7 +10,7 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; template: ` diff --git a/components/upload/demo/upload-with-aliyun-oss.ts b/components/upload/demo/upload-with-aliyun-oss.ts index 8f9923042d..38311a56c5 100644 --- a/components/upload/demo/upload-with-aliyun-oss.ts +++ b/components/upload/demo/upload-with-aliyun-oss.ts @@ -15,7 +15,7 @@ import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload'; > Photos: diff --git a/components/upload/upload-list.component.html b/components/upload/upload-list.component.html index 29ff599246..a896a03623 100644 --- a/components/upload/upload-list.component.html +++ b/components/upload/upload-list.component.html @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ {{ locale.uploading }} - + - +                             @@ -75,7 +75,7 @@ [attr.title]="locale.removeFile" class="ant-upload-list-item-card-actions-btn" > - + @@ -89,7 +89,7 @@ [attr.title]="locale.downloadFile" class="ant-upload-list-item-card-actions-btn" > - + @@ -140,7 +140,7 @@ [ngStyle]="!(file.url || file.thumbUrl) ? { opacity: 0.5, 'pointer-events': 'none' } : null" (click)="handlePreview(file, $event)" > - + diff --git a/components/upload/upload.spec.ts b/components/upload/upload.spec.ts index d28cea047d..e4aada7bcd 100644 --- a/components/upload/upload.spec.ts +++ b/components/upload/upload.spec.ts @@ -1392,7 +1392,7 @@ describe('upload', () => { (nzChange)="nzChange($event)" > diff --git a/docs/global-config.en-US.md b/docs/global-config.en-US.md index 49314cd8ef..12d50f4c87 100644 --- a/docs/global-config.en-US.md +++ b/docs/global-config.en-US.md @@ -62,7 +62,7 @@ To solve this, it is recommended to use a `FactoryProvider` instead of a `ValueP template: ` - + ` diff --git a/docs/global-config.zh-CN.md b/docs/global-config.zh-CN.md index 6d26b63f6c..ddc050d9c1 100644 --- a/docs/global-config.zh-CN.md +++ b/docs/global-config.zh-CN.md @@ -63,7 +63,7 @@ export class AppComponent implements OnInit { template: ` - + ` diff --git a/schematics/ng-generate/side-menu/files/src/app/app.component.html.template b/schematics/ng-generate/side-menu/files/src/app/app.component.html.template index 014c586efe..f954e1282f 100644 --- a/schematics/ng-generate/side-menu/files/src/app/app.component.html.template +++ b/schematics/ng-generate/side-menu/files/src/app/app.component.html.template @@ -38,10 +38,10 @@
                            - + >
                            diff --git a/scripts/site/_site/doc/app/app.component.html b/scripts/site/_site/doc/app/app.component.html index 18bf99df8c..f5bd8e8bd8 100644 --- a/scripts/site/_site/doc/app/app.component.html +++ b/scripts/site/_site/doc/app/app.component.html @@ -79,7 +79,7 @@
                          - +
                          diff --git a/scripts/site/_site/doc/app/components-overview/components-overview.component.html b/scripts/site/_site/doc/app/components-overview/components-overview.component.html index abadadd600..b98df30fad 100644 --- a/scripts/site/_site/doc/app/components-overview/components-overview.component.html +++ b/scripts/site/_site/doc/app/components-overview/components-overview.component.html @@ -26,7 +26,7 @@

                          {{ language === 'en' ? 'Components Overview' : '组件总览' }}

                          /> - + diff --git a/scripts/site/_site/doc/app/footer/footer-item.component.ts b/scripts/site/_site/doc/app/footer/footer-item.component.ts index 33525154d3..b12d443987 100644 --- a/scripts/site/_site/doc/app/footer/footer-item.component.ts +++ b/scripts/site/_site/doc/app/footer/footer-item.component.ts @@ -6,7 +6,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core template: ` - + {{ title }} diff --git a/scripts/site/_site/doc/app/header/header.component.ts b/scripts/site/_site/doc/app/header/header.component.ts index 3bcae8145c..037f3c00a8 100644 --- a/scripts/site/_site/doc/app/header/header.component.ts +++ b/scripts/site/_site/doc/app/header/header.component.ts @@ -19,7 +19,7 @@ const RESPONSIVE_SM = 1200; changeDetection: ChangeDetectionStrategy.OnPush, template: `
                        • - +
                          diff --git a/scripts/site/_site/doc/app/header/searchbar.component.ts b/scripts/site/_site/doc/app/header/searchbar.component.ts index 795beb7e0a..e3f232baf5 100644 --- a/scripts/site/_site/doc/app/header/searchbar.component.ts +++ b/scripts/site/_site/doc/app/header/searchbar.component.ts @@ -22,7 +22,7 @@ declare const docsearch: any; selector: 'div[app-searchbar]', changeDetection: ChangeDetectionStrategy.OnPush, template: ` - + {{ nzTitle }}                           - +
                        @@ -26,7 +26,7 @@
      - - + - + - + + > - {{starCount | number: '.0-0'}} + {{starCount | number: '.0-0'}} \ No newline at end of file diff --git a/scripts/site/_site/doc/app/share/nav-bottom/nav-bottom.component.ts b/scripts/site/_site/doc/app/share/nav-bottom/nav-bottom.component.ts index fa1cea1f04..55b64f2638 100644 --- a/scripts/site/_site/doc/app/share/nav-bottom/nav-bottom.component.ts +++ b/scripts/site/_site/doc/app/share/nav-bottom/nav-bottom.component.ts @@ -9,12 +9,12 @@ import { ROUTER_LIST } from '../../router'; template: `
      - {{ list[index - 1]?.label - }} + {{ list[index - 1]?.label + }} - {{ list[index + 1]?.label - }} + {{ list[index + 1]?.label + }}
      ` diff --git a/scripts/site/_site/doc/style/demo.less b/scripts/site/_site/doc/style/demo.less index 6e24b740bb..a34cabeb78 100644 --- a/scripts/site/_site/doc/style/demo.less +++ b/scripts/site/_site/doc/style/demo.less @@ -114,6 +114,15 @@ padding-right: 0; padding-left: 6px; } + + .anticon { + color: @site-text-color-secondary; + transition: all 0.3s; + + &:hover { + color: @site-text-color; + } + } } &-demo { @@ -310,8 +319,7 @@ height: 20px; overflow: hidden; text-indent: -9999px; - background: transparent - url('https://gw.alipayobjects.com/zos/rmsportal/OtZslpOjYXijshDERXwc.svg') center / 14px + background: transparent url('https://gw.alipayobjects.com/zos/rmsportal/OtZslpOjYXijshDERXwc.svg') center / 14px no-repeat; border: 0; cursor: pointer; @@ -328,8 +336,7 @@ height: 20px; overflow: hidden; text-indent: -9999px; - background: transparent - url('https://gw.alipayobjects.com/zos/rmsportal/DlHbxMCyeuyOrqOdbgik.svg') center / 14px + background: transparent url('https://gw.alipayobjects.com/zos/rmsportal/DlHbxMCyeuyOrqOdbgik.svg') center / 14px no-repeat; border: 0; cursor: pointer; @@ -345,8 +352,7 @@ height: 20px; overflow: hidden; text-indent: -9999px; - background: transparent - url('https://gw.alipayobjects.com/zos/rmsportal/aaYmtdDyHSCkXyLZVgGK.svg') center / 14px + background: transparent url('https://gw.alipayobjects.com/zos/rmsportal/aaYmtdDyHSCkXyLZVgGK.svg') center / 14px no-repeat; border: 0; cursor: pointer; diff --git a/scripts/site/_site/doc/style/markdown.less b/scripts/site/_site/doc/style/markdown.less index 7e366eb687..7d7b6c322b 100644 --- a/scripts/site/_site/doc/style/markdown.less +++ b/scripts/site/_site/doc/style/markdown.less @@ -193,7 +193,7 @@ .markdown .anchor { margin-left: 8px; opacity: 0; - transition: opacity .3s; + transition: opacity 0.3s; .ant-row-rtl & { margin-right: 8px; @@ -215,17 +215,16 @@ margin-right: 8px; margin-left: 0; } - i { - color: @site-text-color-secondary; - - &:hover { - color: @primary-color; - } - } .anticon { display: block; + color: @site-text-color-secondary; font-size: 16px; + transition: all 0.3s; + + &:hover { + color: @site-text-color; + } } } diff --git a/scripts/site/template/title.template.html b/scripts/site/template/title.template.html index d0c1d01261..52f88a5c6e 100644 --- a/scripts/site/template/title.template.html +++ b/scripts/site/template/title.template.html @@ -1,4 +1,4 @@

      {{title}}{{subtitle}}{{widget}} - +

      \ No newline at end of file diff --git a/scripts/site/utils/generate-demo.js b/scripts/site/utils/generate-demo.js index 2784c5362b..1ea90f7147 100644 --- a/scripts/site/utils/generate-demo.js +++ b/scripts/site/utils/generate-demo.js @@ -131,9 +131,9 @@ function wrapperHeader(title, whenToUse, language, example, hasPageDemo, name) { ${hasPageDemo ? `
      ` : ''}

      ${language === 'zh' ? '代码演示' : 'Examples'} - + }" (click)="expandAllCode()">

      ${example}`; } else {