sh-tools 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-tools",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "基于xe-ajax和xe-utils二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/api/index.js

@@ -1,84 +1,84 @@
-import XEAjax from 'xe-ajax'
-import Notice from '../components/sh-notification'
-
-class HttpRequest {
-	constructor(options = {}) {
-		this.instance = XEAjax
-		this.options = options
-		this.setOptions(options)
-		this.interceptors()
-	}
-	setOptions(options) {
-		this.instance.setup(options)
-	}
-	// 继承类重写方法 用于处理个性化业务 预留
-	setRequest(request) {}
-	setResponse(response) {}
-	request(options) {
-		return this.instance.ajax(options)
-	}
-	get(url, params, options) {
-		return this.instance.get(url, params, options)
-	}
-	post(url, params, options) {
-		return this.instance.post(url, params, options)
-	}
-	put(url, params, options) {
-		return this.instance.put(url, params, options)
-	}
-	delete(url, params, options) {
-		return this.instance.delete(url, params, options)
-	}
-	patch(url, params, options) {
-		return this.instance.patch(url, params, options)
-	}
-	head(url, params, options) {
-		return this.instance.head(url, params, options)
-	}
-	jsonp(url, params, options) {
-		return this.instance.jsonp(url, params, options)
-	}
-	// 拦截器
-	interceptors() {
-		// 请求拦截
-		this.instance.interceptors.request.use((request, next) => {
-			this.setRequest(request)
-			next()
-		})
-		// 响应拦截
-		this.instance.interceptors.response.use((response, next) => {
-			this.responseNext(response, next)
-		})
-	}
-	// 错误处理
-	async responseNext(response, next) {
-		const { status, statusText, headers } = response
-		let resBody = null
-		try {
-			resBody = await response.json()
-		} catch (e) {
-			resBody = response.__response || {}
-		}
-		let errorMsg = resBody.error || resBody.msg || resBody.message || resBody.result || statusText || '系统错误'
-		switch (status) {
-			case 0:
-				Notice.error({ title: '请求错误', content: errorMsg })
-				break
-			case 200:
-				break
-			case 401:
-				Notice.error({ title: '系统提示 401', content: '未授权，请重新登录' })
-				return
-			case 504:
-				Notice.error({ title: '系统提示 网络超时', content: errorMsg })
-				break
-			default:
-				Notice.error({ title: `系统提示 ${status}`, content: errorMsg })
-				break
-		}
-		this.setResponse(resBody)
-		next({ status: 200, body: resBody })
-	}
-}
-
-export default HttpRequest
+import XEAjax from 'xe-ajax'
+import Notice from '../components/sh-notification'
+
+class HttpRequest {
+	constructor(options = {}) {
+		this.instance = XEAjax
+		this.options = options
+		this.setOptions(options)
+		this.interceptors()
+	}
+	setOptions(options) {
+		this.instance.setup(options)
+	}
+	// 继承类重写方法 用于处理个性化业务 预留
+	setRequest(request) {}
+	async setResponse(body, response, status) {
+		return { status: 200, body }
+	}
+	request(options) {
+		return this.instance.ajax(options)
+	}
+	get(url, params, options) {
+		return this.instance.get(url, params, options)
+	}
+	post(url, params, options) {
+		return this.instance.post(url, params, options)
+	}
+	put(url, params, options) {
+		return this.instance.put(url, params, options)
+	}
+	delete(url, params, options) {
+		return this.instance.delete(url, params, options)
+	}
+	patch(url, params, options) {
+		return this.instance.patch(url, params, options)
+	}
+	head(url, params, options) {
+		return this.instance.head(url, params, options)
+	}
+	jsonp(url, params, options) {
+		return this.instance.jsonp(url, params, options)
+	}
+	// 拦截器
+	interceptors() {
+		// 请求拦截
+		this.instance.interceptors.request.use((request, next) => {
+			this.setRequest(request)
+			next()
+		})
+		// 响应拦截
+		this.instance.interceptors.response.use((response, next) => {
+			this.responseNext(response, next)
+		})
+	}
+	// 错误处理
+	async responseNext(response, next) {
+		const { status, statusText, headers } = response
+		let resBody = null
+		try {
+			resBody = await response.json()
+		} catch (e) {
+			resBody = response._response || {}
+		}
+		let errorMsg = resBody.error || resBody.msg || resBody.message || resBody.result || statusText || '系统错误'
+		switch (status) {
+			case 0:
+				Notice.error({ title: '请求错误', content: errorMsg })
+				break
+			case 401:
+				Notice.error({ title: '系统提示 401', content: '未授权，请重新登录' })
+				return
+			case 504:
+				Notice.error({ title: '系统提示 网络超时', content: errorMsg })
+				break
+			default:
+				Notice.error({ title: `系统提示 ${status}`, content: errorMsg })
+				break
+		}
+		let nextBody = await this.setResponse(resBody, response, status)
+		next(nextBody)
+	}
+}
+
+export default HttpRequest