Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
85784331
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,发现更多精彩内容 >>
提交
85784331
编写于
12月 07, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/mobile_draft' into 'wrdp'
修复手机端草稿模式bug See merge request o2oa/o2oa!2453
上级
3cb28a4a
f7d07f29
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
7 deletion
+39
-7
o2web/source/x_component_process_Work/Main.js
o2web/source/x_component_process_Work/Main.js
+15
-3
o2web/source/x_desktop/js/base.js
o2web/source/x_desktop/js/base.js
+24
-4
未找到文件。
o2web/source/x_component_process_Work/Main.js
浏览文件 @
85784331
...
...
@@ -388,9 +388,21 @@ MWF.xApplication.process.Work.Main = new Class({
this
.
parseData
(
workData
,
control
,
json_form
.
data
,
[],
[],
[]);
if
(
this
.
mask
)
this
.
mask
.
hide
();
//if (layout.mobile) this.loadMobileActions();
this
.
openWork
();
this
.
unLoading
();
if
(
layout
.
session
&&
layout
.
session
.
user
){
this
.
openWork
();
this
.
unLoading
();
}
else
{
if
(
layout
.
sessionPromise
){
layout
.
sessionPromise
.
then
(
function
(){
this
.
openWork
();
this
.
unLoading
();
}.
bind
(
this
),
function
(){});
}
}
// this.openWork();
// this.unLoading();
}
}.
bind
(
this
),
"
failure
"
:
function
(){}},
[
work
.
form
,
work
.
application
]);
...
...
o2web/source/x_desktop/js/base.js
浏览文件 @
85784331
...
...
@@ -122,6 +122,18 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
return
false
;
};
var
_openWorkHTML
=
function
(
options
)
{
// var uri = new URI(window.location.href);
// var redirectlink = uri.getData("redirectlink");
// if (!redirectlink) {
// redirectlink = encodeURIComponent(locate.pathname + locate.search);
// } else {
// redirectlink = encodeURIComponent(redirectlink);
// }
// if (options.workId) {
// window.location = o2.filterUrl("../x_desktop/workmobilewithaction.html?workid=" + options.workId + ((layout.debugger) ? "&debugger" : "") + "&redirectlink=" + redirectlink);
// } else if (options.workCompletedId) {
// window.location = o2.filterUrl("../x_desktop/workmobilewithaction.html?workcompletedid=" + options.workCompletedId + ((layout.debugger) ? "&debugger" : "") + "&redirectlink=" + redirectlink);
// }
var
uri
=
new
URI
(
window
.
location
.
href
);
var
redirectlink
=
uri
.
getData
(
"
redirectlink
"
);
if
(
!
redirectlink
)
{
...
...
@@ -129,11 +141,19 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
}
else
{
redirectlink
=
encodeURIComponent
(
redirectlink
);
}
if
(
options
.
workId
)
{
window
.
location
=
o2
.
filterUrl
(
"
../x_desktop/workmobilewithaction.html?workid=
"
+
options
.
workId
+
((
layout
.
debugger
)
?
"
&debugger
"
:
""
)
+
"
&redirectlink=
"
+
redirectlink
);
}
else
if
(
options
.
workCompletedId
)
{
window
.
location
=
o2
.
filterUrl
(
"
../x_desktop/workmobilewithaction.html?workcompletedid=
"
+
options
.
workCompletedId
+
((
layout
.
debugger
)
?
"
&debugger
"
:
""
)
+
"
&redirectlink=
"
+
redirectlink
);
var
docurl
=
"
../x_desktop/workmobilewithaction.html
"
.
toURI
();
if
(
options
.
draft
){
var
par
=
"
draft=
"
+
encodeURIComponent
(
JSON
.
stringify
(
options
.
draft
));
docurl
=
"
../x_desktop/workmobilewithaction.html?
"
+
par
;
}
else
{
docurl
=
docurl
.
setData
(
options
).
toString
();
}
var
job
=
(
options
.
jobid
||
options
.
jobId
||
options
.
job
);
if
(
job
)
docurl
+=
((
docurl
.
indexOf
(
"
?
"
)
!=-
1
)
?
"
&
"
:
"
?
"
)
+
"
jobid=
"
+
job
;
docurl
+=
((
redirectlink
)
?
"
&redirectlink=
"
+
redirectlink
:
""
);
docurl
+=
((
layout
.
debugger
)
?
"
&debugger
"
:
""
);
window
.
location
=
o2
.
filterUrl
(
docurl
);
};
var
_openWork
=
function
(
options
)
{
if
(
!
_openWorkAndroid
(
options
))
if
(
!
_openWorkIOS
(
options
))
_openWorkHTML
(
options
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录