批量处理

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundDialogViewModel.cs

@@ -449,6 +449,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             Filenames = filenames;
         }
 
+
         /// <summary>
         /// 添加PDF文件夹
         /// </summary>
@@ -517,15 +518,15 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         /// <summary>
         /// 更新Currentlistview显示
-        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面） state 状态显示字符串
+        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面）isevenpageisenabled 偶数页状态 state 状态显示字符串
         /// </summary>
-        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", string state = "待完成")
+        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0",bool isevenpageisenabled=true,string state = "待完成")
         {
             if (fileNames.Count >= FileNameNumber)
             {
                 for (int i = 0; fileNames.Count - FileNameNumber > i; i++)
                 {
-                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, state);
+                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, isevenpageisenabled, state);
                 }
             }
             else
@@ -621,6 +622,18 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             updateListview("待确定");
         }
 
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+
+            if (fileNames.Count < 1)
+            {
+                SetBackgroundGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
+
+            updateListview("待确定");
+        }
 
         public void PDFFileCount()
         {

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

@@ -15,6 +15,7 @@ using System.IO;
 using System.Linq;
 using System.Windows.Media;
 using System.Windows;
+using ComPDFKit.PDFDocument;
 
 namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBates
 {
@@ -142,6 +143,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             {
                 _pageRangeText = value;
                 BatesInfo.PageRange = EditToolsHelper.ParseRange(PageRangeText);
+                //CommonHelper.GetPagesInRange(ref PageIndexLists, BatesInfo.PageRange, , new char[] { ',' }, new char[] { '-' }, true))
                 //EditToolsHelper.GetPageRange(PageRangeSelectIndex, PDFViewer.Document, ref BatesInfo.PageRange, PageRangeText);
 
             }

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

@@ -432,6 +432,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                 }
                 if (PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeSelectIndex"].ToString() == "3" && !CommonHelper.GetPagesInRange(ref PageIndexLists, PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeText"].ToString(), CPDFDocument.InitWithFilePath(fileName).PageCount, new char[] { ',' }, new char[] { '-' },true)) {
                     PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeSelectIndex"] = "0";
+
                 }
                 pdfdatatable.Rows.Add(f.Name, PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeText"], PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeSelectIndex"], isEvenPage(fileName), file_size, PDFCurrentDataTable.Rows[datatableindex]["FileState"]);
                 datatableindex++;
@@ -442,18 +443,15 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
         }
         /// <summary>
         /// 更新Currentlistview显示
-        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面） state 状态显示字符串
+        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面）isevenpageisenabled 偶数页状态 state 状态显示字符串
         /// </summary>
-        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", string state = "待完成")
+        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", bool isevenpageisenabled = true, string state = "待完成")
         {
             if (fileNames.Count >= FileNameNumber)
             {
                 for (int i = 0; fileNames.Count - FileNameNumber > i; i++)
                 {
-                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, state);
-                    //PDFCurrentDataTable.Rows[i]["FilePageRangeText"] = pagerangetext;
-                    //PDFCurrentDataTable.Rows[i]["FilePageRangeSelectIndex"] = pagerangeselectindex;
-                    //PDFCurrentDataTable.Rows[i]["FileState"] = state;
+                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, isevenpageisenabled, state);
                 }
             }
             else
@@ -549,7 +547,18 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
             updateListview("待确定");
         }
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+            
+            if (fileNames.Count < 1)
+            {
+                SetBatesGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
 
+            updateListview("待确定");
+        }
 
         public void PDFFileCount()
         {

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageCompressDialogViewModel.cs

@@ -365,6 +365,19 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             updateListview("待确定");
         }
 
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+
+            if (fileNames.Count < 1)
+            {
+                SetCompressGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
+
+            updateListview("待确定");
+        }
+
 
         public void PDFFileCount()
         {

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialogViewModel.cs

@@ -424,15 +424,15 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         /// <summary>
         /// 更新Currentlistview显示
-        /// state 状态显示字符串
+        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面）isevenpageisenabled 偶数页状态 state 状态显示字符串
         /// </summary>
-        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", string state = "待完成")
+        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", bool isevenpageisenabled = true, string state = "待完成")
         {
             if (fileNames.Count >= FileNameNumber)
             {
                 for (int i = 0; fileNames.Count - FileNameNumber > i; i++)
                 {
-                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, state);
+                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, isevenpageisenabled, state);
                 }
             }
             else
