Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
49c90f35
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,发现更多精彩内容 >>
提交
49c90f35
编写于
8月 30, 2021
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复公文编辑器copyto和附件的显示问题
上级
a74ba4ae
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
8 deletion
+39
-8
o2web/source/x_component_process_Xform/Documenteditor.js
o2web/source/x_component_process_Xform/Documenteditor.js
+24
-2
o2web/source/x_component_process_Xform/widget/OOXML.js
o2web/source/x_component_process_Xform/widget/OOXML.js
+11
-5
o2web/source/x_desktop/js/initialScriptText.js
o2web/source/x_desktop/js/initialScriptText.js
+4
-1
未找到文件。
o2web/source/x_component_process_Xform/Documenteditor.js
浏览文件 @
49c90f35
...
...
@@ -201,6 +201,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
if
(
this
.
json
.
documentTempleteType
==
"
cus
"
){
pageContentNode
.
loadHtml
(
o2
.
filterUrl
(
this
.
json
.
documentTempleteUrl
),
function
(){
this
.
_clearCopytoTrs
();
if
(
this
.
json
.
toWordPageNumber
==
"
y
"
)
this
.
doPageStyles
(
pageContentNode
);
if
(
this
.
attachmentTemplete
){
...
...
@@ -213,6 +214,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
}.
bind
(
this
));
}
else
{
this
.
getTempleteJson
(
function
(){
this
.
_clearCopytoTrs
();
var
templete
=
this
.
json
.
documentTempleteName
||
"
standard
"
;
pageContentNode
.
loadHtml
(
o2
.
filterUrl
(
"
../x_component_process_FormDesigner/Module/Documenteditor/templete/
"
+
this
.
templeteJson
[
templete
].
file
),
function
(){
if
(
this
.
json
.
toWordPageNumber
==
"
y
"
)
this
.
doPageStyles
(
pageContentNode
);
...
...
@@ -228,6 +230,24 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
}.
bind
(
this
));
}
},
_clearCopytoTrs
:
function
(){
if
(
this
.
layout_copytoContentTr
){
this
.
layout_copytoContentTr
.
destroy
();
this
.
layout_copytoContentTr
=
null
;
}
if
(
this
.
layout_copytoContentTrP
){
this
.
layout_copytoContentTrP
.
destroy
();
this
.
layout_copytoContentTrP
=
null
;
}
if
(
this
.
layout_copyto2ContentTr
){
this
.
layout_copyto2ContentTr
.
destroy
();
this
.
layout_copyto2ContentTr
=
null
;
}
if
(
this
.
layout_copyto2ContentTrP
){
this
.
layout_copyto2ContentTrP
.
destroy
();
this
.
layout_copyto2ContentTrP
=
null
;
}
},
doPageStyles
:
function
(
pageContentNode
){
var
style
=
pageContentNode
.
getLast
(
"
style
"
);
if
(
style
){
...
...
@@ -814,9 +834,9 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
if
(
!
control
.
secret
)
n
++
;
if
(
!
control
.
priority
)
n
++
;
if
(
this
.
layout_copiesSecretPriority_blank
){
this
.
layout_copiesSecretPriority_blank
.
empty
();
while
(
n
>
0
){
this
.
layout_copiesSecretPriority_blank
.
empty
();
this
.
layout_copiesSecretPriority_blank
.
appendHTML
(
"
<span style='font-size:16.0pt'> </span>
"
);
this
.
layout_copiesSecretPriority_blank
.
appendHTML
(
"
<p class=
\"
MsoNormal
\"
><span style='font-size:16.0pt'> </span></p>
"
);
n
--
;
}
}
...
...
@@ -2845,6 +2865,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
this
.
data
[
name
]
=
v
+
"
:
"
;
break
;
case
"
copyto
"
:
case
"
copyto2
"
:
this
.
data
[
name
]
=
v
+
"
。
"
;
break
;
default
:
...
...
@@ -2909,6 +2930,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
this
.
data
[
name
]
=
strs
.
join
(
"
,
"
)
+
"
:
"
;
break
;
case
"
copyto
"
:
case
"
copyto2
"
:
this
.
data
[
name
]
=
strs
.
join
(
"
,
"
)
+
"
。
"
;
break
;
default
:
...
...
o2web/source/x_component_process_Xform/widget/OOXML.js
浏览文件 @
49c90f35
...
...
@@ -483,9 +483,11 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
node
=
node
.
firstChild
;
while
(
node
){
if
(
node
.
nodeType
===
Node
.
TEXT_NODE
){
if
(
node
.
nodeValue
)
this
.
processRun
(
node
.
parentElement
||
node
.
parentNode
,
oo_p
,
p
,
node
.
nodeValue
);
if
(
node
.
nodeValue
.
trim
()
)
this
.
processRun
(
node
.
parentElement
||
node
.
parentNode
,
oo_p
,
p
,
node
.
nodeValue
);
}
else
if
(
node
.
nodeType
===
Node
.
ELEMENT_NODE
){
if
(
node
.
tagName
.
toLowerCase
()
===
"
span
"
)
{
if
(
node
.
getStyle
(
"
display
"
)
===
"
none
"
)
{
continue
;
}
else
if
(
node
.
tagName
.
toLowerCase
()
===
"
span
"
)
{
this
.
processRun
(
node
,
oo_p
,
p
);
}
else
if
(
node
.
tagName
.
toLowerCase
()
===
"
br
"
)
{
if
(
node
.
nextSibling
)
this
.
processRun
(
node
,
oo_p
,
p
,
""
,
"
br
"
);
...
...
@@ -511,7 +513,7 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
this
.
processParagraphRun
(
node
,
oo_p
,
p
,
oo_body
,
append
,
ilvl
);
}
}
else
{
this
.
processParagraphRun
(
node
,
oo_p
,
p
,
oo_body
,
append
,
ilvl
);
this
.
processParagraphRun
(
node
,
oo_p
,
p
,
oo_body
,
append
,
ilvl
);
}
node
=
node
.
nextSibling
;
}
...
...
@@ -830,7 +832,9 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
dom
=
dom
.
firstChild
;
while
(
dom
){
if
(
dom
.
nodeType
===
Node
.
ELEMENT_NODE
){
if
(
dom
.
hasClass
(
"
doc_layout_filetext
"
)){
if
(
dom
.
getStyle
(
"
display
"
)
===
"
none
"
)
{
continue
;
}
else
if
(
dom
.
hasClass
(
"
doc_layout_filetext
"
)){
this
.
processFiletext
(
dom
,
oo_body
,
append
);
}
else
if
(
dom
.
tagName
.
toLowerCase
()
===
"
p
"
||
((
!!
divAsP
||
!!
this
.
options
.
divAsP
)
&&
dom
.
tagName
.
toLowerCase
()
===
"
div
"
)){
this
.
processParagraph
(
dom
,
oo_body
,
append
);
...
...
@@ -1862,7 +1866,9 @@ debugger;
var
node
=
span
.
firstChild
;
while
(
node
){
if
(
node
.
nodeType
===
Node
.
ELEMENT_NODE
){
if
(
node
.
tagName
.
toLowerCase
()
===
"
span
"
){
if
(
node
.
getStyle
(
"
display
"
)
===
"
none
"
)
{
continue
;
}
else
if
(
node
.
tagName
.
toLowerCase
()
===
"
span
"
){
this
.
processRunSpan
(
node
,
oo_p
,
runPrs
);
}
else
if
(
node
.
tagName
.
toLowerCase
()
===
"
br
"
){
runPrs
.
br
=
"
br
"
;
...
...
o2web/source/x_desktop/js/initialScriptText.js
浏览文件 @
49c90f35
...
...
@@ -838,6 +838,8 @@ var _cmsActions = new _Action("x_cms_assemble_control", {
var
_portalActions
=
new
_Action
(
"
x_portal_assemble_surface
"
,
{
"
getScript
"
:
{
"
uri
"
:
"
/jaxrs/script/portal/{portal}/name/{ }
"
,
"
method
"
:
"
POST
"
}
});
bind
.
processActions
=
_processActions
;
bind
.
cmsActions
=
_cmsActions
;
//include 引用脚本
//optionsOrName : {
...
...
@@ -1006,7 +1008,8 @@ var _createDict = function(application){
};
bind
.
exec
=
_exec
;
bind
.
include
=
_include
;
bind
.
Dict
=
_createDict
();
var
work
=
wrapWorkContext
.
getWork
();
bind
.
Dict
=
_createDict
((
work
)
?
work
.
application
:
""
);
try
{
oPrint
=
oPrint
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录