Merge "Fixed Portal-Multi-Tab Issue"

diff --combined portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
index 93dd345,2aecbba..1e0518b
--- 1/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
--- 2/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
+++ b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
@@@ -59,7 -59,7 +59,7 @@@
              <div style="display: flex; flex-direction:row;">
                <app-sidebar (collapsedEvent)="receiveCollapsed($event)"></app-sidebar>
                <app-userbar></app-userbar>
 -              <div class="container" style="margin-left: 370px;">
 +              <div class="container" [ngStyle]="setStyle()">
                  <router-outlet></router-outlet>
                </div>
              </div>
@@@ -86,9 -86,9 +86,9 @@@
          <div *ngFor="let tab of tabs; let index = index"
            [style.display]='tab.active? "inline" : "none"'
            [style.position]='tab.active? "static" : "absolute"'
-           [style.height]='tab.active? "calc(100vh)" : "calc(0vh)"'>
+           [style.height]='tab.active? "45rem" : "45rem"'>
  
-           <iframe id="tabframe-{{tab.label.split(' ').join('-')}}" scrolling='yes' frameBorder='0' width='100%'
+           <iframe id="tabframe-{{tab.label.split(' ').join('-')}}-{{index}}" scrolling='yes' frameBorder='0' width='100%'
              scrolling='yes' frameBorder='0' width='100%' height='90%' [src]='tab.url'></iframe>
  
          </div>