[new] 支持启用宏的excel格式，即xlsm格式。

Jephy369 · Apr 11, 2022 · 861f40c · 861f40c
1 parent d9a2e0f
commit 861f40c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Luban.Common/Source/Utils/FileUtil.cs b/src/Luban.Common/Source/Utils/FileUtil.cs
@@ -111,7 +111,8 @@ public static bool IsExcelFile(string fullName)
         {
             return fullName.EndsWith(".csv", StringComparison.Ordinal)
                 || fullName.EndsWith(".xls", StringComparison.Ordinal)
-                || fullName.EndsWith(".xlsx", StringComparison.Ordinal);
+                || fullName.EndsWith(".xlsx", StringComparison.Ordinal)
+                || fullName.EndsWith(".xlsm", StringComparison.Ordinal);
         }
 
         public static (string, string) SplitFileAndSheetName(string url)

diff --git a/src/Luban.Job.Cfg/Source/DataSources/DataSourceFactory.cs b/src/Luban.Job.Cfg/Source/DataSources/DataSourceFactory.cs
@@ -28,7 +28,8 @@ public static AbstractDataSource Create(string url, string sheetName, Stream str
                 {
                     case "csv":
                     case "xls":
-                    case "xlsx": source = new Excel.ExcelDataSource(); break;
+                    case "xlsx":
+                    case "xlsm": source = new Excel.ExcelDataSource(); break;
                     case "xml": source = new Xml.XmlDataSource(); break;
                     case "lua": source = new Lua.LuaDataSource(); break;
                     case "json": source = new Json.JsonDataSource(); break;