Merge branch 'fix/documenteditor_page' into 'develop'

Merge of fix/documenteditor_page to develop 默认不添加页码

See merge request o2oa/o2oa!1159

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

@@ -136,8 +136,8 @@
 				<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"/>否
+						<input class="editTableRadio" name="toWordPageNumber" text{($.toWordPageNumber=='y')?'checked':''} type="radio" value="y"/>是
+						<input class="editTableRadio" name="toWordPageNumber" text{($.toWordPageNumber!='y')?'checked':''} type="radio" value="n"/>否
 						<div>转换Word后是否要添加页码</div>
 					</td>
 				</tr>

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -149,7 +149,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
 
         if (this.json.documentTempleteType=="cus"){
             pageContentNode.loadHtml(o2.filterUrl(this.json.documentTempleteUrl), function(){
-                if (this.json.toWordPageNumber!="n") this.doPageStyles(pageContentNode);
+                if (this.json.toWordPageNumber=="y") this.doPageStyles(pageContentNode);
 
                 if (this.attachmentTemplete){
                     var attNode = pageContentNode.getElement(".doc_layout_attachment_content");
@@ -162,7 +162,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(){
-                    if (this.json.toWordPageNumber!="n") this.doPageStyles(pageContentNode);
+                    if (this.json.toWordPageNumber=="y") this.doPageStyles(pageContentNode);
 
                     if (this.attachmentTemplete){
                         var attNode = pageContentNode.getElement(".doc_layout_attachment_content");