From 78e38f9e92754db75073a16092b2be6833f86f1c Mon Sep 17 00:00:00 2001
From: zouzhibing <esoul@654321>
Date: Mon, 14 Nov 2022 00:38:28 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=F0=9F=9A=80=20=E5=8D=87=E7=BA=A7v?=
 =?UTF-8?q?ue-router=20&&=20=E4=BC=98=E5=8C=96menu=20=E5=A4=9A=E7=BA=A7?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97=20=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                        | 35 ++++++++++--------------
 package.json                             |  2 +-
 src/layout/Main/index.vue                |  4 +--
 src/views/nested/menu1/index.vue         | 14 +++++++---
 src/views/nested/menu1/menu1-1/index.vue |  3 +-
 src/views/nested/menu1/menu1-2/index.vue |  2 +-
 src/views/nested/menu2/index.vue         |  6 ++--
 yarn.lock                                | 18 ++++++------
 8 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1555928..475a3a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
         "vue-fuse": "^4.1.1",
         "vue-mugen-scroll": "^0.2.6",
         "vue-qr": "^4.0.6",
-        "vue-router": "^4.0.0-0",
+        "vue-router": "^4.1.6",
         "vue-splitpane": "^1.0.6",
         "vuedraggable": "^4.1.0",
         "vuex": "^4.0.0-0",
@@ -750,10 +750,9 @@
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
-      "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ==",
-      "license": "MIT"
+      "version": "6.4.5",
+      "resolved": "https://r.cnpmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
+      "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
     },
     "node_modules/@vue/reactivity": {
       "version": "3.2.41",
@@ -8036,15 +8035,11 @@
       }
     },
     "node_modules/vue-router": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.3.tgz",
-      "integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
-      "license": "MIT",
+      "version": "4.1.6",
+      "resolved": "https://r.cnpmjs.org/vue-router/-/vue-router-4.1.6.tgz",
+      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
       "dependencies": {
-        "@vue/devtools-api": "^6.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/posva"
+        "@vue/devtools-api": "^6.4.5"
       },
       "peerDependencies": {
         "vue": "^3.2.0"
@@ -8770,9 +8765,9 @@
       }
     },
     "@vue/devtools-api": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
-      "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
+      "version": "6.4.5",
+      "resolved": "https://r.cnpmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
+      "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
     },
     "@vue/reactivity": {
       "version": "3.2.41",
@@ -13773,11 +13768,11 @@
       }
     },
     "vue-router": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.3.tgz",
-      "integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
+      "version": "4.1.6",
+      "resolved": "https://r.cnpmjs.org/vue-router/-/vue-router-4.1.6.tgz",
+      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
       "requires": {
-        "@vue/devtools-api": "^6.1.4"
+        "@vue/devtools-api": "^6.4.5"
       }
     },
     "vue-splitpane": {
diff --git a/package.json b/package.json
index 105aa57..e8290b3 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "vue-fuse": "^4.1.1",
     "vue-mugen-scroll": "^0.2.6",
     "vue-qr": "^4.0.6",
-    "vue-router": "^4.0.0-0",
+    "vue-router": "^4.1.6",
     "vue-splitpane": "^1.0.6",
     "vuedraggable": "^4.1.0",
     "vuex": "^4.0.0-0",
diff --git a/src/layout/Main/index.vue b/src/layout/Main/index.vue
index 8792820..8378b0a 100644
--- a/src/layout/Main/index.vue
+++ b/src/layout/Main/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="app-main" v-if="isReload">
+  <div class="app-main" >
     <div class="app-main-inner">
       <router-view v-slot="{ Component, route }">
         <transition name="fade-slide" mode="out-in" appear>
-          <keep-alive :include="cacheRoutes">
+          <keep-alive :include="cacheRoutes" v-if="isReload">
             <component :is="Component" :key="route.path" />
           </keep-alive>
         </transition>
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
index 75c1b08..d743312 100644
--- a/src/views/nested/menu1/index.vue
+++ b/src/views/nested/menu1/index.vue
@@ -1,7 +1,13 @@
 <template>
-  <div style="padding: 30px">
-    <el-alert title="menu 1" :closable="false">
-      <router-view />
-    </el-alert>
+  <div class="app-container">
+   <div class="app-container-inner">
+     <el-alert title="menu 1" :closable="false">
+
+     </el-alert>
+     <router-view  v-slot="{ Component }">
+       <component :is="Component"></component>
+     </router-view>
+   </div>
   </div>
 </template>
+<script lang="ts" setup name="menu1"></script>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
index 227901f..4c0a7e0 100644
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ b/src/views/nested/menu1/menu1-1/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div style="padding: 30px">
     <el-alert title="menu 1-1" type="success" :closable="false">
-      <router-view />
     </el-alert>
+    <router-view />
   </div>
 </template>
+<script lang="ts" setup name="menu1-1"></script>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
index 552fa7e..f1de05f 100644
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ b/src/views/nested/menu1/menu1-2/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="padding: 30px">
     <el-alert title="menu 1-2" type="success" :closable="false">
-      <router-view />
     </el-alert>
+    <router-view />
   </div>
 </template>
diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue
index 90936e5..2fccb9d 100644
--- a/src/views/nested/menu2/index.vue
+++ b/src/views/nested/menu2/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <div style="padding: 30px">
-    <el-alert title="menu 2" :closable="false" />
+  <div class="app-container">
+    <div class="app-container-inner">
+      <el-alert title="menu 2" :closable="false" />
+    </div>
   </div>
 </template>
diff --git a/yarn.lock b/yarn.lock
index 93d4b20..3379610 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -404,10 +404,10 @@
     "@vue/compiler-dom" "3.2.41"
     "@vue/shared" "3.2.41"
 
-"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.1.4", "@vue/devtools-api@^6.2.1":
-  "integrity" "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz"
-  "version" "6.2.1"
+"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.2.1", "@vue/devtools-api@^6.4.5":
+  "integrity" "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
+  "resolved" "https://r.cnpmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"
+  "version" "6.4.5"
 
 "@vue/reactivity-transform@3.2.41":
   "integrity" "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A=="
@@ -4104,12 +4104,12 @@
     "simple-get" "^4.0.1"
     "string-split-by" "^1.0.0"
 
-"vue-router@^4.0.0-0":
-  "integrity" "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA=="
-  "resolved" "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.3.tgz"
-  "version" "4.1.3"
+"vue-router@^4.1.6":
+  "integrity" "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ=="
+  "resolved" "https://r.cnpmjs.org/vue-router/-/vue-router-4.1.6.tgz"
+  "version" "4.1.6"
   dependencies:
-    "@vue/devtools-api" "^6.1.4"
+    "@vue/devtools-api" "^6.4.5"
 
 "vue-splitpane@^1.0.6":
   "integrity" "sha512-6sneVSEeF1VsCD025HP93nRxwzYhv3rotCeYi2Ah1FmGxwtfqbCZEIzaHGberdGNCpMlEzGD/1OIE1kK5QukLA=="