Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
4daa21c3
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,发现更多精彩内容 >>
提交
4daa21c3
编写于
7月 12, 2021
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复流程表单人员卡片无职务的问题,首页会议结束事件不正确的问题、脚本编辑器缩放的问题
上级
51dbe325
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
4 deletion
+16
-4
o2web/source/o2_core/o2/widget/O2Identity.js
o2web/source/o2_core/o2/widget/O2Identity.js
+4
-1
o2web/source/x_component_Homepage/MeetingContent.js
o2web/source/x_component_Homepage/MeetingContent.js
+2
-2
o2web/source/x_component_process_ProcessDesigner/widget/ScriptText.js
.../x_component_process_ProcessDesigner/widget/ScriptText.js
+10
-1
未找到文件。
o2web/source/o2_core/o2/widget/O2Identity.js
浏览文件 @
4daa21c3
...
...
@@ -239,8 +239,11 @@ o2.widget.O2Identity = new Class({
o2
.
widget
.
O2Person
=
new
Class
({
Extends
:
o2
.
widget
.
O2Identity
,
options
:
{
"
lazy
"
:
true
},
getPersonData
:
function
(){
if
(
!
this
.
data
.
distinguishedName
){
if
(
!
this
.
data
.
distinguishedName
||
!
this
.
data
.
dutys
){
this
.
action
.
actions
=
{
"
getPerson
"
:
{
"
uri
"
:
"
/jaxrs/person/{id}
"
}};
this
.
action
.
invoke
({
"
name
"
:
"
getPerson
"
,
"
async
"
:
false
,
"
parameter
"
:
{
"
id
"
:
(
this
.
data
.
id
||
this
.
data
.
name
)},
"
success
"
:
function
(
json
){
this
.
data
=
json
.
data
;
...
...
o2web/source/x_component_Homepage/MeetingContent.js
浏览文件 @
4daa21c3
...
...
@@ -135,7 +135,7 @@ MWF.xApplication.Homepage.MeetingContent.MeetingInvited = new Class({
var
start
=
(
new
Date
()).
parse
(
d
.
startTime
);
var
completed
=
(
new
Date
()).
parse
(
d
.
completedTime
);
var
startStr
=
start
.
format
(
"
%Y-%m-%d %H:%M
"
);
var
completedStr
=
start
.
format
(
"
%H:%M
"
);
var
completedStr
=
completed
.
format
(
"
%H:%M
"
);
timeNode
.
set
(
"
html
"
,
this
.
app
.
lp
.
meetingTime
+
"
: <span style='color: #999999'>
"
+
startStr
+
"
-
"
+
completedStr
+
"
<span>
"
);
var
locationNode
=
new
Element
(
"
div.o2_homepage_meeting_item_location
"
).
inject
(
inforArea
);
...
...
@@ -248,7 +248,7 @@ MWF.xApplication.Homepage.MeetingContent.Meeting = new Class({
var
start
=
(
new
Date
()).
parse
(
d
.
startTime
);
var
completed
=
(
new
Date
()).
parse
(
d
.
completedTime
);
var
startStr
=
start
.
format
(
"
%Y-%m-%d %H:%M
"
);
var
completedStr
=
start
.
format
(
"
%H:%M
"
);
var
completedStr
=
completed
.
format
(
"
%H:%M
"
);
timeNode
.
set
(
"
html
"
,
this
.
app
.
lp
.
meetingTime
+
"
: <span style='color: #999999'>
"
+
startStr
+
"
-
"
+
completedStr
+
"
<span>
"
);
var
locationNode
=
new
Element
(
"
div.o2_homepage_meeting_item_location
"
).
inject
(
inforArea
);
...
...
o2web/source/x_component_process_ProcessDesigner/widget/ScriptText.js
浏览文件 @
4daa21c3
...
...
@@ -111,6 +111,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ScriptText = new Class({
this
.
scriptReferenceMenu
.
menu
.
showIm
(
e
);
},
maxSize
:
function
()
{
var
areaSize
=
this
.
areaNode
.
getSize
();
this
.
originAreaWidth
=
areaSize
.
x
;
this
.
originAreaHeight
=
areaSize
.
y
;
if
(
!
this
.
options
.
maxObj
){
this
.
areaNode
.
setStyles
({
"
width
"
:
"
100%
"
,
...
...
@@ -155,7 +158,13 @@ MWF.xApplication.process.ProcessDesigner.widget.ScriptText = new Class({
returnSize
:
function
(){
this
.
areaNode
.
setStyles
(
this
.
css
.
areaNode
);
this
.
areaNode
.
inject
(
this
.
node
);
if
(
this
.
options
.
height
)
this
.
areaNode
.
setStyle
(
"
height
"
,
""
+
this
.
options
.
height
+
"
px
"
);
this
.
areaNode
.
setStyle
(
"
width
"
,
""
+
this
.
originAreaWidth
+
"
px
"
);
if
(
this
.
options
.
height
)
{
this
.
areaNode
.
setStyle
(
"
height
"
,
""
+
this
.
options
.
height
+
"
px
"
);
}
else
{
this
.
areaNode
.
setStyle
(
"
height
"
,
""
+
this
.
originAreaHeight
+
"
px
"
);
}
this
.
resizeEditor
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录