From 42669b6c67d65b6a159f9a1334a9dc6bd30ff103 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Jul 2021 11:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DoriginalData=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/x_component_process_Xform/Form.js | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/o2web/source/x_component_process_Xform/Form.js b/o2web/source/x_component_process_Xform/Form.js index e241d16602..2dba59bf67 100644 --- a/o2web/source/x_component_process_Xform/Form.js +++ b/o2web/source/x_component_process_Xform/Form.js @@ -1570,14 +1570,19 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class( if (editor.docToWord) p.push(new Promise(function(resolve){ editor.docToWord(resolve) })); }); Promise.all(p).then(function(){ - this.workAction.saveData(callback || function () { }, failure, this.businessData.work.id, this.modifedData); + this.workAction.saveData(function () { + this.businessData.originalData = null; + this.businessData.originalData = Object.clone(data); + if(callback)callback(); + }.bind(this), failure, this.businessData.work.id, this.modifedData); }.bind(this)); }else{ - this.workAction.saveData(callback || function () { }, failure, this.businessData.work.id, this.modifedData); + this.workAction.saveData(function () { + this.businessData.originalData = null; + this.businessData.originalData = Object.clone(data); + if(callback)callback(); + }.bind(this), failure, this.businessData.work.id, this.modifedData); } - - this.businessData.originalData = null; - this.businessData.originalData = Object.clone(data); }, saveFormDataDraft: function (callback, failure, history, data, issubmit, isstart) { if (this.officeList) { @@ -1592,6 +1597,10 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class( "identity": this.businessData.work.creatorIdentityDn } this.workAction.saveDraft(draft, function (json) { + + this.businessData.originalData = null; + this.businessData.originalData = Object.clone(data); + this.workAction.getDraft(json.data.id, function (json) { this.businessData.work = json.data.work; this.app.options.draftId = json.data.work.id; @@ -1618,8 +1627,6 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class( }.bind(this)); }.bind(this), failure); - this.businessData.originalData = null; - this.businessData.originalData = Object.clone(data); }, setProcessorSectionOrgList: function (data) { if (!this.routeDataList) this.getRouteDataList(); -- GitLab