From 8ba2278de5ad8c92df99ccded69e1fe306eb1522 Mon Sep 17 00:00:00 2001 From: walon Date: Wed, 4 Aug 2021 17:19:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BB=8Eexcel=E8=AF=BB=E5=8F=96table=E5=92=8Cbean?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Datas/DBean.cs | 10 ++++++++-- src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Datas/DBean.cs b/src/Luban.Job.Cfg/Source/Datas/DBean.cs index 2190ac7..ee4bb0a 100644 --- a/src/Luban.Job.Cfg/Source/Datas/DBean.cs +++ b/src/Luban.Job.Cfg/Source/Datas/DBean.cs @@ -21,8 +21,14 @@ namespace Luban.Job.Cfg.Datas public DType GetField(string fieldName) { - ImplType.TryGetField(fieldName, out var _, out var findex); - return Fields[findex]; + if (ImplType.TryGetField(fieldName, out var _, out var findex)) + { + return Fields[findex]; + } + else + { + return null; + } } public override void Apply(IDataActionVisitor visitor, T x) diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index 719be09..4615ecc 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -496,7 +496,7 @@ namespace Luban.Job.Cfg.Defs string index = (data.GetField("index") as DString).Value.Trim(); string mode = (data.GetField("mode") 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; string inputFile = (data.GetField("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 { new CfgField() { Name = "full_name", Type = "string" }, + new CfgField() { Name = "sep", Type = "string" }, new CfgField() { Name = "comment", Type = "string" }, new CfgField() { Name = "fields", Type = "list,__FieldInfo__", IsMultiRow = true }, }