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

【特性】cfg var 新增orientation属性。主要用来以纵向形式读入map（虽然也可以用来读入list,array,set）

main
walon 2021-08-30 14:37:04 +08:00
parent 8069c6d7fe
commit ae63bd883b
6 changed files with 78 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
View File

@ -147,11 +147,11 @@ namespace Luban.Job.Cfg.DataCreators
{
if (f.CType.IsCollection)
{
list.Add(f.CType.Apply(MultiRowExcelDataCreator.Ins, row.GetColumnOfMultiRows(f.Name, sep), f.IsNullable, (DefAssembly)bean.AssemblyBase));
list.Add(f.CType.Apply(MultiRowExcelDataCreator.Ins, row.GetColumnOfMultiRows(f.Name, sep, f.IsRowOrient), f.IsNullable, (DefAssembly)bean.AssemblyBase));
}
else
{
list.Add(f.CType.Apply(ExcelDataCreator.Ins, null, row.GetMultiRowStream(f.Name, sep), (DefAssembly)bean.AssemblyBase));
list.Add(f.CType.Apply(ExcelDataCreator.Ins, null, row.GetMultiRowStream(f.Name, sep, f.IsRowOrient), (DefAssembly)bean.AssemblyBase));
}
}
catch (DataCreateException dce)

64
src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
View File

