update

HTEXLib/DOCX/OpenXmlTool/WmlToHtmlConverter.cs

@@ -418,7 +418,7 @@ namespace OpenXmlPowerTools
         {
             var element = node as XElement;
             if (element == null) return null;
-          
+
             // Transform the w:document element to the XHTML h:html element.
             // The h:head element is laid out based on the W3C's recommended layout, i.e.,
             // the charset (using the HTML5-compliant form), the title (which is always
@@ -463,10 +463,13 @@ namespace OpenXmlPowerTools
                                 .First(x => x.Id == (string)element.Attribute(R.id))
                                 .Uri
                             ),
+                         new XAttribute("target", "_blank"
+                            ),
                         element.Elements(W.r).Select(run => ConvertRun(wordDoc, settings, run))
                         );
                     if (!a.Nodes().Any())
                         a.Add(new XText(""));
+
                     return a;
                 }
                 catch (UriFormatException)
@@ -2209,8 +2212,9 @@ namespace OpenXmlPowerTools
 
             var style = DefineRunStyle(run);
             object content = run.Elements().Select(e => ConvertToHtmlTransform(wordDoc, settings, e, false, 0m));
-            if (rPr.Element(W.em) != null) {
-                content=  new XElement(Xhtml.dot, content);
+            if (rPr.Element(W.em) != null)
+            {
+                content = new XElement(Xhtml.dot, content);
             }
             // Wrap content in h:sup or h:sub elements as necessary.
             if (rPr.Element(W.vertAlign) != null)
@@ -3359,18 +3363,18 @@ namespace OpenXmlPowerTools
         private static object CreateBorderDivs(WordprocessingDocument wordDoc, WmlToHtmlConverterSettings settings, IEnumerable<XElement> elements)
         {
             return elements.GroupAdjacent(e =>
+            {
+                var pBdr = e.Elements(W.pPr).Elements(W.pBdr).FirstOrDefault();
+                if (pBdr != null)
                 {
-                    var pBdr = e.Elements(W.pPr).Elements(W.pBdr).FirstOrDefault();
-                    if (pBdr != null)
-                    {
-                        var indStr = string.Empty;
-                        var ind = e.Elements(W.pPr).Elements(W.ind).FirstOrDefault();
-                        if (ind != null)
-                            indStr = ind.ToString(SaveOptions.DisableFormatting);
-                        return pBdr.ToString(SaveOptions.DisableFormatting) + indStr;
-                    }
-                    return e.Name == W.tbl ? "table" : string.Empty;
-                })
+                    var indStr = string.Empty;
+                    var ind = e.Elements(W.pPr).Elements(W.ind).FirstOrDefault();
+                    if (ind != null)
+                        indStr = ind.ToString(SaveOptions.DisableFormatting);
+                    return pBdr.ToString(SaveOptions.DisableFormatting) + indStr;
+                }
+                return e.Name == W.tbl ? "table" : string.Empty;
+            })
                 .Select(g =>
                 {
                     if (g.Key == string.Empty)

HTEXLib/HTEXLib.csproj

@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Description>修改解析</Description>
-    <PackageReleaseNotes></PackageReleaseNotes>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>5.2110.271</Version>
-    <AssemblyVersion>5.2110.271.1</AssemblyVersion>
-    <FileVersion>5.2110.271.1</FileVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.13.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.28" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="HTEX\" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<Description>修改解析</Description>
+		<PackageReleaseNotes></PackageReleaseNotes>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<Version>5.2202.222</Version>
+		<AssemblyVersion>5.2202.222.1</AssemblyVersion>
+		<FileVersion>5.2202.222.1</FileVersion>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="DocumentFormat.OpenXml" Version="2.13.1" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.11.28" />
+		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+		<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+		<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+		<PackageReference Include="System.Text.Json" Version="4.7.2" />
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="HTEX\" />
+	</ItemGroup>
 </Project>

HTEXLib/PPTX/Models/BaseItem.cs

@@ -12,11 +12,11 @@ namespace HTEXLib
         public string id { get; set; }
 
         public bool objective { get; set; }
-        
+
         public BaseItem()
         {
-            
-          //  option = new List<CodeValue>();
+
+            //  option = new List<CodeValue>();
             answer = new List<string>();
             knowledge = new List<string>();
             gradeIds = new List<string>();
@@ -77,12 +77,13 @@ namespace HTEXLib
         //使用次数
         public int useCount { get; set; }
         // public string examCode { get; set; }
-         public string blob { get; set; }
+        public string blob { get; set; }
         public string scope { get; set; }
+        public int opts { get; set; }
     }
     public class CodeValue
     {
-       // public Position position { get; set; }
+        // public Position position { get; set; }
         public string code { get; set; }
         public string value { get; set; }
     }
@@ -119,3 +120,7 @@ namespace HTEXLib
 
     }
 }
+
+
+
+

HTEXLib/PPTX/Models/Html.cs

@@ -0,0 +1,21 @@
+
+
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HTEXLib.PPTX.Models
+{
+    public class Html : Item
+    {
+        public Html()
+        {
+            type = "Html";
+        }
+
+        public string question { get; set; }
+
+        public List<CodeValue> option { get; set; } = new List<CodeValue> { };
+    }
+}