Merge remote-tracking branch 'local/master' into dev --- fix2

@VIEW/@MACRO/VIEW.vue.ftl

@@ -33,9 +33,6 @@ import view_${ctrl.getName()} from '@widgets/app/${srffilepath2(ctrl.getCodeName
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            if(!Object.is(vm.navModel,"route")){
-                vm.initNavDataWithTab(vm.viewCacheData);
-            }
             vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
         });
     },