From a45e55866234b164dacd50d424c61bc7b70a22c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Sun, 22 Nov 2020 19:53:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 16 ++++++--- package.json | 3 +- src/app/app.module.ts | 27 ++++++++++++--- src/app/services/error.service.ts | 2 +- .../admin-article/admin-article.component.ts | 2 +- .../admin-article/admin-article.module.ts | 3 +- .../admin-comment/admin-comment.component.ts | 2 +- .../admin-comment/admin-comment.module.ts | 5 ++- .../admin-dashboard/admin-dashboard.module.ts | 16 ++++----- .../admin/admin-link/admin-link.component.ts | 2 +- .../admin/admin-link/admin-link.module.ts | 16 ++++----- .../admin/admin-tag/admin-tag.component.ts | 2 +- .../view/admin/admin-tag/admin-tag.module.ts | 5 ++- .../admin-update/admin-update.component.ts | 2 +- .../admin/admin-update/admin-update.module.ts | 4 ++- .../admin/admin-user/admin-user.component.ts | 2 +- .../admin/admin-user/admin-user.module.ts | 18 +++++----- src/app/view/admin/admin.component.ts | 5 +-- src/app/view/admin/admin.module.ts | 33 +++++++++++++++++-- .../common-table/common-table.module.ts | 21 +++++++----- .../editable-tag/editable-tag.component.ts | 2 +- .../editable-tag/editable-tag.module.ts | 4 ++- .../test-common-table.module.ts | 3 +- src/app/view/article/article.module.ts | 23 +++++++------ src/app/view/category/category.component.ts | 2 +- src/app/view/category/category.module.ts | 3 +- .../view/email-verify/email-verify.module.ts | 2 +- src/app/view/index/index.component.ts | 3 +- src/app/view/index/index.module.ts | 16 ++++----- src/app/view/link/link.component.ts | 3 +- src/app/view/link/link.module.ts | 7 +++- .../components/login/login.component.ts | 2 +- .../registration/registration.component.ts | 2 +- .../login-registration.component.ts | 2 +- .../login-registration.module.ts | 6 +++- src/app/view/maintain/maintain.module.ts | 3 +- src/app/view/reset-pwd/reset-pwd.component.ts | 2 +- src/app/view/reset-pwd/reset-pwd.module.ts | 2 +- src/app/view/tag/tag.component.ts | 2 +- src/app/view/update/update.module.ts | 2 +- src/app/view/write/write.component.ts | 2 +- src/app/view/write/write.module.ts | 22 ++++++------- src/environments/environment.ts | 2 +- tslint.json | 4 ++- 44 files changed, 193 insertions(+), 114 deletions(-) diff --git a/package-lock.json b/package-lock.json index b84d340..108e460 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4215,8 +4215,8 @@ }, "diff-match-patch": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", - "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==" + "resolved": "https://registry.npm.taobao.org/diff-match-patch/download/diff-match-patch-1.0.5.tgz", + "integrity": "sha1-q7WE1fEM0Rlt/FWqA3AVkq4/ezc=" }, "diffie-hellman": { "version": "5.0.3", @@ -8154,6 +8154,12 @@ "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, + "nz-tslint-rules": { + "version": "0.901.2", + "resolved": "https://registry.npm.taobao.org/nz-tslint-rules/download/nz-tslint-rules-0.901.2.tgz", + "integrity": "sha1-70ojrq4JHv+/PFAgLLypeUvzcx0=", + "dev": true + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", @@ -12688,9 +12694,9 @@ "dev": true }, "vditor": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/vditor/-/vditor-3.6.0.tgz", - "integrity": "sha512-RzcHGntGEzpNcnRczhrWVYq9lZLEfiOGu3vX0wQQqFZUMHC3bjZIWSJJtHCUgrKdaHXheEhUH2vWLoJA3Ino6A==", + "version": "3.6.3", + "resolved": "https://registry.npm.taobao.org/vditor/download/vditor-3.6.3.tgz", + "integrity": "sha1-fQBvJzIIhpsmgmhFO2iK1KDeiZU=", "requires": { "diff-match-patch": "^1.0.5" } diff --git a/package.json b/package.json index a23daec..bbdaa4d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "ng-zorro-antd": "^10.1.2", "rxjs": "^6.6.3", "tslib": "^2.0.3", - "vditor": "^3.6.0", + "vditor": "^3.6.3", "zone.js": "^0.11.2" }, "devDependencies": { @@ -44,6 +44,7 @@ "karma-coverage-istanbul-reporter": "^3.0.3", "karma-jasmine": "^4.0.1", "karma-jasmine-html-reporter": "^1.5.4", + "nz-tslint-rules": "^0.901.2", "protractor": "^7.0.0", "ts-node": "^9.0.0", "tslint": "^6.1.3", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ae58dc1..4e1f4d0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,7 +1,7 @@ import {BrowserModule} from '@angular/platform-browser'; -import {forwardRef, NgModule} from '@angular/core'; +import {NgModule} from '@angular/core'; import {AppComponent} from './app.component'; -import {NgZorroAntdModule, NZ_I18N, zh_CN} from 'ng-zorro-antd'; +import {NZ_I18N, zh_CN} from 'ng-zorro-antd/i18n'; import {FormsModule} from '@angular/forms'; import {HttpClientModule} from '@angular/common/http'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; @@ -20,6 +20,16 @@ import {ComponentStateService} from './services/component-state.service'; import {GlobalUserService} from './services/global-user.service'; import {LocalStorageService} from './services/local-storage.service'; import {ApiService} from './api/api.service'; +import {NzMessageService} from 'ng-zorro-antd/message'; +import {NzBackTopModule} from 'ng-zorro-antd/back-top'; +import {NzModalModule} from 'ng-zorro-antd/modal'; +import {NzNotificationService} from 'ng-zorro-antd/notification'; +import {NzDropDownModule} from 'ng-zorro-antd/dropdown'; +import {NzIconModule} from 'ng-zorro-antd/icon'; +import {NzAvatarModule} from 'ng-zorro-antd/avatar'; +import {NzButtonModule} from 'ng-zorro-antd/button'; +import {NzGridModule} from 'ng-zorro-antd/grid'; +import {NzDividerModule} from 'ng-zorro-antd/divider'; registerLocaleData(zh); @@ -33,13 +43,20 @@ registerLocaleData(zh); imports: [ BrowserModule, AppRoutingModule, - NgZorroAntdModule, FormsModule, HttpClientModule, BrowserAnimationsModule, LoginRegistrationModule, AdminModule, - ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production}) + ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production}), + NzBackTopModule, + NzModalModule, + NzDropDownModule, + NzIconModule, + NzAvatarModule, + NzButtonModule, + NzGridModule, + NzDividerModule ], providers: [ ComponentStateService, @@ -47,6 +64,8 @@ registerLocaleData(zh); LocalStorageService, HttpService, ApiService, + NzMessageService, + NzNotificationService, ErrorService, {provide: NZ_I18N, useValue: zh_CN}, ], diff --git a/src/app/services/error.service.ts b/src/app/services/error.service.ts index fd562e4..878c153 100644 --- a/src/app/services/error.service.ts +++ b/src/app/services/error.service.ts @@ -3,7 +3,7 @@ import {RequestObj, Response} from '../class/HttpReqAndResp'; import {environment} from '../../environments/environment'; import {Router} from '@angular/router'; import {ComponentStateService} from './component-state.service'; -import {NzNotificationService} from 'ng-zorro-antd'; +import { NzNotificationService } from 'ng-zorro-antd/notification'; import {HttpService} from '../api/http/http.service'; import {LocalStorageService} from './local-storage.service'; diff --git a/src/app/view/admin/admin-article/admin-article.component.ts b/src/app/view/admin/admin-article/admin-article.component.ts index 28b7a17..54bde2d 100644 --- a/src/app/view/admin/admin-article/admin-article.component.ts +++ b/src/app/view/admin/admin-article/admin-article.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {ApiService} from '../../../api/api.service'; import {RequestObj} from '../../../class/HttpReqAndResp'; import {Article} from '../../../class/Article'; diff --git a/src/app/view/admin/admin-article/admin-article.module.ts b/src/app/view/admin/admin-article/admin-article.module.ts index 2bf601d..0f79808 100644 --- a/src/app/view/admin/admin-article/admin-article.module.ts +++ b/src/app/view/admin/admin-article/admin-article.module.ts @@ -4,7 +4,8 @@ import {RouterModule} from '@angular/router'; import {AdminArticleComponent} from './admin-article.component'; import {CommonTableModule} from '../components/common-table/common-table.module'; import {FormsModule} from '@angular/forms'; -import {NzCheckboxModule, NzTagModule} from 'ng-zorro-antd'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzTagModule } from 'ng-zorro-antd/tag'; @NgModule({ declarations: [ diff --git a/src/app/view/admin/admin-comment/admin-comment.component.ts b/src/app/view/admin/admin-comment/admin-comment.component.ts index 08bf692..116795e 100644 --- a/src/app/view/admin/admin-comment/admin-comment.component.ts +++ b/src/app/view/admin/admin-comment/admin-comment.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {ApiService} from '../../../api/api.service'; import {RequestObj} from '../../../class/HttpReqAndResp'; import {Comment, CommentReq} from '../../../class/Comment'; diff --git a/src/app/view/admin/admin-comment/admin-comment.module.ts b/src/app/view/admin/admin-comment/admin-comment.module.ts index ca90aae..4958fb4 100644 --- a/src/app/view/admin/admin-comment/admin-comment.module.ts +++ b/src/app/view/admin/admin-comment/admin-comment.module.ts @@ -3,7 +3,10 @@ import {CommonModule} from '@angular/common'; import {RouterModule} from '@angular/router'; import {AdminCommentComponent} from './admin-comment.component'; import {CommonTableModule} from '../components/common-table/common-table.module'; -import {NzAvatarModule, NzCommentModule, NzModalModule, NzTagModule} from 'ng-zorro-antd'; +import { NzAvatarModule } from 'ng-zorro-antd/avatar'; +import { NzCommentModule } from 'ng-zorro-antd/comment'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import {EditableTagModule} from '../components/editable-tag/editable-tag.module'; diff --git a/src/app/view/admin/admin-dashboard/admin-dashboard.module.ts b/src/app/view/admin/admin-dashboard/admin-dashboard.module.ts index 38c15ea..bb64ab8 100644 --- a/src/app/view/admin/admin-dashboard/admin-dashboard.module.ts +++ b/src/app/view/admin/admin-dashboard/admin-dashboard.module.ts @@ -2,15 +2,13 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {AdminDashboardComponent} from './admin-dashboard.component'; import {RouterModule} from '@angular/router'; -import { - NzButtonModule, - NzCardModule, - NzDividerModule, - NzGridModule, - NzIconModule, - NzSpinModule, - NzStatisticModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzSpinModule } from 'ng-zorro-antd/spin'; +import { NzStatisticModule } from 'ng-zorro-antd/statistic'; @NgModule({ diff --git a/src/app/view/admin/admin-link/admin-link.component.ts b/src/app/view/admin/admin-link/admin-link.component.ts index cbbe489..756c46c 100644 --- a/src/app/view/admin/admin-link/admin-link.component.ts +++ b/src/app/view/admin/admin-link/admin-link.component.ts @@ -2,7 +2,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {RequestObj, Response} from '../../../class/HttpReqAndResp'; import {Link} from '../../../class/Link'; import {ApiService} from '../../../api/api.service'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {FormControl, FormGroup, Validators} from '@angular/forms'; import {Observable} from 'rxjs'; import {Title} from '@angular/platform-browser'; diff --git a/src/app/view/admin/admin-link/admin-link.module.ts b/src/app/view/admin/admin-link/admin-link.module.ts index 954d661..9fddef8 100644 --- a/src/app/view/admin/admin-link/admin-link.module.ts +++ b/src/app/view/admin/admin-link/admin-link.module.ts @@ -3,15 +3,13 @@ import {CommonModule} from '@angular/common'; import {RouterModule} from '@angular/router'; import {AdminLinkComponent} from './admin-link.component'; import {CommonTableModule} from '../components/common-table/common-table.module'; -import { - NzButtonModule, - NzCheckboxModule, - NzFormModule, - NzInputModule, - NzModalModule, - NzSelectModule, - NzTagModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; diff --git a/src/app/view/admin/admin-tag/admin-tag.component.ts b/src/app/view/admin/admin-tag/admin-tag.component.ts index e7681d1..a4dac0b 100644 --- a/src/app/view/admin/admin-tag/admin-tag.component.ts +++ b/src/app/view/admin/admin-tag/admin-tag.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {Category, Tag} from '../../../class/Tag'; import {ApiService} from '../../../api/api.service'; import {PageList, RequestObj} from '../../../class/HttpReqAndResp'; diff --git a/src/app/view/admin/admin-tag/admin-tag.module.ts b/src/app/view/admin/admin-tag/admin-tag.module.ts index 97c2040..211fd95 100644 --- a/src/app/view/admin/admin-tag/admin-tag.module.ts +++ b/src/app/view/admin/admin-tag/admin-tag.module.ts @@ -5,7 +5,10 @@ import {AdminTagComponent} from './admin-tag.component'; import {FormsModule} from '@angular/forms'; import {CommonTableModule} from '../components/common-table/common-table.module'; import {EditableTagModule} from '../components/editable-tag/editable-tag.module'; -import {NzButtonModule, NzCardModule, NzIconModule, NzTabsModule} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzTabsModule } from 'ng-zorro-antd/tabs'; @NgModule({ diff --git a/src/app/view/admin/admin-update/admin-update.component.ts b/src/app/view/admin/admin-update/admin-update.component.ts index a15772a..e8b5e79 100644 --- a/src/app/view/admin/admin-update/admin-update.component.ts +++ b/src/app/view/admin/admin-update/admin-update.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {Title} from '@angular/platform-browser'; import {Observable} from 'rxjs'; import {ApiService} from '../../../api/api.service'; diff --git a/src/app/view/admin/admin-update/admin-update.module.ts b/src/app/view/admin/admin-update/admin-update.module.ts index f1c5082..04b01c7 100644 --- a/src/app/view/admin/admin-update/admin-update.module.ts +++ b/src/app/view/admin/admin-update/admin-update.module.ts @@ -5,7 +5,9 @@ import {AdminUpdateComponent} from './admin-update.component'; import {FormsModule} from '@angular/forms'; import {CommonTableModule} from '../components/common-table/common-table.module'; -import {NzButtonModule, NzInputModule, NzModalModule} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; @NgModule({ diff --git a/src/app/view/admin/admin-user/admin-user.component.ts b/src/app/view/admin/admin-user/admin-user.component.ts index 9bccfed..f7f1213 100644 --- a/src/app/view/admin/admin-user/admin-user.component.ts +++ b/src/app/view/admin/admin-user/admin-user.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {Title} from '@angular/platform-browser'; import {FormControl, FormGroup} from '@angular/forms'; import {RequestObj} from '../../../class/HttpReqAndResp'; diff --git a/src/app/view/admin/admin-user/admin-user.module.ts b/src/app/view/admin/admin-user/admin-user.module.ts index c46ac69..4963b7a 100644 --- a/src/app/view/admin/admin-user/admin-user.module.ts +++ b/src/app/view/admin/admin-user/admin-user.module.ts @@ -4,15 +4,15 @@ import {RouterModule} from '@angular/router'; import {AdminUserComponent} from './admin-user.component'; import {ReactiveFormsModule} from '@angular/forms'; import {CommonTableModule} from '../components/common-table/common-table.module'; -import { - NzButtonModule, - NzFormModule, - NzGridModule, - NzIconModule, - NzInputModule, NzModalModule, - NzRadioModule, - NzSelectModule, NzTagModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzTagModule } from 'ng-zorro-antd/tag'; @NgModule({ diff --git a/src/app/view/admin/admin.component.ts b/src/app/view/admin/admin.component.ts index fbff0f6..6210df0 100644 --- a/src/app/view/admin/admin.component.ts +++ b/src/app/view/admin/admin.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms'; -import {NzMessageService, UploadFile} from 'ng-zorro-antd'; +import {NzMessageService} from 'ng-zorro-antd/message'; +import {NzUploadFile} from 'ng-zorro-antd/upload'; import {Router} from '@angular/router'; import {GlobalUserService} from '../../services/global-user.service'; import {User} from '../../class/User'; @@ -71,7 +72,7 @@ export class AdminComponent implements OnInit { return control.value !== newPwd ? {pwdNotSame: true} : null; }; } - uploadHeader = (file: UploadFile): object | Observable<{}> => { + uploadHeader = (file: NzUploadFile): object | Observable<{}> => { return {Authorization: this.localStorageService.getToken()} }; diff --git a/src/app/view/admin/admin.module.ts b/src/app/view/admin/admin.module.ts index fc5a1e8..698bb89 100644 --- a/src/app/view/admin/admin.module.ts +++ b/src/app/view/admin/admin.module.ts @@ -2,12 +2,25 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {AdminRoutingModule} from './admin-routing.module'; import {AdminComponent} from './admin.component'; -import {NgZorroAntdModule} from 'ng-zorro-antd'; import {NzSpaceModule} from 'ng-zorro-antd/space'; import {AdminHeaderComponent} from '../../components/admin-header/admin-header.component'; import {ReactiveFormsModule} from '@angular/forms'; import {AuthGuard} from './auth.guard'; - +import {NzAvatarModule} from 'ng-zorro-antd/avatar'; +import {NzButtonModule} from 'ng-zorro-antd/button'; +import {NzLayoutModule} from 'ng-zorro-antd/layout'; +import {NzMenuModule} from 'ng-zorro-antd/menu'; +import {NzIconModule} from 'ng-zorro-antd/icon'; +import {NzCardModule} from 'ng-zorro-antd/card'; +import {NzDividerModule} from 'ng-zorro-antd/divider'; +import {NzUploadModule} from 'ng-zorro-antd/upload'; +import {NzToolTipModule} from 'ng-zorro-antd/tooltip'; +import {NzTypographyModule} from 'ng-zorro-antd/typography'; +import {NzModalModule} from 'ng-zorro-antd/modal'; +import {NzFormModule} from 'ng-zorro-antd/form'; +import {NzInputModule} from 'ng-zorro-antd/input'; +import {NzDescriptionsModule} from 'ng-zorro-antd/descriptions'; +import {NzDrawerModule} from 'ng-zorro-antd/drawer'; @NgModule({ declarations: [ @@ -17,9 +30,23 @@ import {AuthGuard} from './auth.guard'; imports: [ CommonModule, AdminRoutingModule, - NgZorroAntdModule, NzSpaceModule, ReactiveFormsModule, + NzAvatarModule, + NzButtonModule, + NzLayoutModule, + NzMenuModule, + NzIconModule, + NzCardModule, + NzDividerModule, + NzUploadModule, + NzToolTipModule, + NzTypographyModule, + NzModalModule, + NzFormModule, + NzInputModule, + NzDescriptionsModule, + NzDrawerModule ], providers: [AuthGuard] }) diff --git a/src/app/view/admin/components/common-table/common-table.module.ts b/src/app/view/admin/components/common-table/common-table.module.ts index 9a6044e..b32c6dd 100644 --- a/src/app/view/admin/components/common-table/common-table.module.ts +++ b/src/app/view/admin/components/common-table/common-table.module.ts @@ -1,15 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {CommonTableComponent} from './common-table.component'; -import { - NzButtonModule, - NzCardModule, - NzDividerModule, - NzIconModule, NzModalModule, NzOutletModule, NzPopconfirmModule, NzSwitchModule, - NzTableModule, NzTagModule, - NzToolTipModule, - NzTypographyModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzOutletModule } from 'ng-zorro-antd/core/outlet'; +import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; +import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzTagModule } from 'ng-zorro-antd/tag'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; +import { NzTypographyModule } from 'ng-zorro-antd/typography'; import {FormsModule} from '@angular/forms'; import {DragDropModule} from '@angular/cdk/drag-drop' diff --git a/src/app/view/admin/components/editable-tag/editable-tag.component.ts b/src/app/view/admin/components/editable-tag/editable-tag.component.ts index 3368420..b98a0b8 100644 --- a/src/app/view/admin/components/editable-tag/editable-tag.component.ts +++ b/src/app/view/admin/components/editable-tag/editable-tag.component.ts @@ -9,7 +9,7 @@ import { SimpleChanges, ViewChild } from '@angular/core'; -import {NzModalRef, NzModalService} from 'ng-zorro-antd'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @Component({ selector: 'editable-tag', diff --git a/src/app/view/admin/components/editable-tag/editable-tag.module.ts b/src/app/view/admin/components/editable-tag/editable-tag.module.ts index e3cd5cd..2f4098d 100644 --- a/src/app/view/admin/components/editable-tag/editable-tag.module.ts +++ b/src/app/view/admin/components/editable-tag/editable-tag.module.ts @@ -1,7 +1,9 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {EditableTagComponent} from './editable-tag.component'; -import {NzIconModule, NzInputModule, NzTagModule} from 'ng-zorro-antd'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import {FormsModule} from '@angular/forms'; diff --git a/src/app/view/admin/test-common-table/test-common-table.module.ts b/src/app/view/admin/test-common-table/test-common-table.module.ts index ffb37a0..8a5e3d6 100644 --- a/src/app/view/admin/test-common-table/test-common-table.module.ts +++ b/src/app/view/admin/test-common-table/test-common-table.module.ts @@ -3,7 +3,8 @@ import {CommonModule} from '@angular/common'; import {TestCommonTableComponent} from './test-common-table.component'; import {Router, RouterModule} from '@angular/router'; import {CommonTableModule} from '../components/common-table/common-table.module'; -import {NzCheckboxModule, NzTagModule} from 'ng-zorro-antd'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import {FormsModule} from '@angular/forms'; import {EditableTagModule} from '../components/editable-tag/editable-tag.module'; diff --git a/src/app/view/article/article.module.ts b/src/app/view/article/article.module.ts index 0527803..510b1e6 100644 --- a/src/app/view/article/article.module.ts +++ b/src/app/view/article/article.module.ts @@ -2,16 +2,19 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ArticleRoutingModule} from './article-routing.module'; import {ArticleComponent} from './article.component'; -import { - NzAffixModule, - NzAnchorModule, NzAvatarModule, - NzButtonModule, - NzCommentModule, - NzDividerModule, NzFormModule, - NzGridModule, - NzIconModule, NzInputModule, - NzLayoutModule, NzListModule, NzTabsModule -} from 'ng-zorro-antd'; +import { NzAffixModule } from 'ng-zorro-antd/affix'; +import { NzAnchorModule } from 'ng-zorro-antd/anchor'; +import { NzAvatarModule } from 'ng-zorro-antd/avatar'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCommentModule } from 'ng-zorro-antd/comment'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzLayoutModule } from 'ng-zorro-antd/layout'; +import { NzListModule } from 'ng-zorro-antd/list'; +import { NzTabsModule } from 'ng-zorro-antd/tabs'; import {FormsModule} from '@angular/forms'; diff --git a/src/app/view/category/category.component.ts b/src/app/view/category/category.component.ts index 0001a2e..331ea57 100644 --- a/src/app/view/category/category.component.ts +++ b/src/app/view/category/category.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {ApiService} from '../../api/api.service'; import {Tag} from '../../class/Tag'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {PageList} from '../../class/HttpReqAndResp'; import {Article} from '../../class/Article'; import {ActivatedRoute} from '@angular/router'; diff --git a/src/app/view/category/category.module.ts b/src/app/view/category/category.module.ts index 167a4a3..7e7510c 100644 --- a/src/app/view/category/category.module.ts +++ b/src/app/view/category/category.module.ts @@ -2,7 +2,8 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {CategoryComponent} from './category.component'; import {CategoryRoutingModule} from './category-routing.module'; -import {NzIconModule, NzToolTipModule} from 'ng-zorro-antd'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import {IndexModule} from '../index/index.module'; diff --git a/src/app/view/email-verify/email-verify.module.ts b/src/app/view/email-verify/email-verify.module.ts index 8034228..d8ebf14 100644 --- a/src/app/view/email-verify/email-verify.module.ts +++ b/src/app/view/email-verify/email-verify.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {Route, RouterModule} from '@angular/router'; import {EmailVerifyComponent} from './email-verify.component'; -import {NzAlertModule} from 'ng-zorro-antd'; +import { NzAlertModule } from 'ng-zorro-antd/alert'; const routes: Route[] = [ {path: '**', component: EmailVerifyComponent} diff --git a/src/app/view/index/index.component.ts b/src/app/view/index/index.component.ts index 5d543a2..fbacddb 100644 --- a/src/app/view/index/index.component.ts +++ b/src/app/view/index/index.component.ts @@ -1,7 +1,8 @@ import {Component, OnInit} from '@angular/core'; import {ApiService} from '../../api/api.service'; import {Article} from '../../class/Article'; -import {NzIconService, NzMessageService} from 'ng-zorro-antd'; +import { NzIconService } from 'ng-zorro-antd/icon'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {SvgIconUtil} from '../../utils/svgIconUtil'; import {PageList, RequestObj} from '../../class/HttpReqAndResp'; import {Router} from '@angular/router'; diff --git a/src/app/view/index/index.module.ts b/src/app/view/index/index.module.ts index 824da42..a33b468 100644 --- a/src/app/view/index/index.module.ts +++ b/src/app/view/index/index.module.ts @@ -3,15 +3,13 @@ import {CommonModule} from '@angular/common'; import {IndexComponent} from './index.component'; import {IndexRoutingModule} from './index-routing.module'; import {ArticleDetailCardComponent} from './components/article-detail-card/article-detail-card.component'; -import { - NzBackTopModule, - NzCardModule, - NzDividerModule, - NzGridModule, - NzIconModule, - NzPaginationModule, - NzToolTipModule -} from 'ng-zorro-antd'; +import { NzBackTopModule } from 'ng-zorro-antd/back-top'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzPaginationModule } from 'ng-zorro-antd/pagination'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { CardDetailComponent } from './components/card-detail/card-detail.component'; import { TagTagComponent } from './components/tag-tag/tag-tag.component'; diff --git a/src/app/view/link/link.component.ts b/src/app/view/link/link.component.ts index 822bdf9..0d5e248 100644 --- a/src/app/view/link/link.component.ts +++ b/src/app/view/link/link.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit} from '@angular/core'; -import {NzMessageService, NzModalService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; import {Title} from '@angular/platform-browser'; import {ApiService} from '../../api/api.service'; import {ApplyLinkReq, Link} from '../../class/Link'; diff --git a/src/app/view/link/link.module.ts b/src/app/view/link/link.module.ts index 4e09598..5992b9a 100644 --- a/src/app/view/link/link.module.ts +++ b/src/app/view/link/link.module.ts @@ -1,7 +1,12 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {LinkComponent} from './link.component'; -import {NzButtonModule, NzFormModule, NzIconModule, NzInputModule, NzModalModule, NzSelectModule} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzSelectModule } from 'ng-zorro-antd/select'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; diff --git a/src/app/view/login-registration/components/login/login.component.ts b/src/app/view/login-registration/components/login/login.component.ts index 5336e13..04d96a4 100644 --- a/src/app/view/login-registration/components/login/login.component.ts +++ b/src/app/view/login-registration/components/login/login.component.ts @@ -1,5 +1,5 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {LoginReq} from '../../../../class/User'; import {ActivatedRoute, Router} from '@angular/router'; import {LoginRegistrationService} from '../../service/login-registration.service'; diff --git a/src/app/view/login-registration/components/registration/registration.component.ts b/src/app/view/login-registration/components/registration/registration.component.ts index 2e1439c..869b603 100644 --- a/src/app/view/login-registration/components/registration/registration.component.ts +++ b/src/app/view/login-registration/components/registration/registration.component.ts @@ -1,7 +1,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core'; import {environment} from '../../../../../environments/environment'; import {ApiService} from '../../../../api/api.service'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {Router} from '@angular/router'; import {RequestObj} from '../../../../class/HttpReqAndResp'; import {LoginReq} from '../../../../class/User'; diff --git a/src/app/view/login-registration/login-registration.component.ts b/src/app/view/login-registration/login-registration.component.ts index 06aa1f0..065bae9 100644 --- a/src/app/view/login-registration/login-registration.component.ts +++ b/src/app/view/login-registration/login-registration.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {ApiService} from '../../api/api.service'; import {LoginRegistrationService} from './service/login-registration.service'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; @Component({ selector: 'view-login-registration', diff --git a/src/app/view/login-registration/login-registration.module.ts b/src/app/view/login-registration/login-registration.module.ts index b0ac3dd..cbf4ec5 100644 --- a/src/app/view/login-registration/login-registration.module.ts +++ b/src/app/view/login-registration/login-registration.module.ts @@ -6,7 +6,11 @@ import {RegistrationComponent} from './components/registration/registration.comp import {LoginRegistrationRoutingModule} from './login-registration-routing.module'; import {LoginRegistrationComponent} from './login-registration.component'; import {FormsModule} from '@angular/forms'; -import {NzButtonModule, NzFormModule, NzGridModule, NzInputModule, NzModalModule} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; @NgModule({ diff --git a/src/app/view/maintain/maintain.module.ts b/src/app/view/maintain/maintain.module.ts index ee5388a..43c9794 100644 --- a/src/app/view/maintain/maintain.module.ts +++ b/src/app/view/maintain/maintain.module.ts @@ -2,7 +2,8 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {MaintainComponent} from './maintain.component'; import {RouterModule} from '@angular/router'; -import {NzButtonModule, NzResultModule} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzResultModule } from 'ng-zorro-antd/result'; @NgModule({ diff --git a/src/app/view/reset-pwd/reset-pwd.component.ts b/src/app/view/reset-pwd/reset-pwd.component.ts index 0f4a7c2..300c661 100644 --- a/src/app/view/reset-pwd/reset-pwd.component.ts +++ b/src/app/view/reset-pwd/reset-pwd.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {ActivatedRoute, Router} from '@angular/router'; import {ApiService} from '../../api/api.service'; import {Title} from '@angular/platform-browser'; diff --git a/src/app/view/reset-pwd/reset-pwd.module.ts b/src/app/view/reset-pwd/reset-pwd.module.ts index f7acee8..57b4667 100644 --- a/src/app/view/reset-pwd/reset-pwd.module.ts +++ b/src/app/view/reset-pwd/reset-pwd.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {Route, RouterModule} from '@angular/router'; import {ResetPwdComponent} from './reset-pwd.component'; -import {NzAlertModule} from 'ng-zorro-antd'; +import { NzAlertModule } from 'ng-zorro-antd/alert'; import {FormsModule} from '@angular/forms'; const routes: Route[] = [ diff --git a/src/app/view/tag/tag.component.ts b/src/app/view/tag/tag.component.ts index 61c24b9..d40422f 100644 --- a/src/app/view/tag/tag.component.ts +++ b/src/app/view/tag/tag.component.ts @@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core'; import {PageList} from '../../class/HttpReqAndResp'; import {Article} from '../../class/Article'; import {ApiService} from '../../api/api.service'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {Location} from '@angular/common'; import {ActivatedRoute} from '@angular/router'; import {Title} from '@angular/platform-browser'; diff --git a/src/app/view/update/update.module.ts b/src/app/view/update/update.module.ts index 8aea99f..3f93cf3 100644 --- a/src/app/view/update/update.module.ts +++ b/src/app/view/update/update.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {UpdateComponent} from './update.component'; import {Route, RouterModule} from '@angular/router'; -import {NzTagModule} from 'ng-zorro-antd'; +import { NzTagModule } from 'ng-zorro-antd/tag'; const routes: Route[] = [{path: '**', component: UpdateComponent}]; diff --git a/src/app/view/write/write.component.ts b/src/app/view/write/write.component.ts index f224c36..35788de 100644 --- a/src/app/view/write/write.component.ts +++ b/src/app/view/write/write.component.ts @@ -2,7 +2,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {ArticleReq} from '../../class/Article'; import {ActivatedRoute, Router} from '@angular/router'; import {ApiService} from '../../api/api.service'; -import {NzMessageService} from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import {User} from '../../class/User'; import {Tag} from '../../class/Tag'; import {Title} from '@angular/platform-browser'; diff --git a/src/app/view/write/write.module.ts b/src/app/view/write/write.module.ts index 97f3c19..f569c83 100644 --- a/src/app/view/write/write.module.ts +++ b/src/app/view/write/write.module.ts @@ -4,18 +4,16 @@ import {WriteComponent} from './write.component'; import {Route, RouterModule} from '@angular/router'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {PublishFormComponent} from './components/publish-form/publish-form.component'; -import { - NzButtonModule, - NzCardModule, - NzDividerModule, - NzFormModule, - NzIconModule, - NzInputModule, - NzModalModule, - NzRadioModule, - NzSelectModule, - NzTagModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import {EditableTagModule} from '../admin/components/editable-tag/editable-tag.module'; const routes: Route[] = [ diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 683badd..44ec3fc 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,7 +5,7 @@ export const environment = { production: false, logger: true, - host: 'http://127.0.0.1/' + host: 'http://127.0.0.1:8080/' }; /* diff --git a/tslint.json b/tslint.json index 9ccc147..6858576 100644 --- a/tslint.json +++ b/tslint.json @@ -1,6 +1,7 @@ { "extends": "tslint:recommended", "rules": { + "nz-secondary-entry-imports": true, "array-type": false, "arrow-parens": false, "deprecation": { @@ -86,6 +87,7 @@ "use-pipe-transform-interface": true }, "rulesDirectory": [ - "codelyzer" + "codelyzer", + "node_modules/nz-tslint-rules" ] }