From a8972d778266cb35a8f304aa5e53c9440156d75b Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Thu, 27 Aug 2020 17:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/Main/component/BackToTop.vue    | 21 ++++++++++++++
 .../component/KeepRouterViewAlive.vue}        |  3 ++
 .../component/PageFooter.vue}                 |  2 +-
 .../component/Main/component/PageView.vue     | 27 ++++++++++++++++++
 .../component/{Main.vue => Main/index.vue}    | 28 +++++--------------
 5 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 vue/src/layout/component/Main/component/BackToTop.vue
 rename vue/src/layout/component/{KeepAlive.js => Main/component/KeepRouterViewAlive.vue} (99%)
 rename vue/src/layout/component/{Footer.vue => Main/component/PageFooter.vue} (95%)
 create mode 100644 vue/src/layout/component/Main/component/PageView.vue
 rename vue/src/layout/component/{Main.vue => Main/index.vue} (67%)

diff --git a/vue/src/layout/component/Main/component/BackToTop.vue b/vue/src/layout/component/Main/component/BackToTop.vue
new file mode 100644
index 0000000..582edf9
--- /dev/null
+++ b/vue/src/layout/component/Main/component/BackToTop.vue
@@ -0,0 +1,21 @@
+<script type="text/jsx">
+export default {
+    name: "BackToTop",
+
+    functional: true,
+
+    props: {render: Boolean},
+
+    render(h, context) {
+        const {props: {render}} = context
+        if (!render) return
+        return (
+            <el-backtop target=".app-main .scroll-container" visibility-height={400} bottom={66}>
+                <div class="back-to-top">
+                    <v-icon icon="el-icon-top"/>
+                </div>
+            </el-backtop>
+        )
+    }
+}
+</script>
diff --git a/vue/src/layout/component/KeepAlive.js b/vue/src/layout/component/Main/component/KeepRouterViewAlive.vue
similarity index 99%
rename from vue/src/layout/component/KeepAlive.js
rename to vue/src/layout/component/Main/component/KeepRouterViewAlive.vue
index 8e94707..cd4defb 100644
--- a/vue/src/layout/component/KeepAlive.js
+++ b/vue/src/layout/component/Main/component/KeepRouterViewAlive.vue
@@ -1,3 +1,4 @@
+<script>
 import {isEmpty} from "@/util"
 
 const KEY = '_routerViewKey'
@@ -37,6 +38,7 @@ function getCacheKey(route, componentOptions) {
 
 export default {
     name: 'keep-router-view-alive',
+
     abstract: true,
 
     props: {include: Array},
@@ -97,3 +99,4 @@ export default {
         return vnode || (slot && slot[0])
     }
 }
+</script>
diff --git a/vue/src/layout/component/Footer.vue b/vue/src/layout/component/Main/component/PageFooter.vue
similarity index 95%
rename from vue/src/layout/component/Footer.vue
rename to vue/src/layout/component/Main/component/PageFooter.vue
index ebb74ba..6229db6 100644
--- a/vue/src/layout/component/Footer.vue
+++ b/vue/src/layout/component/Main/component/PageFooter.vue
@@ -8,7 +8,7 @@
 
 <script>
 export default {
-    name: "Footer"
+    name: "PageFooter"
 }
 </script>
 
diff --git a/vue/src/layout/component/Main/component/PageView.vue b/vue/src/layout/component/Main/component/PageView.vue
new file mode 100644
index 0000000..e37341b
--- /dev/null
+++ b/vue/src/layout/component/Main/component/PageView.vue
@@ -0,0 +1,27 @@
+<script type="text/jsx">
+import KeepRouterViewAlive from "./KeepRouterViewAlive"
+
+export default {
+    name: "PageView",
+
+    functional: true,
+
+    props: {
+        include: Array,
+        transitionName: String
+    },
+
+    render(h, context) {
+        const {include, transitionName} = context.props
+        return (
+            <div class="page-view">
+                <KeepRouterViewAlive include={include}>
+                    <transition name={transitionName} mode="out-in">
+                        <router-view/>
+                    </transition>
+                </KeepRouterViewAlive>
+            </div>
+        )
+    }
+}
+</script>
diff --git a/vue/src/layout/component/Main.vue b/vue/src/layout/component/Main/index.vue
similarity index 67%
rename from vue/src/layout/component/Main.vue
rename to vue/src/layout/component/Main/index.vue
index 6086fca..b933570 100644
--- a/vue/src/layout/component/Main.vue
+++ b/vue/src/layout/component/Main/index.vue
@@ -1,14 +1,8 @@
 <template>
     <main class="app-main">
         <div v-show="!showIframe" class="scroll-container">
-            <div class="page-view">
-                <keep-router-view-alive :include="cachedViews">
-                    <transition :name="transitionName" mode="out-in">
-                        <router-view/>
-                    </transition>
-                </keep-router-view-alive>
-            </div>
-            <v-footer/>
+            <page-view :include="cachedViews" :transition-name="transitionName"/>
+            <page-footer/>
         </div>
 
         <!--跨域iframe无法调整高度，只能使用原生滚动条-->
@@ -23,28 +17,20 @@
             width="100%"
         />
 
-        <el-backtop
-            v-if="showBackToTop"
-            target=".app-main .scroll-container"
-            :visibility-height="400"
-            :bottom="66"
-        >
-            <div class="back-to-top">
-                <v-icon icon="el-icon-top"/>
-            </div>
-        </el-backtop>
+        <back-to-top :render="showBackToTop"/>
     </main>
 </template>
 
 <script>
 import {mapState} from 'vuex'
-import KeepRouterViewAlive from "./KeepAlive"
-import VFooter from "./Footer"
+import BackToTop from "./component/BackToTop"
+import PageView from "./component/PageView"
+import PageFooter from "./component/PageFooter"
 
 export default {
     name: 'AppMain',
 
-    components: {KeepRouterViewAlive, VFooter},
+    components: {BackToTop, PageView, PageFooter},
 
     computed: {
         ...mapState('setting', ['showBackToTop']),