From 3104e93d11a92ca9fd558361d3652bfa5639ee26 Mon Sep 17 00:00:00 2001 From: cipchk Date: Thu, 24 May 2018 22:03:16 +0800 Subject: [PATCH] build: sync zorro 0.7.1 --- package-lock.json | 6 +++--- package.json | 2 +- packages/abc/package.json | 6 ++---- packages/form/package.json | 2 +- packages/form/src/widgets/date/date.widget.ts | 8 ++++---- packages/mock/package.json | 2 -- packages/schematics/package.json | 3 +-- packages/theme/package.json | 4 +--- packages/util/package.json | 2 +- scaffold | 2 +- 10 files changed, 15 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80ae5ad3f..ffba96f9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9601,9 +9601,9 @@ } }, "ng-zorro-antd": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/ng-zorro-antd/-/ng-zorro-antd-0.7.0.tgz", - "integrity": "sha512-oCSBbhTbhgXVypSRLas8guACXrUWl58Vse/w/aCQTeOmy4Ii0hjgEx9AiJm0n8HzBqOSTocUBlBHQShomdavpg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ng-zorro-antd/-/ng-zorro-antd-0.7.1.tgz", + "integrity": "sha512-GqeQ8BqOVu3ubKtavYsFti5niRKQwNgz6tMeULmKZdJAwS/ylAsDDmx5AB0bGLv4CrIgto9fUolRyxR8+dLYVw==", "requires": { "@angular/cdk": "^5.0.0", "date-fns": "^1.29.0" diff --git a/package.json b/package.json index 63412a49a..d81687d13 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "file-saver": "^1.3.8", "marked": "^0.3.19", "ng-github-button": "^1.0.0", - "ng-zorro-antd": "^0.7.0", + "ng-zorro-antd": "^0.7.1", "ngx-ace-wrapper": "^6.0.0", "ngx-color": "^1.3.1", "ngx-countdown": "^3.0.0", diff --git a/packages/abc/package.json b/packages/abc/package.json index 1a60e1864..82bb03fb1 100644 --- a/packages/abc/package.json +++ b/packages/abc/package.json @@ -16,12 +16,10 @@ }, "homepage": "https://github.com/cipchk/delon#readme", "keywords": ["delon", "ng-alain", "alain", "antd", "ng-zorro-antd"], - "dependencies": { + "peerDependencies": { "file-saver": "^1.3.3", "ngx-countdown": "^3.0.0", - "qrious": "^4.0.2" - }, - "peerDependencies": { + "qrious": "^4.0.2", "@delon/theme": "PEER-0.0.0-PLACEHOLDER", "@delon/util": "PEER-0.0.0-PLACEHOLDER", "@delon/acl": "PEER-0.0.0-PLACEHOLDER" diff --git a/packages/form/package.json b/packages/form/package.json index e9066111f..179753d98 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -29,7 +29,7 @@ "antd", "ng-zorro-antd" ], - "dependencies": { + "peerDependencies": { "ng-zorro-antd": "ZORRO-0.0.0-PLACEHOLDER", "@delon/util": "PEER-0.0.0-PLACEHOLDER" } diff --git a/packages/form/src/widgets/date/date.widget.ts b/packages/form/src/widgets/date/date.widget.ts index f1f12f7a4..b0c65b047 100644 --- a/packages/form/src/widgets/date/date.widget.ts +++ b/packages/form/src/widgets/date/date.widget.ts @@ -24,7 +24,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss'; [nzClassName]="ui.className" [nzDisabledDate]="ui.disabledDate" [nzLocale]="ui.locale" - [nzPlaceholder]="ui.placeholder" + [nzPlaceHolder]="ui.placeholder" [nzPopupStyle]="ui.popupStyle" [nzDropdownClassName]="ui.dropdownClassName" (nzOnOpenChange)="_openChange($event)" @@ -41,7 +41,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss'; [nzClassName]="ui.className" [nzDisabledDate]="ui.disabledDate" [nzLocale]="ui.locale" - [nzPlaceholder]="ui.placeholder" + [nzPlaceHolder]="ui.placeholder" [nzPopupStyle]="ui.popupStyle" [nzDropdownClassName]="ui.dropdownClassName" (nzOnOpenChange)="_openChange($event)" @@ -57,7 +57,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss'; [nzClassName]="ui.className" [nzDisabledDate]="ui.disabledDate" [nzLocale]="ui.locale" - [nzPlaceholder]="ui.placeholder" + [nzPlaceHolder]="ui.placeholder" [nzPopupStyle]="ui.popupStyle" [nzDropdownClassName]="ui.dropdownClassName" (nzOnOpenChange)="_openChange($event)" @@ -77,7 +77,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss'; [nzClassName]="ui.className" [nzDisabledDate]="ui.disabledDate" [nzLocale]="ui.locale" - [nzPlaceholder]="ui.placeholder" + [nzPlaceHolder]="ui.placeholder" [nzPopupStyle]="ui.popupStyle" [nzDropdownClassName]="ui.dropdownClassName" (nzOnOpenChange)="_openChange($event)" diff --git a/packages/mock/package.json b/packages/mock/package.json index 740ba5c14..d376a14fe 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -27,8 +27,6 @@ "antd", "ng-zorro-antd" ], - "dependencies": { - }, "peerDependencies": { } } diff --git a/packages/schematics/package.json b/packages/schematics/package.json index 7c73c6942..266257d7f 100644 --- a/packages/schematics/package.json +++ b/packages/schematics/package.json @@ -20,7 +20,7 @@ "code generation", "schematics" ], - "dependencies": { + "peerDependencies": { "@angular-devkit/core": "^0.6.1", "@angular-devkit/schematics": "^0.6.1", "@schematics/angular": "^0.6.1" @@ -37,7 +37,6 @@ "@delon/cache", "@delon/mock", "@delon/form", - "ng-zorro-antd", "ng-alain" ] }, diff --git a/packages/theme/package.json b/packages/theme/package.json index d24c6deb8..c1b86606d 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -16,10 +16,8 @@ }, "homepage": "https://github.com/cipchk/delon#readme", "keywords": ["delon", "ng-alain", "alain", "antd", "ng-zorro-antd"], - "dependencies": { - "ng-zorro-antd": "ZORRO-0.0.0-PLACEHOLDER" - }, "peerDependencies": { + "ng-zorro-antd": "ZORRO-0.0.0-PLACEHOLDER", "@delon/acl": "PEER-0.0.0-PLACEHOLDER" } } diff --git a/packages/util/package.json b/packages/util/package.json index be9b9b8bc..2b7f3ec66 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -22,7 +22,7 @@ "utility", "utils" ], - "dependencies": { + "peerDependencies": { "extend": "^3.0.1" } } diff --git a/scaffold b/scaffold index 3f1f39eba..efa00fa38 160000 --- a/scaffold +++ b/scaffold @@ -1 +1 @@ -Subproject commit 3f1f39eba5e2e47f167b652d1f72fbb7f8c84f8a +Subproject commit efa00fa38f0d78759af8dacc4d86ffe21058f217