From 861f40c29bcf87b727cb48ed1efcd2b0b5cbd45b Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 11 Apr 2022 16:11:31 +0800 Subject: [PATCH] =?UTF-8?q?[new]=20=E6=94=AF=E6=8C=81=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E5=AE=8F=E7=9A=84excel=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=8D=B3xlsm?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Common/Source/Utils/FileUtil.cs | 3 ++- src/Luban.Job.Cfg/Source/DataSources/DataSourceFactory.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Luban.Common/Source/Utils/FileUtil.cs b/src/Luban.Common/Source/Utils/FileUtil.cs index 67d5487..8b7da58 100644 --- a/src/Luban.Common/Source/Utils/FileUtil.cs +++ b/src/Luban.Common/Source/Utils/FileUtil.cs @@ -111,7 +111,8 @@ namespace Luban.Common.Utils { 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 index 000d875..ae4065e 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/DataSourceFactory.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/DataSourceFactory.cs @@ -28,7 +28,8 @@ namespace Luban.Job.Cfg.DataSources { 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;