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

Author: xilanhuaweidapao

dist/classic/include-classic.js

@@ -157,7 +157,7 @@
     }
 
     load({
-        libsurl: '../../libs',
+        libsurl: 'https://iclient.supermap.io/web/libs',
         disturl: '../../dist'
     });
     window.isLocal = false;

dist/leaflet/include-leaflet.js

@@ -177,7 +177,7 @@
     }
 
     load({
-        libsurl: '../../libs',
+        libsurl: 'https://iclient.supermap.io/web/libs',
         disturl: '../../dist'
     });
     window.isLocal = false;

dist/mapboxgl/include-mapboxgl.js

@@ -219,7 +219,7 @@
   }
 
   load({
-    libsurl: '../../libs',
+    libsurl: 'https://iclient.supermap.io/web/libs',
     disturl: '../../dist'
   });
   window.isLocal = false;

dist/maplibregl/include-maplibregl.js

@@ -197,7 +197,7 @@
   }
 
   load({
-    libsurl: '../../libs',
+    libsurl: 'https://iclient.supermap.io/web/libs',
     disturl: '../../dist'
   });
   window.isLocal = false;

dist/ol/include-ol.js

@@ -89,7 +89,7 @@
             inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
         }
         if (inArray(includes, 'ol-mapbox-style')) {
-            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-5/olms.js');
+            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');
         }
         if (inArray(includes, 'deck')) {
             inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
@@ -144,7 +144,7 @@
     }
 
     load({
-        libsurl: '../../libs',
+        libsurl: 'https://iclient.supermap.io/web/libs',
         disturl: '../../dist'
     });
     window.isLocal = false;

dist/openlayers/include-openlayers.js

@@ -89,7 +89,7 @@
             inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
         }
         if (inArray(includes, 'ol-mapbox-style')) {
-            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-5/olms.js');
+            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');
         }
         if (inArray(includes, 'deck')) {
             inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
@@ -138,7 +138,7 @@
     }
 
     load({
-        libsurl: '../../libs',
+        libsurl: 'https://iclient.supermap.io/web/libs',
         disturl: '../../dist'
     });
     window.isLocal = false;

examples/component/components_attributes_vue.html

@@ -19,6 +19,9 @@
                 width: 100%;
                 height: 100%;
             }
+            .sm-component-table-fixed {
+               width: 100% !important;
+            }
         </style>
     </head>
 
@@ -71,7 +74,7 @@
                         ],
                         table: {
                           pagination: {
-                            pageSize: 10
+                            pageSize: 6
                           }
                         }
                     };

examples/leaflet/01_chartService.html

@@ -486,8 +486,8 @@ <h5 class='panel-title text-center'>
     function clickHandler(event) {
       var coordinate = event.latlng;
       var pixelCoor = event.layerPoint;
-      var b1 = map.containerPointToLatLng([pixelCoor.x-15,pixelCoor.y+15]);
-      var b2 = map.containerPointToLatLng([pixelCoor.x+15,pixelCoor.y-15]);
+      var b1 = map.layerPointToLatLng([pixelCoor.x-15,pixelCoor.y+15]);
+      var b2 = map.layerPointToLatLng([pixelCoor.x+15,pixelCoor.y-15]);
       // 添加点要素
       pointResultLayer && map.removeLayer(pointResultLayer);
       pointResultLayer = L.circleMarker(coordinate,{radius:5});

src/mapboxgl/mapping/InitMap.js

@@ -2,6 +2,7 @@ import mapboxgl from 'mapbox-gl';
 import { MapService } from '../services/MapService';
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import { InitMapServiceBase, isPlaneProjection, getZoom, getTileset, getTileFormat } from '@supermapgis/iclient-common/iServer/InitMapServiceBase';
+import { Util } from '@supermapgis/iclient-common/commontypes/Util';
 import proj4 from 'proj4';
 
 /**
@@ -137,7 +138,7 @@ async function getVectorTileCRSExtent(vectorStyleUrl, restMapUrl) {
     if (vectorStyleData.metadata && vectorStyleData.metadata.indexbounds) {
       return { extent: vectorStyleData.metadata.indexbounds };
     }
-    const vectorExtentDataRes = await FetchRequest.get(`${restMapUrl}/prjCoordSys/projection/extent.json`);
+    const vectorExtentDataRes = await FetchRequest.get(Util.urlPathAppend(restMapUrl, 'prjCoordSys/projection/extent.json'));
     const vectorExtentData = await vectorExtentDataRes.json();
     return { extent: vectorExtentData, center: vectorStyleData.center };
   } catch (error) {
@@ -176,7 +177,7 @@ async function createMapOptions(url, resetServiceInfo, options) {
   let extent = bounds;
   let tileUrl =
     sourceType === 'vector-tile'
-      ? url + '/tileFeature/vectorstyles.json?type=MapBox_GL&styleonly=true&tileURLTemplate=ZXY'
+      ? Util.urlAppend(Util.urlPathAppend(url, 'tileFeature/vectorstyles.json'), 'type=MapBox_GL&styleonly=true&tileURLTemplate=ZXY')
       : url;
   let nonEnhanceExtraInfo = {};
   let enhanceExtraInfo = {};
@@ -228,7 +229,7 @@ async function createMapOptions(url, resetServiceInfo, options) {
       const tileSize = 256;
       nonEnhanceExtraInfo.tileSize = tileSize;
       const transparent = mapOptions.transparent !== false;
-      tileUrl += `/zxyTileImage.png?z={z}&x={x}&y={y}&width=${tileSize}&height=${tileSize}&transparent=${transparent}`;
+      tileUrl = Util.urlAppend(Util.urlPathAppend(tileUrl, 'zxyTileImage.png'), `z={z}&x={x}&y={y}&width=${tileSize}&height=${tileSize}&transparent=${transparent}`);
     }
   }
   if (zoom === undefined) {

src/mapboxgl/mapping/utils/L7LayerUtil.js

@@ -638,12 +638,14 @@ function vectorSourceToL7Source(source, sourceLayer, options) {
       sourceLayer
     }
   };
-  if (isIportalProxyServiceUrl(result.data, options)) {
-    Object.assign(result.parser, {
-      requestParameters: {
-        credentials: 'include'
-      }
-    });
+  const requestParameters = options.transformRequest(result.data, 'Tile');
+  if (requestParameters) {
+    if (requestParameters.credentials) {
+      result.parser.requestParameters = { credentials: requestParameters.credentials };
+    }
+    if (requestParameters.headers) {
+      result.parser.requestParameters = { ...result.parser.requestParameters, headers: requestParameters.headers };
+    }
   }
   return result;
 }