Merge pull request #2496 in DEC/decision-webui-dcm from release/10.0 to final/10.0

* commit 'aa30cca9baa29b81e3027886a00c74b2b09512dd':
  DEC-19477 fix: 【自动化】数据连接-sql验证查询语句在右侧配置页面显示的是密文
  DEC-19271 e2e: 【自动化】数据连接管理，JNDI和其他类型数据连接中编码的ID不一样，需要改成一样

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

@@ -6,6 +6,10 @@ import { ConnectionJDBC } from 'src/modules/crud/crud.typings';
 import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service';
 import { CONNECTION_LAYOUT } from '@constants/constant';
 import { VerticalLayout } from '@fui/core';
+import { ApiFactory } from '../../../crud/apiFactory';
+
+const api = new ApiFactory().create();
+
 @shortcut()
 @store(ConnectionJdecModel)
 export class ConnectionJdbc extends BI.Widget {
@@ -132,7 +136,7 @@ export class ConnectionJdbc extends BI.Widget {
                         {
                             type: FormItem.xtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'),
-                            value: connectionPoolAttr.validationQuery,
+                            value: api.getPlain(connectionPoolAttr.validationQuery || ''),
                         },
                         {
                             type: FormItem.xtype,

src/modules/pages/maintain/forms/components/form.jndi.ts

@@ -193,7 +193,7 @@ export class FormJndi extends BI.Widget {
                     nameWidth: 200,
                     forms: [{
                         type: BI.TextValueCombo.xtype,
-                        $value: 'new-charset-name',
+                        $value: 'original-charset-name',
                         width: 300,
                         value: newCharsetName ? newCharsetName : '',
                         items: CONNECT_CHARSET,