Browse Source

Merge pull request #3138 in DEC/decision-webui-dcm from release/10.0 to bugfix/10.0

* commit 'aac86dfaffd8c5c93a7b5ff64faf77fad100b75e':
  REPORT-60284 fix: 将平台前端数据连接编码的 【自动】 改成 【默认】
  REPORT-60284 fix: 将平台前端数据连接编码的 【自动】 改成 【默认】
bugfix/10.0
superman 3 years ago
parent
commit
f776880af1
  1. 2
      private/i18n.ts
  2. 2
      src/modules/constants/constant.ts
  3. 2
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
  4. 2
      src/modules/pages/connection/connection_jndi/connection_jndi.ts

2
private/i18n.ts

@ -54,7 +54,7 @@ export default {
'Dec-Dcm_Connection_Form_Database_URL': '数据连接URL', 'Dec-Dcm_Connection_Form_Database_URL': '数据连接URL',
'Dec-Dcm_Connection_Form_Place_Input': '请输入', 'Dec-Dcm_Connection_Form_Place_Input': '请输入',
'Dec-Dcm_Connection_Form_OriginalCharsetName': '编码', 'Dec-Dcm_Connection_Form_OriginalCharsetName': '编码',
'Dec-Dcm_Connection_Form_Auto': '自动', 'Dec-Dcm_Connection_Form_Default': '默认',
'Dec-Dcm_Connection_Form_Host': '主机', 'Dec-Dcm_Connection_Form_Host': '主机',
'Dec-Dcm_Connection_Form_AuthType': '认证方式', 'Dec-Dcm_Connection_Form_AuthType': '认证方式',
'Dec-Dcm_Connection_Form_UserName': '用户名', 'Dec-Dcm_Connection_Form_UserName': '用户名',

2
src/modules/constants/constant.ts

@ -664,7 +664,7 @@ export const DATA_BASE_TYPES = [
export const CONNECT_CHARSET = [ export const CONNECT_CHARSET = [
{ {
text: BI.i18nText('Dec-Dcm_Connection_Form_Auto'), text: BI.i18nText('Dec-Dcm_Connection_Form_Default'),
value: '', value: '',
}, },
{ {

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

@ -84,7 +84,7 @@ export class ConnectionJdbc extends BI.Widget {
{ {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'),
value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Auto'), value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Default'),
}, },
{ {
type: FormItem.xtype, type: FormItem.xtype,

2
src/modules/pages/connection/connection_jndi/connection_jndi.ts

@ -92,7 +92,7 @@ export class ConnectionJndi extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
nameWidth: 200, nameWidth: 200,
name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'),
value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Auto'), value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Default'),
}, },
{ {
type: Collapse.xtype, type: Collapse.xtype,

Loading…
Cancel
Save