Merge branch 'feature/act-code' into dev

src/components/layout/index.vue

@@ -26,33 +26,6 @@ export default {
   name: 'DmHbLayout',
   components: { Notice, MainMenu, AsideMenu, BreadMenu },
   provide: () => provideData,
-  beforeRouteUpdate(to, from, next) {
-    if (Array.isArray(to.meta.fromPath)) {
-      const isKeepAlive = to.meta.fromPath.some(el => {
-        let menuUrlReg = el;
-        let pathConfigReg = /(:.*)(\/?)/;
-        const pathRegStr = '([\\d\\w]+[\\-]*[\\d\\w]*)';
-        while (pathConfigReg.test(menuUrlReg)) {
-          menuUrlReg = menuUrlReg.replace(pathConfigReg, `${pathRegStr}$2`);
-        }
-        pathConfigReg = /(\/\*)(\/?)/;
-        while (pathConfigReg.test(menuUrlReg)) {
-          menuUrlReg = menuUrlReg.replace(pathConfigReg, `${pathRegStr}$2`);
-        }
-        const reg = new RegExp(`^${menuUrlReg}$`);
-        return reg.test(from.path);
-      });
-      if (!isKeepAlive) {
-        this.keepAlive = this.keepAlive.filter(el => el != to.meta.componentName);
-      }
-      setTimeout(() => {
-        if (this.keepAlive.every(el => el != to.meta.componentName)) {
-          this.keepAlive.push(to.meta.componentName);
-        }
-      }, 100);
-    }
-    next();
-  },
   props: {
     // 菜单树数据
     menuList: {
@@ -92,11 +65,10 @@ export default {
     }
   },
   created() {
-    if (Array.isArray(this.$route.meta.fromPath)) {
-      this.keepAlive.push(this.$route.meta.componentName);
-    }
+    this.setKeepAlive(this.$route, {});
     this.$router.beforeEach((to, from, next) => {
       this.activedMenu = this.getActivedMenu(this.getMenuByPath(to.path.slice(1)));
+      this.setKeepAlive(to, from);
       next();
     });
     provideData.layoutVm = this;
@@ -145,6 +117,32 @@ export default {
     getMenuByPath(path) {
       return this.pageRight.find(el => el.regexp.test('/' + path)) || {};
     },
+    setKeepAlive(to, from) {
+      if (Array.isArray(to.meta.fromPath)) {
+        const isKeepAlive = to.meta.fromPath.some(el => {
+          let menuUrlReg = el;
+          let pathConfigReg = /(:.*)(\/?)/;
+          const pathRegStr = '([\\d\\w]+[\\-]*[\\d\\w]*)';
+          while (pathConfigReg.test(menuUrlReg)) {
+            menuUrlReg = menuUrlReg.replace(pathConfigReg, `${pathRegStr}$2`);
+          }
+          pathConfigReg = /(\/\*)(\/?)/;
+          while (pathConfigReg.test(menuUrlReg)) {
+            menuUrlReg = menuUrlReg.replace(pathConfigReg, `${pathRegStr}$2`);
+          }
+          const reg = new RegExp(`^${menuUrlReg}$`);
+          return reg.test(from.path);
+        });
+        if (!isKeepAlive) {
+          this.keepAlive = this.keepAlive.filter(el => el != to.meta.componentName);
+        }
+        setTimeout(() => {
+          if (this.keepAlive.every(el => el != to.meta.componentName)) {
+            this.keepAlive.push(to.meta.componentName);
+          }
+        }, 100);
+      }
+    },
     onShowLoading(loading) {
       if (loading) {
         this.fullLoading.visible = true;