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

@VIEW/@MACRO/VIEW_CONTENT-BASE.vue.ftl

@@ -148,12 +148,12 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
                 }
                 })
             }
-            if(Object.is(this.navModel,"tab")){
+            <#--  if(Object.is(this.navModel,"tab")){
                 this.navDataService.removeNavDataByTag(this.viewtag);
             }
             if (this.serviceStateEvent) {
                 this.serviceStateEvent.unsubscribe();
-            }
+            }  -->
         }
         </#if>
     }