Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
2958ea43
U
uni-app
项目概览
DCloud
/
uni-app
3 个月 前同步成功
通知
719
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2958ea43
编写于
11月 27, 2020
作者:
inkwalk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed: three losed context apis that dependence ui
上级
dff5003d
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
111 addition
and
94 deletion
+111
-94
src/core/helpers/windows.js
src/core/helpers/windows.js
+13
-0
src/core/service/api/ui/create-intersection-observer.js
src/core/service/api/ui/create-intersection-observer.js
+12
-10
src/core/service/api/ui/create-media-query-observer.js
src/core/service/api/ui/create-media-query-observer.js
+46
-47
src/core/view/bridge/subscribe/api/request-component-info.js
src/core/view/bridge/subscribe/api/request-component-info.js
+11
-10
src/core/view/bridge/subscribe/api/request-component-observer.js
...e/view/bridge/subscribe/api/request-component-observer.js
+24
-16
src/core/view/bridge/subscribe/api/request-media-query-observer.js
...view/bridge/subscribe/api/request-media-query-observer.js
+1
-10
src/platforms/h5/service/api/ui/request-component-info.js
src/platforms/h5/service/api/ui/request-component-info.js
+4
-1
未找到文件。
src/core/helpers/windows.js
0 → 100644
浏览文件 @
2958ea43
const
WINDOW_NAMES
=
[
'
VUniLeftWindow
'
,
'
VUniTopWindow
'
,
'
VUniRightWindow
'
]
export
function
checkInWindows
(
vm
)
{
if
(
__PLATFORM__
!==
'
h5
'
)
{
return
false
}
while
(
vm
)
{
if
(
WINDOW_NAMES
.
indexOf
(
vm
.
$options
.
name
)
!==
-
1
)
{
return
true
}
vm
=
vm
.
$parent
}
}
src/core/service/api/ui/create-intersection-observer.js
浏览文件 @
2958ea43
import
createCallbacks
from
'
uni-helpers/callbacks
'
import
{
checkInWindows
}
from
'
uni-helpers/windows
'
import
{
getCurrentPageVm
}
from
'
../../platform
'
...
...
@@ -14,27 +16,27 @@ const defaultOptions = {
class
ServiceIntersectionObserver
{
constructor
(
component
,
options
)
{
this
.
pageId
=
component
.
$page
.
id
this
.
pageId
=
component
.
$page
&&
component
.
$page
.
id
this
.
component
=
component
.
_$id
||
component
// app-plus 平台传输_$id
this
.
options
=
Object
.
assign
({},
defaultOptions
,
options
)
}
}
_makeRootMargin
(
margins
=
{})
{
this
.
options
.
rootMargin
=
[
'
top
'
,
'
right
'
,
'
bottom
'
,
'
left
'
].
map
(
name
=>
`
${
Number
(
margins
[
name
])
||
0
}
px`
).
join
(
'
'
)
}
}
relativeTo
(
selector
,
margins
)
{
this
.
options
.
relativeToSelector
=
selector
this
.
_makeRootMargin
(
margins
)
return
this
}
}
relativeToViewport
(
margins
)
{
this
.
options
.
relativeToSelector
=
null
this
.
_makeRootMargin
(
margins
)
return
this
}
}
observe
(
selector
,
callback
)
{
if
(
typeof
callback
!==
'
function
'
)
{
...
...
@@ -48,13 +50,13 @@ class ServiceIntersectionObserver {
reqId
:
this
.
reqId
,
component
:
this
.
component
,
options
:
this
.
options
},
this
.
pageId
)
}
},
checkInWindows
(
this
.
component
)
?
this
.
component
:
this
.
pageId
)
}
disconnect
()
{
UniServiceJSBridge
.
publishHandler
(
'
destroyComponentObserver
'
,
{
reqId
:
this
.
reqId
},
this
.
pageId
)
},
checkInWindows
(
this
.
component
)
?
this
.
component
:
this
.
pageId
)
}
}
...
...
@@ -67,4 +69,4 @@ export function createIntersectionObserver (context, options) {
return
new
ServiceIntersectionObserver
(
context
,
options
)
}
return
new
ServiceIntersectionObserver
(
getCurrentPageVm
(
'
createIntersectionObserver
'
),
options
)
}
}
src/core/service/api/ui/create-media-query-observer.js
浏览文件 @
2958ea43
import
createCallbacks
from
'
uni-helpers/callbacks
'
import
{
getCurrentPageVm
}
from
'
../../platform
'
const
createMediaQueryObserverCallbacks
=
createCallbacks
(
'
requestMediaQueryObserver
'
)
class
ServiceMediaQueryObserver
{
constructor
(
component
,
options
)
{
this
.
pageId
=
component
.
$page
.
id
this
.
component
=
component
.
_$id
||
component
// app-plus 平台传输_$id
this
.
options
=
options
}
observe
(
options
,
callback
)
{
if
(
typeof
callback
!==
'
function
'
)
{
return
}
this
.
options
=
options
this
.
reqId
=
createMediaQueryObserverCallbacks
.
push
(
callback
)
UniServiceJSBridge
.
publishHandler
(
'
requestMediaQueryObserver
'
,
{
reqId
:
this
.
reqId
,
component
:
this
.
component
,
options
:
this
.
options
},
this
.
pageId
)
}
disconnect
()
{
UniServiceJSBridge
.
publishHandler
(
'
destroyMediaQueryObserver
'
,
{
reqId
:
this
.
reqId
},
this
.
pageId
)
}
}
export
function
createMediaQueryObserver
(
context
,
options
)
{
if
(
!
context
.
_isVue
)
{
options
=
context
context
=
null
}
if
(
context
)
{
return
new
ServiceMediaQueryObserver
(
context
,
options
)
}
return
new
ServiceMediaQueryObserver
(
getCurrentPageVm
(
'
createMediaQueryObserver
'
),
options
)
}
import
createCallbacks
from
'
uni-helpers/callbacks
'
import
{
getCurrentPageVm
}
from
'
../../platform
'
const
createMediaQueryObserverCallbacks
=
createCallbacks
(
'
requestMediaQueryObserver
'
)
class
ServiceMediaQueryObserver
{
constructor
(
component
,
options
)
{
this
.
pageId
=
component
.
$page
&&
component
.
$page
.
id
this
.
component
=
component
.
_$id
||
component
// app-plus 平台传输_$id
this
.
options
=
options
}
observe
(
options
,
callback
)
{
if
(
typeof
callback
!==
'
function
'
)
{
return
}
this
.
options
=
options
this
.
reqId
=
createMediaQueryObserverCallbacks
.
push
(
callback
)
UniServiceJSBridge
.
publishHandler
(
'
requestMediaQueryObserver
'
,
{
reqId
:
this
.
reqId
,
component
:
this
.
component
,
options
:
this
.
options
})
}
disconnect
()
{
UniServiceJSBridge
.
publishHandler
(
'
destroyMediaQueryObserver
'
,
{
reqId
:
this
.
reqId
})
}
}
export
function
createMediaQueryObserver
(
context
,
options
)
{
if
(
!
context
.
_isVue
)
{
options
=
context
context
=
null
}
if
(
context
)
{
return
new
ServiceMediaQueryObserver
(
context
,
options
)
}
return
new
ServiceMediaQueryObserver
(
getCurrentPageVm
(
'
createMediaQueryObserver
'
),
options
)
}
src/core/view/bridge/subscribe/api/request-component-info.js
浏览文件 @
2958ea43
...
...
@@ -124,16 +124,17 @@ export function requestComponentInfo ({
reqId
,
reqs
},
pageId
)
{
const
pages
=
getCurrentPages
()
// 跨平台时,View 层也应该实现该方法,举例 App 上,View 层的 getCurrentPages 返回长度为1的当前页面数组
const
page
=
pages
.
find
(
page
=>
page
.
$page
.
id
===
pageId
)
if
(
!
page
)
{
throw
new
Error
(
`Not Found:Page[
${
pageId
}
]`
)
let
pageVm
if
(
pageId
.
_isVue
)
{
pageVm
=
pageId
}
else
{
const
pages
=
getCurrentPages
()
// 跨平台时,View 层也应该实现该方法,举例 App 上,View 层的 getCurrentPages 返回长度为1的当前页面数组
const
page
=
pages
.
find
(
page
=>
page
.
$page
.
id
===
pageId
)
if
(
!
page
)
{
throw
new
Error
(
`Not Found:Page[
${
pageId
}
]`
)
}
pageVm
=
page
.
$vm
}
const
pageVm
=
page
.
$vm
const
result
=
[]
reqs
.
forEach
(
function
({
component
,
...
...
@@ -151,5 +152,5 @@ export function requestComponentInfo ({
UniViewJSBridge
.
publishHandler
(
'
onRequestComponentInfo
'
,
{
reqId
,
res
:
result
}
,
pageId
)
})
}
src/core/view/bridge/subscribe/api/request-component-observer.js
浏览文件 @
2958ea43
...
...
@@ -26,20 +26,19 @@ export function requestComponentObserver ({
component
,
options
},
pageId
)
{
const
pages
=
getCurrentPages
()
const
page
=
pages
.
find
(
page
=>
page
.
$page
.
id
===
pageId
)
if
(
!
page
)
{
throw
new
Error
(
`Not Found:Page[
${
pageId
}
]`
)
}
const
pageVm
=
page
.
$vm
let
pageVm
if
(
pageId
.
_isVue
)
{
pageVm
=
pageId
}
else
{
const
pages
=
getCurrentPages
()
// 跨平台时,View 层也应该实现该方法,举例 App 上,View 层的 getCurrentPages 返回长度为1的当前页面数组
const
page
=
pages
.
find
(
page
=>
page
.
$page
.
id
===
pageId
)
if
(
!
page
)
{
throw
new
Error
(
`Not Found:Page[
${
pageId
}
]`
)
}
pageVm
=
page
.
$vm
}
const
$el
=
findElm
(
component
,
pageVm
)
const
root
=
options
.
relativeToSelector
?
$el
.
querySelector
(
options
.
relativeToSelector
)
:
null
const
intersectionObserver
=
intersectionObservers
[
reqId
]
=
new
IntersectionObserver
((
entries
,
observer
)
=>
{
entries
.
forEach
(
entrie
=>
{
UniViewJSBridge
.
publishHandler
(
'
onRequestComponentObserver
'
,
{
...
...
@@ -53,7 +52,7 @@ export function requestComponentObserver ({
dataset
:
normalizeDataset
(
entrie
.
target
.
dataset
||
{}),
id
:
entrie
.
target
.
id
}
}
,
pageVm
.
$page
.
id
)
})
})
},
{
root
,
...
...
@@ -63,11 +62,20 @@ export function requestComponentObserver ({
if
(
options
.
observeAll
)
{
intersectionObserver
.
USE_MUTATION_OBSERVER
=
true
Array
.
prototype
.
map
.
call
(
$el
.
querySelectorAll
(
options
.
selector
),
el
=>
{
if
(
!
el
)
{
console
.
warn
(
`Node
${
options
.
selector
}
is not found. Intersection observer will not trigger.`
)
return
}
intersectionObserver
.
observe
(
el
)
})
}
else
{
intersectionObserver
.
USE_MUTATION_OBSERVER
=
false
intersectionObserver
.
observe
(
$el
.
querySelector
(
options
.
selector
))
const
el
=
$el
.
querySelector
(
options
.
selector
)
if
(
!
el
)
{
console
.
warn
(
`Node
${
options
.
selector
}
is not found. Intersection observer will not trigger.`
)
return
}
intersectionObserver
.
observe
(
el
)
}
}
...
...
@@ -76,11 +84,11 @@ export function destroyComponentObserver ({
})
{
const
intersectionObserver
=
intersectionObservers
[
reqId
]
if
(
intersectionObserver
)
{
intersectionObserver
.
disconnect
()
intersectionObserver
.
disconnect
()
delete
intersectionObservers
[
reqId
]
UniViewJSBridge
.
publishHandler
(
'
onRequestComponentObserver
'
,
{
reqId
,
reqEnd
:
true
})
}
}
}
src/core/view/bridge/subscribe/api/request-media-query-observer.js
浏览文件 @
2958ea43
...
...
@@ -34,15 +34,6 @@ export function requestMediaQueryObserver ({
reqId
,
options
},
pageId
)
{
const
pages
=
getCurrentPages
()
const
page
=
pages
.
find
(
page
=>
page
.
$page
.
id
===
pageId
)
if
(
!
page
)
{
throw
new
Error
(
`Not Found:Page[
${
pageId
}
]`
)
}
// const pageVm = page.$vm
// 创建一个媒体查询对象
const
mediaQueryObserver
=
mediaQueryObservers
[
reqId
]
=
window
.
matchMedia
(
handleMediaQueryStr
(
options
))
...
...
@@ -51,7 +42,7 @@ export function requestMediaQueryObserver ({
UniViewJSBridge
.
publishHandler
(
'
onRequestMediaQueryObserver
'
,
{
reqId
,
res
:
e
.
matches
}
,
pages
[
pages
.
length
-
1
].
$page
.
id
)
})
}
listener
(
mediaQueryObserver
)
// 监听前执行一次媒体查询
...
...
src/platforms/h5/service/api/ui/request-component-info.js
浏览文件 @
2958ea43
import
createCallbacks
from
'
uni-helpers/callbacks
'
import
{
checkInWindows
}
from
'
uni-helpers/windows
'
const
requestComponentInfoCallbacks
=
createCallbacks
(
'
requestComponentInfo
'
)
...
...
@@ -6,5 +9,5 @@ export function requestComponentInfo (pageVm, queue, callback) {
UniServiceJSBridge
.
publishHandler
(
'
requestComponentInfo
'
,
{
reqId
:
requestComponentInfoCallbacks
.
push
(
callback
),
reqs
:
queue
},
pageVm
.
$page
.
id
)
},
checkInWindows
(
pageVm
)
?
pageVm
:
pageVm
.
$page
.
id
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录