Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lzb_79
uni-app
提交
c89dbdf9
U
uni-app
项目概览
lzb_79
/
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,发现更多精彩内容 >>
提交
c89dbdf9
编写于
7月 26, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): page style topWindow, leftWindow, rightWindow
上级
97c39302
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
9 deletion
+21
-9
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+4
-3
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+4
-3
packages/uni-h5/src/framework/components/layout/index.tsx
packages/uni-h5/src/framework/components/layout/index.tsx
+13
-3
未找到文件。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
c89dbdf9
...
...
@@ -9987,6 +9987,7 @@ function useMaxWidth(layoutState, rootRef) {
vue
.
watch
([()
=>
route
.
path
],
checkMaxWidth
);
}
function
useState
()
{
const
route
=
usePageRoute
();
if
(
!
__UNI_FEATURE_RESPONSIVE__
)
{
const
layoutState2
=
vue
.
reactive
({
marginWidth
:
0
...
...
@@ -10001,9 +10002,9 @@ function useState() {
const
topWindowMediaQuery
=
vue
.
ref
(
false
);
const
leftWindowMediaQuery
=
vue
.
ref
(
false
);
const
rightWindowMediaQuery
=
vue
.
ref
(
false
);
const
showTopWindow
=
vue
.
computed
(()
=>
__UNI_FEATURE_TOPWINDOW__
&&
topWindowMediaQuery
.
value
);
const
showLeftWindow
=
vue
.
computed
(()
=>
__UNI_FEATURE_LEFTWINDOW__
&&
leftWindowMediaQuery
.
value
);
const
showRightWindow
=
vue
.
computed
(()
=>
__UNI_FEATURE_RIGHTWINDOW__
&&
rightWindowMediaQuery
.
value
);
const
showTopWindow
=
vue
.
computed
(()
=>
__UNI_FEATURE_TOPWINDOW__
&&
route
.
meta
.
topWindow
!==
false
&&
topWindowMediaQuery
.
value
);
const
showLeftWindow
=
vue
.
computed
(()
=>
__UNI_FEATURE_LEFTWINDOW__
&&
route
.
meta
.
leftWindow
!==
false
&&
leftWindowMediaQuery
.
value
);
const
showRightWindow
=
vue
.
computed
(()
=>
__UNI_FEATURE_RIGHTWINDOW__
&&
r
oute
.
meta
.
rightWindow
!==
false
&&
r
ightWindowMediaQuery
.
value
);
const
layoutState
=
vue
.
reactive
({
topWindowMediaQuery
,
showTopWindow
,
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
c89dbdf9
...
...
@@ -18597,6 +18597,7 @@ function useMaxWidth(layoutState, rootRef) {
});
}
function useState() {
const route = usePageRoute();
if (!__UNI_FEATURE_RESPONSIVE__) {
const layoutState2 = reactive({
marginWidth: 0
...
...
@@ -18611,9 +18612,9 @@ function useState() {
const topWindowMediaQuery = ref(false);
const leftWindowMediaQuery = ref(false);
const rightWindowMediaQuery = ref(false);
const showTopWindow2 = computed(() => __UNI_FEATURE_TOPWINDOW__ && topWindowMediaQuery.value);
const showLeftWindow2 = computed(() => __UNI_FEATURE_LEFTWINDOW__ && leftWindowMediaQuery.value);
const showRightWindow2 = computed(() => __UNI_FEATURE_RIGHTWINDOW__ && rightWindowMediaQuery.value);
const showTopWindow2 = computed(() => __UNI_FEATURE_TOPWINDOW__ &&
route.meta.topWindow !== false &&
topWindowMediaQuery.value);
const showLeftWindow2 = computed(() => __UNI_FEATURE_LEFTWINDOW__ &&
route.meta.leftWindow !== false &&
leftWindowMediaQuery.value);
const showRightWindow2 = computed(() => __UNI_FEATURE_RIGHTWINDOW__ && r
oute.meta.rightWindow !== false && r
ightWindowMediaQuery.value);
const layoutState = reactive({
topWindowMediaQuery,
showTopWindow: showTopWindow2,
...
...
packages/uni-h5/src/framework/components/layout/index.tsx
浏览文件 @
c89dbdf9
...
...
@@ -183,6 +183,7 @@ function useMaxWidth(
}
function
useState
()
{
const
route
=
usePageRoute
()
if
(
!
__UNI_FEATURE_RESPONSIVE__
)
{
// max width
const
layoutState
=
reactive
({
...
...
@@ -198,13 +199,22 @@ function useState() {
const
leftWindowMediaQuery
=
ref
(
false
)
const
rightWindowMediaQuery
=
ref
(
false
)
const
showTopWindow
=
computed
(
()
=>
__UNI_FEATURE_TOPWINDOW__
&&
topWindowMediaQuery
.
value
()
=>
__UNI_FEATURE_TOPWINDOW__
&&
route
.
meta
.
topWindow
!==
false
&&
topWindowMediaQuery
.
value
)
const
showLeftWindow
=
computed
(
()
=>
__UNI_FEATURE_LEFTWINDOW__
&&
leftWindowMediaQuery
.
value
()
=>
__UNI_FEATURE_LEFTWINDOW__
&&
route
.
meta
.
leftWindow
!==
false
&&
leftWindowMediaQuery
.
value
)
const
showRightWindow
=
computed
(
()
=>
__UNI_FEATURE_RIGHTWINDOW__
&&
rightWindowMediaQuery
.
value
()
=>
__UNI_FEATURE_RIGHTWINDOW__
&&
route
.
meta
.
rightWindow
!==
false
&&
rightWindowMediaQuery
.
value
)
const
layoutState
:
LayoutState
=
reactive
({
topWindowMediaQuery
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录