From 2ba3d4ca1bd64e59f85940e0b3c9be1aca65ad8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Tue, 16 Mar 2021 20:38:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=94=A8LocalStorageService?= =?UTF-8?q?=E4=BB=A3=E7=90=86localStorage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/services/local-storage.service.ts | 12 ++++++++++++ .../common-table/common-table.component.ts | 12 +++++++----- .../components/login/login.component.ts | 12 +++++++----- .../registration/registration.component.ts | 10 ++++++---- src/app/view/write/write.component.ts | 8 ++++---- 5 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/app/services/local-storage.service.ts b/src/app/services/local-storage.service.ts index 0508325..f36191d 100644 --- a/src/app/services/local-storage.service.ts +++ b/src/app/services/local-storage.service.ts @@ -39,6 +39,18 @@ export class LocalStorageService { return this.getToken() != null; } + setItem(key: string, value: any) { + localStorage.setItem(key, JSON.stringify(value)); + } + + getItem(key: string) { + return localStorage.getItem(key); + } + + removeItem(key: string) { + localStorage.removeItem(key); + } + // setUser(user: User) { // // TODO: 简单加个密 // localStorage.setItem('t', new Date().valueOf().toString()); diff --git a/src/app/view/admin/components/common-table/common-table.component.ts b/src/app/view/admin/components/common-table/common-table.component.ts index 02837ad..3c46509 100644 --- a/src/app/view/admin/components/common-table/common-table.component.ts +++ b/src/app/view/admin/components/common-table/common-table.component.ts @@ -3,6 +3,7 @@ import {Data} from './data'; import {PageList, RequestObj} from '../../../../class/HttpReqAndResp'; import {HttpService} from '../../../../api/http/http.service'; import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop'; +import {LocalStorageService} from '../../../../services/local-storage.service'; @Component({ selector: 'common-table', @@ -28,13 +29,14 @@ export class CommonTableComponent implements OnInit, OnChanges { changed: boolean = false; visibleFieldLength: number = 0; - constructor(private httpService: HttpService) { + constructor(private httpService: HttpService, + private localStorageService: LocalStorageService) { } ngOnInit(): void { - if (localStorage.getItem(this.request.path)) { - this.filedData = this.cloneData(localStorage.getItem(this.request.path)); + if (this.localStorageService.getItem(this.request.path)) { + this.filedData = this.cloneData(this.localStorageService.getItem(this.request.path)); this.changed = true; } else { this.filedData = this.cloneData(this.headData); @@ -132,7 +134,7 @@ export class CommonTableComponent implements OnInit, OnChanges { return; } this.dataList = JSON.parse(JSON.stringify(this.dataList)); - localStorage.setItem(this.request.path, JSON.stringify(this.filedData)); + this.localStorageService.setItem(this.request.path, JSON.stringify(this.filedData)); this.changed = true; } @@ -142,7 +144,7 @@ export class CommonTableComponent implements OnInit, OnChanges { } reset = () => { - localStorage.removeItem(this.request.path); + this.localStorageService.removeItem(this.request.path); this.filedData = this.cloneData(this.headData); this.changed = false; this.calculateVisibleFieldLength(); 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 a377763..f6c230e 100644 --- a/src/app/view/login-registration/components/login/login.component.ts +++ b/src/app/view/login-registration/components/login/login.component.ts @@ -5,6 +5,7 @@ import {ActivatedRoute, Router} from '@angular/router'; import {LoginRegistrationService} from '../../service/login-registration.service'; import {Title} from '@angular/platform-browser'; import {GlobalUserService} from '../../../../services/global-user.service'; +import {LocalStorageService} from '../../../../services/local-storage.service'; @Component({ selector: 'c-login', @@ -26,16 +27,17 @@ export class LoginComponent implements OnInit { private activatedRoute: ActivatedRoute, private router: Router, private loginRegistrationService: LoginRegistrationService, - private title: Title) { + private title: Title, + private localStorageService: LocalStorageService) { this.title.setTitle('小海博客 | 登录 '); } ngOnInit() { this.url = this.activatedRoute.snapshot.queryParamMap.get('url'); - this.loginReq.email = localStorage.getItem('e'); - this.loginReq.password = localStorage.getItem('p'); - localStorage.removeItem('e'); - localStorage.removeItem('p'); + this.loginReq.email = this.localStorageService.getItem('e'); + this.loginReq.password = this.localStorageService.getItem('p'); + this.localStorageService.removeItem('e'); + this.localStorageService.removeItem('p'); } doLogin() { 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 22a278e..b9f22f2 100644 --- a/src/app/view/login-registration/components/registration/registration.component.ts +++ b/src/app/view/login-registration/components/registration/registration.component.ts @@ -1,11 +1,12 @@ 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/message'; +import {NzMessageService} from 'ng-zorro-antd/message'; import {Router} from '@angular/router'; import {RequestObj} from '../../../../class/HttpReqAndResp'; import {LoginReq} from '../../../../class/User'; import {Title} from '@angular/platform-browser'; +import {LocalStorageService} from '../../../../services/local-storage.service'; @Component({ selector: 'c-registration', @@ -29,7 +30,8 @@ export class RegistrationComponent implements OnInit { constructor(private apiService: ApiService, private nzMessageService: NzMessageService, private router: Router, - private title: Title) { + private title: Title, + private localStorageService: LocalStorageService) { this.title.setTitle('小海博客 | 注册'); } @@ -74,8 +76,8 @@ export class RegistrationComponent implements OnInit { this.apiService.verifyImgCode(this.imgCode).subscribe(data => { // 验证成功 注册 this.apiService.registration(this.email, this.pwd).subscribe(regData => { - localStorage.setItem('e', this.email); - localStorage.setItem('p', this.pwd); + this.localStorageService.setItem('e', this.email); + this.localStorageService.setItem('p', this.pwd); this.email = ''; this.pwd = ''; this.imgCode = ''; diff --git a/src/app/view/write/write.component.ts b/src/app/view/write/write.component.ts index 8c02a70..4f31b56 100644 --- a/src/app/view/write/write.component.ts +++ b/src/app/view/write/write.component.ts @@ -119,7 +119,7 @@ export class WriteComponent implements OnInit, OnDestroy { next: data => { // TODO 成功 this.message.success('发布成功,即将转跳'); - localStorage.removeItem('tmpArticle'); + this.localStorageService.removeItem('tmpArticle'); setTimeout(() => { this.router.navigateByUrl('article/' + data.result.id); @@ -143,7 +143,7 @@ export class WriteComponent implements OnInit, OnDestroy { this.apiService.updateArticle(this.article).subscribe({ next: data => { this.message.success('更新成功，即将转跳'); - localStorage.removeItem('tmpArticle'); + this.localStorageService.removeItem('tmpArticle'); setTimeout(() => { this.router.navigateByUrl('article/' + data.result.id); }, 2500); @@ -253,8 +253,8 @@ export class WriteComponent implements OnInit, OnDestroy { this.isUpdate = true; this.getArticle(); } - if (!this.articleId && localStorage.getItem('tmpArticle')) { - this.article = JSON.parse(localStorage.getItem('tmpArticle')); + if (!this.articleId && this.localStorageService.getItem('tmpArticle')) { + this.article = JSON.parse(this.localStorageService.getItem('tmpArticle')); } } };