소스 검색

Bates-bug

liyijie 2 년 전
부모
커밋
46d97b81ca

+ 3 - 0
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesCreateContentViewModel.cs

@@ -530,6 +530,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                                 TextEQ = false;
                             }
                             BatesInfo.Prefix = textValue.Text;
+                            PrefixTextValue = textValue.Text;
 
                             break;
                         case "SuffixTextValueTextBox":
@@ -538,6 +539,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                                 TextEQ = false;
                             }
                             BatesInfo.Suffix = textValue.Text;
+                            SurfixTextValue = textValue.Text;
                             break;
                         default:
                             break;
@@ -572,6 +574,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             {
                 GetTextValueFromNumber[GetLocationIndex.ToString()] = GetTextValueFromNumber[GetLocationIndex.ToString()] + "<<" + "#" + DigitNumberValue + "#" + (StarPagetNumberIndex + 1).ToString() + "#" + PrefixTextValue + "#" + SurfixTextValue + ">>";
             }
+            TextValue = GetTextValueFromNumber[GetLocationIndex.ToString()];
             BatesInfo.TextData[GetLocationIndex].text = GetTextValueFromNumber[GetLocationIndex.ToString()];
             
         }

+ 3 - 0
PDF Office/ViewModels/EditTools/Bates/BatesCreateContentViewModel.cs

@@ -567,6 +567,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
                                 TextEQ = false;
                             }
                             BatesInfo.Prefix = textValue.Text;
+                            PrefixTextValue= textValue.Text;
 
                             break;
                         case "SuffixTextValueTextBox":
@@ -575,6 +576,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
                                 TextEQ = false;
                             }
                             BatesInfo.Suffix = textValue.Text;
+                            SurfixTextValue = textValue.Text;
                             break;
                         default:
                             break;
@@ -614,6 +616,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
                 GetTextValueFromNumber[GetLocationIndex.ToString()] = GetTextValueFromNumber[GetLocationIndex.ToString()] + "<<" + "#" + DigitNumberValue + "#" + (StarPagetNumberIndex + 1).ToString() + "#" + PrefixTextValue + "#" + SurfixTextValue + ">>";
             }
             BatesInfo.TextData[GetLocationIndex].text = GetTextValueFromNumber[GetLocationIndex.ToString()];
+            TextValue= GetTextValueFromNumber[GetLocationIndex.ToString()];
             eventAggregator.GetEvent<SetBatesEvent>().Publish(new BatesInfoUnicode
             {
                 Unicode = Unicode,

+ 1 - 1
PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesCreateContent.xaml.cs

@@ -13,8 +13,8 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
         private HomePageBatesCreateContentViewModel viewModel;
         public HomePageBatesCreateContent()
         {
-            viewModel = this.DataContext as HomePageBatesCreateContentViewModel;
             InitializeComponent();
+            viewModel = this.DataContext as HomePageBatesCreateContentViewModel;
             cusColor.SelectedColorHandler += cusColor_SelectedColor;
         }
 

+ 2 - 1
PDF Office/Views/EditTools/Bates/BatesCreateContent.xaml.cs

@@ -13,8 +13,9 @@ namespace PDF_Office.Views.EditTools.Bates
         private BatesCreateContentViewModel viewModel;
         public BatesCreateContent()
         {
-            viewModel=this.DataContext as BatesCreateContentViewModel;
+
             InitializeComponent();
+            viewModel = this.DataContext as BatesCreateContentViewModel;
             cusColor.SelectedColorHandler += cusColor_SelectedColor;
         }
 

+ 1 - 1
PDF Office/Views/EditTools/Bates/BatesTemplateListContent.xaml

@@ -68,7 +68,7 @@
                                 <Grid  Width="238" HorizontalAlignment="Left">
                                     <StackPanel >
                                         <StackPanel Orientation="Horizontal" Margin="0,12,0,0">
-                                            <TextBlock Text="页眉页脚名称" Height="22" Width="98" FontSize="14" FontWeight="Black"></TextBlock>
+                                            <TextBlock Text="Bates名称" Height="22" Width="98" FontSize="14" FontWeight="Black"></TextBlock>
                                             <TextBlock Name="TemplateIndexTextBox"  FontSize="14" Width="120"></TextBlock>
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="0,8,0,0" Visibility="{Binding ElementName=LeftHeaderTextBox,Path=Visibility}">