xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【修复】修复从excel读取table和bean定义的bug

main
walon 2021-08-04 17:19:53 +08:00
parent 8d95e8539a
commit 8ba2278de5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Luban.Job.Cfg/Source/Datas/DBean.cs
View File

@ -21,9 +21,15 @@ namespace Luban.Job.Cfg.Datas
public DType GetField(string fieldName) public DType GetField(string fieldName)
{ {
ImplType.TryGetField(fieldName, out var _, out var findex); if (ImplType.TryGetField(fieldName, out var _, out var findex))
{
return Fields[findex]; return Fields[findex];
} }
else
{
return null;
}
}
public override void Apply<T>(IDataActionVisitor<T> visitor, T x) public override void Apply<T>(IDataActionVisitor<T> visitor, T x)
{ {

3
src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs
View File

@ -496,7 +496,7 @@ namespace Luban.Job.Cfg.Defs
string index = (data.GetField("index") as DString).Value.Trim(); string index = (data.GetField("index") as DString).Value.Trim();
string mode = (data.GetField("mode") as DString).Value.Trim(); string mode = (data.GetField("mode") as DString).Value.Trim();
string group = (data.GetField("group") as DString).Value.Trim(); string group = (data.GetField("group") as DString).Value.Trim();
string comment = (data.GetField("commnet") as DString).Value.Trim(); string comment = (data.GetField("comment") as DString).Value.Trim();
bool isDefineFromExcel = (data.GetField("define_from_excel") as DBool).Value; bool isDefineFromExcel = (data.GetField("define_from_excel") as DBool).Value;
string inputFile = (data.GetField("input") as DString).Value.Trim(); string inputFile = (data.GetField("input") as DString).Value.Trim();
string branchInput = (data.GetField("branch_input") as DString).Value.Trim(); string branchInput = (data.GetField("branch_input") as DString).Value.Trim();
@ -632,6 +632,7 @@ namespace Luban.Job.Cfg.Defs
Fields = new List<Field> Fields = new List<Field>
{ {
new CfgField() { Name = "full_name", Type = "string" }, new CfgField() { Name = "full_name", Type = "string" },
new CfgField() { Name = "sep", Type = "string" },
new CfgField() { Name = "comment", Type = "string" }, new CfgField() { Name = "comment", Type = "string" },
new CfgField() { Name = "fields", Type = "list,__FieldInfo__", IsMultiRow = true }, new CfgField() { Name = "fields", Type = "list,__FieldInfo__", IsMultiRow = true },
} }