Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

# Conflicts:
#	test/test-main-common.js

Author: MyShallowTime

src/common/util/FetchRequest.js

@@ -129,7 +129,7 @@ export var FetchRequest = SuperMap.FetchRequest = {
                 url: url += "&_method=PUT",
                 data: params
             };
-            return SuperMap.Util.RequestJSONPPromise.DELETE(config);
+            return SuperMap.Util.RequestJSONPPromise.PUT(config);
 
         }
         return this._fetch(url, params, options, 'PUT');

test/common/util/FetchRequestSpec.js

@@ -0,0 +1,37 @@
+import { FetchRequest, isCORS, setCORS } from '../../../src/common//util/FetchRequest';
+
+describe('FetchRequest', () => {
+    var defaultval = SuperMap.Util.RequestJSONPPromise.limitLength;
+    var defaltCors=isCORS();
+    it('RequestJSONPPromise', () => {
+        var url = "http://test.supermap.io/examples/leaflet/editor.html#addressMatchService";
+        var params;
+        var options;
+        spyOn(SuperMap.Util.RequestJSONPPromise, 'issue').and.callThrough();
+        setCORS(false);
+        FetchRequest.get(url, params, options);
+        expect(SuperMap.Util.RequestJSONPPromise.issue).toHaveBeenCalled();
+        var paramsde = {
+            "completeLineSymbolDisplayed": false,
+            "visible": true,
+        };
+        SuperMap.Util.RequestJSONPPromise.limitLength = 5;
+        var deleteUri = "http://test/GUID=PCdd8b1ab00896b3a7a&app=ydrive&cl=desktop?leftBottom%22%20:%20%7B%22x%22:NaN,%22y%22:NaN%7D,%22rightTo"
+        FetchRequest.delete(deleteUri, paramsde, options);
+        expect(SuperMap.Util.RequestJSONPPromise.issue.calls.count()).toBe(2);
+
+        FetchRequest.post(deleteUri, paramsde, options);
+        expect(SuperMap.Util.RequestJSONPPromise.issue.calls.count()).toBe(3);
+
+        SuperMap.Util.RequestJSONPPromise.limitLength = 180;
+        spyOn(FetchRequest, '_fetchJsonp').and.callFake(() => {
+        });
+        FetchRequest.put(deleteUri, paramsde, options);
+        expect(SuperMap.Util.RequestJSONPPromise.issue.calls.count()).toBe(4);
+    });
+
+    afterAll(() => {
+        SuperMap.Util.RequestJSONPPromise.limitLength = defaultval;
+        setCORS(defaltCors);
+    });
+})

test/test-main-common.js

@@ -168,3 +168,5 @@ import './common/thirdparty/elasticsearch/ElasticSearchSpec.js';
 import './common/widgets/chart/ChartModelSpec.js';
 import './common/widgets/chart/ChartViewModelSpec.js';
 import './common/widgets/chart/ChartViewSpec.js';
+
+import './common/util/FetchRequestSpec';