Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
2f499332
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,发现更多精彩内容 >>
提交
2f499332
编写于
7月 26, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): uni-layout class
上级
c89dbdf9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
5 deletion
+26
-5
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+8
-2
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+8
-2
packages/uni-h5/src/framework/components/layout/index.tsx
packages/uni-h5/src/framework/components/layout/index.tsx
+10
-1
未找到文件。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
2f499332
...
@@ -10066,7 +10066,13 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
...
@@ -10066,7 +10066,13 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
const
topWindowTsx
=
__UNI_FEATURE_TOPWINDOW__
?
createTopWindowTsx
(
topWindow
,
layoutState
,
windowState
)
:
null
;
const
topWindowTsx
=
__UNI_FEATURE_TOPWINDOW__
?
createTopWindowTsx
(
topWindow
,
layoutState
,
windowState
)
:
null
;
const
leftWindowTsx
=
__UNI_FEATURE_LEFTWINDOW__
?
createLeftWindowTsx
(
leftWindow
,
layoutState
,
windowState
)
:
null
;
const
leftWindowTsx
=
__UNI_FEATURE_LEFTWINDOW__
?
createLeftWindowTsx
(
leftWindow
,
layoutState
,
windowState
)
:
null
;
const
rightWindowTsx
=
__UNI_FEATURE_RIGHTWINDOW__
?
createRightWindowTsx
(
rightWindow
,
layoutState
,
windowState
)
:
null
;
const
rightWindowTsx
=
__UNI_FEATURE_RIGHTWINDOW__
?
createRightWindowTsx
(
rightWindow
,
layoutState
,
windowState
)
:
null
;
return
vue
.
createVNode
(
"
uni-layout
"
,
null
,
{
return
vue
.
createVNode
(
"
uni-layout
"
,
{
"
class
"
:
{
"
uni-app--showtopwindow
"
:
__UNI_FEATURE_TOPWINDOW__
&&
layoutState
.
showTopWindow
,
"
uni-app--showleftwindow
"
:
__UNI_FEATURE_LEFTWINDOW__
&&
layoutState
.
showLeftWindow
,
"
uni-app--showrightwindow
"
:
__UNI_FEATURE_RIGHTWINDOW__
&&
layoutState
.
showRightWindow
}
},
{
default
:
()
=>
[
topWindowTsx
,
vue
.
createVNode
(
"
uni-content
"
,
null
,
{
default
:
()
=>
[
topWindowTsx
,
vue
.
createVNode
(
"
uni-content
"
,
null
,
{
default
:
()
=>
[
vue
.
createVNode
(
"
uni-main
"
,
null
,
_isSlot$1
(
routerVNode
)
?
routerVNode
:
{
default
:
()
=>
[
vue
.
createVNode
(
"
uni-main
"
,
null
,
_isSlot$1
(
routerVNode
)
?
routerVNode
:
{
default
:
()
=>
[
routerVNode
],
default
:
()
=>
[
routerVNode
],
...
@@ -10075,7 +10081,7 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
...
@@ -10075,7 +10081,7 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
_
:
2
_
:
2
})],
})],
_
:
2
_
:
2
});
}
,
8
,
[
"
class
"
]
);
}
}
function
useShowTabBar
(
emit2
)
{
function
useShowTabBar
(
emit2
)
{
const
route
=
vueRouter
.
useRoute
();
const
route
=
vueRouter
.
useRoute
();
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
2f499332
...
@@ -18680,7 +18680,13 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
...
@@ -18680,7 +18680,13 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
const topWindowTsx = __UNI_FEATURE_TOPWINDOW__ ? createTopWindowTsx(topWindow, layoutState, windowState) : null;
const topWindowTsx = __UNI_FEATURE_TOPWINDOW__ ? createTopWindowTsx(topWindow, layoutState, windowState) : null;
const leftWindowTsx = __UNI_FEATURE_LEFTWINDOW__ ? createLeftWindowTsx(leftWindow, layoutState, windowState) : null;
const leftWindowTsx = __UNI_FEATURE_LEFTWINDOW__ ? createLeftWindowTsx(leftWindow, layoutState, windowState) : null;
const rightWindowTsx = __UNI_FEATURE_RIGHTWINDOW__ ? createRightWindowTsx(rightWindow, layoutState, windowState) : null;
const rightWindowTsx = __UNI_FEATURE_RIGHTWINDOW__ ? createRightWindowTsx(rightWindow, layoutState, windowState) : null;
return createVNode("uni-layout", null, {
return createVNode("uni-layout", {
"class": {
"uni-app--showtopwindow": __UNI_FEATURE_TOPWINDOW__ && layoutState.showTopWindow,
"uni-app--showleftwindow": __UNI_FEATURE_LEFTWINDOW__ && layoutState.showLeftWindow,
"uni-app--showrightwindow": __UNI_FEATURE_RIGHTWINDOW__ && layoutState.showRightWindow
}
}, {
default: () => [topWindowTsx, createVNode("uni-content", null, {
default: () => [topWindowTsx, createVNode("uni-content", null, {
default: () => [createVNode("uni-main", null, _isSlot$2(routerVNode) ? routerVNode : {
default: () => [createVNode("uni-main", null, _isSlot$2(routerVNode) ? routerVNode : {
default: () => [routerVNode],
default: () => [routerVNode],
...
@@ -18689,7 +18695,7 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
...
@@ -18689,7 +18695,7 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le
_: 2
_: 2
})],
})],
_: 2
_: 2
});
}
, 8, ["class"]
);
}
}
function useShowTabBar(emit2) {
function useShowTabBar(emit2) {
const route = useRoute();
const route = useRoute();
...
...
packages/uni-h5/src/framework/components/layout/index.tsx
浏览文件 @
2f499332
...
@@ -311,7 +311,16 @@ function createLayoutTsx(
...
@@ -311,7 +311,16 @@ function createLayoutTsx(
?
createRightWindowTsx
(
rightWindow
,
layoutState
!
,
windowState
!
)
?
createRightWindowTsx
(
rightWindow
,
layoutState
!
,
windowState
!
)
:
null
:
null
return
(
return
(
<
uni
-
layout
>
<
uni
-
layout
class
=
{
{
'
uni-app--showtopwindow
'
:
__UNI_FEATURE_TOPWINDOW__
&&
layoutState
!
.
showTopWindow
,
'
uni-app--showleftwindow
'
:
__UNI_FEATURE_LEFTWINDOW__
&&
layoutState
!
.
showLeftWindow
,
'
uni-app--showrightwindow
'
:
__UNI_FEATURE_RIGHTWINDOW__
&&
layoutState
!
.
showRightWindow
,
}
}
>
{
topWindowTsx
}
{
topWindowTsx
}
<
uni
-
content
>
<
uni
-
content
>
<
uni
-
main
>
{
routerVNode
}
</
uni
-
main
>
<
uni
-
main
>
{
routerVNode
}
</
uni
-
main
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录