Merge branch 'focus-creative-games:main' into main

absences · Jan 7, 2025 · ed1d9ad · ed1d9ad
2 parents e3aacb3 + 4c9086f
commit ed1d9ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/Luban.DataLoader.Builtin/DataVisitors/SheetDataCreator.cs b/src/Luban.DataLoader.Builtin/DataVisitors/SheetDataCreator.cs
@@ -408,8 +408,7 @@ public DType Accept(TBean type, RowColumnSheet sheet, TitleRow row)
         }
         if (row.Elements != null)
         {
-            var s = row.AsMultiRowConcatElements(sep);
-            return type.Apply(ExcelStreamDataCreator.Ins, s);
+            throw new Exception($"{type.DefBean.FullName} 不支持多行子字段格式，只有结构列表才支持此格式");
         }
         throw new Exception();
     }

diff --git a/src/Luban.DataLoader.Builtin/Excel/TitleRow.cs b/src/Luban.DataLoader.Builtin/Excel/TitleRow.cs
@@ -158,9 +158,4 @@ public ExcelStream AsMultiRowConcatStream(string sep)
     {
         return new ExcelStream(Rows, SelfTitle.FromIndex, SelfTitle.ToIndex, sep, SelfTitle.Default);
     }
-
-    public ExcelStream AsMultiRowConcatElements(string sep)
-    {
-        return new ExcelStream(Elements.Select(e => e.Row).ToList(), SelfTitle.FromIndex, SelfTitle.ToIndex, sep, SelfTitle.Default);
-    }
 }