Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
f56cafcd
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,发现更多精彩内容 >>
提交
f56cafcd
编写于
5月 13, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
自定义提交
上级
e700ebb6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
39 addition
and
15 deletion
+39
-15
o2web/source/o2_core/o2/xDesktop/Dialog.js
o2web/source/o2_core/o2/xDesktop/Dialog.js
+19
-6
o2web/source/x_component_process_Work/Processor.js
o2web/source/x_component_process_Work/Processor.js
+12
-2
o2web/source/x_component_process_Xform/Form.js
o2web/source/x_component_process_Xform/Form.js
+8
-7
未找到文件。
o2web/source/o2_core/o2/xDesktop/Dialog.js
浏览文件 @
f56cafcd
...
...
@@ -317,6 +317,14 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
(
node
.
getStyle
(
"
border-left-width
"
).
toInt
()
||
0
)
+
(
node
.
getStyle
(
"
border-right-width
"
).
toInt
()
||
0
);
},
getMarginY
:
function
(
node
){
return
(
node
.
getStyle
(
"
margin-top
"
).
toInt
()
||
0
)
+
(
node
.
getStyle
(
"
margin-bottom
"
).
toInt
()
||
0
);
},
getMarginX
:
function
(
node
){
return
(
node
.
getStyle
(
"
margin-left
"
).
toInt
()
||
0
)
+
(
node
.
getStyle
(
"
margin-right
"
).
toInt
()
||
0
);
},
setContentHeightAuto
:
function
(){
var
maxHeight
=
this
.
getMaxHeight
();
...
...
@@ -327,7 +335,7 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
if
(
this
.
bottom
)
offsetY
=
offsetY
+
this
.
getOffsetY
(
this
.
bottom
)
+
this
.
bottom
.
getSize
().
y
;
if
(
this
.
button
&&
!
this
.
buttonDisable
)
offsetY
=
offsetY
+
this
.
getOffsetY
(
this
.
button
)
+
this
.
button
.
getSize
().
y
;
if
(
this
.
content
){
offsetY
=
offsetY
+
this
.
get
Offset
Y
(
this
.
content
);
offsetY
=
offsetY
+
this
.
get
Margin
Y
(
this
.
content
);
y
=
offsetY
+
this
.
content
.
getSize
().
y
;
}
else
{
y
=
offsetY
;
...
...
@@ -379,6 +387,10 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
if
(
typeOf
(
maxHeightPercent
)
===
"
string
"
&&
maxHeightPercent
.
substr
(
maxHeightPercent
.
length
-
1
,
1
)
===
"
%
"
)
{
var
containerHeight
=
(
this
.
options
.
positionNode
||
this
.
options
.
container
||
$
(
document
.
body
)).
getSize
().
y
;
maxHeightPercent
=
parseInt
(
containerHeight
*
parseInt
(
maxHeightPercent
)
/
100
);
if
(
maxHeightPercent
+
(
this
.
options
.
minTop
||
0
)
>
containerHeight
){
maxHeightPercent
=
containerHeight
-
(
this
.
options
.
minTop
)
}
}
}
...
...
@@ -644,7 +656,7 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
var
offsetX
=
0
;
var
x
=
0
;
if
(
this
.
content
){
offsetX
=
offsetX
+
this
.
get
Offset
X
(
this
.
content
);
offsetX
=
offsetX
+
this
.
get
Margin
X
(
this
.
content
);
x
=
offsetX
+
this
.
content
.
getSize
().
x
;
}
else
{
x
=
offsetX
;
...
...
@@ -663,10 +675,11 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
this
.
node
.
setStyles
({
"
width
"
:
maxWidth
});
this
.
contentWidth
=
maxWidth
-
offsetX
;
this
.
contentWidth
=
maxWidth
-
this
.
getOffsetX
(
this
.
content
);
if
(
this
.
content
)
{
this
.
content
.
setStyles
({
"
width
"
:
maxWidth
-
offsetX
,
"
width
"
:
this
.
contentWidth
,
"
overflow-x
"
:
"
auto
"
})
}
...
...
@@ -682,10 +695,10 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
this
.
node
.
setStyles
({
"
width
"
:
x
});
this
.
contentWidth
=
x
-
offsetX
;
this
.
contentWidth
=
x
-
this
.
getOffsetX
(
this
.
content
)
;
if
(
this
.
content
)
{
this
.
content
.
setStyles
({
"
width
"
:
x
-
offsetX
,
"
width
"
:
this
.
contentWidth
,
"
overflow-x
"
:
"
hidden
"
})
}
...
...
o2web/source/x_component_process_Work/Processor.js
浏览文件 @
f56cafcd
...
...
@@ -216,6 +216,7 @@ MWF.xApplication.process.Work.Processor = new Class({
list
.
push
(
this
.
splitByStartNumber
(
k
).
name
)
}.
bind
(
this
));
var
flag
=
false
;
list
.
each
(
function
(
routeGroupName
){
var
routeList
=
this
.
routeGroupObject
[
routeGroupName
];
var
routeGroupNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
routeGroupNode
,
"
text
"
:
routeGroupName
}).
inject
(
this
.
routeGroupArea
);
...
...
@@ -231,9 +232,12 @@ MWF.xApplication.process.Work.Processor = new Class({
if
(
keys
.
length
===
1
){
this
.
selectRouteGroup
(
routeGroupNode
);
}
else
{
this
.
setSize
(
0
)
;
flag
=
true
;
}
}.
bind
(
this
))
if
(
flag
){
this
.
setSize
(
0
);
}
},
overRouteGroup
:
function
(
node
){
if
(
this
.
selectedRouteGroup
){
...
...
@@ -321,6 +325,7 @@ MWF.xApplication.process.Work.Processor = new Class({
//this.task.routeNameList = ["送审核", "送办理", "送公司领导阅"];
if
(
!
routeList
)
routeList
=
this
.
getRouteDataList
();
//this.task.routeNameList.each(function(route, i){
var
flag
=
false
;
routeList
.
each
(
function
(
route
,
i
){
if
(
route
.
hiddenScriptText
&&
this
.
form
&&
this
.
form
.
Macro
){
if
(
this
.
form
.
Macro
.
exec
(
route
.
hiddenScriptText
,
this
).
toString
()
===
"
true
"
)
return
;
...
...
@@ -344,10 +349,13 @@ MWF.xApplication.process.Work.Processor = new Class({
if
(
routeList
.
length
==
1
||
route
.
sole
){
//sole表示优先路由
this
.
selectRoute
(
routeNode
);
}
else
{
this
.
setSize
(
0
)
;
flag
=
true
;
}
}.
bind
(
this
));
if
(
flag
){
this
.
setSize
(
0
);
}
},
overRoute
:
function
(
node
){
if
(
this
.
selectedRoute
){
...
...
@@ -1389,6 +1397,7 @@ MWF.xApplication.process.Work.Processor = new Class({
//if( this.buttonsArea )height = height + this.getOffsetY(this.buttonsArea) + this.buttonsArea.getStyle("height").toInt();
if
(
lines
>
0
){
if
(
this
.
orgsArea
)
this
.
orgsArea
.
show
();
if
(
this
.
orgsTile
)
height
=
height
+
this
.
getOffsetY
(
this
.
orgsTile
)
+
this
.
orgsTile
.
getStyle
(
"
height
"
).
toInt
();
height
=
height
+
lines
*
this
.
options
.
orgHeight
+
this
.
getOffsetY
(
this
.
orgsArea
);
this
.
node
.
setStyle
(
"
height
"
,
height
);
...
...
@@ -1396,6 +1405,7 @@ MWF.xApplication.process.Work.Processor = new Class({
//flag = (lines*this.options.orgHeight + 431) > Math.floor( this.form.app.content.getSize().y * 0.9);
//this.node.store("height", Math.min( Math.floor( this.form.app.content.getSize().y * 0.9) , lines*this.options.orgHeight + 431 ));
}
else
{
if
(
this
.
orgsArea
)
this
.
orgsArea
.
hide
();
this
.
node
.
setStyle
(
"
height
"
,
height
);
//this.node.store("height", 401 );
}
...
...
o2web/source/x_component_process_Xform/Form.js
浏览文件 @
f56cafcd
...
...
@@ -1763,14 +1763,15 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
"
height
"
:
size
.
y
,
"
width
"
:
size
.
x
});
debugger
;
var
s
=
dlg
.
setContentSize
();
if
(
dlg
.
content
.
getStyle
(
"
overflow-y
"
)
===
"
auto
"
&&
dlg
.
content
.
getStyle
(
"
overflow-x
"
)
!==
"
auto
"
)
{
var
paddingRight
=
(
dlg
.
content
.
getStyle
(
"
padding-right
"
).
toInt
()
||
0
);
if
(
paddingRight
<
20
){
dlg
.
node
.
setStyle
(
"
width
"
,
dlg
.
node
.
getStyle
(
"
width
"
).
toInt
()
+
20
+
"
px
"
);
dlg
.
content
.
setStyle
(
"
width
"
,
dlg
.
content
.
getStyle
(
"
width
"
).
toInt
()
+
20
+
"
px
"
);
}
}
// if ( dlg.content.getStyle("overflow-y") === "auto" && dlg.content.getStyle("overflow-x") !== "auto"
) {
//
var paddingRight = (dlg.content.getStyle("padding-right").toInt() || 0 );
//
if( paddingRight < 20 ){
//
dlg.node.setStyle("width", dlg.node.getStyle("width").toInt() + 20 + "px");
//
dlg.content.setStyle("width", dlg.content.getStyle("width").toInt() + 20 + "px");
//
}
//
}
if
(
!
notRecenter
)
dlg
.
reCenter
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录