注释列表-交互优化

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -303,14 +303,15 @@ namespace PDF_Master.ViewModels.BOTA
         {
             RefreshAnnotationListItems();
         }
-        bool isHiddenAnnot=false;
+
+        private bool isHiddenAnnot = false;
+
         public void HiddenAnnot()
         {
             isHiddenAnnot = true;
             AnnotationListItems.Clear();
             CurrentAnnotationLists = GetDocumentAnnotionList(out HideAnnots);
             AnnotationListItems.AddRange(CurrentAnnotationLists);
-           
         }
 
         public void DisplayAnnot()
@@ -661,7 +662,7 @@ namespace PDF_Master.ViewModels.BOTA
                     button.IsEnabled = true;
                 }
                 IsEmptyPanelVisibility = Visibility.Visible;
-                IsHideAnnotPanelVisibility = Visibility.Collapsed;
+                IsHideAnnotPanelVisibility = Visibility.Visible;
             }
         }
 
@@ -1063,7 +1064,7 @@ namespace PDF_Master.ViewModels.BOTA
                         await Task.Delay(5);//不加延时 每页的第一个注释不会展开
                         listBox.SelectedItem = args;
                         ExpandGroupHeader(args, listBox);
-                       
+
                         await Task.Delay(5);//不加延时 会有不滚动的现象
                         listBox.ScrollIntoView(item);
                         //if (!listBox.SelectedItems.Contains(args))
@@ -1182,7 +1183,7 @@ namespace PDF_Master.ViewModels.BOTA
                                 listBox.SelectedItem = AnnotationListItems[k];
                                 //PdfViewer.SelectAnnotation(args.PageIndex, args.AnnotIndex);
                             }
-                          
+
                             ExpandGroupHeader(AnnotationListItems[k], listBox);
 
                             await Task.Delay(5);//不加延时 会有不滚动的现象
@@ -1278,7 +1279,10 @@ namespace PDF_Master.ViewModels.BOTA
             iCollectionView.SortDescriptions.Add(new SortDescription(nameof(AnnotationHandlerEventArgs.AnnotIndex), ListSortDirection.Ascending));
 
             SetGroupHeader(listBox);
-            //RefreshAnnotationListItems();
+            Screen = Visibility.Collapsed;
+            colors.Clear();
+            authors.Clear();
+            annotArgsTypes.Clear();
             KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
             KeyEventsHelper.KeyDown += ShortCut_KeyDown;
         }
@@ -1371,12 +1375,13 @@ namespace PDF_Master.ViewModels.BOTA
             {
                 if (CurrentAnnotationLists.Count <= 0 && HideAnnots.Count > 1)
                 {
-                    IsEmptyPanelVisibility = Visibility.Collapsed;
+                    IsEmptyPanelVisibility = Visibility.Visible;
                     IsHideAnnotPanelVisibility = Visibility.Visible;
                 }
                 else
                 {
                     IsEmptyPanelVisibility = Visibility.Visible;
+                    IsHideAnnotPanelVisibility = Visibility.Visible;
                 }
             }
         }
@@ -1630,22 +1635,21 @@ namespace PDF_Master.ViewModels.BOTA
                 {
                     if (CurrentAnnotationLists.Count <= 0)
                     {
-                        IsHideAnnotPanelVisibility = Visibility.Visible;
-                        IsEmptyPanelVisibility = Visibility.Collapsed;
+                        IsHideAnnotPanelVisibility = Visibility.Collapsed;
+                        IsEmptyPanelVisibility = Visibility.Visible;
                     }
                     else
                     {
                         if (isHiddenAnnot)
                         {
-                            IsHideAnnotPanelVisibility = Visibility.Visible;
-                            IsEmptyPanelVisibility = Visibility.Collapsed;
+                            IsHideAnnotPanelVisibility = Visibility.Collapsed;
+                            IsEmptyPanelVisibility = Visibility.Visible;
                         }
                         else
                         {
                             IsEmptyPanelVisibility = Visibility.Visible;
-                            IsHideAnnotPanelVisibility = Visibility.Collapsed;
+                            IsHideAnnotPanelVisibility = Visibility.Visible;
                         }
-                        
                     }
                     //IsEmptyPanelVisibility = Visibility.Visible;
                 }

PDF Office/Views/BOTA/AnnotationContent.xaml

@@ -178,25 +178,25 @@
                     Foreground="#94989C"
                     Text="{Binding T_EmptyContext}"
                     TextAlignment="Center"
-                    TextWrapping="Wrap" />
-            </StackPanel>
-            <StackPanel
-                Name="HideAnnotPanel"
-                Grid.ColumnSpan="2"
-                VerticalAlignment="Center"
-                Visibility="{Binding IsHideAnnotPanelVisibility}">
-                <Image
-                    Width="128"
-                    Height="128"
-                    Source="pack://application:,,,/Resources/BOTA/HideAnnot.png" />
-                <TextBlock
-                    Name="txtHideAnnot"
-                    Margin="0,12,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="16"
-                    Text="{Binding T_EmptyTitle}"
-                    TextAlignment="Center" />
+                    TextWrapping="Wrap" Visibility="{Binding IsHideAnnotPanelVisibility}" />
             </StackPanel>
+            <!--<StackPanel
+            Name="HideAnnotPanel"
+            Grid.ColumnSpan="2"
+            VerticalAlignment="Center"
+            Visibility="{Binding IsHideAnnotPanelVisibility}">
+            <Image
+            Width="128"
+            Height="128"
+            Source="pack://application:,,,/Resources/BOTA/HideAnnot.png" />
+            <TextBlock
+            Name="txtHideAnnot"
+            Margin="0,12,0,0"
+            FontFamily="Segoe UI"
+            FontSize="16"
+            Text="{Binding T_EmptyTitle}"
+            TextAlignment="Center" />
+            </StackPanel>-->
         </Grid>
         <Border BorderBrush="{StaticResource color.field.border.norm}" BorderThickness="0,0,0,1">
             <Grid