@@ -528,7 +528,18 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             }
             updateListview("待确定");
         }
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+
+            if (fileNames.Count < 1)
+            {
+                SetConverterGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
 
+            updateListview("待确定");
+        }
 
         public void PDFFileCount()
         {

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageHeaderFooter/HomePageHeaderFooterDialogViewModel.cs

@@ -384,6 +384,19 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             Filenames = filenames;
         }
 
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+
+            if (fileNames.Count < 1)
+            {
+                SetHeaderFooterGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
+
+            updateListview("待确定");
+        }
+
         /// <summary>
         /// 添加PDF文件夹
         /// </summary>
@@ -452,15 +465,15 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         /// <summary>
         /// 更新Currentlistview显示
-        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面） state 状态显示字符串
+        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面）isevenpageisenabled 偶数页状态 state 状态显示字符串
         /// </summary>
-        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", string state = "待完成")
+        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", bool isevenpageisenabled = true, string state = "待完成")
         {
             if (fileNames.Count >= FileNameNumber)
             {
                 for (int i = 0; fileNames.Count - FileNameNumber > i; i++)
                 {
-                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, state);
+                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, isevenpageisenabled, state);
                 }
             }
             else

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageRemoveDialogViewModel.cs

@@ -473,7 +473,18 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             }
             updateListview("待确定");
         }
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
 
+            if (fileNames.Count < 1)
+            {
+                SetOptionsRemoveGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
+
+            updateListview("待确定");
+        }
 
         public void PDFFileCount()
         {

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageSetPasswordDialogViewModel.cs

@@ -487,6 +487,19 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             updateListview("待确定");
         }
 
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+
+            if (fileNames.Count < 1)
+            {
+                SetSafetyGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
+
+            updateListview("待确定");
+        }
+
         public void PDFFileCount()
         {
             if (fileNames.Count == 0)

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkDialogViewModel.cs

@@ -524,15 +524,15 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         /// <summary>
         /// 更新Currentlistview显示
-        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面） state 状态显示字符串
+        /// pagerangetext 自定义页面范围字符串  pagerangeselectindex combobox下拉索引（0全部页面 1奇数页 2偶数页 3自定义页面）isevenpageisenabled 偶数页状态 state 状态显示字符串
         /// </summary>
-        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", string state = "待完成")
+        public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", bool isevenpageisenabled = true, string state = "待完成")
         {
             if (fileNames.Count >= FileNameNumber)
             {
                 for (int i = 0; fileNames.Count - FileNameNumber > i; i++)
                 {
-                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, state);
+                    PDFCurrentDataTable.Rows.Add(pagerangetext, pagerangeselectindex, isevenpageisenabled, state);
                 }
             }
             else
@@ -628,6 +628,19 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             updateListview("待确定");
         }
 
+        public void removepdffile(int index)
+        {
+            fileNames.Remove(fileNames[index]);
+
+            if (fileNames.Count < 1)
+            {
+                SetWatermarkGridIsEnabled = "False";
+                AddFileVisibility = Visibility.Visible;
+            }
+
+            updateListview("待确定");
+        }
+
 
         public void PDFFileCount()
         {

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundDialog.xaml

@@ -60,6 +60,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundDialog.xaml.cs

@@ -1,10 +1,13 @@
-using PDF_Office.CustomControl;
+using ComPDFKit.PDFDocument;
+using PDF_Office.CustomControl;
 using PDF_Office.Helper;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBackground;
 using Prism.Ioc;
 using Prism.Regions;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
 using System.Windows;
@@ -153,11 +156,39 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
         {
             WritableComboBox writableComboBox = sender as WritableComboBox;
             var ls = writableComboBox.DataContext as DataRowView;
+            if (ls != null)
+            {
+                List<int> PageIndexLists = new List<int>();
+                var index = viewModel.PDFDataTable.Rows.IndexOf(ls.Row);
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
+                //viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+                if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"].ToString() == "3" && !CommonHelper.GetPagesInRange(ref PageIndexLists, viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString().ToString(), CPDFDocument.InitWithFilePath(HomePageBatchProcessingDialogModel.FilePaths[index]).PageCount, new char[] { ',' }, new char[] { '-' }, true))
+                {
+                    viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = "0";
+                    if (viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString() != "")
+                    {
+                        if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"].ToString() != viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString())
+                        {
+                            viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.SelectedIndex.ToString();
+                            viewModel.updateListview("待确定");
+                        }
+                    }
+
 
-            Trace.WriteLine("adasda" + viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeText"] = writableComboBox.Text;
-            viewModel.updateListview("待确定");
+                }
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+            }
+            //viewModel.updateListview("待确定");
+        }
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
         }
     }
 }
+

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesDialog.xaml

@@ -60,6 +60,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                    <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                                </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesDialog.xaml.cs

