From 7cba060b9f93e1eb279f91249d9a0cc3e8d3711b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Thu, 1 Dec 2022 23:50:05 +0800 Subject: [PATCH] update to 14 --- angular.json | 1 - package.json | 26 +++++++++---------- .../admin/admin-link/admin-link.component.ts | 20 +++++++------- .../admin/admin-user/admin-user.component.ts | 20 +++++++------- src/app/view/admin/admin.component.ts | 22 ++++++++-------- src/app/view/link/link.component.ts | 6 ++--- .../publish-form/publish-form.component.ts | 6 ++--- tsconfig.json | 2 +- 8 files changed, 51 insertions(+), 52 deletions(-) diff --git a/angular.json b/angular.json index 181d3de..0b2dc2a 100644 --- a/angular.json +++ b/angular.json @@ -134,7 +134,6 @@ } } }, - "defaultProject": "index", "cli": { "analytics": false } diff --git a/package.json b/package.json index a1f4776..1bfba67 100644 --- a/package.json +++ b/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@angular/animations": "^13.3.12", - "@angular/common": "^13.3.12", - "@angular/compiler": "^13.3.12", - "@angular/core": "^13.3.12", - "@angular/forms": "^13.3.12", - "@angular/platform-browser": "^13.3.12", - "@angular/platform-browser-dynamic": "^13.3.12", - "@angular/router": "^13.3.12", - "@angular/service-worker": "^13.3.12", + "@angular/animations": "^14.2.12", + "@angular/common": "^14.2.12", + "@angular/compiler": "^14.2.12", + "@angular/core": "^14.2.12", + "@angular/forms": "^14.2.12", + "@angular/platform-browser": "^14.2.12", + "@angular/platform-browser-dynamic": "^14.2.12", + "@angular/router": "^14.2.12", + "@angular/service-worker": "^14.2.12", "jquery": "^3.5.1", "js-base64": "^3.6.0", "ng-zorro-antd": "^11.2.0", @@ -30,10 +30,10 @@ "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^13.3.10", - "@angular/cli": "^13.3.10", - "@angular/compiler-cli": "^13.3.12", - "@angular/language-service": "^13.2.0", + "@angular-devkit/build-angular": "^14.2.10", + "@angular/cli": "^14.2.10", + "@angular/compiler-cli": "^14.2.12", + "@angular/language-service": "^14.2.12", "@types/jasmine": "^3.6.2", "@types/jasminewd2": "~2.0.3", "@types/node": "^16.11.6", 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 f5f7f09..2037a1c 100644 --- a/src/app/view/admin/admin-link/admin-link.component.ts +++ b/src/app/view/admin/admin-link/admin-link.component.ts @@ -3,7 +3,7 @@ import {RequestObj, Response} from '../../../class/HttpReqAndResp'; import {Link} from '../../../class/Link'; import {ApiService} from '../../../api/api.service'; import {NzMessageService} from 'ng-zorro-antd/message'; -import {FormControl, FormGroup, Validators} from '@angular/forms'; +import {UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms'; import {Observable} from 'rxjs'; import {Title} from '@angular/platform-browser'; import {CommonTableComponent} from '../components/common-table/common-table.component'; @@ -18,27 +18,27 @@ export class AdminLinkComponent implements OnInit { @ViewChild('commonTableComponent') commonTableComponent: CommonTableComponent; modalVisible: boolean = false; modalTitle: string = ''; - formGroup: FormGroup; + formGroup: UntypedFormGroup; request: RequestObj; headData: Data[]; constructor(private apiService: ApiService, private messageService: NzMessageService, private title: Title) { this.title.setTitle('小海博客 | 友链管理'); - this.formGroup = new FormGroup({ - id: new FormControl(null), - name: new FormControl(null, [Validators.required]), - url: new FormControl(null, [ + this.formGroup = new UntypedFormGroup({ + id: new UntypedFormControl(null), + name: new UntypedFormControl(null, [Validators.required]), + url: new UntypedFormControl(null, [ Validators.required, Validators.pattern(/^(https:\/\/|http:\/\/|)([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/) ] ), - open: new FormControl(null, [Validators.required]), - desc: new FormControl(null, [Validators.maxLength(255)]), - iconPath: new FormControl(null, [ + open: new UntypedFormControl(null, [Validators.required]), + desc: new UntypedFormControl(null, [Validators.maxLength(255)]), + iconPath: new UntypedFormControl(null, [ Validators.pattern(/^(https:\/\/|http:\/\/|)([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/) ] ), - oper: new FormControl(null) + oper: new UntypedFormControl(null) }); } 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 427afa0..21a239c 100644 --- a/src/app/view/admin/admin-user/admin-user.component.ts +++ b/src/app/view/admin/admin-user/admin-user.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {NzMessageService} from 'ng-zorro-antd/message'; import {Title} from '@angular/platform-browser'; -import {FormControl, FormGroup} from '@angular/forms'; +import {UntypedFormControl, UntypedFormGroup} from '@angular/forms'; import {RequestObj} from '../../../class/HttpReqAndResp'; import {ApiService} from '../../../api/api.service'; import {User} from '../../../class/User'; @@ -21,20 +21,20 @@ export class AdminUserComponent implements OnInit { isEdit: false, resetPwd: false }; - formGroup: FormGroup; + formGroup: UntypedFormGroup; headData: Data[]; request: RequestObj; constructor(private apiService: ApiService, private title: Title, private messageService: NzMessageService, private userService: GlobalUserService) { - this.formGroup = new FormGroup({ - id: new FormControl(null), - email: new FormControl(''), - displayName: new FormControl(''), - emailStatus: new FormControl(null), - desc: new FormControl(null), - role: new FormControl(null), - pwd: new FormControl(''), + this.formGroup = new UntypedFormGroup({ + id: new UntypedFormControl(null), + email: new UntypedFormControl(''), + displayName: new UntypedFormControl(''), + emailStatus: new UntypedFormControl(null), + desc: new UntypedFormControl(null), + role: new UntypedFormControl(null), + pwd: new UntypedFormControl(''), }); this.userService.watchUserInfo({ next: data => this.user = data.result, diff --git a/src/app/view/admin/admin.component.ts b/src/app/view/admin/admin.component.ts index f183ab3..1c40105 100644 --- a/src/app/view/admin/admin.component.ts +++ b/src/app/view/admin/admin.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms'; +import {AbstractControl, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms'; import {NzMessageService} from 'ng-zorro-antd/message'; import {NzUploadFile} from 'ng-zorro-antd/upload'; import {Router} from '@angular/router'; @@ -23,8 +23,8 @@ export class AdminComponent implements OnInit { sayHelloContent: string; editInfoModalVisible: boolean = false; resetPwdModalVisible: boolean = false; - editInfoFormGroup: FormGroup; - resetPwdFormGroup: FormGroup; + editInfoFormGroup: UntypedFormGroup; + resetPwdFormGroup: UntypedFormGroup; noAvatarUrl = 'https://cdn.celess.cn/'; host: string; @@ -39,17 +39,17 @@ export class AdminComponent implements OnInit { } } ); - this.editInfoFormGroup = new FormGroup({ - desc: new FormControl(), - displayName: new FormControl(), - email: new FormControl({value: null, disabled: true}) + this.editInfoFormGroup = new UntypedFormGroup({ + desc: new UntypedFormControl(), + displayName: new UntypedFormControl(), + email: new UntypedFormControl({value: null, disabled: true}) }); - this.resetPwdFormGroup = new FormGroup({ - originPwd: new FormControl(null, [Validators.required]), - newPwd: new FormControl(null, [ + this.resetPwdFormGroup = new UntypedFormGroup({ + originPwd: new UntypedFormControl(null, [Validators.required]), + newPwd: new UntypedFormControl(null, [ Validators.required, Validators.minLength(6), Validators.maxLength(16), Validators.pattern(/^[\w_-]{6,16}$/) ]), - newPwdConfirm: new FormControl(null, [ + newPwdConfirm: new UntypedFormControl(null, [ Validators.required, Validators.minLength(6), Validators.maxLength(16), Validators.pattern(/^[\w_-]{6,16}$/), this.checkSamePwd() ]), diff --git a/src/app/view/link/link.component.ts b/src/app/view/link/link.component.ts index cccc21d..cae6c88 100644 --- a/src/app/view/link/link.component.ts +++ b/src/app/view/link/link.component.ts @@ -4,7 +4,7 @@ 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'; -import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms'; import {Color, randomColor} from '../../utils/color'; @Component({ @@ -19,14 +19,14 @@ export class LinkComponent implements OnInit { link: Link; linkList: Link[]; loading: boolean = false; - applyFormGroup: FormGroup; + applyFormGroup: UntypedFormGroup; colors: Color[]; private lastUrl: string = ''; constructor(private message: NzMessageService, private titleService: Title, private apiService: ApiService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private modal: NzModalService) { titleService.setTitle('小海博客 | 友链'); } diff --git a/src/app/view/write/components/publish-form/publish-form.component.ts b/src/app/view/write/components/publish-form/publish-form.component.ts index 7d52343..7befaa9 100644 --- a/src/app/view/write/components/publish-form/publish-form.component.ts +++ b/src/app/view/write/components/publish-form/publish-form.component.ts @@ -1,5 +1,5 @@ import {Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; -import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms'; import {Category} from '../../../../class/Tag'; import {COLOR_LIST} from '../../../../utils/color'; @@ -22,14 +22,14 @@ export class PublishFormComponent implements OnInit { isUpdate: boolean; url?: string; }>(); - formGroup: FormGroup; + formGroup: UntypedFormGroup; tagTmpList: string[] = []; tagInputVisible: boolean = false; tagListTouched: boolean = false; editTagText: string = '新增'; color: string[] = []; - constructor(private fb: FormBuilder) { + constructor(private fb: UntypedFormBuilder) { } randomColor = () => this.color = COLOR_LIST.map(c => c.bgColor).sort(() => Math.floor(Math.random() * 2)); diff --git a/tsconfig.json b/tsconfig.json index 30956ae..5a8278d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "module": "esnext", "moduleResolution": "node", "importHelpers": true, - "target": "es2015", + "target": "es2020", "typeRoots": [ "node_modules/@types" ],