diff --git a/package.json b/package.json
index 68b78a8..3b5bd9f 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "codemirror": "^5.65.9",
     "core-js": "^3.6.5",
     "dayjs": "^1.11.4",
-    "default-passive-events": "^2.0.0",
     "echarts": "^5.3.1",
     "echarts-liquidfill": "^3.1.0",
     "element-plus": "^2.2.21",
@@ -38,7 +37,6 @@
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.0",
     "pinia": "^2.0.21",
-    "pinia-persistedstate-plugin": "^0.1.0",
     "pinia-plugin-persistedstate": "^2.1.1",
     "print-js": "^1.6.0",
     "sass": "^1.54.0",
diff --git a/src/hooks/useWrapComponents.ts b/src/hooks/useWrapComponents.ts
new file mode 100644
index 0000000..c2dbdd7
--- /dev/null
+++ b/src/hooks/useWrapComponents.ts
@@ -0,0 +1,23 @@
+// 自定义name的壳的集合
+import {h} from "vue";
+
+const wrapperMap = new Map()
+
+export const useWrapComponents = (Component,route)=>{
+    let wrapper
+    if (Component) {
+        const wrapperName = route.name
+        if (wrapperMap.has(wrapperName)) {
+            wrapper = wrapperMap.get(wrapperName)
+        } else {
+            wrapper = {
+                name: wrapperName,
+                render() {
+                    return h("div", {className: "app-main-inner"}, Component)
+                },
+            }
+            wrapperMap.set(wrapperName, wrapper)
+        }
+        return h(wrapper)
+    }
+}
diff --git a/src/layout/components/Main/index.vue b/src/layout/components/Main/index.vue
index 8a64358..92da0e4 100644
--- a/src/layout/components/Main/index.vue
+++ b/src/layout/components/Main/index.vue
@@ -1,25 +1,24 @@
 <template>
   <div class="app-main" >
-    <div class="app-main-inner">
-      <router-view v-slot="{ Component, route }">
-        <transition name="fade-slide" mode="out-in" appear>
-          <component :is="Component" :key="route.path" />
-        </transition>
-      </router-view>
-    </div>
+    <router-view v-slot="{ Component, route }">
+      <transition name="fade-slide" mode="out-in" appear>
+        <keep-alive :include="cacheRoutes" v-if="isReload">
+          <component :is="useWrapComponents(Component,route)" :key="route.path" />
+        </keep-alive>
+      </transition>
+    </router-view>
   </div>
 </template>
 
 <script lang="ts" setup>
+  import {useWrapComponents} from '@/hooks/useWrapComponents'
   import { computed, ref } from 'vue'
   import {useSettingStore} from "@/store/modules/setting"
   import {usePermissionStore} from "@/store/modules/permission"
   const SettingStore = useSettingStore()
   const PermissionStore = usePermissionStore()
-
-  const cacheRoutes = computed(() =>PermissionStore.getCacheRoutes())
+  const cacheRoutes = computed(() =>PermissionStore.keepAliveRoutes)
   const isReload = computed(() => SettingStore.isReload)
-
 </script>
 
 <style lang="scss" scoped>
@@ -27,7 +26,6 @@
     flex: 1;
     display: flex;
     overflow-x: hidden;
