提交 4501b454 编写于 作者: Mosher's avatar Mosher

update:更新

上级 021428da
......@@ -391,4 +391,30 @@ export class ControlServiceBase {
return this.$store;
}
/**
* 处理工作流数据
*
* @param data 传入数据
*/
public handleWFData(data: any, isMerge: boolean = false) {
if (!(this.model && this.model.getDataItems instanceof Function)) {
return data;
}
let dataItems: any[] = this.model.getDataItems();
let requestData: any = {};
dataItems.forEach((item: any) => {
if (item && item.prop) {
requestData[item.prop] = data[item.name];
} else {
if (item && item.dataType && Object.is(item.dataType, "FORMITEM")) {
requestData[item.name] = data[item.name]
}
}
});
if (isMerge && (data.viewparams && Object.keys(data.viewparams).length > 0)) {
Object.assign(requestData, data.viewparams);
}
return requestData;
}
}
\ No newline at end of file
......@@ -35,9 +35,10 @@ export class FormServiceBase extends ControlServiceBase {
* @returns {Promise<HttpResponse>}
* @memberof FormServiceBase
*/
public async wfstart(action: string, context: any = {}, data: any = {}, isLoading: boolean): Promise<HttpResponse> {
public async wfstart(action: string, context: any = {}, data: any = {}, isLoading?: boolean, localdata?: any): Promise<HttpResponse> {
await this.onBeforeAction(action, context, data, isLoading);
data = this.handleRequestData(action, context, data);
data = this.handleWFData(data, true);
context = this.handleRequestData(action, context, data).context;
let response: HttpResponse;
if (Util.isFunction(this.service[action])) {
response = await this.service[action](context, data, isLoading);
......
......@@ -702,16 +702,20 @@ export class EntityService {
* @memberof EntityService
*/
public async WFStart(context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
if(localdata && Object.keys(localdata).length > 0){
const requestData:any = {};
Object.assign(requestData,{activedata:data});
Object.assign(requestData,localdata);
return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,requestData,isloading);
}else{
const requestData:any = {};
Object.assign(requestData,{wfdata:data});
return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfstart`,requestData,isloading);
}
const requestData:any = {};
Object.assign(requestData,{activedata:data});
Object.assign(requestData,localdata);
return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`, requestData, isloading);
// if(localdata && Object.keys(localdata).length > 0){
// const requestData:any = {};
// Object.assign(requestData,{activedata:data});
// Object.assign(requestData,localdata);
// return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,requestData,isloading);
// }else{
// const requestData:any = {};
// Object.assign(requestData,{wfdata:data});
// return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfstart`,requestData,isloading);
// }
}
......@@ -728,6 +732,23 @@ export class EntityService {
return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfclose`,data,isloading);
}
/**
* 获取标准工作流版本信息
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>}
* @memberof EntityService
*/
public async getStandWorkflow(context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(
`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions`,
isloading,
);
}
/**
* WFMarkRead接口方法
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册