Merge branch 'fix/after_submit_action' into 'develop'

Merge of fix/after_submit_action to develop 版式文件模板更新

See merge request o2oa/o2oa!1044

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

@@ -262,8 +262,8 @@
 
     <div class="doc_block doc_layout_editionArea">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
-        <table class="doc_block doc_layout_edition" data-compute-style="y" border=1 cellspacing=0 cellpadding=0 style='width:100%; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:inside;'>
-            <tr>
+        <table class="doc_block doc_layout_edition" data-compute-style="y" border=1 cellspacing=0 cellpadding=0 style='width:100%; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
+            <tr style="page-break-inside:avoid">
                 <td valign="top" class="line_top_thick_bottom_thin doc_layout_edition_copyto" style='width:54pt; border-left:none;border-right:none; padding:5.4pt 0cm 5.4pt 14pt'>
                     <p class=MsoNormal align=left style='font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt; padding:0cm'>抄送：</span></p>
                 </td>
@@ -271,11 +271,11 @@
                     <p class=MsoNormal align=left style='font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_content" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt; padding:0cm'></span></p>
                 </td>
             </tr>
-            <tr>
+            <tr style="page-break-inside:avoid">
                 <td class="line_top_thin_bottom_thick" colspan=3 style='border-left:none;border-right:none;padding:0cm'>
 
                     <table class=MsoTableGrid border=0 cellspacing=0 cellpadding=0 width="100%" style='width:100.0%;border-collapse:collapse;border:none;'>
-                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
+                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;page-break-inside:avoid'>
                             <td class="doc_layout_edition_issuance" valign=top style='border:none; padding: 0pt 0pt 0pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left'><span class="doc_layout_edition_issuance_unit" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>[印发单位]</span></p>
                             </td>

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

@@ -162,7 +162,7 @@
 <!--    </div>-->
 
     <table class="doc_block 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>
+        <tr style="page-break-inside:avoid">
             <td valign=bottom style='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;'>
                     <span class="doc_layout_filenoup_signerContent" style='font-size:16.0pt;font-family:仿宋'>[签发人]</span>
@@ -175,13 +175,13 @@
             </td>
         </tr>
 
-        <tr>
+        <tr style="page-break-inside:avoid">
             <td class="doc_layout_filenoup_fileno_td" width=321 valign=bottom style='width:280pt;padding:0cm 0cm 0cm 0cm'>
                 <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
             </td>
         </tr>
 
-        <tr>
+        <tr style="page-break-inside:avoid">
             <td valign=bottom style='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'>
                     <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";letter-spacing:-0.4pt;'>[发文时间]</span>

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

@@ -87,7 +87,6 @@
         font-family:"Times New Roman",serif;}
 </style>
 <div class=WordSection1 style='layout-grid:15.6pt; font-size:16.0pt;font-family:仿宋'>
-
     <v:line id="Line_x0020_25" o:spid="_x0000_s1026" style='position:absolute;
  left:0;text-align:left;z-index:251658240;visibility:visible;mso-wrap-style:square;
  mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
@@ -129,9 +128,15 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
         <w:wrap anchory="margin"/>
     </v:line>
 
+    <!--  红头  -->
+    <div class="doc_block">
+        <p class="MsoRedHeader" align=center style='text-align:center;line-height:auto;  mso-line-height-rule:exactly;'><b>
+            <span class="doc_layout_redHeader" style='font-size:42.0pt;font-family:宋体;color:red;letter-spacing:normal'>×××××公司函</span>
+        </b></p>
+    </div>
 
     <!--[if gte vml 1]><v:line id="Line_x0020_24" o:spid="_x0000_s1026"
-                               style='position:absolute;left:0;text-align:left;z-index:251659264;
+                               style='left:0;text-align:left;z-index:251659264;
  visibility:visible;mso-wrap-style:square;mso-width-percent:0;
  mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;
  mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:0;
@@ -172,19 +177,11 @@ AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
 </v:line><![endif]-->
 
     <![if !vml]>
-    <div style='mso-ignore:vglayout;position: absolute; top: 70px'>
+    <div style='mso-ignore:vglayout;'>
         <img width=649 height=6 src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_line.png" v:shapes="Line_x0020_24">
     </div>
     <![endif]>
 
-
-    <!--  红头  -->
-    <div class="doc_block">
-        <p class="MsoRedHeader" align=center style='text-align:center;line-height:auto;  mso-line-height-rule:exactly;'><b>
-            <span class="doc_layout_redHeader" style='font-size:42.0pt;font-family:宋体;color:red;letter-spacing:normal'>×××××公司函</span>
-        </b></p>
-    </div>
-
     <!--        <div class="doc_block doc_layout_fileno_area">-->
     <!--            <p class=MsoNormal align=center style='text-align:center'><span style='font-size:16.0pt;font-family:仿宋'>&nbsp;</span></p>-->
     <!--            <p class="MsoNormal" align=center style='text-align:center'><span class="doc_layout_fileno" style='mso-bidi-font-size:16.0pt;font-family:仿宋'></span></p>-->
