From 7d4b9e049d4cea4bd20d47316882de80d34cde5e Mon Sep 17 00:00:00 2001 From: walon Date: Thu, 21 Oct 2021 16:32:00 +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=20bean=E8=AE=BE=E7=BD=AE=E5=B1=9E=E6=80=A7sep?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=A2=ABexcel=E4=B8=AD=E5=AD=97=E6=AE=B5sep?= =?UTF-8?q?=E5=88=86=E5=89=B2=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=A2=AB?= =?UTF-8?q?bean=E5=B1=9E=E6=80=A7sep=E5=88=86=E5=89=B2=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E5=9C=A8excel=E4=B8=AD=E5=AE=9A=E4=B9=89=E7=9A=84t?= =?UTF-8?q?able,=5F=5Ftag=5F=5F=E8=A2=AB=E5=BD=93=E4=BD=9C=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BD=86=E5=8F=88=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1type=E5=88=97=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E4=BB=94=E7=BB=86=E5=A4=84=E7=90=86=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../Source/DataCreators/SheetDataCreator.cs | 4 ++-- .../Source/DataSources/Excel/SheetLoadUtil.cs | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index eb0bb19..c3c85a6 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ luban相较于常规的excel导表工具有以下核心优势： - 增强了excel格式。可以比较简洁地excel配置**任意复杂**的数据，像子结构、结构列表，以及更复杂的深层次的嵌套结构都能直接解析处理。 -- 完备的类型系统和多原始数据支持（xml、json、lua、yaml），可以轻松表达和解析**任意复杂**的数据。意味着传统excel导表工具无法处理的技能、行为树、副本等等复杂配置，luban也能够统一处理了，彻底将程序从复杂的配置解析中完全解放出来。 +- 完备的类型系统和多原始数据支持（xml、json、lua、yaml），可以轻松表达和解析**任意复杂**的数据。意味着传统excel导表工具无法处理的技能、行为树、副本等等复杂配置，luban也能够统一处理了，彻底将程序从复杂的配置解析中解放出来。 - 完善的工作流支持。如id的外键引用检查;资源合法性检查;灵活的数据源定义（拆表或者多表合一）;灵活的分组导出机制；多种本地化支持;生成极快（日常迭代300ms以内）；Excel2TextDiff工具方便diff查看excel文件的版本间差异； - **=== LubanAssistant Excel插件 ===**。支持把json、lua、xml等文本格式的配置数据加载到excel中，批量编辑处理，最后再保存回原文件，较好地解决大型项目中多人合作数据编辑冲突合并的问题，较好解决在编辑器中制作的配置难以在excel中批量修改的问题。 diff --git a/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs index 48e8e19..7d444c6 100644 --- a/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs @@ -284,12 +284,12 @@ namespace Luban.Job.Cfg.DataCreators if (row.Row != null) { - var s = row.AsStream(sep); + var s = row.AsStream(""); return type.Apply(ExcelStreamDataCreator.Ins, s); } else if (row.Rows != null) { - var s = row.AsMultiRowConcatStream(sep); + var s = row.AsMultiRowConcatStream(""); return type.Apply(ExcelStreamDataCreator.Ins, s); } else if (row.Fields != null) diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs index 579ba55..7f648f8 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs @@ -420,13 +420,17 @@ namespace Luban.Job.Cfg.DataSources.Excel var fields = new Dictionary(); foreach (var subTitle in title.SubTitleList) { + if (subTitle.Name.StartsWith("__")) + { + continue; + } fields.Add(subTitle.Name, new FieldInfo() { Name = subTitle.Name, Tags = title.Tags, - Type = typeRow != null ? typeRow[subTitle.FromIndex].Value?.ToString() : "", - BriefDesc = briefDescRow != null ? briefDescRow[subTitle.FromIndex].Value?.ToString() : "", - DetailDesc = destailDescRow != null ? destailDescRow[subTitle.FromIndex].Value?.ToString() : "", + Type = typeRow?[subTitle.FromIndex].Value?.ToString() ?? "", + BriefDesc = briefDescRow?[subTitle.FromIndex].Value?.ToString() ?? "", + DetailDesc = destailDescRow?[subTitle.FromIndex].Value?.ToString() ?? "", }); }