Merge branch 'fix/Process.custom_process' into 'develop'

Merge of feature/[流程管理]新增自定义提交表单模板 to develop

See merge request o2oa/o2oa!559

o2web/source/x_component_process_FormDesigner/Module/Form/template/templates.json

@@ -38,5 +38,15 @@
     "name": "form_file.json",
     "title": "公文表单模板",
     "icon": "form_file.png"
+  },
+  {
+    "name": "form_custom_submit_pc.json",
+    "title": "自定义提交表单模板(PC)",
+    "icon": "form_custom_submit_pc.png"
+  },
+  {
+    "name": "form_custom_submit_mobile.json",
+    "title": "自定义提交表单模板(Mobile)",
+    "icon": "form_custom_submit_mobile.png"
   }
 ]

o2web/source/x_component_process_Xform/Form.js

@@ -1745,7 +1745,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
             }
             var submitFormContainer = new Element("div").inject( layout.mobile ? $(document.body) : this.app.content );
             this.submitFormModule = new MWF["APPSubmitform"]( submitFormContainer , this.json, this);
-            this.submitFormModule.addEvent("load", function () {
+            this.submitFormModule.addEvent("afterModulesLoad", function () {
                 this.submitFormModule.show();
             }.bind(this))
             this.submitFormModule.load();

o2web/source/x_component_process_Xform/Subform.js

@@ -213,6 +213,7 @@ MWF.xApplication.process.Xform.SubmitForm = MWF.APPSubmitform = new Class({
             if( !this.checkSubformUnique( this.subformData.json.id ) ){ //如果提交表单已经嵌入到表单中，那么把这个表单弹出来
                 // this.form.notice(MWF.xApplication.process.Xform.LP.subformUniqueError, "error");
                 this.isEmbedded = true;
+                this.fireEvent("afterModulesLoad");
             }else if( !this.checkSubformNested( this.subformData.json.id ) ){
                 this.form.notice(MWF.xApplication.process.Xform.LP.subformNestedError, "error");
             }else{
@@ -247,6 +248,7 @@ MWF.xApplication.process.Xform.SubmitForm = MWF.APPSubmitform = new Class({
                 }.bind(this));
 
                 this.form.subformLoaded.push( this.subformData.json.id );
+                this.fireEvent("afterModulesLoad");
                 // this.fireSubFormEvent("postLoad");
                 // this.fireSubFormEvent("load");
                 // this.fireSubFormEvent("afterLoad");
@@ -270,7 +272,7 @@ MWF.xApplication.process.Xform.SubmitForm = MWF.APPSubmitform = new Class({
                         formName = data;
                     }else{
                         if( data.application )app = data.application;
-                        if( data.subform )formName = data.subform;
+                        if( data.form )formName = data.form;
                     }
                     if( formName ){
                         if( !app )app = (this.form.businessData.work || this.form.businessData.workCompleted).application;