Merge branch 'master' into deploy

PanJiaChen · PanJiaChen · commit 86fa7dd65470 · 2019-04-01T17:39:24.000+08:00
diff --git a/mock/index.js b/mock/index.js
@@ -11,7 +11,10 @@ export function mockXHR() {
   Mock.XHR.prototype.send = function() {
     if (this.custom.xhr) {
       this.custom.xhr.withCredentials = this.withCredentials || false
-      this.custom.xhr.responseType = this.responseType
+
+      if (this.responseType) {
+        this.custom.xhr.responseType = this.responseType
+      }
     }
     this.proxy_send(...arguments)
   }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@ export function mockXHR() {`
`11`	`11`	`Mock.XHR.prototype.send = function() {`
`12`	`12`	`if (this.custom.xhr) {`
`13`	`13`	`this.custom.xhr.withCredentials = this.withCredentials \|\| false`
`14`		`- this.custom.xhr.responseType = this.responseType`
	`14`	`+`
	`15`	`+ if (this.responseType) {`
	`16`	`+ this.custom.xhr.responseType = this.responseType`
	`17`	`+ }`
`15`	`18`	`}`
`16`	`19`	`this.proxy_send(...arguments)`
`17`	`20`	`}`