编辑-bug17031，17034解决；轻会员-重置密码复杂操作错误提示文案不对bug解决

PDF Office/Model/AnnotPanel/FontBoard.cs

@@ -113,40 +113,41 @@ namespace PDF_Master.Model.AnnotPanel
                 {
                     ChangedValue?.Invoke(_currentPresetFont.ValueStr, FontSetModeType.PresetFontStyes);
                 }
-                //switch (value.ValueStr.ToString())
-                //{
-                //    case "Custom":
-                //        PresetFontSelectedIndex = 0;
-                //        break;
-
-                //    case "H1":
-                //        PresetFontSelectedIndex = 1;
-                //        break;
-
-                //    case "H2":
-                //        PresetFontSelectedIndex = 2;
-                //        break;
-
-                //    case "H3":
-                //        PresetFontSelectedIndex = 3;
-                //        break;
-
-                //    case "B1":
-                //        PresetFontSelectedIndex = 4;
-                //        break;
-
-                //    case "B2":
-                //        PresetFontSelectedIndex = 5;
-                //        break;
-
-                //    case "B3":
-                //        PresetFontSelectedIndex = 6;
-                //        break;
-
-                //    default:
-                //        PresetFontSelectedIndex = 0;
-                //        break;
-                //}
+                SetProperty(ref _currentPresetFont, value);
+                switch (value.ValueStr.ToString())
+                {
+                    case "Custom":
+                        PresetFontSelectedIndex = 0;
+                        break;
+
+                    case "H1":
+                        PresetFontSelectedIndex = 1;
+                        break;
+
+                    case "H2":
+                        PresetFontSelectedIndex = 2;
+                        break;
+
+                    case "H3":
+                        PresetFontSelectedIndex = 3;
+                        break;
+
+                    case "B1":
+                        PresetFontSelectedIndex = 4;
+                        break;
+
+                    case "B2":
+                        PresetFontSelectedIndex = 5;
+                        break;
+
+                    case "B3":
+                        PresetFontSelectedIndex = 6;
+                        break;
+
+                    default:
+                        PresetFontSelectedIndex = 0;
+                        break;
+                }
             }
         }
 

PDF Office/ViewModels/Dialog/ServiceDialog/PasswordUpdataRegionVIewModel.cs

@@ -348,6 +348,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             else
             {
                 LoginPasswordlook = "";
+                LoginPasswordlook2 = "";
             }
 
         }
@@ -372,6 +373,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
             else
             {
+                LoginPasswordlook = "";
                 LoginPasswordlook2 = "";
             }
 

PDF Office/ViewModels/PropertyPanel/PDFEdit/ImageEditPropertyViewModel.cs

@@ -78,24 +78,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
             set
             {
                 SetProperty(ref _transpent, value);
-                if (TextEditEvent != null && isCanSave)
-                {
-                    if (IsMultiSelectImage)
-                    {
-                        foreach (var item in TextEditEventList)
-                        {
-                            item.Transparency = (int)(_transpent * 2.55);
-                            item.UpdatePDFEditByEventArgs();
-                        }
-                    }
-                    else
-                    {
-                        TextEditEvent.Transparency = (int)(_transpent * 2.55);
-                        TextEditEvent.UpdatePDFEditByEventArgs();
-                        OpacityUI = _transpent / 100.0;
-                    }
-
-                }
+                
             }
         }
         #endregion
@@ -148,6 +131,9 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
         //添加图片
         public DelegateCommand AddImgCommand { get; set; }
 
+        //透明度条
+        public DelegateCommand TranspentslidCommand { get; set; }
+
         public DelegateCommand EditImgModeCommand { get; set; }
         #endregion
 
@@ -166,7 +152,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
             ExportImgCommand = new DelegateCommand(ExportImg);
             CropImgCommand = new DelegateCommand(CropImg);
             ImgAlignCheckedCommand = new DelegateCommand<object>(ImgAlignChecked);
-
+            TranspentslidCommand = new DelegateCommand(Transpentslid);
+           
             AntiClockwiseCommand = new DelegateCommand(AntiClockwise);
             ClockwiseCommand = new DelegateCommand(Clockwise);
             FlipleftrightCommand = new DelegateCommand(Flipleftright);
@@ -178,6 +165,31 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
         }
 
         #region Command实现
+     
+
+       private void Transpentslid()
+        {
+            if (TextEditEvent != null && isCanSave)
+            {
+                if (IsMultiSelectImage)
+                {
+                    foreach (var item in TextEditEventList)
+                    {
+                        item.Transparency = (int)(_transpent * 2.55);
+                        item.UpdatePDFEditByEventArgs();
+                    }
+                }
+                else
+                {
+                    TextEditEvent.Transparency = (int)(_transpent * 2.55);
+                    TextEditEvent.UpdatePDFEditByEventArgs();
+                    OpacityUI = _transpent / 100.0;
+                }
+
+            }
+        }
+
+
         private void EditImgMode()
         {
 

PDF Office/ViewModels/PropertyPanel/PDFEdit/TextEditPropertyViewModel.cs

@@ -164,7 +164,6 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
                 {
                     if (item.mTag != "Custom")
                     {
-                        FontVm.GetCurrentFontSize(item.mFontSize);
                         GetCurrentFontSize(item.mFontSize);
 
                         if (item.mFontFamily != null)
@@ -924,7 +923,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
 
             SelectColor = new SolidColorBrush(TextEditEvent.FontColor);
             CurrentFontSize =new ComboDataItem(TextEditEvent.FontSize);
-            CurrentFontFamily = new ComboDataItem(TextEditEvent.FontName, TextEditEvent.FontName);
+            //CurrentFontFamily = new ComboDataItem(TextEditEvent.FontName, TextEditEvent.FontName);
             FontStyleItem = TextEditEvent.IsItalic ? FontStyles.Italic : FontStyles.Normal;
             FontWeightItem = TextEditEvent.IsBold ? FontWeights.Bold : FontWeights.Normal;
            

PDF Office/Views/PropertyPanel/PDFEdit/ImageEditProperty.xaml

@@ -104,10 +104,17 @@
 
             <CompositeControl:SlidComboControl
                 x:Name="slid"
+               
                 IsEnabled="{Binding IsCrop, Converter={StaticResource InvertBoolConvert}}"
                 Title="{Binding Opacity,Mode=TwoWay}"
                 Unit="%"
-                Value="{Binding Transpent, Mode=TwoWay}" />
+                Value="{Binding Transpent, Mode=TwoWay}" >
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="PreviewMouseLeftButtonUp">
+                        <i:InvokeCommandAction Command="{Binding TranspentslidCommand}" PassEventArgsToCommand="True"/>
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+            </CompositeControl:SlidComboControl>
             <StackPanel
                 Width="228"
                 Margin="0,16,0,0"