From 81909562a04475e2523a1cb3b61e0f9183e35ef7 Mon Sep 17 00:00:00 2001 From: walon Date: Sun, 24 Oct 2021 11:15:52 +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=B8=8A=E5=9B=9E=E9=87=8D=E6=9E=84=E5=BC=95=E5=8F=91?= =?UTF-8?q?=E7=9A=84excel=E4=B8=AD=E5=AE=9A=E4=B9=89=E7=9A=84ref=E6=9C=AA?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs | 11 +---------- src/Luban.Job.Cfg/Source/Defs/DefField.cs | 3 ++- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index 4ce1d48..c971d77 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -293,16 +293,6 @@ namespace Luban.Job.Cfg.Defs var tableDefInfo = source.LoadTableDefInfo(file.OriginFile, file.SheetName, stream); var cb = new CfgBean() { Namespace = table.Namespace, Name = table.ValueType, }; - - //var rc = sheet.RowColumns; - //var attrRow = sheet.RowColumns[0]; - //if (rc.Count < sheet.AttrRowCount + 1) - //{ - // throw new Exception($"table:'{table.Name}' file:{file.OriginFile} 至少包含 属性行和标题行"); - //} - //var titleRow = sheet.RowColumns[sheet.AttrRowCount]; - //// 有可能没有注释行，此时使用标题行，这个是必须有的 - //var descRow = sheet.HeaderRowCount >= sheet.AttrRowCount + 2 ? sheet.RowColumns[sheet.AttrRowCount + 1] : titleRow; #if !LUBAN_LITE foreach (var (name, f) in tableDefInfo.FieldInfos) { @@ -359,6 +349,7 @@ namespace Luban.Job.Cfg.Defs case "path": case "range": { + cf.Type = cf.Type + "&" + attrs[i]; //var validator = new Validator() { Type = attrName, Rule = attrValue }; //cf.Validators.Add(validator); //cf.ValueValidators.Add(validator); diff --git a/src/Luban.Job.Cfg/Source/Defs/DefField.cs b/src/Luban.Job.Cfg/Source/Defs/DefField.cs index dfa8392..ec15ba0 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefField.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefField.cs @@ -220,7 +220,8 @@ namespace Luban.Job.Cfg.Defs { if (CType.Tags.TryGetValue("ref", out string refStr2)) { - this.Ref = (RefValidator)ValidatorFactory.Create("ref", refStr2); + this.Validators.Add( this.Ref = (RefValidator)ValidatorFactory.Create("ref", refStr2)); + } if (CType.Tags.TryGetValue("path", out string pathStr2)) {