防止转word发文单位和发文日期换行

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/combine.html

@@ -181,7 +181,7 @@
         <table class="doc_layout_headIssuance doc_layout_headIssuance" border=0 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
             <tr>
                 <td style='padding:0cm 0cm 0cm 0cm'>
-                    <p class=MsoNormal align=right style='text-align:right;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'>
+                    <p class=MsoNormal align=right style='page-break-after: avoid; text-align:right;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'>
                         <span class="doc_layout_issuanceUnit" style='mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;font-family:仿宋;'>[发文单位]</span>
                     </p>
                 </td>
@@ -200,7 +200,7 @@
 
             <tr>
                 <td style='border-top:none;padding:0cm 0cm 0cm 0cm'>
-                    <p class=MsoNormal align=right style='text-align:right;mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:paragraph; mso-element-anchor-horizontal:margin;mso-element-left:right;mso-element-top: .05pt;mso-height-rule:exactly'>
+                    <p class=MsoNormal align=right style='page-break-after: avoid; text-align:right;mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:paragraph; mso-element-anchor-horizontal:margin;mso-element-left:right;mso-element-top: .05pt;mso-height-rule:exactly'>
                         <span class="doc_layout_issuanceDate" style='mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;  font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman";'>[发文时间]</span>
                     </p>
                 </td>

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html

@@ -272,7 +272,7 @@ AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
                     <table class="doc_layout_issuance" border=0 cellspacing=0 cellpadding=0 align=right width=auto style='width:auto;border-collapse:collapse;border:none;mso-table-overlap:never;mso-table-anchor-vertical:paragraph; mso-table-anchor-horizontal:margin;mso-table-left:right;mso-table-top:.05pt; mso-padding-alt:0cm 0cm 0cm 0cm'>
                         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
                             <td style='padding:0cm 0cm 0cm 0cm'>
-                                <p class=MsoNormal align=center style='text-align:center;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'>
+                                <p class=MsoNormal align=center style='page-break-after: avoid; text-align:center;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'>
                                     <span class="doc_layout_issuanceUnit" style='mso-bidi-font-size:16.0pt;line-height:28.0pt; font-size: 16pt;font-family:仿宋;;'>[发文单位]</span>
                                 </p>
                             </td>
@@ -284,7 +284,7 @@ AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
                         </tr>
                         <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
                             <td style='border-top:none;padding:0cm 0cm 0cm 0cm'>
-                                <p class=MsoNormal align=center style='text-align:center;mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:paragraph; mso-element-anchor-horizontal:margin;mso-element-left:right;mso-element-top: .05pt;mso-height-rule:exactly'>
+                                <p class=MsoNormal align=center style='page-break-after: avoid; text-align:center;mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:paragraph; mso-element-anchor-horizontal:margin;mso-element-left:right;mso-element-top: .05pt;mso-height-rule:exactly'>
                                     <span class="doc_layout_issuanceDate" style='mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman";'>[发文时间]</span>
                                 </p>
                             </td>

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html

@@ -197,7 +197,7 @@
                     <table class="doc_layout_issuance" border=0 cellspacing=0 cellpadding=0 align=right width=auto style='width:auto;border-collapse:collapse;border:none;'>
                         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
                             <td style='padding:0cm 0cm 0cm 0cm'>
-                                <p class=MsoNormal align=center style='text-align:center;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'>
+                                <p class=MsoNormal align=center style='page-break-after: avoid; text-align:center;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'>
                                     <span class="doc_layout_issuanceUnit" style='mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;font-family:仿宋;'>[发文单位]</span>
                                 </p>
                             </td>
@@ -215,7 +215,7 @@
                     <table class="doc_layout_issuance" border=0 cellspacing=0 cellpadding=0 align=right width=auto style='width:auto;border-collapse:collapse;border:none;'>
                         <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
                             <td style='border-top:none;padding:0cm 0cm 0cm 0cm'>
-                                <p class=MsoNormal align=center style='text-align:right;mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:paragraph; mso-element-anchor-horizontal:margin;mso-element-left:right;mso-element-top: .05pt;mso-height-rule:exactly'>
+                                <p class=MsoNormal align=center style='page-break-after: avoid; text-align:right;mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:paragraph; mso-element-anchor-horizontal:margin;mso-element-left:right;mso-element-top: .05pt;mso-height-rule:exactly'>
                                     <span class="doc_layout_issuanceDate" style='mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;  font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman";'>[发文时间]</span>
                                 </p>
                             </td>

o2web/source/x_component_process_Xform/widget/OOXML.js

@@ -475,6 +475,10 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
                 }
             }
         }
+        var pageBreak = dom.getStyle("page-break-after");
+        if (pageBreak && pageBreak.toString().toLowerCase()=="avoid"){
+            pPrs.keepNext = {};
+        }
         return pPrs;
     },
     setParagraphAttrFromDom: function(dom, oo_p){