Merge branch 'fix/documenteditor_print_name' into 'develop'

Merge of fix/documenteditor_print_name to develop 增加联合发文、命令模板，修正表单中布尔值保存不上的问题

See merge request o2oa/o2oa!979

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

@@ -671,17 +671,17 @@
 			</table>
 			<div id="text{$.pid}issuanceUnitShowScriptArea" style="display: text{($.issuanceUnitShow=='s')?'block':'none'}" class="MWFFormulaArea" name="issuanceUnitShowScript" title="成文单位显示脚本 (S)"></div>
 
-<!--			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
-<!--				<tr>-->
-<!--					<td class="editTableTitle">允许编辑:</td>-->
-<!--					<td class="editTableValue">-->
-<!--						<input class="editTableRadio" onclick="if (this.checked) {$('text{$.pid}issuanceUnitEditScriptArea').setStyle('display', 'none')}" name="issuanceUnitEdit" text{($.issuanceUnitEdit=='y')?'checked':''} type="radio" value="y"/>允许-->
-<!--						<input class="editTableRadio" onclick="if (this.checked) {$('text{$.pid}issuanceUnitEditScriptArea').setStyle('display', 'none')}" name="issuanceUnitEdit" text{($.issuanceUnitEdit!='y' && $.issuanceUnitEdit!='s')?'checked':''} type="radio" value="n"/>不允许-->
-<!--						<input class="editTableRadio" onclick="if (this.checked) {$('text{$.pid}issuanceUnitEditScriptArea').setStyle('display', 'block')}" name="issuanceUnitEdit" text{($.issuanceUnitEdit=='s')?'checked':''} type="radio" value="s"/>根据脚本-->
-<!--					</td>-->
-<!--				</tr>-->
-<!--			</table>-->
-<!--			<div id="text{$.pid}issuanceUnitEditScriptArea" style="display: text{($.issuanceUnitEdit=='s')?'block':'none'}" class="MWFFormulaArea" name="issuanceUnitEditScript" title="成文单位编辑脚本 (S)"></div>-->
+			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+				<tr>
+					<td class="editTableTitle">允许编辑:</td>
+					<td class="editTableValue">
+						<input class="editTableRadio" onclick="if (this.checked) {$('text{$.pid}issuanceUnitEditScriptArea').setStyle('display', 'none')}" name="issuanceUnitEdit" text{($.issuanceUnitEdit=='y')?'checked':''} type="radio" value="y"/>允许
+						<input class="editTableRadio" onclick="if (this.checked) {$('text{$.pid}issuanceUnitEditScriptArea').setStyle('display', 'none')}" name="issuanceUnitEdit" text{($.issuanceUnitEdit!='y' && $.issuanceUnitEdit!='s')?'checked':''} type="radio" value="n"/>不允许
+						<input class="editTableRadio" onclick="if (this.checked) {$('text{$.pid}issuanceUnitEditScriptArea').setStyle('display', 'block')}" name="issuanceUnitEdit" text{($.issuanceUnitEdit=='s')?'checked':''} type="radio" value="s"/>根据脚本
+					</td>
+				</tr>
+			</table>
+			<div id="text{$.pid}issuanceUnitEditScriptArea" style="display: text{($.issuanceUnitEdit=='s')?'block':'none'}" class="MWFFormulaArea" name="issuanceUnitEditScript" title="成文单位编辑脚本 (S)"></div>
 
 			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
 				<tr>

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

