Browse Source

DEC-13518 fix: 数据连接高级属性,单独修改“开启空闲回收器检验”不生效

research/10.0
congqiu 5 years ago
parent
commit
0a4648decb
  1. 5
      src/modules/crud/api.ts
  2. 4
      src/modules/crud/decision.api.ts
  3. 5
      src/modules/crud/design.api.ts
  4. 7
      src/modules/pages/maintain/forms/components/form.jdbc.ts

5
src/modules/crud/api.ts

@ -61,4 +61,9 @@ export interface Api {
*
*/
isDriverError(errorCode: string): boolean;
/**
*
*/
getCipher(password: string): string;
}

4
src/modules/crud/decision.api.ts

@ -93,6 +93,10 @@ export class DecisionApi implements Api {
return false;
}
getCipher(password: string) {
return BI.Providers.getProvider('dec.provider.cipher').getCipher(password);
}
private sendEditStatusEvent(name: string, type: string): Promise<SocketResult> {
return new Promise(resolve => {
if (Dec && Dec.socket.connected) {

5
src/modules/crud/design.api.ts

@ -66,4 +66,9 @@ export class DesignApi implements Api {
// 设计器暂不校验
return false;
}
getCipher(password: string) {
// 设计器加密方法
return password;
}
}

7
src/modules/pages/maintain/forms/components/form.jdbc.ts

@ -7,6 +7,9 @@ import { connectionType } from '@constants/env';
import { CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE } from '@constants/constant';
import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl } from '../../../../app.service';
import { TextCheckerXtype } from '../../../../components/text_checker/text_checker';
import { ApiFactory } from 'src/modules/crud/apiFactory';
const api = new ApiFactory().create();
export const FormJdbcXtype = 'dec.dcm.maintain.form.jdbc';
@shortcut(FormJdbcXtype)
export class FormJdbc extends BI.Widget {
@ -742,7 +745,7 @@ export class FormJdbc extends BI.Widget {
driver: this.form.driver.getValue(),
url: this.form.url.getValue(),
user: this.form.user.getValue(),
password: this.oldPassword === this.form.password.getValue() ? this.oldPassword : BI.Providers.getProvider('dec.provider.cipher').getCipher(this.form.password.getValue()),
password: this.oldPassword === this.form.password.getValue() ? this.oldPassword : api.getCipher(this.form.password.getValue()),
queryType: '',
newCharsetName: originalCharsetName ? 'gbk' : '', // 后台要求,originalCharsetName不为空时,newCharsetName为gbk
originalCharsetName,
@ -761,7 +764,7 @@ export class FormJdbc extends BI.Widget {
validationQuery: this.form.validationQuery.getValue(),
testOnBorrow: BI.size(this.form.testOnBorrow.getValue()) > 0 ? this.form.testOnBorrow.getValue()[0] : connectionPoolAttr.testOnBorrow,
testOnReturn: BI.size(this.form.testOnReturn.getValue()) > 0 ? this.form.testOnReturn.getValue()[0] : connectionPoolAttr.testOnReturn,
testWhileIdle: BI.size(this.form.testOnReturn.getValue()) > 0 ? this.form.testWhileIdle.getValue()[0] : connectionPoolAttr.testWhileIdle,
testWhileIdle: BI.size(this.form.testWhileIdle.getValue()) > 0 ? this.form.testWhileIdle.getValue()[0] : connectionPoolAttr.testWhileIdle,
timeBetweenEvictionRunsMillis: this.form.timeBetweenEvictionRunsMillis.getValue(),
numTestsPerEvictionRun: this.form.numTestsPerEvictionRun.getValue(),
minEvictableIdleTimeMillis: this.form.minEvictableIdleTimeMillis.getValue(),

Loading…
Cancel
Save