refactor(all): upgrade to angular 5.0

ng-alain · Nov 19, 2017 · b4a1f22 · b4a1f22
1 parent 3eb8361
commit b4a1f22
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 227 deletions.
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -38,10 +38,10 @@ npm run serve:hmr
 
 | 包 | 版本 |
 | ------- | ------- |
-| `ng-alain` | 0.1.2-rc.3 | 
-| `ng-zorro-antd` | ^0.6.0-rc.3 |
-| `@angular` | ^4.4.5 |
-| `@angular/cli` | ^1.4.7 |
+| `ng-alain` | 0.1.2-rc.4 | 
+| `ng-zorro-antd` | ^0.6.0 |
+| `@angular` | ^5.0.0 |
+| `@angular/cli` | ^1.5.2 |
 
 **第三方类型[可选]**
 

diff --git a/README.md b/README.md
@@ -39,10 +39,10 @@ npm run serve:hmr
 
 | package | version |
 | ------- | ------- |
-| `ng-alain` | 0.1.2-rc.3 | 
-| `ng-zorro-antd` | ^0.6.0-rc.3 |
-| `@angular` | ^4.4.5 |
-| `@angular/cli` | ^1.4.7 |
+| `ng-alain` | 0.1.2-rc.4 | 
+| `ng-zorro-antd` | ^0.6.0 |
+| `@angular` | ^5.0.0 |
+| `@angular/cli` | ^1.5.2 |
 
 **Third Library[Optional]**
 

diff --git a/_documents/pipe.md b/_documents/pipe.md
@@ -17,7 +17,11 @@
 **别忘记在根模块中注册语言环境：**
 
 ```typescript
-// code see: https://github.com/unicode-cldr/cldr-core/blob/master/availableLocales.json
+import { registerLocaleData } from '@angular/common';
+import localeZhHans from '@angular/common/locales/zh-Hans';
+registerLocaleData(localeZhHans);
+
+
 { provide: LOCALE_ID, useValue: 'zh-Hans' }
 ```
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-alain",
-  "version": "0.1.2-rc.3",
+  "version": "0.1.2-rc.4",
   "description": "ng-zorro-antd admin panel front-end framework",
   "author": "cipchk",
   "homepage": "https://cipchk.github.io/ng-alain/",
@@ -28,56 +28,54 @@
     "chore.alain.push": "git subtree push --prefix=src/styles/alain alain master"
   },
   "dependencies": {
-    "@angular/animations": "~4.4.6",
-    "@angular/cdk": "2.0.0-beta.12",
-    "@angular/common": "~4.4.6",
-    "@angular/compiler": "~4.4.6",
-    "@angular/core": "~4.4.6",
-    "@angular/forms": "~4.4.6",
-    "@angular/http": "~4.4.6",
-    "@angular/platform-browser": "~4.4.6",
-    "@angular/platform-browser-dynamic": "~4.4.6",
-    "@angular/router": "~4.4.6",
+    "@angular/animations": "^5.0.0",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/forms": "^5.0.0",
+    "@angular/http": "^5.0.0",
+    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/router": "^5.0.0",
     "@ngx-translate/core": "^8.0.0",
     "@ngx-translate/http-loader": "^2.0.0",
-    "angular-baidu-maps": "1.0.0",
-    "angular-qq-maps": "1.0.0",
-    "angular-tree-component": "^5.0.0",
-    "angular-web-storage": "1.0.0",
+    "angular-baidu-maps": "^1.0.1",
+    "angular-qq-maps": "^1.0.1",
+    "angular-tree-component": "^5.2.1",
+    "angular-web-storage": "^1.0.1",
     "core-js": "^2.5.1",
     "file-saver": "^1.3.3",
     "font-awesome": "^4.7.0",
     "g2": "^2.3.12",
-    "g2-angular": "1.0.0",
-    "moment": "^2.18.1",
-    "ng-tree-antd": "1.0.0",
-    "ng-zorro-antd": "^0.6.0-rc.3",
-    "ng-zorro-antd-extra": "^1.0.0-beta.6",
+    "g2-angular": "^1.0.2",
+    "moment": "^2.19.1",
+    "ng-tree-antd": "^2.0.0",
+    "ng-zorro-antd": "^0.6.0",
+    "ng-zorro-antd-extra": "^1.1.0",
     "ng2-dnd": "^4.2.0",
     "ng2-file-upload": "^1.2.1",
     "ng2-img-cropper": "^0.9.0",
-    "ngx-color-picker": "^4.3.1",
-    "ngx-countdown": "1.0.2",
-    "rxjs": "^5.4.3",
+    "ngx-color-picker": "^5.0.0",
+    "ngx-countdown": "^1.0.3",
+    "rxjs": "^5.5.2",
     "screenfull": "^3.3.1",
     "simple-line-icons": "^2.4.1",
-    "sweetalert": "2.0.3",
+    "sweetalert2": "^7.0.0",
     "weather-icons": "^1.3.2",
     "zone.js": "^0.8.18"
   },
   "devDependencies": {
-    "@angular/cli": "~1.4.7",
-    "@angular/compiler-cli": "~4.4.6",
-    "@angular/language-service": "~4.4.6",
+    "@angular/cli": "^1.5.2",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/language-service": "^5.0.0",
     "@angularclass/hmr": "^2.1.3",
     "@angularclass/hmr-loader": "^3.0.4",
     "@types/jasmine": "~2.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "@types/jquery": "^3.2.12",
     "@types/moment": "^2.13.0",
     "@types/node": "~6.0.60",
-    "codecov": "^2.3.0",
-    "codelyzer": "~3.1.1",
+    "codecov": "^3.0.0",
+    "codelyzer": "~4.0.1",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~1.7.1",
@@ -91,8 +89,8 @@
     "npm-run-all": "^4.1.1",
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
-    "tslint": "~5.3.2",
-    "typescript": "~2.3.3",
+    "tslint": "~5.7.0",
+    "typescript": "~2.4.2",
     "webpack-bundle-analyzer": "^2.9.0"
   }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -17,6 +17,10 @@ import { TranslatorService } from './core/translator/translator.service';
 import { SettingsService } from './core/services/settings.service';
 import { TokenInterceptor } from '@core/net/token/token.interceptor';
 
