Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
47191ceb
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
47191ceb
编写于
10月 27, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
整理文档打开时的请求,减少record和attachment请求
上级
f98b441e
变更
3
展开全部
显示空白变更内容
内联
并排
Showing
3 changed file
with
134 addition
and
53 deletion
+134
-53
o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
.../xAction/services/x_processplatform_assemble_surface.json
+5
-0
o2web/source/x_component_process_Work/Main.js
o2web/source/x_component_process_Work/Main.js
+128
-52
o2web/source/x_desktop/js/base_work_begin.js
o2web/source/x_desktop/js/base_work_begin.js
+1
-1
未找到文件。
o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
浏览文件 @
47191ceb
...
...
@@ -260,6 +260,8 @@
"getFormMobile"
:
{
"uri"
:
"/jaxrs/form/{id}/application/{applicationFlag}/mobile"
},
"getScript"
:
{
"uri"
:
"/jaxrs/script/{flag}/application/{applicationFlag}"
},
"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"
},
"sendReaderByWorkCompleted"
:
{
"uri"
:
"/jaxrs/read/workcompleted/{workCompletedId}"
,
"method"
:
"POST"
},
...
...
@@ -286,6 +288,9 @@
"getWorkForm"
:
{
"uri"
:
"/jaxrs/form/workorworkcompleted/{workOrWorkCompleted}"
},
"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}"
},
"listTaskCompletedByJob"
:
{
"uri"
:
"/jaxrs/taskcompleted/list/job/{job}"
},
"listReadByJob"
:
{
"uri"
:
"/jaxrs/read/list/job/{job}"
},
...
...
o2web/source/x_component_process_Work/Main.js
浏览文件 @
47191ceb
...
...
@@ -143,18 +143,17 @@ MWF.xApplication.process.Work.Main = new Class({
},
loadWorkByWork
:
function
(
id
){
//var getWorkLogMothed = "getWorkLog"; //以前使用worklog,现在改成record了
var
getWorkLogMothed
=
(
this
.
options
.
worklogType
.
toLowerCase
()
===
"
worklog
"
)
?
"
getWorkLog
"
:
"
getRecordLog
"
;
if
(
this
.
options
.
form
&&
this
.
options
.
form
.
id
&&
this
.
options
.
form
.
app
){
o2
.
Actions
.
invokeAsync
([
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getForm
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
loadWork
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkControl
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkLog
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getRecordLog
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
listAttachments
"
}
],
{
"
success
"
:
function
(
json_form
,
json_work
,
json_control
,
json_log
,
json_record
,
json_att
){
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
);
//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
();
...
...
@@ -170,39 +169,116 @@ MWF.xApplication.process.Work.Main = new Class({
this
.
close
();
}
}
}
}.
bind
(
this
);
if
(
this
.
options
.
form
&&
this
.
options
.
form
.
id
&&
this
.
options
.
form
.
app
){
o2
.
Actions
.
invokeAsync
([
{
"
action
"
:
this
.
action
,
"
name
"
:
"
loadWorkV2
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkLog
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkControl
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getForm
"
}
],
{
"
success
"
:
function
(
jsonWork
,
jsonLog
,
jsonControl
,
jsonForm
){
json_work
=
jsonWork
;
json_log
=
jsonLog
;
json_control
=
jsonControl
;
json_form
=
jsonForm
;
loadWorkFlag
=
true
;
loadFormFlag
=
true
;
check
();
}.
bind
(
this
),
"
failure
"
:
function
(){
//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
{
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
([
{
"
action
"
:
this
.
action
,
"
name
"
:
(
layout
.
mobile
)
?
"
getWorkFormMobile
"
:
"
getWorkForm
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
loadWork
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkControl
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
loadWorkV2
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkLog
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getRecordLog
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
listAttachments
"
}
],
{
"
success
"
:
function
(
json_form
,
json_work
,
json_control
,
json_log
,
json_record
,
json_att
){
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
();
}
}
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkControl
"
}
],
{
"
success
"
:
function
(
jsonWork
,
jsonLog
,
jsonControl
){
json_work
=
jsonWork
;
json_log
=
jsonLog
;
json_control
=
jsonControl
;
loadWorkFlag
=
true
;
check
();
}.
bind
(
this
),
"
failure
"
:
function
(){
//this.close();
}.
bind
(
this
)},
id
);
}.
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
){
MWF
.
Actions
.
get
(
"
x_processplatform_assemble_surface
"
).
listWorkByJob
(
jobId
,
function
(
json
){
...
...
o2web/source/x_desktop/js/base_work_begin.js
浏览文件 @
47191ceb
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录