Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
62dee3f8
U
uni-app
项目概览
DCloud
/
uni-app
3 个月 前同步成功
通知
725
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,发现更多精彩内容 >>
提交
62dee3f8
编写于
5月 19, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: label component representation error when containing more than one child element
上级
bf5df5d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
29 deletion
+21
-29
packages/uni-components/src/components/label/index.tsx
packages/uni-components/src/components/label/index.tsx
+2
-4
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+1
-4
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+18
-21
未找到文件。
packages/uni-components/src/components/label/index.tsx
浏览文件 @
62dee3f8
...
...
@@ -13,7 +13,7 @@ const props = {
export
default
/*#__PURE__*/
defineBuiltInComponent
({
name
:
'
Label
'
,
props
,
setup
(
props
,
{
emit
,
slots
})
{
setup
(
props
,
{
slots
})
{
const
pageId
=
useCurrentPageId
()
const
handlers
=
useProvideLabel
()
...
...
@@ -44,9 +44,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({
true
)
}
else
{
handlers
.
forEach
((
handler
)
=>
{
handler
(
$event
,
true
)
})
handlers
[
0
](
$event
,
true
)
}
})
...
...
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
62dee3f8
...
...
@@ -1905,7 +1905,6 @@ var index$o = /* @__PURE__ */ defineBuiltInComponent({
name
:
"
Label
"
,
props
:
props$o
,
setup
(
props2
,
{
emit
:
emit2
,
slots
})
{
const
pageId
=
useCurrentPageId
();
...
...
@@ -1923,9 +1922,7 @@ var index$o = /* @__PURE__ */ defineBuiltInComponent({
if
(
props2
.
for
)
{
UniViewJSBridge
.
emit
(
"
uni-label-click-
"
+
pageId
+
"
-
"
+
props2
.
for
,
$event
,
true
);
}
else
{
handlers
.
forEach
((
handler
)
=>
{
handler
(
$event
,
true
);
});
handlers
[
0
](
$event
,
true
);
}
});
return
()
=>
vue
.
createVNode
(
"
uni-label
"
,
{
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
62dee3f8
...
...
@@ -594,7 +594,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(() => {
...
...
@@ -606,10 +606,10 @@ function getWindowOffset() {
const left = parseInt(style.getPropertyValue("--window-left"));
const right = parseInt(style.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
};
}
function updateCssVar(cssVars) {
...
...
@@ -1291,7 +1291,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);
...
...
@@ -3156,7 +3156,6 @@ var index$l = /* @__PURE__ */ defineBuiltInComponent({
name: "Label",
props: props$v,
setup(props2, {
emit: emit2,
slots
}) {
const pageId = useCurrentPageId();
...
...
@@ -3174,9 +3173,7 @@ var index$l = /* @__PURE__ */ defineBuiltInComponent({
if (props2.for) {
UniViewJSBridge.emit("uni-label-click-" + pageId + "-" + props2.for, $event, true);
} else {
handlers.forEach((handler) => {
handler($event, true);
});
handlers[0]($event, true);
}
});
return () => createVNode("uni-label", {
...
...
@@ -14885,7 +14882,7 @@ const getSystemInfoSync = /* @__PURE__ */ 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;
...
...
@@ -14998,12 +14995,12 @@ const getSystemInfoSync = /* @__PURE__ */ 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;
...
...
@@ -15023,10 +15020,10 @@ const getSystemInfoSync = /* @__PURE__ */ 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录