|
|
@ -17,7 +17,7 @@ export class ConnectionJdbc extends BI.Widget { |
|
|
|
|
|
|
|
|
|
|
|
render () { |
|
|
|
render () { |
|
|
|
const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; |
|
|
|
const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; |
|
|
|
const { driver, database, user, newCharsetName, schema, connectionPoolAttr, authType, principal, url } = connectionData; |
|
|
|
const { driver, database, user, originalCharsetName, schema, connectionPoolAttr, authType, principal, url } = connectionData; |
|
|
|
const databaseType = getJdbcDatabaseType(database, driver); |
|
|
|
const databaseType = getJdbcDatabaseType(database, driver); |
|
|
|
const { host, port, databaseName } = resolveUrlInfo(url); |
|
|
|
const { host, port, databaseName } = resolveUrlInfo(url); |
|
|
|
const { hgap, vgap } = CONNECTION_LAYOUT; |
|
|
|
const { hgap, vgap } = CONNECTION_LAYOUT; |
|
|
@ -68,7 +68,7 @@ export class ConnectionJdbc extends BI.Widget { |
|
|
|
{ |
|
|
|
{ |
|
|
|
type: FormItemXtype, |
|
|
|
type: FormItemXtype, |
|
|
|
name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), |
|
|
|
name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), |
|
|
|
value: newCharsetName ? newCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Auto'), |
|
|
|
value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Auto'), |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
type: FormItemXtype, |
|
|
|
type: FormItemXtype, |
|
|
|