Merge branch 'fix/CMS.macro_error' into 'develop'

Merge of fix/修复某些情况下内容管理脚本报错的问题 to develop

See merge request o2oa/o2oa!727

o2web/source/o2_core/o2/xScript/CMSEnvironment.js

@@ -875,7 +875,7 @@ MWF.xScript.CMSEnvironment = function(ev){
             if (json.data){
                 includedScripts.push( key );
                 includedScripts = includedScripts.concat(json.data.importedList);
-                MWF.Macro.exec(json.data.text, this);
+                MWF.CMSMacro.exec(json.data.text, this);
                 if (callback) callback.apply(this);
             }else{
                 if (callback) callback.apply(this);
@@ -891,7 +891,7 @@ MWF.xScript.CMSEnvironment = function(ev){
     //        }
     //        this.scriptAction.getScriptByName(_form.json.application, name, includedScripts, function(json){
     //            includedScripts = includedScripts.concat(json.data.importedList);
-    //            MWF.Macro.exec(json.data.text, this);
+    //            MWF.CMSMacro.exec(json.data.text, this);
     //            if (callback) callback.apply(this);
     //        }.bind(this), null, false);
     //    }else{

o2web/source/o2_core/o2/xScript/CMSMacro.js

@@ -81,8 +81,8 @@ MWF.CMSMacro.CMSFormContext = new Class({
 
 });
 
-if( !MWF.Macro.ViewContext ){
-    MWF.Macro.ViewContext = new Class({
+if( !MWF.CMSMacro.ViewContext ){
+    MWF.CMSMacro.ViewContext = new Class({
         macroFunction: null,
         environment: {},
         initialize: function(view){
@@ -112,7 +112,7 @@ if( !MWF.Macro.ViewContext ){
         },
         exec: function(code, target){
             this.setTarget(target);
-            var returnValue = MWF.Macro.exec(code, this.environment);
+            var returnValue = MWF.CMSMacro.exec(code, this.environment);
             //this.form.businessData.data = Object.merge(this.form.businessData.data, this.environment.data);
 
             return returnValue;
@@ -122,7 +122,7 @@ if( !MWF.Macro.ViewContext ){
         fire: function(code, target, event){
             this.setTarget(target);
             this.setEvent(event);
-            return MWF.Macro.exec(code, this.environment);
+            return MWF.CMSMacro.exec(code, this.environment);
         }
     });
 }

o2web/source/x_component_cms_Xform/Package.js

@@ -85,6 +85,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage =  new Class({
 //MWF.xDesktop.requireApp("cms.Xform", "Table", null, false);
 //MWF.xDesktop.requireApp("cms.Xform", "Datagrid", null, false);
 
+MWF.xDesktop.requireApp("cms.Xform", "Html", null, false);
 MWF.xApplication.cms.Xform.Html = MWF.CMSHtml =  new Class({
 	Extends: MWF.APPHtml
 });

o2web/source/x_component_process_Xform/Htmleditor.js

@@ -377,7 +377,7 @@ MWF.xApplication.process.Xform.Htmleditor = MWF.APPHtmleditor =  new Class({
     },
     getData: function(){
         this.clearEcnetNodes();
-        return this.editor.getData();
+        return this.editor ? this.editor.getData() : "";
     },
     setData: function(data){
         this._setBusinessData(data);