Merge remote-tracking branch 'origin/master'

app_Web/src/components/app-breadcrumb/app-breadcrumb.vue

@@ -4,7 +4,7 @@
       <template v-if="Object.is(this.navModel,'route')">
         <el-breadcrumb-item v-for="(item, index) in breadcrumbs"  :key="item.id">
           <span v-if="index === breadcrumbs.length-1" class="no-redirect">{{ item.title }}
-            <span v-if="item.isselected === true">
+             <span v-if="isShowSelected(item)">
               <dropdown trigger='click' @on-click="selectNavData($event,item)">
                 <span class="app-breadcrumb-selected">
                     <i class="el-icon-caret-bottom"></i>
@@ -195,6 +195,15 @@ export default class Breadcrumb extends Vue {
         }
     }
 
+    /**
+     * 是否显示下拉列表
+     *
+     * @memberof Breadcrumb
+     */
+    public isShowSelected(item:any){
+      return item.isselected && !this.$util.isEmpty(item.srfkey);
+    }
+
 }
 </script>
 

app_Web/src/engine/view/edit-view-engine.ts

@@ -103,7 +103,7 @@ export default class EditViewEngine extends ViewEngine {
     public onFormLoad(arg: any): void {
         this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : this.view.$t('app.local.new');
 
-        this.setTabCaption(this.view.model.dataInfo);
+        this.setTabCaption(this.view.model.dataInfo,Object.is(arg.srfuf, '0'));
         const newdata: boolean = !Object.is(arg.srfuf, '1');
         this.calcToolbarItemState(newdata);
     }
@@ -117,7 +117,7 @@ export default class EditViewEngine extends ViewEngine {
     public onFormSave(arg: any): void {
         this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : this.view.$t('app.local.new');
 
-        this.setTabCaption(this.view.model.dataInfo);
+        this.setTabCaption(this.view.model.dataInfo,Object.is(arg.srfuf, '0'));
         const newdata: boolean = !Object.is(arg.srfuf, '1');
         this.calcToolbarItemState(newdata);
         this.view.$emit('save',arg);
@@ -245,7 +245,7 @@ export default class EditViewEngine extends ViewEngine {
      *
      * @memberof EditViewEngine
      */
-    public setTabCaption(info: string): void {
+    public setTabCaption(info: string,isNew:boolean): void {
         let viewdata: any = this.view.model;
         let index:number = viewdata.srfTitle.indexOf("-");
         if (viewdata  && info && !Object.is(info, '')) {
@@ -259,7 +259,7 @@ export default class EditViewEngine extends ViewEngine {
                 this.view.$route.meta.info = info;
             }
             this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)}-${viewdata.dataInfo}`;
-            this.view.initNavDataWithRoute();
+            this.view.initNavDataWithRoute(null,isNew);
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
      *
      * @memberof IBZDepartmentEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-edit-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue

@@ -577,9 +577,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
      *
      * @memberof IBZDepartmentGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-grid-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class IBZDepartmentMPickupViewBase extends Vue {
      *
      * @memberof IBZDepartmentMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-mpickup-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-option-view/ibzdepartment-option-view-base.vue

@@ -432,9 +432,9 @@ export default class IBZDepartmentOptionViewBase extends Vue {
      *
      * @memberof IBZDepartmentOptionViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-option-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-option-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class IBZDepartmentPickupGridViewBase extends Vue {
      *
      * @memberof IBZDepartmentPickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-pickup-grid-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view-base.vue

@@ -427,9 +427,9 @@ export default class IBZDepartmentPickupViewBase extends Vue {
      *
      * @memberof IBZDepartmentPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-pickup-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-pickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view-base.vue

@@ -417,9 +417,9 @@ export default class IBZDepartmentTreeExpViewBase extends Vue {
      *
      * @memberof IBZDepartmentTreeExpViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdepartment-tree-exp-view',tag:this.viewtag,srfkey:this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdepartment-tree-exp-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdepartment,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
      *
      * @memberof IBZDeptMemberEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdept-member-edit-view',tag:this.viewtag,srfkey:this.context.ibzdeptmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdept-member-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdeptmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue

@@ -537,9 +537,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
      *
      * @memberof IBZDeptMemberGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzdept-member-grid-view',tag:this.viewtag,srfkey:this.context.ibzdeptmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzdept-member-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzdeptmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzemployee-edit-view/ibzemployee-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
      *
      * @memberof IBZEmployeeEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzemployee-edit-view',tag:this.viewtag,srfkey:this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzemployee-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue

@@ -587,9 +587,9 @@ export default class IBZEmployeeGridViewBase extends Vue {
      *
      * @memberof IBZEmployeeGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzemployee-grid-view',tag:this.viewtag,srfkey:this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzemployee-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class IBZEmployeeMPickupViewBase extends Vue {
      *
      * @memberof IBZEmployeeMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzemployee-mpickup-view',tag:this.viewtag,srfkey:this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzemployee-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzemployee-option-view/ibzemployee-option-view-base.vue

@@ -432,9 +432,9 @@ export default class IBZEmployeeOptionViewBase extends Vue {
      *
      * @memberof IBZEmployeeOptionViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzemployee-option-view',tag:this.viewtag,srfkey:this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzemployee-option-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzemployee-pickup-grid-view/ibzemployee-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class IBZEmployeePickupGridViewBase extends Vue {
      *
      * @memberof IBZEmployeePickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzemployee-pickup-grid-view',tag:this.viewtag,srfkey:this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzemployee-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view-base.vue

@@ -427,9 +427,9 @@ export default class IBZEmployeePickupViewBase extends Vue {
      *
      * @memberof IBZEmployeePickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzemployee-pickup-view',tag:this.viewtag,srfkey:this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzemployee-pickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzemployee,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzorganization-edit-view/ibzorganization-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class IBZOrganizationEditViewBase extends Vue {
      *
      * @memberof IBZOrganizationEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzorganization-edit-view',tag:this.viewtag,srfkey:this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzorganization-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue

@@ -571,9 +571,9 @@ export default class IBZOrganizationGridViewBase extends Vue {
      *
      * @memberof IBZOrganizationGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzorganization-grid-view',tag:this.viewtag,srfkey:this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzorganization-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzorganization-option-view/ibzorganization-option-view-base.vue

@@ -432,9 +432,9 @@ export default class IBZOrganizationOptionViewBase extends Vue {
      *
      * @memberof IBZOrganizationOptionViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzorganization-option-view',tag:this.viewtag,srfkey:this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzorganization-option-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class IBZOrganizationPickupGridViewBase extends Vue {
      *
      * @memberof IBZOrganizationPickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzorganization-pickup-grid-view',tag:this.viewtag,srfkey:this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzorganization-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view-base.vue

@@ -427,9 +427,9 @@ export default class IBZOrganizationPickupViewBase extends Vue {
      *
      * @memberof IBZOrganizationPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzorganization-pickup-view',tag:this.viewtag,srfkey:this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzorganization-pickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view-base.vue

@@ -417,9 +417,9 @@ export default class IBZOrganizationTreeExpViewBase extends Vue {
      *
      * @memberof IBZOrganizationTreeExpViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'ibzorganization-tree-exp-view',tag:this.viewtag,srfkey:this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'ibzorganization-tree-exp-view',tag:this.viewtag,srfkey:isNew ? null : this.context.ibzorganization,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/rt/index/index-base.vue

@@ -408,9 +408,9 @@ export default class IndexBase extends Vue {
      *
      * @memberof IndexBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'index',tag:this.viewtag,srfkey:null,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'index',tag:this.viewtag,srfkey:isNew ? null : null,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view-base.vue

@@ -462,9 +462,9 @@ export default class SysAuthLogGridViewBase extends Vue {
      *
      * @memberof SysAuthLogGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-auth-log-grid-view',tag:this.viewtag,srfkey:this.context.sysauthlog,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-auth-log-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysauthlog,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-permission-mpickup-view/sys-permission-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class SysPermissionMPickupViewBase extends Vue {
      *
      * @memberof SysPermissionMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-permission-mpickup-view',tag:this.viewtag,srfkey:this.context.syspermission,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-permission-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.syspermission,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-permission-pickup-grid-view/sys-permission-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class SysPermissionPickupGridViewBase extends Vue {
      *
      * @memberof SysPermissionPickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-permission-pickup-grid-view',tag:this.viewtag,srfkey:this.context.syspermission,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-permission-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.syspermission,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class SysRoleEditViewBase extends Vue {
      *
      * @memberof SysRoleEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-role-edit-view',tag:this.viewtag,srfkey:this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-role-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-role-grid-view/sys-role-grid-view-base.vue

@@ -569,9 +569,9 @@ export default class SysRoleGridViewBase extends Vue {
      *
      * @memberof SysRoleGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-role-grid-view',tag:this.viewtag,srfkey:this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-role-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class SysRoleMPickupViewBase extends Vue {
      *
      * @memberof SysRoleMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-role-mpickup-view',tag:this.viewtag,srfkey:this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-role-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view-base.vue

@@ -383,9 +383,9 @@ export default class SysRolePermissionCustomViewBase extends Vue {
      *
      * @memberof SysRolePermissionCustomViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-role-permission-custom-view',tag:this.viewtag,srfkey:this.context.sysrolepermission,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-role-permission-custom-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysrolepermission,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class SysRolePickupGridViewBase extends Vue {
      *
      * @memberof SysRolePickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-role-pickup-grid-view',tag:this.viewtag,srfkey:this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-role-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-role-pickup-view/sys-role-pickup-view-base.vue

@@ -427,9 +427,9 @@ export default class SysRolePickupViewBase extends Vue {
      *
      * @memberof SysRolePickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-role-pickup-view',tag:this.viewtag,srfkey:this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-role-pickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-user-mpickup-view/sys-user-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class SysUserMPickupViewBase extends Vue {
      *
      * @memberof SysUserMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-user-mpickup-view',tag:this.viewtag,srfkey:this.context.sysuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-user-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-user-pickup-grid-view/sys-user-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class SysUserPickupGridViewBase extends Vue {
      *
      * @memberof SysUserPickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-user-pickup-grid-view',tag:this.viewtag,srfkey:this.context.sysuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-user-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-user-pickup-view/sys-user-pickup-view-base.vue

@@ -427,9 +427,9 @@ export default class SysUserPickupViewBase extends Vue {
      *
      * @memberof SysUserPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-user-pickup-view',tag:this.viewtag,srfkey:this.context.sysuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-user-pickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class SysUserRoleEditViewBase extends Vue {
      *
      * @memberof SysUserRoleEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-user-role-edit-view',tag:this.viewtag,srfkey:this.context.sysuserrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-user-role-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysuserrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/uaa/sys-user-role-grid-view/sys-user-role-grid-view-base.vue

@@ -566,9 +566,9 @@ export default class SysUserRoleGridViewBase extends Vue {
      *
      * @memberof SysUserRoleGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'sys-user-role-grid-view',tag:this.viewtag,srfkey:this.context.sysuserrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'sys-user-role-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.sysuserrole,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class WFGroupEditViewBase extends Vue {
      *
      * @memberof WFGroupEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfgroup-edit-view',tag:this.viewtag,srfkey:this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfgroup-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view-base.vue

@@ -569,9 +569,9 @@ export default class WFGroupGridViewBase extends Vue {
      *
      * @memberof WFGroupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfgroup-grid-view',tag:this.viewtag,srfkey:this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfgroup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class WFGroupMPickupViewBase extends Vue {
      *
      * @memberof WFGroupMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfgroup-mpickup-view',tag:this.viewtag,srfkey:this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfgroup-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class WFGroupPickupGridViewBase extends Vue {
      *
      * @memberof WFGroupPickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfgroup-pickup-grid-view',tag:this.viewtag,srfkey:this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfgroup-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfgroup,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class WFMemberEditViewBase extends Vue {
      *
      * @memberof WFMemberEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfmember-edit-view',tag:this.viewtag,srfkey:this.context.wfmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfmember-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue

@@ -569,9 +569,9 @@ export default class WFMemberGridViewBase extends Vue {
      *
      * @memberof WFMemberGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfmember-grid-view',tag:this.viewtag,srfkey:this.context.wfmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfmember-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfmember,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view-base.vue

@@ -459,9 +459,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
      *
      * @memberof WFProcessDefinitionEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfprocess-definition-edit-view',tag:this.viewtag,srfkey:this.context.wfprocessdefinition,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfprocess-definition-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfprocessdefinition,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view-base.vue

@@ -569,9 +569,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
      *
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfprocess-definition-grid-view',tag:this.viewtag,srfkey:this.context.wfprocessdefinition,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfprocess-definition-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfprocessdefinition,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view-base.vue

@@ -449,9 +449,9 @@ export default class WFREModelEditViewBase extends Vue {
      *
      * @memberof WFREModelEditViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfremodel-edit-view',tag:this.viewtag,srfkey:this.context.wfremodel,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfremodel-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfremodel,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view-base.vue

@@ -460,9 +460,9 @@ export default class WFUserMPickupViewBase extends Vue {
      *
      * @memberof WFUserMPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfuser-mpickup-view',tag:this.viewtag,srfkey:this.context.wfuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfuser-mpickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view-base.vue

@@ -434,9 +434,9 @@ export default class WFUserPickupGridViewBase extends Vue {
      *
      * @memberof WFUserPickupGridViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfuser-pickup-grid-view',tag:this.viewtag,srfkey:this.context.wfuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfuser-pickup-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

app_Web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue

@@ -427,9 +427,9 @@ export default class WFUserPickupViewBase extends Vue {
      *
      * @memberof WFUserPickupViewBase
      */
-    public initNavDataWithRoute(data:any = null){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
         if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
-            this.navDataService.addNavData({id:'wfuser-pickup-view',tag:this.viewtag,srfkey:this.context.wfuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+            this.navDataService.addNavData({id:'wfuser-pickup-view',tag:this.viewtag,srfkey:isNew ? null : this.context.wfuser,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
 

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzrt/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzrt/
+      mvn clean package -Pweb
+      cd ibzrt-app/ibzrt-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30000
 
 ADD ibzrt-app-web.jar /ibzrt-app-web.jar

ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml

@@ -3,9 +3,22 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "8080:8080"
+      - "30000:30000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30000
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: