From c89dbdf98c43abc08d13c254019307bf4fd98c51 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Mon, 26 Jul 2021 16:55:13 +0800
Subject: [PATCH] fix(h5): page style topWindow, leftWindow, rightWindow

---
 packages/uni-h5/dist/uni-h5.cjs.js               |  7 ++++---
 packages/uni-h5/dist/uni-h5.es.js                |  7 ++++---
 .../src/framework/components/layout/index.tsx    | 16 +++++++++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index 1da8e8a442..2fd5accd90 100644
--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -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__ && route.meta.rightWindow !== false && rightWindowMediaQuery.value);
   const layoutState = vue.reactive({
     topWindowMediaQuery,
     showTopWindow,
diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js
index 2901366456..1cc008f45b 100644
--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
@@ -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__ && route.meta.rightWindow !== false && rightWindowMediaQuery.value);
   const layoutState = reactive({
     topWindowMediaQuery,
     showTopWindow: showTopWindow2,
diff --git a/packages/uni-h5/src/framework/components/layout/index.tsx b/packages/uni-h5/src/framework/components/layout/index.tsx
index 8ac5daa488..bb5f703890 100644
--- a/packages/uni-h5/src/framework/components/layout/index.tsx
+++ b/packages/uni-h5/src/framework/components/layout/index.tsx
@@ -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,
-- 
GitLab