Browse Source

Pull request #1724: DEC-17971 feat: 服务器数据集sql传输加密-前端

Merge in DEC/decision-webui-dcm from ~DAILER/decision-webui-dcm:feature/10.0 to feature/10.0

* commit '5ba87936b9cb6b98f53bf43ec9966121db676bb3':
  DEC-17971 feat: 服务器数据集sql传输加密-前端
  DEC-18013 fix: 【自动化】最新redis数据集插件,新建redis数据连接,默认名称是widget7127这种带随机数
  DEC-17971 feat: 服务器数据集sql传输加密-前端
feature/10.0
parent
commit
0ad26c064e
  1. 16
      README.md
  2. 5
      src/modules/crud/api.ts
  3. 4
      src/modules/crud/decision.api.ts
  4. 11
      src/modules/crud/design.api.ts
  5. 4
      src/modules/pages/maintain/forms/components/form.jdbc.ts
  6. 2
      src/modules/pages/maintain/forms/components/form.plugin.ts

16
README.md

@ -25,14 +25,16 @@ yarn dev
BI.config(ConstantPluginTyps, (datas: string[]) => [...datas, {
text: 'Redis',
databaseType: 'Redis',
edit: '',
show: '',
}]);
```
### 数据连接填写页面
ConstantName名称为`dec.constant.database.conf.connect.form.${name}.edit`,值为组件shortcut的名称
edit属性值为填写组件shortcut的名称
### 数据连接展示页面
ConstantName名称为`dec.constant.database.conf.connect.form.${name}.show`,值为组件shortcut的名称
show属性值为组件shortcut的名称
### 示例
```
@ -121,7 +123,7 @@ BI.shortcut(RedisShowName, RedisShow);
const RedisEdit = BI.inherit(BI.Widget, {
props: {
formData: {
value: {
url: '',
port: '6379',
password: '',
@ -152,7 +154,7 @@ const RedisEdit = BI.inherit(BI.Widget, {
ref: _ref => {
this.url = _ref;
},
text: o.formData.url,
text: o.value.url,
},
],
},
@ -173,7 +175,7 @@ const RedisEdit = BI.inherit(BI.Widget, {
ref: _ref => {
this.port = _ref;
},
text: o.formData.port,
text: o.value.port,
},
],
},
@ -195,14 +197,14 @@ const RedisEdit = BI.inherit(BI.Widget, {
ref: _ref => {
this.password = _ref;
},
text: o.formData.password,
text: o.value.password,
},
],
},
],
};
},
getSubmitValue() {
getValue() {
return {
url: this.url.getValue(),
port: this.port.getValue(),

5
src/modules/crud/api.ts

@ -67,6 +67,11 @@ export interface Api {
*/
getCipher(password: string): string;
/**
*
*/
getPlain(cipher: string): string;
/**
*
*/

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

@ -97,6 +97,10 @@ export class DecisionApi implements Api {
return BI.Providers.getProvider('dec.provider.cipher').getCipher(password);
}
getPlain(cipher: string) {
return BI.Providers.getProvider('dec.provider.cipher').getPlain(cipher);
}
getHyperlink(name: string) {
return Dec.system[DecCst.Hyperlink.DECISION_HYPERLINK_CONFIG][name];
}

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

@ -36,12 +36,14 @@ export class DesignApi implements Api {
getConnectionPool(name: string): Promise<{ data: ConnectionPoolType }> {
return new Promise(resolve => {
resolve({ data: {
resolve({
data: {
maxActive: 1,
maxIdle: 1,
numActive: 1,
numIdle: 1,
} });
}
});
});
}
@ -72,6 +74,11 @@ export class DesignApi implements Api {
return password;
}
getPlain(cipher: string) {
// 设计器解密方法
return cipher;
}
getHyperlink(name: string) {
// 设计器获取超链
return '';

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

@ -537,7 +537,7 @@ export class FormJdbc extends BI.Widget {
cls: 'bi-border',
allowBlank: true,
watermark: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'),
value: validationQuery,
value: api.getPlain(validationQuery || ''),
width: 300,
height: 100,
ref: (_ref: TextAreaEditor) => {
@ -788,7 +788,7 @@ export class FormJdbc extends BI.Widget {
maxIdle: this.form.maxIdle.getValue(),
minIdle: this.form.minIdle.getValue(),
maxWait: this.form.maxWait.getValue(),
validationQuery: this.form.validationQuery.getValue(),
validationQuery: api.getCipher(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.testWhileIdle.getValue()) > 0 ? this.form.testWhileIdle.getValue()[0] : connectionPoolAttr.testWhileIdle,

2
src/modules/pages/maintain/forms/components/form.plugin.ts

@ -32,7 +32,7 @@ export class FormPlugin extends BI.Widget {
return {
connectionId,
connectionType,
connectionName: this.plugin.getName ? this.plugin.getName() : '',
connectionName: this.plugin.getConnectionName ? this.plugin.getConnectionName() : '',
connectionData: this.plugin.getValue(),
};
}

Loading…
Cancel
Save