@@ -0,0 +1,303 @@
+<style>
+    @page WordSection1
+    {size:595.3pt 841.9pt;
+        margin:104.9pt 73.7pt 99.25pt 79.4pt;
+        mso-header-margin:42.55pt;
+        mso-footer-margin:49.6pt;
+        mso-paper-source:0;
+        layout-grid:15.6pt;
+        line-height:normal;
+        font-size:16.0pt;
+        font-family:仿宋;
+        letter-spacing:-0.4pt;
+    }
+    div.WordSection1
+    {page:WordSection1;
+        font-size:16.0pt;
+        font-family:仿宋;
+        line-height:normal;
+        letter-spacing:-0.4pt;
+    }
+    p.MsoNormal, li.MsoNormal, div.MsoNormal
+    {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:left;
+        text-justify:inter-ideograph;
+        mso-pagination:none;
+        font-size:16.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:仿宋;
+        line-height:28.0pt;
+        mso-line-height-rule:exactly;
+        mso-ascii-font-family:仿宋;
+        mso-ascii-theme-font:minor-latin;
+        mso-fareast-font-family:仿宋;
+        mso-fareast-theme-font:minor-fareast;
+        mso-hansi-font-family:仿宋;
+        mso-hansi-theme-font:minor-latin;
+        mso-bidi-font-family:"Times New Roman";
+        mso-bidi-theme-font:minor-bidi;
+        mso-font-kerning:1.0pt;}
+
+    .MsoRedHeader
+    {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:justify;
+        text-justify:inter-ideograph;
+        mso-pagination:none;
+        font-family:宋体;
+        mso-ascii-font-family:宋体;
+        mso-ascii-theme-font:minor-latin;
+        mso-fareast-font-family:宋体;
+        mso-fareast-theme-font:minor-fareast;
+        mso-hansi-font-family:宋体;
+        mso-hansi-theme-font:minor-latin;
+        mso-bidi-font-family:"Times New Roman";
+        mso-bidi-theme-font:minor-bidi;
+        mso-font-kerning:1.0pt;}
+    span.GramE
+    {mso-style-name:"";
+        mso-gram-e:yes;}
+    td.line_top_thin_bottom_thin
+    {
+        mso-border-bottom-alt: solid windowtext .75pt;
+        border-bottom:solid windowtext .75pt;
+        mso-border-top-alt: solid windowtext .75pt;
+        border-top:solid windowtext .75pt;
+    }
+    td.line_top_thin_bottom_thick
+    {
+        mso-border-top-alt: solid windowtext .75pt;
+        border-top:solid windowtext .75pt;
+        mso-border-bottom-alt: solid windowtext 1pt;
+        border-bottom:solid windowtext 1.5pt;
+    }
+    td.line_top_thick_bottom_thin
+    {
+        mso-border-top-alt: solid windowtext 1pt;
+        border-top:solid windowtext 1.5pt;
+        mso-border-bottom-alt: solid windowtext 0.75pt;
+        border-bottom:solid windowtext 0.75pt;
+    }
+    td.line_top_thick_bottom_thick
+    {
+        mso-border-bottom-alt: solid windowtext 1pt;
+        border-bottom:solid windowtext 1.5pt;
+        mso-border-top-alt: solid windowtext 1pt;
+        border-top:solid windowtext 1.5pt;
+    }
+</style>
+<div class=WordSection1 style='layout-grid:15.6pt; font-size:16.0pt;font-family:仿宋'>
+    <!--  份数、密级、紧急度  -->
+    <div class="doc_block doc_layout_copiesSecretPriority">
+        <p class=MsoNormal>
+            <span class="doc_layout_copies" style='font-size:16.0pt;font-family:黑体'>[份数]</span>
+        </p>
+        <p class=MsoNormal>
+            <span class="doc_layout_secret" style='font-size:16.0pt;font-family:黑体'>[密级]</span>
+        </p>
+        <p class=MsoNormal>
+            <span class="doc_layout_priority" style='font-size:16.0pt;font-family:黑体'>[紧急度]</span>
+        </p>
+        <p class="MsoNormal doc_layout_copiesSecretPriority_blank"></p>
+    </div>
+
+    <!--  红头  -->
+    <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:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman"'></span></p>
+        </div>
+
+    <table class="doc_block doc_layout_filenoup" border=0 cellspacing=0 cellpadding=0 style='margin-top:10px;border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>
+        <tr>
+            <td colspan="2" style='padding:0cm 0cm 0cm 0cm'>
+                <p class=MsoNormal align=center style='text-align:center'><span style='font-size:16.0pt;font-family:仿宋'>&nbsp;</span></p>
+            </td>
+        </tr>
+        <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_filenoup_fileno" style='font-size:16.0pt;font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman"'>[文号]</span></p>
+            </td>
+            <td class="doc_layout_filenoup_signer_td" width=268 valign=top style='width:220pt;padding:0cm 0cm 0cm 0cm'>
+                <table align="right" class="doc_layout_filenoup_signer_table" border=0 cellspacing=0 cellpadding=0 style='border-collapse:collapse;border:none;'>
+                    <tr>
+                        <td class="doc_layout_filenoup_signerTitle_td" width=94 valign=top style='width:65pt;padding:0cm 0cm 0cm 0cm'>
+                            <p class=MsoNormal align=left style='text-align:left'><span class="doc_layout_filenoup_signer" style='font-size:16.0pt;font-family:仿宋'>签发人：</span></p>
+                        </td>
+                        <td class="doc_layout_filenoup_signerContent_td" valign=top style='max-width:140pt;padding:0cm 0cm 0cm 0cm'>
+                            <p class=MsoNormal align=left style='text-align:left;'><span class="doc_layout_filenoup_signerContent" style='font-size:16.0pt;font-family:楷体'>[签发人]</span></p>
+                        </td>
+                        <td valign=top style='width:15pt;padding:0cm 0cm 0cm 0cm'></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+
+    <p class="doc_block MsoNormal" align=left style='line-height:8.0pt'><hr class="doc_layout_redline" style="height: 1.5pt;line-height:8.0pt; backgroud-color: red;" color=red></p>
+
+    <div class="doc_block">
+        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
+        <p class=MsoNormal align=center style='text-align:center'><span class="doc_layout_subject" style='font-size:22.0pt; font-weight:bold;font-family:宋体;letter-spacing:normal'>文件标题</span></p>
+        <P class=MsoNormal style='font-size:12.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
+    </div>
+
+    <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend" style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'>主送单位：</span></p>
+
+    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:justify;font-size: 16pt;letter-spacing:-0.4pt'>
+        <p class=MsoNormal>　　文件正文</p>
+    </div>
+
+    <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;'>
+        <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
+            <td class="doc_layout_attachment_title_td" width=94 valign=top style='width:70.65pt;padding:0cm 0cm 0cm 0cm'>
+                <p class=MsoNormal><span style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'>　</span><span class="doc_layout_attachment_title" style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'>附件：</span></p>
+            </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:22.0pt;text-indent:-22.0pt; '>
+                        <span style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'><span style='mso-list:Ignore' class="doc_layout_attachment_content_serial">1</span><span>.</span></span>
+                        <span style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt' class="doc_layout_attachment_content_name"></span>
+                    </p>
+<!--                    <p class=MsoNormal style='margin-left:19.0pt;text-indent:-19.0pt; mso-char-indent-count:0;mso-list:l0 level1 lfo1'>-->
+<!--                        <![if !supportLists]><span style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'><span style='mso-list:Ignore'>2.<span>&nbsp;</span></span></span><![endif]>-->
+<!--                        <span style='font-size:16.0pt;font-family:仿宋;letter-spacing:-.2pt'>这是第二个附件需要换行显示一下我们来测试一下效果看看</span>-->
+<!--                    </p>-->
+                </div>
+            </td>
+        </tr>
+    </table>
+
+    <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>
+
+        <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'>
+                        <span class="doc_layout_issuanceUnit" style='mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;font-family:仿宋;letter-spacing:-0.4pt;'>[发文单位]</span>
+                    </p>
+                </td>
+                <td width=47 valign=top style='width:35.4pt;border-left:none;padding:0cm 0cm 0cm 0cm'>
+                    <p class=MsoNormal style='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 style='mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-.4pt'>　</span>
+                    </p>
+                </td>
+            </tr>
+
+            <tr>
+                <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>
+                <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'>
+                        <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>
+                    </p>
+                </td>
+                <td width=47 valign=top style='width:32pt;padding:0cm 0cm 0cm 0cm'>
+                    <p class=MsoNormal style='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 style='mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'>　</span>
+                    </p>
+                </td>
+            </tr>
+        </table>
+
+
+<!--        <table border=0 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-padding-alt:0cm 0cm 0cm 0cm'>-->
+<!--            <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>-->
+<!--                <td width=100% valign=top style='width:100%;padding:0cm 0cm 0cm 0cm'>-->
+<!--                    <table class="doc_layout_issuance doc_layout_headIssuance" 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'>-->
+<!--                            -->
+<!--                        </tr>-->
+<!--                    </table>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--            <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>-->
+<!--                <td width=100% valign=top style='width:100%;padding:0cm 0cm 0cm 0cm'>-->
+<!--                    <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: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'>-->
+<!--                                    <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>-->
+<!--                                </p>-->
+<!--                            </td>-->
+<!--                            <td width=47 valign=top style='width:32pt;padding:0cm 0cm 0cm 0cm'>-->
+<!--                                <p class=MsoNormal style='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 style='mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'>　</span>-->
+<!--                                </p>-->
+<!--                            </td>-->
+<!--                        </tr>-->
+<!--                    </table>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--            <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>-->
+<!--                <td width=100% valign=top style='width:100%;padding:0cm 0cm 0cm 0cm'>-->
+<!--                    <p class=MsoNormal>-->
+<!--                        <span class="doc_layout_annotation" style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'></span>-->
+<!--                    </p>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--        </table>-->
+    </div>
+
+    <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>
+                <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>
+                <td class="line_top_thick_bottom_thin" valign="top" colspan=2 style='width:360pt;border-left:none;border-right:none;padding:5.4pt 14pt 5.4pt 0cm'>
+                    <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>
+                <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'>
+                            <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>
+                            <td valign=top style='border:none; padding: 0pt 14pt 0pt 0pt'>
+                                <p class=MsoNormal align=right style='text-align:right'><span class="doc_layout_edition_issuance_date" style='font-size:14.0pt;font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman"; letter-spacing:0.4pt'>[印发时间]</span></p>
+                            </td>
+                        </tr>
+                    </table>
+
+<!--                    <table border=0 cellspacing=0 cellpadding=0 style='width:100%; border: none'>-->
+<!--                        <tr>-->
+<!--                            <td class="doc_layout_edition_issuance" width=315 colspan=2 valign=middle style='width:315pt;border:none; padding: 0pt 0pt 0pt 14pt'>-->
+<!--                                <p class=MsoNormal align=left style='font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal'><span class="doc_layout_edition_issuance_unit" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>[印发单位]</span></p>-->
+<!--                            </td>-->
+<!--                            <td width=120 valign=middle style='width:125pt;border:none; padding: 0pt 14pt 0pt 0pt'>-->
+<!--                                <p class=MsoNormal align=right style='font-size:14.0pt;font-family:仿宋; text-align:right;line-height: normal'><span class="doc_layout_edition_issuance_date" style='font-size:14.0pt;font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman"; letter-spacing:0.4pt'>[印发时间]</span></p>-->
+<!--                            </td>-->
+<!--                        </tr>-->
+<!--                    </table>-->
+                </td>
+
+            </tr>
+        </table>
+    </div>
+</div>

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

