合并-拖拽显示与索引bug修复

PDF Office/Model/Dialog/ToolsDialogs/MergeObject.cs

@@ -150,5 +150,16 @@ namespace PDF_Office.Model.Dialog.ToolsDialogs
             }
         }
 
+        private int itemIndex;
+
+        public int ItemIndex
+        {
+            get { return itemIndex; }
+            set
+            {
+                SetProperty(ref itemIndex, value);
+            }
+        }
+
     }
 }

PDF Office/ViewModels/Dialog/ToolsDialogs/MergeDialogViewModel.cs

@@ -115,6 +115,15 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs
         #endregion
 
         #region 私有方法
+
+        private void UpDataMergeObjectIndex()
+        {
+            for (int i = 0; i < MergeObjectlist.Count; i++)
+            {
+                MergeObjectlist[i].ItemIndex = i+1;
+            }
+        }
+
         private void Cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -318,6 +327,9 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs
             MergeObjectlist.Remove(merge);
         }
 
+        /// <summary>
+        /// 拖拽插入
+        /// </summary>
         public void MoveMerge(MergeObject targetNode, MergeObject soureNode)
         {
             int targetindex = MergeObjectlist.IndexOf(targetNode);
@@ -337,6 +349,7 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs
             {
                 MergeObjectlist.Insert(targetindex, soureNode);
             }
+            UpDataMergeObjectIndex();
         }
 
         public void AddFiles(string[] FilePath)
@@ -372,6 +385,7 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs
                 }
                 if (FileType != ".pdf")
                 {
+                   //var x= Properties.Resources.imageex.Split(";");
                     if (!Properties.Resources.imageex.Contains(FileType))
                     {
                         //图片格式不支持
@@ -426,6 +440,7 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs
                 }
                 MergeObjectlist.Add(mergeObject);
             }
+            UpDataMergeObjectIndex();
         }
         #endregion
     }

PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml

@@ -148,11 +148,11 @@
                                             <ColumnDefinition Width="*"/>
                                             <ColumnDefinition Width="17"/>
                                         </Grid.ColumnDefinitions>
-                                        <Line   Margin="0,0,0,0" Grid.ColumnSpan="6" Visibility="{Binding IsForward, Converter={StaticResource BoolToVisible}}" X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" StrokeThickness="1" Stroke="{StaticResource color.sys.layout.accent}" />
+                                        <Line   Margin="0,0,0,0" Grid.ColumnSpan="10" Visibility="{Binding IsForward, Converter={StaticResource BoolToVisible}}" X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" StrokeThickness="1" Stroke="{StaticResource color.sys.layout.accent}" />
 
-                                        <Line Margin="0,0,0,0" Grid.ColumnSpan="6" Visibility="{Binding IsBackwards, Converter={StaticResource BoolToVisible}}"  X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" VerticalAlignment="Top" StrokeThickness="1" Stroke="{StaticResource color.sys.layout.accent}" />
+                                        <Line Margin="0,0,0,0" Grid.ColumnSpan="10" Visibility="{Binding IsBackwards, Converter={StaticResource BoolToVisible}}"  X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" VerticalAlignment="Top" StrokeThickness="1" Stroke="{StaticResource color.sys.layout.accent}" />
 
-                                        <TextBlock Text="{Binding Converter={StaticResource IndexConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}}"
+                                        <TextBlock Text="{Binding ItemIndex}"
                                  VerticalAlignment="Center"  HorizontalAlignment="Center"/>
                                         <Image Margin="8" Grid.Column="1"  HorizontalAlignment="Stretch" VerticalAlignment="Center" Source="{Binding DocThumbnail}"  Stretch="Uniform"  />
                                         <StackPanel Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Center">

PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml.cs

@@ -108,7 +108,6 @@ namespace PDF_Office.Views.Dialog.ToolsDialogs
                 return;
             }
            (DataContext as MergeDialogViewModel).MoveMerge(targetNode, soureNode);
-
             HiddenaAllLine();
         }