-
     width: 100%;
     box-sizing: border-box;
     .app-main-inner{
diff --git a/src/main.ts b/src/main.ts
index db1a8ac..b9b6091 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import App from './App.vue'
-import router from './router'
+import router from './routers'
 import pinia from "./store";
 
 // 权限路由
diff --git a/src/permission.ts b/src/permission.ts
index b1b0db7..8daf6ba 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -1,4 +1,4 @@
-import router from '@/router/index'
+import router from '@/routers/index'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import {useUserStore} from "@/store/modules/user"
@@ -17,9 +17,12 @@ router.beforeEach(async(to, from, next) => {
   if(typeof(to.meta.title) === 'string'){
       document.title = to.meta.title ||'vue-admin-perfect'
   }
+
   const UserStore = useUserStore();
   // 确定用户是否已登录过，存在Token
   const hasToken = UserStore.token
+
+
   if (hasToken) {
     if (to.path === '/login') {
       // 如果已登录，请重定向到主页
diff --git a/src/router/index.ts b/src/routers/index.ts
similarity index 98%
rename from src/router/index.ts
rename to src/routers/index.ts
index 8d36f5b..0190f89 100644
--- a/src/router/index.ts
+++ b/src/routers/index.ts
@@ -14,7 +14,7 @@ import echartsRouter from './modules/echarts'
 import chatRouter from './modules/chat'
 import othersRouter from './modules/other'
 import externalLink from './modules/externalLink'
-import formRouter from './modules/from'
+import formRouter from './modules/form'
 import functionPageRouter from './modules/functionPage'
 
 
diff --git a/src/router/modules/chat.ts b/src/routers/modules/chat.ts
similarity index 100%
rename from src/router/modules/chat.ts
rename to src/routers/modules/chat.ts
diff --git a/src/router/modules/dataScreen.ts b/src/routers/modules/dataScreen.ts
similarity index 100%
rename from src/router/modules/dataScreen.ts
rename to src/routers/modules/dataScreen.ts
diff --git a/src/router/modules/echarts.ts b/src/routers/modules/echarts.ts
similarity index 100%
rename from src/router/modules/echarts.ts
rename to src/routers/modules/echarts.ts
diff --git a/src/router/modules/excel.ts b/src/routers/modules/excel.ts
similarity index 100%
rename from src/router/modules/excel.ts
rename to src/routers/modules/excel.ts
diff --git a/src/router/modules/externalLink.ts b/src/routers/modules/externalLink.ts
similarity index 100%
rename from src/router/modules/externalLink.ts
rename to src/routers/modules/externalLink.ts
diff --git a/src/router/modules/from.ts b/src/routers/modules/form.ts
similarity index 83%
rename from src/router/modules/from.ts
rename to src/routers/modules/form.ts
index 8be23e6..803b7d3 100644
--- a/src/router/modules/from.ts
+++ b/src/routers/modules/form.ts
@@ -17,19 +17,19 @@ const formRouter = [{
         {
             path: 'validateForm',
             component: () => import('@/views/form/validateForm/index.vue'),
-            name: 'validate-form',
+            name: 'validateForm',
             meta: { title: '校验 Form', keepAlive: true , icon: 'MenuIcon'}
         },
         {
             path: 'advancedForm',
             component: () => import('@/views/form/advancedForm/index.vue'),
-            name: 'advanced-form',
-            meta: { title: '收缩 Form', keepAlive: true , icon: 'MenuIcon'}
+            name: 'advancedForm',
+            meta: { title: '收缩 Form',  icon: 'MenuIcon'}
         },
         {
             path: 'appendForm',
             component: () => import('@/views/form/appendForm/index.vue'),
-            name: 'append-form',
+            name: 'appendForm',
             meta: { title: '增删 Form', keepAlive: true , icon: 'MenuIcon'}
         },
     ]
diff --git a/src/router/modules/functionPage.ts b/src/routers/modules/functionPage.ts
similarity index 100%
rename from src/router/modules/functionPage.ts
rename to src/routers/modules/functionPage.ts
diff --git a/src/router/modules/nested.ts b/src/routers/modules/nested.ts
similarity index 100%
rename from src/router/modules/nested.ts
rename to src/routers/modules/nested.ts
diff --git a/src/router/modules/other.ts b/src/routers/modules/other.ts
similarity index 100%
rename from src/router/modules/other.ts
rename to src/routers/modules/other.ts
diff --git a/src/router/modules/system.ts b/src/routers/modules/system.ts
similarity index 100%
rename from src/router/modules/system.ts
rename to src/routers/modules/system.ts
diff --git a/src/router/modules/table.ts b/src/routers/modules/table.ts
similarity index 100%
rename from src/router/modules/table.ts
rename to src/routers/modules/table.ts
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 3cd4128..4f44c67 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,5 +1,5 @@
 import {defineStore} from 'pinia'
-import { asyncRoutes, constantRoutes,routerArray,notFoundRouter } from '@/router/index'
+import { asyncRoutes, constantRoutes,routerArray,notFoundRouter } from '@/routers/index'
 import {hasPermission,filterAsyncRoutes} from "@/utils/routers"
 import {filterKeepAlive} from "../../utils/routers";
 export const usePermissionStore = defineStore({
@@ -17,6 +17,9 @@ export const usePermissionStore = defineStore({
     getters: {
         permission_routes:state=> {
             return state.routes
+        },
+        keepAliveRoutes: state=>{
+            return filterKeepAlive(asyncRoutes)
         }
     },
     // 可以同步 也可以异步
diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts
index bdb6873..fc7f21c 100644
--- a/src/store/modules/tagsView.ts
+++ b/src/store/modules/tagsView.ts
@@ -1,5 +1,5 @@
 import {defineStore} from 'pinia'
-import router from "@/router/index";
+import router from "@/routers/index";
 
 export const useTagsViewStore = defineStore({
     // id: 必须的，在所有 Store 中唯一
diff --git a/src/views/form/advancedForm/index.vue b/src/views/form/advancedForm/index.vue
index 8977218..f8ec76f 100644
--- a/src/views/form/advancedForm/index.vue
+++ b/src/views/form/advancedForm/index.vue
@@ -24,7 +24,7 @@
   </div>
 </template>
 
-<script lang="ts" setup name="advancedForm">
+<script lang="ts" setup >
 import AdvancedForm from "@/components/SearchForm/advancedForm/index.vue"
 import {reactive, ref} from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/form/validateForm/index.vue b/src/views/form/validateForm/index.vue
index c2c6ef8..4974ba5 100644
--- a/src/views/form/validateForm/index.vue
+++ b/src/views/form/validateForm/index.vue
@@ -71,7 +71,7 @@
   </u-container-layout>
 </template>
 
-<script lang="ts" setup name="advancedForm">
+<script lang="ts" setup >
 import { reactive, ref } from 'vue'
 import type { FormInstance } from 'element-plus'
 import Upload from './components/Upload.vue'
@@ -140,13 +140,7 @@ const rules = reactive({
 const submitForm = async (formEl: FormInstance | undefined) => {
   console.log('--FORM---', ruleForm)
   if (!formEl) return
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      console.log('submit!')
-    } else {
-      console.log('error submit!', fields)
-    }
-  })
+
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {