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

Author: xilanhuaweidapao

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;

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_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);

examples/leaflet/02_datasourceService.html

@@ -87,7 +87,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_DatasourceInfo"><
                 innerHTML += "engineType:" + JSON.stringify(serviceResult.result.datasourceInfo.engineType, null, 2) + "<br>";
                 innerHTML += "name:" + JSON.stringify(serviceResult.result.datasourceInfo.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);

examples/leaflet/02_fieldsService.html

@@ -33,7 +33,7 @@
         });
         new L.supermap.FieldService(url).getFields(param).then(function (serviceResult) {
             var innerHTML = serviceResult.result.fieldNames.join(', ');
-            infoWin = L.popup({maxWidth: 420})
+            infoWin = L.popup({maxWidth: 420, closeOnClick:false})
                 .setLatLng(map.getCenter())
                 .setContent(innerHTML)
                 .openOn(map);

examples/leaflet/img/l_mapQueryByDistance.png

@@ -18,7 +18,7 @@ import {InterpolationAnalystParameters} from './InterpolationAnalystParameters';
  * @param {number} [options.zValueScale=1] - 进行插值分析值的缩放比率。
  * @param {number} [options.resolution] - 插值结果栅格数据集的分辨率，即一个像元所代表的实地距离，与点数据集单位相同。
  * @param {FilterParameter} [options.filterQueryParameter] - 属性过滤条件。
- * @param {string} [options.pixelFormat] - 指定结果栅格数据集存储的像素格式。
+ * @param {PixelFormat} [options.pixelFormat] - 指定结果栅格数据集存储的像素格式。
  * @param {string} [options.dataset] - 用来做插值分析的数据源中数据集的名称，该名称用形如 "数据集名称@数据源别名" 形式来表示。当插值分析类型（InterpolationAnalystParameters.prototype.InterpolationAnalystType）为 dataset 时，此为必选参数。
  * @param {Array.<GeometryPoint|L.LatLng|L.Point|ol.geom.Point|mapboxgl.LngLat|Array.<number>>} [options.inputPoints] - 用于做插值分析的离散点集合。当插值分析类型（InterpolationAnalystParameters.prototype.InterpolationAnalystType）为 geometry 时，此为必选参数。
  * @extends {InterpolationAnalystParameters}