页面编辑-18617、18620、18614

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -2314,7 +2314,7 @@ namespace PDF_Master.ViewModels.PageEdit
                 //每页生成的单独的文件
                 for (int i = 0; i < pagenums.Count; i++)
                 {
-                    string filename = PDFViewer.Document.FileName + " " + pagenums[i] + ".pdf";
+                    string filename = PDFViewer.Document.FileName + " " + "pages " + pagenums[i] + ".pdf";
                     string path = System.IO.Path.Combine(dialog.SelectedPath, filename);
                     path = CommonHelper.CreateFilePath(path);
                     selectedfile = path;
@@ -2336,7 +2336,7 @@ namespace PDF_Master.ViewModels.PageEdit
             }
             else//全部生成一个文件
             {
-                string filename = PDFViewer.Document.FileName + " " + CommonHelper.GetPageParmFromList(pagenums) + ".pdf";
+                string filename = PDFViewer.Document.FileName + " " + "pages "+ CommonHelper.GetPageParmFromList(pagenums) + ".pdf";
                 string path = System.IO.Path.Combine(dialog.SelectedPath, filename);
                 path = CommonHelper.CreateFilePath(path);
                 selectedfile = path;
@@ -3065,9 +3065,10 @@ namespace PDF_Master.ViewModels.PageEdit
                 {
                     //没有符合条件时 清空选中项
                     ListSelectedIndex = -1;
+                    //20230714 没有符合条件的页面时候，控件内容不清空
                     //没有符合条件的页面时，空间内容清空
-                    await Task.Delay(30);
-                    TbPageRange = "";
+                    //await Task.Delay(30);
+                    //TbPageRange = "";
                 }
             }
         }

PDF Office/Views/PageEdit/PageEditContent.xaml

@@ -89,22 +89,28 @@
                                     MaxWidth="{Binding ElementName=GridRoot, Path=ActualWidth}"
                                     HorizontalAlignment="Center"
                                     FontSize="{Binding FontSize}"
+                                    Foreground="{StaticResource color.sys.text.neutral.lv2}"
                                     Text="{Binding PageSize}"
                                     TextWrapping="Wrap"
-                                    Visibility="{Binding ShowPageSize, Converter={StaticResource BoolToVisibleConvert}}"
-                                    Foreground="{StaticResource color.sys.text.neutral.lv2}" />
+                                    Visibility="{Binding ShowPageSize, Converter={StaticResource BoolToVisibleConvert}}" />
                             </StackPanel>
                         </Border>
                     </StackPanel>
                 </Grid>
             </DataTemplate>
 
-            <ContextMenu x:Key="ListBoxItemMenu" DataContext="{Binding Path=DataContext, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" Loaded="ContextMenu_Loaded">
-                <MenuItem Header="{Binding T_InsertPage}" Visibility="Visible" Tag="Insert">
+            <ContextMenu
+                x:Key="ListBoxItemMenu"
+                DataContext="{Binding Path=DataContext, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                Loaded="ContextMenu_Loaded">
+                <MenuItem
+                    Header="{Binding T_InsertPage}"
+                    Tag="Insert"
+                    Visibility="Visible">
                     <MenuItem
                         Command="{Binding InsertCommand}"
                         CommandParameter="{x:Static model:ParameterNames.InsertType_File}"
-                        Header="{Binding    T_Insert}" />
+                        Header="{Binding T_Insert}" />
                     <MenuItem
                         Command="{Binding InsertCommand}"
                         CommandParameter="{x:Static model:ParameterNames.InsertType_Blank}"
@@ -115,20 +121,24 @@
                         Header="{Binding T_InsertaCustomPage}" />
                 </MenuItem>
                 <MenuItem
-                    Command="{Binding ExtractCommand}" Tag="Extract"
+                    Command="{Binding ExtractCommand}"
                     Header="{Binding T_ExtractPage}"
+                    Tag="Extract"
                     Visibility="Visible" />
                 <MenuItem
