Skip to content

o2oa
o2oa

浙江兰德纵横网络技术股份有限公司 / o2oa

通知 332
Star 10
Fork 6
o2oa
o2oa

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 0071b1cc 编写于 作者: NoSubject's avatar NoSubject
浏览文件
操作

Merge branch 'featrue/datagrid_attachment_mobile' into 'wrdp' 

整理文档打开时的请求，减少record和attachment请求

See merge request o2oa/o2oa!1937
上级 2f728679 b3a89cc3
展开全部 隐藏空白更改
内联 并排
Showing with 134 addition and 53 deletion
o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
浏览文件 @ 0071b1cc
...@@ -260,6 +260,8 @@ ...@@ -260,6 +260,8 @@
"getFormMobile": {"uri": "/jaxrs/form/{id}/application/{applicationFlag}/mobile"}, "getFormMobile": {"uri": "/jaxrs/form/{id}/application/{applicationFlag}/mobile"},
"getScript": {"uri": "/jaxrs/script/{flag}/application/{applicationFlag}"}, "getScript": {"uri": "/jaxrs/script/{flag}/application/{applicationFlag}"},
"getScriptByName": {"uri": "/jaxrs/script/{name}/application/{applicationId}","method": "POST"}, "getScriptByName": {"uri": "/jaxrs/script/{name}/application/{applicationId}","method": "POST"},
"getFormV2": {"uri": "/jaxrs/form/v2/{id}"},
"getFormV2Mobile": {"uri": "/jaxrs/form/v2/{id}/mobile"},
"sendReaderByWork" : {"uri":"/jaxrs/read/work/{workId}", "method": "POST"}, "sendReaderByWork" : {"uri":"/jaxrs/read/work/{workId}", "method": "POST"},
"sendReaderByWorkCompleted" : {"uri":"/jaxrs/read/workcompleted/{workCompletedId}", "method": "POST"}, "sendReaderByWorkCompleted" : {"uri":"/jaxrs/read/workcompleted/{workCompletedId}", "method": "POST"},
...@@ -286,6 +288,9 @@ ...@@ -286,6 +288,9 @@
"getWorkForm": {"uri": "/jaxrs/form/workorworkcompleted/{workOrWorkCompleted}"}, "getWorkForm": {"uri": "/jaxrs/form/workorworkcompleted/{workOrWorkCompleted}"},
"getWorkFormMobile": {"uri": "/jaxrs/form/workorworkcompleted/{workOrWorkCompleted}/mobile"}, "getWorkFormMobile": {"uri": "/jaxrs/form/workorworkcompleted/{workOrWorkCompleted}/mobile"},
"loadWorkV2": {"uri": "/jaxrs/work/v2/workorworkcompleted/{workOrWorkCompleted}"},
"lookupFormWithWork": {"uri": "/jaxrs/form/v2/lookup/workorworkcompleted/{workOrWorkCompleted}"},
"listTaskByJob": {"uri": "/jaxrs/task/list/job/{job}"}, "listTaskByJob": {"uri": "/jaxrs/task/list/job/{job}"},
"listTaskCompletedByJob": {"uri": "/jaxrs/taskcompleted/list/job/{job}"}, "listTaskCompletedByJob": {"uri": "/jaxrs/taskcompleted/list/job/{job}"},
"listReadByJob": {"uri": "/jaxrs/read/list/job/{job}"}, "listReadByJob": {"uri": "/jaxrs/read/list/job/{job}"},
......
o2web/source/x_component_process_Work/Main.js
浏览文件 @ 0071b1cc
...@@ -143,66 +143,142 @@ MWF.xApplication.process.Work.Main = new Class({ ...@@ -143,66 +143,142 @@ MWF.xApplication.process.Work.Main = new Class({
}, },
loadWorkByWork: function(id){ loadWorkByWork: function(id){
//var getWorkLogMothed = "getWorkLog"; //以前使用worklog，现在改成record了 //var getWorkLogMothed = "getWorkLog"; //以前使用worklog，现在改成record了
var getWorkLogMothed = (this.options.worklogType.toLowerCase()==="worklog") ? "getWorkLog" : "getRecordLog"; //var getWorkLogMothed = (this.options.worklogType.toLowerCase()==="worklog") ? "getWorkLog" : "getRecordLog";
var loadFormFlag = false;
var loadWorkFlag = false;
var json_work, json_log, json_control, json_form;
var check = function(){
if (loadWorkFlag && loadFormFlag){
if (json_work && json_control && json_form && json_log){
this.parseData(json_work.data, json_control.data, json_form.data, json_log.data, json_work.data.recordList, json_work.data.attachmentList);
if (this.mask) this.mask.hide();
//if (layout.mobile) this.loadMobileActions();
this.openWork();
this.unLoading();
} else{
if (this.options.jobId || this.options.jobid || this.options.job){
delete this.options.workCompletedId;
delete this.options.workId;
delete this.options.workid;
delete this.options.workcompletedid;
this.loadWork();
}else{
this.close();
}
}
}
}.bind(this);
if (this.options.form && this.options.form.id && this.options.form.app){ if (this.options.form && this.options.form.id && this.options.form.app){
o2.Actions.invokeAsync([ o2.Actions.invokeAsync([
{"action": this.action, "name": "getForm"}, {"action": this.action, "name": "loadWorkV2"},
{"action": this.action, "name": "loadWork"},
{"action": this.action, "name": "getWorkControl"},
{"action": this.action, "name": "getWorkLog"}, {"action": this.action, "name": "getWorkLog"},
{"action": this.action, "name": "getRecordLog"}, {"action": this.action, "name": "getWorkControl"},
{"action": this.action, "name": "listAttachments"} {"action": this.action, "name": "getForm"}
], {"success": function(json_form, json_work, json_control, json_log, json_record, json_att){ ], {"success": function(jsonWork, jsonLog, jsonControl, jsonForm){
if (json_work && json_control && json_form && json_log && json_att){ json_work = jsonWork;
this.parseData(json_work.data, json_control.data, json_form.data, json_log.data, json_record.data, json_att.data); json_log = jsonLog;
if (this.mask) this.mask.hide(); json_control = jsonControl;
//if (layout.mobile) this.loadMobileActions(); json_form = jsonForm;
this.openWork(); loadWorkFlag = true;
this.unLoading(); loadFormFlag = true;
} else{ check();
if (this.options.jobId || this.options.jobid || this.options.job){
delete this.options.workCompletedId;
delete this.options.workId;
delete this.options.workid;
delete this.options.workcompletedid;
this.loadWork();
}else{
this.close();
}
}
}.bind(this), "failure": function(){ }.bind(this), "failure": function(){
//this.close(); //this.close();
}.bind(this)}, [this.options.form.id, this.options.form.app], id); }.bind(this)}, id, id, id, [this.options.form.id, this.options.form.app]);
}else{ }else{
this.action.lookupFormWithWork(id, function(json){
var formId = json.data.id;
this.action[((layout.mobile) ? "getFormV2Mobile": "getFormV2")](formId, function(formJson){
json_form = formJson;
loadFormFlag = true;
check();
}, function(){
loadFormFlag = true;
check();
});
}.bind(this), function(){
loadFormFlag = true;
check();
});
o2.Actions.invokeAsync([ o2.Actions.invokeAsync([
{"action": this.action, "name": (layout.mobile) ? "getWorkFormMobile": "getWorkForm"}, {"action": this.action, "name": "loadWorkV2"},
{"action": this.action, "name": "loadWork"}, {"action": this.action, "name": "getWorkLog"},
{"action": this.action, "name": "getWorkControl"}, {"action": this.action, "name": "getWorkControl"}
{"action": this.action, "name": "getWorkLog"}, ], {"success": function(jsonWork, jsonLog, jsonControl){
{"action": this.action, "name": "getRecordLog"}, json_work = jsonWork;
{"action": this.action, "name": "listAttachments"} json_log = jsonLog;
], {"success": function(json_form, json_work, json_control, json_log, json_record, json_att){ json_control = jsonControl;
if (json_work && json_control && json_form && json_log && json_att){ loadWorkFlag = true;
this.parseData(json_work.data, json_control.data, json_form.data, json_log.data, json_record.data, json_att.data); check();
if (this.mask) this.mask.hide(); }.bind(this), "failure": function(){
//if (layout.mobile) this.loadMobileActions(); //this.close();
this.openWork(); }.bind(this)}, id
this.unLoading(); );
} else{
if (this.options.jobId || this.options.jobid || this.options.job){
delete this.options.workCompletedId;
delete this.options.workId;
delete this.options.workid;
delete this.options.workcompletedid;
this.loadWork();
}else{
this.close();
}
}
}.bind(this), "failure": function(){
//this.close();
}.bind(this)}, id);
} }
// if (this.options.form && this.options.form.id && this.options.form.app){
// o2.Actions.invokeAsync([
// {"action": this.action, "name": "loadWork"},
// {"action": this.action, "name": "getWorkLog"},
// {"action": this.action, "name": "getRecordLog"},
// {"action": this.action, "name": "getWorkControl"},
// {"action": this.action, "name": "listAttachments"},
// {"action": this.action, "name": "getForm"}
// ], {"success": function(json_work, json_log, json_record, json_control, json_att, json_form){
// if (json_work && json_control && json_form && json_log && json_att){
// this.parseData(json_work.data, json_control.data, json_form.data, json_log.data, json_record.data, json_att.data);
// if (this.mask) this.mask.hide();
// //if (layout.mobile) this.loadMobileActions();
// this.openWork();
// this.unLoading();
// } else{
// if (this.options.jobId || this.options.jobid || this.options.job){
// delete this.options.workCompletedId;
// delete this.options.workId;
// delete this.options.workid;
// delete this.options.workcompletedid;
// this.loadWork();
// }else{
// this.close();
// }
// }
// }.bind(this), "failure": function(){
// //this.close();
// }.bind(this)}, id, id, id, id, id, [this.options.form.id, this.options.form.app]);
// }else{
// o2.Actions.invokeAsync([
// {"action": this.action, "name": "loadWork"},
// {"action": this.action, "name": "getWorkLog"},
// {"action": this.action, "name": "getRecordLog"},
// {"action": this.action, "name": "getWorkControl"},
// {"action": this.action, "name": "listAttachments"},
// {"action": this.action, "name": (layout.mobile) ? "getWorkFormMobile": "getWorkForm"}
// ], {"success": function(json_work, json_log, json_record, json_control, json_att, json_form){
// if (json_work && json_control && json_form && json_log && json_att){
// this.parseData(json_work.data, json_control.data, json_form.data, json_log.data, json_record.data, json_att.data);
// if (this.mask) this.mask.hide();
// //if (layout.mobile) this.loadMobileActions();
// this.openWork();
// this.unLoading();
// } else{
// if (this.options.jobId || this.options.jobid || this.options.job){
// delete this.options.workCompletedId;
// delete this.options.workId;
// delete this.options.workid;
// delete this.options.workcompletedid;
// this.loadWork();
// }else{
// this.close();
// }
// }
// }.bind(this), "failure": function(){
// //this.close();
// }.bind(this)}, id);
//}
}, },
loadWorkByJob: function(jobId){ loadWorkByJob: function(jobId){
MWF.Actions.get("x_processplatform_assemble_surface").listWorkByJob(jobId, function(json){ MWF.Actions.get("x_processplatform_assemble_surface").listWorkByJob(jobId, function(json){
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或