diff --git a/src/modules/pages/maintain/components/driverselector/driverselector.ts b/src/modules/pages/maintain/components/driverselector/driverselector.ts index 564dc9a..d59f956 100644 --- a/src/modules/pages/maintain/components/driverselector/driverselector.ts +++ b/src/modules/pages/maintain/components/driverselector/driverselector.ts @@ -118,7 +118,8 @@ export class DriverSelector extends BI.Widget { watermark: BI.i18nText('Dec-Please_Input'), items: this.model.driverClassItems, value: this.model.customDriver.driver, - text: () => this.model.customDriver.text || BI.i18nText('Dec-Please_Select'), + text: () => this.model.customDriver.text || '', + defaultText: BI.i18nText('Dec-Please_Select'), warningTitle: BI.i18nText('Dec-Dcm-Driver_Driver_File_Lost'), listeners: [ { diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index fa18f6a..baf83ff 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -71,6 +71,7 @@ export class FormJdbc extends BI.Widget { const { connectionName, connectionData } = this.options.formData; const { driver, + driverSource, user, password, originalCharsetName, @@ -138,6 +139,7 @@ export class FormJdbc extends BI.Widget { this.form.driver = _ref; }, driver, + driverSource, connectionData, listeners: [ { diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 84201e6..4900051 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -235,7 +235,7 @@ export class MaintainForm extends BI.Widget { return false; } - if (!this.form.validation || !this.form.validation()) { + if (this.form.validation && !this.form.validation()) { return false; }