From d9e7bc39140d9c37102b0ff213a70a2a4db59f3e Mon Sep 17 00:00:00 2001 From: walon Date: Tue, 16 Nov 2021 12:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=80=83?= =?UTF-8?q?=E8=99=91=E5=88=B0##field=E5=AE=B9=E6=98=93=E5=86=99=E9=94=99?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E##+=E5=92=8C##var=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E5=AD=90=E5=AD=97=E6=AE=B5=E8=A1=8C=E7=9A=84=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1703d3a..271a02c 100644 --- a/README.md +++ b/README.md @@ -512,7 +512,7 @@ xml中定义如下 ## 高级特性 ### 层级标题头 (hierarchy title) -在多行数据或者深层次嵌套的数据中,如果数据字段较多,填写时不易区分子元素。luban提供层级标题实现深层次的子字段对应。以上面的多行数据列表为例。 +在多行数据或者深层次嵌套的数据中,如果数据字段较多,填写时不易区分子元素。luban提供层级标题实现深层次的子字段对应。以上面的多行数据列表为例,第一列为##+表示这是个子字段行。 @@ -523,7 +523,7 @@ xml中定义如下 - + diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs index 5b279ad..cc25003 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs @@ -115,8 +115,8 @@ namespace Luban.Job.Cfg.DataSources.Excel { break; } - string rowTag = row[0].Value?.ToString() ?? ""; - if (rowTag.StartsWith("##field")) + string rowTag = row[0].Value?.ToString()?.ToLower() ?? ""; + if (rowTag == "##field" || rowTag == "##var" || rowTag == "##+") { rowIndex = i; return true; @@ -329,7 +329,7 @@ namespace Luban.Job.Cfg.DataSources.Excel { return false; } - var s = row[0].Value?.ToString()?.Trim(); + var s = row[0].Value?.ToString()?.Trim()?.ToLower(); return s == tag; }
stages
##field##+ id