【update】1) webMap升级。将iclien 通过sql查询feature接口升级。通过web添加rest data会受到影响。测试后没有问题

Yuki-Zhao · Yuki-Zhao · commit 69a8b30071e6 · 2020-07-13T14:03:35.000+08:00
升级原因：1）之前url中直接有代理地址，iclient修改了代码，导致会报错。有开出proxy参数配置代理地址 2）iclient建议使用新接口，以免ol的类型传递，解析不了。虽然这个接口没有这种问题出现
（reviewed by chengl）
diff --git a/src/openlayers/core/Util.js b/src/openlayers/core/Util.js
@@ -3,11 +3,11 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import {Unit, Bounds, GeoJSON as GeoJSONFormat, FilterParameter,
     GetFeaturesBySQLParameters,
-    GetFeaturesBySQLService,
     QueryBySQLParameters,
     QueryOption
 } from '@supermap/iclient-common';
 import { QueryService } from '../services/QueryService';
+import { FeatureService } from '../services/FeatureService';
 import * as olUtil from 'ol/util';
 
 /**
@@ -336,36 +336,29 @@ export class Util {
      * @description 获取feature
      * @param {string} url - 获取feature的请求地址
      * @param {string} datasetNames - 数据集名称
+     * @param {object} serviceOptions - 服务类需要的参数
      * @param {function} processCompleted - 成功请求的回调函数
      * @param {function} processFaild - 失败请求的回调函数
      */
-    static getFeatureBySQL(url, datasetNames, processCompleted, processFaild) {
-        let getFeatureParam, getFeatureBySQLService, getFeatureBySQLParams;
-        getFeatureParam = new FilterParameter({
+    static getFeatureBySQL(url, datasetNames, serviceOptions ,processCompleted, processFaild) {
+        let getFeatureParam = new FilterParameter({
             name: datasetNames.join().replace(":", "@")
              // attributeFilter: 'SMID > 0'  // shp第三方发布的数据没有SMID字段，http://yt.ispeco.com:8099/issue/DV-131 
-        });
-        getFeatureBySQLParams = new GetFeaturesBySQLParameters({
-            queryParameter: getFeatureParam,
-            datasetNames: datasetNames,
-            fromIndex: 0,
-            toIndex: 100000,
-            maxFeatures: 100000,
-            returnContent: true
-        });
-        let options = {
-            eventListeners: {
-                processCompleted: function (getFeaturesEventArgs) {
-                    processCompleted && processCompleted(getFeaturesEventArgs);
-                },
-                processFailed: function (e) {
-                    processFaild && processFaild(e);
-                }
-            },
-            withCredentials: true
+        }), getFeatureBySQLParams = new GetFeaturesBySQLParameters({
+                queryParameter: getFeatureParam,
+                datasetNames: datasetNames,
+                fromIndex: 0,
+                toIndex: 100000,
+                maxFeatures: 100000,
+                returnContent: true
+        }), callback = (serviceResult) => {
+            if(serviceResult.type === "processCompleted") {
+                processCompleted && processCompleted(serviceResult); 
+            } else {
+                processFaild && processFaild(serviceResult);  
+            }
         };
-        getFeatureBySQLService = new GetFeaturesBySQLService(url, options);
-        getFeatureBySQLService.processAsync(getFeatureBySQLParams);
+        new FeatureService(url, serviceOptions).getFeaturesBySQL(getFeatureBySQLParams, callback);
     }
 
     static queryFeatureBySQL(url, layerName, attributeFilter, fields, epsgCode, processCompleted, processFaild, startRecord, recordLength, onlyAttribute) {
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -900,7 +900,7 @@ export class WebMap extends Observable {
             url: layerInfo.url,
             wrapX: false,
             serverType: serverType,
-            crossOrigin: 'anonymous',
+            // crossOrigin: 'anonymous', //在IE11.0.9600版本，会影响通过注册服务打开的iserver地图，不出图。因为没有携带cookie会报跨域问题
             // extent: this.baseLayerExtent,
             prjCoordSys:{ epsgCode: isBaseLayer ? layerInfo.projection.split(':')[1] : this.baseProjection.split(':')[1] },
             format: layerInfo.format
@@ -1763,9 +1763,12 @@ export class WebMap extends Observable {
         let that = this,dataSource = layer.dataSource,
             url = layer.dataSource.url,
             dataSourceName= dataSource.dataSourceName || layer.name;
-        let requestUrl = that.getRequestUrl(url);
+        let requestUrl = that.formatUrlWithCredential(url), serviceOptions = {};
+        if(!this.excludePortalProxyUrl && !CommonUtil.isInTheSameDomain(requestUrl)) {
+            serviceOptions.proxy = this.getProxy();
+        }
         //因为itest上使用的https，iserver是http，所以要加上代理
-        Util.getFeatureBySQL(requestUrl, [dataSourceName], function (result) {
+        Util.getFeatureBySQL(requestUrl, [dataSourceName], serviceOptions, function (result) {
             let features = that.parseGeoJsonData2Feature({
                 allDatas: {
                     features: result.result.features.features
@@ -2241,9 +2244,12 @@ export class WebMap extends Observable {
         if(dataSource.type === "USER_DATA" || dataSource.accessType==="DIRECT" ) {
             that.addGeojsonFromUrl(layerInfo, null, layerIndex)
         } else {
-            let requestUrl = that.getRequestUrl(url);
+            let requestUrl = that.formatUrlWithCredential(url), serviceOptions = {};
+            if(!this.excludePortalProxyUrl && !CommonUtil.isInTheSameDomain(requestUrl)) {
+                serviceOptions.proxy = this.getProxy();
+            }
             //因为itest上使用的https，iserver是http，所以要加上代理
-            Util.getFeatureBySQL(requestUrl, [dataSourceName], function (result) {
+            Util.getFeatureBySQL(requestUrl, [dataSourceName], serviceOptions, function (result) {
                 let features = that.parseGeoJsonData2Feature({
                     allDatas: {
                         features: result.result.features.features
@@ -3516,18 +3522,27 @@ export class WebMap extends Observable {
      * @returns {Promise<T | never>} 请求地址
      */
     getRequestUrl(url) {
-        if(this.credentialValue) {
-            //有token之类的配置项
-            url = url.indexOf("?") === -1 ? `${url}?${this.credentialKey}=${this.credentialValue}` :
-            `${url}&${this.credentialKey}=${this.credentialValue}`;
-        }
+        this.formatUrlWithCredential(url);
         //如果传入进来的url带了代理则不需要处理
         if(this.excludePortalProxyUrl) {
             return;
         }
         return CommonUtil.isInTheSameDomain(url) ? url : `${this.getProxy()}${encodeURIComponent(url)}`;
     }
 
+    /**
+     * 给url带上凭证密钥
+     * @param {*} url 地址
+     */
+    formatUrlWithCredential(url) {
+        if(this.credentialValue) {
+            //有token之类的配置项
+            url = url.indexOf("?") === -1 ? `${url}?${this.credentialKey}=${this.credentialValue}` :
+            `${url}&${this.credentialKey}=${this.credentialValue}`;
+        }  
+        return url;
+    }
+
     /**
      * @private
      * @function ol.supermap.WebMap.prototype.getProxy
