Pārlūkot izejas kodu

處理標簽bug

CrazyIter_Bin 4 gadi atpakaļ
vecāks
revīzija
6a27db29cd

+ 3 - 3
HTEXLib/HTEXLib.csproj

@@ -4,9 +4,9 @@
     <Description>模板解析类型</Description>
     <PackageReleaseNotes>模板解析类型</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.3.2</Version>
-    <AssemblyVersion>2.3.2.2</AssemblyVersion>
-    <FileVersion>2.3.2.2</FileVersion>
+    <Version>2.3.3</Version>
+    <AssemblyVersion>2.3.3.3</AssemblyVersion>
+    <FileVersion>2.3.3.3</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />

+ 2 - 2
HTEXLib/PPTX/Models/BaseItem.cs

@@ -97,7 +97,7 @@ namespace HTEXLib
         /// 
         /// </summary>
 
-        public string[] url { get; set; }
+        public string url { get; set; }
         //public int order { get; set; }
         /// <summary>
         /// 文件大小
@@ -110,7 +110,7 @@ namespace HTEXLib
         /// <summary>
         /// 文件类型
         /// </summary>
-        public string[] type { get; set; }
+        public string type { get; set; }
 
         /// <summary>
         /// 唯一编码

+ 1 - 1
HTEXLib/Translator/HTML2ITEMV3Translator.cs

@@ -128,7 +128,7 @@ namespace HTEXLib.Translator
         }
         public List<DOCX.Models.ItemInfo> Translate(string html )
         {
-            string mathjax = "<script type=\"text/javascript\" src=\"http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML\"></script>";
+            string mathjax = "<script type=\"text/javascript\" src=\"http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML\"></script>"; 
             html = html.Replace(mathjax, "");
             //去除class 以及span标签"
             string classpattern = "class=\"([^\"]*)\"";

+ 11 - 11
HTEXWeb/Controllers/HtexController.cs

@@ -24,12 +24,12 @@ namespace HTEXWeb.Controllers
         public PPTX2HTEXTranslator htexGenerator { get; set; }
         public DOXC2HTMLTranslator _DOXC2HTMLTranslator { get; set; }
         public HTML2ITEMTranslator _HTML2ITEMTranslator { get; set; }
-        public HTML2IMGSTranslator _HTML2IMGSTranslator { get; set; }
+      //  public HTML2IMGSTranslator _HTML2IMGSTranslator { get; set; }
         public HTML2ITEMV3Translator _HTML2ITEMV3Translator { get; set; }
-        public HtexController(PPTX2HTEXTranslator htexGenerator, DOXC2HTMLTranslator DOXC2HTMLTranslator,  HTML2IMGSTranslator HTML2IMGSTranslator,
-            HTML2ITEMV3Translator HTML2ITEMV3Translator, IWebHostEnvironment webHostEnvironment) {
+        public HtexController(PPTX2HTEXTranslator htexGenerator, DOXC2HTMLTranslator DOXC2HTMLTranslator, // HTML2IMGSTranslator HTML2IMGSTranslator,
+            HTML2ITEMV3Translator HTML2ITEMV3Translator) {
             _DOXC2HTMLTranslator = DOXC2HTMLTranslator;
-            _HTML2IMGSTranslator = HTML2IMGSTranslator;
+           // _HTML2IMGSTranslator = HTML2IMGSTranslator;
             _HTML2ITEMV3Translator = HTML2ITEMV3Translator;
             this.htexGenerator = htexGenerator;
         }
@@ -71,12 +71,12 @@ namespace HTEXWeb.Controllers
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [HttpPost("html-screenshot")]
-        public IActionResult HtmlScreenshot(JsonElement request)
-        {
-            request.TryGetProperty("htmlUrl",out JsonElement htmlUrl);
-            var base64 = "data:image/png;base64,"+ _HTML2IMGSTranslator.PageScreenshotAll($"{htmlUrl}");
-            return Ok(new { base64 });
-        }
+        //[HttpPost("html-screenshot")]
+        //public IActionResult HtmlScreenshot(JsonElement request)
+        //{
+        //    request.TryGetProperty("htmlUrl",out JsonElement htmlUrl);
+        //    var base64 = "data:image/png;base64,"+ _HTML2IMGSTranslator.PageScreenshotAll($"{htmlUrl}");
+        //    return Ok(new { base64 });
+        //}
     }
 }

+ 1 - 1
HTEXWeb/Startup.cs

@@ -33,7 +33,7 @@ namespace HTEXWeb
             string path=$"{ environment.ContentRootPath}/Config";
             services.AddControllers().AddJsonOptions(options => { options.JsonSerializerOptions.IgnoreNullValues = false; });
             services.AddHtexTranslator(path);
-            services.TryAddSingleton<HTML2IMGSTranslator>(new HTML2IMGSTranslator(path));
+            //services.TryAddSingleton<HTML2IMGSTranslator>(new HTML2IMGSTranslator(path));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.