Merge branch 'master' of https://github.com/MapGIS/WebClient-JavaScript

Author: hezhentao

src/service/baseserver/CommonServiceBase.js

@@ -239,12 +239,20 @@ class CommonServiceBase {
             withCredentials: options.withCredentials,
             timeout: options.async ? 0 : null,
             proxy: options.proxy
-        }).then(function (response) {
+        })
+        .then(function (response) {
             if (response.text) {
                 return response.text();
             }
             return response.json();
-        }).then(function (text) {
+        })
+        .catch(function(error) {
+            let result = {error: true, value: {}};
+            var failure = (options.scope) ? bind(options.failure, options.scope) : options.failure;
+            failure(result);
+        })
+        .then(function (text) {
+            if (!text) return;
             var result = null;
             if (typeof text === "string" && (text.toLowerCase() === 'true' || text.toLowerCase() === 'false')) {
                 result = {};

src/service/baseserver/FetchRequest.js

@@ -156,6 +156,8 @@ var FetchRequest = Zondy.FetchRequest = {
             timeout: RequestTimeout
         }).then(function (response) {
             return response;
+        }).catch(function(error){
+            return error;
         });
     },
 

src/service/package.json

@@ -9,6 +9,7 @@
   "author": "mapgis",
   "license": "Apache2",
   "dependencies": {
+    "@turf/turf": "^6.3.0",
     "fast-xml-parser": "^3.17.6",
     "qs": "^6.9.4"
   }