@@ -0,0 +1,204 @@
+<style>
+    @page WordSection1
+    {size:595.3pt 841.9pt;
+        margin:104.9pt 73.7pt 99.25pt 79.4pt;
+        mso-header-margin:42.55pt;
+        mso-footer-margin:49.6pt;
+        mso-paper-source:0;
+        layout-grid:15.6pt;
+        line-height:normal;
+        letter-spacing:-0.4pt;
+    }
+    div.WordSection1
+    {page:WordSection1;
+        ont-size:16.0pt;
+        font-family:仿宋;
+        line-height:normal;
+        letter-spacing:-0.4pt;
+    }
+    p.MsoNormal, li.MsoNormal, div.MsoNormal
+    {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:left;
+        text-justify:inter-ideograph;
+        mso-pagination:none;
+        font-size:16.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:仿宋;
+        line-height:28.0pt;
+        mso-line-height-rule:exactly;
+        mso-ascii-font-family:仿宋;
+        mso-ascii-theme-font:minor-latin;
+        mso-fareast-font-family:仿宋;
+        mso-fareast-theme-font:minor-fareast;
+        mso-hansi-font-family:仿宋;
+        mso-hansi-theme-font:minor-latin;
+        mso-bidi-font-family:"Times New Roman";
+        mso-bidi-theme-font:minor-bidi;
+        mso-font-kerning:1.0pt;}
+
+    .MsoRedHeader
+    {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:justify;
+        text-justify:inter-ideograph;
+        mso-pagination:none;
+        font-family:宋体;
+        mso-ascii-font-family:宋体;
+        mso-ascii-theme-font:minor-latin;
+        mso-fareast-font-family:宋体;
+        mso-fareast-theme-font:minor-fareast;
+        mso-hansi-font-family:宋体;
+        mso-hansi-theme-font:minor-latin;
+        mso-bidi-font-family:"Times New Roman";
+        mso-bidi-theme-font:minor-bidi;
+        mso-font-kerning:1.0pt;}
+    span.GramE
+    {mso-style-name:"";
+        mso-gram-e:yes;}
+    td.line_top_thin_bottom_thin
+    {
+        mso-border-bottom-alt: solid windowtext .75pt;
+        border-bottom:solid windowtext .75pt;
+        mso-border-top-alt: solid windowtext .75pt;
+        border-top:solid windowtext .75pt;
+    }
+    td.line_top_thin_bottom_thick
+    {
+        mso-border-top-alt: solid windowtext .75pt;
+        border-top:solid windowtext .75pt;
+        mso-border-bottom-alt: solid windowtext 1pt;
+        border-bottom:solid windowtext 1.5pt;
+    }
+    td.line_top_thick_bottom_thin
+    {
+        mso-border-top-alt: solid windowtext 1pt;
+        border-top:solid windowtext 1.5pt;
+        mso-border-bottom-alt: solid windowtext 0.75pt;
+        border-bottom:solid windowtext 0.75pt;
+    }
+    td.line_top_thick_bottom_thick
+    {
+        mso-border-bottom-alt: solid windowtext 1pt;
+        border-bottom:solid windowtext 1.5pt;
+        mso-border-top-alt: solid windowtext 1pt;
+        border-top:solid windowtext 1.5pt;
+    }
+</style>
+<div class=WordSection1 style='layout-grid:15.6pt; font-size:16.0pt;font-family:仿宋'>
+    <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>
+    </div>
+
+    <!--  红头  -->
+    <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">
+        <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'></p>
+    </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>
+            <td class="doc_layout_filenoup_fileno_td" width=321 valign=bottom style='width:280pt;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>
+            </td>
+            <td class="doc_layout_filenoup_signer_td" width=268 valign=top style='width:200.95pt;padding:0cm 0cm 0cm 0cm'>
+                <p class=MsoNormal align=right style='text-align:right'>
+                    <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><span style='font-size:16.0pt;font-family:仿宋'>&nbsp;&nbsp;</span></p>
+            </td>
+        </tr>
+    </table>
+
+    <p class="doc_block MsoNormal" align=left style='line-height:8.0pt'><hr class="doc_layout_redline" style="height: 1.5pt;line-height:8.0pt; backgroud-color: red;" color=red></p>
+
+    <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>
+    </div>
+
+<!--    <div class="doc_block">-->
+<!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
+<!--        <p class=MsoNormal align=center style='text-align:center'><span class="doc_layout_subject" style='font-size:22.0pt;font-family:宋体;font-weight:bold;letter-spacing:normal'>文件标题</span></p>-->
+<!--        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>-->
+<!--    </div>-->
+
+<!--    <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend" style='font-size:16.0pt;font-family:仿宋'>主送单位：</span></p>-->
+
+    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:justify;font-size: 16pt;letter-spacing:-0.4pt'>
+        <p class=MsoNormal>　　文件正文</p>
+    </div>
+
+    <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>
+    </div>
+
+<!--    <div class="doc_block">-->
+<!--        <table border=0 cellspacing=0 cellpadding=0 align=right width=auto style='width:auto;border-collapse:collapse;border:none;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: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></p>-->
+<!--                </td>-->
+<!--                <td width=47 valign=top style='border-left:none;padding:0cm 0cm 0cm 0cm'>-->
+<!--                    <p class=MsoNormal style='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 style='mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-.4pt'>　　　　</span>-->
+<!--                    </p>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--        </table>-->
+<!--    </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>
+            <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>
+                </p>
+            </td>
+            <td valign=top style='width:64pt; padding:0cm 0cm 0cm 0cm'>
+                <p class=MsoNormal style='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 style='mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-.4pt'>　　　　</span>
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <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>
+            <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>
+                </p>
+            </td>
+            <td valign=top style='width:64pt; padding:0cm 0cm 0cm 0cm'>
+                <p class=MsoNormal style='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 style='mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-.4pt'>　　　　</span>
+                </p>
+            </td>
+        </tr>
+    </table>
+
+
+
+
+
+
+
+</div>

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

