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

Author: MyShallowTime

build/jsdocs/template/static/styles/jaguar.css

@@ -223,8 +223,8 @@ a:hover, a:active, a:focus{
 .main h4.name span.type-signature {
     display: inline-block;
     border-radius: 3px;
-    background-color: gray;
-    color: #fff;
+    background-color: #c4bdbd;
+    color: #605e5e;
     font-size: 0.7em;
     padding: 2px 4px;
 }
@@ -369,9 +369,9 @@ a:hover, a:active, a:focus{
     font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
-.main .nameContainer h4 .type-signature.type a {
+/* .main .nameContainer h4 .type-signature.type a {
     color: #fff;
-}
+} */
 
 .main pre {
     font-size: 11px;

dist/leaflet/include-leaflet.js

@@ -60,8 +60,8 @@
           inputScript(libsurl + '/leaflet/1.9.4/leaflet.js');
         }
         if (inArray(includes, 'mapbox-gl-enhance')) {
-            inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.0-1/mapbox-gl-enhance.css');
-            inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.0-1/mapbox-gl-enhance.js');
+            inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-3/mapbox-gl-enhance.css');
+            inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-3/mapbox-gl-enhance.js');
         }
         if (inArray(includes, 'leaflet.heat')) {
             inputScript(libsurl + '/leaflet/plugins/leaflet.heat/leaflet-heat.js');
@@ -149,9 +149,9 @@
         if (inArray(includes, 'iclient-plot-leaflet')) {
             inputCSS(libsurl + '/plotting/leaflet/11.1.0/iclient-plot-leaflet.css');
             if (supportES6()) {
-                inputScript(libsurl + '/plotting/leaflet/11.1.0/iclient-plot-leaflet-es6.min.js');
+                inputScript(libsurl + '/plotting/leaflet/11.1.1/iclient-plot-leaflet-es6.min.js');
             } else {
-                inputScript(libsurl + '/plotting/leaflet/11.1.0/iclient-plot-leaflet.min.js');
+                inputScript(libsurl + '/plotting/leaflet/11.1.1/iclient-plot-leaflet.min.js');
             }
         }
         if (inArray(includes, 'ant-design-vue')) {

dist/mapboxgl/include-mapboxgl.js

@@ -59,8 +59,8 @@
       inputScript(libsurl + '/mapbox-gl-js/1.13.2/mapbox-gl.js');
     }
     if (inArray(includes, 'mapbox-gl-enhance')) {
-      inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1/mapbox-gl-enhance.css');
-      inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1/mapbox-gl-enhance.js');
+      inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-3/mapbox-gl-enhance.css');
+      inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-3/mapbox-gl-enhance.js');
     }
     if (inArray(includes, 'g6')) {
       inputScript(libsurl + '/antv/g6/4.3.2/g6.min.js');

examples/js/editor.js

@@ -1,9 +1,6 @@
 /* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.*/
-var exampleNameList = [];
-
 $(document).ready(function () {
     window.initI18N(function(){
-    generateExampleNameList();
     initPage();
     bindEvents();
     sidebarScrollFix();
@@ -18,16 +15,6 @@ function initPage() {
     screenResize();
 }
 
-function generateExampleNameList() {
-  var config = window.exampleConfig;
-  Object.keys(config).forEach((menuItem) => {
-    config[menuItem].content && Object.keys(config[menuItem].content).forEach((secondMenuItem) => {
-      config[menuItem].content[secondMenuItem].content && config[menuItem].content[secondMenuItem].content.forEach((exampleInfo) => {
-        exampleNameList.push(exampleInfo.fileName);
-      });
-    });
-  });
-}
 
 
 //获取示例页面的配置信息
@@ -102,10 +89,6 @@ function loadExampleHtml() {
     if (!locationParam) {
         return;
     }
-    if (exampleNameList.indexOf(locationParam) === -1) {
-      window.location.href = window.location.origin + '/web/404.html';
-      return;
-    }
     var href = window.location.toString();
     var mapUrl = href.substr(0, href.lastIndexOf('/') + 1);
     mapUrl = mapUrl + locationParam + ".html";

examples/leaflet/01_layerService.html

@@ -33,7 +33,7 @@
                 result.subLayers.layers.map(function (layer) {
                     innerHTML += layer.name + "<br>";
                 });
-                infowin = L.popup({maxWidth: 400})
+                infowin = L.popup({maxWidth: 400, closeOnClick:false})
                     .setLatLng(map.getCenter())
                     .setContent(innerHTML)
                     .openOn(map);

examples/leaflet/01_mapQueryByDistance.html

@@ -24,7 +24,7 @@
     });
     new L.supermap.TiledMapLayer(url).addTo(map);
     circleMarker = L.circleMarker([30, 104], {color: 'red'}).addTo(map);
-    circleMarker.bindPopup('distance = 10').openPopup();
+    circleMarker.bindPopup('distance = 10',{closeOnClick:false}).openPopup();
     query();
 
     function query() {

examples/leaflet/01_mapQueryBySQL_FGB.html

@@ -34,7 +34,7 @@
           });
           new L.supermap
               .QueryService(url)
-              .queryBySQL(param, null, 'FGB').then(function (serviceResult) {
+              .queryBySQL(param, 'FGB').then(function (serviceResult) {
                 new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
                   strategy: 'all'
               }).addTo(map);

examples/leaflet/01_mapService.html

@@ -31,7 +31,7 @@
             innerHTML += resources.text_mapName+"：" + JSON.stringify(result.name, null, 2) + "<br>";
             innerHTML +=  resources.text_center+":" + JSON.stringify(result.center, null, 2) + "<br>";
             innerHTML += "Bounds:" + JSON.stringify(result.bounds, null, 2) + "<br>";
-            infoWin = L.popup({maxWidth: 400})
+            infoWin = L.popup({maxWidth: 400, closeOnClick:false})
                 .setLatLng(map.getCenter())
                 .setContent(innerHTML)
                 .openOn(map);

examples/leaflet/01_measure_area.html

@@ -34,7 +34,7 @@
             .MeasureService(url)
             .measureArea(areaMeasureParam).then(function (serviceResult) {
                 var content = resources.text_area + serviceResult.result.area + resources.msg_sqm;
-                polygon.bindPopup(content).openPopup(polygon.getCenter());
+                polygon.bindPopup(content, {closeOnClick:false}).openPopup(polygon.getCenter());
             });
     }
 </script>

examples/leaflet/02_datasetService.html

@@ -103,7 +103,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_DatasourceInfo"><
             innerHTML += "isFileCache:" + JSON.stringify(serviceResult.result.datasetInfo.isFileCache, null, 2) + "<br>";
             innerHTML += "name:" + JSON.stringify(serviceResult.result.datasetInfo.name, null, 2) + "<br>";
             innerHTML += "prjCoordSys:" + "(...)" + "<br>";
-            infoWin = L.popup({maxWidth: 420})
+            infoWin = L.popup({maxWidth: 420, closeOnClick:false})
                 .setLatLng(map.getCenter())
                 .setContent(innerHTML)
                 .openOn(map);