@ -6,6 +6,7 @@ using Luban.Job.Cfg.RawDefs;
using Luban.Job.Cfg.TypeVisitors;
using Luban.Job.Cfg.Utils;
using Luban.Job.Common.Types;
using Luban.Job.Common.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
@ -240,17 +241,30 @@ namespace Luban.Job.Cfg.DataSources.Excel
}
}
public IEnumerable<ExcelStream> GetColumnOfMultiRows(string name, string sep)
public IEnumerable<ExcelStream> GetColumnOfMultiRows(string name, string sep, bool isRowOrient)
{
if (Titles.TryGetValue(name, out var title))
{
foreach (var row in Rows)
if (isRowOrient)
{
if (IsBlankRow(row, title.FromIndex, title.ToIndex))
foreach (var row in Rows)
{
continue;
if (IsBlankRow(row, title.FromIndex, title.ToIndex))
{
continue;
}
yield return new ExcelStream(row, title.FromIndex, title.ToIndex, sep, false);
}
}
else
{
for (int i = title.FromIndex; i <= title.ToIndex; i++)
{
if (!IsBlankColumn(Rows, i))
{
yield return new ExcelStream(Rows.Select(r => r[i]).ToList(), 0, Rows.Count - 1, sep, false);
}
}
yield return new ExcelStream(row, title.FromIndex, title.ToIndex, sep, false);
}
}
else
@ -260,13 +274,20 @@ namespace Luban.Job.Cfg.DataSources.Excel
}
public ExcelStream GetMultiRowStream(string name, string sep)
public ExcelStream GetMultiRowStream(string name, string sep, bool isRowOrient)
{
if (Titles.TryGetValue(name, out var title))
{
var totalCells = Rows.SelectMany(r => r.GetRange(title.FromIndex, title.ToIndex - title.FromIndex + 1))
.Where(c => c.Value != null && !(c.Value is string s && string.IsNullOrWhiteSpace(s))).ToList();
return new ExcelStream(totalCells, 0, totalCells.Count - 1, sep, false);
if (isRowOrient)
{
var totalCells = Rows.SelectMany(r => r.GetRange(title.FromIndex, title.ToIndex - title.FromIndex + 1))
.Where(c => c.Value != null && !(c.Value is string s && string.IsNullOrWhiteSpace(s))).ToList();
return new ExcelStream(totalCells, 0, totalCells.Count - 1, sep, false);
}
else
{
throw new NotSupportedException($"bean类型多行数据不支持纵向填写");
}
}
else
{
@ -325,17 +346,7 @@ namespace Luban.Job.Cfg.DataSources.Excel
{
case "orientation":
{
switch (value)
{
case "r":
case "row": IsOrientRow = true; break;
case "c":
case "column": IsOrientRow = false; break;
default:
{
throw new Exception($"单元薄 meta 定义 orientation:{value} 属性值只能为row|r|column|c");
}
}
IsOrientRow = DefUtil.ParseOrientation(value);
break;
}
case "title_rows":
@ -646,6 +657,19 @@ namespace Luban.Job.Cfg.DataSources.Excel
return true;
}
private static bool IsBlankColumn(List<List<Cell>> rows, int column)
{
foreach (List<Cell> row in rows)
{
var v = row[column].Value;
if (v != null && !(v is string s && string.IsNullOrEmpty(s)))
{
return false;
}
}
return true;
}
public IEnumerable<Record> ReadMulti(TBean type)
{
foreach (var recordNamedRow in NamedRow.CreateMultiRowNamedRow(this._rowColumns, this._rootTitle, type))

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

@ -6,6 +6,7 @@ using Luban.Job.Cfg.Utils;
using Luban.Job.Common.Defs;
using Luban.Job.Common.RawDefs;
using Luban.Job.Common.Types;
using Luban.Job.Common.Utils;
using Luban.Server.Common;
using System;
using System.Collections.Generic;
@ -609,6 +610,7 @@ namespace Luban.Job.Cfg.Defs
new CfgField() { Name = "path", Type = "string" },
new CfgField() { Name = "comment", Type = "string" },
new CfgField() { Name = "tags", Type = "string" },
new CfgField() { Name = "orientation", Type = "string" },
}
})
{
@ -698,7 +700,8 @@ namespace Luban.Job.Cfg.Defs
"",
"",
(b.GetField("tags") as DString).Value.Trim(),
false
false,
DefUtil.ParseOrientation((b.GetField("orientation") as DString).Value)
)).ToList(),
};
this._beans.Add(curBean);
@ -728,7 +731,8 @@ namespace Luban.Job.Cfg.Defs
"convert",
"comment",
"tags",
"default"
"default",
"orientation",
};
private static readonly List<string> _fieldRequireAttrs = new List<string> { "name", "type" };
@ -753,12 +757,14 @@ namespace Luban.Job.Cfg.Defs
XmlUtil.GetOptionalAttribute(e, "value_validator"),
XmlUtil.GetOptionalAttribute(e, "validator"),
XmlUtil.GetOptionalAttribute(e, "tags"),
false
false,
DefUtil.ParseOrientation(XmlUtil.GetOptionalAttribute(e, "orientation"))
);
}
private Field CreateField(string name, string type, string index, string sep, bool isMultiRow, string group, string resource, string converter,
string comment, string refs, string path, string range, string keyValidator, string valueValidator, string validator, string tags, bool ignoreNameValidation)
string comment, string refs, string path, string range, string keyValidator, string valueValidator, string validator, string tags,
bool ignoreNameValidation, bool isRowOrient)
{
var f = new CfgField()
{
@ -772,6 +778,7 @@ namespace Luban.Job.Cfg.Defs
Comment = comment,
Tags = tags,
IgnoreNameValidation = ignoreNameValidation,
IsRowOrient = isRowOrient,
};
// 字段与table的默认组不一样。

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

@ -154,6 +154,8 @@ namespace Luban.Job.Cfg.Defs
public DType DefalutDtypeValue { get; private set; }
public bool IsRowOrient { get; }
public DefField(DefTypeBase host, CfgField f, int idOffset) : base(host, f, idOffset)
{
Index = f.Index;
@ -166,6 +168,7 @@ namespace Luban.Job.Cfg.Defs
this.Groups = f.Groups;
this.RawDefine = f;
this.DefaultValue = f.DefaultValue;
this.IsRowOrient = f.IsRowOrient;
}
public override void Compile()

2
src/Luban.Job.Cfg/Source/RawDefs/CfgField.cs
View File

@ -25,6 +25,8 @@ namespace Luban.Job.Cfg.RawDefs
public string DefaultValue { get; set; } = "";
public bool IsRowOrient { get; set; } = false;
public List<string> Groups { get; set; } = new List<string>();
public List<Validator> KeyValidators { get; } = new List<Validator>();

16
src/Luban.Job.Common/Source/Utils/DefUtil.cs
View File

@ -46,5 +46,21 @@ namespace Luban.Job.Common.Utils
return (s[..sepIndex], ParseAttrs(s[(sepIndex + 1)..]));
}
}
public static bool ParseOrientation(string value)
{
switch (value.Trim())
{
case "":
case "r":
case "row": return true;
case "c":
case "column": return false;
default:
{
throw new Exception($"orientation 属性值只能为row|r|column|c");
}
}
}
}
}