diff --git a/o2web/source/o2_core/o2/xScript/CMSEnvironment.js b/o2web/source/o2_core/o2/xScript/CMSEnvironment.js index 3fa5118ae0639bce8c3cf41b05dee0af2d81851d..8189a9e9dfbe23d95d35af63afbde707aea5c538 100644 --- a/o2web/source/o2_core/o2/xScript/CMSEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/CMSEnvironment.js @@ -877,7 +877,19 @@ MWF.xScript.CMSEnvironment = function(ev){ //名称、别名、id json.data.importedList.each( function ( flag ) { - includedScripts.push( type + "-" + json.applicationName + "-" + flag ); + if( type === "portal" ){ + includedScripts.push( type + "-" + json.data.portal + "-" + flag ); + if( json.data.portalName )includedScripts.push( type + "-" + json.data.portalName + "-" + flag ); + if( json.data.portalAlias )includedScripts.push( type + "-" + json.data.portalAlias + "-" + flag ); + }else if( type === "cms" ){ + includedScripts.push( type + "-" + json.data.appId + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + }else if( type === "process" ){ + includedScripts.push( type + "-" + json.data.application + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + } }); includedScripts = includedScripts.concat(json.data.importedList); diff --git a/o2web/source/o2_core/o2/xScript/Environment.js b/o2web/source/o2_core/o2/xScript/Environment.js index dac647d36d2a2de84fc2c46973e1fc79856aa3a7..e547411eea58e892b653500fc317c5108fa1e980 100644 --- a/o2web/source/o2_core/o2/xScript/Environment.js +++ b/o2web/source/o2_core/o2/xScript/Environment.js @@ -929,7 +929,19 @@ debugger; //名称、别名、id json.data.importedList.each( function ( flag ) { - includedScripts.push( type + "-" + json.applicationName + "-" + flag ); + if( type === "portal" ){ + includedScripts.push( type + "-" + json.data.portal + "-" + flag ); + if( json.data.portalName )includedScripts.push( type + "-" + json.data.portalName + "-" + flag ); + if( json.data.portalAlias )includedScripts.push( type + "-" + json.data.portalAlias + "-" + flag ); + }else if( type === "cms" ){ + includedScripts.push( type + "-" + json.data.appId + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + }else if( type === "process" ){ + includedScripts.push( type + "-" + json.data.application + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + } }); includedScripts = includedScripts.concat(json.data.importedList); diff --git a/o2web/source/o2_core/o2/xScript/PageEnvironment.js b/o2web/source/o2_core/o2/xScript/PageEnvironment.js index b813c02c5abeff9581bd7173fbff4ec0c95dce3e..d40b6d3d7990bfd368e2d13fa425316e49752cea 100644 --- a/o2web/source/o2_core/o2/xScript/PageEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/PageEnvironment.js @@ -814,7 +814,19 @@ MWF.xScript.PageEnvironment = function (ev) { //名称、别名、id json.data.importedList.each( function ( flag ) { - includedScripts.push( type + "-" + json.applicationName + "-" + flag ); + if( type === "portal" ){ + includedScripts.push( type + "-" + json.data.portal + "-" + flag ); + if( json.data.portalName )includedScripts.push( type + "-" + json.data.portalName + "-" + flag ); + if( json.data.portalAlias )includedScripts.push( type + "-" + json.data.portalAlias + "-" + flag ); + }else if( type === "cms" ){ + includedScripts.push( type + "-" + json.data.appId + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + }else if( type === "process" ){ + includedScripts.push( type + "-" + json.data.application + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + } }); includedScripts = includedScripts.concat(json.data.importedList); diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js index d37297673e6662e073681e288067f5fbb65cfe59..c6f3010a709d59ce539c75e84a44c77e51055ea8 100644 --- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js @@ -730,7 +730,19 @@ MWF.xScript.ViewEnvironment = function (ev) { //名称、别名、id json.data.importedList.each( function ( flag ) { - includedScripts.push( type + "-" + json.applicationName + "-" + flag ); + if( type === "portal" ){ + includedScripts.push( type + "-" + json.data.portal + "-" + flag ); + if( json.data.portalName )includedScripts.push( type + "-" + json.data.portalName + "-" + flag ); + if( json.data.portalAlias )includedScripts.push( type + "-" + json.data.portalAlias + "-" + flag ); + }else if( type === "cms" ){ + includedScripts.push( type + "-" + json.data.appId + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + }else if( type === "process" ){ + includedScripts.push( type + "-" + json.data.application + "-" + flag ); + if( json.data.appName )includedScripts.push( type + "-" + json.data.appName + "-" + flag ); + if( json.data.appAlias )includedScripts.push( type + "-" + json.data.appAlias + "-" + flag ); + } }); includedScripts = includedScripts.concat(json.data.importedList);