From a2097d42e4410d5d080ac5681b91d4330b4405f5 Mon Sep 17 00:00:00 2001 From: dailer Date: Wed, 29 Sep 2021 09:52:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-60284=20fix:=20=E5=B0=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=89=8D=E7=AB=AF=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84=20=E3=80=90=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E3=80=91=20=E6=94=B9=E6=88=90=20=E3=80=90=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/constants/constant.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts index 31d11b4..130fe48 100644 --- a/src/modules/constants/constant.ts +++ b/src/modules/constants/constant.ts @@ -637,7 +637,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: '', }, { From dab10a8e68b192385925c857ba87c8432835ed1b Mon Sep 17 00:00:00 2001 From: dailer Date: Wed, 29 Sep 2021 09:54:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-60284=20fix:=20=E5=B0=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=89=8D=E7=AB=AF=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84=20=E3=80=90=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E3=80=91=20=E6=94=B9=E6=88=90=20=E3=80=90=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- private/i18n.ts | 2 +- src/modules/pages/connection/connection_jdbc/connection_jdbc.ts | 2 +- src/modules/pages/connection/connection_jndi/connection_jndi.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/private/i18n.ts b/private/i18n.ts index a36b80e..8f00670 100644 --- a/private/i18n.ts +++ b/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': '用户名', diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts index eff5383..6f97be8 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts +++ b/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, diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.ts index 874120a..54d30a6 100644 --- a/src/modules/pages/connection/connection_jndi/connection_jndi.ts +++ b/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,