From a444d520d3c073afcf690bafb3386737b9801e7c Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Tue, 17 Nov 2020 12:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E7=9A=84=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移动端的判断代码移动

调整el-table的滚动条样式
---
 vue/src/asset/style/element-ui.scss           |  8 ------
 vue/src/layout/component/Header/index.vue     | 18 -------------
 .../{Header => }/Navbar/component/Bell.vue    |  0
 .../Navbar/component/Hamburger.vue            |  0
 .../Navbar/component/HeadMenu.vue             |  0
 .../component/{Header => }/Navbar/index.vue   |  0
 .../component}/TagsView/ScrollPanel.vue       |  0
 .../component}/TagsView/index.vue             |  4 +--
 .../component}/TagsView/style.scss            |  0
 vue/src/layout/component/Page/index.vue       |  9 +++++--
 vue/src/layout/index.vue                      | 27 +++++--------------
 vue/src/layout/store/app.js                   |  6 ++++-
 12 files changed, 21 insertions(+), 51 deletions(-)
 delete mode 100644 vue/src/layout/component/Header/index.vue
 rename vue/src/layout/component/{Header => }/Navbar/component/Bell.vue (100%)
 rename vue/src/layout/component/{Header => }/Navbar/component/Hamburger.vue (100%)
 rename vue/src/layout/component/{Header => }/Navbar/component/HeadMenu.vue (100%)
 rename vue/src/layout/component/{Header => }/Navbar/index.vue (100%)
 rename vue/src/layout/component/{Header => Page/component}/TagsView/ScrollPanel.vue (100%)
 rename vue/src/layout/component/{Header => Page/component}/TagsView/index.vue (99%)
 rename vue/src/layout/component/{Header => Page/component}/TagsView/style.scss (100%)

diff --git a/vue/src/asset/style/element-ui.scss b/vue/src/asset/style/element-ui.scss
index 727ba3c..5ed8bfa 100644
--- a/vue/src/asset/style/element-ui.scss
+++ b/vue/src/asset/style/element-ui.scss
@@ -221,14 +221,6 @@
     thead > tr > th {
         background: #fbfbfb;
     }
