编辑自测bug修复

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -2094,11 +2094,12 @@ namespace PDF_Master.ViewModels.Tools
                     }
                     else 
                     {
-                        if(PDFViewer.MouseMode!= MouseModes.PDFEdit)
+                        //避免编辑功能ESC快捷键冲突
+                        if (PDFViewer.MouseMode != MouseModes.PDFEdit)
                         {
                             ExitAnnotationTool();
                         }
-                     
+
                     }
                 }
             }

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -163,42 +163,52 @@ namespace PDF_Master.ViewModels.Tools
         #region 快捷键
         private void ShortCut_KeyDown(object sender, KeyEventArgs e)
         {
-
-  
-            if (e.Key == Key.Escape)
+            try
             {
-                if (PDFViewer != null)
+                if (e.Key == Key.Escape)
                 {
+                    if (PDFViewer != null)
+                    {
 
+                        if (PDFViewer.ToolManager != null && PDFViewer.GetPDFEditCreateType() == ComPDFKit.PDFPage.CPDFEditType.EditText)
+                        {
+                            PDFViewer.RemovePDFEditEmptyText();
+                            //PDFViewer.SetMouseMode(MouseModes.PDFEdit);
+                            //PDFViewer.ReloadDocument();
+                            //ShowPropertyPanel(true);
 
-                    if (PDFViewer.ToolManager != null && IsTextEdit == true)
-                    {
-           
-                        PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.None);
-                        //PDFViewer.RemovePDFEditEmptyText();
-                        //PDFViewer.SetMouseMode(MouseModes.PDFEdit);
-                        //PDFViewer.ReloadDocument();
-                        //ShowPropertyPanel(false);
+                            if (PDFViewer.MouseMode == MouseModes.PDFEdit&& PDFViewer.ToolManager.HasTool == true)
+                            {
+                                PDFViewer.RemoveTool(false);
+                            }
+
+                        }
+
+                        else if (PDFViewer.ToolManager != null && PDFViewer.GetPDFEditCreateType() == ComPDFKit.PDFPage.CPDFEditType.EditImage)
+                        {
+
+                            PDFViewer.RemovePDFEditEmptyText();
+                            //PDFViewer.SetMouseMode(MouseModes.PDFEdit);
+                            //PDFViewer.ReloadDocument();
+                            //ShowPropertyPanel(true);
+                            if (PDFViewer.MouseMode == MouseModes.PDFEdit&&PDFViewer.ToolManager.HasTool == true)
+                            {
+                                PDFViewer.RemoveTool(false);
+                            }
+                        }
 
 
 
-                    }
 
-                    else if (PDFViewer.ToolManager != null && IsImgEdit == true)
-                    {
-                      
-                        PDFViewer.RemovePDFEditEmptyText();
-                        PDFViewer.SetMouseMode(MouseModes.PDFEdit);
-                        PDFViewer.ReloadDocument();
-                        ShowPropertyPanel(true);
-                    }
 
-                    if (PDFViewer.MouseMode == MouseModes.PDFEdit )
-                    {
-                        PDFViewer.RemoveTool(false);
                     }
                 }
             }
+            catch
+            {
+
+            }
+           
           
 
         }