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

Author: MyShallowTime

dist/maplibregl/iclient-maplibregl-es6.js

@@ -49974,6 +49974,7 @@ class MapvLayer {
       getResolution: this._getResolution,
       validZoom: this._validZoom.bind(this)
     }, { id: this.id, targetElement: this.mapContainer, mapElement: this.map.getCanvas() });
+    this.mapContainer.style.perspective = this.map.transform.cameraToCenterDistance + 'px';
     this._bindEvent();
   }
 /**
@@ -54583,7 +54584,7 @@ class GraticuleLayer {
       id: this.id
     });
     this.addGraticuleLayer();
-    this.resizeEvent = this.renderer._resizeCallback;
+    this.resizeEvent = this.renderer._resizeCallback.bind(this.renderer);
     this.zoomendEvent = this.setVisibility.bind(this);
     this._bindEvent()
   }

dist/maplibregl/iclient-maplibregl-es6.min.js

@@ -54230,6 +54230,7 @@ var MapvLayer = /*#__PURE__*/function () {
         targetElement: this.mapContainer,
         mapElement: this.map.getCanvas()
       });
+      this.mapContainer.style.perspective = this.map.transform.cameraToCenterDistance + 'px';
       this._bindEvent();
     }
     /**
@@ -59309,7 +59310,7 @@ var GraticuleLayer = /*#__PURE__*/function () {
         id: this.id
       });
       this.addGraticuleLayer();
-      this.resizeEvent = this.renderer._resizeCallback;
+      this.resizeEvent = this.renderer._resizeCallback.bind(this.renderer);
       this.zoomendEvent = this.setVisibility.bind(this);
       this._bindEvent();
     }

dist/maplibregl/iclient-maplibregl.js

@@ -1,12 +1,14 @@
 /* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.*/
+var exampleNameList = [];
+
 $(document).ready(function () {
     window.initI18N(function(){
+    generateExampleNameList();
     initPage();
     bindEvents();
     sidebarScrollFix();
 });
 });
-
 var aceEditor;
 var containExamples = true;
 
@@ -16,6 +18,17 @@ 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);
+      });
+    });
+  });
+}
+
 
 //获取示例页面的配置信息
 function getActiveExampleConfig(){
@@ -89,21 +102,26 @@ 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";
     if (!mapUrl) {
         return;
     }
     var isError = false;
-    var html = $.ajax({
+    var response = $.ajax({
         url: mapUrl,
         async: false,
         error: function (error) {
             alert(resources.editor.envTips);
             isError = true;
         }
-    }).responseText;
+    });
+    var html = response.responseText;
     if (html && html != "" && !isError) {
         $('#editor').val(html);
         loadPreview(html);

dist/maplibregl/iclient-maplibregl.min.js

@@ -227,6 +227,6 @@
     });
     window.isLocal = false;
     window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
-    window.version = "11.1.0";
+    window.version = "11.1.1";
     window.preRelease = "";
 })();

examples/js/editor.js

@@ -1,7 +1,7 @@
 {
   "name": "SuperMapiClient",
   "description": "SuperMap iClient JavaScript 是一套由 JavaScript 语言编写的 GIS 客户端应用开发包， 支持多源数据地图，支持多终端，跨浏览器， 通过本产品可快速实现浏览器上美观、流畅的地图呈现。",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "directories": {
     "doc": "doc",
     "example": "examples",

examples/js/include-web.js

@@ -1,7 +1,7 @@
 # Required metadata
 sonar.projectKey=com.supermap:iclient-javascript
 sonar.projectName=iclient-javascript
-sonar.projectVersion=11.1.0
+sonar.projectVersion=11.1.1
 
 # Comma-separated paths to directories with sources (required)
 sonar.sources=src/

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-classic",
   "description": "",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "keywords": [
     "SuperMap"
   ],
@@ -15,6 +15,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "mapv": "2.0.62",
-    "@supermap/iclient-common": "11.1.0"
+    "@supermap/iclient-common": "11.1.1-dev"
   }
 }

sonar-project.properties

@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-common",
   "description": "",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "keywords": [
     "SuperMap"
   ],

src/classic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-leaflet",
   "description": "",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "keywords": [
     "SuperMap",
     "Leaflet"
@@ -19,7 +19,7 @@
     "echarts":"4.9.0",
     "mapv":"2.0.62",
     "leaflet": "1.9.4",
-    "@supermap/iclient-common": "11.1.0",
+    "@supermap/iclient-common": "11.1.1-dev",
     "@mapbox/vector-tile": "1.3.1",
     "jsonsql": "0.2.5",
     "pbf": "3.2.1",

src/common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-mapboxgl",
   "description": "",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "keywords": [
     "SuperMap",
     "MapboxGL v1"
@@ -18,7 +18,7 @@
     "mapv": "2.0.62",
     "mapbox-gl": "1.13.2",
     "three": "0.150.1",
-    "@supermap/iclient-common": "11.1.0",
+    "@supermap/iclient-common": "11.1.1-dev",
     "canvg": "3.0.10",
     "xml-js": "1.6.11",
     "flatgeobuf": "3.23.1",

src/leaflet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-maplibregl",
   "description": "",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "keywords": [
     "SuperMap",
     "maplibregl"
@@ -20,7 +20,7 @@
     "three": "0.150.1",
     "canvg": "3.0.10",
     "xml-js": "1.6.11",
-    "@supermap/iclient-common": "11.1.0",
+    "@supermap/iclient-common": "11.1.1-dev",
     "rbush": "^2.0.2"
   }
 }

src/mapboxgl/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-ol",
   "description": "",
-  "version": "11.1.0",
+  "version": "11.1.1-dev",
   "keywords": [
     "SuperMap",
     "OpenLayers"
@@ -18,7 +18,7 @@
     "@turf/turf": "6.5.0",
     "mapv": "2.0.62",
     "ol": "6.14.1",
-    "@supermap/iclient-common": "11.1.0",
+    "@supermap/iclient-common": "11.1.1-dev",
     "proj4": "2.9.0",
     "canvg": "3.0.10",
     "lodash.remove": "^4.7.0",