+import { registerLocaleData } from '@angular/common';
+import localeZhHans from '@angular/common/locales/zh-Hans';
+registerLocaleData(localeZhHans);
+
 // AoT requires an exported function for factories
 export function HttpLoaderFactory(http: HttpClient) {
     return new TranslateHttpLoader(http, `assets/i18n/`, '.json');
@@ -47,7 +51,6 @@ export function StartupServiceFactory(startupService: StartupService): Function
         })
     ],
     providers: [
-        // code see: https://github.com/unicode-cldr/cldr-core/blob/master/availableLocales.json
         { provide: LOCALE_ID, useValue: 'zh-Hans' },
         { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true},
         StartupService,

diff --git a/src/app/routes/elements/sweetalert/sweetalert.component.html b/src/app/routes/elements/sweetalert/sweetalert.component.html
@@ -6,62 +6,19 @@ <h1>
 </div>
 <div nz-row [nzGutter]="16">
     <div nz-col [nzMd]="8">
-        <nz-card nzTitle="Showing an alert">
-            <button nz-button (click)="alert1()">
-                <span>Basic</span>
-            </button>
-            <button nz-button (click)="alert2()">
-                <span>Basic2</span>
-            </button>
-            <button nz-button (click)="alert3()">
-                <span>Success</span>
-            </button>
-            <button nz-button (click)="alert31()">
-                <span>Error</span>
+        <nz-card nzTitle="MODAL TYPES">
+            <button nz-button (click)="alertType(t)" *ngFor="let t of types" class="mr-sm">
+                <span>{{t}}</span>
             </button>
         </nz-card>
     </div>
     <div nz-col [nzMd]="8">
-        <nz-card nzTitle="Using options">
-            <button nz-button (click)="alert4()">
-                <span>Show</span>
+        <nz-card nzTitle="INPUT TYPES">
+            <button nz-button (click)="alertText()" class="mr-sm">
+                <span>text</span>
             </button>
-            <button nz-button (click)="alert41()">
-                <span>3s Auto Close</span>
-            </button>
-        </nz-card>
-    </div>
-    <div nz-col [nzMd]="8">
-        <nz-card nzTitle="Using promises">
-            <button nz-button (click)="alert5()">
-                <span>Show</span>
-            </button>
-            <button nz-button (click)="alert6()">
-                <span>Are you sure?</span>
-            </button>
-        </nz-card>
-    </div>
-    <div nz-col [nzMd]="8">
-        <nz-card nzTitle="Customizing buttons">
-            <button nz-button (click)="alert7()">
-                <span>Show</span>
-            </button>
-            <button nz-button (click)="alert8()">
-                <span>3 Buttons</span>
-            </button>
-        </nz-card>
-    </div>
-    <div nz-col [nzMd]="8">
-        <nz-card nzTitle="AJAX requests">
-            <button nz-button (click)="alert9()">
-                <span>Show</span>
-            </button>
-        </nz-card>
-    </div>
-    <div nz-col [nzMd]="8">
-        <nz-card nzTitle="Using DOM nodes as content">
-            <button nz-button (click)="alert10()">
-                <span>Show</span>
+            <button nz-button (click)="alertHtml()">
+                <span>html</span>
             </button>
         </nz-card>
     </div>