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

Author: MyShallowTime

build/webpack.config.base.js

@@ -58,24 +58,13 @@ module.exports = {
 
     //其它解决方案配置
     resolve: {
-        extensions: ['.js', '.json', '.css'],
-        mainFields: ['browser', 'main'],
-        fallback: {
-          fs: false,
-          http: require.resolve('stream-http'),
-          https: require.resolve('https-browserify'),
-          os: require.resolve('os-browserify/browser'),
-          stream: require.resolve('stream-browserify'),
-          tty: require.resolve('tty-browserify'),
-          zlib: require.resolve('browserify-zlib')
-        }
+        extensions: ['.js', '.json', '.css']
     },
 
     externals: {
         echarts: 'function(){try{return echarts}catch(e){return {}}}()',
         mapv: 'function(){try{return mapv}catch(e){return {}}}()',
         '@antv/g6': 'function(){try{return G6}catch(e){return {}}}()',
-        '@elastic/elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',
         '@tensorflow/tfjs': 'function(){try{return tf}catch(e){return {}}}()'
     },
 

build/webpack.config.mapboxgl.js

@@ -30,13 +30,7 @@ module.exports = {
       xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
       canvg: 'function(){try{return canvg}catch(e){return {}}}()',
       jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()'
-    }),
-    function ({context, request}, callback) {
-      if (/xml-js\/lib\/xml2json/.test(request)) {
-        return callback(null, 'function(){try{return xml2json}catch(e){return {}}}()');
-      }
-      callback();
-    }
+    })
   ],
 
   module: {

dist/mapboxgl/include-mapboxgl.js

@@ -132,6 +132,9 @@
     if (inArray(includes, 'convert')) {
       inputScript(libsurl + '/xml-js/1.6.8/xml-js.min.js');
     }
+    if (inArray(includes, 'XMLParser')) {
+      inputScript(libsurl + '/fast-xml-parser/4.2.7/fxparser.min.js');
+    }
     if (inArray(includes, 'LegacyJSONLoader')) {
       inputScript(libsurl + '/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
     }

examples/leaflet/01_layerService.html

@@ -27,7 +27,7 @@
     function layerService() {
         new L.supermap
             .LayerInfoService(url)
-            .getLayersInfo(function (serviceResult) {
+            .getLayersInfo().then((serviceResult) => {
                 var result = serviceResult.result;
                 var innerHTML = "";
                 result.subLayers.layers.map(function (layer) {

examples/leaflet/01_mapQueryByBounds.html

@@ -34,7 +34,7 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryByBounds(param, function (serviceResult) {
+            .queryByBounds(param).then(function (serviceResult) {
                 var result = serviceResult.result;
                 resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });

examples/leaflet/01_mapQueryByDistance.html

@@ -35,7 +35,7 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryByDistance(param, function (serviceResult) {
+            .queryByDistance(param).then(function (serviceResult) {
                 var result = serviceResult.result;
                 resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });

examples/leaflet/01_mapQueryByGeometry.html

@@ -34,7 +34,7 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryByGeometry(param, function (serviceResult) {
+            .queryByGeometry(param).then(function (serviceResult) {
                 var result = serviceResult.result;
                 resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });

examples/leaflet/01_mapQueryByGeometry3857.html

@@ -38,7 +38,7 @@
         widgets.loader.showLoader();
         new L.supermap
             .QueryService(url)
-            .queryByGeometry(param, function (serviceResult) {
+            .queryByGeometry(param).then(function (serviceResult) {
                 //leaflet 绘制数据默认为 4326，服务器返回数据为 3857，因此在加载到地图前，先进行坐标系转换：
                 var result = L.supermap.Util.transform(serviceResult.result.recordsets[0].features, L.CRS.EPSG3857, L.CRS.EPSG4326);
                 widgets.loader.removeLoader();

examples/leaflet/01_mapQueryBySQL.html

@@ -34,9 +34,9 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryBySQL(param, function (serviceResult) {
-                var result = serviceResult.result;
-                resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
+            .queryBySQL(param).then((serviceResult) => {
+              var result = serviceResult.result;
+              resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });
     }
 </script>

examples/leaflet/01_mapQueryBySQL_FGB.html

@@ -34,11 +34,11 @@
           });
           new L.supermap
               .QueryService(url)
-              .queryBySQL(param, function (serviceResult) {
+              .queryBySQL(param, null, 'FGB').then(function (serviceResult) {
                 new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
                   strategy: 'all'
               }).addTo(map);
-      }, 'FGB')};
+      })};
     </script>
   </body>
 </html>