From 82a5e0f087738cdd39abbc0e73ea666ab504c4f8 Mon Sep 17 00:00:00 2001 From: vthinkxie Date: Wed, 26 Jun 2019 17:57:15 +0800 Subject: [PATCH] fix(module:card): fix card tab ng-template (#3654) --- components/card/nz-card-tab.component.ts | 2 +- components/progress/demo/segment.ts | 9 +- .../steps/demo/customized-progress-dot.ts | 8 +- docs/i18n.en-US.md | 4 +- docs/i18n.zh-CN.md | 4 +- integration/webpack/package.json | 9 +- package.json | 12 +- scripts/site/_site/doc/app/app.component.html | 226 +++++++++++++----- .../doc/app/share/nz-codebox/stack-blitz.ts | 30 +-- setup-shared-libs.sh | 2 +- 10 files changed, 209 insertions(+), 97 deletions(-) diff --git a/components/card/nz-card-tab.component.ts b/components/card/nz-card-tab.component.ts index ca69bdb80ae..2cf76b88b90 100644 --- a/components/card/nz-card-tab.component.ts +++ b/components/card/nz-card-tab.component.ts @@ -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; + @ViewChild(TemplateRef, { static: true }) template: TemplateRef; } diff --git a/components/progress/demo/segment.ts b/components/progress/demo/segment.ts index a505b8ab698..dc84e34f6dc 100644 --- a/components/progress/demo/segment.ts +++ b/components/progress/demo/segment.ts @@ -3,9 +3,12 @@ import { Component } from '@angular/core'; @Component({ selector: 'nz-demo-progress-segment', template: ` - - - + ` }) export class NzDemoProgressSegmentComponent {} diff --git a/components/steps/demo/customized-progress-dot.ts b/components/steps/demo/customized-progress-dot.ts index ee6573387eb..f3c53f60313 100644 --- a/components/steps/demo/customized-progress-dot.ts +++ b/components/steps/demo/customized-progress-dot.ts @@ -10,11 +10,9 @@ import { Component } from '@angular/core'; - - - - - + + + ` }) diff --git a/docs/i18n.en-US.md b/docs/i18n.en-US.md index 11b92458f4c..d218f519019 100755 --- a/docs/i18n.en-US.md +++ b/docs/i18n.en-US.md @@ -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({ ... diff --git a/docs/i18n.zh-CN.md b/docs/i18n.zh-CN.md index 1566567d514..92aab067dc5 100755 --- a/docs/i18n.zh-CN.md +++ b/docs/i18n.zh-CN.md @@ -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({ ... diff --git a/integration/webpack/package.json b/integration/webpack/package.json index 0590ae8fff2..169d274d1f7 100644 --- a/integration/webpack/package.json +++ b/integration/webpack/package.json @@ -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" } } diff --git a/package.json b/package.json index 8088a294ffd..6233c44e30c 100644 --- a/package.json +++ b/package.json @@ -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", @@ -69,10 +69,10 @@ "@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", @@ -80,7 +80,7 @@ "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", @@ -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", diff --git a/scripts/site/_site/doc/app/app.component.html b/scripts/site/_site/doc/app/app.component.html index ce45a260e0e..d6a707b1529 100644 --- a/scripts/site/_site/doc/app/app.component.html +++ b/scripts/site/_site/doc/app/app.component.html @@ -2,14 +2,27 @@
-
+
-
+
-
+
- Made with ❤ by NG-ZORRO team + Made with + ❤ + by NG-ZORRO team
@@ -236,11 +344,15 @@

  • Components
      -
    • +
    • diff --git a/scripts/site/_site/doc/app/share/nz-codebox/stack-blitz.ts b/scripts/site/_site/doc/app/share/nz-codebox/stack-blitz.ts index b1530ea153e..f99de0d874f 100644 --- a/scripts/site/_site/doc/app/share/nz-codebox/stack-blitz.ts +++ b/scripts/site/_site/doc/app/share/nz-codebox/stack-blitz.ts @@ -245,22 +245,22 @@ export class AppModule { }`; description : 'Created with <3 by the StackBlitz SDK!', template : 'angular-cli', dependencies: { - rxjs : '^6.3.3', - '@angular/cdk' : '^7.0.0', - '@angular/compiler' : '^7.0.0', - '@angular/core' : '^7.0.0', - '@angular/forms' : '^7.0.0', - '@angular/http' : '^7.0.0', - '@angular/language-service' : '^7.0.0', - '@angular/platform-browser' : '^7.0.0', - '@angular/platform-browser-dynamic': '^7.0.0', - '@angular/common' : '^7.0.0', - '@angular/router' : '^7.0.0', - '@angular/animations' : '^7.0.0', - '@ant-design/icons-angular' : '^2.0.2', - 'date-fns' : '^1.29.0', + rxjs : '~6.5.2', + '@angular/cdk' : '^8.0.0', + '@angular/compiler' : '^8.0.0', + '@angular/core' : '^8.0.0', + '@angular/forms' : '^8.0.0', + '@angular/http' : '^8.0.0', + '@angular/language-service' : '^8.0.0', + '@angular/platform-browser' : '^8.0.0', + '@angular/platform-browser-dynamic': '^8.0.0', + '@angular/common' : '^8.0.0', + '@angular/router' : '^8.0.0', + '@angular/animations' : '^8.0.0', + '@ant-design/icons-angular' : '^8.0.0', + 'date-fns' : '^1.30.1', tslib : '^1.9.3', - typescript : '~3.1.1', + typescript : '~3.4.5', 'ng-zorro-antd': '^7.5.0' }, tags : [ 'stackblitz', 'sdk' ] diff --git a/setup-shared-libs.sh b/setup-shared-libs.sh index fda0578b52b..865e82176f1 100644 --- a/setup-shared-libs.sh +++ b/setup-shared-libs.sh @@ -4,7 +4,7 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" mkdir -p "$TARGET/ng-zorro-antd" rsync -av --exclude=".*" "$ROOT/publish/" "$TARGET/ng-zorro-antd" > /dev/null 2>&1 -for lib in "@angular/animations" "@angular/cdk" "@angular/common" "@angular/compiler" "@angular/core" "@angular/forms" "@angular/http" "@angular/platform-browser" "@angular/platform-browser-dynamic" "@angular/router" "@angular/cli" "@angular/compiler-cli" "rxjs" "typescript" "zone.js" "date-fns" "core-js" +for lib in "@angular/animations" "@angular/cdk" "@angular/common" "@angular/compiler" "@angular/core" "@angular/forms" "@angular/platform-browser" "@angular/platform-browser-dynamic" "@angular/router" "@angular/cli" "@angular/compiler-cli" "rxjs" "typescript" "zone.js" "date-fns" "core-js" do mkdir -p "$TARGET/$lib" rsync -av --exclude=".*" "$ROOT/node_modules/$lib/" "$TARGET/$lib" > /dev/null 2>&1