提交 637b5681 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 部署微服务应用

上级 c59b10e6
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<template v-if="Object.is(this.navModel,'route')"> <template v-if="Object.is(this.navModel,'route')">
<el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.id"> <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="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)"> <dropdown trigger='click' @on-click="selectNavData($event,item)">
<span class="app-breadcrumb-selected"> <span class="app-breadcrumb-selected">
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
...@@ -195,6 +195,15 @@ export default class Breadcrumb extends Vue { ...@@ -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> </script>
......
...@@ -103,7 +103,7 @@ export default class EditViewEngine extends ViewEngine { ...@@ -103,7 +103,7 @@ export default class EditViewEngine extends ViewEngine {
public onFormLoad(arg: any): void { 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.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'); const newdata: boolean = !Object.is(arg.srfuf, '1');
this.calcToolbarItemState(newdata); this.calcToolbarItemState(newdata);
} }
...@@ -117,7 +117,7 @@ export default class EditViewEngine extends ViewEngine { ...@@ -117,7 +117,7 @@ export default class EditViewEngine extends ViewEngine {
public onFormSave(arg: any): void { 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.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'); const newdata: boolean = !Object.is(arg.srfuf, '1');
this.calcToolbarItemState(newdata); this.calcToolbarItemState(newdata);
this.view.$emit('save',arg); this.view.$emit('save',arg);
...@@ -245,7 +245,7 @@ export default class EditViewEngine extends ViewEngine { ...@@ -245,7 +245,7 @@ export default class EditViewEngine extends ViewEngine {
* *
* @memberof EditViewEngine * @memberof EditViewEngine
*/ */
public setTabCaption(info: string): void { public setTabCaption(info: string,isNew:boolean): void {
let viewdata: any = this.view.model; let viewdata: any = this.view.model;
let index:number = viewdata.srfTitle.indexOf("-"); let index:number = viewdata.srfTitle.indexOf("-");
if (viewdata && info && !Object.is(info, '')) { if (viewdata && info && !Object.is(info, '')) {
...@@ -259,7 +259,7 @@ export default class EditViewEngine extends ViewEngine { ...@@ -259,7 +259,7 @@ export default class EditViewEngine extends ViewEngine {
this.view.$route.meta.info = info; this.view.$route.meta.info = info;
} }
this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)}-${viewdata.dataInfo}`; this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)}-${viewdata.dataInfo}`;
this.view.initNavDataWithRoute(); this.view.initNavDataWithRoute(null,isNew);
} }
} }
......
...@@ -459,9 +459,9 @@ export default class IBZDepartmentEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
* *
* @memberof IBZDepartmentEditViewBase * @memberof IBZDepartmentEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -577,9 +577,9 @@ export default class IBZDepartmentGridViewBase extends Vue { ...@@ -577,9 +577,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
* *
* @memberof IBZDepartmentGridViewBase * @memberof IBZDepartmentGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class IBZDepartmentMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class IBZDepartmentMPickupViewBase extends Vue {
* *
* @memberof IBZDepartmentMPickupViewBase * @memberof IBZDepartmentMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -432,9 +432,9 @@ export default class IBZDepartmentOptionViewBase extends Vue { ...@@ -432,9 +432,9 @@ export default class IBZDepartmentOptionViewBase extends Vue {
* *
* @memberof IBZDepartmentOptionViewBase * @memberof IBZDepartmentOptionViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class IBZDepartmentPickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class IBZDepartmentPickupGridViewBase extends Vue {
* *
* @memberof IBZDepartmentPickupGridViewBase * @memberof IBZDepartmentPickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -427,9 +427,9 @@ export default class IBZDepartmentPickupViewBase extends Vue { ...@@ -427,9 +427,9 @@ export default class IBZDepartmentPickupViewBase extends Vue {
* *
* @memberof IBZDepartmentPickupViewBase * @memberof IBZDepartmentPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -417,9 +417,9 @@ export default class IBZDepartmentTreeExpViewBase extends Vue { ...@@ -417,9 +417,9 @@ export default class IBZDepartmentTreeExpViewBase extends Vue {
* *
* @memberof IBZDepartmentTreeExpViewBase * @memberof IBZDepartmentTreeExpViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class IBZDeptMemberEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
* *
* @memberof IBZDeptMemberEditViewBase * @memberof IBZDeptMemberEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -537,9 +537,9 @@ export default class IBZDeptMemberGridViewBase extends Vue { ...@@ -537,9 +537,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* *
* @memberof IBZDeptMemberGridViewBase * @memberof IBZDeptMemberGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class IBZEmployeeEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
* *
* @memberof IBZEmployeeEditViewBase * @memberof IBZEmployeeEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -587,9 +587,9 @@ export default class IBZEmployeeGridViewBase extends Vue { ...@@ -587,9 +587,9 @@ export default class IBZEmployeeGridViewBase extends Vue {
* *
* @memberof IBZEmployeeGridViewBase * @memberof IBZEmployeeGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class IBZEmployeeMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class IBZEmployeeMPickupViewBase extends Vue {
* *
* @memberof IBZEmployeeMPickupViewBase * @memberof IBZEmployeeMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -432,9 +432,9 @@ export default class IBZEmployeeOptionViewBase extends Vue { ...@@ -432,9 +432,9 @@ export default class IBZEmployeeOptionViewBase extends Vue {
* *
* @memberof IBZEmployeeOptionViewBase * @memberof IBZEmployeeOptionViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class IBZEmployeePickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class IBZEmployeePickupGridViewBase extends Vue {
* *
* @memberof IBZEmployeePickupGridViewBase * @memberof IBZEmployeePickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -427,9 +427,9 @@ export default class IBZEmployeePickupViewBase extends Vue { ...@@ -427,9 +427,9 @@ export default class IBZEmployeePickupViewBase extends Vue {
* *
* @memberof IBZEmployeePickupViewBase * @memberof IBZEmployeePickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class IBZOrganizationEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class IBZOrganizationEditViewBase extends Vue {
* *
* @memberof IBZOrganizationEditViewBase * @memberof IBZOrganizationEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -571,9 +571,9 @@ export default class IBZOrganizationGridViewBase extends Vue { ...@@ -571,9 +571,9 @@ export default class IBZOrganizationGridViewBase extends Vue {
* *
* @memberof IBZOrganizationGridViewBase * @memberof IBZOrganizationGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -432,9 +432,9 @@ export default class IBZOrganizationOptionViewBase extends Vue { ...@@ -432,9 +432,9 @@ export default class IBZOrganizationOptionViewBase extends Vue {
* *
* @memberof IBZOrganizationOptionViewBase * @memberof IBZOrganizationOptionViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class IBZOrganizationPickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class IBZOrganizationPickupGridViewBase extends Vue {
* *
* @memberof IBZOrganizationPickupGridViewBase * @memberof IBZOrganizationPickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -427,9 +427,9 @@ export default class IBZOrganizationPickupViewBase extends Vue { ...@@ -427,9 +427,9 @@ export default class IBZOrganizationPickupViewBase extends Vue {
* *
* @memberof IBZOrganizationPickupViewBase * @memberof IBZOrganizationPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -417,9 +417,9 @@ export default class IBZOrganizationTreeExpViewBase extends Vue { ...@@ -417,9 +417,9 @@ export default class IBZOrganizationTreeExpViewBase extends Vue {
* *
* @memberof IBZOrganizationTreeExpViewBase * @memberof IBZOrganizationTreeExpViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -408,9 +408,9 @@ export default class IndexBase extends Vue { ...@@ -408,9 +408,9 @@ export default class IndexBase extends Vue {
* *
* @memberof IndexBase * @memberof IndexBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -462,9 +462,9 @@ export default class SysAuthLogGridViewBase extends Vue { ...@@ -462,9 +462,9 @@ export default class SysAuthLogGridViewBase extends Vue {
* *
* @memberof SysAuthLogGridViewBase * @memberof SysAuthLogGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class SysPermissionMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class SysPermissionMPickupViewBase extends Vue {
* *
* @memberof SysPermissionMPickupViewBase * @memberof SysPermissionMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class SysPermissionPickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class SysPermissionPickupGridViewBase extends Vue {
* *
* @memberof SysPermissionPickupGridViewBase * @memberof SysPermissionPickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class SysRoleEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class SysRoleEditViewBase extends Vue {
* *
* @memberof SysRoleEditViewBase * @memberof SysRoleEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -569,9 +569,9 @@ export default class SysRoleGridViewBase extends Vue { ...@@ -569,9 +569,9 @@ export default class SysRoleGridViewBase extends Vue {
* *
* @memberof SysRoleGridViewBase * @memberof SysRoleGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class SysRoleMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class SysRoleMPickupViewBase extends Vue {
* *
* @memberof SysRoleMPickupViewBase * @memberof SysRoleMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -383,9 +383,9 @@ export default class SysRolePermissionCustomViewBase extends Vue { ...@@ -383,9 +383,9 @@ export default class SysRolePermissionCustomViewBase extends Vue {
* *
* @memberof SysRolePermissionCustomViewBase * @memberof SysRolePermissionCustomViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class SysRolePickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class SysRolePickupGridViewBase extends Vue {
* *
* @memberof SysRolePickupGridViewBase * @memberof SysRolePickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -427,9 +427,9 @@ export default class SysRolePickupViewBase extends Vue { ...@@ -427,9 +427,9 @@ export default class SysRolePickupViewBase extends Vue {
* *
* @memberof SysRolePickupViewBase * @memberof SysRolePickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class SysUserMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class SysUserMPickupViewBase extends Vue {
* *
* @memberof SysUserMPickupViewBase * @memberof SysUserMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class SysUserPickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class SysUserPickupGridViewBase extends Vue {
* *
* @memberof SysUserPickupGridViewBase * @memberof SysUserPickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -427,9 +427,9 @@ export default class SysUserPickupViewBase extends Vue { ...@@ -427,9 +427,9 @@ export default class SysUserPickupViewBase extends Vue {
* *
* @memberof SysUserPickupViewBase * @memberof SysUserPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class SysUserRoleEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class SysUserRoleEditViewBase extends Vue {
* *
* @memberof SysUserRoleEditViewBase * @memberof SysUserRoleEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -566,9 +566,9 @@ export default class SysUserRoleGridViewBase extends Vue { ...@@ -566,9 +566,9 @@ export default class SysUserRoleGridViewBase extends Vue {
* *
* @memberof SysUserRoleGridViewBase * @memberof SysUserRoleGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class WFGroupEditViewBase extends Vue {
* *
* @memberof WFGroupEditViewBase * @memberof WFGroupEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -569,9 +569,9 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -569,9 +569,9 @@ export default class WFGroupGridViewBase extends Vue {
* *
* @memberof WFGroupGridViewBase * @memberof WFGroupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class WFGroupMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class WFGroupMPickupViewBase extends Vue {
* *
* @memberof WFGroupMPickupViewBase * @memberof WFGroupMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class WFGroupPickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class WFGroupPickupGridViewBase extends Vue {
* *
* @memberof WFGroupPickupGridViewBase * @memberof WFGroupPickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class WFMemberEditViewBase extends Vue {
* *
* @memberof WFMemberEditViewBase * @memberof WFMemberEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -569,9 +569,9 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -569,9 +569,9 @@ export default class WFMemberGridViewBase extends Vue {
* *
* @memberof WFMemberGridViewBase * @memberof WFMemberGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -459,9 +459,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -459,9 +459,9 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
* *
* @memberof WFProcessDefinitionEditViewBase * @memberof WFProcessDefinitionEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -569,9 +569,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -569,9 +569,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
* *
* @memberof WFProcessDefinitionGridViewBase * @memberof WFProcessDefinitionGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -449,9 +449,9 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -449,9 +449,9 @@ export default class WFREModelEditViewBase extends Vue {
* *
* @memberof WFREModelEditViewBase * @memberof WFREModelEditViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -460,9 +460,9 @@ export default class WFUserMPickupViewBase extends Vue { ...@@ -460,9 +460,9 @@ export default class WFUserMPickupViewBase extends Vue {
* *
* @memberof WFUserMPickupViewBase * @memberof WFUserMPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -434,9 +434,9 @@ export default class WFUserPickupGridViewBase extends Vue { ...@@ -434,9 +434,9 @@ export default class WFUserPickupGridViewBase extends Vue {
* *
* @memberof WFUserPickupGridViewBase * @memberof WFUserPickupGridViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -427,9 +427,9 @@ export default class WFUserPickupViewBase extends Vue { ...@@ -427,9 +427,9 @@ export default class WFUserPickupViewBase extends Vue {
* *
* @memberof WFUserPickupViewBase * @memberof WFUserPickupViewBase
*/ */
public initNavDataWithRoute(data:any = null){ public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){ 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});
} }
} }
......
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
git clone -b master $para2 ibzrt/ git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar 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 ADD ibzrt-app-web.jar /ibzrt-app-web.jar
...@@ -3,9 +3,22 @@ services: ...@@ -3,9 +3,22 @@ services:
ibzrt-app-web: ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports: ports:
- "8080:8080" - "30000:30000"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册