【fix】修复ICL1331，service相关回调代码中发生编码错误不再进入失败回调 review by luoxiao

songyumeng · songyumeng · commit 8d5ce9f48722 · 2021-05-19T18:12:14.000+08:00
diff --git a/src/common/iServer/CommonServiceBase.js b/src/common/iServer/CommonServiceBase.js
@@ -37,7 +37,6 @@ export class CommonServiceBase {
 
         this.proxy = null;
 
-
         this.index = null;
 
         this.length = null;
@@ -274,7 +273,7 @@ export class CommonServiceBase {
             timeout: options.async ? 0 : null,
             proxy: options.proxy
         })
-            .then(function(response) {
+            .then(function (response) {
                 if (response.text) {
                     return response.text();
                 }
@@ -283,34 +282,41 @@ export class CommonServiceBase {
                 }
                 return response;
             })
-            .then(function(text) {
-                var result = text;
+            .then(function (text) {
+                let requestResult = text;
                 if (typeof text === 'string') {
-                    result = new JSONFormat().read(text);
+                    requestResult = new JSONFormat().read(text);
                 }
-                if (!result || result.error || (result.code >= 300 && result.code !== 304)) {
-                    if (result && result.error) {
-                        result = {
-                            error: result.error
+                if (
+                    !requestResult ||
+                    requestResult.error ||
+                    (requestResult.code >= 300 && requestResult.code !== 304)
+                ) {
+                    if (requestResult && requestResult.error) {
+                        requestResult = {
+                            error: requestResult.error
                         };
                     } else {
-                        result = {
-                            error: result
+                        requestResult = {
+                            error: requestResult
                         };
                     }
                 }
-                if (result.error) {
+                return requestResult;
+            })
+            .catch(function (e) {
+                var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
+                failure(e);
+            })
+            .then((requestResult) => {
+                if (requestResult.error) {
                     var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
-                    failure(result);
+                    failure(requestResult);
                 } else {
-                    result.succeed = result.succeed == undefined ? true : result.succeed;
+                    requestResult.succeed = requestResult.succeed == undefined ? true : requestResult.succeed;
                     var success = options.scope ? FunctionExt.bind(options.success, options.scope) : options.success;
-                    success(result);
+                    success(requestResult);
                 }
-            })
-            .catch(function(e) {
-                var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
-                failure(e);
             });
     }
 }
diff --git a/test/openlayers/services/GetFeaturesByBufferSpec.js b/test/openlayers/services/GetFeaturesByBufferSpec.js
@@ -125,4 +125,50 @@ describe('openlayers_FeatureService_getFeaturesByBuffer', () => {
             done();
         });
     });
+    it('getFeaturesByBuffer_ICL1331', done => {
+        var polygon = new Polygon([
+            [
+                [-20, 20],
+                [-20, -20],
+                [20, -20],
+                [20, 20],
+                [-20, 20]
+            ]
+        ]);
+        var bufferParam = new GetFeaturesByBufferParameters({
+            datasetNames: ['World:Capitals'],
+            bufferDistance: 10,
+            geometry: polygon,
+            fromIndex: 1,
+            toIndex: 3
+        });
+        var getFeaturesByBuffeService = new FeatureService(featureServiceURL, options);
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe('POST');
+            expect(testUrl).toBe(featureServiceURL + '/featureResults?returnContent=true&fromIndex=1&toIndex=3');
+            var paramsObj = JSON.parse(params.replace(/'/g, '"'));
+            expect(paramsObj.datasetNames[0]).toBe('World:Capitals');
+            expect(paramsObj.bufferDistance).toEqual(10);
+            expect(paramsObj.getFeatureMode).toBe('BUFFER');
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
+        });
+        let errorCalled = false;
+        let callback = false;
+        setTimeout(()=>{
+            expect(callback).toBeTrue();
+            expect(errorCalled).toBeFalse();
+            done();
+        },5000)
+        getFeaturesByBuffeService.getFeaturesByBuffer(bufferParam, testResult => {
+            callback= true;
+            serviceResult = testResult;
+            if(serviceResult.type == "processFailed"){
+                errorCalled = true;
+            }else{
+                expect(serviceResult.type).toBe('processCompleted');
+                serviceResult[AAA]
+            }
+        });
+    });
 });
