其他-bug

PDF Office/CustomControl/BatchStatus.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="PDF_Office.CustomControl.BatchStatus"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:PDF_Office.CustomControl"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>

PDF Office/CustomControl/BatchStatus.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace PDF_Office.CustomControl
+{
+    /// <summary>
+    /// BatchStatus.xaml 的交互逻辑
+    /// </summary>
+    public partial class BatchStatus : UserControl
+    {
+        public BatchStatus()
+        {
+            InitializeComponent();
+        }
+    }
+}

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesCreateContentViewModel.cs

@@ -706,6 +706,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             StringColor = EditToolsHelper.ConvertColor(BatesInfo.TextData[0].Color);
             SolidColorBrush = new SolidColorBrush(StringColor);
             PageRangeSelectIndex = BatesInfo.PageRangeIndex;
+            PageRangeText = BatesInfo.PageRange;
         }
         public bool IsNavigationTarget(NavigationContext navigationContext)
         {
@@ -726,10 +727,12 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             {
                 CreateOrEdit = EnumCreateOrEdit.StatusEdit;
                 InitComponentBySelectedInfo();
+                
             }
             else
             {
                 CreateOrEdit = EnumCreateOrEdit.StatusCreate;
+                BatesInfo.PageRange = "";
             }
         }
 

PDF Office/ViewModels/EditTools/Background/BackgroundCreateColorContentViewModel.cs

@@ -209,7 +209,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
             set
             {
                 _pageRangeText = value;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BackgroundInfo.PageRange, PageRangeText);
+                BackgroundInfo.PageRange = PageRangeText;
                 eventAggregator.GetEvent<SetBackgroundEvent>().Publish(new BackgroundInfoUnicode
                 {
                     Unicode = Unicode,
@@ -229,7 +229,6 @@ namespace PDF_Office.ViewModels.EditTools.Background
             {
                 SetProperty(ref _pageRangeSelectIndex, value);
                 BackgroundInfo.PageRangeIndex = PageRangeSelectIndex;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BackgroundInfo.PageRange, PageRangeText);
                 eventAggregator.GetEvent<SetBackgroundEvent>().Publish(new BackgroundInfoUnicode
                 {
                     Unicode = Unicode,
@@ -383,7 +382,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
                 backgroundItem.opacity = backgroundInfo.Opacity;
                 backgroundItem.rotation = backgroundInfo.Rotation;
                 backgroundItem.PageRangeIndex = backgroundInfo.PageRangeIndex;
-                backgroundItem.pageRange = backgroundInfo.PageRange;
+                backgroundItem.pageRange = PageRangeText;
                 backgroundItem.isRelativeScale = backgroundInfo.IsRelativeScale;
                 backgroundItem.scale = backgroundInfo.Scale;
             }

PDF Office/ViewModels/EditTools/Background/BackgroundCreateFileContentViewModel.cs

@@ -256,7 +256,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
             set
             {
                 _pageRangeText = value;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BackgroundInfo.PageRange, PageRangeText);
+                BackgroundInfo.PageRange=PageRangeText;
                 eventAggregator.GetEvent<SetBackgroundEvent>().Publish(new BackgroundInfoUnicode { Unicode=Unicode,Status=BackgroundInfo});
             }
         }
@@ -277,8 +277,13 @@ namespace PDF_Office.ViewModels.EditTools.Background
             get { return _pageRangeSelectIndex; }
             set
             {
-                SetProperty(ref _pageRangeSelectIndex, value);
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BackgroundInfo.PageRange, PageRangeText);
+                SetProperty(ref _pageRangeSelectIndex, value);
+                BackgroundInfo.PageRangeIndex = PageRangeSelectIndex;
+                eventAggregator.GetEvent<SetBackgroundEvent>().Publish(new BackgroundInfoUnicode
+                {
+                    Unicode = Unicode,
+                    Status = BackgroundInfo
+                });
             }
         }
 
@@ -417,7 +422,6 @@ namespace PDF_Office.ViewModels.EditTools.Background
                 backgroundInfo.Opacity = backgroundItem.opacity;
                 backgroundInfo.Rotation = backgroundItem.rotation;
                 backgroundInfo.IsRelativeScale = backgroundItem.isRelativeScale;
-
                 backgroundInfo.Scale = backgroundItem.scale;
                 backgroundInfo.PageRangeIndex = backgroundItem.PageRangeIndex;
                 backgroundInfo.PageRange = backgroundItem.pageRange;
@@ -437,6 +441,8 @@ namespace PDF_Office.ViewModels.EditTools.Background
             backgroundItem.rotation = backgroundInfo.Rotation;
             backgroundItem.isRelativeScale = backgroundInfo.IsRelativeScale;
             backgroundItem.scale = backgroundInfo.Scale;
