Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
0464b5c1
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,发现更多精彩内容 >>
提交
0464b5c1
编写于
9月 08, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
路由增加异步返回选项
上级
ff46d19d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
46 addition
and
18 deletion
+46
-18
o2web/source/x_component_process_ProcessDesigner/$Process/route.html
...e/x_component_process_ProcessDesigner/$Process/route.html
+2
-2
o2web/source/x_component_process_Xform/Form.js
o2web/source/x_component_process_Xform/Form.js
+43
-16
o2web/source/x_component_process_Xform/lp/zh-cn.js
o2web/source/x_component_process_Xform/lp/zh-cn.js
+1
-0
未找到文件。
o2web/source/x_component_process_ProcessDesigner/$Process/route.html
浏览文件 @
0464b5c1
...
...
@@ -81,8 +81,8 @@
<tr>
<td
class=
"editTableTitle"
>
异步返回:
</td>
<td
class=
"editTableValue"
>
<input
class=
"editTableRadio"
name=
"asyncSupported"
text
{($.
asyncSupported
!==
fals
e
)?'
checked
'
:
''}
type=
"radio"
value=
"true"
/>
是
<input
class=
"editTableRadio"
name=
"asyncSupported"
text
{($
.asyncSupported
=
==fals
e)?'checked':''}
type=
"radio"
value=
"false"
/>
否
<input
class=
"editTableRadio"
name=
"asyncSupported"
text
{($
.asyncSupported
=
==tru
e)?'checked':''}
type=
"radio"
value=
"true"
/>
是
<input
class=
"editTableRadio"
name=
"asyncSupported"
text
{($.
asyncSupported
!==
tru
e
)?'
checked
'
:
''}
type=
"radio"
value=
"false"
/>
否
</td>
</tr>
</table>
...
...
o2web/source/x_component_process_Xform/Form.js
浏览文件 @
0464b5c1
...
...
@@ -1340,24 +1340,51 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
if
(
data
.
completed
)
{
content
+=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
workCompleted
;
}
else
{
if
(
data
.
properties
.
nextManualList
&&
data
.
properties
.
nextManualList
.
length
)
{
var
activityUsers
=
[];
data
.
properties
.
nextManualList
.
each
(
function
(
a
)
{
var
ids
=
[];
a
.
taskIdentityList
.
each
(
function
(
i
)
{
ids
.
push
(
o2
.
name
.
cn
(
i
))
});
var
t
=
"
<b>
"
+
MWF
.
xApplication
.
process
.
Xform
.
LP
.
nextActivity
+
"
</b><span style='color: #ea621f'>
"
+
a
.
activityName
+
"
</span>;<b>
"
+
MWF
.
xApplication
.
process
.
Xform
.
LP
.
nextUser
+
"
</b><span style='color: #ea621f'>
"
+
ids
.
join
(
"
,
"
)
+
"
</span>
"
;
activityUsers
.
push
(
t
);
});
content
+=
activityUsers
.
join
(
"
<br>
"
);
}
else
{
if
(
data
.
arrivedActivityName
)
{
content
+=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
arrivedActivity
+
data
.
arrivedActivityName
;
}
else
{
if
(
data
.
occurSignalStack
){
if
(
data
.
signalStack
&&
data
.
signalStack
.
length
){
var
activityUsers
=
[];
data
.
signalStack
.
each
(
function
(
stack
){
var
ids
=
[];
if
(
stack
.
splitExecute
){
ids
=
stack
.
splitExecute
.
splitValueList
||
[];
}
if
(
stack
.
manualExecute
){
ids
=
stack
.
manualExecute
.
identities
||
[];
}
var
count
=
0
;
if
(
ids
.
length
>
8
){
count
=
ids
.
length
;
ids
=
ids
.
slice
(
0
,
8
);
}
ids
=
o2
.
name
.
cns
(
ids
);
var
lp
=
MWF
.
xApplication
.
process
.
Xform
.
LP
;
var
t
=
"
<b>
"
+
lp
.
nextActivity
+
"
</b><span style='color: #ea621f'>
"
+
stack
.
name
+
"
</span>;<b>
"
+
lp
.
nextUser
+
"
</b><span style='color: #ea621f'>
"
+
ids
.
join
(
"
,
"
)
+
"
</span> <b>
"
+
((
count
)
?
"
,
"
+
lp
.
next_etc
.
replace
(
"
{count}
"
,
count
)
:
""
)
+
"
</b>
"
;
activityUsers
.
push
(
t
);
}.
bind
(
this
));
content
+=
activityUsers
.
join
(
"
<br>
"
);
}
else
{
content
+=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
taskCompleted
;
}
}
else
{
if
(
data
.
properties
.
nextManualList
&&
data
.
properties
.
nextManualList
.
length
)
{
var
activityUsers
=
[];
data
.
properties
.
nextManualList
.
each
(
function
(
a
)
{
var
ids
=
[];
a
.
taskIdentityList
.
each
(
function
(
i
)
{
ids
.
push
(
o2
.
name
.
cn
(
i
))
});
var
t
=
"
<b>
"
+
MWF
.
xApplication
.
process
.
Xform
.
LP
.
nextActivity
+
"
</b><span style='color: #ea621f'>
"
+
a
.
activityName
+
"
</span>;<b>
"
+
MWF
.
xApplication
.
process
.
Xform
.
LP
.
nextUser
+
"
</b><span style='color: #ea621f'>
"
+
ids
.
join
(
"
,
"
)
+
"
</span>
"
;
activityUsers
.
push
(
t
);
});
content
+=
activityUsers
.
join
(
"
<br>
"
);
}
else
{
if
(
data
.
arrivedActivityName
)
{
content
+=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
arrivedActivity
+
data
.
arrivedActivityName
;
}
else
{
content
+=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
taskCompleted
;
}
}
}
}
var
title
=
this
.
businessData
.
data
.
title
||
this
.
businessData
.
data
.
subject
||
this
.
businessData
.
work
.
title
...
...
@@ -1530,7 +1557,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
if
(
processor
&&
processor
.
node
)
processor
.
node
.
unmask
();
return
false
;
}
debugger
;
if
(
!
this
.
formValidation
(
routeName
,
opinion
,
medias
))
{
this
.
app
.
content
.
unmask
();
//this.app.notice("", "error", target, where, offset);
...
...
o2web/source/x_component_process_Xform/lp/zh-cn.js
浏览文件 @
0464b5c1
...
...
@@ -17,6 +17,7 @@ MWF.xApplication.process.Xform.LP = {
"
arrivedActivitys
"
:
"
到达活动
"
,
"
arrivedUsers
"
:
"
到达处理人
"
,
"
replace
"
:
"
代
"
,
"
next_etc
"
:
"
等{count}人
"
,
"
processStarted
"
:
"
文件已启动
"
,
"
processStartedMessage
"
:
"
您启动了一个新的工作:
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录