其他-调整图章右键菜单

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Layout.cs

@@ -897,19 +897,20 @@ namespace PDF_Master.ViewModels.Tools
             menuItem.Header = "导出";
             pop.AddItem(menuItem);
 
-            //已跟设计确认，暂时不需要PNG格式
-            //menuItem = new MenuItem();
-            //menuItem.Name = "StampExportPNG";
-            //menuItem.Header = "PNG";
-            //menuItem.Tag = "PNG";
-            //pop.BindingEvent(pop.AddChild("StampExportPicture", menuItem), StampExportPicture_MenuCommand);
-
+    
             menuItem = new MenuItem();
             menuItem.Name = "StampExportPNG";
-            menuItem.Header = "JPG";
-            menuItem.Tag = "JPG";
-            pop.BindingEvent(pop.AddChild("StampExportPicture", menuItem), StampExportPicture_MenuCommand);
-
+            menuItem.Header = "PNG";
+            menuItem.Tag = "PNG";
+            pop.BindingEvent(pop.AddChild("StampExportPicture", menuItem), StampExportPicture_MenuCommand);
+
+            //已跟设计确认，暂时不需要JPG格式
+            //menuItem = new MenuItem();
+            //menuItem.Name = "StampExportPNG";
+            //menuItem.Header = "JPG";
+            //menuItem.Tag = "JPG";
+            //pop.BindingEvent(pop.AddChild("StampExportPicture", menuItem), StampExportPicture_MenuCommand);
+
             menuItem = new MenuItem();
             menuItem.Name = "StampExportPDF";
             menuItem.Header = "PDF";

PDF Office/Views/BOTA/BookmarkContent.xaml.cs

@@ -55,6 +55,8 @@ namespace PDF_Master.Views.BOTA
         {
             ListViewItem listItem = (ListViewItem)(BookMarkListView.ItemContainerGenerator.ContainerFromItem(BookMarkListView.SelectedItem));
             TextBlock textBlock = CommonHelper.FindVisualChild<TextBlock>(listItem);
+            if (textBlock == null)
+                return;
             TextBox text = CommonHelper.FindVisualChild<TextBox>(listItem);
             if (textBlock.Visibility == Visibility.Collapsed)
             {