fix 兼容iserver服务构造函数传递 eventlisteners 的写法 review by luox

xilanhuaweidapao · xilanhuaweidapao · commit da6d6be326f2 · 2023-09-04T18:06:45.000+08:00
diff --git a/src/common/iServer/AddressMatchService.js b/src/common/iServer/AddressMatchService.js
@@ -79,11 +79,13 @@ export class AddressMatchService extends CommonServiceBase {
       });
     }
     /**
-     * @function AddressMatchService.prototype.serviceProcessCompleted
+     * @function AddressMatchService.prototype.transformResult
      * @param {Object} result - 服务器返回的结果对象。
-     * @description 服务流程是否完成
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
+     * @description 状态完成时转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         if (result.succeed) {
             delete result.succeed;
         }
diff --git a/src/common/iServer/ChartQueryService.js b/src/common/iServer/ChartQueryService.js
@@ -125,11 +125,13 @@ export class ChartQueryService extends CommonServiceBase {
 
 
     /**
-     * @function ChartQueryService.prototype.serviceProcessCompleted
-     * @description 查询完成，执行此方法。
+     * @function ChartQueryService.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         var me = this;
         result = Util.transformResult(result);
         if (result && result.recordsets && me.format === DataFormat.GEOJSON) {
diff --git a/src/common/iServer/CommonServiceBase.js b/src/common/iServer/CommonServiceBase.js
@@ -7,6 +7,7 @@ import { SecurityManager } from '../security/SecurityManager';
 import { Util } from '../commontypes/Util';
 import { JSONFormat } from '../format/JSON';
 import {DataFormat} from '../REST';
+import { FunctionExt } from '../commontypes/BaseTypes';
 
 /**
  * @class CommonServiceBase
@@ -25,7 +26,7 @@ export class CommonServiceBase {
     constructor(url, options) {
         let me = this;
 
-        this.EVENT_TYPES = [];
+        this.EVENT_TYPES = ['processCompleted', 'processFailed'];
 
         this.events = null;
 
@@ -219,28 +220,63 @@ export class CommonServiceBase {
     }
 
     /**
-     * @function CommonServiceBase.prototype.serviceProcessCompleted
-     * @description 状态完成，执行此方法。
+     * @function CommonServiceBase.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      * @private
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         result = Util.transformResult(result);
         return { result, options };
     }
 
     /**
-     * @function CommonServiceBase.prototype.serviceProcessFailed
-     * @description 状态失败，执行此方法。
+     * @function CommonServiceBase.prototype.transformErrorResult
+     * @description 状态失败时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      * @private
      */