@@ -23,6 +23,18 @@
     "layouts": {
     }
   },
+  "command": {
+    "name": "命令类",
+    "file": "command.html",
+    "layouts": {
+    }
+  },
+  "combine": {
+    "name": "联合发文类",
+    "file": "combine.html",
+    "layouts": {
+    }
+  },
   "empty": {
     "name": "空模板（仅正文）",
     "file": "empty.html",

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -796,6 +796,9 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 						data[k] = this._copyFormJson(initial[k], data[k]);
 					}
 					break;
+				case "boolean":
+					data[k] = initial[k];
+					break;
 				default :
 					if (initial[k]) data[k] = initial[k];
 			}

o2web/source/x_component_process_FormDesigner/Module/Form/form.html

@@ -126,7 +126,7 @@
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
             <tr>
                 <td colspan="2" class="editTableValue"><b>流转后提示框:</b>
-                    <input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}promptArea').setStyle('display', 'block');}" name="isPrompt" text{($.isPrompt!==false)?'checked':''} type="radio" value="ture"/>是
+                    <input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}promptArea').setStyle('display', 'block');}" name="isPrompt" text{($.isPrompt!==false)?'checked':''} type="radio" value="true"/>是
                     <input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}promptArea').setStyle('display', 'none'); }" name="isPrompt" text{($.isPrompt===false)?'checked':''} type="radio" value="false"/>否
                     <span>&nbsp;&nbsp;&nbsp;&nbsp;(仅用于新浏览器窗口打开时)</span>
                 </td>
