Merge branch 'fix/Prcoess_copy_no_mobileFormId' into 'wrdp'

Merge of fix/Prcoess_copy_no_mobileFormId 修复内容管理、流程平台、门户管理中拷贝表单的时候移动端表单无ID的问题 to wrdp

See merge request o2oa/o2oa!2271

o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.js

@@ -121,6 +121,10 @@ MWF.xAction.RestActions.Action["x_cms_assemble_control"] = new Class({
                 formData.json.id = id;
 
                 if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+                if ( mobileData && !mobileData.json.id ){
+                    mobileData.json.id = id;
+                }
                 if (mobileData) mobileData = MWF.encodeJsonString(JSON.encode(mobileData));
 
                 var json = {
@@ -137,6 +141,10 @@ MWF.xAction.RestActions.Action["x_cms_assemble_control"] = new Class({
             }.bind(this));
         }else{
             if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+            if ( mobileData && !mobileData.json.id ){
+                mobileData.json.id = formData.json.id;
+            }
             if (mobileData) mobileData = MWF.encodeJsonString(JSON.encode(mobileData));
 
             var json = {

o2web/source/o2_core/o2/xAction/services/x_portal_assemble_designer.js

@@ -97,6 +97,11 @@ MWF.xAction.RestActions.Action["x_portal_assemble_designer"] = new Class({
                 pageData.json.id = id;
 
                 if (pageData) data = MWF.encodeJsonString(JSON.encode(pageData));
+
+
+                if ( mobileData && !mobileData.json.id ){
+                    mobileData.json.id = id;
+                }
                 if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
                 var relatedScriptMap = null;
@@ -143,6 +148,9 @@ MWF.xAction.RestActions.Action["x_portal_assemble_designer"] = new Class({
             }.bind(this));
         }else{
             if (pageData) data = MWF.encodeJsonString(JSON.encode(pageData));
+            if ( mobileData && !mobileData.json.id ){
+                mobileData.json.id = pageData.json.id;
+            }
             if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
             var json = {

o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_designer.js

@@ -258,6 +258,10 @@ MWF.xAction.RestActions.Action["x_processplatform_assemble_designer"] = new Clas
                 //if (mobileData) mobileData.isNewForm = false;
 
                 if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+                if (mobileData && !mobileData.json.id){
+                    mobileData.json.id = id;
+                }
                 if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
                 var relatedScriptMap = null;
@@ -309,6 +313,10 @@ MWF.xAction.RestActions.Action["x_processplatform_assemble_designer"] = new Clas
             //if (formData) formData.isNewForm = false;
             //if (mobileData) mobileData.isNewForm = false;
             if (formData) data = MWF.encodeJsonString(JSON.encode(formData));
+
+            if ( mobileData && !mobileData.json.id ){
+                mobileData.json.id = formData.json.id;
+            }
             if (mobileData) mobileDataStr = MWF.encodeJsonString(JSON.encode(mobileData));
 
             var json = {