Skip to content

Commit ea8c05d

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【update】 升级 xlsx, d3, ol3-echarts, proj4; review by luox
1 parent baf207a commit ea8c05d

File tree

18 files changed

+59
-56
lines changed

18 files changed

+59
-56
lines changed

‎dist/leaflet/include-leaflet.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5555
// 在线
5656
if (!inArray(excludes, 'leaflet')) {
57-
inputCSS('https://iclient.supermap.io/web/libs/leaflet/1.7.1/leaflet.css');
58-
inputScript('https://iclient.supermap.io/web/libs/leaflet/1.7.1/leaflet.js');
57+
inputCSS('https://iclient.supermap.io/web/libs/leaflet/1.7.1/leaflet.css');
58+
inputScript('https://iclient.supermap.io/web/libs/leaflet/1.7.1/leaflet.js');
5959
}
6060
if (inArray(includes, 'mapbox-gl-enhance')) {
6161
inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.css');
@@ -74,8 +74,8 @@
7474
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet.draw/1.0.4/leaflet.draw.js');
7575
}
7676
if (inArray(includes, 'leaflet-geoman')) {
77-
inputCSS('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-geoman/2.11.3/leaflet-geoman.css');
78-
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-geoman/2.11.3/leaflet-geoman.min.js');
77+
inputCSS('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-geoman/2.11.3/leaflet-geoman.css');
78+
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-geoman/2.11.3/leaflet-geoman.min.js');
7979

8080
}
8181
if (inArray(includes, 'leaflet.miniMap')) {
@@ -95,14 +95,14 @@
9595
inputScript('https://iclient.supermap.io/web/libs/elasticsearch/16.7.1/elasticsearch.min.js');
9696
}
9797
if (inArray(includes, 'xlsx')) {
98-
inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.0/xlsx.core.min.js');
98+
inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.5/xlsx.core.min.js');
9999
}
100100
// 本地
101101
if (inArray(includes, 'leaflet.sidebyside')) {
102102
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js');
103103
}
104104
if (inArray(includes, 'd3')) {
105-
inputScript('https://iclient.supermap.io/web/libs/d3/7.0.3/d3.min.js');
105+
inputScript('https://iclient.supermap.io/web/libs/d3/7.4.4/d3.min.js');
106106
}
107107
if (inArray(includes, 'd3-hexbin')) {
108108
inputScript('https://iclient.supermap.io/web/libs/d3/d3-hexbin.v0.2.min.js');
@@ -166,7 +166,7 @@
166166
if (inArray(includes, 'leaflet-mapbox-gl')) {
167167
inputScript('https://iclient.supermap.io/web/libs/leaflet-mapbox-gl/0.0.15/leaflet-mapbox-gl.min.js');
168168
}
169-
169+
170170
}
171171

172172
load();

