From 127cd7453de5ef4338f80d091a6cf6e2c73f94b5 Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Tue, 6 Jul 2021 04:22:30 +0000
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E6=96=87=E8=BD=ACword=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 476cf4e5f05a543bdc90bfb57cf3d064aac72899)
---
 .../Documenteditor/templete/standard.html     |  4 +-
 .../x_component_process_Xform/widget/OOXML.js | 50 +++++--------------
 2 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html
index 40d9375010..60f8e3fd15 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html
@@ -127,7 +127,7 @@
             <p class="MsoNormal" align=center style='text-align:center'><span class="doc_layout_fileno" style='mso-bidi-font-size:16.0pt;font-family:"Times New Roman",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:"Times New Roman"'></span></p>
         </div>
 
-    <table class="doc_block 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;'>
+    <table class="doc_block doc_layout_filenoup" border=0 cellspacing=0 cellpadding=0 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>
@@ -154,7 +154,7 @@
     </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; background-color: red;" color=red />
+    <hr class="doc_layout_redline" style="width:100%; height: 1.5pt;line-height:8.0pt; background-color: red;" color=red />
 <!--    </p>-->
 
     <div class="doc_block">
diff --git a/o2web/source/x_component_process_Xform/widget/OOXML.js b/o2web/source/x_component_process_Xform/widget/OOXML.js
index 375eb7ad75..3eb9be6883 100644
--- a/o2web/source/x_component_process_Xform/widget/OOXML.js
+++ b/o2web/source/x_component_process_Xform/widget/OOXML.js
@@ -1498,43 +1498,19 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
         this.insertSiblings(oo_wsp, [oo_cNvCnPr, oo_spPr, oo_style, oo_bodyPr], "beforeend");
 
 
-        // <a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
-        //     <a:graphicData uri="http://schemas.microsoft.com/office/word/2010/wordprocessingShape">
-        //         <wps:wsp>
-        //             <wps:cNvCnPr/>
-        //             <wps:spPr>
-        //                 <a:xfrm>
-        //                     <a:off x="0" y="0"/>
-        //                     <a:ext cx="5631180" cy="0"/>
-        //                 </a:xfrm>
-        //                 <a:prstGeom prst="line">
-        //                     <a:avLst/>
-        //                 </a:prstGeom>
-        //                 <a:ln w="19050">
-        //                     <a:solidFill>
-        //                         <a:srgbClr val="FF0000"/>
-        //                     </a:solidFill>
-        //                 </a:ln>
-        //             </wps:spPr>
-        //             <wps:style>
-        //                 <a:lnRef idx="1">
-        //                     <a:schemeClr val="accent1"/>
-        //                 </a:lnRef>
-        //                 <a:fillRef idx="0">
-        //                     <a:schemeClr val="accent1"/>
-        //                 </a:fillRef>
-        //                 <a:effectRef idx="0">
-        //                     <a:schemeClr val="accent1"/>
-        //                 </a:effectRef>
-        //                 <a:fontRef idx="minor">
-        //                     <a:schemeClr val="tx1"/>
-        //                 </a:fontRef>
-        //             </wps:style>
-        //             <wps:bodyPr/>
-        //         </wps:wsp>
-        //     </a:graphicData>
-        // </a:graphic>
-
+        var w = hr.style.width;
+        if (w && o2.typeOf(w)==="string"){
+            var u = w.substring(w.length-1, w.length);
+            if (u==="%"){
+                w = w.toFloat()*1000;
+                var oo_sizeRelH = this.createEl(oo_doc, "sizeRelH", "wp14");
+                this.setAttrs(oo_sizeRelH, {"relativeFrom": "margin"}, false);
+                var oo_pctWidth = this.createEl(oo_doc, "pctWidth", "wp14");
+                oo_pctWidth.appendChild(oo_doc.createTextNode(w));
+                oo_sizeRelH.appendChild(oo_pctWidth);
+                oo_anchor.appendChild(oo_sizeRelH);
+            }
+        }
         oo_p.appendChild(oo_run);
     },
 
-- 
GitLab