From 12b41ff17a6b576845b01065620b90bca5e53782 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 12 Oct 2020 11:58:00 +0800
Subject: [PATCH] refactor:  layout.vue

---
 src/platforms/h5/components/app/layout.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/platforms/h5/components/app/layout.vue b/src/platforms/h5/components/app/layout.vue
index d23036ea9..7d4a67cfb 100644
--- a/src/platforms/h5/components/app/layout.vue
+++ b/src/platforms/h5/components/app/layout.vue
@@ -14,6 +14,7 @@
       >
         <v-uni-top-window
           ref="top"
+          v-bind="bindWindow"
           @hook:mounted="onTopWindowInit"
         />
       </div>
@@ -32,7 +33,8 @@
         v-if="leftWindow"
         v-show="showLeftWindow || apiShowLeftWindow"
         ref="leftWindow"
-        :data-show="apiShowLeftWindow"
+        v-bind="bindWindow"
+        :data-show="apiShowLeftWindow"
         :style="leftWindowStyle"
       >
         <div
@@ -51,7 +53,8 @@
         v-if="rightWindow"
         v-show="showRightWindow || apiShowRightWindow"
         ref="rightWindow"
-        :data-show="apiShowRightWindow"
+        v-bind="bindWindow"
+        :data-show="apiShowRightWindow"
         :style="rightWindowStyle"
       >
         <div
@@ -143,6 +146,16 @@ export default {
     }
   },
   computed: {
+    bindWindow () {
+      return {
+        matchTopWindow: this.topWindowMediaQuery,
+        showTopWindow: this.showTopWindow || this.apiShowTopWindow,
+        matchLeftWindow: this.leftWindowMediaQuery,
+        showLeftWindow: this.showLeftWindow || this.apiShowLeftWindow,
+        matchRightWindow: this.rightWindowMediaQuery,
+        showRightWindow: this.showRightWindow || this.apiShowRightWindow
+      }
+    },
     showLayout () {
       return this.showTopWindow || this.showLeftWindow || this.showRightWindow
     },
@@ -213,7 +226,7 @@ export default {
     }
   },
   methods: {
-    resetApiShowWindow () {
+    resetApiShowWindow () {
       // 仅对 left，right 重置
       // this.apiShowTopWindow = false
       this.apiShowLeftWindow = false
@@ -247,7 +260,7 @@ export default {
         if (windowOptions && windowOptions.matchMedia && hasOwn(windowOptions.matchMedia, 'minWidth')) {
           this[minWidthName] = windowOptions.matchMedia.minWidth
         }
-        if (!this.minWidth || this.minWidth > this[minWidthName]) {
+        if (typeof this.minWidth === 'undefined' || this.minWidth > this[minWidthName]) {
           this.minWidth = this[minWidthName]
         }
       }
-- 
GitLab