Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MuGuiLin
uni-app
提交
cd2432fb
U
uni-app
项目概览
MuGuiLin
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd2432fb
编写于
4月 12, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wip: tabBar
上级
bd6684fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
8 deletion
+33
-8
packages/uni-h5/dist/uni-h5.esm.js
packages/uni-h5/dist/uni-h5.esm.js
+3
-5
packages/uni-h5/src/framework/components/layout/index.tsx
packages/uni-h5/src/framework/components/layout/index.tsx
+2
-3
packages/uni-h5/style/tabBar.css
packages/uni-h5/style/tabBar.css
+28
-0
未找到文件。
packages/uni-h5/dist/uni-h5.esm.js
浏览文件 @
cd2432fb
...
...
@@ -11126,7 +11126,7 @@ function createTabBarMidButtonTsx(color, iconPath, midButton, tabBar2, index2, o
src
:
getRealPath
(
iconPath
)
},
null
,
12
,
[
"
src
"
])],
4
),
createTabBarItemBdTsx
(
color
,
iconPath
,
midButton
,
tabBar2
)],
12
,
[
"
onClick
"
]);
}
const
CSS_VARS
=
[
"
--status-bar-height
"
,
"
--top-window-height
"
,
"
--window-left
"
,
"
--window-right
"
,
"
--window-margin
"
];
const
CSS_VARS
=
[
"
--status-bar-height
"
,
"
--top-window-height
"
,
"
--window-left
"
,
"
--window-right
"
,
"
--window-margin
"
,
"
--tab-bar-height
"
];
var
index$1
=
defineComponent
({
name
:
"
Layout
"
,
setup
(
props
,
{
...
...
@@ -11138,7 +11138,7 @@ var index$1 = defineComponent({
__UNI_FEATURE_TOPWINDOW__
&&
useTopWindow
();
__UNI_FEATURE_LEFTWINDOW__
&&
useLeftWindow
();
__UNI_FEATURE_RIGHTWINDOW__
&&
useRightWindow
();
const
showTabBar2
=
__UNI_FEATURE_TABBAR__
&&
useShowTabBar
(
emit
);
const
showTabBar2
=
__UNI_FEATURE_TABBAR__
&&
useShowTabBar
();
const
clazz
=
useAppClass
(
showTabBar2
);
return
()
=>
{
const
layoutTsx
=
createLayoutTsx
(
keepAliveRoute
);
...
...
@@ -11186,9 +11186,7 @@ function useShowTabBar(emit) {
const
route
=
useRoute
();
const
tabBar2
=
useTabBar
();
const
showTabBar2
=
computed
(()
=>
route
.
meta
.
isTabBar
&&
tabBar2
.
shown
);
watch
(
showTabBar2
,
(
value
)
=>
{
emit
(
"
change
"
,
"
showTabBar
"
,
value
);
});
updateCssVar
(
"
--tab-bar-height
"
,
tabBar2
.
height
);
return
showTabBar2
;
}
function
createTabBarTsx
(
showTabBar2
)
{
...
...
packages/uni-h5/src/framework/components/layout/index.tsx
浏览文件 @
cd2432fb
...
...
@@ -31,6 +31,7 @@ const CSS_VARS = [
'
--window-left
'
,
'
--window-right
'
,
'
--window-margin
'
,
'
--tab-bar-height
'
,
]
export
default
defineComponent
({
...
...
@@ -125,9 +126,7 @@ function useShowTabBar(emit: SetupContext<['change']>['emit']) {
const
tabBar
=
useTabBar
()
!
// TODO meida query
const
showTabBar
=
computed
(()
=>
route
.
meta
.
isTabBar
&&
tabBar
.
shown
)
watch
(
showTabBar
,
(
value
)
=>
{
emit
(
'
change
'
,
'
showTabBar
'
,
value
)
})
updateCssVar
(
'
--tab-bar-height
'
,
tabBar
.
height
!
)
return
showTabBar
}
...
...
packages/uni-h5/style/tabBar.css
浏览文件 @
cd2432fb
...
...
@@ -129,3 +129,31 @@ uni-tabbar {
bottom
:
0
;
background-size
:
100%
100%
;
}
.uni-app--showtabbar
uni-page-wrapper
{
display
:
block
;
height
:
calc
(
100%
-
var
(
--tab-bar-height
));
height
:
calc
(
100%
-
var
(
--tab-bar-height
)
-
constant
(
safe-area-inset-bottom
));
height
:
calc
(
100%
-
var
(
--tab-bar-height
)
-
env
(
safe-area-inset-bottom
));
}
.uni-app--showtabbar
uni-page-wrapper
::after
{
content
:
''
;
display
:
block
;
width
:
100%
;
height
:
var
(
--tab-bar-height
);
height
:
calc
(
var
(
--tab-bar-height
)
+
constant
(
safe-area-inset-bottom
));
height
:
calc
(
var
(
--tab-bar-height
)
+
env
(
safe-area-inset-bottom
));
}
.uni-app--showtabbar
uni-page-head
[
uni-page-head-type
=
'default'
]
~
uni-page-wrapper
{
height
:
calc
(
100%
-
44px
-
var
(
--tab-bar-height
));
height
:
calc
(
100%
-
44px
-
constant
(
safe-area-inset-top
)
-
var
(
--tab-bar-height
)
-
constant
(
safe-area-inset-bottom
)
);
height
:
calc
(
100%
-
44px
-
env
(
safe-area-inset-top
)
-
var
(
--tab-bar-height
)
-
env
(
safe-area-inset-bottom
)
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录