[fix]影像服务例子加loading review by xiongjj

YOUYOUNG · YOUYOUNG · commit 69b9b31d989f · 2021-11-24T09:43:50.000+08:00
diff --git a/examples/leaflet/imageService.html b/examples/leaflet/imageService.html
@@ -6,7 +6,7 @@
   <head>
     <meta charset="UTF-8" />
     <title data-i18n="resources.title_image_service"></title>
-    <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
+    
     <script
       type="text/javascript"
       include="proj4,turf,leaflet-geoman"
@@ -324,19 +324,12 @@ <h4 class="modal-title" id="myModalLabel"></h4>
         </div>
       </div>
     </div>
-    <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
+    <script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
     <script type="text/javascript">
       var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
       var mapUrl = host + '/iserver/services/map-world/rest/maps/World';
       var root = host + '/iserver/services/imageservice-hainan/restjsr';
       var url = host + '/iserver/services/data-china400/rest/data';
-      var map = L.map('map', {
-        crs: L.CRS.EPSG4326,
-        center: [19.2, 110],
-        maxZoom: 18,
-        zoom: 8
-      });
-      L.supermap.tiledMapLayer(mapUrl).addTo(map);
       var currentIndex = 0;
       var features = [];
       var pageMax = 10;
@@ -351,9 +344,17 @@ <h4 class="modal-title" id="myModalLabel"></h4>
       var searchBoxLayer;
       var provinceLayer;
       var selectedFeature;
+      var plotLayer;
+      var map = L.map('map', {
+        crs: L.CRS.EPSG4326,
+        center: [19.2, 110],
+        maxZoom: 18,
+        zoom: 8
+      });
+      L.supermap.tiledMapLayer(mapUrl).addTo(map);
+      widgets.loader.showLoader("data loading...");
       var result = queryFromDataService(url);
       var drawControl = addDrawControl();
-      var plotLayer;
       var imageService = ImageService();
       function ImageService() {
         var service = new L.supermap.imageService(root);
@@ -513,6 +514,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
             });
           }
           appendOptions('provinces', result, 'value', 'label');
+          widgets.loader.removeLoader();
           provinces = result;
           return result;
         });
diff --git a/examples/mapboxgl/imageService.html b/examples/mapboxgl/imageService.html
@@ -6,12 +6,8 @@
     <head>
         <meta charset="UTF-8" />
         <title data-i18n="resources.title_image_service"></title>
-        <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
-        <script
-            type="text/javascript"
-            include="proj4,turf,draw,mapbox-gl-enhance,mapboxgl-draw-rectangle-drag"
-            src="../../dist/mapboxgl/include-mapboxgl.js"
-        ></script>
+        
+        
         <style>
             .sidebar-config-wrap {
                 position: absolute;
@@ -341,8 +337,14 @@ <h4 class="modal-title" id="myModalLabel"></h4>
                 <!-- /.modal-content -->
             </div>
         </div>
-        <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
+        <script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
+        <script
+            type="text/javascript"
+            include="proj4,turf,draw,mapbox-gl-enhance,mapboxgl-draw-rectangle-drag"
+            src="../../dist/mapboxgl/include-mapboxgl.js"
+        ></script>
         <script type="text/javascript">
+            widgets.loader.showLoader("data loading...");
             var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
             var root = host + '/iserver/services/imageservice-hainan/restjsr';
             var url = host + '/iserver/services/data-china400/rest/data';
@@ -582,6 +584,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
                         });
                     }
                     appendOptions('provinces', result, 'value', 'label');
+                    widgets.loader.removeLoader();
                     provinces = result;
                     return result;
                 });
diff --git a/examples/openlayers/imageService.html b/examples/openlayers/imageService.html
@@ -6,8 +6,6 @@
     <head>
         <meta charset="UTF-8" />
         <title data-i18n="resources.title_image_service"></title>
-        <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
-        <script type="text/javascript" include="proj4,turf" src="../../dist/ol/include-ol.js"></script>
         <style>
             .sidebar-config-wrap {
                 position: absolute;
@@ -334,9 +332,10 @@ <h4 class="modal-title" id="myModalLabel"></h4>
                 <!-- /.modal-content -->
             </div>
         </div>
-
-        <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
+        <script type="text/javascript" include="bootstrap,jquery,widgets" src="../js/include-web.js"></script>
+        <script type="text/javascript" include="proj4,turf" src="../../dist/ol/include-ol.js"></script>
         <script type="text/javascript">
+            widgets.loader.showLoader("data loading...");
             var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
             var root = host + '/iserver/services/imageservice-hainan/restjsr';
             var url = host + '/iserver/services/data-china400/rest/data';
@@ -699,6 +698,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
                         });
                     }
                     appendOptions('provinces', result, 'value', 'label');
+                    widgets.loader.removeLoader();
                     provinces = result;
                     return result;
                 });
