提交 3a8df246 编写于 作者: NoSubject's avatar NoSubject

Merge branch 'feature/ooxml_encryption' into 'wrdp'

公文编辑器,部分模板增加“附件”区域

See merge request o2oa/o2oa!4912
...@@ -208,6 +208,27 @@ ...@@ -208,6 +208,27 @@
</tr> </tr>
</table> </table>
<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;'>
<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'>
<p class=MsoNormal><span style='font-size:16.0pt;font-family:仿宋;'><span>&#x3000;&#x3000;</span><span
class="doc_layout_attachment_title" style='font-size:16.0pt;font-family:仿宋;'>附件:</span></span>
</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; '>
<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>
</div>
</td>
</tr>
</table>
<div class="doc_block"> <div class="doc_block">
<P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P> <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
<P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P> <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
......
...@@ -240,6 +240,27 @@ ...@@ -240,6 +240,27 @@
</tr> </tr>
</table> </table>
<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;'>
<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'>
<p class=MsoNormal><span style='font-size:16.0pt;font-family:仿宋;'><span>&#x3000;&#x3000;</span><span
class="doc_layout_attachment_title" style='font-size:16.0pt;font-family:仿宋;'>附件:</span></span>
</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; '>
<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>
</div>
</td>
</tr>
</table>
<div class="doc_block"> <div class="doc_block">
<P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P> <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
<P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P> <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
......
...@@ -176,6 +176,25 @@ ...@@ -176,6 +176,25 @@
<P class="doc_block MsoNormal" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P> <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;'>
<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'>
<p class=MsoNormal><span style='font-size:16.0pt;font-family:仿宋;'><span>&#x3000;&#x3000;</span><span
class="doc_layout_attachment_title" style='font-size:16.0pt;font-family:仿宋;'>附件:</span></span>
</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; '>
<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>
</div>
</td>
</tr>
</table>
<div class="doc_block"> <div class="doc_block">
<P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P> <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册