Browse Source

Pull request #2734: DEC-20047 fix: 【迭代】【部分数据连接支持fetchSize】平台设置fetchSize为空回填数值为0

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

* commit '0843c9acae4e4d04a3ecbf5aa81686e03e9a069c':
  DEC-20047 fix: 【迭代】【部分数据连接支持fetchSize】平台设置fetchSize为空回填数值为0
feature/10.0
Dailer 3 years ago
parent
commit
a472d95b5f
  1. 4
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
  2. 6
      src/modules/pages/maintain/forms/components/form.jdbc.ts

4
src/modules/pages/connection/connection_jdbc/connection_jdbc.ts

@ -182,9 +182,9 @@ export class ConnectionJdbc extends BI.Widget {
unit: BI.i18nText('BI-Basic_Seconds'),
}, {
type: FormItem.xtype,
invisible: BI.parseInt(fetchSize) < 0,
invisible: fetchSize < 0 && fetchSize !== -2,
name: 'Fetchsize',
value: fetchSize,
value: fetchSize === -2 ? '' : fetchSize,
},
],
},

6
src/modules/pages/maintain/forms/components/form.jdbc.ts

@ -712,7 +712,7 @@ export class FormJdbc extends BI.Widget {
el: {
type: BI.VerticalLayout.xtype,
cls: 'bi-border-top',
invisible: BI.parseInt(fetchSize) < 0,
invisible: fetchSize < 0 && fetchSize !== -2,
items: [
{
el: {
@ -723,7 +723,7 @@ export class FormJdbc extends BI.Widget {
$value: 'fetch-size',
width: 300,
allowBlank: true,
value: fetchSize,
value: fetchSize === -2 ? '' : fetchSize,
watermark: 'Fetchsize',
validationChecker: [{
errorText: BI.i18nText('Dec-Dcm_Connection_Check_Fetch_Size_Range'),
@ -857,7 +857,7 @@ export class FormJdbc extends BI.Widget {
creator: Dec ? Dec.personal.username : '',
principal: this.form.principal.getValue(),
keyPath: this.form.keyPath.getValue(),
fetchSize: BI.parseInt(this.form.fetchSize.getValue()),
fetchSize: BI.isEmptyString(this.form.fetchSize.getValue()) ? -2 : BI.parseInt(this.form.fetchSize.getValue()),
connectionPoolAttr: {
initialSize: this.form.initialSize.getValue(),
maxActive: this.form.maxActive.getValue(),

Loading…
Cancel
Save