Merge branch '01/19NavMenu' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 01/19NavMenu

src/layout/components/TagsView.vue

@@ -60,7 +60,7 @@ export default {
     $route() {
       this.addViewTags();
       this.moveToCurrentTag();
-      if (!activeKey) {
+      if (!activeKey && !this.$store.state.tagsView.isBack) {
         const s = new Searchs()
         const keys = [this.$route.path]
         for (const key in s.searchs) {
@@ -75,6 +75,7 @@ export default {
           s.removeByKey(item)
         }
       }
+      this.$store.commit('SET_IS_BACK', false)
       activeKey = ''
     },
     visible(value) {
@@ -146,7 +147,7 @@ export default {
     closeSelectedTag(view) {
       const searchs = new Searchs();
       searchs.remove(this.$route.path);
-      this.$store.dispatch("delVisitedViews", view).then((views) => {
+      this.$store.dispatch("delVisitedViews", {...view, dontNeedSave: true}).then((views) => {
         if (this.isActive(view)) {
           const latestView = views.slice(-1)[0];
           if (latestView) {

src/store/modules/tagsView.js

@@ -1,11 +1,11 @@
 const tagsView = {
   state: {
-    visitedViews: []
+    visitedViews: [],
+    isBack: false,
     // cachedViews: []
   },
   mutations: {
     ADD_VISITED_VIEWS: (state, view) => {
-      console.log(view)
       if (state.visitedViews.some(v => v.path === view.path)) {
         state.visitedViews.forEach(v => {
           if (v.path === view.path) {
@@ -67,6 +67,9 @@ const tagsView = {
     DEL_ALL_VIEWS: (state) => {
       state.visitedViews = []
       // state.cachedViews = []
+    },
+    SET_IS_BACK: (state, isBack) => {
+      state.isBack = isBack
     }
   },
   actions: {
@@ -75,6 +78,7 @@ const tagsView = {
     },
     delVisitedViews ({ commit, state }, view) {
       return new Promise((resolve) => {
+        commit('SET_IS_BACK', !view.dontNeedSave)
         commit('DEL_VISITED_VIEWS', view)
         resolve([...state.visitedViews])
       })