From 80204a8712873ededb13cad33ef390f7ec9f62ac Mon Sep 17 00:00:00 2001 From: alan Date: Wed, 4 Sep 2019 18:20:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20KERNEL-1208=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/components/test_status/test_status.ts | 7 +++++-- src/modules/pages/connection/list/list_item/list_item.ts | 2 +- src/modules/pages/maintain/forms/components/form.jdbc.ts | 1 - src/modules/pages/maintain/forms/form.ts | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/components/test_status/test_status.ts b/src/modules/components/test_status/test_status.ts index dc49c32..6173571 100644 --- a/src/modules/components/test_status/test_status.ts +++ b/src/modules/components/test_status/test_status.ts @@ -142,6 +142,9 @@ export class TestStatus extends BI.Widget { type: TextButton, cls: 'bi-high-light bi-high-light-border-bottom', text: BI.i18nText('Dec-Dcm_Connection_Download_Driver'), + handler: () => { + window.open(this.model.link); + }, }, ], ref: (_ref: any) => { @@ -168,8 +171,8 @@ export class TestStatus extends BI.Widget { setFail(message: string, driver = '', link = '') { this.store.setStatus(TEST_STATUS.FAIL); this.failMessage.setText(message); - this.failDriverMessage.isVisible(!!driver); - this.driverLink.isVisible(!!driver); + this.failDriverMessage.setVisible(!!driver); + this.driverLink.setVisible(!!driver); if (driver) { this.failDriverMessage.setText(BI.i18nText('Dec-Dcm_Connection_Lack_Driver', driver)); this.store.setLink(link); diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index 5ba8c97..4ff7652 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -168,7 +168,7 @@ export class ListItem extends BI.BasicButton { if (thisConnection.connectionType === connectionType.JDBC) { const driver = (thisConnection.connectionData as ConnectionJDBC).driver; const databaseLink = BI.get(DATA_BASE_DRIVER_LINK.find(item => item.databaseType === databaseType), 'link'); - this.testStatus.setFail(re.errorMsg, driver, BI.Services.getService('dec.service.migration').getHelpLink(databaseLink)); + this.testStatus.setFail(re.errorMsg, driver, Dec.system[DecCst.Hyperlink.DECISION_HYPERLINK_CONFIG][databaseLink]); } else { this.testStatus.setFail(re.errorMsg); } diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index d0735bb..4908503 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -652,7 +652,6 @@ export class FormJdbc extends BI.Widget { newCharsetName: this.form.newCharsetName.getValue()[0] || '', originalCharsetName: this.form.newCharsetName.getValue()[0] || '', schema: this.form.schema.getValue(), - port: this.form.port.getValue(), host: this.form.host.getValue(), authType: this.form.authType.getValue()[0] || '', creator: Dec ? Dec.personal.username : '', diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 0fd48bf..a8f5dde 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -55,7 +55,7 @@ export class MaintainForm extends BI.Widget { const driver = (formValue.connectionData as ConnectionJDBC).driver; const databaseType = (formValue.connectionData as ConnectionJDBC).database; const databaseLink = BI.get(DATA_BASE_DRIVER_LINK.find(item => item.databaseType === databaseType), 'link'); - this.testStatus.setFail(re.errorMsg, driver, BI.Services.getService('dec.service.migration').getHelpLink(databaseLink)); + this.testStatus.setFail(re.errorMsg, driver, Dec.system[DecCst.Hyperlink.DECISION_HYPERLINK_CONFIG][databaseLink]); } else { this.testStatus.setFail(re.errorMsg); }