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

Author: Yuki-Zhao

build/deps.js

@@ -42,7 +42,9 @@ function initSideBar() {
     var config = exampleConfig;
     var sideBar = $("ul#sidebar-menu");
     for (var key in config) {
+      if (typeof config[key] === 'object' && config[key] !== null) {
         sideBar.append(createSideBarMenuItem(key, config[key], containExamples));
+      }
     }
     $(sideBar).ready(function () {
         initSelect();

examples/js/editor.js

@@ -21,8 +21,10 @@ function initPage() {
     var sideBar = $("ul#sidebar-menu");
     var chartList = $("#charts-list");
     for (var key in exConfig) {
+      if (typeof exConfig[key] === 'object' && exConfig[key] !== null) {
         sideBar.append(createSideBarMenuItem(key, exConfig[key], containExamples));
         chartList.append(createGalleryItem(key, exConfig[key]));
+      }
     }
     resizeCharts();
     initSelect();

examples/js/example.js

@@ -47,7 +47,7 @@
     "build-docs-mapboxgl": "rimraf ./docs/mapboxgl && jsdoc -c ./build/jsdocs/mapboxgl/docs.json -R ./build/jsdocs/mapboxgl/index.md",
     "build-docs-maplibregl": "rimraf ./docs/maplibregl && jsdoc -c ./build/jsdocs/maplibregl/docs.json -R ./build/jsdocs/maplibregl/index.md",
     "build-docs-classic": "rimraf ./docs/classic && jsdoc -c ./build/jsdocs/classic/docs.json -R ./build/jsdocs/classic/index.md",
-    "pre-publish": "node ./build/publish.js --leaflet && node  ./build/publish.js --openlayers && node  ./build/publish.js --mapboxgl && npm run pre-publish-symbol && node ./build/publish.js --maplibregl && node  ./build/publish.js --classic",
+    "pre-publish": "node ./build/publish.js --leaflet && node  ./build/publish.js --openlayers && node  ./build/publish.js --mapboxgl && node ./build/publish.js --maplibregl && node  ./build/publish.js --classic && npm run pre-publish-symbol",
     "publish": "npm run pre-publish && cd ./src/common && npm publish && cd ../leaflet && npm publish && cd ../openlayers && npm publish && cd ../mapboxgl && npm publish && cd ../maplibregl && npm publish && cd ../classic && npm publish",
     "pre-publish-symbol": "copyfiles -u 1 ./dist/resources/** ./src/mapboxgl/ "
   },

package.json

@@ -70,6 +70,7 @@ mapboxgl.supermap = {...SuperMap, ...mapboxgl.supermap};
 mapboxgl.supermap.map = mapboxgl.supermap.map || {};
 
 mapboxgl.supermap.LogoControl = Logo;
+mapboxgl.supermap.Logo = Logo;
 mapboxgl.supermap.Util = Util;
 mapboxgl.supermap.WebMap = WebMap;
 mapboxgl.supermap.Graphic = Graphic;

src/mapboxgl/namespace.js

@@ -10,7 +10,7 @@ import { FetchRequest } from "@supermap/iclient-common/util/FetchRequest";
  * @description  扩展了 mapboxgl.Map 对图层相关的操作。
  * @private
  */
-export var MapExtendSymbol = (function () {
+function MapExtendSymbol(){
   /**
    * 获取symbol管理
    * @param {*} map
@@ -257,5 +257,5 @@ export var MapExtendSymbol = (function () {
     }
   }
 
-})();
-
+}
+export default MapExtendSymbol

src/mapboxgl/overlay/symbol/MapExtendSymbol.js

@@ -2,7 +2,7 @@
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import mapboxgl from "mapbox-gl";
-import './MapExtendSymbol';
+import MapExtendSymbol from './MapExtendSymbol';
 /**
 * @class WebSymbol
 * @classdesc SuperMap iClient for MapboxGL 支持 Web 符号库，扩展了 [MapboxGL](https://docs.mapbox.com/mapbox-gl-js/api/) 的 API。
@@ -188,5 +188,6 @@ export class WebSymbol {
    */
   init(config) {
     mapboxgl.Map.prototype.basePath = config?.basePath ?? this.defaultBasePath;
+    MapExtendSymbol();
   }
 }