Skip to content

Commit

Permalink
fix(module:card): fix card tab ng-template (NG-ZORRO#3654)
Browse files Browse the repository at this point in the history
  • Loading branch information
vthinkxie committed Jun 26, 2019
1 parent 84a5207 commit 82a5e0f
Show file tree
Hide file tree
Showing 10 changed files with 209 additions and 97 deletions.
2 changes: 1 addition & 1 deletion components/card/nz-card-tab.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ import { ChangeDetectionStrategy, Component, TemplateRef, ViewChild, ViewEncapsu
templateUrl: './nz-card-tab.component.html'
})
export class NzCardTabComponent {
@ViewChild(TemplateRef, { static: false }) template: TemplateRef<void>;
@ViewChild(TemplateRef, { static: true }) template: TemplateRef<void>;
}
9 changes: 6 additions & 3 deletions components/progress/demo/segment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ import { Component } from '@angular/core';
@Component({
selector: 'nz-demo-progress-segment',
template: `
<nz-tooltip nzTitle="3 done / 3 in progress / 4 to do">
<nz-progress nz-tooltip [nzPercent]="60" [nzSuccessPercent]="30"></nz-progress>
</nz-tooltip>
<nz-progress
nz-tooltip
nzTitle="3 done / 3 in progress / 4 to do"
[nzPercent]="60"
[nzSuccessPercent]="30"
></nz-progress>
`
})
export class NzDemoProgressSegmentComponent {}
8 changes: 3 additions & 5 deletions components/steps/demo/customized-progress-dot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ import { Component } from '@angular/core';
<nz-step nzTitle="Waiting" nzDescription="You can hover on the dot."></nz-step>
</nz-steps>
<ng-template #progressTemplate let-dot let-status="status" let-index="index">
<nz-popover nzContent="steps {{ index }} status: {{ status }}">
<span nz-popover style="margin-left: -100%;">
<ng-template [ngTemplateOutlet]="dot"></ng-template>
</span>
</nz-popover>
<span nz-popover nzContent="steps {{ index }} status: {{ status }}" style="margin-left: -100%;">
<ng-template [ngTemplateOutlet]="dot"></ng-template>
</span>
</ng-template>
`
})
Expand Down
4 changes: 2 additions & 2 deletions docs/i18n.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ For date formatting, we use Angular's DatePipe ([syntax reference](https://angul
So we have a new `Date-fns` method ([syntax reference](https://date-fns.org/docs/format#description)) for standard date formatting, you can switch to it by the following way (after switching, it will affect the date formatting of all date related components such as Calendar/DatePicker):
```typescript
import { NzI18nService } from 'ng-zorro-antd';
import enDateLocale from 'date-fns/locale/en';
import jaDateLocale from 'date-fns/locale/ja';
import * as enDateLocale from 'date-fns/locale/en';
import * as jaDateLocale from 'date-fns/locale/ja';

@NgModule({
...
Expand Down
4 changes: 2 additions & 2 deletions docs/i18n.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ switchLanguage() {
所以我们新提供了`Date-fns`方式([语法参考](https://date-fns.org/docs/format#description))来进行标准的日期格式化,您可以通过以下方式切换至`Date-fns`(切换后将影响所有日期类组件如Calendar/DatePicker的日期格式化):
```typescript
import { NzI18nService } from 'ng-zorro-antd';
import enDateLocale from 'date-fns/locale/en';
import jaDateLocale from 'date-fns/locale/ja';
import * as enDateLocale from 'date-fns/locale/en';
import * as jaDateLocale from 'date-fns/locale/ja';

@NgModule({
...
Expand Down
9 changes: 4 additions & 5 deletions integration/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,14 @@
"zone.js": "file:lib/zone.js"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "~0.10.0",
"@angular-devkit/build-optimizer": "~0.800.0",
"@angular/cli": "file:lib/@angular/cli",
"@angular/compiler-cli": "file:lib/@angular/compiler-cli",
"@ngtools/webpack": "~8.0.0",
"html-webpack-plugin": "^3.2.0",
"typescript": "file:lib/typescript",
"terser-webpack-plugin": "^1.1.0",
"webpack": "^4.26.0",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10"
}
"webpack": "^4.35.0",
"webpack-cli": "^3.3.5",
"webpack-dev-server": "^3.7.2" }
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@angular/cdk": "~8.0.0",
"@ant-design/icons-angular": "^8.0.0",
"date-fns": "^1.29.0"
"date-fns": "^1.30.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.800.3",
Expand All @@ -69,18 +69,18 @@
"@nguniversal/module-map-ngfactory-loader": "^7.1.1",
"@schematics/angular": "~8.0.1",
"@stackblitz/sdk": "^1.1.1",
"@types/fs-extra": "^5.0.4",
"@types/fs-extra": "^7.0.0",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"antd-theme-generator": "^1.0.7",
"antd-theme-generator": "^1.1.7",
"chalk": "^2.4.1",
"classlist.js": "^1.1.20150312",
"clean-css": "~4.1.11",
"codecov": "^3.0.0",
"codelyzer": "~4.5.0",
"conventional-changelog-cli": "^2.0.1",
"core-js": "^2.5.4",
"fs-extra": "^6.0.1",
"fs-extra": "^8.0.1",
"husky": "^1.0.1",
"jasmine-core": "~2.99.1",
"karma": "~3.0.0",
Expand All @@ -95,13 +95,13 @@
"lint-staged": "^8.1.5",
"marked": "^0.6.2",
"ng-packagr": "^5.2.0",
"ngx-color": "^2.0.5",
"ngx-color": "^3.0.3",
"node-prismjs": "^0.1.1",
"prettier": "^1.16.4",
"prismjs": "^1.10.0",
"protractor": "~5.4.0",
"readline-sync": "^1.4.9",
"remark": "^8.0.0",
"remark": "^10.0.1",
"rxjs": "~6.5.2",
"sitemap": "^2.1.0",
"ts-node": "~7.0.0",
Expand Down
Loading

0 comments on commit 82a5e0f

Please sign in to comment.