公文编辑器，word转换编辑保护，红头标题默认字体改为“华文中宋”，减少红线高度，抄送显示优化

o2web/source/o2_core/o2.js

@@ -1499,19 +1499,23 @@ if (window.Promise && !Promise.any){
                                 layout.session.token = xToken;
                             }
                         }
-                        var r = o2.runCallback(callback, "success", [responseJSON],null);
-                        resolve(r || responseJSON);
+                        //var r = o2.runCallback(callback, "success", [responseJSON],null);
+                        //resolve(r || responseJSON);
+                        resolve(responseJSON);
                         //return o2.runCallback(callback, "success", [responseJSON],null, resolve);
                     },
                     onFailure: function(xhr){
                         //var r = o2.runCallback(callback, "requestFailure", [xhr], null, reject);
-                        var r = o2.runCallback(callback, "failure", [xhr, "", ""], null);
-                        (r) ? reject(r) : reject(xhr, "", "");
+                        // var r = o2.runCallback(callback, "failure", [xhr, "", ""], null);
+                        // (r) ? reject(r) : reject(xhr, "", "");
+                        reject(xhr, "", "");
                         //return o2.runCallback(callback, "requestFailure", [xhr], null, reject);
                     }.bind(this),
                     onError: function(text, error){
-                        var r = o2.runCallback(callback, "error", [text, error], null, reject);
-                        (r) ? reject(r) : reject(null, text, error);
+                        // var r = o2.runCallback(callback, "error", [text, error], null, reject);
+                        // (r) ? reject(r) : reject(null, text, error);
+
+                        reject(null, text, error);
                         //return o2.runCallback(callback, "error", [text, error], null, reject);
                     }.bind(this)
                 });
@@ -1533,7 +1537,13 @@ if (window.Promise && !Promise.any){
                 }
                 //Content-Type	application/x-www-form-urlencoded; charset=utf-8
                 res.send(data);
-            }.bind(this));
+            }.bind(this)).then(function(responseJSON){
+                var r = o2.runCallback(callback, "success", [responseJSON],null);
+                return r || responseJSON;
+            }).catch(function(xhr, text, error){
+                var r = o2.runCallback(callback, "failure", [xhr, text, error], null);
+                return r || xhr || text || error;
+            });
 
             // p = p.then(function(responseJSON){
             //     return o2.runCallback(callback, "success", [responseJSON],null);

