Commit 24d2130e by golton_gao

update: 优化代码

parent dc4a15fb
......@@ -46,6 +46,6 @@ module.exports = {
// allow async-await
'generator-star-spacing': 0,
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
'no-debugger': process.env.NODE_ENV !== 'development' ? 2 : 0
}
}
......@@ -12,6 +12,10 @@ function isObject (value) {
return value !== null && typeof value === 'object'
}
function isString (fd) {
return Object.prototype.toString.call(fd) === '[object String]'
}
function isFormData (fd) {
return Object.prototype.toString.call(fd) === '[object FormData]'
}
......@@ -35,7 +39,7 @@ function params2object (url) {
.forEach((n) => {
n = n.split('=')
if (n.length === 2) {
params[n[0]] = n[1]
params[n[0]] = decodeURIComponent(n[1])
}
})
}
......@@ -43,6 +47,7 @@ function params2object (url) {
}
function request (opt) {
let serializer = opt.serializer || 'form'
opt = opt || {}
if (!opt.url) {
return Promise.reject('interface url is required!')
......@@ -78,35 +83,52 @@ function request (opt) {
// post非json即是form。
if (opt.method.toLowerCase() === 'post') {
var data = opt.data
if (isFormData(data)) {
opt.headers = Object.assign(opt.headers || {}, {
'Content-Type': 'application/x-www-form-urlencoded'
})
const headers = opt.headers
const contentType = headers['content-type'] || headers['Content-Type'] || headers['CONTENT-TYPE'] || ''
if (contentType.indexOf('application/json') !== -1) {
serializer = 'json'
}
if ((serializer === 'form') && isFormData(data)) {
opt.data = formData2obj(data)
} else if (isObject(data)) {
opt.headers = Object.assign(opt.headers || {}, {
'Content-Type': 'application/json;charset=UTF-8'
})
} else if (isString(data)) {
if (serializer === 'json') {
try {
opt.data = JSON.parse(data)
} catch (error) {
opt.data = {}
}
} else {
opt.data = params2object(data)
}
}
}
// 处理header
opt.headers = opt.headers || {}
const headers = {}
// headers字段值必须是字符串型
Object.keys(opt.headers).forEach(function (key) {
var val = opt.headers[key]
var type = typeof val
if (type === 'undefined') {
delete opt.headers[key]
} else if (type !== 'string') {
opt.headers[key] = val + ''
if (val) {
var type = typeof val
if (type !== 'string') {
val = val + ''
}
// 因content-type可能存在大小写不规范,这里先过滤掉,后面根据serializer统一添加
var _key = key.toLowerCase()
if (_key !== 'content-type') {
headers[_key] = val
}
}
})
// 根据serializer统一添加content-type
headers['content-type'] = serializer === 'json' ? 'application/json' : 'application/x-www-form-urlencoded'
opt.headers = headers
return new Promise(function (resolve, reject) {
window.qing.call('request', {
url: opt.url,
method: opt.method,
method: opt.method.toUpperCase(),
headers: opt.headers,
header: opt.headers,
data: opt.data || {},
......
......@@ -11,7 +11,7 @@ import modules from './modules'
Vue.use(Vuex)
const debug = process.env.NODE_ENV !== 'production'
const debug = process.env.NODE_ENV === 'development'
Vue.config.debug = debug
export default new Vuex.Store({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment