Merge pull request #191 from KorzhCom/dev

Version 1.5.6 of EasyData.NET
KorzhCom · Jun 23, 2024 · 90d1047 · 90d1047
2 parents 37c1693 + 53ef94f
commit 90d1047
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/easydata.net/src/EasyData.Core/DataUtils.cs b/easydata.net/src/EasyData.Core/DataUtils.cs
@@ -283,5 +283,24 @@ public static string DateTimeToUserFormat(DateTime dt, DataType dataType)
             }
             return dt.ToString(format, System.Globalization.DateTimeFormatInfo.CurrentInfo);
         }
+
+        /// <summary>
+        /// Returns <c>true</c> if the value passed in the parameter is one of the number types.
+        /// </summary>
+        /// <param name="value">The object to investigate.</param>
+        public static bool IsNumber(object value)
+        {
+            return value is byte 
+                    || value is sbyte 
+                    || value is short 
+                    || value is ushort 
+                    || value is int 
+                    || value is uint 
+                    || value is long 
+                    || value is ulong 
+                    || value is float 
+                    || value is double 
+                    || value is decimal;
+        }
     }
 }
diff --git a/easydata.net/src/EasyData.Exporters.ClosedXML/EasyData.Exporters.ClosedXML.csproj b/easydata.net/src/EasyData.Exporters.ClosedXML/EasyData.Exporters.ClosedXML.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
 		<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClosedXML" Version="0.100.3" />
+    <PackageReference Include="ClosedXML" Version="0.102.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/easydata.net/src/EasyData.Exporters.ClosedXML/Excel/ExcelDataExporter.cs b/easydata.net/src/EasyData.Exporters.ClosedXML/Excel/ExcelDataExporter.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 
 using ClosedXML.Excel;
+using DocumentFormat.OpenXml.Spreadsheet;
 
 namespace EasyData.Export
 {
@@ -158,13 +159,18 @@ Task WriteRowAsync(EasyDataRow row, bool isExtraRow = false,
 
                     var excelDataType = XLDataType.Text;
                     if (value != null) {
-                        if (!isExtraRow) {
+                        if (isExtraRow) {
+                            if (!string.IsNullOrEmpty(groupFooterTemplate)) {
+                                var formattedValue = DataFormatUtils.GetFormattedValue(row[i], column.DataType, settings.Culture, dfmt);
+                                value = ExportHelpers.ApplyGroupFooterColumnTemplate(groupFooterTemplate, formattedValue, extraData);
+                            }
+                            else { 
+                                excelDataType = DataUtils.IsNumber(value) ? XLDataType.Number : XLDataType.Text;
+                            }
+                        } 
+                        else {
                             excelDataType = MapDataType(column.DataType);
                         }
-                        else if (!string.IsNullOrEmpty(groupFooterTemplate)) {
-                            var formattedValue = DataFormatUtils.GetFormattedValue(row[i], column.DataType, settings.Culture, dfmt);
-                            value = ExportHelpers.ApplyGroupFooterColumnTemplate(groupFooterTemplate, formattedValue, extraData);
-                        }
                     }
 
                     if (!(value is DBNull)) {

diff --git a/easydata.net/version.json b/easydata.net/version.json
@@ -1,5 +1,5 @@
 {
-    "assemblyVersion": "1.5.5.1",
-    "packageVersion": "1.5.5",
-    "assetVersion": "01_05_05"
+    "assemblyVersion": "1.5.6.1",
+    "packageVersion": "1.5.6",
+    "assetVersion": "01_05_06"
 }