Browse Source

Pull request #2696: DEC-20078 fix: 【迭代】【部分数据连接支持fetchSize】JNDI数据连接新建、编辑页面的「测试连接」、「保存」按钮点击无反应

Merge in DEC/decision-webui-dcm from ~DAILER/decision-webui-dcm:feature/10.0 to feature/10.0

* commit 'a0f2479cc0b88c4b47219aea7ef4829484811d6c':
  DEC-20078 fix: 【迭代】【部分数据连接支持fetchSize】JNDI数据连接新建、编辑页面的「测试连接」、「保存」按钮点击无反应
feature/10.0
Dailer 3 years ago
parent
commit
93413bd570
  1. 3
      src/modules/pages/maintain/components/driverselector/driverselector.ts
  2. 2
      src/modules/pages/maintain/forms/components/form.jdbc.ts
  3. 2
      src/modules/pages/maintain/forms/form.ts

3
src/modules/pages/maintain/components/driverselector/driverselector.ts

@ -118,7 +118,8 @@ export class DriverSelector extends BI.Widget {
watermark: BI.i18nText('Dec-Please_Input'), watermark: BI.i18nText('Dec-Please_Input'),
items: this.model.driverClassItems, items: this.model.driverClassItems,
value: this.model.customDriver.driver, 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'), warningTitle: BI.i18nText('Dec-Dcm-Driver_Driver_File_Lost'),
listeners: [ listeners: [
{ {

2
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 { connectionName, connectionData } = this.options.formData;
const { const {
driver, driver,
driverSource,
user, user,
password, password,
originalCharsetName, originalCharsetName,
@ -138,6 +139,7 @@ export class FormJdbc extends BI.Widget {
this.form.driver = _ref; this.form.driver = _ref;
}, },
driver, driver,
driverSource,
connectionData, connectionData,
listeners: [ listeners: [
{ {

2
src/modules/pages/maintain/forms/form.ts

@ -235,7 +235,7 @@ export class MaintainForm extends BI.Widget {
return false; return false;
} }
if (!this.form.validation || !this.form.validation()) { if (this.form.validation && !this.form.validation()) {
return false; return false;
} }

Loading…
Cancel
Save