高级替换 对表格内的支持优化

Author: ping9719

src/MiniWord/Extensions/ObjectExtension.cs

@@ -29,7 +29,7 @@ internal static Dictionary<string, object> ToDictionary(this object value)
 
 					if (IsStrongTypeEnumerable(val1))
 					{
-						var isValueOrStringType = false; ;
+						var isValueOrStringType = false;
 						List<Dictionary<string, object>> sx = new List<Dictionary<string, object>>();
 						foreach (object val1item in (IEnumerable)val1)
 						{
@@ -76,7 +76,7 @@ internal static Dictionary<string, object> ToDictionary(this object value)
 				return reuslt;
 			}
 		}
-		internal static bool IsStrongTypeEnumerable(object obj)
+		internal static bool IsStrongTypeEnumerable(this object obj)
 		{
 			return obj is IEnumerable && !(obj is string) && !(obj is char[]) && !(obj is string[]);
 		}

src/MiniWord/MiniWord.Implment.cs

@@ -45,7 +45,7 @@ private static void Generate(this OpenXmlElement xmlElement, WordprocessingDocum
             // avoid {{tag}} like <t>{</t><t>{</t> 
             //AvoidSplitTagText(xmlElement);
             // avoid {{tag}} like <t>aa{</t><t>{</t>  test in...
-            AvoidSplitTagText(xmlElement, tags.Select(o => "{{" + o.Key + "}}"));
+            AvoidSplitTagText(xmlElement, GetReplaceKeys(tags));
 
             //Tables
             var tables = xmlElement.Descendants<Table>().ToArray();
@@ -149,7 +149,7 @@ private static void AvoidSplitTagText(OpenXmlElement xmlElement)
 
         private static void AvoidSplitTagText(OpenXmlElement xmlElement, IEnumerable<string> txt)
         {
-            foreach (var paragraph in xmlElement.Elements<Paragraph>())
+            foreach (var paragraph in xmlElement.Descendants<Paragraph>())
             {
                 foreach (var continuousString in paragraph.GetContinuousString())
                 {
@@ -161,6 +161,31 @@ private static void AvoidSplitTagText(OpenXmlElement xmlElement, IEnumerable<str
             }
         }
 
+        private static List<string> GetReplaceKeys(Dictionary<string, object> tags)
+        {
+            var keys = new List<string>();
+            foreach (var item in tags)
+            {
+                if (item.Value.IsStrongTypeEnumerable())
+                {
+                    foreach (var item2 in (IEnumerable)item.Value)
+                    {
+                        if (item2 is Dictionary<string, object> dic)
+                        {
+                            foreach (var item3 in dic.Keys)
+                                keys.Add("{{" + item.Key + "." + item3 + "}}");
+                        }
+                        break;
+                    }
+                }
+                else
+                {
+                    keys.Add("{{" + item.Key + "}}");
+                }
+            }
+            return keys;
+        }
+
         private static void ReplaceText(OpenXmlElement xmlElement, WordprocessingDocument docx, Dictionary<string, object> tags)
         {
             var paragraphs = xmlElement.Descendants<Paragraph>().ToArray();