‎dist/mapboxgl/include-mapboxgl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@
102102
inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/build/three.js');
103103
}
104104
if (inArray(includes, 'xlsx')) {
105-
inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.0/xlsx.core.min.js');
105+
inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.5/xlsx.core.min.js');
106106
}
107107
if (inArray(includes, 'proj4')) {
108-
inputScript('https://iclient.supermap.io/web/libs/proj4/2.7.5/proj4.js');
108+
inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');
109109
}
110110
if (inArray(includes, 'shapefile')) {
111111
inputScript('https://iclient.supermap.io/web/libs/shapefile/shapefile.js');

‎dist/ol/include-ol.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
inputScript('https://iclient.supermap.io/web/libs/echarts/4.9.0/echarts.min.js');
7676
}
7777
if (inArray(includes, 'proj4')) {
78-
inputScript('https://iclient.supermap.io/web/libs/proj4/2.7.5/proj4.js');
78+
inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');
7979
}
8080
if (inArray(includes, 'ol3-echarts')) {
81-
inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.4/ol3Echarts.min.js');
81+
inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
8282
}
8383
if (inArray(includes, 'ol3-echarts@1.3.6')) {
8484
inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
@@ -111,6 +111,9 @@
111111
if (inArray(includes, 'tensorflow')) {
112112
inputScript('https://iclient.supermap.io/web/libs/tensorflow/3.9.0/tf.min.js');
113113
}
114+
if (inArray(includes, 'xlsx')) {
115+
inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.5/xlsx.core.min.js');
116+
}
114117

115118
// dist
116119
if (!inArray(excludes, 'iclient-ol')) {

‎dist/openlayers/include-openlayers.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
inputScript('https://iclient.supermap.io/web/libs/echarts/4.9.0/echarts.min.js');
7676
}
7777
if (inArray(includes, 'proj4')) {
78-
inputScript('https://iclient.supermap.io/web/libs/proj4/2.7.5/proj4.js');
78+
inputScript('https://iclient.supermap.io/web/libs/proj4/2.8.0/proj4.js');
7979
}
8080
if (inArray(includes, 'ol3-echarts')) {
81-
inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.4/ol3Echarts.min.js');
81+
inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
8282
}
8383
if (inArray(includes, 'ol3-echarts@1.3.6')) {
8484
inputScript('https://iclient.supermap.io/web/libs/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
@@ -111,6 +111,9 @@
111111
if (inArray(includes, 'tensorflow')) {
112112
inputScript('https://iclient.supermap.io/web/libs/tensorflow/3.9.0/tf.min.js');
113113
}
114+
if (inArray(includes, 'xlsx')) {
115+
inputScript('https://iclient.supermap.io/web/libs/xlsx/0.18.5/xlsx.core.min.js');
116+
}
114117

115118
// dist
116119
if (!inArray(excludes, 'iclient-openlayers')) {

‎examples/leaflet/02_editFeatures.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
closeClearListener();
113113
var xmax = 120, xmin = 100, ymax = 50, ymin = 20,
114114
point = [];
115-
if (!featureGroup.hasLayer(marker)) {
115+
if (!marker || !featureGroup.hasLayer(marker)) {
116116

117117
point = [
118118
Math.floor(Math.random() * (ymax - ymin + 1) + ymin),
@@ -137,7 +137,7 @@
137137

138138
function revocationMarker() {
139139
closeClearListener();
140-
if (featureGroup.hasLayer(marker)) {
140+
if (marker && featureGroup.hasLayer(marker)) {
141141
featureGroup.clearLayers();
142142
marker = null;
143143
} else {
@@ -148,7 +148,7 @@
148148
function commit() {
149149
widgets.alert.clearAlert();
150150
closeClearListener();
151-
if (featureGroup.hasLayer(marker)) {
151+
if (marker && featureGroup.hasLayer(marker)) {
152152
marker = marker.toGeoJSON();
153153
marker.properties = {POP: 1, CAPITAL: 'test'};
154154
var addFeatureParams = new L.supermap.EditFeaturesParameters({
@@ -191,7 +191,7 @@
191191
editType: "delete"
192192
});
193193
featureService.editFeatures(deleteParams, function (serviceResult) {
194-
if (serviceResult.result.succeed) {
194+
if (serviceResult.result && serviceResult.result.succeed) {
195195
if (resultLayer) {
196196
map.removeLayer(resultLayer);
197197
resultLayer = null;
@@ -218,4 +218,4 @@
218218

219219
</script>
220220
</body>
221-
</html>
221+
</html>

‎examples/leaflet/05_findServiceAreas.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
parameter.weights = [400 + Math.random() * 100];
5656
service.findServiceAreas(parameter, function (serviceResult) {
5757
var result = serviceResult.result;
58-
result.serviceAreaList.map(function (serviceArea) {
58+
result && result.serviceAreaList.map(function (serviceArea) {
5959
resultLayer.addLayer(L.geoJSON(serviceArea.serviceRegion));
6060
});
6161

6262
});
6363
}
6464
</script>
6565
</body>
66-
</html>
66+
</html>

‎examples/leaflet/imageService.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<script
1111
type="text/javascript"
12-
include="proj4,turf,leaflet-geoman"
12+
include="turf,leaflet-geoman"
1313
src="../../dist/leaflet/include-leaflet.js"
1414
></script>
1515
<style>
@@ -547,7 +547,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
547547
}
548548

549549
function removeLayer(map, layer) {
550-
if (map.hasLayer(layer)) {
550+
if (layer && map.hasLayer(layer)) {
551551
map.removeLayer(layer);
552552
}
553553
}

‎examples/mapboxgl/imageService.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<head>
77
<meta charset="UTF-8" />
88
<title data-i18n="resources.title_image_service"></title>
9-
10-
9+
10+
1111
<style>
1212
.sidebar-config-wrap {
1313
position: absolute;
@@ -340,7 +340,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
340340
<script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
341341
<script
342342
type="text/javascript"
343-
include="proj4,turf,draw,mapbox-gl-enhance,mapboxgl-draw-rectangle-drag"
343+
include="turf,draw,mapbox-gl-enhance,mapboxgl-draw-rectangle-drag"
344344
src="../../dist/mapboxgl/include-mapboxgl.js"
345345
></script>
346346
<script type="text/javascript">

‎examples/mapboxgl/mapvCsvcar_4326.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626

2727
<body>
2828
<div id='map'></div>
29-
<script type="text/javascript" include='mapbox-gl-enhance,mapv,proj4' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
29+
<script type="text/javascript" include='mapbox-gl-enhance,mapv' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3030

3131
<script type="text/javascript">
3232
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
3333
var map = new mapboxgl.Map({
34-
container: 'map',
34+
container: 'map',
3535
style: {
3636
"version": 8,
3737
"sources": {
@@ -85,4 +85,4 @@
8585

8686
</body>
8787

88-
</html>
88+
</html>

‎examples/mapboxgl/mapvLayerPolyon_4326.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535

3636
<body>
3737
<div id='map'></div>
38-
<script type="text/javascript" include='mapbox-gl-enhance,mapv,proj4' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
38+
<script type="text/javascript" include='mapbox-gl-enhance,mapv' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3939
<script type="text/javascript">
4040
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
4141
var map = new mapboxgl.Map({
42-
container: 'map',
42+
container: 'map',
4343
style: {
4444
"version": 8,
4545
"sources": {
@@ -60,8 +60,8 @@
6060
}]
6161
},
6262
crs: mapboxgl.CRS.EPSG4326,
63-
center: [112.03027629538065, 22.095590365161783],
64-
zoom: 6
63+
center: [112.03027629538065, 22.095590365161783],
64+
zoom: 6
6565
});
6666
map.on('load', function () {
6767
$.get('../data/guang_dong.json', function (geojson) {

0 commit comments

Comments
 (0)