Merge branch 'cherry-pick-c48814a9' into 'develop_java8'

优化版式公文格式

See merge request o2oa/o2oa!310

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

@@ -191,8 +191,8 @@
 
     <P class="MsoNormal doc_block" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
 
-    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="100%"
-           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="103%"
+           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;max-width:100%;'>
         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
             <td class="doc_layout_attachment_title_td" width=116 valign=top
                 style='width:86.65pt;padding:0cm 0cm 0cm 0cm'>
@@ -201,7 +201,7 @@
             </td>
             <td class="doc_layout_attachment_content_td" valign=top style='padding:0cm 0cm 0cm 0cm'>
                 <div class="doc_layout_attachment_content">
-                    <p class=MsoNormal style='margin-left:16.0pt;text-indent:-16.0pt; '>
+                    <p class=MsoNormal style='margin-left:16.0pt;text-indent:-16.0pt; text-align:justify;'>
                     <span style='mso-list:Ignore'
                           class="doc_layout_attachment_content_serial">1</span><span>.</span><span
                             style='font-size:16.0pt;font-family:仿宋;'

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

@@ -178,7 +178,7 @@
     <P class="doc_block MsoNormal" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
 
     <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="100%"
-           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;max-width:100%;'>
         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
             <td class="doc_layout_attachment_title_td" width=116 valign=top
                 style='width:86.65pt;padding:0cm 0cm 0cm 0cm'>
@@ -187,7 +187,7 @@
             </td>
             <td class="doc_layout_attachment_content_td" valign=top style='padding:0cm 0cm 0cm 0cm'>
                 <div class="doc_layout_attachment_content">
-                    <p class=MsoNormal style='margin-left:16.0pt;text-indent:-16.0pt; '>
+                    <p class=MsoNormal style='margin-left:16.0pt;text-indent:-16.0pt; text-align:justify;'>
                     <span style='mso-list:Ignore'
                           class="doc_layout_attachment_content_serial">1</span><span>.</span><span
                             style='font-size:16.0pt;font-family:仿宋;' class="doc_layout_attachment_content_name"></span>

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

@@ -210,8 +210,8 @@
 
     <P class="doc_block MsoNormal" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
 
-    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="100%"
-           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="103%"
+           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm; max-width: 100%'>
         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
             <td class="doc_layout_attachment_title_td" width=116 valign=top
                 style='width:86.65pt;padding:0cm 0cm 0cm 0cm'>
@@ -220,7 +220,7 @@
             </td>
             <td class="doc_layout_attachment_content_td" valign=top style='padding:0cm 0cm 0cm 0cm'>
                 <div class="doc_layout_attachment_content">
-                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; '>
+                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; text-align:justify'>
                         <span class="doc_layout_attachment_content_serial">1</span><span>.</span><span
                             style='font-size:16.0pt;font-family:仿宋;' class="doc_layout_attachment_content_name"></span>
                     </p>

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

@@ -242,8 +242,8 @@
 
     <P class="doc_block MsoNormal" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
 
-    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="100%"
-           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="103%"
+           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;max-width: 100%'>
         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
             <td class="doc_layout_attachment_title_td" width=116 valign=top
                 style='width:86.65pt;padding:0cm 0cm 0cm 0cm'>
@@ -252,7 +252,7 @@
             </td>
             <td class="doc_layout_attachment_content_td" valign=top style='padding:0cm 0cm 0cm 0cm'>
                 <div class="doc_layout_attachment_content">
-                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; '>
+                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; text-align:justify'>
                         <span class="doc_layout_attachment_content_serial">1</span><span>.</span><span
                             style='font-size:16.0pt;font-family:仿宋;' class="doc_layout_attachment_content_name"></span>
                     </p>

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

@@ -176,8 +176,8 @@
 
     <P class="doc_block MsoNormal" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
 
-    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="100%"
-           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="103%"
+           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;max-width: 100%'>
         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
             <td class="doc_layout_attachment_title_td" width=116 valign=top
                 style='width:86.65pt;padding:0cm 0cm 0cm 0cm'>
@@ -186,7 +186,7 @@
             </td>
             <td class="doc_layout_attachment_content_td" valign=top style='padding:0cm 0cm 0cm 0cm'>
                 <div class="doc_layout_attachment_content">
-                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; '>
+                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; text-align:justify'>
                         <span class="doc_layout_attachment_content_serial">1</span><span>.</span><span
                             style='font-size:16.0pt;font-family:仿宋;' class="doc_layout_attachment_content_name"></span>
                     </p>

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

@@ -206,8 +206,8 @@
 
     <P class="MsoNormal doc_block" style='font-size:16.0pt;font-family:仿宋'><span>&#x3000;</span></P>
 
-    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="100%"
-           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+    <table class="doc_block doc_layout_attachment" border=0 cellspacing=0 cellpadding=0 width="103%"
+           style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm; max-width:100%'>
         <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
             <td class="doc_layout_attachment_title_td" width=116 valign=top
                 style='width:86.65pt;padding:0cm 0cm 0cm 0cm'>
@@ -216,9 +216,9 @@
             </td>
             <td class="doc_layout_attachment_content_td" valign=top style='padding:0cm 0cm 0cm 0cm'>
                 <div class="doc_layout_attachment_content">
-                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt; '>
+                    <p class=MsoNormal style='margin-left:16pt;text-indent:-16pt;text-align:justify'>
                         <span class="doc_layout_attachment_content_serial">1</span><span>.</span><span
-                            style='font-size:16.0pt;font-family:仿宋;' class="doc_layout_attachment_content_name"></span>
+                            style='font-size:16.0pt;font-family:仿宋;text-align:justify;' class="doc_layout_attachment_content_name"></span>
                     </p>
                 </div>
             </td>