Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: user name

dist/ol/include-ol.js

@@ -53,7 +53,7 @@
         var includes = (targetScript.getAttribute('include') || '').split(',');
         var excludes = (targetScript.getAttribute('exclude') || '').split(',');
         // 在线
-        if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
+        if (!inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5') && !inArray(excludes, 'ol')) {
             inputCSS(`${libsurl}/openlayers/6.14.1/ol.css`);
             inputScript(`${libsurl}/openlayers/6.14.1/ol.js`);
         }

dist/openlayers/include-openlayers.js

@@ -53,8 +53,8 @@
         var includes = (targetScript.getAttribute('include') || '').split(',');
         var excludes = (targetScript.getAttribute('exclude') || '').split(',');
         // 在线
-        if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
-          inputCSS(`${libsurl}/openlayers/6.14.1/ol.css`);
+        if (!inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5') && !inArray(excludes, 'ol')) {
+            inputCSS(`${libsurl}/openlayers/6.14.1/ol.css`);
             inputScript(`${libsurl}/openlayers/6.14.1/ol.js`);
         }
         if (inArray(includes, 'ol@4.6.5')) {

test/karma.conf.js

@@ -95,7 +95,7 @@ module.exports = function (config) {
       { pattern: '../node_modules/maplibre-gl/dist/maplibre-gl.css', included: false },
       '../src/maplibregl/**/!(index).js',
       /**测试文件**/
-      './test-main-maplibregl.js'
+      // './test-main-maplibregl.js'
     ],
 
     // list of files to exclude 测试时排除的文件