Merge branch 'fix/amd_define' into 'develop'

修复ADM载入模式和系统载入冲突的问题

See merge request o2oa/o2oa!569

o2web/source/o2_core/o2.js

@@ -431,7 +431,13 @@
     var _load = function(urls, options, callback){
         var ms = (_typeOf(urls)==="array") ? urls : [urls];
         var op =  (_typeOf(options)==="object") ? _getJsOptions(options) : _getJsOptions(null);
-        var cb = (_typeOf(options)==="function") ? options : callback;
+        var cbk = (_typeOf(options)==="function") ? options : callback;
+
+        var cb = cbk;
+        if (typeof define === 'function' && define.amd){
+            define.amd = false;
+            cb = (cbk) ? function(){define.amd = true; cbk();} : function(){define.amd = true;}
+        }
 
         var modules = [];
         for (var i=0; i<ms.length; i++){

o2web/source/o2_core/o2/widget/monaco.js

@@ -13,7 +13,7 @@ o2.widget.monaco = {
                         while (this.callbackList.length){
                             this.callbackList.shift()();
                         }
-                        define.amd = false;
+                        //define.amd = false;
                         //if (callback) callback();
                     }.bind(this));
                 }.bind(this));

o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -25,7 +25,7 @@ MWF.xDesktop.Actions.RestActions = new Class({
 //		MWF.getJSON(url, callback);
 		
 		//this.address = "http://xa02.zoneland.net:8080/"+this.serviceName;
-        debugger;
+
         var addressObj = layout.serviceAddressList[this.serviceName];
         if (addressObj){
             //var mapping = layout.getAppUrlMapping(layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context);