Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qianlong66
uni-app
提交
371b4b1b
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,发现更多精彩内容 >>
提交
371b4b1b
编写于
4月 27, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: checkbox、checkbox-group、useListeners
上级
fc1b84cf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
45 addition
and
36 deletion
+45
-36
packages/uni-components/src/components/checkbox-group/index.tsx
...es/uni-components/src/components/checkbox-group/index.tsx
+2
-1
packages/uni-components/src/components/checkbox/index.tsx
packages/uni-components/src/components/checkbox/index.tsx
+1
-1
packages/uni-components/src/helpers/useListeners.ts
packages/uni-components/src/helpers/useListeners.ts
+12
-7
packages/uni-h5/dist/uni-h5.esm.js
packages/uni-h5/dist/uni-h5.esm.js
+30
-27
未找到文件。
packages/uni-components/src/components/checkbox-group/index.tsx
浏览文件 @
371b4b1b
...
...
@@ -83,7 +83,8 @@ function useProvideCheckGroup(
submit
:
()
=>
{
let
data
:
[
string
,
any
]
=
[
''
,
null
]
if
(
props
.
name
!==
''
)
{
data
.
push
(
props
.
name
,
getFieldsValue
())
data
[
0
]
=
props
.
name
data
[
1
]
=
getFieldsValue
()
}
return
data
},
...
...
packages/uni-components/src/components/checkbox/index.tsx
浏览文件 @
371b4b1b
...
...
@@ -134,7 +134,7 @@ function useCheckboxInject(
onBeforeUnmount
(()
=>
{
uniCheckGroup
&&
uniCheckGroup
.
removeField
(
filed
)
uniForm
&&
uniForm
.
add
Field
(
formField
)
uniForm
&&
uniForm
.
remove
Field
(
formField
)
})
return
{
...
...
packages/uni-components/src/helpers/useListeners.ts
浏览文件 @
371b4b1b
...
...
@@ -25,21 +25,23 @@ function _addListeners(
listeners
:
Record
<
string
,
Function
>
,
watch
?:
boolean
)
{
const
$page
=
getCurrentInstance
()
!
.
proxy
?.
$page
const
instance
=
getCurrentInstance
()
!
const
vm
=
instance
.
proxy
!
const
pageId
=
vm
.
$root
!
.
$page
.
id
if
(
watch
&&
!
id
)
{
// id被置空
return
}
if
(
!
isPlainObject
(
listeners
))
{
return
}
Object
.
keys
(
listeners
).
forEach
((
name
)
=>
{
if
(
watch
)
{
// watch id
if
(
name
.
indexOf
(
'
@
'
)
!==
0
&&
name
.
indexOf
(
'
uni-
'
)
!==
0
)
{
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
$page
!
.
i
d
}
-
${
id
}
`
,
listeners
[
name
])
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id
}
`
,
listeners
[
name
])
}
}
else
{
if
(
name
.
indexOf
(
'
uni-
'
)
===
0
)
{
...
...
@@ -47,7 +49,7 @@ function _addListeners(
UniViewJSBridge
.
on
(
name
,
listeners
[
name
])
}
else
if
(
id
)
{
// scoped
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
$page
!
.
i
d
}
-
${
id
}
`
,
listeners
[
name
])
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id
}
`
,
listeners
[
name
])
}
}
})
...
...
@@ -58,7 +60,9 @@ function _removeListeners(
listeners
:
Record
<
string
,
Function
>
,
watch
?:
boolean
)
{
const
$page
=
getCurrentInstance
()
!
.
proxy
?.
$page
const
instance
=
getCurrentInstance
()
!
const
vm
=
instance
.
proxy
!
const
pageId
=
vm
.
$root
!
.
$page
.
id
if
(
watch
&&
!
id
)
{
// id之前不存在
...
...
@@ -67,11 +71,12 @@ function _removeListeners(
if
(
!
isPlainObject
(
listeners
))
{
return
}
Object
.
keys
(
listeners
).
forEach
((
name
)
=>
{
if
(
watch
)
{
// watch id
if
(
name
.
indexOf
(
'
@
'
)
!==
0
&&
name
.
indexOf
(
'
uni-
'
)
!==
0
)
{
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
$page
!
.
i
d
}
-
${
id
}
`
,
listeners
[
name
])
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id
}
`
,
listeners
[
name
])
}
}
else
{
if
(
name
.
indexOf
(
'
uni-
'
)
===
0
)
{
...
...
@@ -79,7 +84,7 @@ function _removeListeners(
UniViewJSBridge
.
off
(
name
,
listeners
[
name
])
}
else
if
(
id
)
{
// scoped
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
$page
!
.
i
d
}
-
${
id
}
`
,
listeners
[
name
])
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id
}
`
,
listeners
[
name
])
}
}
})
...
...
packages/uni-h5/dist/uni-h5.esm.js
浏览文件 @
371b4b1b
...
...
@@ -678,7 +678,7 @@ var safeAreaInsets = {
onChange
,
offChange
};
var
out
=
safeAreaInsets
;
var
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
=
safeAreaInsets
;
const
onEventPrevent
=
/* @__PURE__ */
withModifiers
(()
=>
{
},
[
"
prevent
"
]);
const
onEventStop
=
/* @__PURE__ */
withModifiers
(()
=>
{
...
...
@@ -690,10 +690,10 @@ function getWindowOffset() {
const
left
=
parseInt
(
style2
.
getPropertyValue
(
"
--window-left
"
));
const
right
=
parseInt
(
style2
.
getPropertyValue
(
"
--window-right
"
));
return
{
top
:
top
?
top
+
out
.
top
:
0
,
bottom
:
bottom
?
bottom
+
out
.
bottom
:
0
,
left
:
left
?
left
+
out
.
left
:
0
,
right
:
right
?
right
+
out
.
right
:
0
top
:
top
?
top
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
:
0
,
bottom
:
bottom
?
bottom
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
:
0
,
left
:
left
?
left
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
left
:
0
,
right
:
right
?
right
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
:
0
};
}
const
style
=
document
.
documentElement
.
style
;
...
...
@@ -1329,7 +1329,7 @@ function normalizePageMeta(pageMeta) {
let
offset
=
rpx2px
(
refreshOptions
.
offset
);
const
{
type
}
=
navigationBar
;
if
(
type
!==
"
transparent
"
&&
type
!==
"
none
"
)
{
offset
+=
NAVBAR_HEIGHT
+
out
.
top
;
offset
+=
NAVBAR_HEIGHT
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
;
}
refreshOptions
.
offset
=
offset
;
refreshOptions
.
height
=
rpx2px
(
refreshOptions
.
height
);
...
...
@@ -5030,8 +5030,9 @@ function useListeners(props2, listeners2) {
});
}
function
_addListeners
(
id2
,
listeners2
,
watch2
)
{
var
_a
;
const
$page
=
(
_a
=
getCurrentInstance
().
proxy
)
==
null
?
void
0
:
_a
.
$page
;
const
instance2
=
getCurrentInstance
();
const
vm
=
instance2
.
proxy
;
const
pageId
=
vm
.
$root
.
$page
.
id
;
if
(
watch2
&&
!
id2
)
{
return
;
}
...
...
@@ -5041,20 +5042,21 @@ function _addListeners(id2, listeners2, watch2) {
Object
.
keys
(
listeners2
).
forEach
((
name
)
=>
{
if
(
watch2
)
{
if
(
name
.
indexOf
(
"
@
"
)
!==
0
&&
name
.
indexOf
(
"
uni-
"
)
!==
0
)
{
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
$page
.
i
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
}
}
else
{
if
(
name
.
indexOf
(
"
uni-
"
)
===
0
)
{
UniViewJSBridge
.
on
(
name
,
listeners2
[
name
]);
}
else
if
(
id2
)
{
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
$page
.
i
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
UniViewJSBridge
.
on
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
}
}
});
}
function
_removeListeners
(
id2
,
listeners2
,
watch2
)
{
var
_a
;
const
$page
=
(
_a
=
getCurrentInstance
().
proxy
)
==
null
?
void
0
:
_a
.
$page
;
const
instance2
=
getCurrentInstance
();
const
vm
=
instance2
.
proxy
;
const
pageId
=
vm
.
$root
.
$page
.
id
;
if
(
watch2
&&
!
id2
)
{
return
;
}
...
...
@@ -5064,13 +5066,13 @@ function _removeListeners(id2, listeners2, watch2) {
Object
.
keys
(
listeners2
).
forEach
((
name
)
=>
{
if
(
watch2
)
{
if
(
name
.
indexOf
(
"
@
"
)
!==
0
&&
name
.
indexOf
(
"
uni-
"
)
!==
0
)
{
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
$page
.
i
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
}
}
else
{
if
(
name
.
indexOf
(
"
uni-
"
)
===
0
)
{
UniViewJSBridge
.
off
(
name
,
listeners2
[
name
]);
}
else
if
(
id2
)
{
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
$page
.
i
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
UniViewJSBridge
.
off
(
`uni-
${
name
}
-
${
pageI
d
}
-
${
id2
}
`
,
listeners2
[
name
]);
}
}
});
...
...
@@ -5141,7 +5143,8 @@ function useProvideCheckGroup(props2, trigger) {
submit
:
()
=>
{
let
data
=
[
""
,
null
];
if
(
props2
.
name
!==
""
)
{
data
.
push
(
props2
.
name
,
getFieldsValue
());
data
[
0
]
=
props2
.
name
;
data
[
1
]
=
getFieldsValue
();
}
return
data
;
}
...
...
@@ -5300,7 +5303,7 @@ function useCheckboxInject(checkboxChecked, checkboxValue, reset) {
const
uniLabel
=
inject
(
uniLabelKey
,
false
);
onBeforeUnmount
(()
=>
{
uniCheckGroup
&&
uniCheckGroup
.
removeField
(
filed
);
uniForm
&&
uniForm
.
add
Field
(
formField
);
uniForm
&&
uniForm
.
remove
Field
(
formField
);
});
return
{
uniCheckGroup
,
...
...
@@ -11425,7 +11428,7 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
const
windowWidth
=
getWindowWidth
(
screenWidth
);
let
windowHeight
=
window
.
innerHeight
;
const
language
=
navigator
.
language
;
const
statusBarHeight
=
out
.
top
;
const
statusBarHeight
=
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
;
let
osname
;
let
osversion
;
let
model
;
...
...
@@ -11538,12 +11541,12 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
const
system
=
`
${
osname
}
${
osversion
}
`
;
const
platform
=
osname
.
toLocaleLowerCase
();
const
safeArea
=
{
left
:
out
.
left
,
right
:
windowWidth
-
out
.
right
,
top
:
out
.
top
,
bottom
:
windowHeight
-
out
.
bottom
,
width
:
windowWidth
-
out
.
left
-
out
.
right
,
height
:
windowHeight
-
out
.
top
-
out
.
bottom
left
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
left
,
right
:
windowWidth
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
,
top
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
,
bottom
:
windowHeight
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
,
width
:
windowWidth
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out
.
left
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
,
height
:
windowHeight
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out
.
top
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
};
const
{
top
:
windowTop
,
bottom
:
windowBottom
}
=
getWindowOffset
();
windowHeight
-=
windowTop
;
...
...
@@ -11563,10 +11566,10 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
model
,
safeArea
,
safeAreaInsets
:
{
top
:
out
.
top
,
right
:
out
.
right
,
bottom
:
out
.
bottom
,
left
:
out
.
left
top
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
,
right
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
,
bottom
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
,
left
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
left
}
};
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录