Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
77897ae6
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
77897ae6
编写于
10月 19, 2022
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
在登录界面展现之前加个心跳测试,正确判断后台服务能否访问
上级
87b5f0d5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
61 addition
and
43 deletion
+61
-43
o2web/source/o2_core/o2/lp/en.js
o2web/source/o2_core/o2/lp/en.js
+2
-1
o2web/source/o2_core/o2/lp/zh-cn.js
o2web/source/o2_core/o2/lp/zh-cn.js
+2
-1
o2web/source/o2_core/o2/xDesktop/Authentication.js
o2web/source/o2_core/o2/xDesktop/Authentication.js
+55
-39
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+2
-2
未找到文件。
o2web/source/o2_core/o2/lp/en.js
浏览文件 @
77897ae6
...
...
@@ -504,7 +504,8 @@ o2.LP.authentication = {
"
inputYourNewPassword
"
:
"
Enter a new password
"
,
"
changePasswordSuccess
"
:
"
Successfully change password
"
,
"
userAppCameraHtml
"
:
"
<div>open <div styles='bindTipLinkArea'>APP </div> and scan</div>
"
,
"
loginToPage
"
:
"
Login to the page
"
"
loginToPage
"
:
"
Login to the page
"
,
"
accessError
"
:
"
Failed to access background service
"
};
o2
.
LP
.
script
=
{
...
...
o2web/source/o2_core/o2/lp/zh-cn.js
浏览文件 @
77897ae6
...
...
@@ -510,7 +510,8 @@ o2.LP.authentication = {
"
inputYourNewPassword
"
:
"
请输入新密码
"
,
"
changePasswordSuccess
"
:
"
修改密码成功
"
,
"
userAppCameraHtml
"
:
"
<div>打开<div styles='bindTipLinkArea'>APP</div>扫一扫</div>
"
,
"
loginToPage
"
:
"
登录网页版
"
"
loginToPage
"
:
"
登录网页版
"
,
"
accessError
"
:
"
访问后台服务失败
"
};
o2
.
LP
.
script
=
{
...
...
o2web/source/o2_core/o2/xDesktop/Authentication.js
浏览文件 @
77897ae6
...
...
@@ -46,46 +46,62 @@ MWF.xDesktop.Authentication = new Class({
},
loadLogin
:
function
(
node
)
{
if
(
node
)
this
.
loginNode
=
node
;
if
(
!
node
&&
this
.
loginNode
)
node
=
this
.
loginNode
;
if
(
layout
.
config
.
loginPage
&&
layout
.
config
.
loginPage
.
enable
&&
layout
.
config
.
loginPage
.
portal
)
{
MWF
.
xDesktop
.
loadPortal
(
layout
.
config
.
loginPage
.
portal
,
this
.
options
.
loginParameter
);
this
.
fireEvent
(
"
openLogin
"
);
}
else
{
this
.
popupOptions
=
{
"
draggable
"
:
false
,
"
closeAction
"
:
false
,
"
hasMask
"
:
false
,
"
relativeToApp
"
:
false
};
this
.
popupPara
=
{
container
:
node
};
this
.
postLogin
=
function
(
json
)
{
layout
.
desktop
.
session
.
user
=
json
.
data
;
layout
.
session
.
user
=
json
.
data
;
layout
.
session
.
token
=
layout
.
session
.
user
.
token
;
var
user
=
layout
.
desktop
.
session
.
user
;
if
(
!
user
.
identityList
)
user
.
identityList
=
[];
if
(
user
.
roleList
)
{
var
userRoleName
=
[];
user
.
roleList
.
each
(
function
(
role
)
{
userRoleName
.
push
(
role
.
substring
(
0
,
role
.
indexOf
(
"
@
"
)));
});
user
.
roleList
=
user
.
roleList
.
concat
(
userRoleName
);
}
var
roleLCList
=
(
user
.
roleList
||
[]).
map
(
function
(
role
){
return
role
.
toLowerCase
();
}.
bind
(
this
));
if
(
roleLCList
.
isIntersect
([
"
systemmanager
"
,
"
securitymanager
"
,
"
auditmanager
"
])
){
window
.
location
=
"
../x_desktop/app.html?app=ThreeMember
"
;
}
else
{
window
.
location
.
reload
();
o2
.
Actions
.
load
(
"
x_organization_assemble_authentication
"
).
EchoAction
.
get
(
function
()
{
if
(
node
)
this
.
loginNode
=
node
;
if
(
!
node
&&
this
.
loginNode
)
node
=
this
.
loginNode
;
if
(
layout
.
config
.
loginPage
&&
layout
.
config
.
loginPage
.
enable
&&
layout
.
config
.
loginPage
.
portal
)
{
MWF
.
xDesktop
.
loadPortal
(
layout
.
config
.
loginPage
.
portal
,
this
.
options
.
loginParameter
);
this
.
fireEvent
(
"
openLogin
"
);
}
else
{
this
.
popupOptions
=
{
"
draggable
"
:
false
,
"
closeAction
"
:
false
,
"
hasMask
"
:
false
,
"
relativeToApp
"
:
false
};
this
.
popupPara
=
{
container
:
node
};
this
.
postLogin
=
function
(
json
)
{
layout
.
desktop
.
session
.
user
=
json
.
data
;
layout
.
session
.
user
=
json
.
data
;
layout
.
session
.
token
=
layout
.
session
.
user
.
token
;
var
user
=
layout
.
desktop
.
session
.
user
;
if
(
!
user
.
identityList
)
user
.
identityList
=
[];
if
(
user
.
roleList
)
{
var
userRoleName
=
[];
user
.
roleList
.
each
(
function
(
role
)
{
userRoleName
.
push
(
role
.
substring
(
0
,
role
.
indexOf
(
"
@
"
)));
});
user
.
roleList
=
user
.
roleList
.
concat
(
userRoleName
);
}
var
roleLCList
=
(
user
.
roleList
||
[]).
map
(
function
(
role
)
{
return
role
.
toLowerCase
();
}.
bind
(
this
));
if
(
roleLCList
.
isIntersect
([
"
systemmanager
"
,
"
securitymanager
"
,
"
auditmanager
"
]))
{
window
.
location
=
"
../x_desktop/app.html?app=ThreeMember
"
;
}
else
{
window
.
location
.
reload
();
}
}.
bind
(
this
);
this
.
openLoginForm
(
this
.
popupOptions
);
this
.
fireEvent
(
"
openLogin
"
);
}
}.
bind
(
this
),
function
(
xhr
)
{
var
message
;
if
(
xhr
)
{
try
{
var
responseJSON
=
JSON
.
parse
(
xhr
.
responseText
);
message
=
responseJSON
.
message
;
//message为错误提示文本
}
catch
(
e
)
{
}
}.
bind
(
this
);
this
.
openLoginForm
(
this
.
popupOptions
);
this
.
fireEvent
(
"
openLogin
"
);
}
}
if
(
!
message
)
message
=
MWF
.
LP
.
authentication
.
accessError
;
new
Element
(
"
div
"
,
{
"
style
"
:
"
font-size:16px;font-weight:bold;
"
,
"
text
"
:
message
}).
inject
(
node
);
}.
bind
(
this
));
},
safeLogout
:
function
(){
o2
.
Actions
.
get
(
"
x_organization_assemble_authentication
"
).
safeLogout
(
function
()
{
...
...
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
77897ae6
...
...
@@ -2786,13 +2786,13 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
var
actionNode
=
new
Element
(
"
div
"
,
{
"
id
"
:
tool
.
id
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFButtonImage
"
:
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
iconPath
+
tool
.
img
,
"
MWFButtonImage
"
:
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
iconPath
+
tool
.
img
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
"
runCustomAction
"
,
"
MWFButtonText
"
:
tool
.
text
}).
inject
(
node
);
if
(
this
.
json
.
customIconOverStyle
){
actionNode
.
set
(
"
MWFButtonImageOver
"
,
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
this
.
json
.
customIconOverStyle
+
"
/
"
+
tool
.
img
);
actionNode
.
set
(
"
MWFButtonImageOver
"
,
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
this
.
json
.
customIconOverStyle
+
"
/
"
+
tool
.
img
);
}
if
(
tool
.
properties
){
actionNode
.
set
(
tool
.
properties
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录