【fix】当请求体为formdata时Content-Type不填充默认是由浏览器确认 review by huangqinghua

songyumeng · songyumeng · commit 1952c5d3ac74 · 2021-03-26T17:34:08.000+08:00
diff --git a/src/common/util/FetchRequest.js b/src/common/util/FetchRequest.js
@@ -191,7 +191,7 @@ export var FetchRequest = SuperMap.FetchRequest = {
     _fetch: function (url, params, options, type) {
         options = options || {};
         options.headers = options.headers || {};
-        if (!options.headers['Content-Type']) {
+        if (!options.headers['Content-Type'] && !FormData.prototype.isPrototypeOf(params)) {
             options.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
         }
         if (options.timeout) {
diff --git a/test/common/util/FetchRequestSpec.js b/test/common/util/FetchRequestSpec.js
@@ -89,6 +89,32 @@ describe('FetchRequest', () => {
             timeout: 45000
         });
     });
+    it('formdata', () => {
+        var url = 'http://test.supermap.io';
+        var data = new FormData();
+        FetchRequest.post(url, new FormData(), { withCredentials: 'depends' });
+        expect(fetch).toHaveBeenCalledWith('http://test.supermap.io.json', {
+            method: 'POST',
+            body: data,
+            headers: { },
+            credentials: 'same-origin',
+            mode: 'cors',
+            timeout: 45000
+        });
+    });
+    it('formdata_includeContentType', () => {
+        var url = 'http://test.supermap.io';
+        var data = new FormData();
+        FetchRequest.post(url, new FormData(), { withCredentials: 'depends', headers: { 'Content-Type': 'aaaaa' } });
+        expect(fetch).toHaveBeenCalledWith('http://test.supermap.io.json', {
+            method: 'POST',
+            body: data,
+            headers: { 'Content-Type': 'aaaaa' },
+            credentials: 'same-origin',
+            mode: 'cors',
+            timeout: 45000
+        });
+    });
     afterAll(() => {
         SuperMap.Util.RequestJSONPPromise.limitLength = defaultval;
         setCORS(defaltCors);

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ export var FetchRequest = SuperMap.FetchRequest = {`
`191`	`191`	`_fetch: function (url, params, options, type) {`
`192`	`192`	`options = options \|\| {};`
`193`	`193`	`options.headers = options.headers \|\| {};`
`194`		`- if (!options.headers['Content-Type']) {`
	`194`	`+ if (!options.headers['Content-Type'] && !FormData.prototype.isPrototypeOf(params)) {`
`195`	`195`	`options.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';`
`196`	`196`	`}`
`197`	`197`	`if (options.timeout) {`