Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
b82f78c6
U
uni-app
项目概览
genary
/
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,发现更多精彩内容 >>
提交
b82f78c6
编写于
5月 25, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): window ssr
上级
5afea33b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
35 addition
and
23 deletion
+35
-23
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+9
-7
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+13
-8
packages/uni-h5/src/framework/components/layout/index.tsx
packages/uni-h5/src/framework/components/layout/index.tsx
+13
-8
未找到文件。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
b82f78c6
...
...
@@ -10608,13 +10608,16 @@ function useAppClass(showTabBar) {
});
}
function
initMediaQuery
(
minWidth
,
callback
)
{
const
mediaQueryList
=
window
.
matchMedia
(
"
(min-width:
"
+
minWidth
+
"
px)
"
);
if
(
mediaQueryList
.
addEventListener
)
{
mediaQueryList
.
addEventListener
(
"
change
"
,
callback
);
}
else
{
mediaQueryList
.
addListener
(
callback
);
if
(
typeof
window
===
"
object
"
&&
window
.
matchMedia
)
{
const
mediaQueryList
=
window
.
matchMedia
(
"
(min-width:
"
+
minWidth
+
"
px)
"
);
if
(
mediaQueryList
.
addEventListener
)
{
mediaQueryList
.
addEventListener
(
"
change
"
,
callback
);
}
else
{
mediaQueryList
.
addListener
(
callback
);
}
return
mediaQueryList
.
matches
;
}
return
mediaQueryList
.
matches
;
return
false
;
}
function
useMaxWidth
(
layoutState
,
rootRef
)
{
const
route
=
vueRouter
.
useRoute
();
...
...
@@ -10646,7 +10649,6 @@ function useMaxWidth(layoutState, rootRef) {
}
}
vue
.
watch
([()
=>
route
.
path
],
checkMaxWidth
);
window
.
addEventListener
(
"
resize
"
,
checkMaxWidth
);
}
function
useState
()
{
const
topWindowMediaQuery
=
vue
.
ref
(
false
);
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
b82f78c6
...
...
@@ -18092,13 +18092,16 @@ function initCssVar() {
});
}
function initMediaQuery(minWidth, callback) {
const mediaQueryList = window.matchMedia("(min-width: " + minWidth + "px)");
if (mediaQueryList.addEventListener) {
mediaQueryList.addEventListener("change", callback);
} else {
mediaQueryList.addListener(callback);
if (typeof window === "object" && window.matchMedia) {
const mediaQueryList = window.matchMedia("(min-width: " + minWidth + "px)");
if (mediaQueryList.addEventListener) {
mediaQueryList.addEventListener("change", callback);
} else {
mediaQueryList.addListener(callback);
}
return mediaQueryList.matches;
}
return
mediaQueryList.matches
;
return
false
;
}
function useMaxWidth(layoutState, rootRef) {
const route = useRoute();
...
...
@@ -18130,8 +18133,10 @@ function useMaxWidth(layoutState, rootRef) {
}
}
watch([() => route.path], checkMaxWidth);
onMounted(checkMaxWidth);
window.addEventListener("resize", checkMaxWidth);
onMounted(() => {
checkMaxWidth();
window.addEventListener("resize", checkMaxWidth);
});
}
function useState() {
const topWindowMediaQuery = ref(false);
...
...
packages/uni-h5/src/framework/components/layout/index.tsx
浏览文件 @
b82f78c6
...
...
@@ -127,13 +127,16 @@ function initMediaQuery(
minWidth
:
number
,
callback
:
(
ev
:
MediaQueryListEvent
)
=>
void
)
{
const
mediaQueryList
=
window
.
matchMedia
(
'
(min-width:
'
+
minWidth
+
'
px)
'
)
if
(
mediaQueryList
.
addEventListener
)
{
mediaQueryList
.
addEventListener
(
'
change
'
,
callback
)
}
else
{
mediaQueryList
.
addListener
(
callback
)
if
(
typeof
window
===
'
object
'
&&
window
.
matchMedia
)
{
const
mediaQueryList
=
window
.
matchMedia
(
'
(min-width:
'
+
minWidth
+
'
px)
'
)
if
(
mediaQueryList
.
addEventListener
)
{
mediaQueryList
.
addEventListener
(
'
change
'
,
callback
)
}
else
{
mediaQueryList
.
addListener
(
callback
)
}
return
mediaQueryList
.
matches
}
return
mediaQueryList
.
matches
return
false
}
function
useMaxWidth
(
...
...
@@ -172,8 +175,10 @@ function useMaxWidth(
}
}
watch
([()
=>
route
.
path
],
checkMaxWidth
)
onMounted
(
checkMaxWidth
)
window
.
addEventListener
(
'
resize
'
,
checkMaxWidth
)
onMounted
(()
=>
{
checkMaxWidth
()
window
.
addEventListener
(
'
resize
'
,
checkMaxWidth
)
})
}
function
useState
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录