[fix]leaflet和mapboxgl的三方库升级 review by qiw

luoxiao-supermap · luoxiao-supermap · commit 9a64e7be5c36 · 2023-03-23T09:34:02.000+08:00
diff --git a/dist/leaflet/include-leaflet.js b/dist/leaflet/include-leaflet.js
@@ -102,7 +102,7 @@
             inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js');
         }
         if (inArray(includes, 'd3')) {
-            inputScript('https://iclient.supermap.io/web/libs/d3/7.4.4/d3.min.js');
+            inputScript('https://iclient.supermap.io/web/libs/d3/7.8.2/d3.min.js');
         }
         if (inArray(includes, 'd3-hexbin')) {
             inputScript('https://iclient.supermap.io/web/libs/d3/d3-hexbin.v0.2.min.js');
diff --git a/dist/mapboxgl/include-mapboxgl.js b/dist/mapboxgl/include-mapboxgl.js
@@ -64,8 +64,8 @@
       inputScript('https://iclient.supermap.io/web/libs/turf/6.5.0/turf.min.js');
     }
     if (inArray(includes, 'draw')) {
-      inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.3.0/mapbox-gl-draw.css');
-      inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.3.0/mapbox-gl-draw.js');
+      inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css');
+      inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js');
     }
 
     if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {
@@ -96,7 +96,7 @@
       inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
     }
     if (inArray(includes, 'three')) {
-      inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/build/three.min.js');
+      inputScript('https://iclient.supermap.io/web/libs/three/0.150.1/build/three.min.js');
     }
     if (inArray(includes, 'three@0.121.1')) {
       inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/build/three.js');
@@ -105,7 +105,7 @@
       inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.5/xlsx.core.min.js');
     }
     if (inArray(includes, 'proj4')) {
-      inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');
+      inputScript('https://iclient.supermap.io/web/libs/proj4/2.9.0/proj4.min.js');
     }
     if (inArray(includes, 'shapefile')) {
       inputScript('https://iclient.supermap.io/web/libs/shapefile/shapefile.js');
@@ -116,7 +116,7 @@
     }
     if (inArray(includes, 'antd')) {
       inputCSS('https://iclient.supermap.io/web/libs/antd/3.25.3/antd.min.css');
-      inputScript('https://iclient.supermap.io/web/libs/moment/2.29.3/moment.min.js');
+      inputScript('https://iclient.supermap.io/web/libs/moment/2.29.4/moment.min.js');
       inputScript('https://iclient.supermap.io/web/libs/antd/3.25.3/antd.min.js');
     }
     if (inArray(includes, 'deck')) {
@@ -168,7 +168,7 @@
       inputScript('https://iclient.supermap.io/web/libs/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
     }
     if (inArray(includes, 'moment')) {
-      inputScript('https://iclient.supermap.io/web/libs/moment/2.29.3/moment.min.js');
+      inputScript('https://iclient.supermap.io/web/libs/moment/2.29.4/moment.min.js');
     }
     if (inArray(includes, 'lodash')) {
       inputScript('https://iclient.supermap.io/web/libs/lodash/4.17.21/lodash.min.js');
diff --git a/dist/ol/include-ol.js b/dist/ol/include-ol.js
@@ -75,7 +75,7 @@
             inputScript('https://iclient.supermap.io/web/libs/echarts/4.9.0/echarts.min.js');
         }
         if (inArray(includes, 'proj4')) {
-            inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');
+          inputScript('https://iclient.supermap.io/web/libs/proj4/2.9.0/proj4.min.js');
         }
         if (inArray(includes, 'ol3-echarts')) {
             inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
diff --git a/dist/openlayers/include-openlayers.js b/dist/openlayers/include-openlayers.js
@@ -75,7 +75,7 @@
             inputScript('https://iclient.supermap.io/web/libs/echarts/4.9.0/echarts.min.js');
         }
         if (inArray(includes, 'proj4')) {
-            inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');
+            inputScript('https://iclient.supermap.io/web/libs/proj4/2.9.0/proj4.min.js');
         }
         if (inArray(includes, 'ol3-echarts')) {
             inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
diff --git a/examples/js/include-web.js b/examples/js/include-web.js
@@ -81,8 +81,8 @@
             inputScript("https://iclient.supermap.io/web/libs/papaparse/papaparse.min.js");
         }
         if (inArray(includes, 'moment')) {
-          inputScript("https://iclient.supermap.io/web/libs/moment/2.29.3/moment.min.js");
-          inputScript("https://iclient.supermap.io/web/libs/moment/2.29.3/zh-cn.js");
+          inputScript("https://iclient.supermap.io/web/libs/moment/2.29.4/moment.min.js");
+          inputScript("https://iclient.supermap.io/web/libs/moment/2.29.4/zh-cn.min.js");
         }
         if (inArray(includes, 'bootstrap-datetimepicker')) {
             inputCSS("https://iclient.supermap.io/web/libs/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css");
diff --git a/package.json b/package.json
@@ -140,10 +140,10 @@
     "mapv": "2.0.62",
     "ol": "6.14.1",
     "pbf": "3.2.1",
-    "proj4": "2.8.0",
+    "proj4": "2.9.0",
     "promise-polyfill": "8.2.3",
     "rbush": "^2.0.2",
-    "three": "0.129.0",
+    "three": "0.150.1",
     "util": "^0.12.4",
     "xlsx": "0.18.5",
     "xml-js": "1.6.11"
diff --git a/src/leaflet/package.json b/src/leaflet/package.json
@@ -23,7 +23,7 @@
     "@mapbox/vector-tile": "1.3.1",
     "jsonsql": "0.2.5",
     "pbf": "3.2.1",
-    "proj4": "2.8.0",
+    "proj4": "2.9.0",
     "flatgeobuf": "3.24.1"
   }
 }
