Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
ffe97aa2
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
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,发现更多精彩内容 >>
提交
ffe97aa2
编写于
5月 14, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: picker-view state.height
上级
aef8efb3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
5 deletion
+20
-5
packages/uni-components/src/components/picker-view-column/index.tsx
...ni-components/src/components/picker-view-column/index.tsx
+8
-1
packages/uni-components/src/components/picker-view/index.tsx
packages/uni-components/src/components/picker-view/index.tsx
+9
-1
packages/uni-components/src/components/resize-sensor/index.tsx
...ges/uni-components/src/components/resize-sensor/index.tsx
+3
-3
未找到文件。
packages/uni-components/src/components/picker-view-column/index.tsx
浏览文件 @
ffe97aa2
...
...
@@ -9,6 +9,7 @@ import {
getCurrentInstance
,
ComponentInternalInstance
,
nextTick
,
ComponentPublicInstance
,
}
from
'
vue
'
import
{
defineBuiltInComponent
}
from
'
../../helpers/component
'
import
{
useScroller
}
from
'
../../helpers/scroller
'
...
...
@@ -103,6 +104,11 @@ export default /*#__PURE__*/ defineBuiltInComponent({
const
pickerViewProps
=
inject
(
'
pickerViewProps
'
)
as
PickerViewProps
const
pickerViewState
=
inject
(
'
pickerViewState
'
)
as
PickerViewState
const
indicatorHeight
=
ref
(
34
)
const
resizeSensorRef
:
Ref
<
ComponentPublicInstance
|
null
>
=
ref
(
null
)
onMounted
(()
=>
{
const
resizeSensor
=
resizeSensorRef
.
value
as
ComponentPublicInstance
indicatorHeight
.
value
=
resizeSensor
.
$el
.
getBoundingClientRect
().
height
})
const
maskSize
=
computed
(
()
=>
(
pickerViewState
.
height
-
indicatorHeight
.
value
)
/
2
)
...
...
@@ -258,7 +264,8 @@ export default /*#__PURE__*/ defineBuiltInComponent({
style
=
{
pickerViewProps
.
indicatorStyle
}
>
<
ResizeSensor
initial
ref
=
{
resizeSensorRef
}
// @ts-ignore
onResize
=
{
({
height
}:
{
height
:
number
})
=>
(
indicatorHeight
.
value
=
height
)
}
...
...
packages/uni-components/src/components/picker-view/index.tsx
浏览文件 @
ffe97aa2
...
...
@@ -10,6 +10,8 @@ import {
SetupContext
,
PropType
,
ComponentInternalInstance
,
onMounted
,
ComponentPublicInstance
,
}
from
'
vue
'
import
{
defineBuiltInComponent
}
from
'
../../helpers/component
'
import
{
flatVNode
}
from
'
../../helpers/flatVNode
'
...
...
@@ -91,6 +93,11 @@ export default /*#__PURE__*/ defineBuiltInComponent({
const
rootRef
:
Ref
<
HTMLElement
|
null
>
=
ref
(
null
)
const
trigger
=
useCustomEvent
(
rootRef
,
emit
as
SetupContext
[
'
emit
'
])
const
state
=
useState
(
props
)
const
resizeSensorRef
:
Ref
<
ComponentPublicInstance
|
null
>
=
ref
(
null
)
onMounted
(()
=>
{
const
resizeSensor
=
resizeSensorRef
.
value
as
ComponentPublicInstance
state
.
height
=
resizeSensor
.
$el
.
getBoundingClientRect
().
height
})
let
columnVNodes
:
VNode
[]
=
[]
function
getItemIndex
(
vnode
:
VNode
):
number
{
return
columnVNodes
.
indexOf
(
vnode
)
...
...
@@ -128,7 +135,8 @@ export default /*#__PURE__*/ defineBuiltInComponent({
return
(
<
uni
-
picker
-
view
ref
=
{
rootRef
}
>
<
ResizeSensor
initial
ref
=
{
resizeSensorRef
}
// @ts-ignore
onResize
=
{
({
height
}:
{
height
:
number
})
=>
(
state
.
height
=
height
)
}
...
...
packages/uni-components/src/components/resize-sensor/index.tsx
浏览文件 @
ffe97aa2
...
...
@@ -49,9 +49,9 @@ function useResizeSensorUpdate(
(
value
:
typeof
size
)
=>
emit
(
'
resize
'
,
value
)
)
return
()
=>
{
const
{
offsetWidth
,
offsetHeight
}
=
rootRef
.
value
!
size
.
width
=
offsetW
idth
size
.
height
=
offsetH
eight
const
{
width
,
height
}
=
rootRef
.
value
!
.
getBoundingClientRect
()
size
.
width
=
w
idth
size
.
height
=
h
eight
reset
()
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录