Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
785ff378
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,发现更多精彩内容 >>
提交
785ff378
编写于
11月 25, 2021
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复日期选择框定位的问题
上级
e9a88aeb
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
102 addition
and
41 deletion
+102
-41
o2web/source/o2_core/o2/widget/Calendar.js
o2web/source/o2_core/o2/widget/Calendar.js
+69
-35
o2web/source/x_component_process_Xform/Calendar.js
o2web/source/x_component_process_Xform/Calendar.js
+33
-6
未找到文件。
o2web/source/o2_core/o2/widget/Calendar.js
浏览文件 @
785ff378
...
...
@@ -486,7 +486,44 @@ o2.widget.Calendar = o2.Calendar = new Class({
// }
this
.
container
.
setStyle
(
"
display
"
,
"
block
"
);
this
.
setPosition
();
// var p = this.container.getPosition();
// var s = this.container.getSize();
// var zidx = this.container.getStyle("z-index");
// this.iframe = new Element("iframe", {"styles":{
// "border": "0px",
// "margin": "0px",
// "padding": "0px",
// "opacity": 0,
// "z-index": (zidx) ? zidx-1 : 0,
// "top": ""+p.y+"px",
// "left": ""+p.x+"px",
// "width": ""+s.x+"px",
// "height": ""+s.y+"px",
// "position": "absolute"
// }}).inject(this.container, "before");
if
(
layout
.
desktop
.
offices
){
Object
.
each
(
layout
.
desktop
.
offices
,
function
(
office
){
if
(
this
.
container
.
isOverlap
(
office
.
officeNode
)){
office
.
hide
();
}
}.
bind
(
this
));
}
if
(
this
.
maskNode
){
this
.
maskNode
.
show
();
}
// this.morph.start({"opacity": 1}).chain(function(){
this
.
visible
=
true
;
// }.bind(this));
this
.
fireEvent
(
"
show
"
);
}
},
setPosition
:
function
(){
if
(
this
.
container
.
position
&&
(
!
layout
||
!
layout
.
userLayout
||
!
layout
.
userLayout
.
scale
||
!
layout
.
userLayout
.
scale
===
1
)
){
var
postY
=
"
bottom
"
;
var
postX
=
"
left
"
;
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
bottomLeft
'
,
...
...
@@ -501,12 +538,41 @@ o2.widget.Calendar = o2.Calendar = new Class({
//if (cp.y+cSize.y>fsize.y+fp.y){
if
(
cp
.
y
+
cSize
.
y
>
fsize
.
y
){
// this.container.position({
// relativeTo: this.node,
// position: 'upperLeft',
// edge: 'bottomLeft'
// });
postY
=
"
upper
"
;
}
if
(
cp
.
x
+
cSize
.
x
>
fsize
.
x
){
postX
=
"
right
"
;
}
if
(
postY
===
"
upper
"
&&
postX
===
"
left
"
){
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
upperLeft
'
,
edge
:
'
bottomLeft
'
});
}
else
if
(
postX
===
"
right
"
){
if
(
postY
===
"
bottom
"
){
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
bottomRight
'
,
edge
:
'
upperRight
'
});
}
else
{
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
upperRight
'
,
edge
:
'
bottomRight
'
});
}
}
this
.
postY
=
postY
;
this
.
postX
=
postX
;
}
else
{
var
p
=
this
.
node
.
getPosition
(
this
.
options
.
target
||
null
);
var
size
=
this
.
node
.
getSize
();
...
...
@@ -521,38 +587,6 @@ o2.widget.Calendar = o2.Calendar = new Class({
this
.
container
.
setStyle
(
"
top
"
,
p
.
y
+
size
.
y
+
2
);
this
.
container
.
setStyle
(
"
left
"
,
left
);
}
// var p = this.container.getPosition();
// var s = this.container.getSize();
// var zidx = this.container.getStyle("z-index");
// this.iframe = new Element("iframe", {"styles":{
// "border": "0px",
// "margin": "0px",
// "padding": "0px",
// "opacity": 0,
// "z-index": (zidx) ? zidx-1 : 0,
// "top": ""+p.y+"px",
// "left": ""+p.x+"px",
// "width": ""+s.x+"px",
// "height": ""+s.y+"px",
// "position": "absolute"
// }}).inject(this.container, "before");
if
(
layout
.
desktop
.
offices
){
Object
.
each
(
layout
.
desktop
.
offices
,
function
(
office
){
if
(
this
.
container
.
isOverlap
(
office
.
officeNode
)){
office
.
hide
();
}
}.
bind
(
this
));
}
if
(
this
.
maskNode
){
this
.
maskNode
.
show
();
}
// this.morph.start({"opacity": 1}).chain(function(){
this
.
visible
=
true
;
// }.bind(this));
this
.
fireEvent
(
"
show
"
);
}
},
showYear
:
function
(
year
){
var
thisYear
=
(
year
!=
undefined
)
?
year
:
this
.
options
.
baseDate
.
getFullYear
();
...
...
o2web/source/x_component_process_Xform/Calendar.js
浏览文件 @
785ff378
...
...
@@ -176,12 +176,39 @@ MWF.xApplication.process.Xform.Calendar = MWF.APPCalendar = new Class(
if
(
overflow
===
"
auto
"
||
overflow
===
"
scroll
"
||
overflowY
===
"
auto
"
||
overflowY
===
"
scroll
"
){
_self
.
scrollFun
=
function
(
e
){
if
(
this
.
container
.
position
)
{
if
(
this
.
postX
===
"
right
"
){
if
(
this
.
postY
===
"
bottom
"
){
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
bottomRight
'
,
edge
:
'
upperRight
'
,
allowNegative
:
true
});
}
else
{
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
upperRight
'
,
edge
:
'
bottomRight
'
,
allowNegative
:
true
});
}
}
else
{
if
(
this
.
postY
===
"
bottom
"
)
{
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
bottomLeft
'
,
edge
:
'
upperLeft
'
,
allowNegative
:
true
allowNegative
:
true
});
}
else
{
this
.
container
.
position
({
relativeTo
:
this
.
node
,
position
:
'
upperLeft
'
,
edge
:
'
bottomLeft
'
,
allowNegative
:
true
});
}
}
}
}.
bind
(
this
);
_self
.
scrollParentNode
=
parent
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录