Browse Source

Pull request #9150: 无JIRA任务,解决冲突

Merge in DEC/decision-webui-dcm from ~AUSTIN.DUAN/decision-webui-dcm:research/fbp-1.0 to research/fbp-1.0

* commit 'e331143a9faff0021273bb33ee330529722022e8':
  REPORT-114169 fix: 【多租户】新建数据连接输入框样式问题
fbp/feature
Austin.Duan-段嗣跃 7 months ago
parent
commit
e89681f83c
  1. 9
      src/modules/pages/maintain/maintain.ts

9
src/modules/pages/maintain/maintain.ts

@ -25,7 +25,7 @@ export class Maintain extends BI.Widget {
render() { render() {
const { isEdit, databaseType } = this.getEditConnection(); const { isEdit, databaseType } = this.getEditConnection();
const titleText = getTextByDatabaseType(databaseType); const titleText = getTextByDatabaseType(databaseType);
return { return {
type: BI.VTapeLayout.xtype, type: BI.VTapeLayout.xtype,
hgap: 16, hgap: 16,
@ -82,12 +82,13 @@ export class Maintain extends BI.Widget {
this.socketTip.setVisible(true); this.socketTip.setVisible(true);
} }
api.setEditedConnectionStatus(this.model.connectionSelectedOne.connectionName); this.model.connectionSelectedOne
&& api.setEditedConnectionStatus(this.model.connectionSelectedOne.connectionName);
} }
private renderItems() { private renderItems() {
const { type } = this.getEditConnection(); const { type } = this.getEditConnection();
return [{ return [{
type: MaintainForm.xtype, type: MaintainForm.xtype,
connectionType: type, connectionType: type,
@ -108,7 +109,7 @@ export class Maintain extends BI.Widget {
const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType; databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType;
} }
return { return {
type: this.model.connectionSelectedOne.connectionType, type: this.model.connectionSelectedOne.connectionType,
text: this.model.connectionSelectedOne.connectionName, text: this.model.connectionSelectedOne.connectionName,

Loading…
Cancel
Save