Merge branch 'fix/cache_script' into 'develop'

Merge of fix/cache_script to develop 修复缓存资源的正则表达式判断的bug

See merge request o2oa/o2oa!1385

o2web/source/o2_core/o2.js

@@ -1258,6 +1258,7 @@
         //if (Browser.name == "ie")
         if (_cacheUrls.length){
             for (var i=0; i<_cacheUrls.length; i++){
+                _cacheUrls[i].lastIndex = 0;
                 if (_cacheUrls[i].test(address)){
                     noCache = false;
                     break;

o2web/source/o2_core/o2/o2.core.js

@@ -291,7 +291,7 @@
     //    /jaxrs\/script/ig,
         /jaxrs\/script\/.+\/app\/.+\/imported/ig,
         /jaxrs\/script\/portal\/.+\/name\/.+\/imported/ig,
-        /jaxrs\/script\/[\S\s]+\/application\/[\S\s]+\/imported/,
+        /jaxrs\/script\/[\S\s]+\/application\/[\S\s]+\/imported/ig,
         /jaxrs\/page\/.+\/portal\/.+/ig
         // /jaxrs\/authentication/ig
         // /jaxrs\/statement\/.*\/execute\/page\/.*\/size\/.*/ig
@@ -307,6 +307,7 @@
         //if (Browser.name == "ie")
         if (_cacheUrls.length){
             for (var i=0; i<_cacheUrls.length; i++){
+                _cacheUrls[i].lastIndex = 0;
                 if (_cacheUrls[i].test(address)){
                     noCache = false;
                     break;