替换 完美解决 <t>aa{</t><t>{</t>

Author: ping9719

src/MiniWord/Extensions/OpenXmlExtension.cs

@@ -38,7 +38,7 @@ internal static List<Tuple<string, List<Run>, List<Text>>> GetContinuousString(t
                         var text = run.GetFirstChild<Text>();
                         runs.Add(run);
                         texts.Add(text);
-                        sb.Append(text.InnerText);
+                        sb.Append(text.Text);
                     }
                     else
                     {
@@ -73,9 +73,9 @@ internal static List<Tuple<string, List<Run>, List<Text>>> GetContinuousString(t
             if (runs.Any())
                 tuples.Add(new Tuple<string, List<Run>, List<Text>>(sb.ToString(), runs, texts));
 
-            sb = new StringBuilder();
-            runs = new List<Run>();
-            texts = new List<Text>();
+            sb = null;
+            runs = null;
+            texts = null;
 
             return tuples;
         }
@@ -93,64 +93,42 @@ internal static void TrimStringToInContinuousString(this IEnumerable<Text> texts
             //优化块为：[AB][C][DE][FGH][]
              */
 
-            var index = string.Concat(texts.SelectMany(o => o.Text)).IndexOf(text);
-            if (index == -1)
+            var allTxtx = string.Concat(texts.SelectMany(o => o.Text));
+            var indexState = allTxtx.IndexOf(text);
+            if (indexState == -1)
                 return;
 
-            int i = -1;
-            int addLengg = 0;
-            bool isbr = false;
-            foreach (var textWord in texts)
+            int indexEnd = indexState + text.Length - 1;
+            List<Tuple<int, char>> yl = new List<Tuple<int, char>>(allTxtx.Length);
+            int iRun = 0;
+            int iIndex = 0;
+            int iRunOf = -1;
+            foreach (var item in texts)
             {
-                if (addLengg > 0)
+                foreach (var item2 in item.Text)
                 {
-                    isbr = true;
-                    var leng = textWord.Text.Length;
-
-                    if (addLengg - leng > 0)
-                    {
-                        addLengg -= leng;
-                        textWord.Text = "";
-                    }
-                    else if (addLengg - leng == 0)
+                    if (indexState <= iIndex && iIndex <= indexEnd)
                     {
-                        textWord.Text = "";
-                        break;
+                        if (iRunOf == -1)
+                            iRunOf = iRun;
+
+                        yl.Add(new Tuple<int, char>(iRunOf, item2));
                     }
                     else
                     {
-                        textWord.Text = textWord.Text.Substring(addLengg);
-                    }
-                }
-                else if (isbr)
-                {
-                    break;
-                }
-                else
-                {
-                    i += textWord.Text.Length;
-                    //开始包含
-                    if (i >= index)
-                    {
-                        //全部包含
-                        if (textWord.Text.Contains(text))
-                        {
-                            break;
-                        }
-                        //部分包含
-                        else
-                        {
-                            var str1 = textWord.Text.Substring(0, i - index + 1);
-                            if (i == index)
-                                str1 = "";
-
-                            var str2 = str1 + text;
-
-                            addLengg = str2.Length - textWord.Text.Length;
-                            textWord.Text = str2;
-                        }
+                        yl.Add(new Tuple<int, char>(iRun, item2));
                     }
+
+                    iIndex++;
                 }
+                iRun++;
+            }
+
+            int i = 0;
+            foreach (var item in texts)
+            {
+                item.Text = string.Concat(yl.Where(o => o.Item1 == i).Select(o => o.Item2));
+                i++;
             }
 
         }

src/MiniWord/MiniWord.Implment.cs

@@ -43,9 +43,9 @@ private static void SaveAsByTemplateImpl(Stream stream, byte[] template, Diction
         private static void Generate(this OpenXmlElement xmlElement, WordprocessingDocument docx, Dictionary<string, object> tags)
         {
             // avoid {{tag}} like <t>{</t><t>{</t> 
-            AvoidSplitTagText(xmlElement);
+            //AvoidSplitTagText(xmlElement);
             // avoid {{tag}} like <t>aa{</t><t>{</t>  test in...
-            //AvoidSplitTagText(xmlElement, tags.Select(o => "{{" + o.Key + "}}"));
+            AvoidSplitTagText(xmlElement, tags.Select(o => "{{" + o.Key + "}}"));
 
             //Tables
             var tables = xmlElement.Descendants<Table>().ToArray();