Browse Source

Merge pull request #8368 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0

* commit 'f7b963bd8cbe1bd31010e29439d29367f85d05ab':
  REPORT-102763 fix:数据连接支持对接业务系统-接口补充
bugfix/11.0
superman 1 year ago
parent
commit
1a0fd23030
  1. 3
      src/modules/pages/connection/list/list.model.ts
  2. 1
      src/modules/pages/maintain/forms/form.ts

3
src/modules/pages/connection/list/list.model.ts

@ -20,8 +20,9 @@ export class ConnectionListModel extends Model<{
actions = {
setConnections: ():Promise<void> => api.getConnectionList().then(data => {
data.data.push(...BI.Constants.getConstant('dec.constant.connection.list'));
if (BI.size(data.data) > 0) {
this.model.connections = data.data.concat(BI.Constants.getConstant('dec.constant.connection.list'));
this.model.connections = data.data;
this.model.connections.forEach(item => {
// 后端传过来的是字符串,转为对象
BI.isString(item.connectionData) && (item.connectionData = JSON.parse(item.connectionData as string));

1
src/modules/pages/maintain/forms/form.ts

@ -34,6 +34,7 @@ export class MaintainForm extends BI.Widget {
if (sonSave) {
sonSave().then((success: boolean) => {
if (success) {
this.store.goFirstPage();
BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Success"), {
level: "success",
});

Loading…
Cancel
Save