@@ -173,4 +173,4 @@
 	<div title="JSON"  class="MWFTab">
 		<div class="MWFJSONArea" style="font-family: Verdana, Geneva, sans-serif; font-size:14px"></div>
 	</div>
-</div>
+</div>

o2web/source/x_component_process_ProcessDesigner/$Process/manual.html

@@ -30,6 +30,13 @@
                     <input title="谁先打开待办就由谁处理" class="editTableRadio" name="manualMode" text{($.manualMode=='grab')?'checked':''} type="radio" value="grab"/>抢办
                 </td>
             </tr>
+            <tr>
+                <td class="editTableValue"  colspan="2"><b>给未处理待办的人发待阅：</b>
+                    <input class="editTableRadio" name="manualUncompletedTaskToRead" text{($.manualUncompletedTaskToRead)?'checked':''} type="radio" value="true"/>是
+                    <input class="editTableRadio" name="manualUncompletedTaskToRead" text{(!$.manualUncompletedTaskToRead)?'checked':''} type="radio" value="false"/>否</td>
+            </tr>
+
+
             <tr>
                 <td class="editTableTitle">合并待办:</td>
                 <td class="editTableValue">

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -703,7 +703,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             var coptyToTitleNode = (this.layout_copytoTitle || this.layout_copyto2Title);
             if (coptyToTitleNode){
                 var editionTable = coptyToTitleNode.getParent("table");
-                if (editionTable.get("data-compute-style")=="y"){
+                if (editionTable) if (editionTable.get("data-compute-style")=="y"){
                     var rows = editionTable.rows;
                     for (var i=0; i<rows.length; i++){
                         var cell = rows[i].cells[0];
@@ -718,7 +718,6 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
                                 "min-width": ""+l+"pt"
                             });
                         }
-
                     }
                 }
             }
