Merge pull request #1231 from jumpserver/dev

v4.7.0

Author: BaiJiangJie

src/app/elements/connect/connect.component.ts

@@ -234,17 +234,20 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
   }
 
   getConnectData(accounts: Account[], asset: Asset): Promise<ConnectData> {
+    let dialogWidth = '600px';
     const preConnectData = this._appSvc.getPreConnectData(asset);
     const isValid = this.checkPreConnectDataForAuto(asset, accounts, preConnectData);
     if (isValid) {
       return Promise.resolve(preConnectData);
     }
-
+    if (this._i18n.getLangCode() === 'pt-br') {
+      dialogWidth = '730px'
+    }
     this._appSvc.connectDialogShown = true;
     const dialogRef = this._dialog.open(ElementConnectDialogComponent, {
       minHeight: '300px',
       height: 'auto',
-      width: '600px',
+      width: dialogWidth,
       data: {accounts, asset, preConnectData}
     });
 

src/app/elements/content/content-window/content-view/content-view.component.css

@@ -3,6 +3,7 @@
   display: flex;
   flex-direction: column;
   height: 100%;
+  overflow-y: scroll;
 }
 
 .head {

src/app/elements/content/content-window/content-window.component.css

@@ -18,6 +18,7 @@ div, elements-term, elements-guacamole {
   display: flex;
   flex-flow: row wrap;
   align-content: flex-start;
+  overflow-y: scroll;
 }
 
 .sub-view {

src/app/elements/face-monitor/face-monitor.component.html

@@ -1,6 +1,7 @@
 <div class="box" [class.minimized]="isMinimized" *ngIf="isVisible">
   <div class="box-header">
-    <span class="box-title" style="color: red" *ngIf="monitoringTabCount">●&nbsp;[{{ monitoringTabCount }}]个会话正在被监控中</span>
+    <span class="box-title" style="color: red" *ngIf="monitoringTabCount">●&nbsp;[{{ monitoringTabCount }}
+      ]{{ 'SessionIsBeingMonitored' | translate }}</span>
     <div class="box-controls">
       <button (click)="minimizeBox()">
         <i *ngIf="!isMinimized" class="fa fa-window-minimize"></i>

src/app/services/connect-token/acl-dialog/acl-dialog.component.ts

@@ -51,8 +51,9 @@ export class ElementACLDialogComponent implements OnInit {
     } else if (typeof error === 'object') {
       if (error.detail) {
         error = error.detail;
+      } else {
+        error = JSON.stringify(error);
       }
-      error = JSON.stringify(error);
     }
     return error;
   }