Skip to content

Commit 69b9b31

Browse files
YOUYOUNGYOUYOUNG
committed
[fix]影像服务例子加loading review by xiongjj
1 parent a50af39 commit 69b9b31

3 files changed

Lines changed: 26 additions & 21 deletions

File tree

‎examples/leaflet/imageService.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<head>
77
<meta charset="UTF-8" />
88
<title data-i18n="resources.title_image_service"></title>
9-
<script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
9+
1010
<script
1111
type="text/javascript"
1212
include="proj4,turf,leaflet-geoman"
@@ -324,19 +324,12 @@ <h4 class="modal-title" id="myModalLabel"></h4>
324324
</div>
325325
</div>
326326
</div>
327-
<script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
327+
<script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
328328
<script type="text/javascript">
329329
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
330330
var mapUrl = host + '/iserver/services/map-world/rest/maps/World';
331331
var root = host + '/iserver/services/imageservice-hainan/restjsr';
332332
var url = host + '/iserver/services/data-china400/rest/data';
333-
var map = L.map('map', {
334-
crs: L.CRS.EPSG4326,
335-
center: [19.2, 110],
336-
maxZoom: 18,
337-
zoom: 8
338-
});
339-
L.supermap.tiledMapLayer(mapUrl).addTo(map);
340333
var currentIndex = 0;
341334
var features = [];
342335
var pageMax = 10;
@@ -351,9 +344,17 @@ <h4 class="modal-title" id="myModalLabel"></h4>
351344
var searchBoxLayer;
352345
var provinceLayer;
353346
var selectedFeature;
347+
var plotLayer;
348+
var map = L.map('map', {
349+
crs: L.CRS.EPSG4326,
350+
center: [19.2, 110],
351+
maxZoom: 18,
352+
zoom: 8
353+
});
354+
L.supermap.tiledMapLayer(mapUrl).addTo(map);
355+
widgets.loader.showLoader("data loading...");
354356
var result = queryFromDataService(url);
355357
var drawControl = addDrawControl();
356-
var plotLayer;
357358
var imageService = ImageService();
358359
function ImageService() {
359360
var service = new L.supermap.imageService(root);
@@ -513,6 +514,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
513514
});
514515
}
515516
appendOptions('provinces', result, 'value', 'label');
517+
widgets.loader.removeLoader();
516518
provinces = result;
517519
return result;
518520
});

‎examples/mapboxgl/imageService.html‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
<head>
77
<meta charset="UTF-8" />
88
<title data-i18n="resources.title_image_service"></title>
9-
<script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
10-
<script
11-
type="text/javascript"
12-
include="proj4,turf,draw,mapbox-gl-enhance,mapboxgl-draw-rectangle-drag"
13-
src="../../dist/mapboxgl/include-mapboxgl.js"
14-
></script>
9+
10+
1511
<style>
1612
.sidebar-config-wrap {
1713
position: absolute;
@@ -341,8 +337,14 @@ <h4 class="modal-title" id="myModalLabel"></h4>
341337
<!-- /.modal-content -->
342338
</div>
343339
</div>
344-
<script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
340+
<script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
341+
<script
342+
type="text/javascript"
343+
include="proj4,turf,draw,mapbox-gl-enhance,mapboxgl-draw-rectangle-drag"
344+
src="../../dist/mapboxgl/include-mapboxgl.js"
345+
></script>
345346
<script type="text/javascript">
347+
widgets.loader.showLoader("data loading...");
346348
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
347349
var root = host + '/iserver/services/imageservice-hainan/restjsr';
348350
var url = host + '/iserver/services/data-china400/rest/data';
@@ -582,6 +584,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
582584
});
583585
}
584586
appendOptions('provinces', result, 'value', 'label');
587+
widgets.loader.removeLoader();
585588
provinces = result;
586589
return result;
587590
});

‎examples/openlayers/imageService.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<head>
77
<meta charset="UTF-8" />
88
<title data-i18n="resources.title_image_service"></title>
9-
<script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
10-
<script type="text/javascript" include="proj4,turf" src="../../dist/ol/include-ol.js"></script>
119
<style>
1210
.sidebar-config-wrap {
1311
position: absolute;
@@ -334,9 +332,10 @@ <h4 class="modal-title" id="myModalLabel"></h4>
334332
<!-- /.modal-content -->
335333
</div>
336334
</div>
337-
338-
<script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
335+
<script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
336+
<script type="text/javascript" include="proj4,turf" src="../../dist/ol/include-ol.js"></script>
339337
<script type="text/javascript">
338+
widgets.loader.showLoader("data loading...");
340339
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
341340
var root = host + '/iserver/services/imageservice-hainan/restjsr';
342341
var url = host + '/iserver/services/data-china400/rest/data';
@@ -699,6 +698,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
699698
});
700699
}
701700
appendOptions('provinces', result, 'value', 'label');
701+
widgets.loader.removeLoader();
702702
provinces = result;
703703
return result;
704704
});

0 commit comments

Comments
 (0)