Browse Source

fix: DEC-9802 复制数据连接时,保留之前的id

qufenxi
alan 5 years ago
parent
commit
02ac99e304
  1. 2
      src/modules/crud/decision.api.ts
  2. 7
      src/modules/pages/maintain/forms/form.ts

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

@ -19,7 +19,7 @@ export class DecisionApi implements Api {
addConnection(data: Connection) { addConnection(data: Connection) {
const form = { const form = {
...data, ...data,
connectionId: data.connectionName, connectionId: data.connectionId || data.connectionName,
connectionData : JSON.stringify(data.connectionData), connectionData : JSON.stringify(data.connectionData),
}; };

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

@ -33,7 +33,9 @@ export class MaintainForm extends BI.Widget {
if (this.connectionName && !this.model.isCopy) { if (this.connectionName && !this.model.isCopy) {
this.store.updateConnection(this.connectionName, this.form.getSubmitValue()); this.store.updateConnection(this.connectionName, this.form.getSubmitValue());
} else { } else {
this.store.addConnection(this.form.getSubmitValue()); const form = this.form.getSubmitValue();
form.connectionId = this.connectionName;
this.store.addConnection(form);
} }
this.store.setIsCopy(false); this.store.setIsCopy(false);
}, },
@ -44,7 +46,7 @@ export class MaintainForm extends BI.Widget {
const id = BI.UUID(); const id = BI.UUID();
const testConnection = () => { const testConnection = () => {
const formValue = this.form.getSubmitValue(); const formValue = this.form.getSubmitValue();
if (this.isEdit) { if (this.isEdit || this.model.isCopy) {
formValue.connectionId = this.connectionName; formValue.connectionId = this.connectionName;
} }
this.store.testConnection(formValue).then(re => { this.store.testConnection(formValue).then(re => {
@ -118,7 +120,6 @@ export class MaintainForm extends BI.Widget {
if (this.model.isCopy) { if (this.model.isCopy) {
formData.connectionName = `${formData.connectionName}-${BI.i18nText('Dec-Dcm_Copy')}`; formData.connectionName = `${formData.connectionName}-${BI.i18nText('Dec-Dcm_Copy')}`;
this.isEdit = false; this.isEdit = false;
this.connectionName = '';
} }
return { return {

Loading…
Cancel
Save