提交 d3ad058e 编写于 作者: NoSubject's avatar NoSubject

Merge branch 'cherry-pick-8f45246e' into 'wrdp'

Merge branch 'fix/document_templete_editor' into 'develop'

See merge request o2oa/o2oa!1066
......@@ -214,8 +214,8 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
if (last!==";") cssText = cssText+";";
cssText += "mso-header-margin:42.55pt;\n" +
" mso-footer-margin:70.9pt;\n" +
" mso-even-footer:url(\"http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm\") ef1;\n" +
" mso-footer:url(\"http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm\") f1;\n" +
" mso-even-footer:url(\""+header+"\") ef1;\n" +
" mso-footer:url(\""+header+"\") f1;\n" +
" mso-paper-source:0;";
text = text.replace(arr[0], arr[1]+cssText+arr[3]);
}
......@@ -230,8 +230,8 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
" letter-spacing:-0.4pt;\n" +
" mso-header-margin:42.55pt;\n" +
" mso-footer-margin:70.9pt;\n" +
" mso-even-footer:url(\"http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm\") ef1;\n" +
" mso-footer:url(\"http://develop.o2oa.net/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm\") f1;\n" +
" mso-even-footer:url(\""+header+"\") ef1;\n" +
" mso-footer:url(\""+header+"\") f1;\n" +
" mso-paper-source:0;\n" +
" }"
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册