From f82df5d68d732985031c95fff31af315263b29cd Mon Sep 17 00:00:00 2001
From: walon <taojingjian@gmail.com>
Date: Mon, 30 Aug 2021 16:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=80=A7=E3=80=91cfg=20excel?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=94=AF=E6=8C=81=E4=BB=A5map=E7=9A=84key?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=87=E9=A2=98=E5=A4=B4=EF=BC=8C=E4=BD=86=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E9=85=8D=E5=90=88orientation=3Dc=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCreators/ExcelNamedRowDataCreator.cs  | 39 ++++++++++++++++++-
 .../Source/DataSources/Excel/Sheet.cs         |  9 ++++-
 src/Luban.Job.Cfg/Source/RawDefs/CfgField.cs  |  2 +-
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
index 304bb33..ea4c8b1 100644
--- a/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
@@ -287,9 +287,46 @@ namespace Luban.Job.Cfg.DataCreators
             throw new NotSupportedException();
         }
 
+
+        private bool TryCreateColumnStream(Sheet.NamedRow x, Sheet.Title title, out ExcelStream stream)
+        {
+            var cells = new List<Sheet.Cell>();
+            for (int i = title.FromIndex; i <= title.ToIndex; i++)
+            {
+                foreach (var row in x.Rows)
+                {
+                    if (row.Count > i)
+                    {
+                        var value = row[i].Value;
+                        if (!(value == null || (value is string s && string.IsNullOrEmpty(s))))
+                        {
+                            cells.Add(row[i]);
+                        }
+                    }
+                }
+            }
+            if (cells.Count > 0)
+            {
+                stream = new ExcelStream(cells, 0, cells.Count - 1, "", false);
+                return true;
+            }
+            stream = null;
+            return false;
+        }
+
         public DType Accept(TMap type, Sheet.NamedRow x, bool multirow, bool nullable)
         {
-            throw new NotSupportedException();
+            var map = new Dictionary<DType, DType>();
+            foreach (var (key, keyTitle) in x.Titles)
+            {
+                if (TryCreateColumnStream(x, keyTitle, out var stream))
+                {
+                    var keyData = type.KeyType.Apply(StringDataCreator.Ins, key);
+                    var valueData = type.ValueType.Apply(ExcelDataCreator.Ins, null, stream, DefAssembly.LocalAssebmly);
+                    map.Add(keyData, valueData);
+                }
+            }
+            return new DMap(type, map);
         }
 
         public DType Accept(TVector2 type, Sheet.NamedRow x, bool multirow, bool nullable)
diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
index f096ea8..b297452 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
@@ -123,7 +123,7 @@ namespace Luban.Job.Cfg.DataSources.Excel
                 }
                 else
                 {
-                    List<DefField> notMultiRowFields = bean.Bean.HierarchyFields.Select(f => (DefField)f).Where(f => !f.IsMultiRow).ToList();
+                    List<DefField> notMultiRowFields = bean.Bean.HierarchyFields.Select(f => (DefField)f).Where(f => !f.IsMultiRow && f.IsRowOrient).ToList();
                     List<List<Cell>> recordRows = null;
                     foreach (var row in rows)
                     {
@@ -262,7 +262,8 @@ namespace Luban.Job.Cfg.DataSources.Excel
                         {
                             if (!IsBlankColumn(Rows, i))
                             {
-                                yield return new ExcelStream(Rows.Select(r => r[i]).ToList(), 0, Rows.Count - 1, sep, false);
+                                var cells = Rows.Where(r => r.Count > i).Select(r => r[i]).Where(v => !(v.Value == null || (v.Value is string s && string.IsNullOrEmpty(s)))).ToList();
+                                yield return new ExcelStream(cells, 0, cells.Count - 1, sep, false);
                             }
                         }
                     }
@@ -661,6 +662,10 @@ namespace Luban.Job.Cfg.DataSources.Excel
         {
             foreach (List<Cell> row in rows)
             {
+                if (column >= row.Count)
+                {
+                    continue;
+                }
                 var v = row[column].Value;
                 if (v != null && !(v is string s && string.IsNullOrEmpty(s)))
                 {
diff --git a/src/Luban.Job.Cfg/Source/RawDefs/CfgField.cs b/src/Luban.Job.Cfg/Source/RawDefs/CfgField.cs
index 58b0583..bdebf75 100644
--- a/src/Luban.Job.Cfg/Source/RawDefs/CfgField.cs
+++ b/src/Luban.Job.Cfg/Source/RawDefs/CfgField.cs
@@ -25,7 +25,7 @@ namespace Luban.Job.Cfg.RawDefs
 
         public string DefaultValue { get; set; } = "";
 
-        public bool IsRowOrient { get; set; } = false;
+        public bool IsRowOrient { get; set; } = true;
 
         public List<string> Groups { get; set; } = new List<string>();