-    serviceProcessFailed(result, options) {
+    transformErrorResult(result, options) {
         result = Util.transformResult(result);
         let error = result.error || result;
         return { error, options };
     }
 
+    /**
+    * @function CommonServiceBase.prototype.serviceProcessCompleted
+    * @description 状态完成，执行此方法。
+    * @param {Object} result - 服务器返回的结果对象。
+    * @param {Object} options - 请求参数对象。
+    * @private
+    */
+    serviceProcessCompleted(result, options) {
+        result = Util.transformResult(result);
+        this.events.triggerEvent('processCompleted', {
+            result: result,
+            options: options
+        });
+    }
+
+    /**
+     * @function CommonServiceBase.prototype.serviceProcessFailed
+     * @description 状态失败，执行此方法。
+     * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数对象。对象
+     * @private
+     */
+    serviceProcessFailed(result, options) {
+      result = Util.transformResult(result);
+      let error = result.error || result;
+      this.events.triggerEvent('processFailed', {
+          error: error,
+          options: options
+      });
+    }
+
     _returnContent(options) {
       if (options.scope.format === DataFormat.FGB) {
         return false;
@@ -324,14 +360,25 @@ export class CommonServiceBase {
                   object: this
                 };
                 if (requestResult.error) {
-                    response = {...response, ...this.serviceProcessFailed(requestResult, options)};
+                  // 兼容服务在构造函数中使用 eventListeners 的老用法
+                  if (options.failure === this.serviceProcessFailed) {
+                    var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
+                    failure(requestResult, options);
+                  } else {
+                    response = {...response, ...this.transformErrorResult(requestResult, options)};
                     response.type = 'processFailed';
                     options.failure && options.failure(response);
+                  }
                 } else {
+                  if (options.success === this.serviceProcessCompleted) {
+                    var success = options.scope ? FunctionExt.bind(options.success, options.scope) : options.success;
+                    success(requestResult, options);
+                  } else {
                     requestResult.succeed = requestResult.succeed == undefined ? true : requestResult.succeed;
-                    response = {...response, ...this.serviceProcessCompleted(requestResult, options)};
+                    response = {...response, ...this.transformResult(requestResult, options)};
                     response.type = 'processCompleted';
                     options.success && options.success(response);
+                  }
                 }
                 return response;
             });
diff --git a/src/common/iServer/GeoprocessingService.js b/src/common/iServer/GeoprocessingService.js
@@ -82,7 +82,7 @@ export class GeoprocessingService extends CommonServiceBase {
     waitForJobCompletion(jobId, identifier, options, callback) {
         const me = this;
         const timer = setInterval(function () {
-            const serviceProcessCompleted = function (serverResult) {
+            const transformResult = function (serverResult) {
                 const state = serverResult.result.state.runState;
                 if (serverResult.options.statusCallback) {
                     serverResult.options.statusCallback(state);
@@ -92,7 +92,7 @@ export class GeoprocessingService extends CommonServiceBase {
                   callback(serverResult);
                 }
             };
-            me._processAsync({ url: `${me.url}/${identifier}/jobs/${jobId}`, callback: serviceProcessCompleted });
+            me._processAsync({ url: `${me.url}/${identifier}/jobs/${jobId}`, callback: transformResult });
         }, options.interval);
     }
 
diff --git a/src/common/iServer/GetFeaturesServiceBase.js b/src/common/iServer/GetFeaturesServiceBase.js
@@ -132,11 +132,13 @@ export class GetFeaturesServiceBase extends CommonServiceBase {
     }
 
     /**
-     * @function GetFeaturesServiceBase.prototype.getFeatureComplete
-     * @description 查询完成，执行此方法。
+     * @function GetFeaturesServiceBase.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         var me = this;
         result = Util.transformResult(result);
         if (me.format === DataFormat.GEOJSON && result.features) {
diff --git a/src/common/iServer/GetLayersInfoService.js b/src/common/iServer/GetLayersInfoService.js
@@ -72,11 +72,13 @@ export class GetLayersInfoService extends CommonServiceBase {
     }
 
     /**
-     * @function GetLayersInfoService.prototype.serviceProcessCompleted
-     * @description 编辑完成，执行此方法。
+     * @function GetLayersInfoService.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         var me = this, existRes, layers, len;
         result = Util.transformResult(result);
         existRes = !!result && result.length > 0;
diff --git a/src/common/iServer/MapService.js b/src/common/iServer/MapService.js
@@ -74,14 +74,14 @@ export class MapService extends CommonServiceBase {
         });
     }
 
-    /*
-     * Method: getMapStatusCompleted
-     * 获取地图状态完成，执行此方法。
-     *
-     * Parameters:
-     * {Object} result - 服务器返回的结果对象。
+    /**
+     * @function  MapService.prototype.transformResult
+     * @description 状态完成时转换结果。
+     * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         result = Util.transformResult(result);
         var codeStatus = (result.code >= 200 && result.code < 300) || result.code == 0 || result.code === 304;
         var isCodeValid = result.code && codeStatus;
diff --git a/src/common/iServer/NetworkAnalystServiceBase.js b/src/common/iServer/NetworkAnalystServiceBase.js
@@ -40,11 +40,13 @@ export class NetworkAnalystServiceBase extends CommonServiceBase {
     }
 
     /**
-     * @function NetworkAnalystServiceBase.prototype.serviceProcessCompleted
-     * @description 分析完成，执行此方法。
+     * @function NetworkAnalystServiceBase.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         var me = this, analystResult;
         result = Util.transformResult(result);
         if (result && me.format === DataFormat.GEOJSON && typeof me.toGeoJSONResult === 'function') {
diff --git a/src/common/iServer/ProcessingServiceBase.js b/src/common/iServer/ProcessingServiceBase.js
@@ -102,24 +102,24 @@ export class ProcessingServiceBase extends CommonServiceBase {
             return response.json();
         }).then(function (result) {
             if (result.succeed) {
-                return me.serviceProcessCompleted(result, seconds, callback, processRunningCallback);
+                return me.transformResult(result, seconds, callback, processRunningCallback);
             } else {
-              result = me.serviceProcessFailed(result);
+              result = me.transformErrorResult(result);
               result.options = me;
               result.type = 'processFailed';
               callback(result);
               return result;
             }
         }).catch(function (e) {
-            e = me.serviceProcessFailed({ error: e });
+            e = me.transformErrorResult({ error: e });
             e.options = me;
             e.type = 'processFailed';
             callback(e);
             return e;
         });
     }
 
-    serviceProcessCompleted(result, seconds, callback, processRunningCallback) {
+    transformResult(result, seconds, callback, processRunningCallback) {
         result = Util.transformResult(result);
         seconds = seconds || 1000;
         var me = this;
diff --git a/src/common/iServer/QueryServiceBase.js b/src/common/iServer/QueryServiceBase.js
@@ -102,20 +102,22 @@ export class QueryServiceBase extends CommonServiceBase {
         }
         me.returnFeatureWithFieldCaption = params.returnFeatureWithFieldCaption;
         return me.request({
-            method: "POST",
-            data: jsonParameters,
-            scope: me,
-            success: callback,
-            failure: callback
+          method: "POST",
+          data: jsonParameters,
+          scope: me,
+          success: callback,
+          failure: callback
         });
     }
 
     /**
-     * @function QueryService.prototype.serviceProcessCompleted
-     * @description 查询完成，执行此方法。
+     * @function QueryService.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         var me = this;
         result = Util.transformResult(result);
         var geoJSONFormat = new GeoJSON();
diff --git a/src/common/iServer/SetLayerStatusService.js b/src/common/iServer/SetLayerStatusService.js
@@ -130,11 +130,13 @@ export class SetLayerStatusService extends CommonServiceBase {
     }
 
     /**
-     * @function SetLayerStatusService.prototype.setLayerCompleted
-     * @description 设置完成，执行此方法。
+     * @function SetLayerStatusService.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象，记录设置操作是否成功。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
       var me = this;
       result = Util.transformResult(result);
       if (result != null && me.lastparams != null && me.lastparams.resourceID != null) {
diff --git a/src/common/iServer/SpatialAnalystBase.js b/src/common/iServer/SpatialAnalystBase.js
@@ -40,11 +40,13 @@ export class SpatialAnalystBase extends CommonServiceBase {
     }
 
     /**
-     * @function SpatialAnalystBase.prototype.serviceProcessCompleted
-     * @description 分析完成，执行此方法。
+     * @function SpatialAnalystBase.prototype.transformResult
+     * @description 状态完成时转换结果。
      * @param {Object} result - 服务器返回的结果对象。
+     * @param {Object} options - 请求参数。
+     * @return {Object} 转换结果。
      */
-    serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
         var me = this, analystResult;
         result = Util.transformResult(result);
         if (result && me.format === DataFormat.GEOJSON && typeof me.toGeoJSONResult === 'function') {
diff --git a/src/common/iServer/WebPrintingService.js b/src/common/iServer/WebPrintingService.js
@@ -138,7 +138,7 @@ export class WebPrintingService extends CommonServiceBase {
       return me.request(requestConfig);
     }
 
-     serviceProcessCompleted(result, options) {
+    transformResult(result, options) {
       result = Util.transformResult(result);
       if (result.status === 'FINISHED' || result.status === 'ERROR') {
         clearInterval(this.id);
diff --git a/test/common/iServer/CompatibleSpec.js b/test/common/iServer/CompatibleSpec.js
diff --git a/test/test-main-common.js b/test/test-main-common.js
