Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qianlong66
uni-app
提交
9ec66c88
U
uni-app
项目概览
qianlong66
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ec66c88
编写于
4月 06, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: defineTaskApi
上级
f5373fae
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
702 addition
and
79 deletion
+702
-79
packages/shims-uni-app.d.ts
packages/shims-uni-app.d.ts
+40
-0
packages/uni-api/src/helpers/api/index.ts
packages/uni-api/src/helpers/api/index.ts
+41
-28
packages/uni-api/src/index.ts
packages/uni-api/src/index.ts
+3
-0
packages/uni-api/src/protocols/network/request.ts
packages/uni-api/src/protocols/network/request.ts
+125
-0
packages/uni-h5/dist/uni-h5.esm.js
packages/uni-h5/dist/uni-h5.esm.js
+243
-9
packages/uni-h5/src/service/api/index.ts
packages/uni-h5/src/service/api/index.ts
+2
-0
packages/uni-h5/src/service/api/network/request.ts
packages/uni-h5/src/service/api/network/request.ts
+158
-0
packages/uni-mp-alipay/dist/uni.api.esm.js
packages/uni-mp-alipay/dist/uni.api.esm.js
+15
-7
packages/uni-mp-baidu/dist/uni.api.esm.js
packages/uni-mp-baidu/dist/uni.api.esm.js
+15
-7
packages/uni-mp-qq/dist/uni.api.esm.js
packages/uni-mp-qq/dist/uni.api.esm.js
+15
-7
packages/uni-mp-toutiao/dist/uni.api.esm.js
packages/uni-mp-toutiao/dist/uni.api.esm.js
+15
-7
packages/uni-mp-weixin/dist/uni.api.esm.js
packages/uni-mp-weixin/dist/uni.api.esm.js
+15
-7
packages/uni-quickapp-webview/dist/uni.api.esm.js
packages/uni-quickapp-webview/dist/uni.api.esm.js
+15
-7
未找到文件。
packages/shims-uni-app.d.ts
浏览文件 @
9ec66c88
...
...
@@ -34,6 +34,12 @@ declare namespace UniApp {
topWindow
?:
LayoutWindowOptions
leftWindow
?:
LayoutWindowOptions
rightWindow
?:
LayoutWindowOptions
networkTimeout
:
{
connectSocket
:
number
downloadFile
:
number
request
:
number
uploadFile
:
number
}
}
interface
UniRoute
{
...
...
@@ -202,6 +208,40 @@ declare namespace UniApp {
name
:
string
,
res
:
Parameters
<
Parameters
<
T
>
[
0
]
>
[
0
]
):
void
/**
* 订阅 View 的自定义事件,回调函数会接收所有传入事件触发函数的额外参数。
* @param event
* @param callback
*/
subscribe
(
event
:
string
,
callback
:
Function
):
void
/**
* 取消订阅 View 的自定义事件
* 如果没有提供参数,则移除所有的事件监听器;
* 如果只提供了事件,则移除该事件所有的监听器;
* 如果同时提供了事件与回调,则只移除这个回调的监听器。
* @param event
* @param callback
*/
unsubscribe
(
event
:
string
,
callback
?:
Function
):
void
/**
* 执行 Service 层 API 回调
* @param callbackId
* @param args
*/
invokeCallbackHandler
(
callbackId
:
number
,
args
:
unknown
):
void
/**
* 向 View 层发送事件
* @param event
* @param args
* @param pageId
*/
publishHandler
(
event
:
string
,
args
:
unknown
,
pageId
:
number
):
void
/**
* 接收 View 层事件(通常由 View 层调用,并暴露至全局 UniServiceJSBridge 对象中)
* @param event
* @param args
* @param pageId
*/
subscribeHandler
(
event
:
string
,
args
:
unknown
,
pageId
:
number
):
void
}
}
packages/uni-api/src/helpers/api/index.ts
浏览文件 @
9ec66c88
...
...
@@ -65,9 +65,22 @@ function wrapperOffApi(name: string, fn: Function) {
}
}
function
invokeSuccess
(
id
:
number
,
name
:
string
,
res
:
unknown
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}))
}
function
invokeFail
(
id
:
number
,
name
:
string
,
err
:
string
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
})
}
function
wrapperTaskApi
(
name
:
string
,
fn
:
Function
,
options
?:
ApiOptions
)
{
return
(
args
:
Record
<
string
,
any
>
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)])
return
(
args
:
Record
<
string
,
any
>
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
)
return
fn
(
args
,
{
resolve
:
(
res
:
unknown
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
:
string
)
=>
invokeFail
(
id
,
name
,
err
),
})
}
}
function
wrapperSyncApi
(
fn
:
Function
)
{
...
...
@@ -82,22 +95,18 @@ function wrapperAsyncApi(
return
(
args
:
Record
<
string
,
any
>
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
)
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}))
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
})
})
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
))
}
}
function
wrapperApi
<
T
extends
Function
>
(
function
wrapperApi
(
fn
:
Function
,
name
?:
string
,
protocol
?:
ApiProtocols
,
options
?:
ApiOptions
)
{
return
(
function
(...
args
:
any
[])
{
return
function
(...
args
:
any
[])
{
if
(
__DEV__
)
{
const
errMsg
=
validateProtocols
(
name
!
,
args
,
protocol
)
if
(
errMsg
)
{
...
...
@@ -105,50 +114,54 @@ function wrapperApi<T extends Function>(
}
}
return
fn
.
apply
(
null
,
formatApiArgs
(
args
,
options
))
}
as
unknown
)
as
T
}
}
export
function
defineOnApi
<
T
extends
Function
>
(
name
:
string
,
fn
:
T
,
fn
:
()
=>
void
,
options
?:
ApiOptions
)
{
return
defineApi
(
return
(
defineApi
(
API_TYPE_ON
,
name
,
fn
,
__DEV__
?
API_TYPE_ON_PROTOCOLS
:
undefined
,
options
)
as
T
)
as
unknown
)
as
T
}
export
function
defineOffApi
<
T
extends
Function
>
(
name
:
string
,
fn
:
T
,
fn
:
()
=>
void
,
options
?:
ApiOptions
)
{
return
defineApi
(
return
(
defineApi
(
API_TYPE_OFF
,
name
,
fn
,
__DEV__
?
API_TYPE_ON_PROTOCOLS
:
undefined
,
options
)
as
T
)
as
unknown
)
as
T
}
export
function
defineTaskApi
<
T
extends
Function
>
(
type
TaskApiLike
=
(
args
:
any
)
=>
any
export
function
defineTaskApi
<
T
extends
TaskApiLike
,
P
=
AsyncApiOptions
<
T
>>
(
name
:
string
,
fn
:
T
,
fn
:
(
args
:
Omit
<
P
,
'
success
'
|
'
fail
'
|
'
complete
'
>
,
res
:
{
resolve
:
(
res
:
AsyncApiRes
<
P
>
)
=>
void
reject
:
(
err
?:
string
)
=>
void
}
)
=>
ReturnType
<
T
>
,
protocol
?:
ApiProtocols
,
options
?:
ApiOptions
)
{
return
defineApi
(
API_TYPE_TASK
,
name
,
fn
,
__DEV__
?
protocol
:
undefined
,
options
)
as
T
return
(
promisify
(
defineApi
(
API_TYPE_TASK
,
name
,
fn
,
__DEV__
?
protocol
:
undefined
,
options
)
)
as
unknown
)
as
T
}
export
function
defineSyncApi
<
T
extends
Function
>
(
...
...
@@ -157,13 +170,13 @@ export function defineSyncApi<T extends Function>(
protocol
?:
ApiProtocols
,
options
?:
ApiOptions
)
{
return
defineApi
(
return
(
defineApi
(
API_TYPE_SYNC
,
name
,
fn
,
__DEV__
?
protocol
:
undefined
,
options
)
as
T
)
as
unknown
)
as
T
}
interface
AsyncMethodOptionLike
{
success
?:
(...
args
:
any
[])
=>
void
...
...
packages/uni-api/src/index.ts
浏览文件 @
9ec66c88
...
...
@@ -20,6 +20,9 @@ export * from './protocols/location/openLocation'
export
*
from
'
./protocols/media/chooseImage
'
export
*
from
'
./protocols/media/chooseVideo
'
export
*
from
'
./protocols/media/getImageInfo
'
export
*
from
'
./protocols/network/request
'
export
*
from
'
./protocols/route/route
'
// helpers
...
...
packages/uni-api/src/protocols/network/request.
j
s
→
packages/uni-api/src/protocols/network/request.
t
s
浏览文件 @
9ec66c88
import
{
hasOwn
,
isPlainObject
}
from
'
uni-shared
'
const
method
=
{
OPTIONS
:
'
OPTIONS
'
,
GET
:
'
GET
'
,
HEAD
:
'
HEAD
'
,
POST
:
'
POST
'
,
PUT
:
'
PUT
'
,
DELETE
:
'
DELETE
'
,
TRACE
:
'
TRACE
'
,
CONNECT
:
'
CONNECT
'
}
const
dataType
=
{
JSON
:
'
json
'
}
const
responseType
=
{
TEXT
:
'
text
'
,
ARRAYBUFFER
:
'
arraybuffer
'
}
const
encode
=
encodeURIComponent
function
stringifyQuery
(
url
,
data
)
{
let
str
=
url
.
split
(
'
#
'
)
const
hash
=
str
[
1
]
||
''
str
=
str
[
0
].
split
(
'
?
'
)
let
query
=
str
[
1
]
||
''
url
=
str
[
0
]
const
search
=
query
.
split
(
'
&
'
).
filter
(
item
=>
item
)
query
=
{}
search
.
forEach
(
item
=>
{
item
=
item
.
split
(
'
=
'
)
query
[
item
[
0
]]
=
item
[
1
]
})
for
(
const
key
in
data
)
{
if
(
hasOwn
(
data
,
key
))
{
let
v
=
data
[
key
]
if
(
typeof
v
===
'
undefined
'
||
v
===
null
)
{
v
=
''
}
else
if
(
isPlainObject
(
v
))
{
v
=
JSON
.
stringify
(
v
)
}
query
[
encode
(
key
)]
=
encode
(
v
)
}
}
query
=
Object
.
keys
(
query
)
.
map
(
item
=>
`
${
item
}
=
${
query
[
item
]}
`
)
.
join
(
'
&
'
)
return
url
+
(
query
?
'
?
'
+
query
:
''
)
+
(
hash
?
'
#
'
+
hash
:
''
)
}
export
const
request
=
{
method
:
{
type
:
String
,
validator
(
value
,
params
)
{
value
=
(
value
||
''
).
toUpperCase
()
params
.
method
=
Object
.
values
(
method
).
indexOf
(
value
)
<
0
?
method
.
GET
:
value
}
},
data
:
{
type
:
[
Object
,
String
,
Array
,
ArrayBuffer
],
validator
(
value
,
params
)
{
params
.
data
=
value
||
''
}
},
url
:
{
type
:
String
,
required
:
true
,
validator
(
value
,
params
)
{
if
(
params
.
method
===
method
.
GET
&&
isPlainObject
(
params
.
data
)
&&
Object
.
keys
(
params
.
data
).
length
)
{
// 将 method,data 校验提前,保证 url 校验时,method,data 已被格式化
params
.
url
=
stringifyQuery
(
value
,
params
.
data
)
}
}
},
header
:
{
type
:
Object
,
validator
(
value
,
params
)
{
const
header
=
(
params
.
header
=
value
||
{})
if
(
params
.
method
!==
method
.
GET
)
{
if
(
!
Object
.
keys
(
header
).
find
(
key
=>
key
.
toLowerCase
()
===
'
content-type
'
)
)
{
header
[
'
Content-Type
'
]
=
'
application/json
'
}
}
}
},
dataType
:
{
type
:
String
,
validator
(
value
,
params
)
{
params
.
dataType
=
(
value
||
dataType
.
JSON
).
toLowerCase
()
}
},
responseType
:
{
type
:
String
,
validator
(
value
,
params
)
{
value
=
(
value
||
''
).
toLowerCase
()
params
.
responseType
=
Object
.
values
(
responseType
).
indexOf
(
value
)
<
0
?
responseType
.
TEXT
:
value
}
},
withCredentials
:
{
type
:
Boolean
}
}
import
{
hasOwn
,
isPlainObject
}
from
'
@vue/shared
'
import
{
ApiOptions
,
ApiProtocol
}
from
'
../type
'
export
const
API_REQUEST
=
'
request
'
const
METHOD
=
[
'
GET
'
,
'
OPTIONS
'
,
'
HEAD
'
,
'
POST
'
,
'
PUT
'
,
'
DELETE
'
,
'
TRACE
'
,
'
CONNECT
'
,
]
const
DEFAULT_METHOD
=
'
GET
'
const
dataType
=
{
JSON
:
'
json
'
,
}
const
RESPONSE_TYPE
=
[
'
text
'
,
'
arraybuffer
'
]
const
DEFAULT_RESPONSE_TYPE
=
'
text
'
const
encode
=
encodeURIComponent
function
stringifyQuery
(
url
:
string
,
data
:
Record
<
string
,
any
>
)
{
let
str
=
url
.
split
(
'
#
'
)
const
hash
=
str
[
1
]
||
''
str
=
str
[
0
].
split
(
'
?
'
)
let
query
=
str
[
1
]
||
''
url
=
str
[
0
]
const
search
=
query
.
split
(
'
&
'
).
filter
((
item
)
=>
item
)
const
params
:
Record
<
string
,
string
>
=
{}
search
.
forEach
((
item
)
=>
{
const
part
=
item
.
split
(
'
=
'
)
params
[
part
[
0
]]
=
part
[
1
]
})
for
(
const
key
in
data
)
{
if
(
hasOwn
(
data
,
key
))
{
let
v
=
data
[
key
]
if
(
typeof
v
===
'
undefined
'
||
v
===
null
)
{
v
=
''
}
else
if
(
isPlainObject
(
v
))
{
v
=
JSON
.
stringify
(
v
)
}
params
[
encode
(
key
)]
=
encode
(
v
)
}
}
query
=
Object
.
keys
(
params
)
.
map
((
item
)
=>
`
${
item
}
=
${
params
[
item
]}
`
)
.
join
(
'
&
'
)
return
url
+
(
query
?
'
?
'
+
query
:
''
)
+
(
hash
?
'
#
'
+
hash
:
''
)
}
export
const
RequestProtocol
:
ApiProtocol
=
{
method
:
{
type
:
String
,
},
data
:
{
type
:
[
Object
,
String
,
Array
,
ArrayBuffer
],
},
url
:
{
type
:
String
,
required
:
true
,
},
header
:
{
type
:
Object
,
},
dataType
:
{
type
:
String
,
},
responseType
:
{
type
:
String
,
},
withCredentials
:
{
type
:
Boolean
,
},
}
export
const
RequestOptions
:
ApiOptions
=
{
formatArgs
:
{
method
(
value
,
params
)
{
params
.
method
=
(
value
||
''
).
toUpperCase
()
if
(
METHOD
.
indexOf
(
params
.
method
)
===
-
1
)
{
params
.
method
=
DEFAULT_METHOD
}
},
data
(
value
,
params
)
{
params
.
data
=
value
||
''
},
url
(
value
,
params
)
{
if
(
params
.
method
===
DEFAULT_METHOD
&&
isPlainObject
(
params
.
data
)
&&
Object
.
keys
(
params
.
data
).
length
)
{
// 将 method,data 校验提前,保证 url 校验时,method,data 已被格式化
params
.
url
=
stringifyQuery
(
value
,
params
.
data
)
}
},
header
(
value
,
params
)
{
const
header
=
(
params
.
header
=
value
||
{})
if
(
params
.
method
!==
DEFAULT_METHOD
)
{
if
(
!
Object
.
keys
(
header
).
find
(
(
key
)
=>
key
.
toLowerCase
()
===
'
content-type
'
)
)
{
header
[
'
Content-Type
'
]
=
'
application/json
'
}
}
},
dataType
(
value
,
params
)
{
params
.
dataType
=
(
value
||
dataType
.
JSON
).
toLowerCase
()
},
responseType
(
value
,
params
)
{
params
.
responseType
=
(
value
||
''
).
toLowerCase
()
if
(
RESPONSE_TYPE
.
indexOf
(
params
.
responseType
)
===
-
1
)
{
params
.
responseType
=
DEFAULT_RESPONSE_TYPE
}
},
},
}
packages/uni-h5/dist/uni-h5.esm.js
浏览文件 @
9ec66c88
...
...
@@ -7483,7 +7483,7 @@ var lookup = new Uint8Array(256);
for
(
var
i
=
0
;
i
<
chars
.
length
;
i
++
)
{
lookup
[
chars
.
charCodeAt
(
i
)]
=
i
;
}
function
encode
(
arraybuffer
)
{
function
encode
$1
(
arraybuffer
)
{
var
bytes
=
new
Uint8Array
(
arraybuffer
),
i
,
len
=
bytes
.
length
,
base64
=
""
;
for
(
i
=
0
;
i
<
len
;
i
+=
3
)
{
base64
+=
chars
[
bytes
[
i
]
>>
2
];
...
...
@@ -7816,8 +7816,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id2
,
name
,
res
)
{
return
invokeCallback
(
id2
,
extend
(
res
||
{},
{
errMsg
:
name
+
"
:ok
"
}));
}
function
invokeFail
(
id2
,
name
,
err
)
{
return
invokeCallback
(
id2
,
{
errMsg
:
name
+
"
:fail
"
+
(
err
?
"
"
+
err
:
""
)});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id2
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id2
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id2
,
name
,
err
)
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -7825,11 +7837,7 @@ function wrapperSyncApi(fn) {
function
wrapperAsyncApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
{
const
id2
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
).
then
((
res
)
=>
{
invokeCallback
(
id2
,
extend
(
res
||
{},
{
errMsg
:
name
+
"
:ok
"
}));
}).
catch
((
err
)
=>
{
invokeCallback
(
id2
,
{
errMsg
:
name
+
"
:fail
"
+
(
err
?
"
"
+
err
:
""
)});
});
fn
(
args
).
then
((
res
)
=>
invokeSuccess
(
id2
,
name
,
res
)).
catch
((
err
)
=>
invokeFail
(
id2
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
@@ -7849,6 +7857,9 @@ function defineOnApi(name, fn, options) {
function
defineOffApi
(
name
,
fn
,
options
)
{
return
defineApi
(
API_TYPE_OFF
,
name
,
fn
,
process
.
env
.
NODE_ENV
!==
"
production
"
?
API_TYPE_ON_PROTOCOLS
:
void
0
,
options
);
}
function
defineTaskApi
(
name
,
fn
,
protocol
,
options
)
{
return
promisify
(
defineApi
(
API_TYPE_TASK
,
name
,
fn
,
process
.
env
.
NODE_ENV
!==
"
production
"
?
protocol
:
void
0
,
options
));
}
function
defineSyncApi
(
name
,
fn
,
protocol
,
options
)
{
return
defineApi
(
API_TYPE_SYNC
,
name
,
fn
,
process
.
env
.
NODE_ENV
!==
"
production
"
?
protocol
:
void
0
,
options
);
}
...
...
@@ -7889,7 +7900,7 @@ const base64ToArrayBuffer = defineSyncApi(API_BASE64_TO_ARRAY_BUFFER, (base64) =
return
decode
(
base64
);
},
Base64ToArrayBufferProtocol
);
const
arrayBufferToBase64
=
defineSyncApi
(
API_ARRAY_BUFFER_TO_BASE64
,
(
arrayBuffer
)
=>
{
return
encode
(
arrayBuffer
);
return
encode
$1
(
arrayBuffer
);
},
ArrayBufferToBase64Protocol
);
const
API_UPX2PX
=
"
upx2px
"
;
const
Upx2pxProtocol
=
[
...
...
@@ -8139,6 +8150,109 @@ const GetImageInfoProtocol = {
required
:
true
}
};
const
API_REQUEST
=
"
request
"
;
const
METHOD
=
[
"
GET
"
,
"
OPTIONS
"
,
"
HEAD
"
,
"
POST
"
,
"
PUT
"
,
"
DELETE
"
,
"
TRACE
"
,
"
CONNECT
"
];
const
DEFAULT_METHOD
=
"
GET
"
;
const
dataType
=
{
JSON
:
"
json
"
};
const
RESPONSE_TYPE
=
[
"
text
"
,
"
arraybuffer
"
];
const
DEFAULT_RESPONSE_TYPE
=
"
text
"
;
const
encode
=
encodeURIComponent
;
function
stringifyQuery
(
url
,
data
)
{
let
str
=
url
.
split
(
"
#
"
);
const
hash
=
str
[
1
]
||
""
;
str
=
str
[
0
].
split
(
"
?
"
);
let
query
=
str
[
1
]
||
""
;
url
=
str
[
0
];
const
search
=
query
.
split
(
"
&
"
).
filter
((
item
)
=>
item
);
const
params
=
{};
search
.
forEach
((
item
)
=>
{
const
part
=
item
.
split
(
"
=
"
);
params
[
part
[
0
]]
=
part
[
1
];
});
for
(
const
key
in
data
)
{
if
(
hasOwn$1
(
data
,
key
))
{
let
v2
=
data
[
key
];
if
(
typeof
v2
===
"
undefined
"
||
v2
===
null
)
{
v2
=
""
;
}
else
if
(
isPlainObject
(
v2
))
{
v2
=
JSON
.
stringify
(
v2
);
}
params
[
encode
(
key
)]
=
encode
(
v2
);
}
}
query
=
Object
.
keys
(
params
).
map
((
item
)
=>
`
${
item
}
=
${
params
[
item
]}
`
).
join
(
"
&
"
);
return
url
+
(
query
?
"
?
"
+
query
:
""
)
+
(
hash
?
"
#
"
+
hash
:
""
);
}
const
RequestProtocol
=
{
method
:
{
type
:
String
},
data
:
{
type
:
[
Object
,
String
,
Array
,
ArrayBuffer
]
},
url
:
{
type
:
String
,
required
:
true
},
header
:
{
type
:
Object
},
dataType
:
{
type
:
String
},
responseType
:
{
type
:
String
},
withCredentials
:
{
type
:
Boolean
}
};
const
RequestOptions
=
{
formatArgs
:
{
method
(
value
,
params
)
{
params
.
method
=
(
value
||
""
).
toUpperCase
();
if
(
METHOD
.
indexOf
(
params
.
method
)
===
-
1
)
{
params
.
method
=
DEFAULT_METHOD
;
}
},
data
(
value
,
params
)
{
params
.
data
=
value
||
""
;
},
url
(
value
,
params
)
{
if
(
params
.
method
===
DEFAULT_METHOD
&&
isPlainObject
(
params
.
data
)
&&
Object
.
keys
(
params
.
data
).
length
)
{
params
.
url
=
stringifyQuery
(
value
,
params
.
data
);
}
},
header
(
value
,
params
)
{
const
header
=
params
.
header
=
value
||
{};
if
(
params
.
method
!==
DEFAULT_METHOD
)
{
if
(
!
Object
.
keys
(
header
).
find
((
key
)
=>
key
.
toLowerCase
()
===
"
content-type
"
))
{
header
[
"
Content-Type
"
]
=
"
application/json
"
;
}
}
},
dataType
(
value
,
params
)
{
params
.
dataType
=
(
value
||
dataType
.
JSON
).
toLowerCase
();
},
responseType
(
value
,
params
)
{
params
.
responseType
=
(
value
||
""
).
toLowerCase
();
if
(
RESPONSE_TYPE
.
indexOf
(
params
.
responseType
)
===
-
1
)
{
params
.
responseType
=
DEFAULT_RESPONSE_TYPE
;
}
}
}
};
function
encodeQueryString
(
url
)
{
if
(
typeof
url
!==
"
string
"
)
{
return
url
;
...
...
@@ -8480,6 +8594,125 @@ const getImageInfo = defineAsyncApi(API_GET_IMAGE_INFO, ({src}) => {
img
.
src
=
src
;
});
},
GetImageInfoProtocol
,
GetImageInfoOptions
);
const
request
=
defineTaskApi
(
API_REQUEST
,
({
url
,
data
,
header
,
method
,
dataType
:
dataType2
,
responseType
,
withCredentials
,
timeout
=
__uniConfig
.
networkTimeout
.
request
},
{
resolve
,
reject
})
=>
{
let
body
=
null
;
const
contentType
=
normalizeContentType
(
header
);
if
(
method
!==
"
GET
"
)
{
if
(
typeof
data
===
"
string
"
||
data
instanceof
ArrayBuffer
)
{
body
=
data
;
}
else
{
if
(
contentType
===
"
json
"
)
{
try
{
body
=
JSON
.
stringify
(
data
);
}
catch
(
error
)
{
body
=
data
.
toString
();
}
}
else
if
(
contentType
===
"
urlencoded
"
)
{
const
bodyArray
=
[];
for
(
const
key
in
data
)
{
if
(
hasOwn$1
(
data
,
key
))
{
bodyArray
.
push
(
encodeURIComponent
(
key
)
+
"
=
"
+
encodeURIComponent
(
data
[
key
]));
}
}
body
=
bodyArray
.
join
(
"
&
"
);
}
else
{
body
=
data
.
toString
();
}
}
}
const
xhr
=
new
XMLHttpRequest
();
const
requestTask
=
new
RequestTask
(
xhr
);
xhr
.
open
(
method
,
url
);
for
(
const
key
in
header
)
{
if
(
hasOwn$1
(
header
,
key
))
{
xhr
.
setRequestHeader
(
key
,
header
[
key
]);
}
}
const
timer
=
setTimeout
(
function
()
{
xhr
.
onload
=
xhr
.
onabort
=
xhr
.
onerror
=
null
;
requestTask
.
abort
();
reject
(
"
timeout
"
);
},
timeout
);
xhr
.
responseType
=
responseType
;
xhr
.
onload
=
function
()
{
clearTimeout
(
timer
);
const
statusCode
=
xhr
.
status
;
let
res
=
responseType
===
"
text
"
?
xhr
.
responseText
:
xhr
.
response
;
if
(
responseType
===
"
text
"
&&
dataType2
===
"
json
"
)
{
try
{
res
=
JSON
.
parse
(
res
);
}
catch
(
error
)
{
}
}
resolve
({
data
:
res
,
statusCode
,
header
:
parseHeaders
(
xhr
.
getAllResponseHeaders
()),
cookies
:
[]
});
};
xhr
.
onabort
=
function
()
{
clearTimeout
(
timer
);
reject
(
"
abort
"
);
};
xhr
.
onerror
=
function
()
{
clearTimeout
(
timer
);
reject
();
};
xhr
.
withCredentials
=
withCredentials
;
xhr
.
send
(
body
);
return
requestTask
;
},
RequestProtocol
,
RequestOptions
);
function
normalizeContentType
(
header
)
{
const
name
=
Object
.
keys
(
header
).
find
((
name2
)
=>
name2
.
toLowerCase
()
===
"
content-type
"
);
if
(
!
name
)
{
return
;
}
const
contentType
=
header
[
name
];
if
(
contentType
.
indexOf
(
"
application/json
"
)
===
0
)
{
return
"
json
"
;
}
else
if
(
contentType
.
indexOf
(
"
application/x-www-form-urlencoded
"
)
===
0
)
{
return
"
urlencoded
"
;
}
return
"
string
"
;
}
class
RequestTask
{
constructor
(
xhr
)
{
this
.
_xhr
=
xhr
;
}
abort
()
{
if
(
this
.
_xhr
)
{
this
.
_xhr
.
abort
();
delete
this
.
_xhr
;
}
}
onHeadersReceived
(
callback
)
{
throw
new
Error
(
"
Method not implemented.
"
);
}
offHeadersReceived
(
callback
)
{
throw
new
Error
(
"
Method not implemented.
"
);
}
}
function
parseHeaders
(
headers
)
{
const
headersObject
=
{};
headers
.
split
(
"
\n
"
).
forEach
((
header
)
=>
{
const
find
=
header
.
match
(
/
(\S
+
\s
*
)
:
\s
*
(
.*
)
/
);
if
(
!
find
||
find
.
length
!==
3
)
{
return
;
}
headersObject
[
find
[
1
]]
=
find
[
2
];
});
return
headersObject
;
}
const
navigateBack
=
defineAsyncApi
(
API_NAVIGATE_BACK
,
({
delta
})
=>
new
Promise
((
resolve
,
reject
)
=>
{
let
canBack
=
true
;
const
vm
=
getCurrentPageVm
();
...
...
@@ -8531,6 +8764,7 @@ var api = /* @__PURE__ */ Object.freeze({
getNetworkType
,
openDocument
,
getImageInfo
,
request
,
navigateBack
,
navigateTo
,
redirectTo
,
...
...
@@ -9644,4 +9878,4 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
]);
}
_sfc_main
.
render
=
_sfc_render
;
export
{
_sfc_main$1
as
AsyncErrorComponent
,
_sfc_main
as
AsyncLoadingComponent
,
_sfc_main$o
as
Audio
,
_sfc_main$n
as
Canvas
,
_sfc_main$m
as
Checkbox
,
_sfc_main$l
as
CheckboxGroup
,
_sfc_main$k
as
Editor
,
_sfc_main$j
as
Form
,
index$2
as
Icon
,
_sfc_main$h
as
Image
,
_sfc_main$g
as
Input
,
_sfc_main$f
as
Label
,
_sfc_main$e
as
MovableView
,
_sfc_main$d
as
Navigator
,
index
as
PageComponent
,
_sfc_main$c
as
Progress
,
_sfc_main$b
as
Radio
,
_sfc_main$a
as
RadioGroup
,
_sfc_main$i
as
ResizeSensor
,
_sfc_main$9
as
RichText
,
_sfc_main$8
as
ScrollView
,
_sfc_main$7
as
Slider
,
_sfc_main$6
as
SwiperItem
,
_sfc_main$5
as
Switch
,
index$1
as
Text
,
_sfc_main$4
as
Textarea
,
UniServiceJSBridge$1
as
UniServiceJSBridge
,
UniViewJSBridge$1
as
UniViewJSBridge
,
_sfc_main$3
as
View
,
addInterceptor
,
arrayBufferToBase64
,
base64ToArrayBuffer
,
canIUse
,
createIntersectionObserver
,
createSelectorQuery
,
getApp$1
as
getApp
,
getCurrentPages$1
as
getCurrentPages
,
getImageInfo
,
getNetworkType
,
getSystemInfo
,
getSystemInfoSync
,
makePhoneCall
,
navigateBack
,
navigateTo
,
offNetworkStatusChange
,
onNetworkStatusChange
,
openDocument
,
index$3
as
plugin
,
promiseInterceptor
,
reLaunch
,
redirectTo
,
removeInterceptor
,
switchTab
,
uni$1
as
uni
,
upx2px
};
export
{
_sfc_main$1
as
AsyncErrorComponent
,
_sfc_main
as
AsyncLoadingComponent
,
_sfc_main$o
as
Audio
,
_sfc_main$n
as
Canvas
,
_sfc_main$m
as
Checkbox
,
_sfc_main$l
as
CheckboxGroup
,
_sfc_main$k
as
Editor
,
_sfc_main$j
as
Form
,
index$2
as
Icon
,
_sfc_main$h
as
Image
,
_sfc_main$g
as
Input
,
_sfc_main$f
as
Label
,
_sfc_main$e
as
MovableView
,
_sfc_main$d
as
Navigator
,
index
as
PageComponent
,
_sfc_main$c
as
Progress
,
_sfc_main$b
as
Radio
,
_sfc_main$a
as
RadioGroup
,
_sfc_main$i
as
ResizeSensor
,
_sfc_main$9
as
RichText
,
_sfc_main$8
as
ScrollView
,
_sfc_main$7
as
Slider
,
_sfc_main$6
as
SwiperItem
,
_sfc_main$5
as
Switch
,
index$1
as
Text
,
_sfc_main$4
as
Textarea
,
UniServiceJSBridge$1
as
UniServiceJSBridge
,
UniViewJSBridge$1
as
UniViewJSBridge
,
_sfc_main$3
as
View
,
addInterceptor
,
arrayBufferToBase64
,
base64ToArrayBuffer
,
canIUse
,
createIntersectionObserver
,
createSelectorQuery
,
getApp$1
as
getApp
,
getCurrentPages$1
as
getCurrentPages
,
getImageInfo
,
getNetworkType
,
getSystemInfo
,
getSystemInfoSync
,
makePhoneCall
,
navigateBack
,
navigateTo
,
offNetworkStatusChange
,
onNetworkStatusChange
,
openDocument
,
index$3
as
plugin
,
promiseInterceptor
,
reLaunch
,
redirectTo
,
removeInterceptor
,
request
,
switchTab
,
uni$1
as
uni
,
upx2px
};
packages/uni-h5/src/service/api/index.ts
浏览文件 @
9ec66c88
...
...
@@ -9,6 +9,8 @@ export * from './file/openDocument'
export
*
from
'
./media/getImageInfo
'
export
*
from
'
./network/request
'
export
*
from
'
./route/navigateBack
'
export
*
from
'
./route/navigateTo
'
export
*
from
'
./route/redirectTo
'
...
...
packages/uni-h5/src/service/api/network/request.ts
0 → 100644
浏览文件 @
9ec66c88
import
{
API_REQUEST
,
defineTaskApi
,
RequestOptions
,
RequestProtocol
,
}
from
'
@dcloudio/uni-api
'
import
{
hasOwn
}
from
'
@vue/shared
'
export
const
request
=
defineTaskApi
<
typeof
uni
.
request
>
(
API_REQUEST
,
(
{
url
,
data
,
header
,
method
,
dataType
,
responseType
,
withCredentials
,
timeout
=
__uniConfig
.
networkTimeout
.
request
,
},
{
resolve
,
reject
}
)
=>
{
let
body
=
null
// 根据请求类型处理数据
const
contentType
=
normalizeContentType
(
header
)
if
(
method
!==
'
GET
'
)
{
if
(
typeof
data
===
'
string
'
||
data
instanceof
ArrayBuffer
)
{
body
=
data
}
else
{
if
(
contentType
===
'
json
'
)
{
try
{
body
=
JSON
.
stringify
(
data
)
}
catch
(
error
)
{
body
=
data
!
.
toString
()
}
}
else
if
(
contentType
===
'
urlencoded
'
)
{
const
bodyArray
=
[]
for
(
const
key
in
data
)
{
if
(
hasOwn
(
data
,
key
))
{
bodyArray
.
push
(
encodeURIComponent
(
key
)
+
'
=
'
+
encodeURIComponent
(
data
[
key
])
)
}
}
body
=
bodyArray
.
join
(
'
&
'
)
}
else
{
body
=
data
!
.
toString
()
}
}
}
const
xhr
=
new
XMLHttpRequest
()
const
requestTask
=
new
RequestTask
(
xhr
)
xhr
.
open
(
method
!
,
url
)
for
(
const
key
in
header
)
{
if
(
hasOwn
(
header
,
key
))
{
xhr
.
setRequestHeader
(
key
,
header
[
key
])
}
}
const
timer
=
setTimeout
(
function
()
{
xhr
.
onload
=
xhr
.
onabort
=
xhr
.
onerror
=
null
requestTask
.
abort
()
reject
(
'
timeout
'
)
},
timeout
)
xhr
.
responseType
=
responseType
as
'
arraybuffer
'
|
'
text
'
xhr
.
onload
=
function
()
{
clearTimeout
(
timer
)
const
statusCode
=
xhr
.
status
let
res
=
responseType
===
'
text
'
?
xhr
.
responseText
:
xhr
.
response
if
(
responseType
===
'
text
'
&&
dataType
===
'
json
'
)
{
try
{
res
=
JSON
.
parse
(
res
)
}
catch
(
error
)
{
// 和微信一致解析失败不抛出错误
// invoke(callbackId, {
// errMsg: 'request:fail json parse error'
// })
// return
}
}
resolve
({
data
:
res
,
statusCode
,
header
:
parseHeaders
(
xhr
.
getAllResponseHeaders
()),
cookies
:
[],
})
}
xhr
.
onabort
=
function
()
{
clearTimeout
(
timer
)
reject
(
'
abort
'
)
}
xhr
.
onerror
=
function
()
{
clearTimeout
(
timer
)
reject
()
}
xhr
.
withCredentials
=
withCredentials
!
xhr
.
send
(
body
)
return
requestTask
},
RequestProtocol
,
RequestOptions
)
function
normalizeContentType
(
header
:
Record
<
string
,
string
>
)
{
const
name
=
Object
.
keys
(
header
).
find
(
(
name
)
=>
name
.
toLowerCase
()
===
'
content-type
'
)
if
(
!
name
)
{
return
}
const
contentType
=
header
[
name
]
if
(
contentType
.
indexOf
(
'
application/json
'
)
===
0
)
{
return
'
json
'
}
else
if
(
contentType
.
indexOf
(
'
application/x-www-form-urlencoded
'
)
===
0
)
{
return
'
urlencoded
'
}
return
'
string
'
}
/**
* 请求任务类
*/
class
RequestTask
implements
UniApp
.
RequestTask
{
private
_xhr
?:
XMLHttpRequest
constructor
(
xhr
:
XMLHttpRequest
)
{
this
.
_xhr
=
xhr
}
abort
()
{
if
(
this
.
_xhr
)
{
this
.
_xhr
.
abort
()
delete
this
.
_xhr
}
}
onHeadersReceived
(
callback
:
(
result
:
any
)
=>
void
):
void
{
throw
new
Error
(
'
Method not implemented.
'
)
}
offHeadersReceived
(
callback
:
(
result
:
any
)
=>
void
):
void
{
throw
new
Error
(
'
Method not implemented.
'
)
}
}
/**
* 解析响应头
* @param {string} headers
* @return {object}
*/
function
parseHeaders
(
headers
:
string
)
{
const
headersObject
:
Record
<
string
,
string
>
=
{}
headers
.
split
(
'
\n
'
).
forEach
((
header
)
=>
{
const
find
=
header
.
match
(
/
(\S
+
\s
*
)
:
\s
*
(
.*
)
/
)
if
(
!
find
||
find
.
length
!==
3
)
{
return
}
headersObject
[
find
[
1
]]
=
find
[
2
]
})
return
headersObject
}
packages/uni-mp-alipay/dist/uni.api.esm.js
浏览文件 @
9ec66c88
...
...
@@ -300,8 +300,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id
,
name
,
res
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
}
function
invokeFail
(
id
,
name
,
err
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id
,
name
,
err
),
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -310,12 +322,8 @@ function wrapperAsyncApi(name, fn, options) {
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
});
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
packages/uni-mp-baidu/dist/uni.api.esm.js
浏览文件 @
9ec66c88
...
...
@@ -300,8 +300,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id
,
name
,
res
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
}
function
invokeFail
(
id
,
name
,
err
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id
,
name
,
err
),
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -310,12 +322,8 @@ function wrapperAsyncApi(name, fn, options) {
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
});
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
packages/uni-mp-qq/dist/uni.api.esm.js
浏览文件 @
9ec66c88
...
...
@@ -300,8 +300,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id
,
name
,
res
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
}
function
invokeFail
(
id
,
name
,
err
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id
,
name
,
err
),
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -310,12 +322,8 @@ function wrapperAsyncApi(name, fn, options) {
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
});
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
packages/uni-mp-toutiao/dist/uni.api.esm.js
浏览文件 @
9ec66c88
...
...
@@ -300,8 +300,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id
,
name
,
res
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
}
function
invokeFail
(
id
,
name
,
err
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id
,
name
,
err
),
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -310,12 +322,8 @@ function wrapperAsyncApi(name, fn, options) {
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
});
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
packages/uni-mp-weixin/dist/uni.api.esm.js
浏览文件 @
9ec66c88
...
...
@@ -300,8 +300,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id
,
name
,
res
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
}
function
invokeFail
(
id
,
name
,
err
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id
,
name
,
err
),
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -310,12 +322,8 @@ function wrapperAsyncApi(name, fn, options) {
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
});
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
packages/uni-quickapp-webview/dist/uni.api.esm.js
浏览文件 @
9ec66c88
...
...
@@ -300,8 +300,20 @@ function wrapperOffApi(name, fn) {
}
};
}
function
invokeSuccess
(
id
,
name
,
res
)
{
return
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
}
function
invokeFail
(
id
,
name
,
err
)
{
return
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
}
function
wrapperTaskApi
(
name
,
fn
,
options
)
{
return
(
args
)
=>
fn
.
apply
(
null
,
[
args
,
createAsyncApiCallback
(
name
,
args
,
options
)]);
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
return
fn
(
args
,
{
resolve
:
(
res
)
=>
invokeSuccess
(
id
,
name
,
res
),
reject
:
(
err
)
=>
invokeFail
(
id
,
name
,
err
),
});
};
}
function
wrapperSyncApi
(
fn
)
{
return
(...
args
)
=>
fn
.
apply
(
null
,
args
);
...
...
@@ -310,12 +322,8 @@ function wrapperAsyncApi(name, fn, options) {
return
(
args
)
=>
{
const
id
=
createAsyncApiCallback
(
name
,
args
,
options
);
fn
(
args
)
.
then
((
res
)
=>
{
invokeCallback
(
id
,
extend
(
res
||
{},
{
errMsg
:
name
+
'
:ok
'
}));
})
.
catch
((
err
)
=>
{
invokeCallback
(
id
,
{
errMsg
:
name
+
'
:fail
'
+
(
err
?
'
'
+
err
:
''
)
});
});
.
then
((
res
)
=>
invokeSuccess
(
id
,
name
,
res
))
.
catch
((
err
)
=>
invokeFail
(
id
,
name
,
err
));
};
}
function
wrapperApi
(
fn
,
name
,
protocol
,
options
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录