Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
d749199e
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,发现更多精彩内容 >>
提交
d749199e
编写于
2月 26, 2021
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/close_all' into 'wrdp'
关闭全部bug修复 See merge request o2oa/o2oa!3050
上级
06e8f834
dc4e1a24
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
49 deletion
+35
-49
o2web/source/o2_core/o2/xDesktop/Default.js
o2web/source/o2_core/o2/xDesktop/Default.js
+31
-25
o2web/source/x_component_process_Xform/Documenteditor.js
o2web/source/x_component_process_Xform/Documenteditor.js
+4
-24
未找到文件。
o2web/source/o2_core/o2/xDesktop/Default.js
浏览文件 @
d749199e
...
...
@@ -1233,7 +1233,6 @@ o2.xDesktop.Default.StartMenu = new Class({
},
loadApplicationsItem
:
function
(
layoutJson
,
componentJson
,
portalJson
){
debugger
;
var
user
=
this
.
layout
.
session
.
user
;
var
currentNames
=
[
user
.
name
,
user
.
distinguishedName
,
user
.
id
,
user
.
unique
];
if
(
user
.
roleList
)
currentNames
=
currentNames
.
concat
(
user
.
roleList
);
...
...
@@ -1261,44 +1260,51 @@ o2.xDesktop.Default.StartMenu = new Class({
if
(
d
)
json_portal
.
erase
(
d
);
}.
bind
(
this
));
}
else
{
}
else
{
var
appData
=
null
;
if
(
!
appData
&&
json_layout
&&
json_layout
.
length
){
appData
=
json_layout
.
find
(
function
(
i
){
return
(
i
.
id
===
app
.
id
);
});
if
(
appData
){
if
(
!
appData
&&
json_layout
&&
json_layout
.
length
)
{
appData
=
json_layout
.
find
(
function
(
i
)
{
return
(
i
.
id
===
app
.
id
);
});
if
(
appData
)
{
json_layout
.
erase
(
appData
);
if
(
this
.
checkMenuItem
(
appData
,
currentNames
)
)
this
.
createApplicationMenuItem
(
appData
);
if
(
this
.
checkMenuItem
(
appData
,
currentNames
)
)
this
.
createApplicationMenuItem
(
appData
);
}
}
if
(
!
appData
&&
json_component
&&
json_component
.
length
){
appData
=
json_component
.
find
(
function
(
i
){
return
(
i
.
id
===
app
.
id
);
});
if
(
appData
){
if
(
!
appData
&&
json_component
&&
json_component
.
length
)
{
appData
=
json_component
.
find
(
function
(
i
)
{
return
(
i
.
id
===
app
.
id
);
});
if
(
appData
)
{
json_component
.
erase
(
appData
);
if
(
this
.
checkMenuItem
(
appData
,
currentNames
)
)
this
.
createApplicationMenuItem
(
appData
);
if
(
this
.
checkMenuItem
(
appData
,
currentNames
)
)
this
.
createApplicationMenuItem
(
appData
);
}
}
if
(
!
appData
&&
json_portal
&&
json_portal
.
length
){
appData
=
json_portal
.
find
(
function
(
i
){
return
(
i
.
id
===
app
.
id
);
});
if
(
appData
){
if
(
!
appData
&&
json_portal
&&
json_portal
.
length
)
{
appData
=
json_portal
.
find
(
function
(
i
)
{
return
(
i
.
id
===
app
.
id
);
});
if
(
appData
)
{
json_portal
.
erase
(
appData
);
appData
.
type
=
"
portal
"
;
this
.
createPortalMenuItem
(
appData
);
}
}
}.
bind
(
this
));
}
if
(
json_layout
&&
json_layout
.
length
)
json_layout
.
each
(
function
(
value
){
if
(
this
.
checkMenuItem
(
value
,
currentNames
)
)
this
.
createApplicationMenuItem
(
value
);
}
}.
bind
(
this
));
}
if
(
json_component
&&
json_component
.
length
)
json_componen
t
.
each
(
function
(
value
){
if
(
this
.
checkMenuItem
(
value
,
currentNames
)
)
this
.
createApplicationMenuItem
(
value
);
}.
bind
(
this
));
if
(
json_layout
&&
json_layout
.
length
)
json_layou
t
.
each
(
function
(
value
){
if
(
this
.
checkMenuItem
(
value
,
currentNames
)
)
this
.
createApplicationMenuItem
(
value
);
}.
bind
(
this
));
if
(
json_portal
&&
json_portal
.
length
)
json_portal
.
each
(
function
(
value
){
this
.
createPortalMenuItem
(
value
);
}.
bind
(
this
));
if
(
json_component
&&
json_component
.
length
)
json_component
.
each
(
function
(
value
){
if
(
this
.
checkMenuItem
(
value
,
currentNames
)
)
this
.
createApplicationMenuItem
(
value
);
}.
bind
(
this
));
if
(
json_portal
&&
json_portal
.
length
)
json_portal
.
each
(
function
(
value
){
this
.
createPortalMenuItem
(
value
);
}.
bind
(
this
));
if
(
json_portal
&&
json_portal
.
length
)
json_portal
.
each
(
function
(
value
){
value
.
type
=
"
portal
"
;
...
...
@@ -2526,7 +2532,7 @@ o2.xDesktop.Default.TaskItem = new Class({
this
.
taskitemMenu
.
addMenuItem
(
o2
.
LP
.
desktop
.
closeAll
,
"
click
"
,
function
(){
var
keys
=
Array
.
clone
(
Object
.
keys
(
this
.
desktop
.
apps
));
keys
.
each
(
function
(
key
){
if
(
!
this
.
desktop
.
apps
[
key
].
isIndex
&&
!
this
.
desktop
.
apps
[
key
].
options
.
isIndex
)
this
.
desktop
.
apps
[
key
].
close
();
if
(
!
layout
.
desktop
.
apps
[
key
].
isIndex
&&
!
layout
.
desktop
.
apps
[
key
].
options
.
isIndex
)
layout
.
desktop
.
apps
[
key
].
close
();
}.
bind
(
this
));
keys
=
null
;
}.
bind
(
this
),
img
);
...
...
o2web/source/x_component_process_Xform/Documenteditor.js
浏览文件 @
d749199e
...
...
@@ -121,7 +121,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
return
true
;
}
},
_createPage
:
function
(
callback
){
_createPage
:
function
(
callback
,
callbackAftreLoad
){
var
pageContentNode
=
this
.
_createNewPage
().
getFirst
();
var
control
=
this
.
getShowControl
();
...
...
@@ -187,6 +187,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
}
if
(
callback
)
callback
(
control
);
this
.
fireEvent
(
"
loadPage
"
);
if
(
callbackAftreLoad
)
callbackAftreLoad
(
control
);
}.
bind
(
this
));
}
else
{
this
.
getTempleteJson
(
function
(){
...
...
@@ -200,6 +201,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
}
if
(
callback
)
callback
(
control
);
this
.
fireEvent
(
"
loadPage
"
);
if
(
callbackAftreLoad
)
callbackAftreLoad
(
control
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
@@ -3025,35 +3027,13 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
this
.
node
.
setStyles
({
"
height
"
:
"
auto
"
});
//var content = this.contentNode.getFirst().getFirst().get("html");
// var tmpNode = this.contentNode.getFirst().getFirst().clone(true);
// var htmlNode = tmpNode.getLast();
// htmlNode = this.removeDisplayNone(htmlNode);
// var nodes = tmpNode.querySelectorAll("[data-w-style]");
// if (nodes.length){
// for (var i=0; i<nodes.length; i++){
// var n = nodes.item(i);
// wStyle = n.dataset["wStyle"];
// var styles = wStyle.split(/\s*\;\s*/g);
// styles.each(function(style){
// if (style){
// try{
// s = style.split(/\s*\:\s*/g);
// n.setStyle(s[0], s[1]);
// }catch(e) {}
// }
// });
// }
// }
}.
bind
(
this
),
function
(){
var
content
=
this
.
getDocumentHtml
();
//var content = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\"><head><meta charset=\"UTF-8\" /></head><body>"+tmpNode.get("html")+"</body></html>";
var
fileName
=
docNmae
||
this
.
json
.
toWordFilename
||
"
$doc
"
;
var
n
=
fileName
.
lastIndexOf
(
"
.
"
);
if
(
n
==-
1
)
fileName
=
fileName
+
"
.doc
"
;
// var ex = fileName.substring(n, fileName.length).toLowerCase();
// if (ex!==".doc" && ex!==".docx") fileName = fileName+".doc";
var
body
=
{
"
fileName
"
:
fileName
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录