@@ -320,7 +317,7 @@ AAAAAAAAAAAAACUEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAALQUAAAAA
     <div class="doc_block doc_layout_editionArea">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
         <table class="doc_block" data-compute-style="y" border=1 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-border-top-alt:solid windowtext 1.5pt; mso-border-bottom-alt:solid windowtext 1.5pt;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
-            <tr>
+            <tr style="page-break-inside:avoid">
                 <td class="doc_layout_edition_copyto" valign=top style='width:46.45pt;border:none; mso-border-alt:none; padding:5.4pt 0cm 5.4pt 14pt'>
                     <p class=MsoNormal align=left style='text-align:left;'><span class="doc_layout_edition_copyto_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>　抄送：</span></p>
                 </td>

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

@@ -120,7 +120,7 @@
         <p class="MsoNormal" align=center style='text-align:center'><span class="doc_layout_fileno" style='mso-bidi-font-size:16.0pt;font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman"'>[文号]</span></p>
     </div>
 
-    <table class="doc_block" border=0 cellspacing=0 cellpadding=0 style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+    <table class="doc_block doc_layout_headIssuance" border=0 cellspacing=0 cellpadding=0 style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
         <tr>
             <td class="doc_layout_filenoup_fileno_td" width=321 valign=bottom style='padding:0cm 0cm 0cm 0cm'>
                 <p class=MsoNormal align=left style='text-align:left'><span style='font-size:16.0pt;font-family:仿宋'>　</span><span class="doc_layout_issuanceUnit" style='font-size:16.0pt;font-family:仿宋'>[单位]</span></p>
@@ -186,12 +186,12 @@
 
     <div class="doc_block doc_layout_editionArea">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
-        <table class="doc_block doc_layout_edition" border=1 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-border-top-alt:solid windowtext 1.5pt; mso-border-bottom-alt:solid windowtext 1.5pt;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:inside;'>
-            <tr>
+        <table class="doc_block doc_layout_edition" border=1 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-border-top-alt:solid windowtext 1.5pt; mso-border-bottom-alt:solid windowtext 1.5pt;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
+            <tr style="page-break-inside:avoid">
                 <td class="line_top_thick_bottom_thin" style='border-right:none;border-left:none; padding:5.4pt 0'>
 
                     <table data-compute-style="y" style="width:100%; border: none">
-                        <tr>
+                        <tr style="page-break-inside:avoid">
                             <td class="doc_layout_edition_copyto" valign=top style='width:27pt; max-width:44pt; min-width:44px; border:none;padding:5.4pt 0cm 5.4pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>送：</span></p>
                             </td>
@@ -199,7 +199,7 @@
                                 <p class=MsoNormal align=left style='text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_content" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'></span></p>
                             </td>
                         </tr>
-                        <tr>
+                        <tr style="page-break-inside:avoid">
                             <td class="doc_layout_edition_copyto2" valign=top style='width:27pt;border:none;padding:5.4pt 0cm 5.4pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left;line-height: normal'><span class="doc_layout_edition_copyto2_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>发：</span></p>
                             </td>
@@ -211,11 +211,11 @@
 
                 </td>
             </tr>
-            <tr>
+            <tr style="page-break-inside:avoid">
                 <td class="line_top_thin_bottom_thick" colspan=3 style='border-left:none;border-right:none;padding:0cm'>
 
                     <table class=MsoTableGrid border=0 cellspacing=0 cellpadding=0 width="100%" style='width:100.0%;border-collapse:collapse;border:none;'>
-                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
+                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;page-break-inside:avoid'>
                             <td class="doc_layout_edition_issuance" valign=top style='width:300pt; border:none; padding: 0pt 0pt 0pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left'><span class="doc_layout_edition_issuance_unit" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>[印发单位]</span></p>
                             </td>

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/party-meeting.html

@@ -206,12 +206,12 @@
 
     <div class="doc_block doc_layout_editionArea">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
-        <table class="doc_block doc_layout_edition" border=1 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-border-top-alt:solid windowtext 1.5pt; mso-border-bottom-alt:solid windowtext 1.5pt;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:inside;'>
-            <tr>
+        <table class="doc_block doc_layout_edition" border=1 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-border-top-alt:solid windowtext 1.5pt; mso-border-bottom-alt:solid windowtext 1.5pt;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
+            <tr style="page-break-inside:avoid">
                 <td class="line_top_thick_bottom_thin" style='border-right:none;border-left:none; padding:5.4pt 0'>
 
                     <table data-compute-style="y" style="width:100%; border: none">
