From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目；
---
HMI.Util/ExcelHelper.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/HMI.Util/ExcelHelper.cs b/HMI.Util/ExcelHelper.cs
index 7a6f416..b2ee156 100644
--- a/HMI.Util/ExcelHelper.cs
+++ b/HMI.Util/ExcelHelper.cs
@@ -1,4 +1,6 @@
-锘縰sing NPOI.HSSF.UserModel;
+锘縰sing HMI.Core;
+using HMI.Core.Util;
+using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using System;
@@ -33,7 +35,7 @@
IRow row1 = SheetOne.CreateRow(0);
for (int i = 0; i < properties.Count; i++)
{
- row1.CreateCell(i).SetCellValue((attrs[i]).Name);
+ row1.CreateCell(i).SetCellValue(LangUtil.Get((attrs[i]).Name));
}
for (int i = 0; i < datas.Count(); i++)
@@ -64,7 +66,7 @@
Dictionary<string, PropertyInfo> dict = new Dictionary<string, PropertyInfo>();
for (int i = 0; i < attrs.Count; i++)
{
- dict.Add(attrs[i].Name, properties[i]);
+ dict.Add(LangUtil.Get(attrs[i].Name), properties[i]);
}
using (FileStream fileStream1 = new FileStream(sourcePath, FileMode.Open, FileAccess.Read))
{
@@ -105,23 +107,26 @@
value = row.GetCell(j).BooleanCellValue;
var prop = dict[title];
- if (prop.PropertyType is string)
+ if (prop.PropertyType == typeof(string))
{
value = Convert.ToString(value);
}
- else if (prop.PropertyType is double || prop.PropertyType is double?)
+ else if (prop.PropertyType == typeof(double) || prop.PropertyType == typeof(double?))
{
value = Convert.ToDouble(value);
}
- else if (prop.PropertyType is int || prop.PropertyType is int?)
+ else if (prop.PropertyType == typeof(int) || prop.PropertyType == typeof(int?))
{
value = Convert.ToInt16(value);
}
- else if (prop.PropertyType is bool || prop.PropertyType is bool?)
+ else if (prop.PropertyType == typeof(bool) || prop.PropertyType == typeof(bool?))
{
value = Convert.ToBoolean(value);
}
-
+ else if (prop.PropertyType.IsEnum)
+ {
+ value = Enum.Parse(prop.PropertyType, value.ToString());
+ }
prop.SetValue(obj, value);
isEmpty = false;
}
--
Gitblit v1.9.1