Supports the TimeSpan type, double.NaN exports invalid values, and wh…

…en reading, it needs to be determined whether it is a double value.
mini-software · Feb 23, 2025 · d221726 · d221726
1 parent ca78480
commit d221726
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlSheetReader.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlSheetReader.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
@@ -495,15 +496,20 @@ private void SetCellsValueAndHeaders(object cellValue, bool useHeaderRow, ref Di
 
                         if (itemValue == null)
                             continue;
-
-                        newV = TypeHelper.TypeMapping(v, pInfo, newV, itemValue, rowIndex, startCell, configuration);
+                            if (pInfo.ExcludeNullableType == typeof(double) && (!Regex.IsMatch(itemValue?.ToString(), "^-?\\d+(\\.\\d+)?([eE][-+]?\\d+)?$") || itemValue?.ToString().Trim().Equals("NaN") == true))//double.NaN 无效值处理
+                            {
+                                newV = TypeHelper.TypeMapping(v, pInfo, newV, double.NaN, rowIndex, startCell, configuration);
+                            }
+                            else
+                            {
+                                newV = TypeHelper.TypeMapping(v, pInfo, newV, itemValue, rowIndex, startCell, configuration);
+                            }
                     }
                 }
                 rowIndex++;
                 yield return v;
             }
         }
-
         private void SetSharedStrings()
         {
             if (_sharedStrings != null)

diff --git a/src/MiniExcel/Utils/TypeHelper.cs b/src/MiniExcel/Utils/TypeHelper.cs
@@ -129,6 +129,32 @@ public static bool IsNumericType(Type type, bool isNullableUnderlyingType = fals
                 else
                     throw new InvalidCastException($"{vs} can't cast to datetime");
             }
+            else if (pInfo.ExcludeNullableType == typeof(TimeSpan))
+            {
+                if (itemValue is TimeSpan || itemValue is TimeSpan?)
+                {
+                    newValue = itemValue;
+                    pInfo.Property.SetValue(v, newValue);
+                    return newValue;
+                }
+
+                var vs = itemValue?.ToString();
+                if (pInfo.ExcelFormat != null)
+                {
+                    if (TimeSpan.TryParseExact(vs, pInfo.ExcelFormat, CultureInfo.InvariantCulture, out var _v))
+                    {
+                        newValue = _v;
+                    }
+                }
+                else if (TimeSpan.TryParse(vs, _config.Culture, out var _v))
+                    newValue = _v;
+                else if (TimeSpan.TryParseExact(vs, "hh\\:mm\\:ss\\.fff", CultureInfo.InvariantCulture, out var _v2))
+                    newValue = _v2;
+                else if (double.TryParse(vs, NumberStyles.None, CultureInfo.InvariantCulture, out var _d))
+                    newValue = TimeSpan.FromMilliseconds(_d);
+                else
+                    throw new InvalidCastException($"{vs} can't cast to TimeSpan");
+            }
             else if (pInfo.ExcludeNullableType == typeof(bool))
             {
                 var vs = itemValue.ToString();