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

liqian7 · liqian7 · commit d51d48264c51 · 2019-08-23T13:11:31.000+08:00
diff --git a/build/server.js b/build/server.js
@@ -32,11 +32,11 @@ if (product) {
   });
   app.use(instance);
   instance.waitUntilValid(() => {
-    open(`http://localhost:9999/examples/${product}`);
+    open(`http://localhost:8082/examples/${product}`);
   });
 }
 
-const server = app.listen(9999, () => {
+const server = app.listen(8082, () => {
   const host = server.address().address;
   const port = server.address().port;
   console.log('Example app listening at http://%s:%s', host, port);
@@ -58,5 +58,5 @@ app.use("/en/dist", express.static('dist'), serveIndex('dist'));
 app.use("/en/build", express.static('build'), serveIndex('build'));
 app.use("/en", express.static('web/en'), serveIndex('web/en'));
 if (!product) {
-  open(`http://localhost:9999`);
+  open(`http://localhost:8082`);
 }
diff --git a/dist/mapboxgl/include-mapboxgl.js b/dist/mapboxgl/include-mapboxgl.js
@@ -50,12 +50,12 @@
         var includes = (targetScript.getAttribute('include') || "").split(",");
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
         if (!inArray(includes, 'mapbox-gl-enhance') && !inArray(excludes, 'mapbox-gl')) {
-            inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/0.48.0/mapbox-gl.css");
-            inputScript("http://iclient.supermap.io/web/libs/mapbox-gl-js/0.48.0/mapbox-gl.js");
+            inputCSS("https://cdn.bootcss.com/mapbox-gl/1.2.0/mapbox-gl.css");
+            inputScript("https://cdn.bootcss.com/mapbox-gl/1.2.0/mapbox-gl.js");
         }
         if (inArray(includes, 'mapbox-gl-enhance')) {
-            inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/0.48.0/mapbox-gl.css");
-            inputScript("http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js");
+            inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.2.0/mapbox-gl-enhance.css");
+            inputScript("http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.2.0/mapbox-gl-enhance.js");
         }
         if (inArray(includes, 'draw')) {
             inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.0.9/mapbox-gl-draw.css");
diff --git a/package.json b/package.json
@@ -122,7 +122,7 @@
     "leaflet": "1.3.1",
     "lodash.remove": "^4.7.0",
     "lodash.topairs": "4.3.0",
-    "mapbox-gl": "0.45.0",
+    "mapbox-gl": "1.2.0",
     "mapv": "2.0.20",
     "openlayers": "4.6.5",
     "pbf": "3.0.2",
diff --git a/src/mapboxgl/package.json b/src/mapboxgl/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "echarts": "4.1.0",
     "mapv": "2.0.20",
-    "mapbox-gl": "0.45.0",
+    "mapbox-gl": "1.2.0",
     "three": "0.92.0",
     "xlsx": "0.12.13",
     "@supermap/iclient-common": "10.0.0-beta",