-
-    .el-table--scrollable-x .el-table__body-wrapper {
-        overflow-x: overlay;
-    }
-
-    .el-table--scrollable-y .el-table__body-wrapper {
-        overflow-y: overlay;
-    }
 }
 
 .el-textarea {
diff --git a/vue/src/layout/component/Header/index.vue b/vue/src/layout/component/Header/index.vue
deleted file mode 100644
index 9384f89..0000000
--- a/vue/src/layout/component/Header/index.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<script type="text/jsx">
-import {getters as tagsViewGetters} from "@/layout/store/tagsView"
-import VNavbar from './Navbar'
-import TagsView from './TagsView'
-
-export default {
-    functional: true,
-
-    render() {
-        return (
-            <header>
-                <VNavbar/>
-                {tagsViewGetters.enabled && <TagsView/>}
-            </header>
-        )
-    }
-}
-</script>
diff --git a/vue/src/layout/component/Header/Navbar/component/Bell.vue b/vue/src/layout/component/Navbar/component/Bell.vue
similarity index 100%
rename from vue/src/layout/component/Header/Navbar/component/Bell.vue
rename to vue/src/layout/component/Navbar/component/Bell.vue
diff --git a/vue/src/layout/component/Header/Navbar/component/Hamburger.vue b/vue/src/layout/component/Navbar/component/Hamburger.vue
similarity index 100%
rename from vue/src/layout/component/Header/Navbar/component/Hamburger.vue
rename to vue/src/layout/component/Navbar/component/Hamburger.vue
diff --git a/vue/src/layout/component/Header/Navbar/component/HeadMenu.vue b/vue/src/layout/component/Navbar/component/HeadMenu.vue
similarity index 100%
rename from vue/src/layout/component/Header/Navbar/component/HeadMenu.vue
rename to vue/src/layout/component/Navbar/component/HeadMenu.vue
diff --git a/vue/src/layout/component/Header/Navbar/index.vue b/vue/src/layout/component/Navbar/index.vue
similarity index 100%
rename from vue/src/layout/component/Header/Navbar/index.vue
rename to vue/src/layout/component/Navbar/index.vue
diff --git a/vue/src/layout/component/Header/TagsView/ScrollPanel.vue b/vue/src/layout/component/Page/component/TagsView/ScrollPanel.vue
similarity index 100%
rename from vue/src/layout/component/Header/TagsView/ScrollPanel.vue
rename to vue/src/layout/component/Page/component/TagsView/ScrollPanel.vue
diff --git a/vue/src/layout/component/Header/TagsView/index.vue b/vue/src/layout/component/Page/component/TagsView/index.vue
similarity index 99%
rename from vue/src/layout/component/Header/TagsView/index.vue
rename to vue/src/layout/component/Page/component/TagsView/index.vue
index 7e9d9b1..5eeb1a0 100644
--- a/vue/src/layout/component/Header/TagsView/index.vue
+++ b/vue/src/layout/component/Page/component/TagsView/index.vue
@@ -189,12 +189,12 @@ export default {
 
     render() {
         return (
-            <nav class="tags-view-container">
+            <div class="tags-view-container">
                 <scroll-panel ref="scrollPanel" class="tags-view-wrapper">
                     {this.renderTags()}
                 </scroll-panel>
                 {this.renderContextMenu()}
-            </nav>
+            </div>
         )
     }
 }
diff --git a/vue/src/layout/component/Header/TagsView/style.scss b/vue/src/layout/component/Page/component/TagsView/style.scss
similarity index 100%
rename from vue/src/layout/component/Header/TagsView/style.scss
rename to vue/src/layout/component/Page/component/TagsView/style.scss
diff --git a/vue/src/layout/component/Page/index.vue b/vue/src/layout/component/Page/index.vue
index a21bbcb..15e3676 100644
--- a/vue/src/layout/component/Page/index.vue
+++ b/vue/src/layout/component/Page/index.vue
@@ -5,11 +5,12 @@ import BackToTop from "./component/BackToTop"
 import PageHeader from "./component/PageHeader"
 import PageView from "./component/PageView"
 import PageFooter from "./component/PageFooter"
+import TagsView from './component/TagsView'
 
 export default {
     name: 'Page',
 
-    components: {BackToTop, PageHeader, PageView, PageFooter},
+    components: {BackToTop, PageHeader, PageView, PageFooter, TagsView},
 
     computed: {
         renderPageHeader() {
@@ -26,6 +27,8 @@ export default {
 
         return (
             <main class="page-main">
+                {enabled && <tags-view/>}
+
                 <div v-show={!showIframe} class={this.pageClass}>
                     {this.renderPageHeader && <page-header/>}
 
@@ -61,8 +64,10 @@ export default {
 @import "~@/asset/style/variables.scss";
 
 .page-main {
-    position: relative;
+    display: flex;
+    flex-direction: column;
     flex: 1;
+    position: relative;
     overflow: hidden;
     background-color: #f0f2f5;
 
diff --git a/vue/src/layout/index.vue b/vue/src/layout/index.vue
index 43175f9..b4b0330 100644
--- a/vue/src/layout/index.vue
+++ b/vue/src/layout/index.vue
@@ -1,20 +1,18 @@
 <script type="text/jsx">
 import offlineMixin from './mixin/offline'
 import VAside from './component/Aside'
-import VHeader from './component/Header'
+import VNavbar from './component/Navbar'
 import VPage from './component/Page'
-import {getters as appGetters, mutations as appMutations} from "@/layout/store/app"
+import {getters as appGetters} from "@/layout/store/app"
 import {getters as pageGetters} from "@/layout/store/page"
 import {getters as tagsViewGetters} from "@/layout/store/tagsView"
-import {debounce} from "@/util"
-import {isMobile} from "@/util/browser"
 
 export default {
     name: 'Layout',
 
     mixins: [offlineMixin],
 
-    components: {VAside, VHeader, VPage},
+    components: {VAside, VNavbar, VPage},
 
     computed: {
         isLeftRight() {
@@ -40,26 +38,15 @@ export default {
         }
     },
 
-    mounted() {
-        this.$_resizeHandler = debounce(() => {
-            !document.hidden && appMutations.isMobile(isMobile())
-        })
-        this.$_resizeHandler()
-
-        window.addEventListener('resize', this.$_resizeHandler)
-
-        this.$once('hook:beforeDestroy', () => {
-            window.removeEventListener('resize', this.$_resizeHandler)
-        })
-    },
-
     render() {
+        const aside = this.renderAside && <v-aside/>
+
         return (
             <section class={this.wrapperClass}>
-                {this.isLeftRight ? this.renderAside && <v-aside/> : <v-header/>}
+                {this.isLeftRight ? aside : <v-navbar/>}
 
                 <section class={this.containerClass}>
-                    {this.isLeftRight ? <v-header/> : <v-aside/>}
+                    {this.isLeftRight ? <v-navbar/> : aside}
                     <v-page/>
                 </section>
             </section>
diff --git a/vue/src/layout/store/app.js b/vue/src/layout/store/app.js
index a07601f..9c8a43f 100644
--- a/vue/src/layout/store/app.js
+++ b/vue/src/layout/store/app.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import {isEmpty} from "@/util"
+import {debounce, isEmpty} from "@/util"
 import {isMobile} from "@/util/browser"
 import {createGetters, createMutations} from "@/util/observable"
 
@@ -67,3 +67,7 @@ function sort(routes) {
         }
     })
 }
+
+window.addEventListener('resize', debounce(() => {
+    !document.hidden && mutations.isMobile(isMobile())
+}))