From 2656c7ab687d3e3b6f704b9d87ce20ff9c805bb0 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 07 Jun 2018 16:02:31 +0800
Subject: [PATCH] 过时弹窗完善测试
---
src/app/core/net/default.interceptor.ts | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/app/core/net/default.interceptor.ts b/src/app/core/net/default.interceptor.ts
index 0ddad87..2a3a6dc 100644
--- a/src/app/core/net/default.interceptor.ts
+++ b/src/app/core/net/default.interceptor.ts
@@ -24,10 +24,12 @@
private unLoginHandle: Subject<HttpErrorResponse> = new Subject<HttpErrorResponse>();
constructor(private injector: Injector) {
- this.unLoginHandle.debounceTime(2000).subscribe( (event: HttpErrorResponse) => {
- const canExpireModelShow = !this.isExpireModelShow;
- this.isExpireModelShow = true;
- if (canExpireModelShow && !!event.error) {
+ let isExpireModelShow = false;
+ this.unLoginHandle.debounceTime(1000).delay(1000).filter(
+ () => !isExpireModelShow
+ ).subscribe( (event: HttpErrorResponse) => {
+ isExpireModelShow = true;
+ if (!!event.error) {
let errorMsg = '';
const erroCode = !!event.error['errorCode'] ? Number.parseInt(event.error['errorCode']) : 0;
switch (erroCode) {
@@ -40,16 +42,16 @@
// ������refresh���������������������
this.loginService.clearRefreshToken();
this.model.info({
+ maskClosable: false,
title: errorMsg,
onOk: () => {
- this.isExpireModelShow = false;
+ isExpireModelShow = false;
this.goTo('/passport/login');
}
});
}
});
}
- private isExpireModelShow = false;
get loginService(): LoginService {
return this.injector.get<LoginService>(LoginService);
}
--
Gitblit v1.8.0