diff --git a/o2web/source/o2_core/o2/xScript/CMSEnvironment.js b/o2web/source/o2_core/o2/xScript/CMSEnvironment.js index 7a958cb0b913d384f5b597606ca3d2a944bae6d7..3fa5118ae0639bce8c3cf41b05dee0af2d81851d 100644 --- a/o2web/source/o2_core/o2/xScript/CMSEnvironment.js +++ b/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); diff --git a/o2web/source/o2_core/o2/xScript/Environment.js b/o2web/source/o2_core/o2/xScript/Environment.js index 48412f95ec4ca201ad4dfebcbe7469293c311ffb..dac647d36d2a2de84fc2c46973e1fc79856aa3a7 100644 --- a/o2web/source/o2_core/o2/xScript/Environment.js +++ b/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{ diff --git a/o2web/source/o2_core/o2/xScript/PageEnvironment.js b/o2web/source/o2_core/o2/xScript/PageEnvironment.js index 04e0457d2fb981ffc96ad6fdc8fa178d548acdfd..b813c02c5abeff9581bd7173fbff4ec0c95dce3e 100644 --- a/o2web/source/o2_core/o2/xScript/PageEnvironment.js +++ b/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); diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js index 6e638b76aa195acaae20652ed16baaf5167da77c..d37297673e6662e073681e288067f5fbb65cfe59 100644 --- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js +++ b/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);