diff --git a/src/mapboxgl/package.json b/src/mapboxgl/package.json
@@ -18,7 +18,7 @@
     "echarts": "4.9.0",
     "mapv": "2.0.62",
     "mapbox-gl": "1.13.2",
-    "three": "0.129.0",
+    "three": "0.150.1",
     "@supermap/iclient-common": "11.1.0-dev",
     "canvg": "3.0.10",
     "xml-js": "1.6.11",
diff --git a/src/openlayers/package.json b/src/openlayers/package.json
@@ -20,7 +20,7 @@
     "mapv": "2.0.62",
     "ol": "6.14.1",
     "@supermap/iclient-common": "11.1.0-dev",
-    "proj4": "2.8.0",
+    "proj4": "2.9.0",
     "canvg": "3.0.10",
     "lodash.remove": "^4.7.0",
     "lodash.difference": "^4.5.0",

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@`
`102`	`102`	`inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js');`
`103`	`103`	`}`
`104`	`104`	`if (inArray(includes, 'd3')) {`
`105`		`- inputScript('https://iclient.supermap.io/web/libs/d3/7.4.4/d3.min.js');`
	`105`	`+ inputScript('https://iclient.supermap.io/web/libs/d3/7.8.2/d3.min.js');`
`106`	`106`	`}`
`107`	`107`	`if (inArray(includes, 'd3-hexbin')) {`
`108`	`108`	`inputScript('https://iclient.supermap.io/web/libs/d3/d3-hexbin.v0.2.min.js');`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@`
`64`	`64`	`inputScript('https://iclient.supermap.io/web/libs/turf/6.5.0/turf.min.js');`
`65`	`65`	`}`
`66`	`66`	`if (inArray(includes, 'draw')) {`
`67`		`- inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.3.0/mapbox-gl-draw.css');`
`68`		`- inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.3.0/mapbox-gl-draw.js');`
	`67`	`+ inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css');`
	`68`	`+ inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js');`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {`
`@@ -96,7 +96,7 @@`
`96`	`96`	`inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');`
`97`	`97`	`}`
`98`	`98`	`if (inArray(includes, 'three')) {`
`99`		`- inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/build/three.min.js');`
	`99`	`+ inputScript('https://iclient.supermap.io/web/libs/three/0.150.1/build/three.min.js');`
`100`	`100`	`}`
`101`	`101`	`if (inArray(includes, 'three@0.121.1')) {`
`102`	`102`	`inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/build/three.js');`
`@@ -105,7 +105,7 @@`
`105`	`105`	`inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.5/xlsx.core.min.js');`
`106`	`106`	`}`
`107`	`107`	`if (inArray(includes, 'proj4')) {`
`108`		`- inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');`
	`108`	`+ inputScript('https://iclient.supermap.io/web/libs/proj4/2.9.0/proj4.min.js');`
`109`	`109`	`}`
`110`	`110`	`if (inArray(includes, 'shapefile')) {`
`111`	`111`	`inputScript('https://iclient.supermap.io/web/libs/shapefile/shapefile.js');`
`@@ -116,7 +116,7 @@`
`116`	`116`	`}`
`117`	`117`	`if (inArray(includes, 'antd')) {`
`118`	`118`	`inputCSS('https://iclient.supermap.io/web/libs/antd/3.25.3/antd.min.css');`
`119`		`- inputScript('https://iclient.supermap.io/web/libs/moment/2.29.3/moment.min.js');`
	`119`	`+ inputScript('https://iclient.supermap.io/web/libs/moment/2.29.4/moment.min.js');`
`120`	`120`	`inputScript('https://iclient.supermap.io/web/libs/antd/3.25.3/antd.min.js');`
`121`	`121`	`}`
`122`	`122`	`if (inArray(includes, 'deck')) {`
`@@ -168,7 +168,7 @@`
`168`	`168`	`inputScript('https://iclient.supermap.io/web/libs/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');`
`169`	`169`	`}`
`170`	`170`	`if (inArray(includes, 'moment')) {`
`171`		`- inputScript('https://iclient.supermap.io/web/libs/moment/2.29.3/moment.min.js');`
	`171`	`+ inputScript('https://iclient.supermap.io/web/libs/moment/2.29.4/moment.min.js');`
`172`	`172`	`}`
`173`	`173`	`if (inArray(includes, 'lodash')) {`
`174`	`174`	`inputScript('https://iclient.supermap.io/web/libs/lodash/4.17.21/lodash.min.js');`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`inputScript('https://iclient.supermap.io/web/libs/echarts/4.9.0/echarts.min.js');`
`76`	`76`	`}`
`77`	`77`	`if (inArray(includes, 'proj4')) {`
`78`		`- inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');`
	`78`	`+ inputScript('https://iclient.supermap.io/web/libs/proj4/2.9.0/proj4.min.js');`
`79`	`79`	`}`
`80`	`80`	`if (inArray(includes, 'ol3-echarts')) {`
`81`	`81`	`inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@`
`81`	`81`	`inputScript("https://iclient.supermap.io/web/libs/papaparse/papaparse.min.js");`
`82`	`82`	`}`
`83`	`83`	`if (inArray(includes, 'moment')) {`
`84`		`- inputScript("https://iclient.supermap.io/web/libs/moment/2.29.3/moment.min.js");`
`85`		`- inputScript("https://iclient.supermap.io/web/libs/moment/2.29.3/zh-cn.js");`
	`84`	`+ inputScript("https://iclient.supermap.io/web/libs/moment/2.29.4/moment.min.js");`
	`85`	`+ inputScript("https://iclient.supermap.io/web/libs/moment/2.29.4/zh-cn.min.js");`
`86`	`86`	`}`
`87`	`87`	`if (inArray(includes, 'bootstrap-datetimepicker')) {`
`88`	`88`	`inputCSS("https://iclient.supermap.io/web/libs/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css");`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"@mapbox/vector-tile": "1.3.1",`
`24`	`24`	`"jsonsql": "0.2.5",`
`25`	`25`	`"pbf": "3.2.1",`
`26`		`- "proj4": "2.8.0",`
	`26`	`+ "proj4": "2.9.0",`
`27`	`27`	`"flatgeobuf": "3.24.1"`
`28`	`28`	`}`
`29`	`29`	`}`