Merge branch 'fix/Process.namager' into 'wrdp'

Merge of fix/Process.namager 流程服务调用节点默认设置为jaxrs，流程保存数据的时候originalData的拷贝改变位置 to wrdp

See merge request o2oa/o2oa!4685

o2web/source/x_component_process_ProcessDesigner/$Process/activity.json

@@ -501,7 +501,7 @@
 
 //    "script": "",
 //    "scriptText": "",
-    "invokeMode": "jaxws",   //jaxws, jaxrs
+    "invokeMode": "jaxrs",   //jaxws, jaxrs
 
     "jaxwsAddress": "",
     "jaxwsMethod": "",

o2web/source/x_component_process_ProcessDesigner/$Process/invoke.html

@@ -48,8 +48,8 @@
             <tr>
                 <td class="editTableTitle">{{$.lp.protocol}}:</td>
                 <td class="editTableValue">
-                    <input class="editTableRadio" checked onclick="if (this.checked){$('text{$.id}webserviceInvokeModeJaxrs').setStyle('display', 'none'); $('text{$.id}webserviceInvokeModeJaxws').setStyle('display', 'block')}" name="invokeMode" text{($.invokeMode=='jaxws')?'checked':''} type="radio" value="jaxws"/>jaxws
-                    <input class="editTableRadio" onclick="if (this.checked){$('text{$.id}webserviceInvokeModeJaxrs').setStyle('display', 'block'); $('text{$.id}webserviceInvokeModeJaxws').setStyle('display', 'none')}" name="invokeMode" text{($.invokeMode=='jaxrs')?'checked':''} type="radio" value="jaxrs"/>jaxrs
+                    <input class="editTableRadio" onclick="if (this.checked){$('text{$.id}webserviceInvokeModeJaxrs').setStyle('display', 'none'); $('text{$.id}webserviceInvokeModeJaxws').setStyle('display', 'block')}" name="invokeMode" text{($.invokeMode=='jaxws')?'checked':''} type="radio" value="jaxws"/>jaxws
+                    <input class="editTableRadio" checked onclick="if (this.checked){$('text{$.id}webserviceInvokeModeJaxrs').setStyle('display', 'block'); $('text{$.id}webserviceInvokeModeJaxws').setStyle('display', 'none')}" name="invokeMode" text{($.invokeMode=='jaxrs')?'checked':''} type="radio" value="jaxrs"/>jaxrs
                 </td>
             </tr>
         </table>

o2web/source/x_component_process_Xform/Form.js

@@ -1571,17 +1571,19 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
             this.toWordSaveList.each(function(editor){
                 if (editor.docToWord) p.push(new Promise(function(resolve){ editor.docToWord(resolve) }));
             });
+            var copyData = Object.clone(data);
             Promise.all(p).then(function(){
                 this.workAction.saveData(function () {
                     this.businessData.originalData = null;
-                    this.businessData.originalData = Object.clone(data);
+                    this.businessData.originalData = copyData;
                     if(callback)callback();
                 }.bind(this), failure, this.businessData.work.id, this.modifedData);
             }.bind(this));
         }else{
+            var copyData = Object.clone(data);
             this.workAction.saveData(function () {
                 this.businessData.originalData = null;
-                this.businessData.originalData = Object.clone(data);
+                this.businessData.originalData = copyData;
                 if(callback)callback();
             }.bind(this), failure, this.businessData.work.id, this.modifedData);
         }
@@ -1598,10 +1600,11 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
             "work": this.businessData.work,
             "identity": this.businessData.work.creatorIdentityDn
         }
+        var copyData = Object.clone(data);
         this.workAction.saveDraft(draft, function (json) {
 
             this.businessData.originalData = null;
-            this.businessData.originalData = Object.clone(data);
+            this.businessData.originalData = copyData;
 
             this.workAction.getDraft(json.data.id, function (json) {
                 this.businessData.work = json.data.work;