-                        <tr>
+                        <tr style="page-break-inside:avoid">
                             <td class="doc_layout_edition_copyto" valign=top style='width:27pt;border:none;padding:5.4pt 0cm 5.4pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>送：</span></p>
                             </td>
@@ -219,7 +219,7 @@
                                 <p class=MsoNormal align=left style='text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_content" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'></span></p>
                             </td>
                         </tr>
-                        <tr>
+                        <tr style="page-break-inside:avoid">
                             <td class="doc_layout_edition_copyto2" valign=top style='width:27pt;border:none;padding:5.4pt 0cm 5.4pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left;line-height: normal'><span class="doc_layout_edition_copyto2_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>发：</span></p>
                             </td>
@@ -231,11 +231,11 @@
 
                 </td>
             </tr>
-            <tr>
+            <tr style="page-break-inside:avoid">
                 <td class="line_top_thin_bottom_thick" colspan=3 style='border-left:none;border-right:none;padding:0cm'>
 
                     <table class=MsoTableGrid border=0 cellspacing=0 cellpadding=0 width="100%" style='width:100.0%;border-collapse:collapse;border:none;'>
-                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
+                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;page-break-inside:avoid'>
                             <td class="doc_layout_edition_issuance" valign=top style='border:none; padding: 0pt 0pt 0pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left'><span class="doc_layout_edition_issuance_unit" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>[印发单位]</span></p>
                             </td>

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

@@ -236,8 +236,8 @@
 
     <div class="doc_block doc_layout_editionArea">
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
-        <table class="doc_block doc_layout_edition" data-compute-style="y" border=1 cellspacing=0 cellpadding=0 style='width:100%; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:inside;'>
-            <tr>
+        <table class="doc_block doc_layout_edition" data-compute-style="y" border=1 cellspacing=0 cellpadding=0 style='width:100%; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
+            <tr style="page-break-inside:avoid">
                 <td valign="top" class="line_top_thick_bottom_thin doc_layout_edition_copyto" style='width:54pt; border-left:none;border-right:none; padding:5.4pt 0cm 5.4pt 14pt'>
                     <p class=MsoNormal align=left style='font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_title" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt; padding:0cm'>抄送：</span></p>
                 </td>
@@ -245,11 +245,11 @@
                     <p class=MsoNormal align=left style='font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal'><span class="doc_layout_edition_copyto_content" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt; padding:0cm'></span></p>
                 </td>
             </tr>
-            <tr>
+            <tr style="page-break-inside:avoid">
                 <td class="line_top_thin_bottom_thick" colspan=3 style='border-left:none;border-right:none;padding:0cm'>
 
                     <table class=MsoTableGrid border=0 cellspacing=0 cellpadding=0 width="100%" style='width:100.0%;border-collapse:collapse;border:none;'>
-                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
+                        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;page-break-inside:avoid'>
                             <td class="doc_layout_edition_issuance" valign=top style='border:none; padding: 0pt 0pt 0pt 14pt'>
                                 <p class=MsoNormal align=left style='text-align:left'><span class="doc_layout_edition_issuance_unit" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>[印发单位]</span></p>
                             </td>

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/templete.json

@@ -29,6 +29,12 @@
     "layouts": {
     }
   },
+  "party": {
+    "name": "党委纪委类",
+    "file": "party.html",
+    "layouts": {
+    }
+  },
   "combine": {
     "name": "联合发文类",
     "file": "combine.html",

o2web/source/x_component_process_ProcessDesigner/$Process/flat/css.wcss

@@ -838,7 +838,8 @@
 		"font-size": "12px",
 		"height": "24px",
 		"line-height": "24px",
-		"border-bottom": "1px dashed #CCC"
+		"border-bottom": "1px dashed #CCC",
+		"word-break":"keep-all"
 	},
 	"editTableHeadTitle": {
         "color": "#bf6364",
@@ -951,4 +952,4 @@
         "margin-right": "5px",
         "cursor": "pointer"
     }
-}
\ No newline at end of file
+}

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -713,9 +713,11 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
                         if (!tmp){
                             var text = cell.get("text").trim();
                             var l = 14*text.length;
+                            var wl = 19*text.length;
                             cell.setStyles({
                                 "max-width": ""+l+"pt",
-                                "min-width": ""+l+"pt"
+                                "min-width": ""+l+"pt",
+                                "width": ""+wl+"pt"
                             });
                         }
                     }
@@ -2405,9 +2407,11 @@ debugger;
                         if (!tmp){
                             var text = cell.get("text").trim();
                             var l = 14*text.length;
+                            var wl = 19*text.length;
                             cell.setStyles({
-                                "max-width": ""+l+"pt",
-                                "min-width": ""+l+"pt"
+                                "max-width": ""+l+"pt !important",
+                                "min-width": ""+l+"pt !important",
+                                "width": ""+wl+"pt"
                             });
                         }