注释列表-增加筛选符号

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -165,6 +165,20 @@ namespace PDF_Master.ViewModels.BOTA
             }
         }
 
+        private Visibility screen = Visibility.Collapsed;
+        /// <summary>
+        /// 是否有筛选条件
+        /// </summary>
+        public Visibility Screen
+        {
+            get { return screen; }
+            set
+            {
+                SetProperty(ref screen, value);
+            }
+        }
+
+
         private void InitString()
         {
             T_Expand = App.MainPageLoader.GetString("Annotation_MenuExpand");
@@ -582,10 +596,12 @@ namespace PDF_Master.ViewModels.BOTA
                               //AnnotationListItems = new ObservableCollection<AnnotationHandlerEventArgs>(AnnotationListItems.OrderBy(item => item.ClientRect.Y).ThenBy(item => item.ClientRect.X));
                               RefreshAnnotationListItems(button);
                               //AnnotationListItems.CollectionChanged += AnnotationListItems_CollectionChanged;
+                              Screen = Visibility.Visible;
                           }
                           else
                           {
                               CleanAnnotation(button);
+                              Screen = Visibility.Collapsed;
                           }
                       }
                       else if (e.Result == ButtonResult.Cancel && e.Parameters != null)

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -895,7 +895,7 @@ namespace PDF_Master.ViewModels
         private void AutoSaveTimer_Tick(object sender, EventArgs e)
         {
             var autoSave = Settings.Default.AppProperties.Description.AutoSave;
-            if (autoSave && !mainViewModel.NewFile)
+            if (autoSave && !mainViewModel.NewFile&&PDFViewer.UndoManager.CanSave)
             {
                 //自动保存仅针对已经有文件路径的文档
                 saveFile();

PDF Office/Views/Dialog/BOTA/ScreenAnnotationDialog.xaml

@@ -34,8 +34,9 @@
                         Name="EllipseColor"
                         Width="20"
                         Height="20"
-                        StrokeThickness="1" Stroke="{StaticResource color.sys.layout.divider}"
-                        Fill="{Binding Color}" />
+                        Fill="{Binding Color}"
+                        Stroke="{StaticResource color.sys.layout.divider}"
+                        StrokeThickness="1" />
                 </Border>
             </DataTemplate>
             <DataTemplate x:Key="ListAuthorData">
@@ -61,7 +62,6 @@
                                 Width="40"
                                 Height="40"
                                 HorizontalAlignment="Center"
-
                                 Background="{TemplateBinding Background}"
                                 CornerRadius="4">
                                 <ContentPresenter />
@@ -524,8 +524,6 @@
                     Height="32"
                     Margin="25,0,0,0"
                     HorizontalAlignment="Left"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
                     Command="{Binding CleanCommand}"
                     Content="{Binding T_Clear}"
                     FontFamily="Segoe UI"