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

@LOGIC/@VIEWLOGIC/编辑/LOGIC.vue.ftl

@@ -14,15 +14,6 @@
      * @memberof ${srfclassname('${view.name}')}
      */
     public ${item.name}(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
-    <#if item.getPSControlContainer().getViewType??>
-        if(!this.viewDefaultUsage){
-            if(Object.is(this.navModel,"route")){
-                this.initNavDataWithRoute(this.viewCacheData, false, true);
-            }else{
-                this.initNavDataWithTab(this.viewCacheData, false, true);
-            }
-        }
-    </#if>
     <#if viewlogic.getPSAppUILogicRefViews?? && viewlogic.getPSAppUILogicRefViews()??>
     <#list viewlogic.getPSAppUILogicRefViews() as appUILogicRefView>
     <#if appUILogicRefView_index == 0><#assign curOPenLogicRefView = appUILogicRefView /></#if>