From 36df70bffb9b9ac6657fd387e9c0f22423e40b7b Mon Sep 17 00:00:00 2001
From: walon <taojingjian@gmail.com>
Date: Wed, 19 Jan 2022 18:12:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=BD=93ex?=
 =?UTF-8?q?cel=E5=AD=97=E6=AE=B5=E8=A1=8C=E5=8C=85=E5=90=AB=E9=9D=9E?=
 =?UTF-8?q?=E6=B3=95tag=E5=A6=82group=E6=97=B6=EF=BC=8C=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Source/DataSources/Excel/SheetLoadUtil.cs   |  2 +-
 .../Source/DataSources/Excel/Title.cs           | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs
index 6ff4de2..018f9bb 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs
@@ -598,7 +598,7 @@ namespace Luban.Job.Cfg.DataSources.Excel
                 fields.Add(subTitle.Name, new FieldInfo()
                 {
                     Name = subTitle.Name,
-                    Tags = title.Tags,
+                    Tags = subTitle.Tags,
                     Type = typeRow[subTitle.FromIndex].Value?.ToString() ?? "",
                     Desc = desc,
                 });
diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/Title.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/Title.cs
index ae118a4..b6a941d 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Excel/Title.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/Title.cs
@@ -62,6 +62,14 @@ namespace Luban.Job.Cfg.DataSources.Excel
             }
         }
 
+        private static HashSet<string> s_validTags = new HashSet<string>()
+        {
+            "sep",
+            "non_empty",
+            "multi_rows",
+            "default",
+        };
+
         public void Init()
         {
             SortSubTitles();
@@ -73,6 +81,15 @@ namespace Luban.Job.Cfg.DataSources.Excel
             NonEmpty = Tags.TryGetValue("non_empty", out var ne) && ne == "1";
             SelfMultiRows = Tags.TryGetValue("multi_rows", out var v2) && (v2 == "1" || v2 == "true");
             Default = Tags.TryGetValue("default", out var v3) ? v3 : null;
+
+            foreach (var (key, value) in Tags)
+            {
+                if (!s_validTags.Contains(key))
+                {
+                    throw new Exception($"excel标题列:'{Name}' 不支持tag:'{key}',请移到##type行");
+                }
+            }
+
             if (SubTitleList.Count > 0)
             {
                 if (Root)