From 9b09472c89a4ca463b2130e5dc08c8040664f8f8 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Fri, 22 Sep 2023 10:53:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-105428=20fix:=20=E7=A7=BB=E9=99=A4SS?= =?UTF-8?q?H=E4=B8=BB=E6=9C=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/components/form.jdbc.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 0a78633..a3a2dee 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1014,7 +1014,6 @@ export class FormJdbc extends BI.Widget { this.form.sshIp = _ref; }, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Host'), - allowBlank: false, value: sshIp, listeners: [ { @@ -1651,7 +1650,7 @@ export class FormJdbc extends BI.Widget { public validation(): boolean { const driver = this.form.driver.validation(); - const sshSet = !this.form.usingSsh.isSelected() || (this.form.sshIp.getValue() !== '' && this.form.sshPort.getValue() !== ''); + const sshSet = !this.form.usingSsh.isSelected() || BI.isNotEmptyString(this.form.sshPort.getValue()); return driver && sshSet; } From 0a269508c368ba2f2c4921ff94789f4b599ecee2 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Fri, 22 Sep 2023 10:53:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-105428=20fix:=20=E7=A7=BB=E9=99=A4SS?= =?UTF-8?q?H=E4=B8=BB=E6=9C=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/components/form.jdbc.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 0a78633..a3a2dee 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1014,7 +1014,6 @@ export class FormJdbc extends BI.Widget { this.form.sshIp = _ref; }, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Host'), - allowBlank: false, value: sshIp, listeners: [ { @@ -1651,7 +1650,7 @@ export class FormJdbc extends BI.Widget { public validation(): boolean { const driver = this.form.driver.validation(); - const sshSet = !this.form.usingSsh.isSelected() || (this.form.sshIp.getValue() !== '' && this.form.sshPort.getValue() !== ''); + const sshSet = !this.form.usingSsh.isSelected() || BI.isNotEmptyString(this.form.sshPort.getValue()); return driver && sshSet; }