Fix propInfo.Key missing

mini-software · Mar 6, 2024 · 6151c3f · 6151c3f
1 parent 3d63587
commit 6151c3f
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 4 deletions.
diff --git a/samples/xlsx/TestIssue24020201.xlsx b/samples/xlsx/TestIssue24020201.xlsx
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
@@ -475,7 +475,8 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData, bo
                                         rowXml.Replace(key, "");
                                         continue;
                                     }
-
+                                    if (!dic.ContainsKey(propInfo.Key))
+                                        continue;
                                     var cellValue = dic[propInfo.Key];
                                     if (cellValue == null)
                                     {
@@ -985,12 +986,15 @@ private void UpdateDimensionAndGetRowsInfo(Dictionary<string, object> inputMaps,
                                 v.InnerText = v.InnerText.Replace($"{{{{{propNames[0]}}}}}", propNames[1]);
                                 break;
                             }
+                            if (!xRowInfo.PropsMap.ContainsKey(propNames[1]))
+                            {
+                                v.InnerText = v.InnerText.Replace($"{{{{{propNames[0]}.{propNames[1]}}}}}", "");
+                                continue;
+                                throw new InvalidDataException($"{propNames[0]} doesn't have {propNames[1]} property");
+                            }
                             // auto check type https://github.com/shps951023/MiniExcel/issues/177
                             var prop = xRowInfo.PropsMap[propNames[1]];
                             var type = prop.UnderlyingTypePropType; //avoid nullable 
-                                                                    // 
-                            if (!xRowInfo.PropsMap.ContainsKey(propNames[1]))
-                                throw new InvalidDataException($"{propNames[0]} doesn't have {propNames[1]} property");
 
                             if (isMultiMatch)
                             {