-                    Command="{Binding ReplaceCommand}" Tag="Replace"
+                    Command="{Binding ReplaceCommand}"
                     Header="{Binding T_ReplacePage}"
+                    Tag="Replace"
                     Visibility="{Binding IsBOTAThumb, Converter={StaticResource UnvisibleConvert}}" />
                 <MenuItem
-                    Command="{Binding SplitCommand}" Tag="Split"
-                    Header="{Binding  T_Split}"
+                    Command="{Binding SplitCommand}"
+                    Header="{Binding T_Split}"
+                    Tag="Split"
                     Visibility="Visible" />
                 <MenuItem
-                    Command="{Binding ReverseCommand}" Tag="Reverse"
+                    Command="{Binding ReverseCommand}"
                     Header="{Binding T_Reverse}"
+                    Tag="Reverse"
                     Visibility="Visible" />
                 <MenuItem Command="{Binding DeleteCommand}" Header="{x:Static mainpage:MainPage.PageEdit_MenuDelete}" />
                 <MenuItem
@@ -150,8 +160,8 @@
                 <MenuItem
                     Name="MenuHidePageSize"
                     Command="{Binding ShowPageSizeCommand}"
-                    Header="Hide PageSize"
-                    Visibility="{Binding  HidePageSize}" />
+                    Header="Hide Page Size"
+                    Visibility="{Binding HidePageSize}" />
                 <Separator Style="{StaticResource HorizontalSeparatorStyle}" Visibility="{Binding IsBOTAThumb, Converter={StaticResource UnVisibleConvert}}" />
                 <MenuItem Click="MenuItem_Click" Header="{x:Static mainpage:MainPage.PageEdit_MenuPrint}" />
             </ContextMenu>
@@ -288,7 +298,7 @@
                                 <Path Data="M10.5 18H4.5V2H12.3671L16.5 6.74847V10H18.5V6.74847C18.5 6.26584 18.3255 5.79948 18.0086 5.43542L13.8757 0.686951C13.4958 0.250541 12.9456 0 12.3671 0H4.5C3.39543 0 2.5 0.895431 2.5 2V18C2.5 19.1046 3.39543 20 4.5 20H10.5V18Z " Fill="#273C62" />
                                 <Path Data="M16.5 14V11H14.5V14H11.5V16H14.5V19H16.5V16H19.5V14H16.5Z " Fill="#94989C" />
                             </Grid>
-                            <TextBlock VerticalAlignment="Center" Text="{Binding T_Insert}" />
+                            <TextBlock VerticalAlignment="Center" Text="{Binding T_InsertFile}" />
                             <Path
                                 Width="12"
                                 Height="12"
@@ -301,7 +311,7 @@
                                 <MenuItem
                                     Command="{Binding InsertCommand}"
                                     CommandParameter="{x:Static model:ParameterNames.InsertType_File}"
-                                    Header="{Binding T_InsertFile}" />
+                                    Header="{Binding T_Insert}" />
                                 <MenuItem
                                     Command="{Binding InsertCommand}"
                                     CommandParameter="{x:Static model:ParameterNames.InsertType_Blank}"
@@ -319,10 +329,11 @@
                     Content="提取"
                     Visibility="Visible" />-->
                     <Button
+                        Width="75"
                         Margin="5"
+                        HorizontalContentAlignment="Left"
                         Command="{Binding ExtractCommand}"
-                        Width="75"
-                        Visibility="Visible" HorizontalContentAlignment="Left">
+                        Visibility="Visible">
                         <StackPanel Margin="4,0" Orientation="Horizontal">
                             <Grid Margin="0,0,8,0">
 
@@ -338,10 +349,11 @@
                     Content="替换"
                     Visibility="Visible" />-->
                     <Button
-                        Margin="5"
                         Width="80"
+                        Margin="5"
+                        HorizontalContentAlignment="Left"
                         Command="{Binding ReplaceCommand}"
