Merge pull request #90 from jumpserver/manual

Manual

src/app/elements/asset-tree/asset-tree.component.ts

@@ -286,6 +286,9 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
       data: {username: user.username}
     });
     dialogRef.afterClosed().subscribe(result => {
+      if (!result) {
+        return;
+      }
       user.username = btoa(result.username);
       user.password = btoa(result.password);
       return this.login(host, user);
@@ -453,6 +456,10 @@ export class ManualPasswordDialogComponent implements OnInit {
     this.dialogRef.close();
   }
 
+  onEnter() {
+    this.dialogRef.close(this.data);
+  }
+
   ngOnInit(): void {
   }
 }

src/app/elements/asset-tree/manual-password-dialog.html

@@ -5,10 +5,13 @@
 </mat-form-field>
 
 <mat-form-field style="width: 100%">
-    <input matInput [type]="'password'" [(ngModel)]="data.password" [formControl]="PasswordControl" placeholder="{{'Password'|trans}}">
+  <input matInput [type]="'password'" [(ngModel)]="data.password"
+         [formControl]="PasswordControl" placeholder="{{'Password'|trans}}"
+         (keyup.enter)="onEnter()" [attr.cdkFocusInitial]="data.username? true : null">
 </mat-form-field>
 
 <div style="float: right">
   <button mat-raised-button (click)="onNoClick()" >{{"Cancel"|trans}}</button>
   <button mat-raised-button color="primary" [type]="'submit'" [mat-dialog-close]="data" >{{"Confirm"|trans}}</button>
 </div>
+