perf: 修复所有连接方式动作为拒绝时控制台报错问题

jumpserver · Jun 13, 2023 · da566eb · da566eb
1 parent 1794cc4
commit da566eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/app/elements/connect/connect-dialog/advanced-option/advanced-option.component.ts b/src/app/elements/connect/connect-dialog/advanced-option/advanced-option.component.ts
@@ -32,7 +32,7 @@ export class ElementAdvancedOptionComponent implements OnChanges {
         label: 'Charset',
         hidden: () => {
           const protocolsCanCharset: Array<string> = ['ssh', 'telnet'];
-          return this.connectMethod.component !== 'koko' || !protocolsCanCharset.includes(this.protocol.name);
+          return this.connectMethod && this.connectMethod.component !== 'koko' || !protocolsCanCharset.includes(this.protocol.name);
         },
         value: 'default',
         options: [
@@ -46,7 +46,7 @@ export class ElementAdvancedOptionComponent implements OnChanges {
         field: 'disableautohash',
         hidden: () => {
           const protocolsCanAutoHash: Array<string> = ['mysql', 'mariadb'];
-          return this.connectMethod.component !== 'koko' || !protocolsCanAutoHash.includes(this.protocol.name);
+          return this.connectMethod && this.connectMethod.component !== 'koko' || !protocolsCanAutoHash.includes(this.protocol.name);
         },
         label: 'Disable auto completion',
         value: false,
@@ -67,7 +67,7 @@ export class ElementAdvancedOptionComponent implements OnChanges {
         type: 'select',
         field: 'backspaceAsCtrlH',
         hidden: () => {
-          return this.connectMethod.component !== 'koko';
+          return this.connectMethod && this.connectMethod.component !== 'koko';
         },
         options: this.boolChoices,
         label: 'Backspace as Ctrl+H',

diff --git a/src/app/elements/connect/connect-dialog/connect-dialog.component.html b/src/app/elements/connect/connect-dialog/connect-dialog.component.html
@@ -30,7 +30,7 @@ <h3>{{"Connect" | translate}} - {{ asset.name | truncatechars:30 }}</h3>
     <elements-connect-method
       class="connect-method-zone"
       [protocol]="protocol"
-      [(connectMethod)]="connectMethod"
+      [connectMethod]="connectMethod"
       (onDownloadRDPFile)="onConfirm(true)"
     >
     </elements-connect-method>

diff --git a/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.ts b/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.ts
@@ -46,7 +46,7 @@ export class ElementConnectMethodComponent implements OnInit {
   currentConnectMethodTypeIndex() {
     const i = this.connectMethodTypes
       .map((item) => item.value)
-      .indexOf(this.connectMethod.type);
+      .indexOf(this.connectMethod && this.connectMethod.type);
     if (i === -1) {
       return 0;
     }