-                        Visibility="Visible" HorizontalContentAlignment="Left">
+                        Visibility="Visible">
                         <StackPanel Margin="4,0" Orientation="Horizontal">
                             <Grid Margin="0,0,8,0">
 
@@ -357,9 +369,11 @@
                     Content="拆分"
                     Visibility="Visible" />-->
                     <Button
+                        Width="68"
                         Margin="5"
-                        Command="{Binding SplitCommand}" Width="68"
-                        Visibility="Visible" HorizontalContentAlignment="Left">
+                        HorizontalContentAlignment="Left"
+                        Command="{Binding SplitCommand}"
+                        Visibility="Visible">
                         <StackPanel Margin="4,0" Orientation="Horizontal">
                             <Grid Margin="0,0,8,0">
 
@@ -375,9 +389,11 @@
                     Content="倒序"
                     Visibility="Visible" />-->
                     <Button
+                        Width="80"
                         Margin="5"
-                        Command="{Binding ReverseCommand}" Width="80"
-                        Visibility="Visible" HorizontalContentAlignment="Left">
+                        HorizontalContentAlignment="Left"
+                        Command="{Binding ReverseCommand}"
+                        Visibility="Visible">
                         <StackPanel Margin="4,0" Orientation="Horizontal">
                             <Grid Margin="0,0,8,0">
 
@@ -473,18 +489,20 @@
                 ScrollViewer.ScrollChanged="ListPageEdit_ScrollChanged"
                 SelectedIndex="{Binding ListSelectedIndex, Mode=TwoWay}"
                 SelectionMode="Extended"
-                VirtualizingPanel.IsVirtualizing="False"
                 VirtualizingPanel.CacheLength="1"
                 VirtualizingPanel.CacheLengthUnit="Page"
+                VirtualizingPanel.IsVirtualizing="False"
                 VirtualizingPanel.ScrollUnit="Pixel"
                 VirtualizingPanel.VirtualizationMode="Standard">
-                <!--VirtualizingPanel.IsVirtualizing="true"会加快item加载速度，但是会导致大量绑定失败，Debug时会比较卡顿。
-                需要综合情况来看是否要启用虚拟化-->
                 <!--
-                此处要用循环模式，否则滚动时容易误触发EndSscroll 从而频繁拿图导致卡顿
-                VirtualizingPanel.ScrollUnit="Pixel" 设置鼠标每次滚动的步进值
-                VirtualizingPanel.VirtualizationMode="Standard" ‚
-                如果设置成循环模式，回导致偶现选中一页无法取消的情况
+                    VirtualizingPanel.IsVirtualizing="true"会加快item加载速度，但是会导致大量绑定失败，Debug时会比较卡顿。
+                    需要综合情况来看是否要启用虚拟化
+                -->
+                <!--
+                    此处要用循环模式，否则滚动时容易误触发EndSscroll 从而频繁拿图导致卡顿
+                    VirtualizingPanel.ScrollUnit="Pixel" 设置鼠标每次滚动的步进值
+                    VirtualizingPanel.VirtualizationMode="Standard" ‚
+                    如果设置成循环模式，回导致偶现选中一页无法取消的情况
                 -->
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="{x:Type ListBoxItem}">

PDF Office/Views/PageEdit/PageEditContent.xaml.cs

@@ -477,7 +477,7 @@ namespace PDF_Master.Views.PageEdit
                         {
                             //多选页面 提取成一个文件夹
 
-                            string filename = viewModel.PDFViewer.Document.FileName + " " + CommonHelper.GetPageParmFromList(pages) + ".pdf";
+                            string filename = viewModel.PDFViewer.Document.FileName + " " + "pages " + CommonHelper.GetPageParmFromList(pages) + ".pdf";
                             string tempPath = System.IO.Path.Combine(dir, filename);
                             //删除 临时文件的同名文件
                             if (File.Exists(tempPath))