修复内容管理表单保存后事件丢失的问题

o2web/source/x_component_cms_FormDesigner/Main.js

@@ -1268,13 +1268,27 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({
     loadFormData: function(callback){
         this.actions.getForm(this.options.id, function(form){
             if (form){
+			    var formTemplete = null;
+                MWF.getJSON("../x_component_cms_FormDesigner/Module/Form/template/form.json", {
+                    "onSuccess": function(obj){ formTemplete = obj; }.bind(this)
+                }, false);
 
                 this.formData = JSON.decode(MWF.decodeJsonString(form.data.data));
+                if (formTemplete.pcData){
+				    Object.merge(formTemplete.pcData, this.formData);
+                    Object.merge(this.formData, formTemplete.pcData);
+                }
                 this.formData.isNewForm = false;
                 this.formData.json.id = form.data.id;
 
                 if (form.data.mobileData){
                     this.formMobileData = JSON.decode(MWF.decodeJsonString(form.data.mobileData));
+
+                    if (formTemplete.mobileData){
+                        Object.merge(formTemplete.mobileData, this.formMobileData);
+                        Object.merge(this.formMobileData, formTemplete.mobileData);
+                    }
+
                     this.formMobileData.isNewForm = false;
                     this.formMobileData.json.id = form.data.id;
                 }else{

o2web/source/x_component_cms_FormDesigner/Module/Form/template/form.json

@@ -168,7 +168,23 @@
       },
 
       "events": {
-        "help": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "postLoad": {
           "code": "",
           "html": ""
         },
@@ -176,6 +192,42 @@
           "code": "",
           "html": ""
         },
+        "afterLoad": {
+          "code": "",
+          "html": ""
+        },
+        "beforeSave": {
+          "code": "",
+          "html": ""
+        },
+        "afterSave": {
+          "code": "",
+          "html": ""
+        },
+        "beforeClose": {
+          "code": "",
+          "html": ""
+        },
+        "beforePublish": {
+          "code": "",
+          "html": ""
+        },
+        "afterPublish": {
+          "code": "",
+          "html": ""
+        },
+        "beforeDelete":{
+          "code": "",
+          "html": ""
+        },
+        "afterDelete":{
+          "code": "",
+          "html": ""
+        },
+        "help": {
+          "code": "",
+          "html": ""
+        },
         "unload": {
           "code": "",
           "html": ""

o2web/source/x_component_query_Query/Statement.js

@@ -785,7 +785,7 @@ MWF.xApplication.query.Query.Statement.Item = new Class({
             if (!this.view.Macro) {
                 MWF.require("MWF.xScript.Macro", function () {
                     this.view.businessData = {};
-                    this.view.Macro = new MWF.Macro.PageContext(this.view);
+                    this.view.Macro = new MWF.Macro.ViewContext(this.view);
                 }.bind(this), false);
             }
             td.addEvent("click", function (ev) {