sync plus

Author: jzfai

.husky/pre-commit

@@ -4,4 +4,4 @@
 #npx --no-install commitlint --edit "$1"
 #npx husky add .husky/commit-msg 'npx --no-install commitlint --edit "$1"'
 #推送之前运行eslint检查
-yarn run lint || echo exit;
+npm run lint || echo exit;

.yarnrc

@@ -1,8 +1,8 @@
-registry "https://registry.npm.taobao.org"
-
-sass_binary_site "https://npm.taobao.org/mirrors/node-sass/"
-phantomjs_cdnurl "http://cnpmjs.org/downloads"
-electron_mirror "https://npm.taobao.org/mirrors/electron/"
-sqlite3_binary_host_mirror "https://foxgis.oss-cn-shanghai.aliyuncs.com/"
-profiler_binary_host_mirror "https://npm.taobao.org/mirrors/node-inspector/"
-chromedriver_cdnurl "https://cdn.npm.taobao.org/dist/chromedriver"
+registry "https://registry.npm.taobao.org"
+
+sass_binary_site "https://npm.taobao.org/mirrors/node-sass/"
+phantomjs_cdnurl "http://cnpmjs.org/downloads"
+electron_mirror "https://npm.taobao.org/mirrors/electron/"
+sqlite3_binary_host_mirror "https://foxgis.oss-cn-shanghai.aliyuncs.com/"
+profiler_binary_host_mirror "https://npm.taobao.org/mirrors/node-inspector/"
+chromedriver_cdnurl "https://cdn.npm.taobao.org/dist/chromedriver"

package.json

@@ -79,7 +79,7 @@
     "axios": "0.21.3",
     "echarts": "4.2.1",
     "electron-is-dev": "2.0.0",
-    "element-plus": "2.0.1",
+    "element-plus": "~2.0.2",
     "fs-extra": "10.0.0",
     "mitt": "3.0.0",
     "moment-mini": "^2.22.1",
@@ -121,7 +121,7 @@
     "scss": "0.2.4",
     "svg-sprite-loader": "6.0.11",
     "typescript": "4.3.2",
-    "vite": "2.7.13",
+    "vite": "~2.8.6",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-style-import": "1.2.1",
     "vite-plugin-svg-icons": "1.0.5",

src/layout/components/AppMain.vue

@@ -21,21 +21,28 @@ let route = useRoute()
 let settings = computed(() => {
   return store.state.app.settings
 })
+
+const key = computed(()=>route.path)
+
+const cachedViews = computed(() => {
+  return store.state.app.cachedViews
+})
+
+/*listen the component name changing, then to keep-alive the page*/
+
 // cachePage: is true, keep-alive this Page
 // leaveRmCachePage: is true, keep-alive remote when page leave
 let oldRoute = null
 let deepOldRouter = null
-
 const removeDeepChildren = (deepOldRouter) => {
   deepOldRouter.children?.forEach((fItem) => {
     store.commit('app/M_DEL_CACHED_VIEW_DEEP', fItem.name)
   })
 }
-
-const key = computed({
-  get() {
+watch(
+  () => route.name,
+  () => {
     const routerLevel = route.matched.length
-    console.log('routerLevel', routerLevel)
     if (routerLevel === 2) {
       if (deepOldRouter?.name) {
         if (deepOldRouter.meta?.leaveRmCachePage && deepOldRouter.meta?.cachePage) {
@@ -57,7 +64,9 @@ const key = computed({
         }
       }
       deepOldRouter = null
-    } else if (routerLevel === 3) {
+    }
+
+    if (routerLevel === 3) {
       //如果路由等级为3级处理流程
       //三级时存储当前路由对象的上一级
       const parentRoute = route.matched[1]
@@ -78,7 +87,6 @@ const key = computed({
         }
       }
 
-      //缓存移除逻辑
       if (route.name) {
         if (route.meta?.cachePage) {
           deepOldRouter = parentRoute
@@ -89,13 +97,10 @@ const key = computed({
       }
     }
     oldRoute = JSON.parse(JSON.stringify({ name: route.name, meta: route.meta }))
-    return route.path
-  }
-})
+  },
+  { immediate: true }
+)
 
-const cachedViews = computed(() => {
-  return store.state.app.cachedViews
-})
 </script>
 
 <style scoped lang="scss">

src/layout/components/Breadcrumb/index.vue

@@ -16,7 +16,6 @@
 </template>
 
 <script setup>
-import { getCurrentInstance } from 'vue'
 defineProps({
   isActive: {
     type: Boolean,

src/layout/components/Hamburger/Hamburger.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="navbar rowBC">
+  <div class="navbar rowBC reset-el-dropdown">
     <div class="rowSC">
       <hamburger
         v-if="settings.showHamburger"
@@ -43,8 +43,6 @@
 import { CaretBottom } from '@element-plus/icons-vue'
 import Breadcrumb from './Breadcrumb'
 import Hamburger from './Hamburger'
-import { computed, getCurrentInstance } from 'vue'
-import { ElMessage } from 'element-plus'
 import { useStore } from 'vuex'
 const store = useStore()
 let settings = computed(() => {