Browse Source

Merge pull request #2457 in DEC/decision-webui-dcm from release/11.0 to feature/x

* commit 'f8596f5eccb809787155b4019420453583eee6ae':
  DEC-19477 fix: 【自动化】数据连接-sql验证查询语句在右侧配置页面显示的是密文
research/11.0
superman 3 years ago
parent
commit
c7c4a3853b
  1. 8
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts

8
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 { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service';
import { CONNECTION_LAYOUT } from '@constants/constant'; import { CONNECTION_LAYOUT } from '@constants/constant';
import { VerticalLayout } from '@fui/core'; import { VerticalLayout } from '@fui/core';
import { ApiFactory } from '../../../crud/apiFactory';
const api = new ApiFactory().create();
@shortcut() @shortcut()
@store(ConnectionJdecModel) @store(ConnectionJdecModel)
export class ConnectionJdbc extends BI.Widget { export class ConnectionJdbc extends BI.Widget {
@ -21,7 +25,7 @@ export class ConnectionJdbc extends BI.Widget {
const databaseType = getJdbcDatabaseType(database, driver); const databaseType = getJdbcDatabaseType(database, driver);
const { host, port, databaseName } = resolveUrlInfo(url, database); const { host, port, databaseName } = resolveUrlInfo(url, database);
const { hgap, vgap } = CONNECTION_LAYOUT; const { hgap, vgap } = CONNECTION_LAYOUT;
return { return {
type: BI.VerticalLayout.xtype, type: BI.VerticalLayout.xtype,
hgap, hgap,
@ -132,7 +136,7 @@ export class ConnectionJdbc extends BI.Widget {
{ {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'), name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'),
value: connectionPoolAttr.validationQuery, value: api.getPlain(connectionPoolAttr.validationQuery || ''),
}, },
{ {
type: FormItem.xtype, type: FormItem.xtype,

Loading…
Cancel
Save