暂存

Author: codelove1314

README.md

@@ -61,6 +61,7 @@
 - Pdf支持
 - HTML
 - 导入结果支持生成HTML输出
+- 导入重复验证
 
 ### 更新历史
 

src/Magicodes.ExporterAndImporter.Excel/Utility/ImportHelper.cs

@@ -186,6 +186,12 @@ protected virtual void ParseTemplate(ExcelPackage excelPackage)
                         break;
                     }
 
+                    //不处理空表头
+                    if (string.IsNullOrWhiteSpace(header))
+                    {
+                        continue;
+                    }
+
                     if (excelHeaders.ContainsKey(header))
                     {
                         ImportResult.TemplateErrors.Add(new TemplateErrorInfo()
@@ -257,7 +263,7 @@ protected virtual bool ParseImporterHeader(out Dictionary<int, IDictionary<strin
             enumColumns = new Dictionary<int, IDictionary<string, int>>();
             boolColumns = new List<int>();
             var objProperties = typeof(T).GetProperties();
-            if (objProperties == null || objProperties.Length == 0)
+            if (objProperties.Length == 0)
                 return false;
             for (var i = 0; i < objProperties.Length; i++)
             {

src/Magicodes.ExporterAndImporter.Html/HtmlExporter.cs

@@ -1,22 +1,21 @@
-using System;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Core.Models;
+using Microsoft.CodeAnalysis.CSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Core.Models;
 using System.Reflection;
-using RazorEngine;
-using RazorEngine.Configuration;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using Encoding = System.Text.Encoding;
-using RazorEngine.Templating;
 
 namespace Magicodes.ExporterAndImporter.Html
 {
     /// <summary>
     /// HTML导出
     /// </summary>
-    public class HtmlExporter: IExporterByTemplate
+    public class HtmlExporter : IExporterByTemplate
     {
         /// <summary>
         /// 根据模板导出
@@ -26,19 +25,59 @@ public class HtmlExporter: IExporterByTemplate
         /// <param name="dataItems"></param>
         /// <param name="htmlTemplate">Html模板内容</param>
         /// <returns></returns>
-        public Task<TemplateFileInfo> ExportByTemplate<T>(string fileName, IList<T> dataItems, string htmlTemplate = null) where T : class
+        public async Task<TemplateFileInfo> ExportByTemplate<T>(string fileName, IList<T> dataItems, string htmlTemplate = null) where T : class
         {
             if (string.IsNullOrWhiteSpace(htmlTemplate))
             {
-                var defaultHtmlTpl = ReadManifestData<HtmlExporter>("default.cshtml");
-                var config = new TemplateServiceConfiguration()
+                var defaultHtmlTpl = ReadManifestData<HtmlExporter>("default.html");
+
+                var script = CSharpScript.Create<string>("string htmlStr=\"\";");
+                var matches = Regex.Matches(defaultHtmlTpl, @"@foreach[\w\s{}.<>()/\[\]\+\-?|\\*`$]+}", RegexOptions.Multiline);
+                foreach (Match match in matches)
                 {
-                    
-                };
-                var service = RazorEngineService.Create(config);
-                Engine.Razor = service;
-                var res = Engine.Razor.RunCompile(defaultHtmlTpl, fileName, typeof(IList<T>), dataItems);
-                var t = new TemplateFileInfo();
+                    if (match.Success)
+                    {
+                        //var sb = new StringBuilder();
+                        var list = Regex.Split(match.Value, Environment.NewLine).Where(p => p.Trim() != "{" && p.Trim() != "}")
+                            .ToList();
+                        foreach (var dataItem in dataItems)
+                        {
+                            foreach (var line in list)
+                            {
+                                script.ContinueWith("htmlStr +=\"\\n\";");
+                                if (line.Contains("{"))
+                                {
+                                    var codeStr = await CSharpScript.RunAsync<string>("var res=$\"" + line + "\";", globals: dataItem);
+                                    var codeRes = await codeStr.ContinueWithAsync("res");
+                                    script.ContinueWith("htmlStr +=$\"" + codeRes.ReturnValue + "\";");
+                                }
+                                else
+                                {
+                                    script.ContinueWith("htmlStr +=$\"" + line + "\";");
+                                }
+
+                                //var res = Regex.Matches(line, @"{{[\w\s.()/\[\]\+\-?|\\*`$]+}}", RegexOptions.None);
+                                //if (res.Count == 0)
+                                //{
+                                //    script.ContinueWith("htmlStr +=\"" + line + "\"");
+                                //}
+                                //else
+                                //{
+                                //    script.ContinueWith("htmlStr +=$\"" + line + "\"");
+                                //}
+                            }
+                        }
+
+
+
+                    }
+                }
+                var result = await script.RunAsync();
+                var a = await result.ContinueWithAsync("res");
+                var test = a.ReturnValue;
+                //var result = script.;
+                //var script = CSharpScript.Create<int>("X*Y", globalsType: typeof(IList<T>));
+                //script.Compile();
             }
             throw new NotImplementedException();
         }
@@ -54,7 +93,7 @@ public static string ReadManifestData<TSource>(string embeddedFileName) where TS
                 {
                     throw new InvalidOperationException("Could not load manifest resource stream.");
                 }
-                using (var reader = new StreamReader(stream,encoding: Encoding.UTF8))
+                using (var reader = new StreamReader(stream, encoding: Encoding.UTF8))
                 {
                     return reader.ReadToEnd();
                 }

src/Magicodes.ExporterAndImporter.Html/Magicodes.ExporterAndImporter.Html.csproj

@@ -5,17 +5,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Tpls\default.cshtml" />
+    <None Remove="Tpls\default.html" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Tpls\default.cshtml" />
+    <EmbeddedResource Include="Tpls\default.html" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RazorEngine" Version="3.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.2.1" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Magicodes.ExporterAndImporter.Core\Magicodes.ExporterAndImporter.Core.csproj" />
   </ItemGroup>

src/Magicodes.ExporterAndImporter.Html/Tpls/default.cshtml renamed to src/Magicodes.ExporterAndImporter.Html/Tpls/default.html

@@ -30,14 +30,14 @@ <h1 style="text-align:center">{{Title}}</h1>
             <th>{{Value}}</th>
         </tr>
         </thead>
-        @foreach (var item in Model)
+        @foreach
         {
             <tr>
-                <td>{{Name}}</td>
-                <td>@item.Name1</td>
-
+                <td>{Name1}</td>
+                <td>{Name2}</td>
             </tr>
         }
+
     </table>
 </body>
 </html>