Skip to content

I
ibzwf
提交 9eb7fa37 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong 发布系统代码 [ibz-wf，统一工作流]

上级 58b69a21
隐藏空白字符变更
内嵌 并排
正在显示 包含 154 行增加 和 35 行删除
app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN_base.ts
浏览文件 @ 9eb7fa37
......@@ -12,6 +12,7 @@ function getLocaleResourceBase(){
endtime: commonLogic.appcommonhandle("结束时间",null),
startuserid: commonLogic.appcommonhandle("发起人标识",null),
startusername: commonLogic.appcommonhandle("发起人",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
},
views: {
activeinstancegridview: {
......@@ -37,6 +38,7 @@ function getLocaleResourceBase(){
taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null),
taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
definitionid: commonLogic.appcommonhandle("DefinitionId",null),
wfusers: commonLogic.appcommonhandle("操作用户",null),
instanceid: commonLogic.appcommonhandle("实例标识",null),
},
......@@ -46,7 +48,6 @@ function getLocaleResourceBase(){
main_grid: {
columns: {
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
instancename: commonLogic.appcommonhandle("实例名称",null),
businesskey: commonLogic.appcommonhandle("业务键值",null),
starttime: commonLogic.appcommonhandle("启动时间",null),
......
app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US_base.ts
浏览文件 @ 9eb7fa37
......@@ -12,6 +12,7 @@ function getLocaleResourceBase(){
endtime: commonLogic.appcommonhandle("结束时间",null),
startuserid: commonLogic.appcommonhandle("发起人标识",null),
startusername: commonLogic.appcommonhandle("发起人",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
},
views: {
activeinstancegridview: {
......@@ -37,6 +38,7 @@ function getLocaleResourceBase(){
taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null),
taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
definitionid: commonLogic.appcommonhandle("DefinitionId",null),
wfusers: commonLogic.appcommonhandle("操作用户",null),
instanceid: commonLogic.appcommonhandle("实例标识",null),
},
......@@ -46,7 +48,6 @@ function getLocaleResourceBase(){
main_grid: {
columns: {
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
instancename: commonLogic.appcommonhandle("实例名称",null),
businesskey: commonLogic.appcommonhandle("业务键值",null),
starttime: commonLogic.appcommonhandle("启动时间",null),
......
app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN_base.ts
浏览文件 @ 9eb7fa37
......@@ -12,6 +12,7 @@ function getLocaleResourceBase(){
endtime: commonLogic.appcommonhandle("结束时间",null),
startuserid: commonLogic.appcommonhandle("发起人标识",null),
startusername: commonLogic.appcommonhandle("发起人",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
},
views: {
activeinstancegridview: {
......@@ -37,6 +38,7 @@ function getLocaleResourceBase(){
taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null),
taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
definitionid: commonLogic.appcommonhandle("DefinitionId",null),
wfusers: commonLogic.appcommonhandle("操作用户",null),
instanceid: commonLogic.appcommonhandle("实例标识",null),
},
......@@ -46,7 +48,6 @@ function getLocaleResourceBase(){
main_grid: {
columns: {
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
instancename: commonLogic.appcommonhandle("实例名称",null),
businesskey: commonLogic.appcommonhandle("业务键值",null),
starttime: commonLogic.appcommonhandle("启动时间",null),
......
app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_BO_CN_base.ts
浏览文件 @ 9eb7fa37
......@@ -9,6 +9,7 @@ function getLocaleResourceBase(){
processdefinitionname: commonLogic.appcommonhandle("流程定义名称",null),
version: commonLogic.appcommonhandle("版本",null),
cnt: commonLogic.appcommonhandle("数量",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
},
views: {
pickupview: {
......
app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_en_US_base.ts
浏览文件 @ 9eb7fa37
......@@ -9,6 +9,7 @@ function getLocaleResourceBase(){
processdefinitionname: commonLogic.appcommonhandle("流程定义名称",null),
version: commonLogic.appcommonhandle("版本",null),
cnt: commonLogic.appcommonhandle("数量",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
},
views: {
pickupview: {
......
app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_zh_CN_base.ts
浏览文件 @ 9eb7fa37
......@@ -9,6 +9,7 @@ function getLocaleResourceBase(){
processdefinitionname: commonLogic.appcommonhandle("流程定义名称",null),
version: commonLogic.appcommonhandle("版本",null),
cnt: commonLogic.appcommonhandle("数量",null),
processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
},
views: {
pickupview: {
......
app_web/src/uiservice/wfprocess-instance/wfprocess-instance-ui-service-base.ts
浏览文件 @ 9eb7fa37
......@@ -134,7 +134,7 @@ export default class WFProcessInstanceUIServiceBase extends UIService {
let parentContext:any = {};
let parentViewParam:any = {};
const _this: any = actionContext;
Object.assign(context,{PROCESSDEFINITIONKEY:"%definitionkey%"});
Object.assign(context,{PROCESSDEFINITIONID:"%definitionid%"});
const _args: any[] = Util.deepCopy(args);
const actionTarget: string | null = 'SINGLEKEY';
Object.assign(context, { wfprocessinstance: '%wfprocessinstance%' });
......
app_web/src/widgets/wfprocess-instance/jump-form/jump-form-base.vue
浏览文件 @ 9eb7fa37
......@@ -14,7 +14,7 @@
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ n_definitionkey_eq:"%definitionkey%" }'
:localParam ='{ n_definitionkey_eq:"%definitionid%" }'
:disabled="detailsModel.taskdefinitionname.disabled"
name='taskdefinitionname'
......@@ -58,6 +58,20 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.definitionid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='definitionid' :itemRules="this.rules().definitionid" class='' :caption="$t('entities.wfprocessinstance.jump_form.details.definitionid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.definitionid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.definitionid"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.definitionid.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.wfusers.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='wfusers' :itemRules="this.rules().wfusers" class='' :caption="$t('entities.wfprocessinstance.jump_form.details.wfusers')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.wfusers.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -493,6 +507,7 @@ export default class JumpBase extends Vue implements ControlInterface {
taskdefinitionname: null,
taskdefinitionkey: null,
definitionkey: null,
definitionid: null,
wfusers: null,
instanceid: null,
wfprocessinstance:null,
......@@ -558,6 +573,10 @@ export default class JumpBase extends Vue implements ControlInterface {
{ required: this.detailsModel.definitionkey.required, type: 'string', message: '流程定义标识 值不能为空', trigger: 'change' },
{ required: this.detailsModel.definitionkey.required, type: 'string', message: '流程定义标识 值不能为空', trigger: 'blur' },
],
definitionid: [
{ required: this.detailsModel.definitionid.required, type: 'string', message: 'DefinitionId 值不能为空', trigger: 'change' },
{ required: this.detailsModel.definitionid.required, type: 'string', message: 'DefinitionId 值不能为空', trigger: 'blur' },
],
wfusers: [
{ required: this.detailsModel.wfusers.required, type: 'string', message: '操作用户 值不能为空', trigger: 'change' },
{ required: this.detailsModel.wfusers.required, type: 'string', message: '操作用户 值不能为空', trigger: 'blur' },
......@@ -692,6 +711,8 @@ export default class JumpBase extends Vue implements ControlInterface {
taskdefinitionkey: new FormItemModel({ caption: '流程步骤标识', detailType: 'FORMITEM', name: 'taskdefinitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
definitionkey: new FormItemModel({ caption: '流程定义标识', detailType: 'FORMITEM', name: 'definitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
definitionid: new FormItemModel({ caption: 'DefinitionId', detailType: 'FORMITEM', name: 'definitionid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
wfusers: new FormItemModel({ caption: '操作用户', detailType: 'FORMITEM', name: 'wfusers', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
,
......@@ -819,6 +840,18 @@ export default class JumpBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'definitionkey', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 definitionid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof JumpBase
*/
@Watch('data.definitionid')
onDefinitionidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'definitionid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 wfusers 值
*
......@@ -911,6 +944,7 @@ export default class JumpBase extends Vue implements ControlInterface {
}
/**
......@@ -1999,6 +2033,9 @@ export default class JumpBase extends Vue implements ControlInterface {
if (this.data.hasOwnProperty('definitionkey')) {
this.data['definitionkey'] = this.context['processdefinitionkey'];
}
if (this.data.hasOwnProperty('definitionid')) {
this.data['definitionid'] = this.context['processdefinitionid'];
}
}
/**
......@@ -2009,6 +2046,9 @@ export default class JumpBase extends Vue implements ControlInterface {
if (this.data.hasOwnProperty('definitionkey') && !this.data.definitionkey) {
this.data['definitionkey'] = this.context['processdefinitionkey'];
}
if (this.data.hasOwnProperty('definitionid') && !this.data.definitionid) {
this.data['definitionid'] = this.context['processdefinitionid'];
}
}
......
app_web/src/widgets/wfprocess-instance/jump-form/jump-form-model.ts
浏览文件 @ 9eb7fa37
......@@ -63,6 +63,11 @@ export default class JumpModel {
prop: 'processdefinitionkey',
dataType: 'TEXT',
},
{
name: 'definitionid',
prop: 'processdefinitionid',
dataType: 'TEXT',
},
{
name: 'wfusers',
dataType:'FORMITEM',
......
app_web/src/widgets/wfprocess-instance/main-grid/main-grid-base.vue
浏览文件 @ 9eb7fa37
......@@ -34,18 +34,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('definitionkey')">
<el-table-column show-overflow-tooltip :prop="'definitionkey'" :label="$t('entities.wfprocessinstance.main_grid.columns.definitionkey')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessinstance.main_grid.columns.definitionkey')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.definitionkey}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('instancename')">
<el-table-column show-overflow-tooltip :prop="'instancename'" :label="$t('entities.wfprocessinstance.main_grid.columns.instancename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -648,15 +636,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'definitionkey',
label: '流程定义标识',
langtag: 'entities.wfprocessinstance.main_grid.columns.definitionkey',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'instancename',
label: '实例名称',
......@@ -1400,7 +1379,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['definitionname','definitionkey','instancename','businesskey','starttime','startuserid'];
let allColumns:Array<any> = ['definitionname','instancename','businesskey','starttime','startuserid'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1481,7 +1460,6 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((i+1)*100),
group: group.label,
definitionname:'',
definitionkey:'',
instancename:'',
businesskey:'',
starttime:'',
......@@ -1513,7 +1491,6 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
definitionname:'',
definitionkey:'',
instancename:'',
businesskey:'',
starttime:'',
......@@ -1565,7 +1542,6 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((groupIndex+1)*100),
group: group,
definitionname:'',
definitionkey:'',
instancename:'',
businesskey:'',
starttime:'',
......
app_web/src/widgets/wfprocess-instance/main-grid/main-grid-model.ts
浏览文件 @ 9eb7fa37
......@@ -31,11 +31,6 @@ export default class MainModel {
prop: 'processdefinitionname',
dataType: 'TEXT',
},
{
name: 'definitionkey',
prop: 'processdefinitionkey',
dataType: 'TEXT',
},
{
name: 'instancename',
prop: 'name',
......@@ -56,6 +51,16 @@ export default class MainModel {
prop: 'startuserid',
dataType: 'TEXT',
},
{
name: 'definitionid',
prop: 'processdefinitionid',
dataType: 'TEXT',
},
{
name: 'definitionkey',
prop: 'processdefinitionkey',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'id',
......
app_web/src/widgets/wfprocess-node/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 9eb7fa37
......@@ -33,6 +33,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'cnt',
},
{
name: 'processdefinitionid',
},
]
}
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java
浏览文件 @ 9eb7fa37
......@@ -117,6 +117,15 @@ public class WFProcessInstance extends EntityBase implements Serializable {
@ApiModelProperty("发起人")
private String startusername;
/**
* DefinitionId
*/
@DEField(name = "definitionid")
@JSONField(name = "processDefinitionId")
@JsonProperty("processDefinitionId")
@ApiModelProperty("DefinitionId")
private String processdefinitionid;
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java
浏览文件 @ 9eb7fa37
......@@ -91,6 +91,15 @@ public class WFProcessNode extends EntityBase implements Serializable {
@ApiModelProperty("数量")
private Integer cnt;
/**
* DefinitionId
*/
@DEField(name = "definitionid")
@JSONField(name = "processDefinitionId")
@JsonProperty("processDefinitionId")
@ApiModelProperty("DefinitionId")
private String processdefinitionid;
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFProcessNodeSearchContext.java
浏览文件 @ 9eb7fa37
......@@ -33,6 +33,8 @@ public class WFProcessNodeSearchContext extends SearchContextBase {
private String n_definitionkey_leftlike;//[DefinitionKey]
private String n_definitionid_eq;//[DefinitionId]
}
ibzwf-core/src/main/resources/sysmodel/ibzwf.json
浏览文件 @ 9eb7fa37
......@@ -703,6 +703,20 @@
"key_field":0,
"show_order":9,
"major_field":0
},
{
"fieldname":"DEFINITIONID" ,
"codename":"ProcessDefinitionId",
"field_logic_name":"DefinitionId",
"entity_name":"WF_INSTANCE",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":10,
"major_field":0
}
],
"subEntitys":[
......@@ -802,6 +816,20 @@
"key_field":0,
"show_order":7,
"major_field":0
},
{
"fieldname":"DEFINITIONID" ,
"codename":"ProcessDefinitionId",
"field_logic_name":"DefinitionId",
"entity_name":"WF_DEFINITION_NODE",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":8,
"major_field":0
}
],
"subEntitys":[
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessInstanceDTO.java
浏览文件 @ 9eb7fa37
......@@ -122,6 +122,16 @@ public class WFProcessInstanceDTO extends DTOBase implements Serializable {
@ApiModelProperty("发起人")
private String startusername;
/**
* 属性 [DEFINITIONID]
*
*/
@JSONField(name = "processdefinitionid")
@JsonProperty("processdefinitionid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("DefinitionId")
private String processdefinitionid;
/**
* 设置 [INSTANCENAME]
......@@ -187,6 +197,14 @@ public class WFProcessInstanceDTO extends DTOBase implements Serializable {
this.modify("startusername",startusername);
}
/**
* 设置 [DEFINITIONID]
*/
public void setProcessdefinitionid(String processdefinitionid){
this.processdefinitionid = processdefinitionid ;
this.modify("definitionid",processdefinitionid);
}
}
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessNodeDTO.java
浏览文件 @ 9eb7fa37
......@@ -90,6 +90,16 @@ public class WFProcessNodeDTO extends DTOBase implements Serializable {
@ApiModelProperty("数量")
private Integer cnt;
/**
* 属性 [DEFINITIONID]
*
*/
@JSONField(name = "processdefinitionid")
@JsonProperty("processdefinitionid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("DefinitionId")
private String processdefinitionid;
/**
* 设置 [NODENAME]
......@@ -131,6 +141,14 @@ public class WFProcessNodeDTO extends DTOBase implements Serializable {
this.modify("cnt",cnt);
}
/**
* 设置 [DEFINITIONID]
*/
public void setProcessdefinitionid(String processdefinitionid){
this.processdefinitionid = processdefinitionid ;
this.modify("definitionid",processdefinitionid);
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或