@@ -747,13 +746,25 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
     reSetEdit: function(control){
         //未进行数据绑定时，可允许编辑
         if (!control) var control = this.getEditControl();
-        if (!this.json.subjectValueData && this.json.subjectValueType=="data"){
-            this.layout_subject.set("contenteditable", control.subject);
-            this.layout_subject.addEvent("blur", function(){
-                this.getData();
-            }.bind(this))
+        if (this.layout_subject){
+            if (!this.json.subjectValueData && this.json.subjectValueType=="data"){
+                this.layout_subject.set("contenteditable", control.subject);
+                this.layout_subject.addEvent("blur", function(){
+                    this.getData();
+                }.bind(this))
+            }
         }
 
+        if (this.layout_issuanceUnit){
+            if (!this.json.issuanceUnitValueData && this.json.issuanceUnitValueType=="data"){
+                this.layout_issuanceUnit.set("contenteditable", control.issuanceUnit);
+                this.layout_issuanceUnit.addEvent("blur", function(){
+                    this.getData();
+                }.bind(this))
+            }
+        }
+
+
         // this.layout_subject.addEvent("keydown", function(e){
         //     debugger;
         //     if (this.json.subjectValueType=="data" && this.json.subjectValueData){
@@ -1098,7 +1109,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             }else{
                 this.form.workAction.getWorkcompletedAttachmentStream(data.id, ((this.form.businessData.workCompleted) ? this.form.businessData.workCompleted.id : this.form.businessData.work.id));
             }
-        }.bind(this), "$doc.doc");
+        }.bind(this));
     },
     _historyDoc: function(){
         this.getHistory(function(){
@@ -2211,7 +2222,7 @@ debugger;
             // }
             // this.data.attachment = atts;
         }
-        if (this.layout_issuanceUnit) this.data.issuanceUnit = this.layout_issuanceUnit.get("text");
+        if (this.layout_issuanceUnit) this.data.issuanceUnit = this.layout_issuanceUnit.get("html");
         if (this.layout_issuanceDate) this.data.issuanceDate = this.layout_issuanceDate.get("text");
         if (this.layout_annotation) this.data.annotation = this.layout_annotation.get("text");
         if (this.layout_copytoTitle) this.data.copytoTitle = this.layout_copytoTitle.get("text");
@@ -2307,7 +2318,7 @@ debugger;
                 this.setAttachmentData();
             }
 
-            if (this.layout_issuanceUnit) this.layout_issuanceUnit.set("text", data.issuanceUnit || " ");
+            if (this.layout_issuanceUnit) this.layout_issuanceUnit.set("html", data.issuanceUnit || " ");
             if (this.layout_issuanceDate) this.layout_issuanceDate.set("text", data.issuanceDate || " ");
             if (this.layout_annotation) this.layout_annotation.set("text", data.annotation || " ");
             if (this.layout_copytoTitle) this.layout_copytoTitle.set("text", data.copytoTitle || " ");
@@ -2382,7 +2393,7 @@ debugger;
             var coptyToTitleNode = (this.layout_copytoTitle || this.layout_copyto2Title);
             if (coptyToTitleNode){
                 var editionTable = coptyToTitleNode.getParent("table");
-                if (editionTable.get("data-compute-style")=="y"){
+                if (editionTable) if (editionTable.get("data-compute-style")=="y"){
                     var rows = editionTable.rows;
                     for (var i=0; i<rows.length; i++){
                         var cell = rows[i].cells[0];
@@ -2563,6 +2574,12 @@ debugger;
 
     toWord: function(callback, name){
         debugger;
+        var docNmae = name || "";
+        if (!docNmae){
+            try{
+                docNmae = this.json.toWordFilename || this.form.businessData.data.subject || this.form.businessData.data["$work"].title
+            }catch (e) {}
+        }
         var toEdit = false;
         if (this.editMode){
             toEdit = true;
@@ -2587,8 +2604,10 @@ debugger;
             htmlNode = this.removeDisplayNone(htmlNode);
             var content = "<html><head><meta charset=\"UTF-8\" /></head><body>"+tmpNode.get("html")+"</body></html>";
 
+            var fileName = docNmae || this.json.toWordFilename || "$doc";
+            fileName = fileName+".doc";
             var body = {
-                "fileName": name || this.json.toWordFilename || "$doc.doc",
+                "fileName": fileName,
                 "site": this.json.toWordSite || "$doc",
                 "content": content
             };