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);
     }
 
 }