From efe6d4fa9b8583d278259dceac226cd18da5a321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com>
Date: Fri, 6 May 2022 21:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B5=E7=AD=BE=E7=9A=84?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/layouts/TabLayout.vue      | 39 +++----------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/jshERP-web/src/components/layouts/TabLayout.vue b/jshERP-web/src/components/layouts/TabLayout.vue
index 746e98de..fd9f4943 100644
--- a/jshERP-web/src/components/layouts/TabLayout.vue
+++ b/jshERP-web/src/components/layouts/TabLayout.vue
@@ -19,10 +19,10 @@
     <div style="margin: 4px 4px 0;">
       <transition name="page-toggle">
         <keep-alive v-if="multipage" :include="includedComponents">
-          <router-view v-if="reloadFlag"/>
+          <router-view />
         </keep-alive>
         <template v-else>
-          <router-view v-if="reloadFlag"/>
+          <router-view />
         </template>
       </transition>
       <!-- iframe页 -->
@@ -30,8 +30,7 @@
         v-for="item in hasOpenComponentsArr"
         :key="item.name"
         :is="item.name"
-        v-show="$route.path === item.path"
-        v-if="reloadIframeFlag">
+        v-show="$route.path === item.path">
       </component>
     </div>
   </global-layout>
@@ -61,13 +60,10 @@
         activePage: '',
         menuVisible: false,
         menuItemList: [
-          { key: '4', icon: 'reload', text: '刷 新' },
           { key: '1', icon: 'arrow-left', text: '关闭左侧' },
           { key: '2', icon: 'arrow-right', text: '关闭右侧' },
           { key: '3', icon: 'close', text: '关闭其它' }
         ],
-        reloadFlag:true,
-        reloadIframeFlag:true,
         componentsArr: []
       }
     },
@@ -152,11 +148,9 @@
         this.changeTitle(waitRouter.meta.title)
       },
       'multipage': function(newVal) {
-        if(this.reloadFlag){
-          if (!newVal) {
-            this.linkList = [this.$route.fullPath]
-            this.pageList = [this.$route]
-          }
+        if (!newVal) {
+          this.linkList = [this.$route.fullPath]
+          this.pageList = [this.$route]
         }
       },
       //从单页模式切换回多页模式后首页要居第一位
@@ -301,9 +295,6 @@
           case '3':
             this.closeOthers(pageKey)
             break
-          case '4':
-            this.routeReload(pageKey)
-            break
           default:
             break
         }
@@ -384,24 +375,6 @@
           this.activePage = key
         }
       },
-      //路由刷新
-      routeReload(pageKey){
-        if(pageKey.indexOf('/system/plugins')>-1) {
-          //从iframe缓存中关闭对应的页面
-          this.reloadIframeFlag = false
-          this.$nextTick(()=>{
-            this.reloadIframeFlag = true
-          })
-        } else {
-          this.reloadFlag = false
-          let ToggleMultipage = "ToggleMultipage"
-          this.$store.dispatch(ToggleMultipage,false)
-          this.$nextTick(()=>{
-            this.$store.dispatch(ToggleMultipage,true)
-            this.reloadFlag = true
-          })
-        }
-      }
     }
   }
 </script>