Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
3bdb430c
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,发现更多精彩内容 >>
提交
3bdb430c
编写于
10月 20, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
请求支持Promise
上级
71f9286e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
41 deletion
+51
-41
o2web/source/o2_core/o2.js
o2web/source/o2_core/o2.js
+44
-39
o2web/source/x_component_process_Xform/$Input.js
o2web/source/x_component_process_Xform/$Input.js
+7
-2
未找到文件。
o2web/source/o2_core/o2.js
浏览文件 @
3bdb430c
...
...
@@ -1379,50 +1379,55 @@
var
useWebWorker
=
(
window
.
layout
&&
layout
.
config
&&
layout
.
config
.
useWebWorker
);
//var noCache = false;
if
(
!
loadAsync
||
!
useWebWorker
){
var
res
=
new
Request
.
JSON
({
url
:
o2
.
filterUrl
(
address
),
secure
:
false
,
method
:
method
,
emulation
:
false
,
noCache
:
noCache
,
async
:
loadAsync
,
withCredentials
:
credentials
,
onSuccess
:
function
(
responseJSON
,
responseText
){
// var xToken = this.getHeader("authorization");
// if (!xToken) xToken = this.getHeader("x-token");
var
xToken
=
this
.
getHeader
(
"
x-token
"
);
if
(
xToken
){
if
(
window
.
layout
){
if
(
!
layout
.
session
)
layout
.
session
=
{};
layout
.
session
.
token
=
xToken
;
var
res
;
var
p
=
new
Promise
(
function
(
s
,
f
){
res
=
new
Request
.
JSON
({
url
:
o2
.
filterUrl
(
address
),
secure
:
false
,
method
:
method
,
emulation
:
false
,
noCache
:
noCache
,
async
:
loadAsync
,
withCredentials
:
credentials
,
onSuccess
:
function
(
responseJSON
,
responseText
){
// var xToken = this.getHeader("authorization");
// if (!xToken) xToken = this.getHeader("x-token");
var
xToken
=
this
.
getHeader
(
"
x-token
"
);
if
(
xToken
){
if
(
window
.
layout
){
if
(
!
layout
.
session
)
layout
.
session
=
{};
layout
.
session
.
token
=
xToken
;
}
}
o2
.
runCallback
(
callback
,
"
success
"
,
[
responseJSON
]);
},
onFailure
:
function
(
xhr
){
o2
.
runCallback
(
callback
,
"
requestFailure
"
,
[
xhr
]);
}.
bind
(
this
),
onError
:
function
(
text
,
error
){
o2
.
runCallback
(
callback
,
"
error
"
,
[
text
,
error
]);
}.
bind
(
this
)
});
res
.
setHeader
(
"
Content-Type
"
,
"
application/json; charset=utf-8
"
);
res
.
setHeader
(
"
Accept
"
,
"
text/html,application/json,*/*
"
);
if
(
window
.
layout
)
{
if
(
layout
[
"
debugger
"
]){
res
.
setHeader
(
"
x-debugger
"
,
"
true
"
);
}
o2
.
runCallback
(
callback
,
"
success
"
,
[
responseJSON
]);
},
onFailure
:
function
(
xhr
){
o2
.
runCallback
(
callback
,
"
requestFailure
"
,
[
xhr
]);
}.
bind
(
this
),
onError
:
function
(
text
,
error
){
o2
.
runCallback
(
callback
,
"
error
"
,
[
text
,
error
]);
}.
bind
(
this
)
});
res
.
setHeader
(
"
Content-Type
"
,
"
application/json; charset=utf-8
"
);
res
.
setHeader
(
"
Accept
"
,
"
text/html,application/json,*/*
"
);
if
(
window
.
layout
)
{
if
(
layout
[
"
debugger
"
]){
res
.
setHeader
(
"
x-debugger
"
,
"
true
"
);
}
if
(
layout
.
session
&&
layout
.
session
.
user
){
if
(
layout
.
session
.
user
.
token
)
{
res
.
setHeader
(
"
x-token
"
,
layout
.
session
.
user
.
token
);
res
.
setHeader
(
"
authorization
"
,
layout
.
session
.
user
.
token
);
if
(
layout
.
session
&&
layout
.
session
.
user
){
if
(
layout
.
session
.
user
.
token
)
{
res
.
setHeader
(
"
x-token
"
,
layout
.
session
.
user
.
token
);
res
.
setHeader
(
"
authorization
"
,
layout
.
session
.
user
.
token
);
}
}
}
}
//Content-Type application/x-www-form-urlencoded; charset=utf-8
res
.
send
(
data
);
//Content-Type application/x-www-form-urlencoded; charset=utf-8
res
.
send
(
data
);
}.
bind
(
this
));
var
oReturn
=
(
callback
.
success
&&
callback
.
success
.
isAG
)
?
callback
.
success
:
callback
;
var
oReturn
=
p
;
oReturn
.
res
=
res
;
return
oReturn
;
}
else
{
...
...
o2web/source/x_component_process_Xform/$Input.js
浏览文件 @
3bdb430c
...
...
@@ -192,10 +192,12 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class({
_setValue
:
function
(
value
){
debugger
;
if
(
value
&&
value
.
isAG
){
this
.
moduleValueAG
=
o2
.
AG
.
all
(
value
).
then
(
function
(
v
){
var
ag
=
o2
.
AG
.
all
(
value
).
then
(
function
(
v
){
if
(
o2
.
typeOf
(
v
)
==
"
array
"
)
v
=
v
[
0
];
this
.
__setValue
(
v
);
}.
bind
(
this
));
this
.
moduleValueAG
=
ag
;
ag
.
then
()
}
else
{
Promise
.
resolve
(
value
).
then
(
function
(
v
){
this
.
__setValue
(
v
);
...
...
@@ -267,7 +269,10 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class({
this
.
__setData
(
v
);
}.
bind
(
this
));
}
else
{
this
.
__setData
(
data
);
Promise
.
resolve
(
data
).
then
(
function
(
v
){
this
.
__setValue
(
v
);
}.
bind
(
this
));
//this.__setData(data);
}
},
__setData
:
function
(
data
){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录