注释 - 绘制线条为箭头的问题，右键菜单添加形状，属性面板注释类型不同步变化

PDF Office/ViewModels/PropertyPanel/AnnotPanel/SharpsAnnotPropertyViewModel.cs

@@ -216,8 +216,8 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                     break;
             }
 
-            //if (isFromToolsBtn == false)
-            //     PropertyPanel.AnnotTypeChangedInvoke(this, changeData);
+            if (isFromToolsBtn == false)
+                PropertyPanel.AnnotTypeChangedInvoke(this, changeData);
 
             BasicVm.SetOtherTag(tag);
         }

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

@@ -170,13 +170,40 @@ namespace PDF_Office.ViewModels.Tools
                             {
                                 if (ToolExpandDict.ContainsValue(e.AnnotItemsList[0].EventType))
                                 {
+                                    var strLineAnnotTag = "";
+                                    if(e.AnnotItemsList[0] is LineAnnotArgs)
+                                    {
+                                        var lineAnnot = e.AnnotItemsList[0] as LineAnnotArgs;
+                                        if (lineAnnot.HeadLineType == C_LINE_TYPE.LINETYPE_NONE && lineAnnot.TailLineType == C_LINE_TYPE.LINETYPE_NONE)
+                                        {
+                                            strLineAnnotTag = "Line";
+                                        }
+                                        else
+                                        {
+                                            strLineAnnotTag = "Arrow";
+                                        }
+                                    }
+
                                     foreach (var item in ToolExpandDict)
                                     {
                                         if (item.Value == e.AnnotItemsList[0].EventType)
                                         {
                                             annot = null;//新建注释时，回到默认值
-                                            FindAnnotTypeKey(item.Key, ref annot);
-                                            break;
+                                            if(string.IsNullOrEmpty(strLineAnnotTag))
+                                            {
+                                                FindAnnotTypeKey(item.Key, ref annot);
+                                                break;
+                                            }
+                                            else
+                                            {
+                                                if(strLineAnnotTag == item.Key)
+                                                {
+                                                    FindAnnotTypeKey(item.Key, ref annot);
+                                                    break;
+                                                }
+                                                    
+                                            }
+                                           
                                         }
                                     }
                                 }

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -168,6 +168,7 @@ namespace PDF_Office.ViewModels.Tools
             {
                 AnnotHandlerEventArgs annotHandler = null;
                 string str = menuItem.Tag.ToString();
+                viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                 if (str == AddAnnotType.AnnotFreehand.ToString())
                 {
                     annotHandler = GetFreehand();