|
|
@ -6,7 +6,7 @@ import { FormPluginXtype } from './components/form.plugin'; |
|
|
|
import { connectionType } from '@constants/env'; |
|
|
|
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, DATA_BASE_DRIVER_LINK } from '@constants/constant'; |
|
|
|
import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATA_BASE_DRIVER_LINK, DATEBASE_FILTER_TYPE } from '@constants/constant'; |
|
|
|
import { getJdbcDatabaseType } from 'src/modules/app.service'; |
|
|
|
import { getJdbcDatabaseType } from 'src/modules/app.service'; |
|
|
|
|
|
|
|
|
|
|
|
export const MaintainFormXtype = 'dec.dcm.maintain.form'; |
|
|
|
export const MaintainFormXtype = 'dec.dcm.maintain.form'; |
|
|
@ -136,6 +136,8 @@ export class MaintainForm extends BI.Widget { |
|
|
|
return FormJdbcXtype; |
|
|
|
return FormJdbcXtype; |
|
|
|
case connectionType.JNDI: |
|
|
|
case connectionType.JNDI: |
|
|
|
return FormJndiXtype; |
|
|
|
return FormJndiXtype; |
|
|
|
|
|
|
|
case DATEBASE_FILTER_TYPE.OTHER: |
|
|
|
|
|
|
|
return FormJdbcXtype; |
|
|
|
default: |
|
|
|
default: |
|
|
|
return FormPluginXtype; |
|
|
|
return FormPluginXtype; |
|
|
|
} |
|
|
|
} |
|
|
@ -147,6 +149,8 @@ export class MaintainForm extends BI.Widget { |
|
|
|
return this.getJdbcConnection(); |
|
|
|
return this.getJdbcConnection(); |
|
|
|
case connectionType.JNDI: |
|
|
|
case connectionType.JNDI: |
|
|
|
return this.getJndiConnection(); |
|
|
|
return this.getJndiConnection(); |
|
|
|
|
|
|
|
case DATEBASE_FILTER_TYPE.OTHER: |
|
|
|
|
|
|
|
return this.getJdbcConnection(); |
|
|
|
default: |
|
|
|
default: |
|
|
|
return this.getPluginConnection(); |
|
|
|
return this.getPluginConnection(); |
|
|
|
} |
|
|
|
} |
|
|
|