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

Author: hhyu1

build/jsdocs/openlayers/docs.json

@@ -62,9 +62,7 @@
             "src/common/components/templates/PopContainer",
             "src/common/components/templates/Select",
             "src/common/security/KeyServiceParameter",
-            "src/common/components/templates/TemplateBase",
-
-            "src/openlayers/core/Util"
+            "src/common/components/templates/TemplateBase"
         ]
     },
     "plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],

build/server.js

@@ -5,13 +5,14 @@ const serveIndex = require('serve-index');
 
 const webpack = require('webpack');
 const webpackDevMiddleware = require('webpack-dev-middleware');
+
 const product = process.argv[2];
 var dirname = product === 'openlayers' ? 'ol' : product
 const app = (module.exports = express());
 if (product) {
     const config = require(`./webpack.config.${product}.js`);
     const configBase = require(`./webpack.config.base.js`);
-    const entry = [`./src/${product}/${product === 'classic'? 'index': 'namespace'}.js`];
+    const entry = [`./src/${product}/namespace.js`];
     const filename = `iclient-${dirname}`;
     config.output.filename = `${filename}-es6.min.js`;
     config.output.path = path.resolve(`${__dirname}/../dist/${dirname}`);

examples/leaflet/01_chartService.html

@@ -16,7 +16,9 @@ export { OutputSetting } from '@supermap/iclient-common/iServer/OutputSetting';
 export { MappingParameters } from '@supermap/iclient-common/iServer/MappingParameters';
 export { GeoCodingParameter } from '@supermap/iclient-common/iServer/GeoCodingParameter';
 export { GeoDecodingParameter } from '@supermap/iclient-common/iServer/GeoDecodingParameter';
+export { VectorClipJobsParameter } from '@supermap/iclient-common/iServer/VectorClipJobsParameter';
 export { Util } from '@supermap/iclient-common/commontypes/Util';
+export { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
 export * from './overlay';
 export * from './services';
 export { SuperMap } from './SuperMap';

examples/mapboxgl/01_chartService.html

@@ -1,6 +1,7 @@
 import {
   ElasticSearch,
   SecurityManager,
+  VectorClipJobsParameter,
   KernelDensityJobParameter,
   SingleObjectQueryJobsParameter,
   SummaryAttributesJobsParameter,
@@ -14,11 +15,13 @@ import {
   GeoCodingParameter,
   GeoDecodingParameter,
   SuperMap,
-  Util
+  Util,
+  FetchRequest
 } from './index';
 
 SuperMap.ElasticSearch = ElasticSearch;
 SuperMap.SecurityManager = SecurityManager;
+SuperMap.VectorClipJobsParameter = VectorClipJobsParameter;
 SuperMap.KernelDensityJobParameter = KernelDensityJobParameter;
 SuperMap.SingleObjectQueryJobsParameter = SingleObjectQueryJobsParameter;
 SuperMap.SummaryAttributesJobsParameter = SummaryAttributesJobsParameter;
@@ -31,5 +34,6 @@ SuperMap.OutputSetting = OutputSetting;
 SuperMap.MappingParameters = MappingParameters;
 SuperMap.GeoCodingParameter = GeoCodingParameter;
 SuperMap.GeoDecodingParameter = GeoDecodingParameter;
+SuperMap.FetchRequest = FetchRequest;
 SuperMap.Util = {...SuperMap.Util, ...Util};
 export * from './index';

examples/openlayers/01_chartService.html

@@ -162,8 +162,8 @@ export class ChartQueryService extends CommonServiceBase {
                     this._transformFeatures(recordsets[i], fieldNameFormatter, me.format)
                 }
                 // 点选查询的返回结果
-                if(recordsets[i].chartFeatureRecordsets) {
-                    recordsets[i].chartFeatureRecordsets.forEach(chartFeatureRecordset => {
+                if(recordsets[i].chartRecordsets) {
+                    recordsets[i].chartRecordsets.forEach(chartFeatureRecordset => {
                       this._transformFeatures(chartFeatureRecordset, fieldNameFormatter, me.format)
                     });
                 }

src/classic/index.js

@@ -39,7 +39,7 @@
   * @param {boolean} [options.textClipRegionEnabled=false] - 是否启用海图图层的文本显示裁剪区。
   * @param {boolean} [options.displayLowAccurateMarker=true] - 是否显示低精度符号。
   * @param {number} [options.displayScaleFactor] - 比例尺缩放。
-  * @param {object} [options.chartAcronymClassify] - 物标分组是否可显示的对应关系。
+  * @param {object} [options.displayableAcronymClassify] - 物标分组是否可显示的对应关系。
   * @usage
   */
  export class ChartSetting {
@@ -208,10 +208,10 @@
          this.displayScaleFactor = 0.05;
 
          /**
-          * @member {object} [options.chartAcronymClassify]
+          * @member {object} [options.displayableAcronymClassify]
           * @description 物标分组是否可显示的对应关系。
           */
-         this.chartAcronymClassify = null;
+         this.displayableAcronymClassify = null;
 
          if (options) {
              Util.extend(this, options);
@@ -252,7 +252,7 @@
       this.textClipRegionEnabled = null;
       this.displayLowAccurateMarker = null;
       this.displayScaleFactor = null;
-      this.chartAcronymClassify = null;
+      this.displayableAcronymClassify = null;
      }
  }
 

src/classic/namespace.js

@@ -47,10 +47,7 @@ export class GetFeaturesByBufferService extends GetFeaturesServiceBase {
      * @returns {Object} 转化后的 JSON 字符串。
      */
     getJsonParameters(params) {
-        if (!(params instanceof GetFeaturesByBufferParameters)) {
-            return;
-        }
-        return GetFeaturesByBufferParameters.toJsonParameters(params);
+      return GetFeaturesByBufferParameters.toJsonParameters(params);
     }
 
 }

src/common/iServer/ChartQueryService.js

@@ -129,15 +129,15 @@ export class GetFeaturesServiceBase extends CommonServiceBase {
             console.warn('recommend set returnFeaturesOnly config to true to imporve performance. if need get Total amount and Dataset information. FeatureService provide getFeaturesCount and getFeaturesDatasetInfo method');
           }
           if (params.returnCountOnly) {
-            me.url = Util.urlAppend(me.url, "&returnCountOnly=" + params.returnCountOnly)
+            me.url = Util.urlAppend(me.url, "returnCountOnly=" + params.returnCountOnly)
          }
 
           if (params.returnDatasetInfoOnly) {
-            me.url = Util.urlAppend(me.url, "&returnDatasetInfoOnly=" + params.returnDatasetInfoOnly)
+            me.url = Util.urlAppend(me.url, "returnDatasetInfoOnly=" + params.returnDatasetInfoOnly)
           }
 
           if (params.returnFeaturesOnly) {
-            me.url = Util.urlAppend(me.url, "&returnFeaturesOnly=" + params.returnFeaturesOnly)
+            me.url = Util.urlAppend(me.url, "returnFeaturesOnly=" + params.returnFeaturesOnly)
           }
        }
 

src/common/iServer/ChartSetting.js

@@ -185,7 +185,7 @@ export class GraticuleLayerRenderer {
         this.oldExtent = this.options.extent;
         this._calcInterval();
         this.isRotate = false;
-        this.visible = true;
+        this.visible = this.options.visible;
         this.features = this._getGraticuleFeatures();
     }
 

src/common/iServer/GetFeaturesByBufferService.js

@@ -1,18 +1,20 @@
 import uniqBy from 'lodash.uniqby';
 
 export function transformGraphMap(data, graphMap) {
-  const style = graphMap && graphMap.styles && graphMap.styles.style;
-  const captionField = graphMap && graphMap.captionFields && graphMap.captionFields.captionField;
+  graphMap = graphMap || {};
+  const style = graphMap.styles && graphMap.styles.style;
+  const captionField = graphMap.captionFields && graphMap.captionFields.captionField;
+  const showRelationTypes = graphMap.showRelationTypes;
 
   const rst = { nodes: [], edges: [] };
   data.forEach((item) => {
     const pathData = item.path;
     if (pathData) {
-      const { nodes, edges } = transformPath(pathData, style, captionField);
+      const { nodes, edges } = transformPath(pathData, style, captionField, showRelationTypes);
       rst.nodes.push(...nodes);
       rst.edges.push(...edges);
     } else if (isEdge(item)) {
-      const edge = edgeFromGraphMap(item, style);
+      const edge = edgeFromGraphMap(item, style, showRelationTypes);
       rst.edges.push(edge);
     } else {
       const node = nodeFromGraphMap(item, style, captionField);
@@ -30,11 +32,11 @@ function isEdge(entity) {
   return entity.hasOwnProperty('start') && entity.hasOwnProperty('end');
 }
 
-function transformPath(pathData, style, captionField) {
+function transformPath(pathData, style, captionField, showRelationTypes) {
   const rst = { nodes: [], edges: [] };
   pathData.forEach((item) => {
     if (isEdge(item)) {
-      const edge = edgeFromGraphMap(item, style);
+      const edge = edgeFromGraphMap(item, style, showRelationTypes);
       rst.edges.push(edge);
     } else {
       const node = nodeFromGraphMap(item, style, captionField);
@@ -51,7 +53,7 @@ export function nodeFromGraphMap(entity, style, captionField) {
   const fillColor = styleData.fillColor || '';
   const node = {
     id: id + '',
-    label: label,
+    label: label === undefined ? '' : label + '',
     properties,
     lables
   };
@@ -73,7 +75,7 @@ export function nodeFromGraphMap(entity, style, captionField) {
   }
   return node;
 }
-export function edgeFromGraphMap(entity, style) {
+export function edgeFromGraphMap(entity, style, showRelationTypes) {
   const { start, end, id, type, properties } = entity;
   const styleData = style ? getEdgeStyle(entity, style) : {};
   const edge = {
@@ -85,6 +87,9 @@ export function edgeFromGraphMap(entity, style) {
     labelCfg: {},
     properties
   };
+  if (showRelationTypes === false) {
+    delete edge.label;
+  }
   if (styleData.stroke) {
     edge.style.stroke = styleData.stroke;
     edge.style.endArrow = {
@@ -161,11 +166,11 @@ function getNodeLabel(entity, captionField) {
       const types = JSON.parse(entityTypes || '[]');
       const labelStr = labels && labels.join('&');
       if (ids.includes(id) || types.includes(labelStr)) {
-        return properties[name] || '';
+        return properties[name];
       }
     }
   }
-  return properties[properties._labelfieldname] || '';
+  return properties[properties._labelfieldname];
 }
 
 function formatFontStyle(fontStyle) {

src/common/iServer/GetFeaturesServiceBase.js

@@ -41,6 +41,9 @@ export const CommontypesConversion = {
                 bounds.max.y
             );
         }
+        if (bounds instanceof Bounds) {
+          return bounds;
+        }
         if (isArray(bounds)) {
             return new Bounds(
                 bounds[0],

src/common/overlay/graticule/GraticuleLayerRenderer.js

@@ -11,7 +11,7 @@ import { getServiceKey } from '@supermap/iclient-common/util/EncryptRequest';
  * @private
  */
 export var MapExtend = (function () {
-  if (mapboxgl.VectorTileSource.prototype.beforeLoadBak === undefined) {
+  if (mapboxgl.VectorTileSource && mapboxgl.VectorTileSource.prototype.beforeLoadBak === undefined) {
     mapboxgl.VectorTileSource.prototype.beforeLoadBak = mapboxgl.VectorTileSource.prototype.beforeLoad;
     mapboxgl.VectorTileSource.prototype.beforeLoad = async function (id, options) {
       const url = options && options.tiles && options.tiles[0];

src/common/overlay/knowledge-graph/format.js

@@ -58,6 +58,9 @@ export const Util = {
         if (bounds instanceof mapboxgl.LngLatBounds) {
           return new Bounds(bounds.getWest(), bounds.getSouth(), bounds.getEast(), bounds.getNorth());
         }
+        if (bounds instanceof Bounds) {
+          return bounds;
+        }
         return bounds;
     },
 

src/leaflet/core/CommontypesConversion.js

@@ -2,6 +2,7 @@
  * @name decryptSources
  * @namespace
  * @category BaseTypes Util
+ * @version 11.2.0
  * @description 配置需要解密的矢量瓦片的sourceId。
  * @usage
  * ```
@@ -24,6 +25,7 @@ const decryptSources = {
    * @description 设置需要解密的矢量瓦片的sourceId数组
    * @param {Array.<string>} sourceIds sourceId数组
    * @returns {Array.<string>} sourceId数组
+   * @version 11.2.0
    */
   set(sourceIds) {
     this.values = sourceIds;
@@ -34,6 +36,7 @@ const decryptSources = {
    * @description 添加需要解密的矢量瓦片的sourceId
    * @param {string} sourceId sourceId
    * @returns {Array.<string>} sourceId
+   * @version 11.2.0
    */
   add(sourceId) {
     this.values.push(sourceId);

src/mapboxgl/core/MapExtend.js

@@ -55,7 +55,7 @@ export function initMap(url, options = {}) {
         }
         const mapOptions = await createMapOptions(url, res.result, { ...options, initMapService });
         const map = new mapboxgl.Map(mapOptions);
-        if (mapOptions.style && mapOptions.style.layers && mapOptions.style.layers.length > 0) {
+        if (!map.loaded()) {
           map.on('load', () => {
             resolve({ map });
           });

src/mapboxgl/core/Util.js

@@ -58,6 +58,9 @@ export const Util = {
         if (bounds instanceof maplibregl.LngLatBounds) {
           return new Bounds(bounds.getWest(), bounds.getSouth(), bounds.getEast(), bounds.getNorth());
         }
+        if (bounds instanceof Bounds) {
+          return bounds;
+        }
         return bounds;
     },