Sfoglia il codice sorgente

Merge branch 'fix/document_templete_editor' into 'develop'

Merge of fix/document_templete_editor to develop 版式文件转word增加页码,更换header.htm位置

See merge request o2oa/o2oa!1064
胡起 5 anni fa
parent
commit
f018bace3a

+ 0 - 0
o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm → o2web/source/x_component_process_FormDesigner/Module/Documenteditor/header.htm


+ 1 - 1
o2web/source/x_component_process_Xform/Documenteditor.js

@@ -177,7 +177,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
         var style = pageContentNode.getLast("style");
         if (style){
             var origin = window.location.origin;
-            var header = o2.filterUrl(origin+"/x_component_process_FormDesigner/Module/Documenteditor/templete/header.htm");
+            var header = o2.filterUrl(origin+"/x_component_process_FormDesigner/Module/Documenteditor/header.htm");
 
             var text = style.get("html");
             var pageRex = /(?:@page\s*\{)([\s\S]*?)(?:\})/;