@@ -1,4 +1,5 @@
-using PDF_Office.CustomControl;
+using ComPDFKit.PDFDocument;
+using PDF_Office.CustomControl;
 using PDF_Office.Helper;
 using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBates;
@@ -6,6 +7,7 @@ using Prism.Ioc;
 using Prism.Regions;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
 using System.Windows;
@@ -37,7 +39,7 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
             menuPop1.IsOpen = true;
         }
 
-       
+
 
         private void listView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
@@ -48,10 +50,10 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
             viewModel.fileNamesView.Clear();
             foreach (var item in list)
             {
-                
+
                 a = (System.Data.DataRowView)item;
                 viewModel.fileNamesView.Add(lists.IndexOf(a));
-                
+
             }
             if (viewModel.fileNamesView.Count > 0)
             {
@@ -158,13 +160,41 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
 
         private void PageRangeWritableComboBox_LostFocus(object sender, RoutedEventArgs e)
         {
-           WritableComboBox  writableComboBox = sender as WritableComboBox;
+            WritableComboBox writableComboBox = sender as WritableComboBox;
             var ls = writableComboBox.DataContext as DataRowView;
-            
-            Trace.WriteLine("adasda"+ viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeText"] = writableComboBox.Text;
-            viewModel.updateListview("待确定");
+            if (ls != null)
+            {
+                List<int> PageIndexLists = new List<int>();
+                var index = viewModel.PDFDataTable.Rows.IndexOf(ls.Row);
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
+                //viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+                if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"].ToString() == "3" && !CommonHelper.GetPagesInRange(ref PageIndexLists, viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString().ToString(), CPDFDocument.InitWithFilePath(HomePageBatchProcessingDialogModel.FilePaths[index]).PageCount, new char[] { ',' }, new char[] { '-' }, true))
+                {
+                    viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = "0";
+                    if (viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString() != "")
+                    {
+                        if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"].ToString() != viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString())
+                        {
+                            viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+                            viewModel.updateListview("待确定");
+                        }
+                    }
+
+
+                }
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+            }
+            //viewModel.updateListview("待确定");
+        }
+
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
         }
     }
 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageCompressDialog.xaml

@@ -52,6 +52,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageCompressDialog.xaml.cs

@@ -3,6 +3,7 @@ using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using System;
 using System.Collections;
+using System.Data;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
@@ -137,6 +138,15 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing
             }
 
         }
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
+        }
 
     }
 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialog.xaml

@@ -60,6 +60,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialog.xaml.cs

@@ -1,11 +1,14 @@
-using PDF_Office.CustomControl;
+using ComPDFKit.PDFDocument;
+using PDF_Office.CustomControl;
 using PDF_Office.Helper;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageConverter;
 using Prism.Ioc;
 using Prism.Regions;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
 using System.Windows;
@@ -157,11 +160,38 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
         {
             WritableComboBox writableComboBox = sender as WritableComboBox;
             var ls = writableComboBox.DataContext as DataRowView;
+            if (ls != null)
+            {
+                List<int> PageIndexLists = new List<int>();
+                var index = viewModel.PDFDataTable.Rows.IndexOf(ls.Row);
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
+                //viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+                if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"].ToString() == "3" && !CommonHelper.GetPagesInRange(ref PageIndexLists, viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString().ToString(), CPDFDocument.InitWithFilePath(HomePageBatchProcessingDialogModel.FilePaths[index]).PageCount, new char[] { ',' }, new char[] { '-' }, true))
+                {
+                    viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = "0";
+                    if (viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString() != "")
+                    {
+                        if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"].ToString() != viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString())
+                        {
+                            viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.SelectedIndex.ToString();
+                            viewModel.updateListview("待确定");
+                        }
+                    }
+
 
-            Trace.WriteLine("adasda" + viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeText"] = writableComboBox.Text;
-            viewModel.updateListview("待确定");
+                }
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+            }
+            //viewModel.updateListview("待确定");
+        }
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
         }
     }
 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageHeaderFooter/HomePageHeaderFooterDialog.xaml

@@ -60,6 +60,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageHeaderFooter/HomePageHeaderFooterDialog.xaml.cs

@@ -1,10 +1,13 @@
-using PDF_Office.CustomControl;
+using ComPDFKit.PDFDocument;
+using PDF_Office.CustomControl;
 using PDF_Office.Helper;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageHeaderFooter;
 using Prism.Ioc;
 using Prism.Regions;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
 using System.Windows;
