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

SuperMap · Jun 15, 2023 · 180e141 · 180e141
2 parents bcd76b5 + 7d41be2
commit 180e141
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/examples/js/include-web.js b/examples/js/include-web.js
@@ -193,5 +193,5 @@
     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.preRelease = "beta";
+    window.preRelease = "";
 })();
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "SuperMapiClient",
   "description": "SuperMap iClient JavaScript 是一套由 JavaScript 语言编写的 GIS 客户端应用开发包， 支持多源数据地图，支持多终端，跨浏览器， 通过本产品可快速实现浏览器上美观、流畅的地图呈现。",
-  "version": "11.1.0-beta",
+  "version": "11.1.0",
   "directories": {
     "doc": "doc",
     "example": "examples",

diff --git a/src/classic/package.json b/src/classic/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-classic",
   "description": "",
-  "version": "11.1.0-beta",
+  "version": "11.1.0",
   "keywords": [
     "SuperMap"
   ],
@@ -15,6 +15,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "mapv": "2.0.62",
-    "@supermap/iclient-common": "11.1.0-beta"
+    "@supermap/iclient-common": "11.1.0"
   }
 }
diff --git a/src/common/package.json b/src/common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-common",
   "description": "",
-  "version": "11.1.0-beta",
+  "version": "11.1.0",
   "keywords": [
     "SuperMap"
   ],

diff --git a/src/leaflet/package.json b/src/leaflet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-leaflet",
   "description": "",
-  "version": "11.1.0-beta",
+  "version": "11.1.0",
   "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-beta",
+    "@supermap/iclient-common": "11.1.0",
     "@mapbox/vector-tile": "1.3.1",
     "jsonsql": "0.2.5",
     "pbf": "3.2.1",

diff --git a/src/mapboxgl/package.json b/src/mapboxgl/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-mapboxgl",
   "description": "",
-  "version": "11.1.0-beta",
+  "version": "11.1.0",
   "keywords": [
     "SuperMap",
     "MapboxGL v1"
@@ -19,7 +19,7 @@
     "mapv": "2.0.62",
     "mapbox-gl": "1.13.2",
     "three": "0.150.1",
-    "@supermap/iclient-common": "11.1.0-beta",
+    "@supermap/iclient-common": "11.1.0",
     "canvg": "3.0.10",
     "xml-js": "1.6.11",
     "flatgeobuf": "3.23.1",

diff --git a/src/maplibregl/namespace.js b/src/maplibregl/namespace.js
@@ -32,7 +32,6 @@ import {
   KnowledgeGraphService
 } from './services';
 
-import { GraphMap } from './overlay'
 import {
   MapvLayer,
   ThreeLayer,
@@ -41,7 +40,8 @@ import {
   GraphicLayer,
   Graphic,
   GraticuleLayer,
-  FGBLayer
+  FGBLayer,
+  GraphMap
 } from './overlay';
 
 import {

diff --git a/src/maplibregl/package.json b/src/maplibregl/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-maplibregl",
   "description": "",
-  "version": "11.1.0-dev",
+  "version": "11.1.0",
   "keywords": [
     "SuperMap",
     "maplibregl"
@@ -15,12 +15,13 @@
   "author": "SuperMap",
   "license": "Apache-2.0",
   "dependencies": {
-    "@supermap/iclient-common": "11.1.0-beta",
     "maplibre-gl": "3.1.0",
     "echarts": "4.9.0",
     "mapv": "2.0.62",
     "three": "0.150.1",
     "canvg": "3.0.10",
-    "xml-js": "1.6.11"
+    "xml-js": "1.6.11",
+    "@supermap/iclient-common": "11.1.0",
+    "rbush": "^2.0.2"
   }
 }
diff --git a/src/openlayers/package.json b/src/openlayers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@supermap/iclient-ol",
   "description": "",
-  "version": "11.1.0-beta",
+  "version": "11.1.0",
   "keywords": [
     "SuperMap",
     "OpenLayers"
@@ -19,7 +19,7 @@
     "echarts": "4.9.0",
     "mapv": "2.0.62",
     "ol": "6.14.1",
-    "@supermap/iclient-common": "11.1.0-beta",
+    "@supermap/iclient-common": "11.1.0",
     "proj4": "2.9.0",
     "canvg": "3.0.10",
     "lodash.remove": "^4.7.0",