Skip to content

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

ibizdev提交

上级 cb8dc3fc
隐藏空白字符变更
内嵌 并排
正在显示 包含 483 行增加 和 31 行删除
app_web/src/locale/lanres/wfprocess-definition/wfprocess-definition_en_US.ts
浏览文件 @ 7a1a7183
......@@ -6,6 +6,9 @@ export default {
modelversion: '模型版本',
modelenable: '模型是否启用',
pssystemid: '系统标识',
md5check: '校验',
bpmnfile: 'BPMN',
deploykey: 'DeployKey',
},
views: {
editview: {
......@@ -29,10 +32,13 @@ export default {
srfdeid: "",
srfsourcekey: "",
definitionkey: "DefinitionKey",
deploykey: "DefinitionKey",
definitionname: "流程定义名称",
pssystemid: "系统标识",
modelversion: "模型版本",
modelenable: "模型是否启用",
bpmnfile: "BPMN",
md5check: "校验",
},
uiactions: {
},
......@@ -51,7 +57,8 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_definitionname_like: "流程定义名称(文本包含(%))",
n_deploykey_like: "DefinitionKey",
n_definitionname_like: "流程定义名称",
},
uiactions: {
},
......
app_web/src/locale/lanres/wfprocess-definition/wfprocess-definition_zh_CN.ts
浏览文件 @ 7a1a7183
......@@ -5,6 +5,9 @@ export default {
modelversion: '模型版本',
modelenable: '模型是否启用',
pssystemid: '系统标识',
md5check: '校验',
bpmnfile: 'BPMN',
deploykey: 'DeployKey',
},
views: {
editview: {
......@@ -28,10 +31,13 @@ export default {
srfdeid: '',
srfsourcekey: '',
definitionkey: 'DefinitionKey',
deploykey: 'DefinitionKey',
definitionname: '流程定义名称',
pssystemid: '系统标识',
modelversion: '模型版本',
modelenable: '模型是否启用',
bpmnfile: 'BPMN',
md5check: '校验',
},
uiactions: {
},
......@@ -50,7 +56,8 @@ export default {
default_searchform: {
details: {
formpage1: '常规条件',
n_definitionname_like: '流程定义名称(文本包含(%))',
n_deploykey_like: 'DefinitionKey',
n_definitionname_like: '流程定义名称',
},
uiactions: {
},
......
app_web/src/mock/entity/wfgroups/wfgroups.ts
浏览文件 @ 7a1a7183
......@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const mockDatas: Array<any> = [
];
//getwflink
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfgroups\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
console.groupCollapsed("实体:wfgroup 方法: getwflink");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status,[
{"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddlfldldfldsfds","refViewKey":""},
{"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
]];
});
// getwfstep
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfgroups\/process-definitions-nodes$/)).reply((config: any) => {
console.groupCollapsed("实体:wfgroup 方法: getwfstep");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status, [
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
"userTaskName":"待审",
"cnt":0,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"
},
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
"userTaskName":"待分配",
"cnt":3,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"}
]];
});
// createBatch
mock.onPost(new RegExp(/^\/wfgroups\/batch$/)).reply((config: any) => {
console.groupCollapsed("实体:wfgroup 方法: createBatch");
......
app_web/src/mock/entity/wfmembers/wfmembers.ts
浏览文件 @ 7a1a7183
......@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const mockDatas: Array<any> = [
];
//getwflink
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfmembers\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
console.groupCollapsed("实体:wfmember 方法: getwflink");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status,[
{"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddlfldldfldsfds","refViewKey":""},
{"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
]];
});
// getwfstep
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfmembers\/process-definitions-nodes$/)).reply((config: any) => {
console.groupCollapsed("实体:wfmember 方法: getwfstep");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status, [
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
"userTaskName":"待审",
"cnt":0,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"
},
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
"userTaskName":"待分配",
"cnt":3,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"}
]];
});
// createBatch
mock.onPost(new RegExp(/^\/wfmembers\/batch$/)).reply((config: any) => {
console.groupCollapsed("实体:wfmember 方法: createBatch");
......
app_web/src/mock/entity/wfprocess-definitions/wfprocess-definitions.ts
浏览文件 @ 7a1a7183
......@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const mockDatas: Array<any> = [
];
//getwflink
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfprocessdefinitions\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
console.groupCollapsed("实体:wfprocessdefinition 方法: getwflink");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status,[
{"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddlfldldfldsfds","refViewKey":""},
{"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
]];
});
// getwfstep
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfprocessdefinitions\/process-definitions-nodes$/)).reply((config: any) => {
console.groupCollapsed("实体:wfprocessdefinition 方法: getwfstep");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status, [
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
"userTaskName":"待审",
"cnt":0,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"
},
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
"userTaskName":"待分配",
"cnt":3,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"}
]];
});
// createBatch
mock.onPost(new RegExp(/^\/wfprocessdefinitions\/batch$/)).reply((config: any) => {
console.groupCollapsed("实体:wfprocessdefinition 方法: createBatch");
......
app_web/src/mock/entity/wfsystems/wfsystems.ts
浏览文件 @ 7a1a7183
......@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const mockDatas: Array<any> = [
];
//getwflink
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfsystems\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
console.groupCollapsed("实体:wfsystem 方法: getwflink");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status,[
{"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddlfldldfldsfds","refViewKey":""},
{"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
]];
});
// getwfstep
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfsystems\/process-definitions-nodes$/)).reply((config: any) => {
console.groupCollapsed("实体:wfsystem 方法: getwfstep");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status, [
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
"userTaskName":"待审",
"cnt":0,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"
},
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
"userTaskName":"待分配",
"cnt":3,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"}
]];
});
// createBatch
mock.onPost(new RegExp(/^\/wfsystems\/batch$/)).reply((config: any) => {
console.groupCollapsed("实体:wfsystem 方法: createBatch");
......
app_web/src/mock/entity/wfusers/wfusers.ts
浏览文件 @ 7a1a7183
......@@ -6,6 +6,48 @@ const mock = MockAdapter.getInstance();
const mockDatas: Array<any> = [
];
//getwflink
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfusers\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
console.groupCollapsed("实体:wfuser 方法: getwflink");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status,[
{"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddlfldldfldsfds","refViewKey":""},
{"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
"taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
"processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
]];
});
// getwfstep
mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfusers\/process-definitions-nodes$/)).reply((config: any) => {
console.groupCollapsed("实体:wfuser 方法: getwfstep");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, {}];
}
return [status, [
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
"userTaskName":"待审",
"cnt":0,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"
},
{"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
"userTaskName":"待分配",
"cnt":3,
"processDefinitionKey":"support-workorders-approve-v1",
"processDefinitionName":"工单审批流程v1"}
]];
});
// createBatch
mock.onPost(new RegExp(/^\/wfusers\/batch$/)).reply((config: any) => {
console.groupCollapsed("实体:wfuser 方法: createBatch");
......
app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-base.vue
浏览文件 @ 7a1a7183
......@@ -4,7 +4,13 @@
<row>
<i-col span="20">
<row>
<i-col v-show="detailsModel.n_definitionname_like.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<i-col v-show="detailsModel.n_deploykey_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='n_deploykey_like' :itemRules="this.rules.n_deploykey_like" class='' :caption="$t('entities.wfprocessdefinition.default_searchform.details.n_deploykey_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_deploykey_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_deploykey_like" @enter="onEnter($event)" :disabled="detailsModel.n_deploykey_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_definitionname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='n_definitionname_like' :itemRules="this.rules.n_definitionname_like" class='' :caption="$t('entities.wfprocessdefinition.default_searchform.details.n_definitionname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_definitionname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_definitionname_like" @enter="onEnter($event)" :disabled="detailsModel.n_definitionname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
......@@ -250,6 +256,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
protected data: any = {
n_deploykey_like: null,
n_definitionname_like: null,
};
......@@ -260,11 +267,17 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
protected rules: any = {
n_deploykey_like: [
{ type: 'string', message: 'DefinitionKey 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: 'DefinitionKey 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'blur' },
],
n_definitionname_like: [
{ type: 'string', message: '流程定义名称(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '流程定义名称(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '流程定义名称(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '流程定义名称(文本包含(%)) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '流程定义名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '流程定义名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '流程定义名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '流程定义名称 值不能为空', trigger: 'blur' },
],
}
......@@ -277,10 +290,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
protected detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_definitionname_like: new FormItemModel({ caption: '流程定义名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_definitionname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_deploykey_like: new FormItemModel({ caption: 'DefinitionKey', detailType: 'FORMITEM', name: 'n_deploykey_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_definitionname_like: new FormItemModel({ caption: '流程定义名称', detailType: 'FORMITEM', name: 'n_definitionname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_deploykey_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_deploykey_like')
onN_deploykey_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_deploykey_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_definitionname_like 值
*
......@@ -315,6 +342,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-model.ts
浏览文件 @ 7a1a7183
......@@ -25,6 +25,11 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_deploykey_like',
prop: 'deploykey',
dataType: 'TEXT',
},
{
name: 'n_definitionname_like',
prop: 'definitionname',
......
app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue
浏览文件 @ 7a1a7183
......@@ -7,9 +7,9 @@
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfprocessdefinition.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
<row>
<i-col v-show="detailsModel.definitionkey.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='definitionkey' :itemRules="this.rules.definitionkey" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.definitionkey')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.definitionkey.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.definitionkey" @enter="onEnter($event)" unit="" :disabled="detailsModel.definitionkey.disabled" type='text' style=""></input-box>
<i-col v-show="detailsModel.deploykey.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deploykey' :itemRules="this.rules.deploykey" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.deploykey')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deploykey.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deploykey" @enter="onEnter($event)" unit="" :disabled="detailsModel.deploykey.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -36,6 +36,18 @@
<dropdown-list v-model="data.modelenable" :data="data" :itemParam="{}" :disabled="detailsModel.modelenable.disabled" style="width:100px;width: 100px;" tag='YesNo' codelistType='STATIC' placeholder='请选择...'></dropdown-list>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.bpmnfile.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='bpmnfile' :itemRules="this.rules.bpmnfile" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.bpmnfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.bpmnfile.error" :isEmptyCaption="false" labelPos="LEFT">
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='bpmnfile' :value="data.bpmnfile" :disabled="detailsModel.bpmnfile.disabled" uploadparams='' exportparams='' :customparams="{}" style="overflow: auto;"></app-file-upload>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.md5check.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='md5check' :itemRules="this.rules.md5check" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.md5check')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.md5check.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.md5check" @enter="onEnter($event)" unit="" :disabled="detailsModel.md5check.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
</row>
......@@ -342,10 +354,13 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: null,
srfsourcekey: null,
definitionkey: null,
deploykey: null,
definitionname: null,
pssystemid: null,
modelversion: null,
modelenable: null,
bpmnfile: null,
md5check: null,
wfprocessdefinition:null,
};
......@@ -436,11 +451,17 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'blur' },
],
deploykey: [
{ type: 'string', message: 'DefinitionKey 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: 'DefinitionKey 值必须为字符串类型', trigger: 'blur' },
{ required: true, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'blur' },
],
definitionname: [
{ type: 'string', message: '流程定义名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '流程定义名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '流程定义名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '流程定义名称 值不能为空', trigger: 'blur' },
{ required: true, type: 'string', message: '流程定义名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '流程定义名称 值不能为空', trigger: 'blur' },
],
pssystemid: [
{ type: 'string', message: '系统标识 值必须为字符串类型', trigger: 'change' },
......@@ -460,6 +481,18 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'number', message: '模型是否启用 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '模型是否启用 值不能为空', trigger: 'blur' },
],
bpmnfile: [
{ type: 'string', message: 'BPMN 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: 'BPMN 值必须为字符串类型', trigger: 'blur' },
{ required: true, type: 'string', message: 'BPMN 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: 'BPMN 值不能为空', trigger: 'blur' },
],
md5check: [
{ type: 'string', message: '校验 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '校验 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '校验 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '校验 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -488,6 +521,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
definitionkey: new FormItemModel({ caption: 'DefinitionKey', detailType: 'FORMITEM', name: 'definitionkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
deploykey: new FormItemModel({ caption: 'DefinitionKey', detailType: 'FORMITEM', name: 'deploykey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
,
definitionname: new FormItemModel({ caption: '流程定义名称', detailType: 'FORMITEM', name: 'definitionname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
......@@ -496,6 +531,10 @@ export default class MainBase extends Vue implements ControlInterface {
modelversion: new FormItemModel({ caption: '模型版本', detailType: 'FORMITEM', name: 'modelversion', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
modelenable: new FormItemModel({ caption: '模型是否启用', detailType: 'FORMITEM', name: 'modelenable', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
bpmnfile: new FormItemModel({ caption: 'BPMN', detailType: 'FORMITEM', name: 'bpmnfile', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
md5check: new FormItemModel({ caption: '校验', detailType: 'FORMITEM', name: 'md5check', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
......@@ -595,6 +634,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'definitionkey', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 deploykey 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.deploykey')
onDeploykeyChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'deploykey', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 definitionname 值
*
......@@ -643,6 +694,30 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'modelenable', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 bpmnfile 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.bpmnfile')
onBpmnfileChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'bpmnfile', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 md5check 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.md5check')
onMd5checkChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'md5check', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -693,6 +768,9 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/wfprocess-definition/main-form/main-form-model.ts
浏览文件 @ 7a1a7183
......@@ -55,6 +55,11 @@ export default class MainModel {
prop: 'definitionkey',
dataType: 'TEXT',
},
{
name: 'deploykey',
prop: 'deploykey',
dataType: 'TEXT',
},
{
name: 'definitionname',
prop: 'definitionname',
......@@ -75,6 +80,16 @@ export default class MainModel {
prop: 'modelenable',
dataType: 'YESNO',
},
{
name: 'bpmnfile',
prop: 'bpmnfile',
dataType: 'TEXT',
},
{
name: 'md5check',
prop: 'md5check',
dataType: 'TEXT',
},
{
name: 'wfprocessdefinition',
prop: 'definitionkey',
......
app_web/src/widgets/wfprocess-definition/main-form/main-form-service.ts
浏览文件 @ 7a1a7183
......@@ -160,7 +160,6 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{definitionkey: data.definitionkey, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/wfprocess-definition/main-grid/main-grid-model.ts
浏览文件 @ 7a1a7183
......@@ -70,6 +70,11 @@ export default class MainModel {
name: 'wfprocessdefinition',
prop: 'definitionkey',
},
{
name: 'n_deploykey_like',
prop: 'n_deploykey_like',
dataType: 'TEXT',
},
{
name: 'n_definitionname_like',
prop: 'n_definitionname_like',
......
config.xml
浏览文件 @ 7a1a7183
......@@ -38,11 +38,6 @@
git clone -b master $para2 ibzwf/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzwf/
mvn clean package -Pweb
cd ibzwf-app/ibzwf-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-app-web.yaml dev --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzwf-app/ibzwf-app-web/src/main/docker/Dockerfile
浏览文件 @ 7a1a7183
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-app-web.jar
EXPOSE 30003
EXPOSE 8080
ADD ibzwf-app-web.jar /ibzwf-app-web.jar
ibzwf-app/ibzwf-app-web/src/main/docker/ibzwf-app-web.yaml
浏览文件 @ 7a1a7183
......@@ -3,7 +3,7 @@ services:
ibzwf-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
ports:
- "30003:30003"
- "8080:8080"
networks:
- agent_network
deploy:
......
ibzwf-app/ibzwf-app-web/src/main/resources/application-web-dev.yml
浏览文件 @ 7a1a7183
server:
port: 30003
\ No newline at end of file
port: 8080
\ No newline at end of file
ibzwf-app/ibzwf-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ 7a1a7183
server:
port: 30003
port: 8080
#zuul网关路由设置
zuul:
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java
浏览文件 @ 7a1a7183
......@@ -68,6 +68,27 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
@JSONField(name = "pssystemid")
@JsonProperty("pssystemid")
private String pssystemid;
/**
* 校验
*/
@TableField(value = "md5check")
@JSONField(name = "md5check")
@JsonProperty("md5check")
private String md5check;
/**
* BPMN
*/
@TableField(value = "bpmnfile")
@JSONField(name = "bpmnfile")
@JsonProperty("bpmnfile")
private String bpmnfile;
/**
* DeployKey
*/
@TableField(value = "deploykey")
@JSONField(name = "deploykey")
@JsonProperty("deploykey")
private String deploykey;
......@@ -99,6 +120,27 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
this.pssystemid = pssystemid ;
this.modify("pssystemid",pssystemid);
}
/**
* 设置 [校验]
*/
public void setMd5check(String md5check){
this.md5check = md5check ;
this.modify("md5check",md5check);
}
/**
* 设置 [BPMN]
*/
public void setBpmnfile(String bpmnfile){
this.bpmnfile = bpmnfile ;
this.modify("bpmnfile",bpmnfile);
}
/**
* 设置 [DeployKey]
*/
public void setDeploykey(String deploykey){
this.deploykey = deploykey ;
this.modify("deploykey",deploykey);
}
}
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFProcessDefinitionSearchContext.java
浏览文件 @ 7a1a7183
......@@ -33,6 +33,13 @@ public class WFProcessDefinitionSearchContext extends QueryWrapperContext<WFProc
this.getSelectCond().like("definitionname", n_definitionname_like);
}
}
private String n_deploykey_like;//[DeployKey]
public void setN_deploykey_like(String n_deploykey_like) {
this.n_deploykey_like = n_deploykey_like;
if(!ObjectUtils.isEmpty(this.n_deploykey_like)){
this.getSelectCond().like("deploykey", n_deploykey_like);
}
}
/**
* 启用快速搜索
......
ibzwf-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 7a1a7183
......@@ -92,7 +92,7 @@
</createTable>
</changeSet>
<!--输出实体[WF_DEFINITION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_definition-34-7">
<changeSet author="a_A_5d9d78509" id="tab-wf_definition-47-7">
<createTable tableName="IBZWFDEFINITION">
<column name="DEFINITIONKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_DEFINITION_DEFINITIONKEY"/>
......@@ -105,6 +105,12 @@
</column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="MD5CHECK" remarks="" type="VARCHAR(100)">
</column>
<column name="BPMNFILE" remarks="" type="VARCHAR(100)">
</column>
<column name="DEPLOYKEY" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
<!--输出实体[WF_GROUP_MEMBER]数据结构 -->
......
ibzwf-core/src/main/resources/mapper/workflow/wfprocessdefinition/WFProcessDefinitionMapper.xml
浏览文件 @ 7a1a7183
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="WFProcessDefinitionResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1 ) t1 where definitionkey=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1 ) t1 where definitionkey=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -27,13 +27,13 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
<![CDATA[ SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
<![CDATA[ SELECT t1.`BPMNFILE`, t1.`DEFINITIONKEY`, t1.`DEFINITIONNAME`, t1.`DEPLOYKEY`, t1.`MD5CHECK`, t1.`MODELENABLE`, t1.`MODELVERSION`, t1.`PSSYSTEMID` FROM `IBZWFDEFINITION` t1
]]>
</sql>
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/dto/WFProcessDefinitionDTO.java
浏览文件 @ 7a1a7183
......@@ -63,6 +63,30 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
@JsonProperty("pssystemid")
private String pssystemid;
/**
* 属性 [MD5CHECK]
*
*/
@JSONField(name = "md5check")
@JsonProperty("md5check")
private String md5check;
/**
* 属性 [BPMNFILE]
*
*/
@JSONField(name = "bpmnfile")
@JsonProperty("bpmnfile")
private String bpmnfile;
/**
* 属性 [DEPLOYKEY]
*
*/
@JSONField(name = "deploykey")
@JsonProperty("deploykey")
private String deploykey;
/**
* 设置 [DEFINITIONNAME]
......@@ -96,6 +120,30 @@ public class WFProcessDefinitionDTO extends DTOBase implements Serializable {
this.modify("pssystemid",pssystemid);
}
/**
* 设置 [MD5CHECK]
*/
public void setMd5check(String md5check){
this.md5check = md5check ;
this.modify("md5check",md5check);
}
/**
* 设置 [BPMNFILE]
*/
public void setBpmnfile(String bpmnfile){
this.bpmnfile = bpmnfile ;
this.modify("bpmnfile",bpmnfile);
}
/**
* 设置 [DEPLOYKEY]
*/
public void setDeploykey(String deploykey){
this.deploykey = deploykey ;
this.modify("deploykey",deploykey);
}
}
ibzwf-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ 7a1a7183
......@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
private String systemId;
@Override
......
ibzwf-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java
浏览文件 @ 7a1a7183
......@@ -69,7 +69,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
return false;
List gridParamList = (ArrayList) gridParam;
if(action.equals("DELETE")){ //grid delete
if(action.equalsIgnoreCase("DELETE")){ //grid delete
//准备参数
Object srfKey =gridParamList.get(0);
EntityBase entity = (EntityBase) gridParamList.get(1);
......@@ -145,7 +145,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
JSONObject permissionList=userPermission.getJSONObject("userPermissionList");
String entityName = entity.getClass().getSimpleName();
if(action.equals("CREATE")){
if(action.equalsIgnoreCase("CREATE")){
return validDEActionHasPermission(permissionList,entityName,action);
}
else{
......
ibzwf-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java
浏览文件 @ 7a1a7183
......@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
@Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
private String systemid;
@Autowired
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或