Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzj-java
uni-app
提交
a5fc148d
U
uni-app
项目概览
wzj-java
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a5fc148d
编写于
3月 17, 2020
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build:v3
上级
549d450b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
32 deletion
+40
-32
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+40
-32
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
a5fc148d
...
...
@@ -644,9 +644,9 @@ var serviceContext = (function () {
const
CONTEXT_API_RE
=
/^create|Manager$/
;
const
TASK_APIS
=
[
'
request
'
,
'
downloadFile
'
,
'
uploadFile
'
,
'
connectSocket
'
];
const
TASK_APIS
=
[
'
request
'
,
'
downloadFile
'
,
'
uploadFile
'
,
'
connectSocket
'
];
const
ASYNC_API
=
[
'
createBLEConnection
'
];
const
ASYNC_API
=
[
'
createBLEConnection
'
];
const
CALLBACK_API_RE
=
/^on/
;
...
...
@@ -683,6 +683,19 @@ var serviceContext = (function () {
return
true
}
/* eslint-disable no-extend-native */
if
(
!
Promise
.
prototype
.
finally
)
{
Promise
.
prototype
.
finally
=
function
(
callback
)
{
const
promise
=
this
.
constructor
;
return
this
.
then
(
value
=>
promise
.
resolve
(
callback
()).
then
(()
=>
value
),
reason
=>
promise
.
resolve
(
callback
()).
then
(()
=>
{
throw
reason
})
)
};
}
function
promisify
(
name
,
api
)
{
if
(
!
shouldPromise
(
name
))
{
return
api
...
...
@@ -696,18 +709,6 @@ var serviceContext = (function () {
success
:
resolve
,
fail
:
reject
}),
...
params
);
/* eslint-disable no-extend-native */
if
(
!
Promise
.
prototype
.
finally
)
{
Promise
.
prototype
.
finally
=
function
(
callback
)
{
const
promise
=
this
.
constructor
;
return
this
.
then
(
value
=>
promise
.
resolve
(
callback
()).
then
(()
=>
value
),
reason
=>
promise
.
resolve
(
callback
()).
then
(()
=>
{
throw
reason
})
)
};
}
})))
}
}
...
...
@@ -1347,12 +1348,14 @@ var serviceContext = (function () {
query
[
item
[
0
]]
=
item
[
1
];
});
for
(
let
key
in
data
)
{
if
(
data
.
hasOwnProperty
(
key
))
{
if
(
isPlainObject
(
data
[
key
]))
{
query
[
encode$1
(
key
)]
=
encode$1
(
JSON
.
stringify
(
data
[
key
]));
}
else
{
query
[
encode$1
(
key
)]
=
encode$1
(
data
[
key
]);
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$1
(
key
)]
=
encode$1
(
v
);
}
}
query
=
Object
.
keys
(
query
).
map
(
item
=>
`
${
item
}
=
${
query
[
item
]}
`
).
join
(
'
&
'
);
...
...
@@ -4063,11 +4066,14 @@ var serviceContext = (function () {
}
function
readBLECharacteristicValue
(
data
,
callbackId
)
{
onBLECharacteristicValueChange
=
onBLECharacteristicValueChange
||
bluetoothOn
(
'
onBLECharacteristicValueChange
'
);
bluetoothExec
(
'
readBLECharacteristicValue
'
,
callbackId
,
data
);
}
function
writeBLECharacteristicValue
(
data
,
callbackId
)
{
data
.
value
=
base64ToArrayBuffer$2
(
data
.
value
);
if
(
typeof
data
.
value
===
'
string
'
)
{
data
.
value
=
base64ToArrayBuffer$2
(
data
.
value
);
}
bluetoothExec
(
'
writeBLECharacteristicValue
'
,
callbackId
,
data
);
}
...
...
@@ -8402,7 +8408,7 @@ var serviceContext = (function () {
const
pages
=
getCurrentPages
();
const
len
=
pages
.
length
;
let
call
o
nShow
=
false
;
let
call
O
nShow
=
false
;
if
(
len
>=
1
)
{
// 前一个页面是非 tabBar 页面
const
currentPage
=
pages
[
len
-
1
];
...
...
@@ -8411,7 +8417,7 @@ var serviceContext = (function () {
// 该情况下目标页tabBarPage的visible是不对的
// 除非每次路由跳转都处理一遍tabBarPage的visible,目前仅switchTab会处理
// 简单起见,暂时直接判断该情况,执行onShow
call
o
nShow
=
true
;
call
O
nShow
=
true
;
pages
.
reverse
().
forEach
(
page
=>
{
if
(
!
page
.
$page
.
meta
.
isTabBar
&&
page
!==
currentPage
)
{
page
.
$remove
();
...
...
@@ -8437,8 +8443,8 @@ var serviceContext = (function () {
// 查找当前 tabBarPage,且设置 visible
getCurrentPages
(
true
).
forEach
(
page
=>
{
if
((
'
/
'
+
page
.
route
)
===
path
)
{
if
(
!
page
.
$page
.
meta
.
visible
||
callonShow
)
{
page
.
$vm
.
__call_hook
(
'
onShow
'
)
;
if
(
!
page
.
$page
.
meta
.
visible
)
{
// 之前未显示
callOnShow
=
true
;
}
page
.
$page
.
meta
.
visible
=
true
;
tabBarPage
=
page
;
...
...
@@ -8451,6 +8457,8 @@ var serviceContext = (function () {
if
(
tabBarPage
)
{
tabBarPage
.
$getAppWebview
().
show
(
'
none
'
);
// 等visible状态都切换完之后,再触发onShow,否则开发者在onShow里边 getCurrentPages 会不准确
callOnShow
&&
tabBarPage
.
$vm
.
__call_hook
(
'
onShow
'
);
}
else
{
return
showWebview
(
registerPage
({
url
,
...
...
@@ -11169,13 +11177,6 @@ var serviceContext = (function () {
if
(
!
socketTask
)
{
return
}
socketTask
.
_callbacks
[
state
].
forEach
(
callback
=>
{
if
(
typeof
callback
===
'
function
'
)
{
callback
(
state
===
'
message
'
?
{
data
}
:
{});
}
});
if
(
state
===
'
open
'
)
{
socketTask
.
readyState
=
socketTask
.
OPEN
;
}
...
...
@@ -11191,7 +11192,14 @@ var serviceContext = (function () {
if
(
index
>=
0
)
{
socketTasksArray
.
splice
(
index
,
1
);
}
}
}
socketTask
.
_callbacks
[
state
].
forEach
(
callback
=>
{
if
(
typeof
callback
===
'
function
'
)
{
callback
(
state
===
'
message
'
?
{
data
}
:
{});
}
});
});
function
connectSocket$1
(
args
,
callbackId
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录