2.10.0

Plain Craft Launcher 2/Pages/PageOther/PageOtherHelpDetail.xaml.vb

@@ -14,17 +14,20 @@
     ''' 根据特定帮助项初始化页面 UI，返回是否成功加载。
     ''' </summary>
     Public Function Init(Entry As HelpEntry) As Boolean
-        Dim FileContent = "<StackPanel xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:local=""clr-namespace:PCL;assembly=Plain Craft Launcher 2"">" & If(Entry.XamlContent, "") & "</StackPanel>"
+        Dim Content = If(Entry.XamlContent, "")
+        If Content = "" Then Throw New Exception("帮助 xaml 文件为空")
         Try
-            If String.IsNullOrEmpty(Entry.XamlContent) Then Throw New Exception("帮助 xaml 文件为空")
+            '修改时应同时修改 PageLaunchRight.LoadContent
+            Content = HelpArgumentReplace(Content)
+            If Content.Contains("xmlns") Then Content = Content.RegexReplace("xmlns[^""']*(""|')[^""']*(""|')", "").Replace("xmlns", "") '禁止声明命名空间
+            Content = "<StackPanel xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:sys=""clr-namespace:System;assembly=mscorlib"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:local=""clr-namespace:PCL;assembly=Plain Craft Launcher 2"">" & Content & "</StackPanel>"
             Me.Entry = Entry
             PanCustom.Children.Clear()
-            FileContent = HelpArgumentReplace(FileContent)
-            PanCustom.Children.Add(GetObjectFromXML(FileContent))
+            PanCustom.Children.Add(GetObjectFromXML(Content))
             Return True
         Catch ex As Exception
-            Log("[System] 自定义信息内容：" & vbCrLf & FileContent)
-            Log(ex, "加载帮助 xaml 文件失败", LogLevel.Msgbox)
+            Log("[System] 自定义信息内容：" & vbCrLf & Content)
+            Log(ex, "加载帮助 XAML 文件失败", LogLevel.Msgbox)
             Return False
         End Try
     End Function