o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -632,15 +632,17 @@ MWF.xDesktop.Actions.RestActions.Callback = new Class({
     },
     doError: function(xhr, text, error){
         if (this.appendFailure) this.appendFailure(xhr, text, error);
+        var flag = true;
         if (this.failure && this.failure.owner){
             if (this.failure.reject || (this.failure.rejectList && this.failure.rejectList.length)){
                 return this.failure(xhr, text, error);
             }
             this.failure = null;
         }else{
-            if (this.failure) return this.failure(xhr, text, error);
+            if (this.failure) flag = !this.failure(xhr, text, error);
         }
-        if (!this.failure && !this.appendFailure){
+        //if (!this.failure && !this.appendFailure){
+        if (flag && !this.appendFailure){
             if (xhr.status!=0){
                 var errorText = error;
                 if (xhr){

o2web/source/x_component_process_FormDesigner/Main.js

@@ -1578,6 +1578,21 @@ MWF.xApplication.process.FormDesigner.Main = new Class({
                 if (this.pcForm) this.pcForm.fireEvent("postSaveError");
                 if (this.mobileForm) this.mobileForm.fireEvent("postSaveError");
 
+                // if (xhr.status!=0){
+                //     var errorText = error;
+                //     if (xhr){
+                //         var json = JSON.decode(xhr.responseText);
+                //         if (json){
+                //             errorText = json.message.trim() || "request json error";
+                //         }else{
+                //             errorText = "request json error: "+xhr.responseText;
+                //         }
+                //     }
+                //     errorText = errorText.replace(/\</g, "&lt;");
+                //     errorText = errorText.replace(/\</g, "&gt;");
+                //     if (layout.session && layout.session.user) MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
+                // }
+
                 var errorText = error+":"+text;
                 if (xhr) errorText = xhr.responseText;
                 MWF.xDesktop.notice("error", {x: "right", y:"top"}, "request json error: "+errorText);

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

@@ -216,9 +216,47 @@
 <!--					</td>-->
 <!--				</tr>-->
 			</table>
-
 			<div id="text{$.pid}toWordConditionArea" style="display: text{($.toWordCondition=='condition')?'block':'none'}" class="MWFFormulaArea" name="toWordConditionScript" title="{{$.lp.conversionCondition}} (S)"></div>
 
+			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+				<tr>
+					<td class="editTableTitle">{{$.lp.wordConversionEncryption}}:</td>
+					<td class="editTableValue">
+<!--						<input class="editTableRadio" name="wordConversionEncryption" onclick="if (this.checked) {$('text{$.pid}toWordPasswordArea').setStyle('display', 'block')}" text{($.wordConversionEncryption===true)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}-->
+<!--						<input class="editTableRadio" name="wordConversionEncryption" onclick="if (this.checked) {$('text{$.pid}toWordPasswordArea').setStyle('display', 'none')}" text{($.wordConversionEncryption!==true)?'checked':''} type="radio" value="false"/>{{$.lp.no}}-->
+						<input class="editTableRadio" name="wordConversionEncryption" text{($.wordConversionEncryption===true)?'checked':''} type="radio" value="true"/>{{$.lp.yes}}
+						<input class="editTableRadio" name="wordConversionEncryption" text{($.wordConversionEncryption!==true)?'checked':''} type="radio" value="false"/>{{$.lp.no}}
+						<div style="color:#333333">{{$.lp.wordConversionEncryptionInfo1}}</div>
+						<div style="color:#999999">{{$.lp.wordConversionEncryptionInfo}}</div>
+					</td>
+				</tr>
+			</table>
+
+<!--			<div id="text{$.pid}toWordPasswordArea" style="display: text{($.wordConversionEncryption===true)?'block':'none'}">-->
+<!--				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
+<!--					<tr>-->
+<!--						<td class="editTableTitle">{{$.lp.wordEncryptionPasswordType}}:</td>-->
+<!--						<td class="editTableValue">-->
+<!--							<input class="editTableRadio" name="wordEncryptionPasswordType" onclick="if (this.checked) {$('text{$.pid}toWordPasswordInputArea').setStyle('display', 'block'); $('text{$.pid}toWordPasswordScriptArea').setStyle('display', 'none')}" text{($.wordEncryptionPasswordType!=='script')?'checked':''} type="radio" value="static"/>{{$.lp.static}}-->
+<!--							<input class="editTableRadio" name="wordEncryptionPasswordType" onclick="if (this.checked) {$('text{$.pid}toWordPasswordInputArea').setStyle('display', 'none'); $('text{$.pid}toWordPasswordScriptArea').setStyle('display', 'block')}" text{($.wordEncryptionPasswordType==='script')?'checked':''} type="radio" value="byScript"/>{{$.lp.byScript}}-->
+<!--						</td>-->
+<!--					</tr>-->
+<!--				</table>-->
+
+<!--				<div id="text{$.pid}toWordPasswordInputArea" style="display: text{($.wordEncryptionPasswordType!=='script')?'block':'none'}">-->
+<!--					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
+<!--						<tr>-->
+<!--							<td class="editTableTitle">{{$.lp.wordEncryptionPasswordInput}}:</td>-->
+<!--							<td class="editTableValue"><input type="text" name="toWordPassword" value="text{$.toWordPassword}" class="editTableInput"/></td>-->
+<!--						</tr>-->
+<!--					</table>-->
+<!--				</div>-->
+<!--				<div id="text{$.pid}toWordPasswordScriptArea" style="display: text{($.wordEncryptionPasswordType=='script')?'block':'none'}">-->
+<!--					<div class="MWFFormulaArea" name="toWordPasswordScript" title="{{$.lp.toWordPasswordScript}} (S)"></div>-->
+<!--					<br><div style="color:#999999; padding: 0 10px">{{$.lp.toWordPasswordScriptInfo}}</div><br><br>-->
+<!--				</div>-->
+<!--			</div>-->
+
 		</div>
 
 

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

@@ -115,7 +115,7 @@
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>
             红头文件
         </div>
     </div>
@@ -176,7 +176,7 @@
     <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>
+                                                                        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>
@@ -216,50 +216,88 @@
         <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='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>
-                <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>
-
+        <table 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 style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
+                <td style="width:100%">
+                    <table align=right border=0 cellspacing=0 cellpadding=0 class="doc_layout_issuanceV2" style='width:auto; border-collapse:collapse;border:none;'>
+                        <tr>
+                            <td style='padding:0cm 0cm 0cm 0cm'>
+                                <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:"Times New Roman",仿宋;'>[发文单位]</span>
+                                </p>
+                            </td>
+                            <td style='width:64pt; border-left:none;padding:0cm 0cm 0cm 0cm'>
+                                <p class=MsoNormal><span>&#x3000;</span></p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style='padding:0cm 0cm 0cm 0cm'>
+                                <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>
+                            <td style='width:64pt; border-left:none;padding:0cm 0cm 0cm 0cm'>
+                                <p class=MsoNormal><span>&#x3000;</span></p>
+                            </td>
+                        </tr>
+                    </table>
                 </td>
             </tr>
-
-            <tr>
-                <td style='border-top:none;padding:0cm 0cm 0cm 0cm'>
-                    <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>
-                <td width=47 valign=top style='width:32pt;padding:0cm 0cm 0cm 0cm'>
+            <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 style="position: relative">
                         <img class="doc_layout_seal" width=160 height=160 data-mso-position-vertical="absolute"
                              data-mso-position-horizontal-relative="margin"
                              data-mso-position-vertical-relative="paragraph"
-                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-88pt; left:290pt;">
+                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:285pt;">
                     </p>
                 </td>
             </tr>
         </table>
+
+<!--        <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='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>-->
+<!--                <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='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>-->
+<!--                <td width=47 valign=top style='width:32pt;padding:0cm 0cm 0cm 0cm'>-->
+<!--                    <p class=MsoNormal style="position: relative">-->
+<!--                        <img class="doc_layout_seal" width=160 height=160 data-mso-position-vertical="absolute"-->
+<!--                             data-mso-position-horizontal-relative="margin"-->
+<!--                             data-mso-position-vertical-relative="paragraph"-->
+<!--                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-88pt; left:290pt;">-->
+<!--                    </p>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--        </table>-->
     </div>
     <div class="doc_block">
         <p class=MsoNormal>

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

@@ -104,7 +104,7 @@
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>
             ＸＸＸＸＸＸ令
         </div>
     </div>

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

@@ -138,7 +138,7 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>公司函
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>公司函
         </div>
     </div>
 
@@ -189,7 +189,7 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
     <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:宋体;letter-spacing:normal'>文件标题</span>
+                                                                        style='font-size:22.0pt;font-family:华文中宋;letter-spacing:normal'>文件标题</span>
         </p>
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
     </div>
@@ -228,42 +228,28 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
         <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 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" 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'>
+        <table border=0 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-padding-alt:0cm 0cm 0cm 0cm'>
+            <tr>
+                <td style="width:100%">
+                    <table align=right border=0 cellspacing=0 cellpadding=0 class="doc_layout_issuanceV2" style='width:auto; border-collapse:collapse;border:none;'>
+                        <tr>
                             <td style='padding:0cm 0cm 0cm 0cm'>
-                                <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 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:"Times New Roman",仿宋;'>[发文单位]</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 style='width:64pt; border-left:none;padding:0cm 0cm 0cm 0cm'>
+                                <p class=MsoNormal><span>&#x3000;</span></p>
                             </td>
                         </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='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>
+                        <tr>
+                            <td style='padding:0cm 0cm 0cm 0cm'>
+                                <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>
-                            <td width=47 valign=top style='width:35.4pt;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:仿宋;'>　</span>
-                                </p>
+                            <td style='width:64pt; border-left:none;padding:0cm 0cm 0cm 0cm'>
+                                <p class=MsoNormal><span>&#x3000;</span></p>
                             </td>
                         </tr>
                     </table>
@@ -275,11 +261,62 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
                         <img class="doc_layout_seal" width=160 height=160 data-mso-position-vertical="absolute"
                              data-mso-position-horizontal-relative="margin"
                              data-mso-position-vertical-relative="paragraph"
-                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:290pt;">
+                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:285pt;">
                     </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" 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='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>-->
+<!--                            <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 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='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>-->
+<!--                            <td width=47 valign=top style='width:35.4pt;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:仿宋;'>　</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 style="position: relative">-->
+<!--                        <img class="doc_layout_seal" width=160 height=160 data-mso-position-vertical="absolute"-->
+<!--                             data-mso-position-horizontal-relative="margin"-->
+<!--                             data-mso-position-vertical-relative="paragraph"-->
+<!--                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:290pt;">-->
+<!--                    </p>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--        </table>-->
     </div>
     <div class="doc_block">
         <p class=MsoNormal>

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

@@ -115,7 +115,7 @@
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>××××××纪要</div>
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>××××××纪要</div>
     </div>
 
 
@@ -151,7 +151,7 @@
     <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>
+                                                                        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>

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

@@ -115,7 +115,7 @@
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>××××××纪要</div>
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>××××××纪要</div>
     </div>
 
 
@@ -164,7 +164,7 @@
     <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>
+                                                                        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>

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

@@ -112,7 +112,7 @@
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>
             纪 委 文 件
         </div>
     </div>
@@ -144,7 +144,7 @@
             <td style="width: 16pt;"><span style='font-size:16.0pt;font-family:仿宋'>　</span></td>
         </tr>
     </table>
-
+    <P class=MsoNormal style='line-height: 1pt; font-size: 1pt'><span>&nbsp</span></P>
     <table cellpadding=0 cellspacing=0 align=left>
         <tr>
             <td height=18><img width=280 height=3 style="margin-bottom: 7px"
@@ -163,7 +163,7 @@
     <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>
+                                                                        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>

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

@@ -134,12 +134,12 @@
     <!--  红头  -->
     <div class="doc_block">
         <div class="MsoRedHeader doc_layout_redHeader" align=center
-             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:宋体,sans-serif;color:red;letter-spacing:normal'>红头文件</div>
+             style='text-align:center;mso-line-height-rule:exactly;font-weight:bold; font-size:42.0pt;font-family:华文中宋,sans-serif;color:red;letter-spacing:normal'>红头文件</div>
     </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>
+                style='font-size:16.0pt;font-family:仿宋'>&#x3000;</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>
@@ -149,14 +149,14 @@
            style='width:100%; 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 class=MsoNormal align=center style='text-align:center'><span style='font-size:16.0pt;font-family:仿宋'>&#x3000;</span>
                 </p>
             </td>
         </tr>
         <tr>
             <td class="doc_layout_filenoup_fileno_td" 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
+                        style='font-size:16.0pt;font-family:仿宋'>&#x3000;</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>
@@ -189,11 +189,11 @@
     <!--    </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 style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&#x3000;</span></P>
         <p class=MsoNormal align=center style='text-align:center'><span class="doc_layout_subject"
-                                                                        style='font-size:22.0pt; font-weight:normal;font-family: "Times New Roman","宋体";letter-spacing:normal'>文件标题</span>
+                                                                        style='font-size:22.0pt; font-weight:normal;font-family: "华文中宋";letter-spacing:normal'>文件标题</span>
         </p>
-        <P class=MsoNormal style='font-size:12.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
+        <P class=MsoNormal style='font-size:12.0pt;font-family:仿宋;line-height: 22pt'><span>&#x3000;</span></P>
     </div>
 
     <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend"
@@ -201,17 +201,17 @@
     </p>
 
     <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:justify;font-size: 16pt;'>
-        <p class=MsoNormal>　　文件正文</p>
+        <p class=MsoNormal>&#x3000;&#x3000;文件正文</p>
     </div>
 
-    <P class="MsoNormal doc_block" style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
+    <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;'>
         <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>　　</span><span
+                <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'>
@@ -226,51 +226,32 @@
     </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>
+        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&#x3000;</span></P>
+        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&#x3000;</span></P>
+        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&#x3000;</span></P>
 
-        <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" 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'>
+        <table border=0 cellspacing=0 cellpadding=0 style='width:100%; border-collapse:collapse;border:none;mso-padding-alt:0cm 0cm 0cm 0cm'>
+            <tr>
+                <td style="width:100%">
+                    <table align=right border=0 cellspacing=0 cellpadding=0 class="doc_layout_issuanceV2" style='width:auto; border-collapse:collapse;border:none;'>
+                        <tr>
                             <td style='padding:0cm 0cm 0cm 0cm'>
-                                <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 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:"Times New Roman",仿宋;'>[发文单位]</span>
                                 </p>
                             </td>
-                            <td valign=top style='width:64pt;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 style='width:64pt; border-left:none;padding:0cm 0cm 0cm 0cm'>
+                                <p class=MsoNormal><span>&#x3000;</span></p>
                             </td>
                         </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;'>
-                        <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='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>
+                        <tr>
+                            <td style='padding:0cm 0cm 0cm 0cm'>
+                                <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>
-                            <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;mso-height-rule:exactly'>
-                                    <span style='mso-bidi-font-size:16.0pt;font-family:仿宋;'>　</span>
-                                </p>
+                            <td style='width:64pt; border-left:none;padding:0cm 0cm 0cm 0cm'>
+                                <p class=MsoNormal><span>&#x3000;</span></p>
                             </td>
                         </tr>
                     </table>
@@ -287,19 +268,80 @@
                 </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" 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='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:"Times New Roman",仿宋;'>[发文单位]</span>-->
+<!--                                </p>-->
+<!--                            </td>-->
+<!--                            <td valign=top style='width:64pt;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'>&#x3000;</span>-->
+<!--                                </p>-->
+<!--                            </td>-->
+<!--                        </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;'>-->
+<!--                        <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='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>-->
+<!--                            <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;mso-height-rule:exactly'>-->
+<!--                                    <span style='mso-bidi-font-size:16.0pt;font-family:仿宋;'>&#x3000;</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 style="position: relative">-->
+<!--                        <img class="doc_layout_seal" width=160 height=160 data-mso-position-vertical="absolute"-->
+<!--                             data-mso-position-horizontal-relative="margin"-->
+<!--                             data-mso-position-vertical-relative="paragraph"-->
+<!--                             style="border:1px solid #cccccc; border-radius: 100px; position: absolute; top:-100pt; left:285pt;">-->
+<!--                    </p>-->
+<!--                </td>-->
+<!--            </tr>-->
+<!--        </table>-->
     </div>
     <div class="doc_block">
         <p class=MsoNormal>
-            <span style='mso-bidi-font-size:16.0pt;font-family:仿宋;'>　　</span><span class="doc_layout_annotation" style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'></span>
+            <span style='mso-bidi-font-size:16.0pt;font-family:仿宋;'>&#x3000;&#x3000;</span><span class="doc_layout_annotation" style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'></span>
         </p>
     </div>
 
     <div class="MsoNormal doc_block doc_layout_attachment_text" style="margin: 16pt 0; font-family:仿宋;text-align:justify;font-size: 16pt;"></div>
 
     <div class="doc_block doc_layout_editionArea">
-        <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>&#x3000;</span></P>
+        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&#x3000;</span></P>
+        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&#x3000;</span></P>
         <table class="doc_block doc_layout_edition" data-compute-style="y" border=0 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">
@@ -326,7 +368,7 @@
                                 style='border:none; padding: 0pt 0pt 0pt 14pt'>
                                 <p class=MsoNormal align=left style='line-height:24pt;text-align:left'><span
                                         class="doc_layout_edition_issuance_unit"
-                                        style='font-size:14.0pt;font-family:仿宋;'>[印发单位]</span>
+                                        style='font-size:14.0pt;font-family:"Times New Roman",仿宋;'>[印发单位]</span>
                                 </p>
                             </td>
                             <td valign=top style='border:none; padding: 0pt 14pt 0pt 0pt'>

o2web/source/x_component_process_FormDesigner/lp/en.js

@@ -789,6 +789,14 @@ MWF.xApplication.process.FormDesigner.LP = {
         "conversionCondition": "Conversion Condition",
         "alwaysConvert": "Always",
         "whenConditionsMet": "Met Condition",
+        "static": "static",
+        "wordConversionEncryption": "Edit Protection",
+        "wordConversionEncryptionInfo": "If you select \"Yes\", the converted file will be edited and protected, and all editing of the converted Word document will be restricted. The password provided below will be used as the password for document protection. If the password is not provided, editing protection will also be carried out, but the protection can be removed in Work without a password.",
+        "wordEncryptionPasswordType": "Password",
+        "toWordPasswordScript": "Password Script",
+        "wordEncryptionPasswordInput":"Enter password",
+        "toWordPasswordScriptInfo": "Return a string as the password. Note: Administrators or clerks and other related personnel need to know this password, otherwise the converted files will not be unprotected",
+
         "config": "Config",
         "copiesSecretPriority": "Copies Secret And Priority",
         "isShow": "Whether to show",

o2web/source/x_component_process_FormDesigner/lp/zh-cn.js

@@ -794,6 +794,15 @@ MWF.xApplication.process.FormDesigner.LP = {
         "conversionCondition": "转换条件",
         "alwaysConvert": "始终转换",
         "whenConditionsMet": "满足条件时转换",
+        "static": "固定",
+        "wordConversionEncryption": "编辑保护",
+        "wordConversionEncryptionInfo1": "（仅OOXML方式可用）",
+        "wordConversionEncryptionInfo": "如果选择“是”，将对转换后的文件进行编辑保护，限制对转换的Word文档的所有编辑。",
+        "wordEncryptionPasswordType": "密码",
+        "toWordPasswordScript": "密码脚本",
+        "wordEncryptionPasswordInput":"输入密码",
+        "toWordPasswordScriptInfo": "返回一个字符串作为密码。注意：管理员或文书等相关人员需要知晓此密码，否则转换后的文件将无法解除保护",
+
         "config": "配置",
         "copiesSecretPriority": "份数密级紧急度",
         "isShow": "是否显示",

o2web/source/x_component_process_ProcessDesigner/lp/en.js

@@ -327,7 +327,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 		"deleteParameter": "Delete Parameter",
 		"responseScript": "Response Script",
 		"use": "Use",
-		"getJson": " get JSON Object",
+		"getJson": " get response content. If the response content is a string in JSON format, a JSON object is returned; otherwise, the original response content is returned.",
 		"systemRequest": "System Service",
 		"restAddr": "Restful Address ",
 		"requestBodyScript": "Request Body Script",

o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js

@@ -326,7 +326,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 		"deleteParameter": "删除参数",
 		"responseScript": "响应脚本",
 		"use": "使用",
-		"getJson": "获取响应的JSON对象",
+		"getJson": "获取响应内容。如果响应内容是JSON格式的字符串，则返回JSON对象；否则返回原始响应内容。",
 		"systemRequest": "系统内请求",
 		"restAddr": "REST地址",
 		"requestBodyScript": "消息体脚本",

o2web/source/x_component_process_Xform/widget/OOXML.js

@@ -44,8 +44,24 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
             "            xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"\n" +
             "            xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\"\n" +
             "            mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14\">",
+        "w_setting": "<w:settings xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n" +
+            "            xmlns:o=\"urn:schemas-microsoft-com:office:office\"\n" +
+            "            xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"\n" +
+            "            xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\"\n" +
+            "            xmlns:w10=\"urn:schemas-microsoft-com:office:word\"\n" +
+            "            xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\"\n" +
+            "            xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\"\n" +
+            "            xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\"\n" +
+            "            xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\"\n" +
+            "            xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\"\n" +
+            "            xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\"\n" +
+            "            xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\"\n" +
+            "            xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\"\n" +
+            "            xmlns:sl=\"http://schemas.openxmlformats.org/schemaLibrary/2006/main\"\n" +
+            "            mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh\">",
         "xmlHead": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>",
-        "divAsP": false
+        "divAsP": false,
+        "protection": false
     },
     initialize: function(options){
         this.setOptions(options);
@@ -82,7 +98,8 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
         }.bind(this));
     },
     processDocument: function(data){
-        return this.zip.file("word/document.xml").async("text").then(function(oo_string){
+        var promise = [];
+        var p1 = this.zip.file("word/document.xml").async("text").then(function(oo_string){
             return this.processWordDocument(oo_string, data);
         }.bind(this)).then(function(oo_str){
             if (oo_str.substring(0, 5)!=="<?xml"){
@@ -93,21 +110,85 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
 
             if (this.pics && this.pics.length){
                 return this.zip.file("word/_rels/document.xml.rels").async("text").then(function(oo_relString){
-                   return this.processWordRel(oo_relString);
+                    return this.processWordRel(oo_relString);
                 }.bind(this)).then(function(oo_relStr){
                     //return oo_relStrPromise.then(function(oo_relStr){
-                        if (oo_relStr.substring(0, 5)!=="<?xml"){
-                            oo_relStr = this.options.xmlHead + oo_relStr;
-                        }
-                        return this.zip.file("word/_rels/document.xml.rels", oo_relStr).generateAsync({type:"blob"});
+                    if (oo_relStr.substring(0, 5)!=="<?xml"){
+                        oo_relStr = this.options.xmlHead + oo_relStr;
+                    }
+                    //return this.zip.file("word/_rels/document.xml.rels", oo_relStr).generateAsync({type:"blob"});
+                    return this.zip.file("word/_rels/document.xml.rels", oo_relStr);
                     //}.bind(this));
                 }.bind(this));
             }
-            return this.zip.generateAsync({type:"blob"});
+            return this.zip;
             // this.zip.file("word/document.xml", oo_str).generateAsync({type:"blob"}).then(function(oo_content) {
             //     this.saveAs(oo_content, "example.docx");
             // }.bind(this));
         }.bind(this));
+        promise.push(p1);
+
+        if (this.options.protection){
+            var p2 = this.zip.file("word/settings.xml").async("text").then(function(oo_string){
+                return this.processWordSetting(oo_string);
+            }.bind(this)).then(function(oo_settingStr){
+                if (oo_settingStr.substring(0, 5)!=="<?xml"){
+                    oo_settingStr = oo_settingStr.replace(/<w:settings.*\>/, this.options.w_setting);
+                    oo_settingStr = this.options.xmlHead + oo_settingStr;
+                }
+                return this.zip.file("word/settings.xml", oo_settingStr);
+            }.bind(this));
+            promise.push(p2);
+        }
+
+        return Promise.all(promise).then(function(){
+            return this.zip.generateAsync({type:"blob"});
+        }.bind(this));
+    },
+    processWordSetting: function(oo_string){
+        var domparser = new DOMParser();
+        var oo_doc = domparser.parseFromString(oo_string, "text/xml");
+
+        var oo_settings = oo_doc.documentElement;
+
+        return new Promise(function(resolve){
+            o2.require("o2.widget.Base64", function(){
+                o2.load(["../o2_lib/CryptoJS/tripledes.js", "../o2_lib/CryptoJS/components/aes.js"], function () {
+                    var keyStr = (new o2.widget.UUID()).toString();
+                    var key = CryptoJS.enc.Utf8.parse(keyStr.substr(0, 16));
+                    var iv = CryptoJS.enc.Utf8.parse(keyStr.substr(0, 16));
+
+                    var ps = new o2.widget.UUID().toString();
+                    //var srcs = CryptoJS.enc.Utf8.parse(ps);
+                    encrypted = CryptoJS.AES.encrypt(ps, key, {
+                        iv: iv,
+                        mode: CryptoJS.mode.CBC,
+                        padding: CryptoJS.pad.Pkcs7
+                    });
+                    var hash = o2.widget.Base64.encode(encrypted.ciphertext.toString());
+                    var salt = o2.widget.Base64.encode(keyStr);
+
+                    var oo_protection = this.createEl(oo_doc, "documentProtection");
+                    this.setAttrs(oo_protection, {
+                        "salt": salt,
+                        "hash": hash,
+                        "cryptSpinCount": "100000",
+                        "cryptAlgorithmSid": "4",
+                        "cryptAlgorithmType": "typeAny",
+                        "cryptAlgorithmClass": "hash",
+                        "cryptProviderType": "rsaAES",
+                        "enforcement": "1",
+                        "formatting": "1",
+                        "edit": "readOnly"
+                    });
+                    oo_settings.appendChild(oo_protection);
+
+                    var s = new XMLSerializer();
+                    resolve(s.serializeToString(oo_doc));
+
+                }.bind(this));
+            }.bind(this));
+        }.bind(this));
     },
     saveAs: function(content, name){
         o2.saveAs(content, name);
@@ -316,10 +397,14 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
                     var top = dom.getPosition(dom.getParent(".WordSection1")).y;
                     var pageH = this.pageHeight/20-this["page-margin-top"]/20-this["page-margin-bottom"]/20;
                     var tmp = this.pxToPt(top+h)/pageH;
+                    var tmp2 = this.pxToPt(top)/pageH;
                     var ps = tmp.toInt();
+                    var ps2 = tmp2.toInt();
                     if (tmp>ps) ps = ps+1;
+                    if (tmp2>ps2) ps2 = ps2+1;
                     if ((ps % 2)!=0){
                         var p = new Element("p", {"styles": {"page-break-after":"always"}}).inject(dom, "top");
+                        if ((ps2 % 2)==0){new Element("p", {"styles": {"page-break-after":"always"}}).inject(dom, "top");}
                     }
                     this.processDom(dom, oo_body, append, divAsP);
 
@@ -364,6 +449,14 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
     //     }
     // },
     processFiletext: function(dom, oo_body, append){
+        var node = dom.firstChild;
+        if (node && node.nodeType===Node.TEXT_NODE){
+            var text = node.nodeValue.replace(/[\u200B-\u200D\uFEFF]/g, '')
+            if (text){
+                var oo_p = this.createParagraphFromDom(dom, oo_body, append);
+                this.processRun(dom, oo_p, dom, node.nodeValue);
+            }
+        }
         node = dom.getFirst();
         while (node){
             if (node.tagName.toLowerCase() === "div" || node.tagName.toLowerCase() === "p") {
@@ -1431,7 +1524,14 @@ debugger;
     processHr: function(hr, oo_body, append){
         var oo_doc = oo_body.ownerDocument;
 
-        var oo_p = this.createParagraph(oo_doc, {});
+        var oo_p = this.createParagraph(oo_doc, {
+            "pPrs": {
+                "spacing": {
+                    "lineRule": "exact",
+                    "line": "40"    //段落行高设置为固定值2pt
+                }
+            }
+        });
         if (append){
             oo_body.appendChild(oo_p);
         }else{
@@ -1464,7 +1564,7 @@ debugger;
         var oo_positionV = this.createEl(oo_doc, "positionV", "wp");
         this.setAttrs(oo_positionV, {"relativeFrom": "paragraph"}, false);
         var oo_posOffset = this.createEl(oo_doc, "posOffset", "wp");
-        oo_posOffset.appendChild(oo_doc.createTextNode("161290"));  //此处需要根据行高来设置数值,暂时固定数值
+        oo_posOffset.appendChild(oo_doc.createTextNode("3810"));  //此处需要根据行高来设置数值,暂时固定数值
         oo_positionV.appendChild(oo_posOffset);
 
         var oo_extent = this.createEl(oo_doc, "extent", "wp");