提交 c89dbdf9 编写于 作者: Q qiang

fix(h5): page style topWindow, leftWindow, rightWindow

上级 97c39302
...@@ -9987,6 +9987,7 @@ function useMaxWidth(layoutState, rootRef) { ...@@ -9987,6 +9987,7 @@ function useMaxWidth(layoutState, rootRef) {
vue.watch([() => route.path], checkMaxWidth); vue.watch([() => route.path], checkMaxWidth);
} }
function useState() { function useState() {
const route = usePageRoute();
if (!__UNI_FEATURE_RESPONSIVE__) { if (!__UNI_FEATURE_RESPONSIVE__) {
const layoutState2 = vue.reactive({ const layoutState2 = vue.reactive({
marginWidth: 0 marginWidth: 0
...@@ -10001,9 +10002,9 @@ function useState() { ...@@ -10001,9 +10002,9 @@ function useState() {
const topWindowMediaQuery = vue.ref(false); const topWindowMediaQuery = vue.ref(false);
const leftWindowMediaQuery = vue.ref(false); const leftWindowMediaQuery = vue.ref(false);
const rightWindowMediaQuery = vue.ref(false); const rightWindowMediaQuery = vue.ref(false);
const showTopWindow = vue.computed(() => __UNI_FEATURE_TOPWINDOW__ && topWindowMediaQuery.value); const showTopWindow = vue.computed(() => __UNI_FEATURE_TOPWINDOW__ && route.meta.topWindow !== false && topWindowMediaQuery.value);
const showLeftWindow = vue.computed(() => __UNI_FEATURE_LEFTWINDOW__ && leftWindowMediaQuery.value); const showLeftWindow = vue.computed(() => __UNI_FEATURE_LEFTWINDOW__ && route.meta.leftWindow !== false && leftWindowMediaQuery.value);
const showRightWindow = vue.computed(() => __UNI_FEATURE_RIGHTWINDOW__ && rightWindowMediaQuery.value); const showRightWindow = vue.computed(() => __UNI_FEATURE_RIGHTWINDOW__ && route.meta.rightWindow !== false && rightWindowMediaQuery.value);
const layoutState = vue.reactive({ const layoutState = vue.reactive({
topWindowMediaQuery, topWindowMediaQuery,
showTopWindow, showTopWindow,
......
...@@ -18597,6 +18597,7 @@ function useMaxWidth(layoutState, rootRef) { ...@@ -18597,6 +18597,7 @@ function useMaxWidth(layoutState, rootRef) {
}); });
} }
function useState() { function useState() {
const route = usePageRoute();
if (!__UNI_FEATURE_RESPONSIVE__) { if (!__UNI_FEATURE_RESPONSIVE__) {
const layoutState2 = reactive({ const layoutState2 = reactive({
marginWidth: 0 marginWidth: 0
...@@ -18611,9 +18612,9 @@ function useState() { ...@@ -18611,9 +18612,9 @@ function useState() {
const topWindowMediaQuery = ref(false); const topWindowMediaQuery = ref(false);
const leftWindowMediaQuery = ref(false); const leftWindowMediaQuery = ref(false);
const rightWindowMediaQuery = ref(false); const rightWindowMediaQuery = ref(false);
const showTopWindow2 = computed(() => __UNI_FEATURE_TOPWINDOW__ && topWindowMediaQuery.value); const showTopWindow2 = computed(() => __UNI_FEATURE_TOPWINDOW__ && route.meta.topWindow !== false && topWindowMediaQuery.value);
const showLeftWindow2 = computed(() => __UNI_FEATURE_LEFTWINDOW__ && leftWindowMediaQuery.value); const showLeftWindow2 = computed(() => __UNI_FEATURE_LEFTWINDOW__ && route.meta.leftWindow !== false && leftWindowMediaQuery.value);
const showRightWindow2 = computed(() => __UNI_FEATURE_RIGHTWINDOW__ && rightWindowMediaQuery.value); const showRightWindow2 = computed(() => __UNI_FEATURE_RIGHTWINDOW__ && route.meta.rightWindow !== false && rightWindowMediaQuery.value);
const layoutState = reactive({ const layoutState = reactive({
topWindowMediaQuery, topWindowMediaQuery,
showTopWindow: showTopWindow2, showTopWindow: showTopWindow2,
......
...@@ -183,6 +183,7 @@ function useMaxWidth( ...@@ -183,6 +183,7 @@ function useMaxWidth(
} }
function useState() { function useState() {
const route = usePageRoute()
if (!__UNI_FEATURE_RESPONSIVE__) { if (!__UNI_FEATURE_RESPONSIVE__) {
// max width // max width
const layoutState = reactive({ const layoutState = reactive({
...@@ -198,13 +199,22 @@ function useState() { ...@@ -198,13 +199,22 @@ function useState() {
const leftWindowMediaQuery = ref(false) const leftWindowMediaQuery = ref(false)
const rightWindowMediaQuery = ref(false) const rightWindowMediaQuery = ref(false)
const showTopWindow = computed( const showTopWindow = computed(
() => __UNI_FEATURE_TOPWINDOW__ && topWindowMediaQuery.value () =>
__UNI_FEATURE_TOPWINDOW__ &&
route.meta.topWindow !== false &&
topWindowMediaQuery.value
) )
const showLeftWindow = computed( const showLeftWindow = computed(
() => __UNI_FEATURE_LEFTWINDOW__ && leftWindowMediaQuery.value () =>
__UNI_FEATURE_LEFTWINDOW__ &&
route.meta.leftWindow !== false &&
leftWindowMediaQuery.value
) )
const showRightWindow = computed( const showRightWindow = computed(
() => __UNI_FEATURE_RIGHTWINDOW__ && rightWindowMediaQuery.value () =>
__UNI_FEATURE_RIGHTWINDOW__ &&
route.meta.rightWindow !== false &&
rightWindowMediaQuery.value
) )
const layoutState: LayoutState = reactive({ const layoutState: LayoutState = reactive({
topWindowMediaQuery, topWindowMediaQuery,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册