Browse Source

Merge pull request #8519 in DEC/decision-webui-dcm from release/11.0 to final/11.0

* commit '790361805dd629580a3038ab8913415ddcb2873f':
  REPORT-107734【平台前端适配】数据连接增加fetchsize配置项
  REPORT-108103 Starrocks数据连接解析不包含catalog的数据连接出错
final/11.0
superman 12 months ago
parent
commit
4191716dfa
  1. 3
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
  2. 5
      src/modules/pages/maintain/forms/components/form.jdbc.ts

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

@ -376,9 +376,8 @@ export class ConnectionJdbc extends BI.Widget {
}, },
{ {
type: FormItem.xtype, type: FormItem.xtype,
invisible: fetchSize < 0 && fetchSize !== -2,
name: 'Fetchsize', name: 'Fetchsize',
value: fetchSize === -2 ? '' : fetchSize, value: fetchSize,
}, },
], ],
}, },

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

@ -1496,7 +1496,6 @@ export class FormJdbc extends BI.Widget {
el: { el: {
type: BI.VerticalLayout.xtype, type: BI.VerticalLayout.xtype,
cls: 'bi-border-top', cls: 'bi-border-top',
invisible: fetchSize < 0 && fetchSize !== -2,
items: [ items: [
{ {
el: { el: {
@ -1508,7 +1507,7 @@ export class FormJdbc extends BI.Widget {
$value: 'fetch-size', $value: 'fetch-size',
width: EDITOR_WIDTH, width: EDITOR_WIDTH,
allowBlank: true, allowBlank: true,
value: fetchSize === -2 ? '' : fetchSize, value: fetchSize,
watermark: 'Fetchsize', watermark: 'Fetchsize',
validationChecker: [ validationChecker: [
{ {
@ -1713,7 +1712,7 @@ export class FormJdbc extends BI.Widget {
principal: this.form.principal.getValue()[0], principal: this.form.principal.getValue()[0],
keyPath: this.form.keyPath.getValue(), keyPath: this.form.keyPath.getValue(),
krb5Path: this.form.krb5Path.getValue(), krb5Path: this.form.krb5Path.getValue(),
fetchSize: BI.isEmptyString(this.form.fetchSize.getValue()) ? -2 : BI.parseInt(this.form.fetchSize.getValue()), fetchSize: BI.isEmptyString(this.form.fetchSize.getValue()) ? -1 : BI.parseInt(this.form.fetchSize.getValue()),
// ssh // ssh
usingSsh: this.form.usingSsh.isSelected(), usingSsh: this.form.usingSsh.isSelected(),
// redirectPort: 0, // redirectPort: 0,

Loading…
Cancel
Save