@@ -152,11 +155,36 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
         {
             WritableComboBox writableComboBox = sender as WritableComboBox;
             var ls = writableComboBox.DataContext as DataRowView;
-
-            Trace.WriteLine("adasda" + viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeText"] = writableComboBox.Text;
-            viewModel.updateListview("待确定");
+            if (ls != null) { 
+            List<int> PageIndexLists = new List<int>();
+            var index= viewModel.PDFDataTable.Rows.IndexOf(ls.Row);
+            viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
+            //viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+            if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"].ToString() == "3" && !CommonHelper.GetPagesInRange(ref PageIndexLists, viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString().ToString(), CPDFDocument.InitWithFilePath(HomePageBatchProcessingDialogModel.FilePaths[index]).PageCount, new char[] { ',' }, new char[] { '-' }, true))
+            {
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = "0";
+                if (viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString() != "") {
+                    if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"].ToString() != viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString())
+                    {
+                        viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.SelectedIndex.ToString();
+                        viewModel.updateListview("待确定");
+                    }
+                }
+                
+                    
+            }
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+            }
+            //viewModel.updateListview("待确定");
+        }
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
         }
     }
 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageRemoveDialog.xaml

@@ -53,6 +53,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageRemoveDialog.xaml.cs

@@ -3,6 +3,7 @@ using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.EditTools.Watermark;
 using System;
 using System.Collections;
+using System.Data;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
@@ -139,6 +140,15 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing
             }
             
         }
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
+        }
 
 
     }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageSetPasswordDialog.xaml

@@ -52,6 +52,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageSetPasswordDialog.xaml.cs

@@ -4,6 +4,7 @@ using PDF_Office.Model.Dialog.ToolsDialogs.SaftyDialogs;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using System;
 using System.Collections;
+using System.Data;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
@@ -278,5 +279,15 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing
             }
 
         }
+
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
+        }
     }
 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkDialog.xaml

@@ -60,6 +60,22 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
+                            <GridViewColumn Header=""  Width="100">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Name="DeleteTemplateBtn" Width="14" Height="14" Content="X" Foreground="Red" FontSize="8" Click="DeleteTemplateBtn_Click">
+                                        </Button>
+                                        <DataTemplate.Triggers>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="True">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType=ListViewItem}}" Value="False">
+                                                <Setter TargetName="DeleteTemplateBtn" Property="Visibility" Value="Hidden"/>
+                                            </DataTrigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
                         </GridView>
                     </ListView.View>
                     <ListView.ItemContainerStyle>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkDialog.xaml.cs

@@ -1,10 +1,13 @@
-using PDF_Office.CustomControl;
+using ComPDFKit.PDFDocument;
+using PDF_Office.CustomControl;
 using PDF_Office.Helper;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageWatermark;
 using Prism.Ioc;
 using Prism.Regions;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
 using System.Windows;
@@ -153,12 +156,40 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
         {
             WritableComboBox writableComboBox = sender as WritableComboBox;
             var ls = writableComboBox.DataContext as DataRowView;
+            if (ls != null)
+            {
+                List<int> PageIndexLists = new List<int>();
+                var index = viewModel.PDFDataTable.Rows.IndexOf(ls.Row);
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
+                //viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+                if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"].ToString() == "3" && !CommonHelper.GetPagesInRange(ref PageIndexLists, viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString().ToString(), CPDFDocument.InitWithFilePath(HomePageBatchProcessingDialogModel.FilePaths[index]).PageCount, new char[] { ',' }, new char[] { '-' }, true))
+                {
+                    viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeSelectIndex"] = "0";
+                    if (viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString() != "")
+                    {
+                        if (viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"].ToString() != viewModel.PDFDataTable.Rows[index]["FilePageRangeText"].ToString())
+                        {
+                            viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.SelectedIndex.ToString();
+                            viewModel.updateListview("待确定");
+                        }
+                    }
+
 
-            Trace.WriteLine("adasda" + viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeSelectIndex"] = writableComboBox.SelectedIndex.ToString();
-            viewModel.PDFCurrentDataTable.Rows[viewModel.PDFDataTable.Rows.IndexOf(ls.Row)]["FilePageRangeText"] = writableComboBox.Text;
-            viewModel.updateListview("待确定");
+                }
+                viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
+            }
+            //viewModel.updateListview("待确定");
+        }
+        private void DeleteTemplateBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Button deletetemplatebtn = sender as Button;
+            var ls = deletetemplatebtn.DataContext as DataRowView;
+            if (ls != null)
+            {
+                viewModel.removepdffile(viewModel.PDFDataTable.Rows.IndexOf(ls.Row));
+            }
         }
     }
 }
 
+