Browse Source

阅读页-链接 右键菜单交互优化

OYXH\oyxh 1 year ago
parent
commit
79a2cd0bf5

+ 1 - 1
PDF Office/ViewModels/PropertyPanel/AnnotPanel/LinkAnnotPropertyViewModel.cs

@@ -1023,7 +1023,6 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 
         private void GoToPage(int pageIndex)
         {
-           
             //定位
             paintrect = LinkAnnotArgs.GetLinkCreateArea();
             double height = 0;
@@ -1275,6 +1274,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                 if (viewContentViewModel.IsRightMenuCreateLink)
                 {
                     SetTextBoxEnableOrNot(true, totalPage);
+                    viewContentViewModel.IsRightMenuCreateLink = false;
                 }
                 else
                 {

+ 12 - 8
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -411,16 +411,20 @@ namespace PDF_Master.ViewModels.Tools
                 {
                     selectedArgs = new List<AnnotHandlerEventArgs>();
                     selectedArgs.Add(linkArgs);
-                    AnnotHandlerEventArgs annotHandler = CreateAnnotFromSelectPageText(linkArgs);
-                    if (annotHandler is LinkAnnotArgs annotArgs)
+                    if (viewContentViewModel.IsRightMenuCreateLink == false)
                     {
-                        selectedArgs.Clear();
-                        selectedArgs.Add(annotArgs);
-                        PropertyPanel.IsSelectedTextAddLink = true;
-                        //PDFViewer.SelectAnnotation(annotArgs.PageIndex, annotArgs.AnnotIndex);
-                        //viewContentViewModel.IsPropertyOpen = true;
-                        //return linkArgs;
+                        AnnotHandlerEventArgs annotHandler = CreateAnnotFromSelectPageText(linkArgs);
+                        if (annotHandler is LinkAnnotArgs annotArgs)
+                        {
+                            selectedArgs.Clear();
+                            selectedArgs.Add(annotArgs);
+                            PropertyPanel.IsSelectedTextAddLink = true;
+                            //PDFViewer.SelectAnnotation(annotArgs.PageIndex, annotArgs.AnnotIndex);
+                            //viewContentViewModel.IsPropertyOpen = true;
+                            //return linkArgs;
+                        }
                     }
+
                 }
             }
             AddToPropertyPanel("LinkAnnotProperty", "Link", selectedArgs, annotAttribEvent);

+ 1 - 1
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -451,7 +451,7 @@ namespace PDF_Master.ViewModels.Tools
                 if (str == AddAnnotType.AnnotLink.ToString())
                 {
                     PropertyPanel.IsAddLink = true;
-
+                    viewContentViewModel.IsRightMenuCreateLink = true;
                     annotHandler = GetLink();
                 }
                 if (str == AddAnnotType.AnnotStamp.ToString())