Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
陈庄旺
uni-app
提交
c37af7e5
U
uni-app
项目概览
陈庄旺
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
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,发现更多精彩内容 >>
提交
c37af7e5
编写于
5月 24, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: scroll-view e2e error
上级
cae888e8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
30 addition
and
26 deletion
+30
-26
packages/uni-components/src/components/scroll-view/index.tsx
packages/uni-components/src/components/scroll-view/index.tsx
+14
-14
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+7
-5
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+9
-7
未找到文件。
packages/uni-components/src/components/scroll-view/index.tsx
浏览文件 @
c37af7e5
...
...
@@ -121,26 +121,26 @@ export default /*#__PURE__*/ defineBuiltInComponent({
content
)
const
mainStyle
=
computed
(()
=>
{
let
style
=
''
props
.
scrollX
?
(
style
+=
'
overflow-x:auto;
'
)
:
(
style
+=
'
overflow-x:hidden;
'
)
props
.
scrollY
?
(
style
+=
'
overflow-y:auto;
'
)
:
(
style
+=
'
overflow-y:hidden;
'
)
return
style
})
return
()
=>
{
const
{
scrollX
,
refresherEnabled
,
refresherBackground
,
refresherDefaultStyle
,
}
=
props
const
{
refresherEnabled
,
refresherBackground
,
refresherDefaultStyle
}
=
props
const
{
refresherHeight
,
refreshState
,
refreshRotate
}
=
state
return
(
<
uni
-
scroll
-
view
ref
=
{
rootRef
}
>
<
div
ref
=
{
wrap
}
class
=
"uni-scroll-view"
>
<
div
ref
=
{
main
}
style
=
{
{
overflowX
:
scrollX
?
'
auto
'
:
'
hidden
'
,
overflowY
:
scrollY
?
'
auto
'
:
'
hidden
'
,
}
}
class
=
"uni-scroll-view"
>
<
div
ref
=
{
main
}
style
=
{
mainStyle
.
value
}
class
=
"uni-scroll-view"
>
<
div
ref
=
{
content
}
class
=
"uni-scroll-view-content"
>
{
refresherEnabled
?
(
<
div
...
...
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
c37af7e5
...
...
@@ -5818,9 +5818,14 @@ var index$h = /* @__PURE__ */ defineBuiltInComponent({
scrollLeftNumber
}
=
useScrollViewState
(
props2
);
useScrollViewLoader
(
props2
,
state
,
scrollTopNumber
,
scrollLeftNumber
,
trigger
,
rootRef
,
main
,
content
);
const
mainStyle
=
vue
.
computed
(()
=>
{
let
style
=
""
;
props2
.
scrollX
?
style
+=
"
overflow-x:auto;
"
:
style
+=
"
overflow-x:hidden;
"
;
props2
.
scrollY
?
style
+=
"
overflow-y:auto;
"
:
style
+=
"
overflow-y:hidden;
"
;
return
style
;
});
return
()
=>
{
const
{
scrollX
,
refresherEnabled
,
refresherBackground
,
refresherDefaultStyle
...
...
@@ -5837,10 +5842,7 @@ var index$h = /* @__PURE__ */ defineBuiltInComponent({
"
class
"
:
"
uni-scroll-view
"
},
[
vue
.
createVNode
(
"
div
"
,
{
"
ref
"
:
main
,
"
style
"
:
{
overflowX
:
scrollX
?
"
auto
"
:
"
hidden
"
,
overflowY
:
scrollY
?
"
auto
"
:
"
hidden
"
},
"
style
"
:
mainStyle
.
value
,
"
class
"
:
"
uni-scroll-view
"
},
[
vue
.
createVNode
(
"
div
"
,
{
"
ref
"
:
content
,
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
c37af7e5
...
...
@@ -606,8 +606,8 @@ function createScrollListener({
const isReachBottom = () => {
const {scrollHeight} = document.documentElement;
const windowHeight = window.innerHeight;
const scrollY
2
= window.scrollY;
const isBottom = scrollY
2 > 0 && scrollHeight > windowHeight && scrollY2
+ windowHeight + onReachBottomDistance >= scrollHeight;
const scrollY = window.scrollY;
const isBottom = scrollY
> 0 && scrollHeight > windowHeight && scrollY
+ windowHeight + onReachBottomDistance >= scrollHeight;
const heightChanged = Math.abs(scrollHeight - lastScrollHeight) > onReachBottomDistance;
if (isBottom && (!hasReachBottom || heightChanged)) {
lastScrollHeight = scrollHeight;
...
...
@@ -7934,9 +7934,14 @@ var ScrollView = /* @__PURE__ */ defineBuiltInComponent({
scrollLeftNumber
} = useScrollViewState(props2);
useScrollViewLoader(props2, state2, scrollTopNumber, scrollLeftNumber, trigger, rootRef, main, content);
const mainStyle = computed(() => {
let style = "";
props2.scrollX ? style += "overflow-x:auto;" : style += "overflow-x:hidden;";
props2.scrollY ? style += "overflow-y:auto;" : style += "overflow-y:hidden;";
return style;
});
return () => {
const {
scrollX,
refresherEnabled,
refresherBackground,
refresherDefaultStyle
...
...
@@ -7953,10 +7958,7 @@ var ScrollView = /* @__PURE__ */ defineBuiltInComponent({
"class": "uni-scroll-view"
}, [createVNode("div", {
"ref": main,
"style": {
overflowX: scrollX ? "auto" : "hidden",
overflowY: scrollY ? "auto" : "hidden"
},
"style": mainStyle.value,
"class": "uni-scroll-view"
}, [createVNode("div", {
"ref": content,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录