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

Author: ChenPeng181007

package.json

@@ -116,7 +116,7 @@
     "echarts": "4.5.0",
     "elasticsearch": "16.5.0",
     "fetch-ie8": "1.5.0",
-    "fetch-jsonp": "1.0.6",
+    "fetch-jsonp": "1.1.3",
     "jsonsql": "0.2.5",
     "leaflet": "1.5.1",
     "lodash.remove": "^4.7.0",
@@ -126,9 +126,9 @@
     "ol": "6.1.1",
     "pbf": "3.0.2",
     "proj4": "2.5.0",
-    "promise-polyfill": "6.0.2",
+    "promise-polyfill": "8.1.3",
     "three": "0.92.0",
-    "xlsx": "0.15.1",
+    "xlsx": "0.15.3",
     "xml-js": "1.6.11"
   },
   "pre-commit": [

src/classic/package.json

@@ -14,7 +14,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "mapv": "2.0.38",
-    "xlsx": "0.15.1",
+    "xlsx": "0.15.3",
     "@supermap/iclient-common": "10.0.0"
   }
 }

src/common/package.json

@@ -15,8 +15,8 @@
   "dependencies": {
     "elasticsearch": "16.5.0",
     "fetch-ie8": "1.5.0",
-    "fetch-jsonp": "1.0.6",
-    "promise-polyfill": "6.0.2",
+    "fetch-jsonp": "1.1.3",
+    "promise-polyfill": "8.1.3",
     "lodash.topairs": "4.3.0"
   }
 }

src/common/util/FetchRequest.js

@@ -1,8 +1,8 @@
 /* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-import "./PromisePolyfill"
-import 'fetch-ie8'
+import 'promise-polyfill/dist/polyfill';
+import 'fetch-ie8';
 import fetchJsonp from 'fetch-jsonp';
 import {
     SuperMap
@@ -427,4 +427,4 @@ SuperMap.Util.RequestJSONPPromise = {
         });
         return me.issue(config);
     }
-};
+};

src/common/util/PromisePolyfill.js

@@ -23,6 +23,6 @@
     "jsonsql": "0.2.5",
     "pbf": "3.0.2",
     "proj4": "2.5.0",
-    "xlsx": "0.15.1"
+    "xlsx": "0.15.3"
   }
 }

src/leaflet/package.json

@@ -18,7 +18,7 @@
     "mapv": "2.0.38",
     "mapbox-gl": "1.3.1",
     "three": "0.92.0",
-    "xlsx": "0.15.1",
+    "xlsx": "0.15.3",
     "@supermap/iclient-common": "10.0.0",
     "canvg": "1.5.3",
     "xml-js": "1.6.8"

src/mapboxgl/package.json

@@ -20,7 +20,7 @@
     "ol": "6.1.1",
     "@supermap/iclient-common": "10.0.0",
     "proj4": "2.5.0",
-    "xlsx": "0.15.1",
+    "xlsx": "0.15.3",
     "canvg": "1.5.3",
     "lodash.remove": "^4.7.0"
   }

src/openlayers/package.json

@@ -25,7 +25,7 @@ module.exports = function (config) {
                 [require('babelify'), {
                     global: true,
                     presets: ["@babel/preset-env"],
-                    ignore: ["../src/classic/libs/**", "../test/libs/**", /\/node_modules\/(?!ol\/)/],
+                    ignore: ["../src/classic/libs/**", "../test/libs/**", "../node_modules/mapbox-gl/**","../node_modules/three/**","../node_modules/xlsx/**","../node_modules/@turf/**","../node_modules/lodash/**"],
                     plugins: ['istanbul']
                 }],
                 [require('browserify-css'), { global: true }],