Merge branch 'fix/document_templete_editor' into 'develop'

Merge of fix/document_templete_editor to developc 增加版式正文word转换是否添加页码的配置

See merge request o2oa/o2oa!1073

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/documenteditor.html

@@ -122,6 +122,14 @@
 					<td class="editTableTitle">附件site:</td>
 					<td class="editTableValue"><input type="text" name="toWordSite" value="text{$.toWordSite || '$doc'}" class="editTableInput"/></td>
 				</tr>
+				<tr>
+					<td class="editTableTitle">添加页码:</td>
+					<td class="editTableValue">
+						<input class="editTableRadio" name="toWordPageNumber" text{($.toWordPageNumber!=='n')?'checked':''} type="radio" value="y"/>是
+						<input class="editTableRadio" name="toWordPageNumber" text{($.toWordPageNumber=='n')?'checked':''} type="radio" value="n"/>否
+						<div>转换Word后是否要添加页码</div>
+					</td>
+				</tr>
 				<tr>
 					<td class="editTableTitle">何时转换:</td>
 					<td class="editTableValue">

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -160,8 +160,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             this.getTempleteJson(function(){
                 var templete = this.json.documentTempleteName || "standard";
                 pageContentNode.loadHtml(o2.filterUrl("../x_component_process_FormDesigner/Module/Documenteditor/templete/"+this.templeteJson[templete].file), function(){
-                    debugger;
-                    this.doPageStyles(pageContentNode);
+                    if (this.json.toWordPageNumber!="n") this.doPageStyles(pageContentNode);
 
                     if (this.attachmentTemplete){
                         var attNode = pageContentNode.getElement(".doc_layout_attachment_content");