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

【修复】修复上回重构引发的excel中定义的ref未正确处理的bug

main
walon 2021-10-24 11:15:52 +08:00
parent 4ff1a54eed
commit 81909562a0
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -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))
{