Merge pull request #3139 in DEC/decision-webui-dcm from bugfix/10.0 to feature/10.0

* commit 'f776880af1f0ebc28d93390d7a41f96dd5021bae':
  REPORT-60284 fix: 将平台前端数据连接编码的 【自动】 改成 【默认】
  REPORT-60284 fix: 将平台前端数据连接编码的 【自动】 改成 【默认】

private/i18n.ts

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

src/modules/constants/constant.ts

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

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

@@ -84,7 +84,7 @@ export class ConnectionJdbc extends BI.Widget {
                 {
                     type: FormItem.xtype,
                     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,

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

@@ -92,7 +92,7 @@ export class ConnectionJndi extends BI.Widget {
                     type: FormItem.xtype,
                     nameWidth: 200,
                     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,