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

Author: luoxiao-supermap

build/jsdocs/template/publish.js

@@ -404,6 +404,9 @@ var whiteLists = {
     'ElasticSearch'
   ],
   leaflet: [
+    'KnowledgeGraphService',
+    'GraphMap',
+    'FGBLayer',
     'AddressMatchService',
     'ChartService',
     'CommonServiceBase',
@@ -491,6 +494,9 @@ var whiteLists = {
     'WKTFormat'
   ],
   mapboxgl: [
+    'KnowledgeGraphService',
+    'GraphMap',
+    'FGBLayer',
     'AddressMatchService',
     'ChartService',
     'CommonServiceBase',
@@ -563,9 +569,14 @@ var whiteLists = {
     'WKTFormat'
   ],
   maplibregl:[
+    'KnowledgeGraphService',
+    'GraphMap',
+    'FGBLayer',
     'L7Layer',
   ],
   openlayers: [
+    'KnowledgeGraphService',
+    'GraphMap',
     'AddressMatchService',
     'ChartService',
     'CommonServiceBase',

build/jsdocs/template/typeLinkExt.js

@@ -85,6 +85,7 @@ var typeLinks = {
 
     //maplibregl
     "maplibregl.Map": mlbglapi + '#map',
+    "maplibregl.Evented": mlbglapi + '#Evented',
 
     //mapv
     "Mapv.DataSet": mapv + 'data/DataSet.md',

src/common/iServer/GeoprocessingService.js

@@ -160,7 +160,7 @@ export class GeoprocessingService extends CommonServiceBase {
         let eventListeners = {
           scope: this,
           processCompleted: function(result) {
-            if (eventId === result.eventId && callback) {
+            if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
             }

src/leaflet/overlay/GraphMap.js

@@ -19,6 +19,7 @@ import { KnowledgeGraph } from '@supermap/iclient-common/overlay/KnowledgeGraph'
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @fires GraphMap#loaded
+ * @extends {L.Evented}
  * @usage
  */
 export class GraphMap extends L.Evented {
@@ -59,6 +60,10 @@ export class GraphMap extends L.Evented {
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.setData(result);
     this.graph.on('afterrender', () => {
+      /**
+       * @event GraphMap#loaded
+       * @description 渲染完成时触发。
+       */
       this.fire(this.EVENT_TYPES[0]);
     });
   }

src/mapboxgl/overlay/GraphMap.js

@@ -17,7 +17,8 @@ import mapboxgl from 'mapbox-gl';
  * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
- * @fires GraphMap#loaded 渲染完成时触发。
+ * @fires GraphMap#loaded
+ * @extends {mapboxgl.Evented}
  * @usage
  */
 export class GraphMap extends mapboxgl.Evented {
@@ -55,6 +56,10 @@ export class GraphMap extends mapboxgl.Evented {
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.setData(result);
     this.graph.on('afterrender', () => {
+      /**
+       * @event GraphMap#loaded
+       * @description 渲染完成时触发。
+       */
       this.fire(this.EVENT_TYPES[0]);
     });
   }

src/maplibregl/overlay/GraphMap.js

@@ -17,7 +17,8 @@ import maplibregl from 'maplibre-gl';
  * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
- * @fires GraphMap#loaded 徐冉冉完成时触发。
+ * @fires GraphMap#loaded
+ * @extends {maplibregl.Evented}
  * @usage
  */
 export class GraphMap extends maplibregl.Evented {
@@ -55,6 +56,10 @@ export class GraphMap extends maplibregl.Evented {
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.setData(result);
     this.graph.on('afterrender', () => {
+      /**
+       * @event GraphMap#loaded
+       * @description 渲染完成时触发。
+       */
       this.fire(this.EVENT_TYPES[0]);
     });
   }

src/openlayers/overlay/GraphMap.js

@@ -16,7 +16,8 @@ import Observable from 'ol/Observable';
  * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
- * @fires GraphMap#loaded 徐冉冉完成时触发。
+ * @fires GraphMap#loaded
+ * @extends {ol.Observable}
  * @usage
  */
 export class GraphMap extends Observable {
@@ -55,6 +56,10 @@ export class GraphMap extends Observable {
     const result = KnowledgeGraph.dataFromGraphMap(res.data, res.graphMap.styles.style);
     this.graph = new KnowledgeGraph(options && options.config);
     this.graph.on('afterrender', () => {
+      /**
+       * @event GraphMap#loaded
+       * @description 渲染完成时触发。
+       */
       this.dispatchEvent(this.EVENT_TYPES[0]);
     });
     this.graph.setData(result);