Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xjbieke
axios
提交
d7820471
A
axios
项目概览
xjbieke
/
axios
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
axios
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7820471
编写于
3月 09, 2018
作者:
M
Martti Laine
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean up PR
上级
5bfd2ea9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
38 deletion
+26
-38
lib/axios.js
lib/axios.js
+1
-1
lib/core/Axios.js
lib/core/Axios.js
+3
-7
lib/utils.js
lib/utils.js
+22
-30
未找到文件。
lib/axios.js
浏览文件 @
d7820471
...
...
@@ -32,7 +32,7 @@ axios.Axios = Axios;
// Factory for creating new instances
axios
.
create
=
function
create
(
instanceConfig
)
{
return
createInstance
(
utils
.
mergeConfig
(
axios
.
defaults
,
instanceConfig
||
{}
));
return
createInstance
(
utils
.
mergeConfig
(
axios
.
defaults
,
instanceConfig
));
};
// Expose Cancel & CancelToken
...
...
lib/core/Axios.js
浏览文件 @
d7820471
...
...
@@ -23,21 +23,17 @@ function Axios(instanceConfig) {
* @param {Object} config The config specific for this request (merged with this.defaults)
*/
Axios
.
prototype
.
request
=
function
request
(
config
)
{
config
=
config
||
{};
/*eslint no-param-reassign:0*/
// Allow for axios('example/url'[, config]) a la fetch API
if
(
typeof
config
===
'
string
'
)
{
config
=
arguments
[
1
]
||
{};
config
.
url
=
arguments
[
0
];
}
if
(
!
config
.
method
)
{
config
.
method
=
'
get
'
;
}
else
{
config
=
config
||
{};
}
config
=
utils
.
mergeConfig
(
this
.
defaults
,
config
);
config
.
method
=
config
.
method
.
toLowerCase
()
;
config
.
method
=
config
.
method
?
config
.
method
.
toLowerCase
()
:
'
get
'
;
// Hook up interceptors middleware
var
chain
=
[
dispatchRequest
,
undefined
];
...
...
lib/utils.js
浏览文件 @
d7820471
...
...
@@ -279,47 +279,39 @@ function extend(a, b, thisArg) {
return
a
;
}
/**
* Config-specific merge-function which creates a new config-object
* based on given defaults and instance config.
*
* @param {Object} defaults Defaults
* @param {Object} instanceConfig Instance-specific config
* @returns {Object} New object resulting from merging instanceConfig to defaults
*/
function
mergeConfig
(
defaults
,
instanceConfig
)
{
instanceConfig
=
instanceConfig
||
{};
var
config
=
{};
forEach
([
'
url
'
,
'
method
'
,
'
params
'
,
'
data
'
],
function
(
prop
)
{
forEach
([
'
url
'
,
'
method
'
,
'
params
'
,
'
data
'
],
function
valueFromInstanceConfig
(
prop
)
{
config
[
prop
]
=
instanceConfig
[
prop
];
});
forEach
([
'
headers
'
,
'
auth
'
,
'
proxy
'
],
function
(
prop
)
{
forEach
([
'
headers
'
,
'
auth
'
,
'
proxy
'
],
function
mergeInstanceConfigWithDefaults
(
prop
)
{
if
(
!
isUndefined
(
instanceConfig
[
prop
]))
{
if
(
!
isObject
(
instanceConfig
[
prop
]))
{
config
[
prop
]
=
instanceConfig
[
prop
]
;
if
(
isObject
(
instanceConfig
[
prop
]))
{
config
[
prop
]
=
merge
(
defaults
[
prop
],
instanceConfig
[
prop
])
;
}
else
{
config
[
prop
]
=
merge
(
defaults
[
prop
],
instanceConfig
[
prop
]
);
config
[
prop
]
=
instanceConfig
[
prop
];
}
}
else
if
(
!
isUndefined
(
defaults
[
prop
]))
{
config
[
prop
]
=
JSON
.
parse
(
JSON
.
stringify
(
defaults
[
prop
]));
}
});
var
remainingProperties
=
[
'
baseURL
'
,
'
transformRequest
'
,
'
transformResponse
'
,
'
paramsSerializer
'
,
'
timeout
'
,
'
withCredentials
'
,
'
adapter
'
,
'
responseType
'
,
'
xsrfCookieName
'
,
'
xsrfHeaderName
'
,
'
onUploadProgress
'
,
'
onDownloadProgress
'
,
'
maxContentLength
'
,
'
validateStatus
'
,
'
maxRedirects
'
,
'
httpAgent
'
,
'
httpsAgent
'
,
'
cancelToken
'
];
forEach
(
remainingProperties
,
function
(
prop
)
{
config
[
prop
]
=
!
isUndefined
(
instanceConfig
[
prop
])
?
instanceConfig
[
prop
]
:
defaults
[
prop
];
forEach
([
'
baseURL
'
,
'
transformRequest
'
,
'
transformResponse
'
,
'
paramsSerializer
'
,
'
timeout
'
,
'
withCredentials
'
,
'
adapter
'
,
'
responseType
'
,
'
xsrfCookieName
'
,
'
xsrfHeaderName
'
,
'
onUploadProgress
'
,
'
onDownloadProgress
'
,
'
maxContentLength
'
,
'
validateStatus
'
,
'
maxRedirects
'
,
'
httpAgent
'
,
'
httpsAgent
'
,
'
cancelToken
'
],
function
defaultToInstanceConfig
(
prop
)
{
config
[
prop
]
=
isUndefined
(
instanceConfig
[
prop
])
?
defaults
[
prop
]
:
instanceConfig
[
prop
];
});
return
config
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录