|
|
@ -7,6 +7,7 @@ import { connectionType } from '@constants/env'; |
|
|
|
import { ConnectionJDBC, Connection } from 'src/modules/crud/crud.typings'; |
|
|
|
import { ConnectionJDBC, Connection } from 'src/modules/crud/crud.typings'; |
|
|
|
import { TestStatusXtype, EVENT_RELOAD, EVENT_CLOSE } from 'src/modules/components/test_status/test_status'; |
|
|
|
import { TestStatusXtype, EVENT_RELOAD, EVENT_CLOSE } from 'src/modules/components/test_status/test_status'; |
|
|
|
import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL } from '@constants/constant'; |
|
|
|
import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL } from '@constants/constant'; |
|
|
|
|
|
|
|
import { getJdbcDatabaseType } from 'src/modules/app.service'; |
|
|
|
|
|
|
|
|
|
|
|
export const MaintainFormXtype = 'dec.dcm.maintain.form'; |
|
|
|
export const MaintainFormXtype = 'dec.dcm.maintain.form'; |
|
|
|
@shortcut(MaintainFormXtype) |
|
|
|
@shortcut(MaintainFormXtype) |
|
|
@ -164,8 +165,11 @@ export class MaintainForm extends BI.Widget { |
|
|
|
} |
|
|
|
} |
|
|
|
this.isEdit = true; |
|
|
|
this.isEdit = true; |
|
|
|
this.connectionName = this.model.connectionSelectedOne.connectionName; |
|
|
|
this.connectionName = this.model.connectionSelectedOne.connectionName; |
|
|
|
|
|
|
|
const connection = BI.clone(this.model.connectionSelectedOne); |
|
|
|
|
|
|
|
const { database, driver } = connection.connectionData as ConnectionJDBC; |
|
|
|
|
|
|
|
(connection.connectionData as ConnectionJDBC).database = getJdbcDatabaseType(database, driver).databaseType; |
|
|
|
|
|
|
|
|
|
|
|
return this.model.connectionSelectedOne; |
|
|
|
return connection; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private getJndiConnection():Connection { |
|
|
|
private getJndiConnection():Connection { |
|
|
|