【update/API】 serviece 新增 crossOrigin 参数 review by songym

Author: liqian7

dist/classic/iclient-classic-es6.js

@@ -12,6 +12,7 @@ import {AddressMatchService as CommonAddressMatchService} from '@supermap/iclien
  * @extends {SuperMap.CommonServiceBase}
  * @param {string} url - 服务地址。
  * @param {Object} options - 参数。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class AddressMatchService extends CommonServiceBase {
 
@@ -31,6 +32,7 @@ export class AddressMatchService extends CommonServiceBase {
         var addressMatchService = new CommonAddressMatchService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin: me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -52,6 +54,7 @@ export class AddressMatchService extends CommonServiceBase {
         var addressMatchService = new CommonAddressMatchService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin: me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,

dist/classic/iclient-classic-es6.min.js

@@ -27,6 +27,7 @@ import {SummaryAttributesJobsService} from '@supermap/iclient-common/iServer/Sum
  * })
  * @param {string} url - 分布式分析服务地址。
  * @param {Object} options - 可选参数。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class ProcessingService extends CommonServiceBase {
 
@@ -55,6 +56,7 @@ export class ProcessingService extends CommonServiceBase {
         var kernelDensityJobsService = new KernelDensityJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -79,6 +81,7 @@ export class ProcessingService extends CommonServiceBase {
         var kernelDensityJobsService = new KernelDensityJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -103,6 +106,7 @@ export class ProcessingService extends CommonServiceBase {
         var kernelDensityJobsService = new KernelDensityJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -138,6 +142,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryMeshJobsService = new SummaryMeshJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -162,6 +167,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryMeshJobsService = new SummaryMeshJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -186,6 +192,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryMeshJobsService = new SummaryMeshJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -221,6 +228,7 @@ export class ProcessingService extends CommonServiceBase {
         var singleObjectQueryJobsService = new SingleObjectQueryJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -245,6 +253,7 @@ export class ProcessingService extends CommonServiceBase {
         var singleObjectQueryJobsService = new SingleObjectQueryJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -271,6 +280,7 @@ export class ProcessingService extends CommonServiceBase {
         var singleObjectQueryJobsService = new SingleObjectQueryJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -306,6 +316,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryRegionJobsService = new SummaryRegionJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -330,6 +341,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryRegionJobsService = new SummaryRegionJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -354,6 +366,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryRegionJobsService = new SummaryRegionJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -389,6 +402,7 @@ export class ProcessingService extends CommonServiceBase {
         var vectorClipJobsService = new VectorClipJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -413,6 +427,7 @@ export class ProcessingService extends CommonServiceBase {
         var vectorClipJobsService = new VectorClipJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -439,6 +454,7 @@ export class ProcessingService extends CommonServiceBase {
         var vectorClipJobsService = new VectorClipJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -475,6 +491,7 @@ export class ProcessingService extends CommonServiceBase {
         var overlayGeoJobsService = new OverlayGeoJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -499,6 +516,7 @@ export class ProcessingService extends CommonServiceBase {
         var overlayGeoJobsService = new OverlayGeoJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -524,6 +542,7 @@ export class ProcessingService extends CommonServiceBase {
         var overlayGeoJobsService = new OverlayGeoJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -560,6 +579,7 @@ export class ProcessingService extends CommonServiceBase {
         var buffersAnalystJobsService = new BuffersAnalystJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -584,6 +604,7 @@ export class ProcessingService extends CommonServiceBase {
         var buffersAnalystJobsService = new BuffersAnalystJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -609,6 +630,7 @@ export class ProcessingService extends CommonServiceBase {
         var buffersAnalystJobsService = new BuffersAnalystJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -645,6 +667,7 @@ export class ProcessingService extends CommonServiceBase {
         var topologyValidatorJobsService = new TopologyValidatorJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -669,6 +692,7 @@ export class ProcessingService extends CommonServiceBase {
         var topologyValidatorJobsService = new TopologyValidatorJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -694,6 +718,7 @@ export class ProcessingService extends CommonServiceBase {
         var topologyValidatorJobsService = new TopologyValidatorJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -730,6 +755,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryAttributesJobsService = new SummaryAttributesJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -754,6 +780,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryAttributesJobsService = new SummaryAttributesJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,
@@ -779,6 +806,7 @@ export class ProcessingService extends CommonServiceBase {
         var summaryAttributesJobsService = new SummaryAttributesJobsService(me.url, {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
+            crossOrigin:me.crossOrigin,
             serverType: me.serverType,
             eventListeners: {
                 scope: me,

dist/classic/iclient-classic.js

@@ -10,14 +10,17 @@ import {FetchRequest} from '../util/FetchRequest';
  * @classdesc iManager 服务基类（有权限限制的类需要实现此类）。
  * @category iManager
  * @param {string} url - iManager 首页地址，如：http://localhost:8390/imanager。
+ * @param {Object} options - 服务参数。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class IManagerServiceBase {
 
-    constructor(url) {
+    constructor(url,options) {
         if (url) {
             var end = url.substr(url.length - 1, 1);
             this.serviceUrl = end === "/" ? url.substr(0, url.length - 2) : url;
         }
+        this.options = options || {};
         this.CLASS_NAME = "SuperMap.iManagerServiceBase";
     }
 
@@ -41,6 +44,7 @@ export class IManagerServiceBase {
         if (!requestOptions.hasOwnProperty("withCredentials")) {
             requestOptions['withCredentials'] = true;
         }
+        requestOptions['crossOrigin'] = this.options.crossOrigin;
         var token = SecurityManager.imanagerToken;
         if (token) {
             if (!requestOptions.headers) {

dist/classic/iclient-classic.min.js

@@ -12,14 +12,15 @@ import {IPortalServiceBase} from './iPortalServiceBase';
  * @extends {SuperMap.iPortalServiceBase}
  * @param {string} seviceUrl - 服务地址。
  * @param {Object} params - 服务请求参数。
- *
+ * @param {boolean} [params.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [params.crossOrigin] - 请求是否携带 cookie。 * 
  */
 export class IPortalService extends IPortalServiceBase {
 
 
 
     constructor(serviceUrl, params) {
-        super(serviceUrl);
+        super(serviceUrl, params);
         params = params || {};
         this.addedMapNames = null;
         this.addedSceneNames = null;

dist/leaflet/iclient9-leaflet-es6.js

@@ -14,6 +14,7 @@ import { FetchRequest } from '../util/FetchRequest';
  * @param {string} url - iPortal 服务地址。
  * @param {Object} options - 可选参数。
  * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class IPortalServiceBase {
 
@@ -23,6 +24,7 @@ export class IPortalServiceBase {
         this.serverType = ServerType.iPortal;
         this.CLASS_NAME = "SuperMap.iPortalServiceBase";
         this.withCredentials = options.withCredentials || false;
+        this.crossOrigin = options.crossOrigin
     }
 
     /**
@@ -35,7 +37,7 @@ export class IPortalServiceBase {
      * @returns {Promise} 返回包含请求结果的 Promise 对象。
      */
 
-    request(method, url, param, requestOptions = { withCredentials: this.withCredentials }) {
+    request(method, url, param, requestOptions = {crossOrigin: this.crossOrigin, withCredentials: this.withCredentials }) {
         url = this.createCredentialUrl(url);
         return FetchRequest.commit(method, url, param, requestOptions).then(function (response) {
             return response.json();

dist/leaflet/iclient9-leaflet-es6.min.js

@@ -13,11 +13,13 @@ import {GeoDecodingParameter} from './GeoDecodingParameter';
  * @classdesc 地址匹配服务，包括正向匹配和反向匹配。
  * @param {string} url - 地址匹配服务地址。
  * @param {Object} options - 参数。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class AddressMatchService extends CommonServiceBase {
 
     constructor(url, options) {
         super(url, options);
+        this.options = options || {}
         this.CLASS_NAME = "SuperMap.AddressMatchService";
     }
 
@@ -62,7 +64,7 @@ export class AddressMatchService extends CommonServiceBase {
 
     processAsync(url, params) {
         var me = this;
-        FetchRequest.get(url, params,{proxy: me.proxy}).then(function (response) {
+        FetchRequest.get(url, params,{crossOrigin:me.crossOrigin, proxy: me.proxy}).then(function (response) {
             return response.json();
         }).then(function (result) {
             if (result) {

dist/leaflet/iclient9-leaflet.js

@@ -13,6 +13,7 @@ import {Util} from '../commontypes/Util';
  * @param {string} url - 服务的访问地址。如：</br>http://localhost:8090/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst。</br>
  * @param {Object} options - 参数。</br>
  * @param {Object} options.eventListeners - 需要被注册的监听器对象。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @extends {SuperMap.SpatialAnalystBase}
  * @example 例如：
  * (start code)

dist/leaflet/iclient9-leaflet.min.js

@@ -16,6 +16,7 @@ import {GeometryBufferAnalystParameters} from './GeometryBufferAnalystParameters
  * @param {string} url - 服务的访问地址。如：http://localhost:8090/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst。
  * @param {Object} options - 参数。</br>
  * @param {Object} options.eventListeners - 需要被注册的监听器对象。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @extends {SuperMap.SpatialAnalystBase}
  * @example 例如：
  * (start code)

dist/mapboxgl/iclient9-mapboxgl-es6.js

@@ -12,6 +12,7 @@ import {BuffersAnalystJobsParameter} from './BuffersAnalystJobsParameter';
  * @extends {SuperMap.ProcessingServiceBase}
  * @param {string} url - 服务地址。
  * @param {Object} options - 参数。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class BuffersAnalystJobsService extends ProcessingServiceBase {
     constructor(url, options) {

dist/mapboxgl/iclient9-mapboxgl-es6.min.js

@@ -15,6 +15,7 @@ import {BurstPipelineAnalystParameters} from './BurstPipelineAnalystParameters';
  *                       例如: "http://localhost:8090/iserver/services/test/rest/networkanalyst/WaterNet@FacilityNet"。
  * @param {Object} options - 参数。
  * @param {Object} options.eventListeners - 需要被注册的监听器对象。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class BurstPipelineAnalystService extends NetworkAnalystServiceBase {
 

dist/mapboxgl/iclient9-mapboxgl-widgets-vue.js

@@ -18,8 +18,9 @@ import {CommonServiceBase} from './CommonServiceBase';
  *        发送请求格式类似于："http://localhost:8090/iserver/services/map-ChartW/rest/maps/海图/chartFeatureInfoSpecs.json"。
  * @param {Object} options - 参数。
  * @param {Object} options.eventListeners - 事件监听器对象。有processCompleted属性可传入处理完成后的回调函数。processFailed属性传入处理失败后的回调函数。
- * @param {SuperMap.ServerType} options.serverType - 服务器类型，iServer|iPortal|Online。
- * @param {SuperMap.DataFormat} options.format - 查询结果返回格式，目前支持 iServerJSON 和 GeoJSON 两种格式，参数格式为"ISERVER","GEOJSON"。
+ * @param {SuperMap.ServerType} [options.serverType=SuperMap.ServerType.ISERVER] - 服务器类型，iServer|iPortal|Online。
+ * @param {SuperMap.DataFormat} [options.format] - 查询结果返回格式，目前支持 iServerJSON 和 GeoJSON 两种格式，参数格式为"ISERVER","GEOJSON"。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  */
 export class ChartFeatureInfoSpecsService extends CommonServiceBase {
 

dist/mapboxgl/iclient9-mapboxgl-widgets-vue.min.js

@@ -20,8 +20,9 @@ import {GeoJSON} from '../format/GeoJSON';
  * @param {string} url - 地图查询服务访问地址。如："http://192.168.168.35:8090/iserver/services/map-ChartW/rest/maps/海图"。
  * @param {Object} options - 参数。
  * @param {Object} options.eventListeners - 事件监听器对象。有processCompleted属性可传入处理完成后的回调函数。processFailed属性传入处理失败后的回调函数。
- * @param {SuperMap.ServerType} options.serverType - 服务器类型，iServer|iPortal|Online。
- * @param {SuperMap.DataFormat} options.format - 查询结果返回格式，目前支持 iServerJSON 和 GeoJSON 两种格式。参数格式为"ISERVER","GEOJSON"。
+ * @param {SuperMap.ServerType} [options.serverType=SuperMap.ServerType.ISERVER] - 服务器类型，iServer|iPortal|Online。
+ * @param {SuperMap.DataFormat} [options.format] - 查询结果返回格式，目前支持 iServerJSON 和 GeoJSON 两种格式。参数格式为"ISERVER","GEOJSON"。
+ * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @example
  * 下面示例显示了如何进行海图属性查询：
  * var nameArray = ["GB4X0000_52000"];