Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
a8a2ae7b
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,发现更多精彩内容 >>
提交
a8a2ae7b
编写于
11月 01, 2021
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复门户页面设计dom列表无法滚动的问题
上级
1955c29e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
63 addition
and
36 deletion
+63
-36
o2web/source/x_component_portal_PageDesigner/Main.js
o2web/source/x_component_portal_PageDesigner/Main.js
+5
-6
o2web/source/x_component_process_Xform/Documenteditor.js
o2web/source/x_component_process_Xform/Documenteditor.js
+58
-30
未找到文件。
o2web/source/x_component_portal_PageDesigner/Main.js
浏览文件 @
a8a2ae7b
...
...
@@ -23,7 +23,6 @@ MWF.xApplication.portal.PageDesigner.Main = new Class({
"
processData
"
:
null
},
onQueryLoad
:
function
(){
debugger
;
this
.
shortcut
=
true
;
if
(
this
.
status
){
this
.
options
.
id
=
this
.
status
.
id
;
...
...
@@ -217,12 +216,12 @@ MWF.xApplication.portal.PageDesigner.Main = new Class({
"
V
"
:
{
"
x
"
:
0
,
"
y
"
:
0
},
"
H
"
:
{
"
x
"
:
0
,
"
y
"
:
0
}
});
MWF
.
require
(
"
MWF.widget.ScrollBar
"
,
function
(){
new
MWF
.
widget
.
ScrollBar
(
this
.
propertyDomScrollArea
,
{
"
style
"
:
"
default
"
,
"
where
"
:
"
before
"
,
"
distance
"
:
30
,
"
friction
"
:
4
,
"
indent
"
:
false
,
"
axis
"
:
{
"
x
"
:
false
,
"
y
"
:
true
}
});
}.
bind
(
this
));
}
MWF
.
require
(
"
MWF.widget.ScrollBar
"
,
function
(){
new
MWF
.
widget
.
ScrollBar
(
this
.
propertyDomScrollArea
,
{
"
style
"
:
"
default
"
,
"
where
"
:
"
before
"
,
"
distance
"
:
30
,
"
friction
"
:
4
,
"
indent
"
:
false
,
"
axis
"
:
{
"
x
"
:
false
,
"
y
"
:
true
}
});
}.
bind
(
this
));
},
initOptions
:
function
(){
this
.
toolsData
=
null
;
...
...
o2web/source/x_component_process_Xform/Documenteditor.js
浏览文件 @
a8a2ae7b
...
...
@@ -1562,42 +1562,70 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
_switchReadOrEditInline
:
function
(){
if
(
this
.
editMode
){
this
.
_readFiletext
();
if
(
this
.
allowEdit
){
if
(
!
layout
.
mobile
)
{
var
button
=
this
.
sideToolbar
.
childrenButton
[
0
];
button
.
setText
((
layout
.
mobile
)
?
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdoc_mobile
:
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdoc
);
button
.
picNode
.
getElement
(
"
img
"
).
set
(
"
src
"
,
"
../x_component_process_Xform/$Form/default/icon/editdoc.png
"
);
//this.getFullWidthFlagNode().dispose();
}
button
=
this
.
toolbar
.
childrenButton
[
0
];
button
.
setText
((
layout
.
mobile
)
?
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdoc_mobile
:
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdoc
);
button
.
picNode
.
getElement
(
"
img
"
).
set
(
"
src
"
,
"
../x_component_process_Xform/$Form/default/icon/editdoc.png
"
);
//this.getFullWidthFlagNode().dispose();
// if (!layout.mobile)this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
// this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
}
//
if (this.allowEdit){
//
if (!layout.mobile) {
//
var button = this.sideToolbar.childrenButton[0];
//
button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc);
//
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc.png");
//
//this.getFullWidthFlagNode().dispose();
//
}
//
button = this.toolbar.childrenButton[0];
//
button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc);
//
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc.png");
//
//this.getFullWidthFlagNode().dispose();
//
//
//
// if (!layout.mobile)this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
//
// this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
//
}
this
.
editMode
=
false
;
//this.form.saveFormData();
}
else
{
this
.
_editFiletext
(
"
inline
"
);
if
(
this
.
loadFileTextEditFun
)
this
.
layout_filetext
.
removeEvent
(
"
click
"
,
this
.
loadFileTextEditFun
);
if
(
this
.
allowEdit
){
if
(
!
layout
.
mobile
)
{
var
button
=
this
.
sideToolbar
.
childrenButton
[
0
];
button
.
setText
((
layout
.
mobile
)
?
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdocCompleted_mobile
:
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdocCompleted
);
button
.
picNode
.
getElement
(
"
img
"
).
set
(
"
src
"
,
"
../x_component_process_Xform/$Form/default/icon/editdoc_completed.png
"
);
//this.toolbar.node.inject(this.getFullWidthFlagNode());
}
button
=
this
.
toolbar
.
childrenButton
[
0
];
button
.
setText
((
layout
.
mobile
)
?
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdocCompleted_mobile
:
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdocCompleted
);
button
.
picNode
.
getElement
(
"
img
"
).
set
(
"
src
"
,
"
../x_component_process_Xform/$Form/default/icon/editdoc_completed.png
"
);
//this.toolbar.node.inject(this.getFullWidthFlagNode());
// if (!layout.mobile) this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
// this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
}
// if (this.allowEdit){
// if (!layout.mobile) {
// var button = this.sideToolbar.childrenButton[0];
// button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted);
// button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc_completed.png");
// //this.toolbar.node.inject(this.getFullWidthFlagNode());
// }
// button = this.toolbar.childrenButton[0];
// button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted);
// button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc_completed.png");
// //this.toolbar.node.inject(this.getFullWidthFlagNode());
// // if (!layout.mobile) this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
// // this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
// }
this
.
editMode
=
true
;
}
this
.
_switchButtonText
();
},
_switchButtonText
:
function
(){
var
text
=
(
layout
.
mobile
)
?
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdoc_mobile
:
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdoc
;
var
img
=
"
editdoc.png
"
;
if
(
this
.
editMode
){
text
=
(
layout
.
mobile
)
?
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdocCompleted_mobile
:
MWF
.
xApplication
.
process
.
Xform
.
LP
.
editdocCompleted
;
img
=
"
editdoc_completed.png
"
;
}
if
(
!
layout
.
mobile
&&
this
.
sideToolbar
&&
this
.
sideToolbar
.
childrenButton
[
0
])
{
var
button
=
this
.
sideToolbar
.
childrenButton
[
0
];
button
.
setText
(
text
);
button
.
picNode
.
getElement
(
"
img
"
).
set
(
"
src
"
,
"
../x_component_process_Xform/$Form/default/icon/
"
+
img
);
}
if
(
this
.
toolbar
&&
this
.
toolbar
.
childrenButton
[
0
]){
button
=
this
.
toolbar
.
childrenButton
[
0
];
button
.
setText
(
text
);
button
.
picNode
.
getElement
(
"
img
"
).
set
(
"
src
"
,
"
../x_component_process_Xform/$Form/default/icon/
"
+
img
);
}
},
editFiletext
:
function
(){
if
(
!
this
.
editMode
&&
this
.
allowEdit
){
this
.
_editFiletext
(
"
inline
"
);
if
(
this
.
loadFileTextEditFun
)
this
.
layout_filetext
.
removeEvent
(
"
click
"
,
this
.
loadFileTextEditFun
);
this
.
editMode
=
true
;
//this._switchButtonText();
}
},
// getFullWidthFlagNode: function(){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录