Fixed: Fix the issue with the tab name when splitting the name.

Author: ZhaoJiSen

src/app/services/view.ts

@@ -1,38 +1,44 @@
-import {Injectable} from '@angular/core';
-import {View} from '@app/model';
-import {BehaviorSubject} from 'rxjs';
-import {FaceService} from '@app/services/face';
+import { View } from '@app/model';
+import { BehaviorSubject } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { FaceService } from '@app/services/face';
 
 @Injectable()
 export class ViewService {
-  viewList: Array<View> = [];
-  currentView: View;
   num = 0;
+
+  currentView: View;
+  viewList: Array<View> = [];
   viewIds: Array<string> = [];
+
+  public state$ = new BehaviorSubject<any>({});
   public currentView$ = new BehaviorSubject<Object>({});
   private connectViewCount = new BehaviorSubject<number>(0);
+
   public connectViewCount$ = this.connectViewCount.asObservable();
-  public state$ = new BehaviorSubject<any>({});
 
-  constructor(private _faceSvc: FaceService) {
-  }
+  constructor(private _faceSvc: FaceService) {}
 
   addView(view: View) {
     this.num += 1;
+
     view.id = 'View_' + this.num;
+
     this.viewList.push(view);
     this.viewIds.push(view.id);
 
     if (view.connectToken.face_monitor_token) {
       this._faceSvc.addMonitoringTab(view.id);
     }
-    this.state$.next({action: 'add', view: view});
+
+    this.state$.next({ action: 'add', view: view });
   }
 
   activeView(view: View) {
     this.viewList.forEach((v, k) => {
       if (v === view) {
         v.active = true;
+
         if (view.termComp && typeof view.termComp.setActive === 'function') {
           setTimeout(() => {
             view.termComp.setActive();
@@ -44,55 +50,66 @@ export class ViewService {
     });
     setTimeout(() => {
       const viewEl = document.getElementById(view.id);
+
       if (viewEl) {
         viewEl.scrollIntoView();
       }
     }, 100);
+
     this.currentView = view;
     this.setCurrentView(view);
   }
 
   removeView(view: View) {
     const index = this.viewList.indexOf(view);
-    this.viewList.splice(index, 1);
     const idIndex = this.viewIds.indexOf(view.id);
+
+    this.viewList.splice(index, 1);
     this.viewIds.splice(idIndex, 1);
+
     if (this.viewList.length === 0) {
       this.setCurrentView({});
     }
     if (view.connectToken.face_monitor_token) {
       this._faceSvc.removeMonitoringTab(view.id);
     }
-    this.state$.next({action: 'close', view: view});
+
+    this.state$.next({ action: 'close', view: view });
   }
 
   addSubViewToCurrentView(view: View) {
     this.currentView.subViews.push(view);
+
     const index = this.currentView.subViews.length;
-    this.setCurrentViewTitle(view, index + 1, 'concat');
+
+    this.setCurrentViewTitle(view, index, 'concat');
     this.setCurrentView();
-    this.state$.next({action: 'addSub', view: view, currentView: this.currentView});
+    this.state$.next({ action: 'addSub', view: view, currentView: this.currentView });
   }
 
   clearSubViewOfCurrentView(view: View) {
     const index = this.currentView.subViews.indexOf(view);
+
     this.currentView.subViews.splice(index, 1);
-    this.setCurrentViewTitle(view, index + 1, 'delete');
+    this.setCurrentViewTitle(view, index, 'delete');
     this.setCurrentView();
-    this.state$.next({action: 'clearSub', view: view, currentView: this.currentView});
+    this.state$.next({ action: 'clearSub', view: view, currentView: this.currentView });
   }
 
   setCurrentViewTitle(view, index, status) {
-    const {name} = this.currentView;
+    const { name } = this.currentView;
+
     switch (status) {
       case 'concat':
         this.currentView.name = name + '|' + view.name;
         break;
       case 'delete':
         const names = name.split('|');
+
         if (names[index] === view.name) {
           names.splice(index, 1);
         }
+
         this.currentView.name = names.join('|');
         break;
     }
@@ -102,8 +119,10 @@ export class ViewService {
   keyboardSwitchTab(key) {
     let nextViewId: any = 0;
     let nextActiveView = null;
+
     const viewIds = this.viewIds;
     const currentViewIndex = viewIds.findIndex(i => i === this.currentView.id);
+
     if (key === 'alt+shift+right') {
       if (currentViewIndex === viewIds.length - 1 && currentViewIndex !== 0) {
         nextActiveView = this.viewList.find(i => i.id === viewIds[0]);
@@ -128,9 +147,12 @@ export class ViewService {
   setCurrentView(view: Object = this.currentView) {
     this.currentView$.next(view);
     const connectedCount = this.viewList.filter(
-      v => v.connected === true && v.connectMethod.component === 'koko' && v.connectMethod.value === 'web_cli'
+      v =>
+        v.connected === true &&
+        v.connectMethod.component === 'koko' &&
+        v.connectMethod.value === 'web_cli'
     ).length;
     this.connectViewCount.next(connectedCount);
-    this.state$.next({action: 'active', view: view});
+    this.state$.next({ action: 'active', view: view });
   }
 }