Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
ecc48ff6
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
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,发现更多精彩内容 >>
提交
ecc48ff6
编写于
1月 13, 2021
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复流程记录在多媒体和表格状态下未执行postLoadLine事件的问题
上级
2d65953d
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
46 addition
and
11 deletion
+46
-11
o2web/source/x_component_process_Xform/Log.js
o2web/source/x_component_process_Xform/Log.js
+46
-11
未找到文件。
o2web/source/x_component_process_Xform/Log.js
浏览文件 @
ecc48ff6
...
...
@@ -379,9 +379,9 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
td
=
tr
.
insertCell
(
8
).
setStyles
(
css
);
td
.
set
(
"
html
"
,
arrivedUsers
);
var
atts
=
[];
if
(
task
.
properties
.
mediaOpinion
){
var
mediaIds
=
task
.
properties
.
mediaOpinion
.
split
(
"
,
"
);
var
atts
=
[];
if
(
this
.
form
.
businessData
.
attachmentList
){
this
.
form
.
businessData
.
attachmentList
.
each
(
function
(
att
){
if
(
att
.
site
===
"
$mediaOpinion
"
){
...
...
@@ -391,6 +391,14 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
if
(
atts
.
length
)
this
.
loadMediaOpinion
(
atts
,
opinionTd
.
getFirst
(),
"
table
"
);
}
this
.
fireEvent
(
"
postLoadLine
"
,[{
"
data
"
:
task
,
"
node
"
:
tr
,
"
atts
"
:
atts
,
"
log
"
:
this
,
"
type
"
:
isTask
?
"
task
"
:
"
taskCompleted
"
}]);
},
loadRecordLogDefault
:
function
(
list
,
container
){
var
logActivityNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
form
.
css
.
logActivityNode_record
}).
inject
(
container
||
this
.
node
);
...
...
@@ -450,6 +458,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
var
html
;
var
company
=
""
;
var
atts
=
[];
if
(
!
isTask
){
company
=
(
task
.
unitList
)
?
task
.
unitList
[
task
.
unitList
.
length
-
1
]
:
""
;
html
=
this
.
json
.
textStyle
;
...
...
@@ -545,7 +554,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
var
imgNode
=
textNode
.
getElement
(
"
.mwf_log_img
"
);
if
(
task
.
properties
.
mediaOpinion
){
var
mediaIds
=
task
.
properties
.
mediaOpinion
.
split
(
"
,
"
);
var
atts
=
[];
//
var atts = [];
if
(
this
.
form
.
businessData
.
attachmentList
){
this
.
form
.
businessData
.
attachmentList
.
each
(
function
(
att
){
if
(
att
.
site
===
"
$mediaOpinion
"
){
...
...
@@ -578,6 +587,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
this
.
fireEvent
(
"
postLoadLine
"
,[{
"
data
"
:
task
,
"
atts
"
:
atts
,
"
node
"
:
logTaskNode
,
"
log
"
:
this
,
"
type
"
:
isTask
?
"
task
"
:
"
taskCompleted
"
...
...
@@ -604,7 +614,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
this
.
loadRecordTaskLine_text
(
log
,
container
||
this
.
node
,
false
);
}
},
loadRecordTaskLine_text
:
function
(
task
,
node
,
log
,
isTask
){
loadRecordTaskLine_text
:
function
(
task
,
node
,
isTask
){
this
.
loadRecordTaskLine_default
(
task
,
node
,
isTask
,
"
0px
"
,
false
,
true
,
true
);
},
...
...
@@ -634,8 +644,18 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
}.
bind
(
this
));
}
var
isCompleted
=
!!
task
.
recordTime
;
task
.
completedTime
=
task
.
recordTime
;
if
(
atts
.
length
)
this
.
loadMediaOpinion_show
(
atts
,
task
,
container
);
var
node
=
new
Element
(
"
div
"
).
inject
(
container
||
this
.
node
);
if
(
atts
.
length
)
this
.
loadMediaOpinion_show
(
atts
,
task
,
node
);
this
.
fireEvent
(
"
postLoadLine
"
,[{
"
data
"
:
task
,
"
atts
"
:
atts
,
"
node
"
:
node
,
"
log
"
:
this
,
"
type
"
:
isCompleted
?
"
taskCompleted
"
:
"
task
"
}]);
}
},
...
...
@@ -1023,7 +1043,16 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
}.
bind
(
this
));
}
if
(
atts
.
length
)
this
.
loadMediaOpinion_show
(
atts
,
task
,
container
);
var
node
=
new
Element
(
"
div
"
).
inject
(
container
||
this
.
node
);
if
(
atts
.
length
)
this
.
loadMediaOpinion_show
(
atts
,
task
,
node
);
this
.
fireEvent
(
"
postLoadLine
"
,[{
"
data
"
:
task
,
"
atts
"
:
atts
,
"
node
"
:
node
,
"
log
"
:
this
,
"
type
"
:
!!
task
.
completedTime
?
"
taskCompleted
"
:
"
task
"
}]);
}
},
loadMediaOpinion_show
:
function
(
atts
,
task
,
container
,
noName
){
...
...
@@ -1098,10 +1127,6 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
}).
inject
(
imgNode
);
// var size = img.getSize();
// var x_y = size.x/size.y;
// if (size.y>260){
...
...
@@ -1276,9 +1301,10 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
opinion
=
(
task
.
processingType
==
"
empower
"
)
?
"
授权给
"
+
o2
.
name
.
cn
(
task
.
empowerToIdentity
||
""
)
:
"
<div style='line-height: 28px; float:left'>
"
+
(
task
.
opinion
||
""
)
+
"
</div>
"
;
td
.
set
(
"
html
"
,
opinion
);
var
atts
=
[];
if
(
task
.
mediaOpinion
){
var
mediaIds
=
task
.
mediaOpinion
.
split
(
"
,
"
);
var
atts
=
[];
if
(
this
.
form
.
businessData
.
attachmentList
){
this
.
form
.
businessData
.
attachmentList
.
each
(
function
(
att
){
if
(
att
.
site
===
"
$mediaOpinion
"
){
...
...
@@ -1288,6 +1314,13 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
if
(
atts
.
length
)
this
.
loadMediaOpinion
(
atts
,
td
.
getFirst
(),
"
table
"
);
}
this
.
fireEvent
(
"
postLoadLine
"
,[{
"
data
"
:
task
,
"
atts
"
:
atts
,
"
node
"
:
tr
,
"
log
"
:
this
,
"
type
"
:
isTask
?
"
task
"
:
"
taskCompleted
"
}]);
},
...
...
@@ -1504,6 +1537,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
}
var
html
;
var
company
=
""
;
var
atts
=
[];
if
(
!
isTask
){
company
=
(
task
.
unitList
)
?
task
.
unitList
[
task
.
unitList
.
length
-
1
]
:
""
;
var
html
=
this
.
json
.
textStyle
;
...
...
@@ -1568,7 +1602,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
var
imgNode
=
textNode
.
getElement
(
"
.mwf_log_img
"
);
if
(
task
.
mediaOpinion
){
var
mediaIds
=
task
.
mediaOpinion
.
split
(
"
,
"
);
var
atts
=
[];
//
var atts = [];
if
(
this
.
form
.
businessData
.
attachmentList
){
this
.
form
.
businessData
.
attachmentList
.
each
(
function
(
att
){
if
(
att
.
site
===
"
$mediaOpinion
"
){
...
...
@@ -1598,6 +1632,7 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class(
this
.
fireEvent
(
"
postLoadLine
"
,[{
"
data
"
:
task
,
"
node
"
:
logTaskNode
,
"
atts
"
:
atts
,
"
log
"
:
this
,
"
type
"
:
isTask
?
"
task
"
:
"
taskCompleted
"
}]);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录