fix: 更新依赖导致的错误异常

This commit is contained in:
禾几海
2020-11-22 19:53:11 +08:00
parent 6d9aa66536
commit a45e558662
44 changed files with 193 additions and 114 deletions

16
package-lock.json generated
View File

@@ -4215,8 +4215,8 @@
}, },
"diff-match-patch": { "diff-match-patch": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", "resolved": "https://registry.npm.taobao.org/diff-match-patch/download/diff-match-patch-1.0.5.tgz",
"integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==" "integrity": "sha1-q7WE1fEM0Rlt/FWqA3AVkq4/ezc="
}, },
"diffie-hellman": { "diffie-hellman": {
"version": "5.0.3", "version": "5.0.3",
@@ -8154,6 +8154,12 @@
"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
"dev": true "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": { "oauth-sign": {
"version": "0.9.0", "version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
@@ -12688,9 +12694,9 @@
"dev": true "dev": true
}, },
"vditor": { "vditor": {
"version": "3.6.0", "version": "3.6.3",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-3.6.0.tgz", "resolved": "https://registry.npm.taobao.org/vditor/download/vditor-3.6.3.tgz",
"integrity": "sha512-RzcHGntGEzpNcnRczhrWVYq9lZLEfiOGu3vX0wQQqFZUMHC3bjZIWSJJtHCUgrKdaHXheEhUH2vWLoJA3Ino6A==", "integrity": "sha1-fQBvJzIIhpsmgmhFO2iK1KDeiZU=",
"requires": { "requires": {
"diff-match-patch": "^1.0.5" "diff-match-patch": "^1.0.5"
} }

View File

@@ -25,7 +25,7 @@
"ng-zorro-antd": "^10.1.2", "ng-zorro-antd": "^10.1.2",
"rxjs": "^6.6.3", "rxjs": "^6.6.3",
"tslib": "^2.0.3", "tslib": "^2.0.3",
"vditor": "^3.6.0", "vditor": "^3.6.3",
"zone.js": "^0.11.2" "zone.js": "^0.11.2"
}, },
"devDependencies": { "devDependencies": {
@@ -44,6 +44,7 @@
"karma-coverage-istanbul-reporter": "^3.0.3", "karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^4.0.1", "karma-jasmine": "^4.0.1",
"karma-jasmine-html-reporter": "^1.5.4", "karma-jasmine-html-reporter": "^1.5.4",
"nz-tslint-rules": "^0.901.2",
"protractor": "^7.0.0", "protractor": "^7.0.0",
"ts-node": "^9.0.0", "ts-node": "^9.0.0",
"tslint": "^6.1.3", "tslint": "^6.1.3",

View File

@@ -1,7 +1,7 @@
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import {forwardRef, NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {AppComponent} from './app.component'; 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 {FormsModule} from '@angular/forms';
import {HttpClientModule} from '@angular/common/http'; import {HttpClientModule} from '@angular/common/http';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; 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 {GlobalUserService} from './services/global-user.service';
import {LocalStorageService} from './services/local-storage.service'; import {LocalStorageService} from './services/local-storage.service';
import {ApiService} from './api/api.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); registerLocaleData(zh);
@@ -33,13 +43,20 @@ registerLocaleData(zh);
imports: [ imports: [
BrowserModule, BrowserModule,
AppRoutingModule, AppRoutingModule,
NgZorroAntdModule,
FormsModule, FormsModule,
HttpClientModule, HttpClientModule,
BrowserAnimationsModule, BrowserAnimationsModule,
LoginRegistrationModule, LoginRegistrationModule,
AdminModule, 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: [ providers: [
ComponentStateService, ComponentStateService,
@@ -47,6 +64,8 @@ registerLocaleData(zh);
LocalStorageService, LocalStorageService,
HttpService, HttpService,
ApiService, ApiService,
NzMessageService,
NzNotificationService,
ErrorService, ErrorService,
{provide: NZ_I18N, useValue: zh_CN}, {provide: NZ_I18N, useValue: zh_CN},
], ],

View File

@@ -3,7 +3,7 @@ import {RequestObj, Response} from '../class/HttpReqAndResp';
import {environment} from '../../environments/environment'; import {environment} from '../../environments/environment';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {ComponentStateService} from './component-state.service'; 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 {HttpService} from '../api/http/http.service';
import {LocalStorageService} from './local-storage.service'; import {LocalStorageService} from './local-storage.service';

View File

@@ -1,5 +1,5 @@
import {Component, OnInit, ViewChild} from '@angular/core'; 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 {ApiService} from '../../../api/api.service';
import {RequestObj} from '../../../class/HttpReqAndResp'; import {RequestObj} from '../../../class/HttpReqAndResp';
import {Article} from '../../../class/Article'; import {Article} from '../../../class/Article';

View File

@@ -4,7 +4,8 @@ import {RouterModule} from '@angular/router';
import {AdminArticleComponent} from './admin-article.component'; import {AdminArticleComponent} from './admin-article.component';
import {CommonTableModule} from '../components/common-table/common-table.module'; import {CommonTableModule} from '../components/common-table/common-table.module';
import {FormsModule} from '@angular/forms'; 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({ @NgModule({
declarations: [ declarations: [

View File

@@ -1,5 +1,5 @@
import {Component, OnInit, ViewChild} from '@angular/core'; 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 {ApiService} from '../../../api/api.service';
import {RequestObj} from '../../../class/HttpReqAndResp'; import {RequestObj} from '../../../class/HttpReqAndResp';
import {Comment, CommentReq} from '../../../class/Comment'; import {Comment, CommentReq} from '../../../class/Comment';

View File

@@ -3,7 +3,10 @@ import {CommonModule} from '@angular/common';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import {AdminCommentComponent} from './admin-comment.component'; import {AdminCommentComponent} from './admin-comment.component';
import {CommonTableModule} from '../components/common-table/common-table.module'; 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'; import {EditableTagModule} from '../components/editable-tag/editable-tag.module';

View File

@@ -2,15 +2,13 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {AdminDashboardComponent} from './admin-dashboard.component'; import {AdminDashboardComponent} from './admin-dashboard.component';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import { import { NzButtonModule } from 'ng-zorro-antd/button';
NzButtonModule, import { NzCardModule } from 'ng-zorro-antd/card';
NzCardModule, import { NzDividerModule } from 'ng-zorro-antd/divider';
NzDividerModule, import { NzGridModule } from 'ng-zorro-antd/grid';
NzGridModule, import { NzIconModule } from 'ng-zorro-antd/icon';
NzIconModule, import { NzSpinModule } from 'ng-zorro-antd/spin';
NzSpinModule, import { NzStatisticModule } from 'ng-zorro-antd/statistic';
NzStatisticModule
} from 'ng-zorro-antd';
@NgModule({ @NgModule({

View File

@@ -2,7 +2,7 @@ import {Component, OnInit, ViewChild} from '@angular/core';
import {RequestObj, Response} from '../../../class/HttpReqAndResp'; import {RequestObj, Response} from '../../../class/HttpReqAndResp';
import {Link} from '../../../class/Link'; import {Link} from '../../../class/Link';
import {ApiService} from '../../../api/api.service'; 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 {FormControl, FormGroup, Validators} from '@angular/forms';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
import {Title} from '@angular/platform-browser'; import {Title} from '@angular/platform-browser';

View File

@@ -3,15 +3,13 @@ import {CommonModule} from '@angular/common';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import {AdminLinkComponent} from './admin-link.component'; import {AdminLinkComponent} from './admin-link.component';
import {CommonTableModule} from '../components/common-table/common-table.module'; import {CommonTableModule} from '../components/common-table/common-table.module';
import { import { NzButtonModule } from 'ng-zorro-antd/button';
NzButtonModule, import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
NzCheckboxModule, import { NzFormModule } from 'ng-zorro-antd/form';
NzFormModule, import { NzInputModule } from 'ng-zorro-antd/input';
NzInputModule, import { NzModalModule } from 'ng-zorro-antd/modal';
NzModalModule, import { NzSelectModule } from 'ng-zorro-antd/select';
NzSelectModule, import { NzTagModule } from 'ng-zorro-antd/tag';
NzTagModule
} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';

View File

@@ -1,5 +1,5 @@
import {Component, OnInit, ViewChild} from '@angular/core'; 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 {Category, Tag} from '../../../class/Tag';
import {ApiService} from '../../../api/api.service'; import {ApiService} from '../../../api/api.service';
import {PageList, RequestObj} from '../../../class/HttpReqAndResp'; import {PageList, RequestObj} from '../../../class/HttpReqAndResp';

View File

@@ -5,7 +5,10 @@ import {AdminTagComponent} from './admin-tag.component';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {CommonTableModule} from '../components/common-table/common-table.module'; import {CommonTableModule} from '../components/common-table/common-table.module';
import {EditableTagModule} from '../components/editable-tag/editable-tag.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({ @NgModule({

View File

@@ -1,5 +1,5 @@
import {Component, OnInit} from '@angular/core'; 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 {Title} from '@angular/platform-browser';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
import {ApiService} from '../../../api/api.service'; import {ApiService} from '../../../api/api.service';

View File

@@ -5,7 +5,9 @@ import {AdminUpdateComponent} from './admin-update.component';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {CommonTableModule} from '../components/common-table/common-table.module'; 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({ @NgModule({

View File

@@ -1,5 +1,5 @@
import {Component, OnInit} from '@angular/core'; 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 {Title} from '@angular/platform-browser';
import {FormControl, FormGroup} from '@angular/forms'; import {FormControl, FormGroup} from '@angular/forms';
import {RequestObj} from '../../../class/HttpReqAndResp'; import {RequestObj} from '../../../class/HttpReqAndResp';

View File

@@ -4,15 +4,15 @@ import {RouterModule} from '@angular/router';
import {AdminUserComponent} from './admin-user.component'; import {AdminUserComponent} from './admin-user.component';
import {ReactiveFormsModule} from '@angular/forms'; import {ReactiveFormsModule} from '@angular/forms';
import {CommonTableModule} from '../components/common-table/common-table.module'; import {CommonTableModule} from '../components/common-table/common-table.module';
import { import { NzButtonModule } from 'ng-zorro-antd/button';
NzButtonModule, import { NzFormModule } from 'ng-zorro-antd/form';
NzFormModule, import { NzGridModule } from 'ng-zorro-antd/grid';
NzGridModule, import { NzIconModule } from 'ng-zorro-antd/icon';
NzIconModule, import { NzInputModule } from 'ng-zorro-antd/input';
NzInputModule, NzModalModule, import { NzModalModule } from 'ng-zorro-antd/modal';
NzRadioModule, import { NzRadioModule } from 'ng-zorro-antd/radio';
NzSelectModule, NzTagModule import { NzSelectModule } from 'ng-zorro-antd/select';
} from 'ng-zorro-antd'; import { NzTagModule } from 'ng-zorro-antd/tag';
@NgModule({ @NgModule({

View File

@@ -1,6 +1,7 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms'; 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 {Router} from '@angular/router';
import {GlobalUserService} from '../../services/global-user.service'; import {GlobalUserService} from '../../services/global-user.service';
import {User} from '../../class/User'; import {User} from '../../class/User';
@@ -71,7 +72,7 @@ export class AdminComponent implements OnInit {
return control.value !== newPwd ? {pwdNotSame: true} : null; return control.value !== newPwd ? {pwdNotSame: true} : null;
}; };
} }
uploadHeader = (file: UploadFile): object | Observable<{}> => { uploadHeader = (file: NzUploadFile): object | Observable<{}> => {
return {Authorization: this.localStorageService.getToken()} return {Authorization: this.localStorageService.getToken()}
}; };

View File

@@ -2,12 +2,25 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {AdminRoutingModule} from './admin-routing.module'; import {AdminRoutingModule} from './admin-routing.module';
import {AdminComponent} from './admin.component'; import {AdminComponent} from './admin.component';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {NzSpaceModule} from 'ng-zorro-antd/space'; import {NzSpaceModule} from 'ng-zorro-antd/space';
import {AdminHeaderComponent} from '../../components/admin-header/admin-header.component'; import {AdminHeaderComponent} from '../../components/admin-header/admin-header.component';
import {ReactiveFormsModule} from '@angular/forms'; import {ReactiveFormsModule} from '@angular/forms';
import {AuthGuard} from './auth.guard'; 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({ @NgModule({
declarations: [ declarations: [
@@ -17,9 +30,23 @@ import {AuthGuard} from './auth.guard';
imports: [ imports: [
CommonModule, CommonModule,
AdminRoutingModule, AdminRoutingModule,
NgZorroAntdModule,
NzSpaceModule, NzSpaceModule,
ReactiveFormsModule, ReactiveFormsModule,
NzAvatarModule,
NzButtonModule,
NzLayoutModule,
NzMenuModule,
NzIconModule,
NzCardModule,
NzDividerModule,
NzUploadModule,
NzToolTipModule,
NzTypographyModule,
NzModalModule,
NzFormModule,
NzInputModule,
NzDescriptionsModule,
NzDrawerModule
], ],
providers: [AuthGuard] providers: [AuthGuard]
}) })

View File

@@ -1,15 +1,18 @@
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {CommonTableComponent} from './common-table.component'; import {CommonTableComponent} from './common-table.component';
import { import { NzButtonModule } from 'ng-zorro-antd/button';
NzButtonModule, import { NzCardModule } from 'ng-zorro-antd/card';
NzCardModule, import { NzDividerModule } from 'ng-zorro-antd/divider';
NzDividerModule, import { NzIconModule } from 'ng-zorro-antd/icon';
NzIconModule, NzModalModule, NzOutletModule, NzPopconfirmModule, NzSwitchModule, import { NzModalModule } from 'ng-zorro-antd/modal';
NzTableModule, NzTagModule, import { NzOutletModule } from 'ng-zorro-antd/core/outlet';
NzToolTipModule, import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
NzTypographyModule import { NzSwitchModule } from 'ng-zorro-antd/switch';
} from 'ng-zorro-antd'; 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 {FormsModule} from '@angular/forms';
import {DragDropModule} from '@angular/cdk/drag-drop' import {DragDropModule} from '@angular/cdk/drag-drop'

View File

@@ -9,7 +9,7 @@ import {
SimpleChanges, SimpleChanges,
ViewChild ViewChild
} from '@angular/core'; } from '@angular/core';
import {NzModalRef, NzModalService} from 'ng-zorro-antd'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
@Component({ @Component({
selector: 'editable-tag', selector: 'editable-tag',

View File

@@ -1,7 +1,9 @@
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {EditableTagComponent} from './editable-tag.component'; 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'; import {FormsModule} from '@angular/forms';

View File

@@ -3,7 +3,8 @@ import {CommonModule} from '@angular/common';
import {TestCommonTableComponent} from './test-common-table.component'; import {TestCommonTableComponent} from './test-common-table.component';
import {Router, RouterModule} from '@angular/router'; import {Router, RouterModule} from '@angular/router';
import {CommonTableModule} from '../components/common-table/common-table.module'; 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 {FormsModule} from '@angular/forms';
import {EditableTagModule} from '../components/editable-tag/editable-tag.module'; import {EditableTagModule} from '../components/editable-tag/editable-tag.module';

View File

@@ -2,16 +2,19 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {ArticleRoutingModule} from './article-routing.module'; import {ArticleRoutingModule} from './article-routing.module';
import {ArticleComponent} from './article.component'; import {ArticleComponent} from './article.component';
import { import { NzAffixModule } from 'ng-zorro-antd/affix';
NzAffixModule, import { NzAnchorModule } from 'ng-zorro-antd/anchor';
NzAnchorModule, NzAvatarModule, import { NzAvatarModule } from 'ng-zorro-antd/avatar';
NzButtonModule, import { NzButtonModule } from 'ng-zorro-antd/button';
NzCommentModule, import { NzCommentModule } from 'ng-zorro-antd/comment';
NzDividerModule, NzFormModule, import { NzDividerModule } from 'ng-zorro-antd/divider';
NzGridModule, import { NzFormModule } from 'ng-zorro-antd/form';
NzIconModule, NzInputModule, import { NzGridModule } from 'ng-zorro-antd/grid';
NzLayoutModule, NzListModule, NzTabsModule import { NzIconModule } from 'ng-zorro-antd/icon';
} from 'ng-zorro-antd'; 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'; import {FormsModule} from '@angular/forms';

View File

@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {ApiService} from '../../api/api.service'; import {ApiService} from '../../api/api.service';
import {Tag} from '../../class/Tag'; import {Tag} from '../../class/Tag';
import {NzMessageService} from 'ng-zorro-antd'; import { NzMessageService } from 'ng-zorro-antd/message';
import {PageList} from '../../class/HttpReqAndResp'; import {PageList} from '../../class/HttpReqAndResp';
import {Article} from '../../class/Article'; import {Article} from '../../class/Article';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';

View File

@@ -2,7 +2,8 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {CategoryComponent} from './category.component'; import {CategoryComponent} from './category.component';
import {CategoryRoutingModule} from './category-routing.module'; 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'; import {IndexModule} from '../index/index.module';

View File

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {Route, RouterModule} from '@angular/router'; import {Route, RouterModule} from '@angular/router';
import {EmailVerifyComponent} from './email-verify.component'; import {EmailVerifyComponent} from './email-verify.component';
import {NzAlertModule} from 'ng-zorro-antd'; import { NzAlertModule } from 'ng-zorro-antd/alert';
const routes: Route[] = [ const routes: Route[] = [
{path: '**', component: EmailVerifyComponent} {path: '**', component: EmailVerifyComponent}

View File

@@ -1,7 +1,8 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {ApiService} from '../../api/api.service'; import {ApiService} from '../../api/api.service';
import {Article} from '../../class/Article'; 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 {SvgIconUtil} from '../../utils/svgIconUtil';
import {PageList, RequestObj} from '../../class/HttpReqAndResp'; import {PageList, RequestObj} from '../../class/HttpReqAndResp';
import {Router} from '@angular/router'; import {Router} from '@angular/router';

View File

@@ -3,15 +3,13 @@ import {CommonModule} from '@angular/common';
import {IndexComponent} from './index.component'; import {IndexComponent} from './index.component';
import {IndexRoutingModule} from './index-routing.module'; import {IndexRoutingModule} from './index-routing.module';
import {ArticleDetailCardComponent} from './components/article-detail-card/article-detail-card.component'; import {ArticleDetailCardComponent} from './components/article-detail-card/article-detail-card.component';
import { import { NzBackTopModule } from 'ng-zorro-antd/back-top';
NzBackTopModule, import { NzCardModule } from 'ng-zorro-antd/card';
NzCardModule, import { NzDividerModule } from 'ng-zorro-antd/divider';
NzDividerModule, import { NzGridModule } from 'ng-zorro-antd/grid';
NzGridModule, import { NzIconModule } from 'ng-zorro-antd/icon';
NzIconModule, import { NzPaginationModule } from 'ng-zorro-antd/pagination';
NzPaginationModule, import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
NzToolTipModule
} from 'ng-zorro-antd';
import { CardDetailComponent } from './components/card-detail/card-detail.component'; import { CardDetailComponent } from './components/card-detail/card-detail.component';
import { TagTagComponent } from './components/tag-tag/tag-tag.component'; import { TagTagComponent } from './components/tag-tag/tag-tag.component';

View File

@@ -1,5 +1,6 @@
import {Component, OnInit} from '@angular/core'; 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 {Title} from '@angular/platform-browser';
import {ApiService} from '../../api/api.service'; import {ApiService} from '../../api/api.service';
import {ApplyLinkReq, Link} from '../../class/Link'; import {ApplyLinkReq, Link} from '../../class/Link';

View File

@@ -1,7 +1,12 @@
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {LinkComponent} from './link.component'; 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 {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';

View File

@@ -1,5 +1,5 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; 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 {LoginReq} from '../../../../class/User';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {LoginRegistrationService} from '../../service/login-registration.service'; import {LoginRegistrationService} from '../../service/login-registration.service';

View File

@@ -1,7 +1,7 @@
import {Component, EventEmitter, OnInit, Output} from '@angular/core'; import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {environment} from '../../../../../environments/environment'; import {environment} from '../../../../../environments/environment';
import {ApiService} from '../../../../api/api.service'; 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 {Router} from '@angular/router';
import {RequestObj} from '../../../../class/HttpReqAndResp'; import {RequestObj} from '../../../../class/HttpReqAndResp';
import {LoginReq} from '../../../../class/User'; import {LoginReq} from '../../../../class/User';

View File

@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {ApiService} from '../../api/api.service'; import {ApiService} from '../../api/api.service';
import {LoginRegistrationService} from './service/login-registration.service'; import {LoginRegistrationService} from './service/login-registration.service';
import {NzMessageService} from 'ng-zorro-antd'; import { NzMessageService } from 'ng-zorro-antd/message';
@Component({ @Component({
selector: 'view-login-registration', selector: 'view-login-registration',

View File

@@ -6,7 +6,11 @@ import {RegistrationComponent} from './components/registration/registration.comp
import {LoginRegistrationRoutingModule} from './login-registration-routing.module'; import {LoginRegistrationRoutingModule} from './login-registration-routing.module';
import {LoginRegistrationComponent} from './login-registration.component'; import {LoginRegistrationComponent} from './login-registration.component';
import {FormsModule} from '@angular/forms'; 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({ @NgModule({

View File

@@ -2,7 +2,8 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {MaintainComponent} from './maintain.component'; import {MaintainComponent} from './maintain.component';
import {RouterModule} from '@angular/router'; 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({ @NgModule({

View File

@@ -1,5 +1,5 @@
import {Component, OnInit} from '@angular/core'; 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 {ActivatedRoute, Router} from '@angular/router';
import {ApiService} from '../../api/api.service'; import {ApiService} from '../../api/api.service';
import {Title} from '@angular/platform-browser'; import {Title} from '@angular/platform-browser';

View File

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {Route, RouterModule} from '@angular/router'; import {Route, RouterModule} from '@angular/router';
import {ResetPwdComponent} from './reset-pwd.component'; import {ResetPwdComponent} from './reset-pwd.component';
import {NzAlertModule} from 'ng-zorro-antd'; import { NzAlertModule } from 'ng-zorro-antd/alert';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
const routes: Route[] = [ const routes: Route[] = [

View File

@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
import {PageList} from '../../class/HttpReqAndResp'; import {PageList} from '../../class/HttpReqAndResp';
import {Article} from '../../class/Article'; import {Article} from '../../class/Article';
import {ApiService} from '../../api/api.service'; 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 {Location} from '@angular/common';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {Title} from '@angular/platform-browser'; import {Title} from '@angular/platform-browser';

View File

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {UpdateComponent} from './update.component'; import {UpdateComponent} from './update.component';
import {Route, RouterModule} from '@angular/router'; 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}]; const routes: Route[] = [{path: '**', component: UpdateComponent}];

View File

@@ -2,7 +2,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
import {ArticleReq} from '../../class/Article'; import {ArticleReq} from '../../class/Article';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {ApiService} from '../../api/api.service'; 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 {User} from '../../class/User';
import {Tag} from '../../class/Tag'; import {Tag} from '../../class/Tag';
import {Title} from '@angular/platform-browser'; import {Title} from '@angular/platform-browser';

View File

@@ -4,18 +4,16 @@ import {WriteComponent} from './write.component';
import {Route, RouterModule} from '@angular/router'; import {Route, RouterModule} from '@angular/router';
import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {PublishFormComponent} from './components/publish-form/publish-form.component'; import {PublishFormComponent} from './components/publish-form/publish-form.component';
import { import { NzButtonModule } from 'ng-zorro-antd/button';
NzButtonModule, import { NzCardModule } from 'ng-zorro-antd/card';
NzCardModule, import { NzDividerModule } from 'ng-zorro-antd/divider';
NzDividerModule, import { NzFormModule } from 'ng-zorro-antd/form';
NzFormModule, import { NzIconModule } from 'ng-zorro-antd/icon';
NzIconModule, import { NzInputModule } from 'ng-zorro-antd/input';
NzInputModule, import { NzModalModule } from 'ng-zorro-antd/modal';
NzModalModule, import { NzRadioModule } from 'ng-zorro-antd/radio';
NzRadioModule, import { NzSelectModule } from 'ng-zorro-antd/select';
NzSelectModule, import { NzTagModule } from 'ng-zorro-antd/tag';
NzTagModule
} from 'ng-zorro-antd';
import {EditableTagModule} from '../admin/components/editable-tag/editable-tag.module'; import {EditableTagModule} from '../admin/components/editable-tag/editable-tag.module';
const routes: Route[] = [ const routes: Route[] = [

View File

@@ -5,7 +5,7 @@
export const environment = { export const environment = {
production: false, production: false,
logger: true, logger: true,
host: 'http://127.0.0.1/' host: 'http://127.0.0.1:8080/'
}; };
/* /*

View File

@@ -1,6 +1,7 @@
{ {
"extends": "tslint:recommended", "extends": "tslint:recommended",
"rules": { "rules": {
"nz-secondary-entry-imports": true,
"array-type": false, "array-type": false,
"arrow-parens": false, "arrow-parens": false,
"deprecation": { "deprecation": {
@@ -86,6 +87,7 @@
"use-pipe-transform-interface": true "use-pipe-transform-interface": true
}, },
"rulesDirectory": [ "rulesDirectory": [
"codelyzer" "codelyzer",
"node_modules/nz-tslint-rules"
] ]
} }