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/routes/routes.module.ts | 2 ++
src/app/core/net/default.interceptor.ts | 8 +++++---
src/app/routes/map/coordinates-picker/coordinates-picker.component.ts | 1 -
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/app/core/net/default.interceptor.ts b/src/app/core/net/default.interceptor.ts
index 7224f89..2a3a6dc 100644
--- a/src/app/core/net/default.interceptor.ts
+++ b/src/app/core/net/default.interceptor.ts
@@ -25,10 +25,11 @@
constructor(private injector: Injector) {
let isExpireModelShow = false;
- this.unLoginHandle.debounceTime(3000).subscribe( (event: HttpErrorResponse) => {
- const canExpireModelShow = !isExpireModelShow;
+ this.unLoginHandle.debounceTime(1000).delay(1000).filter(
+ () => !isExpireModelShow
+ ).subscribe( (event: HttpErrorResponse) => {
isExpireModelShow = true;
- if (canExpireModelShow && !!event.error) {
+ if (!!event.error) {
let errorMsg = '';
const erroCode = !!event.error['errorCode'] ? Number.parseInt(event.error['errorCode']) : 0;
switch (erroCode) {
@@ -41,6 +42,7 @@
// ������refresh���������������������
this.loginService.clearRefreshToken();
this.model.info({
+ maskClosable: false,
title: errorMsg,
onOk: () => {
isExpireModelShow = false;
diff --git a/src/app/routes/map/coordinates-picker/coordinates-picker.component.ts b/src/app/routes/map/coordinates-picker/coordinates-picker.component.ts
index 2bc9ec9..470d625 100644
--- a/src/app/routes/map/coordinates-picker/coordinates-picker.component.ts
+++ b/src/app/routes/map/coordinates-picker/coordinates-picker.component.ts
@@ -91,7 +91,6 @@
this._localSearch = new this._BMap.LocalSearch(map, {
renderOptions: {map: map}
});
- debugger;
if (this.data.latitude === this.Default_LAT
&& this.data.longitude === this.Default_LNG
&& !!this.data.address
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index c09bb38..776196a 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -24,6 +24,8 @@
import 'rxjs/add/operator/switchMap';
import 'rxjs/add/operator/toPromise';
import 'rxjs/add/operator/filter';
+import 'rxjs/add/operator/last';
+import 'rxjs/add/operator/delay';
@NgModule({
imports: [ SharedModule, RouteRoutingModule ],
--
Gitblit v1.8.0