+            backgroundItem.pageRange = PageRangeText;
+            backgroundItem.PageRangeIndex = backgroundInfo.PageRangeIndex;
             //backgroundItem.pagRangeMode = backgroundInfo.PageRange;
         }
 

PDF Office/ViewModels/EditTools/Background/BackgroundDocumentContentViewModel.cs

@@ -7,6 +7,7 @@ using PDF_Office.EventAggregators;
 using PDF_Office.Helper;
 using PDF_Office.Model;
 using PDF_Office.Model.EditTools.Background;
+using PDF_Office.Model.EditTools.Bates;
 using PDF_Office.Model.EditTools.Watermark;
 using Prism.Commands;
 using Prism.Events;
@@ -153,6 +154,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
         {
             EnumDelete = EnumDelete.StatusCreate;
             BackgroundInfo backgroundInfo = backgroundInfounicode.Status;
+            EditToolsHelper.GetPageRange(backgroundInfo.PageRangeIndex, PDFViewer.Document, ref backgroundInfo.PageRange, backgroundInfo.PageRange);
             this.backgroundInfo = backgroundInfo;
             PDFViewer.InvalidChildVisual(false);
         }

PDF Office/ViewModels/EditTools/Bates/BatesCreateContentViewModel.cs

@@ -154,7 +154,8 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             set
             {
                 _pageRangeText = value;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
+                BatesInfo.PageRange = PageRangeText;
+                //EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
                 eventAggregator.GetEvent<SetBatesEvent>().Publish(new BatesInfoUnicode
                 {
                     Unicode = Unicode,
@@ -171,7 +172,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             {
                 SetProperty(ref _pageRangeSelectIndex, value);
                 BatesInfo.PageRangeIndex = PageRangeSelectIndex;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
+                //EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
                 eventAggregator.GetEvent<SetBatesEvent>().Publish(new BatesInfoUnicode
                 {
                     Unicode = Unicode,
@@ -633,7 +634,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             batesItem.Suffix = batesInfo.Suffix;
             batesItem.StarPagetNumber = batesInfo.StarPagetNumber;
             batesItem.margin = batesInfo.margin;
-            batesItem.PageRange = batesInfo.PageRange;
+            batesItem.PageRange = PageRangeText;
             batesItem.PageRangeIndex = batesInfo.PageRangeIndex;
 
         }
@@ -648,7 +649,8 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             batesInfo.StarPagetNumber = batesItem.StarPagetNumber;
             batesInfo.margin = batesItem.margin;
             batesInfo.PageRangeIndex = batesItem.PageRangeIndex;
-            EditToolsHelper.GetPageRange(batesInfo.PageRangeIndex, PDFViewer.Document, ref batesInfo.PageRange, batesItem.PageRange);
+            batesInfo.PageRange=batesItem.PageRange;
+            //EditToolsHelper.GetPageRange(batesInfo.PageRangeIndex, PDFViewer.Document, ref batesInfo.PageRange, batesItem.PageRange);
 
         }
 
@@ -747,6 +749,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             StringColor = EditToolsHelper.ConvertColor(BatesInfo.TextData[0].Color);
             SolidColorBrush = new SolidColorBrush(StringColor);
             PageRangeSelectIndex = BatesInfo.PageRangeIndex;
+            PageRangeText=BatesInfo.PageRange;
         }
         public bool IsNavigationTarget(NavigationContext navigationContext)
         {
@@ -762,16 +765,18 @@ namespace PDF_Office.ViewModels.EditTools.Bates
 
             navigationContext.Parameters.TryGetValue<CPDFViewer>(ParameterNames.PDFViewer, out PDFViewer);
             MaxPageRange = PDFViewer.Document.PageCount;
-            EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
-
+            
             if (navigationContext.Parameters.TryGetValue<BatesHeaderFooterItem>("BatesItem", out TemplateBatesItem))
             {
                 CreateOrEdit = EnumCreateOrEdit.StatusEdit;
+                BatesInfo.PageRange = TemplateBatesItem.PageRange;
                 InitComponentBySelectedInfo();
+                
             }
             else
             {
                 CreateOrEdit = EnumCreateOrEdit.StatusCreate;
+                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
             }
         }
 

PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterCreateContentViewModel.cs

@@ -250,7 +250,7 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
             set
             {
                 _pageRangeText = value;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref HeaderFooterInfo.PageRange, PageRangeText);
+                HeaderFooterInfo.PageRange = PageRangeText;
                 eventAggregator.GetEvent<SetHeaderFooterEvent>().Publish(new HeaderFooterInfoUnicode
                 {
                     Unicode = Unicode,
@@ -267,7 +267,6 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
             {
                 SetProperty(ref _pageRangeSelectIndex, value);
                 HeaderFooterInfo.PageRangeIndex = PageRangeSelectIndex;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref HeaderFooterInfo.PageRange, PageRangeText);
                 eventAggregator.GetEvent<SetHeaderFooterEvent>().Publish(new HeaderFooterInfoUnicode
                 {
                     Unicode = Unicode,
@@ -657,7 +656,7 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
             headerFooterItem.StarPagetNumber = headerFooterInfo.StarPagetNumber;
             headerFooterItem.PageNumberFormat = headerFooterInfo.PageNumberFormat;
             headerFooterItem.margin = headerFooterInfo.margin;
-            headerFooterItem.PageRange = headerFooterInfo.PageRange;
+            headerFooterItem.PageRange = PageRangeText;
             headerFooterItem.PageRangeIndex = headerFooterInfo.PageRangeIndex;
         }
 

PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateFileContentViewModel.cs

@@ -273,7 +273,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             set
             {
                 _pageRangeText = value;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref WatermarkInfo.PageRange, PageRangeText);
+                WatermarkInfo.PageRange = PageRangeText;
                 eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
                 {
                     Unicode = Unicode,
@@ -322,7 +322,6 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             {
                 SetProperty(ref _pageRangeSelectIndex, value);
                 WatermarkInfo.PageRangeIndex = PageRangeSelectIndex;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref WatermarkInfo.PageRange, PageRangeText);
                 eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
                 {
                     Unicode = Unicode,
@@ -424,7 +423,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 watermarkItem.verticalSpacing = watermarkInfo.VerticalSpacing;
                 watermarkItem.horizontalSpacing = watermarkInfo.HorizontalSpacing;
                 watermarkItem.pageRangeIndex = watermarkInfo.PageRangeIndex;
-                watermarkItem.pageRange = watermarkInfo.PageRange;
+                watermarkItem.pageRange = PageRangeText;
             }
         }
 

PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateTextContentViewModel.cs

@@ -436,7 +436,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             set
             {
                 _pageRangeText = value;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref WatermarkInfo.PageRange, PageRangeText);
+                WatermarkInfo.PageRange = PageRangeText;
                 eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
                 {
                     Unicode = Unicode,
@@ -453,7 +453,6 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             {
                 SetProperty(ref _pageRangeSelectIndex, value);
                 WatermarkInfo.PageRangeIndex = PageRangeSelectIndex;
-                EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref WatermarkInfo.PageRange, PageRangeText);
                 eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
                 {
                     Unicode = Unicode,
@@ -523,7 +522,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 watermarkItem.verticalSpacing = watermarkInfo.VerticalSpacing;
                 watermarkItem.horizontalSpacing = watermarkInfo.HorizontalSpacing;
                 watermarkItem.pageRangeIndex = watermarkInfo.PageRangeIndex;
-                watermarkItem.pageRange = watermarkInfo.PageRange;
+                watermarkItem.pageRange = PageRangeText;
             }
         }
 

PDF Office/Views/EditTools/Background/BackgroundTemplateListColorContent.xaml.cs

@@ -33,7 +33,7 @@ namespace PDF_Office.Views.EditTools.Background
         {
             var listBox = sender as ListBox;
             viewModel.SelectTemplateItemCommand?.Execute(sender);
-            listBox.SelectedIndex = -1;
+            //listBox.SelectedIndex = -1;
         }
 
         private void MenuEdit_Click(object sender, RoutedEventArgs e)

PDF Office/Views/EditTools/Background/BackgroundTemplateListFileContent.xaml.cs

@@ -32,7 +32,7 @@ namespace PDF_Office.Views.EditTools.Background
         {
             var listBox = sender as ListBox;
             viewModel.SelectTemplateItemCommand?.Execute(sender);
-            listBox.SelectedIndex = -1;
+            //listBox.SelectedIndex = -1;
         }
 
         private void MenuEdit_Click(object sender, RoutedEventArgs e)

PDF Office/Views/EditTools/Watermark/WatermarkTemplateListFileContent.xaml.cs

@@ -40,7 +40,7 @@ namespace PDF_Office.Views.EditTools.Watermark
                Trace.WriteLine( lists.IndexOf(item));
             }
             viewModel.SelectTemplateItemCommand?.Execute(sender);
-            FileWatermarkListbox.SelectedIndex = -1;
+            //FileWatermarkListbox.SelectedIndex = -1;
         }
 
         private void MenuEdit_Click(object sender, RoutedEventArgs e)

PDF Office/Views/EditTools/Watermark/WatermarkTemplateListTextContent.xaml.cs

@@ -32,7 +32,7 @@ namespace PDF_Office.Views.EditTools.Watermark
         {
             viewModel.SelectTemplateItemCommand?.Execute(sender);
 
-            TextWatermarkListbox.SelectedIndex = -1;
+            //TextWatermarkListbox.SelectedIndex = -1;
         }
 
         private void MenuEdit_Click(object sender, RoutedEventArgs e)