Tabbug修复

Author: weihomechen

src/app/base-data/person-manage.service.spec.ts

@@ -1,19 +1,19 @@
 import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
 
-import { ITablePersonItem } from './model/table-person-item';
+import { IPersonItem } from './model/table-person-item';
 import 'rxjs/add/operator/toPromise';
 @Injectable()
 export class PersonManageService {
 
     private personUrl = 'assets/mock-data/person.json';
     constructor(private http: Http) { }
 
-    getPersons(): Promise<ITablePersonItem[]> {
+    getPersons(): Promise<IPersonItem[]> {
         return this.http
             .get(this.personUrl)
             .toPromise()
-            .then(response => response.json() as ITablePersonItem[])
+            .then(response => response.json() as IPersonItem[])
             .catch(this.handleError);
     }
 

src/app/layout/header/tab/tabControl.service.ts

@@ -97,7 +97,6 @@ export class TabControlService {
     closeAll() {
         this.tabs.length = 1;
         this.tabsModel.activeTab = 0;
-
         this.router.navigate(['/home']);
     }
 
@@ -109,11 +108,10 @@ export class TabControlService {
         }
         const retainList = [],
             currentTabIndex = this.tabsModel.activeTab;
-        retainList.push(this.tabs[0]);
-        retainList.push(this.tabs[currentTabIndex]);
-        this.tabs = retainList;
+        this.tabsModel.tabs[1] = this.tabsModel.tabs[currentTabIndex];
+        this.tabs.length = 2;
         this.tabsModel.activeTab = 1;
-        this.router.navigate([this.tabs[1].link]);
+        this.router.navigate([this.tabsModel.tabs[1].link]);
     }
 
     // 关闭tab

src/app/layout/header/tab/tabs.ts

@@ -131,7 +131,7 @@ export class Md2Tabs implements OnInit, AfterContentInit {
             this._updateInkBar();
             if (this.tabs) {
                 const tabs = this.tabs.toArray();
-                if (!tabs[value].disabled) {
+                if (tabs[value] && !tabs[value].disabled) {
                     tabs.forEach(tab => tab.active = false);
                     tabs[value].active = true;
                 }
@@ -184,16 +184,19 @@ export class Md2Tabs implements OnInit, AfterContentInit {
     // 关闭所有页面
     closeAll() {
         this.tabControlService.closeAll();
+        this.adjustOffset();
     }
 
     // 关闭其它页面
     closeOther() {
         this.tabControlService.closeOther();
+        this.adjustOffset();
     }
 
     // 关闭当前页面
     closeNow() {
         this.tabControlService.closeTab();
+        this.adjustOffset();
     }
 
     /**
@@ -316,7 +319,7 @@ export class Md2Tabs implements OnInit, AfterContentInit {
         this.element.tabs.forEach((tab: any) => {
             canvasWidth -= tab.offsetWidth;
         });
-        this.shouldPaginate = canvasWidth < 0;
+        this.shouldPaginate = canvasWidth < -70;
 
         const manageBtn = $('#tab_manage_btn'),
             canvas = $('.md2-tabs-canvas');

src/app/user/user.service.ts

@@ -59,10 +59,13 @@ export class UserService implements CanActivate {
 
     public logout(): void {
         this.tabControlService.closeAll();
-        localStorage.removeItem('currentUser');
-        this.userId = null;
-        this.subject.next(Object.assign({}));
-        this.router.navigate([{ outlets: { user: ['user-login'] } }]);
+        setTimeout(() => {
+            localStorage.removeItem('currentUser');
+            this.userId = null;
+            this.subject.next(Object.assign({}));
+            this.router.navigate([{ outlets: { user: ['user-login'] } }]);
+        }, 100);
+
     }
 
     public forgetPwd(email: string): Observable<any> {
@@ -93,8 +96,8 @@ export class UserService implements CanActivate {
     }
 
     // 检测邮箱是否已注册
-    public isEmailUsed(email: string){
-        return Observable.create((observer)=>{
+    public isEmailUsed(email: string) {
+        return Observable.create((observer) => {
             observer.next(false);
         })
     }

src/index.html

@@ -8,7 +8,6 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
-    <!--<script src="//cdn.ckeditor.com/4.6.2/full/ckeditor.js"></script>-->
     <script src="./assets/global/plugins/ckeditor/ckeditor.js"></script>
     <script src="http://webapi.amap.com/maps?v=1.3&key=7abcc68bf0add08f839b8466d8bae876"></script>
 </head>