include 增加名称、别名、id的缓存，避免重新加载

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

@@ -874,6 +874,12 @@ MWF.xScript.CMSEnvironment = function(ev){
         scriptAction.getScriptByName( application, name, includedScripts, function(json){
             if (json.data){
                 includedScripts.push( key );
+
+                //名称、别名、id
+                json.data.importedList.each( function ( flag ) {
+                    includedScripts.push( type + "-" + json.applicationName + "-" + flag );
+                });
+
                 includedScripts = includedScripts.concat(json.data.importedList);
                 MWF.CMSMacro.exec(json.data.text, this);
                 if (callback) callback.apply(this);

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

@@ -926,7 +926,13 @@ debugger;
         scriptAction.getScriptByName( application, name, includedScripts, function(json){
             if (json.data){
                 includedScripts.push( key );
+
+                //名称、别名、id
+                json.data.importedList.each( function ( flag ) {
+                    includedScripts.push( type + "-" + json.applicationName + "-" + flag );
+                });
                 includedScripts = includedScripts.concat(json.data.importedList);
+
                 MWF.Macro.exec(json.data.text, this);
                 if (callback) callback.apply(this);
             }else{

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

@@ -811,6 +811,12 @@ MWF.xScript.PageEnvironment = function (ev) {
         scriptAction.getScriptByName( application, name, includedScripts, function(json){
             if (json.data){
                 includedScripts.push( key );
+
+                //名称、别名、id
+                json.data.importedList.each( function ( flag ) {
+                    includedScripts.push( type + "-" + json.applicationName + "-" + flag );
+                });
+
                 includedScripts = includedScripts.concat(json.data.importedList);
                 MWF.Macro.exec(json.data.text, this);
                 if (callback) callback.apply(this);

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

@@ -727,6 +727,12 @@ MWF.xScript.ViewEnvironment = function (ev) {
         scriptAction.getScriptByName(application, name, includedScripts, function (json) {
             if (json.data) {
                 includedScripts.push(key);
+
+                //名称、别名、id
+                json.data.importedList.each( function ( flag ) {
+                    includedScripts.push( type + "-" + json.applicationName + "-" + flag );
+                });
+
                 includedScripts = includedScripts.concat(json.data.importedList);
                 MWF.Macro.exec(json.data.text, this);
                 if (callback) callback.apply(this);