From 6f1ab8e489e791734a2c63550b63ad1cb74b4f57 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:19:29 +0800
Subject: [PATCH] 设备页面bug 修复

---
 src/app/core/net/default.interceptor.ts |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/core/net/default.interceptor.ts b/src/app/core/net/default.interceptor.ts
index 6f77ed7..2a3a6dc 100644
--- a/src/app/core/net/default.interceptor.ts
+++ b/src/app/core/net/default.interceptor.ts
@@ -24,7 +24,11 @@
     private unLoginHandle: Subject<HttpErrorResponse> = new Subject<HttpErrorResponse>();
     
     constructor(private injector: Injector) {
-         this.unLoginHandle.debounceTime(1000).subscribe( (event: HttpErrorResponse) => {
+         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;
@@ -35,22 +39,19 @@
                     case 0: errorMsg = '���������������������������'; break;
                     default: errorMsg = '������������,���������������'; break;
                     }
-                    if (!this.isExpireModelShow) {
-                        this.isExpireModelShow = true;
                         // ������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