Skip to content

T
Thick-Common
Commit 2c9d6c0f authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修复定点图样式

parent f503cd7b
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 172 deletions
Project.FLY.FlyADBase/FlyADBase/FlyADBase.csproj
View file @ 2c9d6c0f
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<Version>10.1.1</Version> <Version>10.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NLog"> <PackageReference Include="NLog">
<Version>5.1.0</Version> <Version>4.6.8</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>4.1.0</Version> <Version>4.1.0</Version>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraph.xaml
View file @ 2c9d6c0f
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/GraphStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/GraphStyle.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<local:FixGraphVmUt x:Key="viewModel" Max="65540" Min="655" Average="123" Sigma3="3.2"/> <local:FixGraphVmUt x:Key="viewModel" Max="65540" Min="655" Average="123" Sigma3="3.2"/>
...@@ -36,23 +35,23 @@ ...@@ -36,23 +35,23 @@
<lvc:LineSeries <lvc:LineSeries
Values="{Binding Values}" Values="{Binding Values}"
StrokeThickness = "3" StrokeThickness = "3"
Stroke = "{StaticResource Brushes.Activity}" Stroke = "{StaticResource Brushes.Accent}"
Fill = "Transparent" Fill = "Transparent"
PointGeometry ="{x:Null}"/> PointGeometry ="{x:Null}"/>
</lvc:CartesianChart.Series> </lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis LabelFormatter="{Binding XFormatter}" FontSize="16" Foreground="Black" <lvc:Axis LabelFormatter="{Binding XFormatter}" Foreground="{StaticResource Brushes.Text.Black}"
MaxValue="{Binding XMax}" MinValue="{Binding XMin}"> MaxValue="{Binding XMax}" MinValue="{Binding XMin}">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Stroke="LightGray"/> <lvc:Separator Stroke="{StaticResource Brushes.Text.Gray}" StrokeDashArray="3" />
</lvc:Axis.Separator> </lvc:Axis.Separator>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis LabelFormatter="{Binding YFormatter}" MaxValue="{Binding YMax}" MinValue="{Binding YMin}" Panel.ZIndex="0" Foreground="Black"> <lvc:Axis LabelFormatter="{Binding YFormatter}" Foreground="{StaticResource Brushes.Text.Black}"
MaxValue="{Binding YMax}" MinValue="{Binding YMin}" >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator StrokeThickness="1" Stroke="LightGray" /> <lvc:Separator Stroke="{StaticResource Brushes.Text.Gray}" StrokeDashArray="3" />
</lvc:Axis.Separator> </lvc:Axis.Separator>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisY > </lvc:CartesianChart.AxisY >
...@@ -68,43 +67,51 @@ ...@@ -68,43 +67,51 @@
</TextBlock> </TextBlock>
</Grid> </Grid>
</Button> </Button>
<Grid Grid.Column="1" Grid.RowSpan="2" Panel.ZIndex="2" > <Grid Grid.Column="1" Grid.RowSpan="2" Panel.ZIndex="2" VerticalAlignment="Top" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel VerticalAlignment="Top" HorizontalAlignment="Left" Margin="{StaticResource ControlMargin}"> <Grid
<Viewbox MaxHeight="{StaticResource FontSize.Value}" HorizontalAlignment="Left" Margin="2"> HorizontalAlignment="Left" >
<StackPanel Orientation="Horizontal" > <Viewbox MaxHeight="{StaticResource GraphInfo2RowMaxHeight}" Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TitleStyle}" Text="AD值" Foreground="{StaticResource Brushes.Highlight}" Visibility="{Binding IsADMode,Converter={StaticResource visbilityconv}}"/> <StackPanel>
<TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Time,StringFormat={}{0:HH:mm:ss}}"/> <StackPanel Orientation="Horizontal" >
</StackPanel> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}">
</Viewbox> <TextBlock Style="{StaticResource TitleStyle}" Text="AD" Foreground="{StaticResource Brushes.Highlight}" Visibility="{Binding IsADMode,Converter={StaticResource visbilityconv}}"/>
<Viewbox MaxHeight="{StaticResource FontSize.Value}" HorizontalAlignment="Left" Margin="2"> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}">
<StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}" <TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Time,StringFormat={}{0:HH:mm:ss}}"/>
Background="{StaticResource SemiTransparentGreyBrush2}"> </StackPanel>
<TextBlock Style="{StaticResource TitleStyle}" Text="间隔:" />
<TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Intervalms}"/>
<TextBlock Style="{StaticResource UnitStyle}" Text="ms" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}" <StackPanel Orientation="Horizontal">
Background="{StaticResource SemiTransparentGreyBrush2}"> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}"
<TextBlock Style="{StaticResource TitleStyle}" Text="混合:" /> Background="{StaticResource TextTransparentBackgroundBrush}">
<TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Mix}"/> <TextBlock Style="{StaticResource TitleStyle}" Text="间隔" />
<TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Intervalms}"/>
<TextBlock Style="{StaticResource UnitStyle}" Text="ms" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}"
Background="{StaticResource TextTransparentBackgroundBrush}">
<TextBlock Style="{StaticResource TitleStyle}" Text="混合" />
<TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Mix}"/>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Viewbox> </Viewbox>
</StackPanel> </Grid>
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Column="2" Grid.RowSpan="2"> <StackPanel Orientation="Horizontal" Grid.Column="1" >
<Button Click="button_pause_Click" > <Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding ClearCmd}">
<iconPacks:PackIconMaterial Kind="Delete"/>
</Button>
<Button Command="{Binding PauseCmd}">
<Button.Style> <Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}"> <Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Setter Property="Background" Value="{StaticResource Brushes.Activity}"/> <Setter Property="Background" Value="{StaticResource Brushes.Fault}"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding IsPaused}" Value="True"> <DataTrigger Binding="{Binding IsPaused}" Value="True">
<Setter Property="Background" Value="{StaticResource Brushes.NoAct}"/> <Setter Property="Background" Value="{StaticResource Brushes.Pass}"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
...@@ -122,98 +129,54 @@ ...@@ -122,98 +129,54 @@
</iconPacks:PackIconMaterial.Style> </iconPacks:PackIconMaterial.Style>
</iconPacks:PackIconMaterial> </iconPacks:PackIconMaterial>
</Button> </Button>
<Button Click="button_save_Click" IsEnabled="{Binding IsPaused}" > <Button Style="{StaticResource Styles.Button.Icon.Rectangle}" IsEnabled="{Binding IsPaused}" Command="{Binding SaveCmd}">
<Button.Style> <iconPacks:PackIconMaterial Kind="Floppy"/>
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Setter Property="Background" Value="{StaticResource Brushes.NoAct}"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsPaused}" Value="True">
<Setter Property="Background" Value="{StaticResource Brushes.Activity}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
<iconPacks:PackIconMaterial Kind="Floppy" />
</Button> </Button>
<Button Click="button_analyze_Click" IsEnabled="{Binding IsPaused}" > <Button Style="{StaticResource Styles.Button.Icon.Rectangle}" IsEnabled="{Binding IsPaused}" Command="{Binding AnalyzeCmd}">
<Button.Style> <iconPacks:PackIconMaterial Kind="ChartLine"/>
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Setter Property="Background" Value="{StaticResource Brushes.NoAct}"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsPaused}" Value="True">
<Setter Property="Background" Value="{StaticResource Brushes.Activity}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
<iconPacks:PackIconMaterial Kind="ChartLine" />
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="2" Grid.RowSpan="2" Panel.ZIndex="1" <Grid Grid.Column="2" Grid.RowSpan="2" Panel.ZIndex="1"
Margin="10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,0" VerticalAlignment="Top" HorizontalAlignment="Right"
Background="{StaticResource SemiTransparentGreyBrush}" > Background="{StaticResource SemiTransparentGreyBrush}" >
<Viewbox MaxHeight="50"> <Viewbox MaxHeight="{StaticResource GraphInfo2RowMaxHeight}" Margin="{StaticResource ControlMargin}">
<StackPanel Margin="{StaticResource ControlMargin}"> <UniformGrid Columns="2">
<StackPanel.Resources> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}"
<Style TargetType="Viewbox"> Background="{StaticResource TextBrush}">
<Setter Property="Height" Value="25"/> <TextBlock Style="{StaticResource TitleStyle}"
<Setter Property="Width" Value="120"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Top"/>
</Style>
</StackPanel.Resources>
<StackPanel Orientation="Horizontal">
<Viewbox >
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TitleStyle}"
Foreground="{StaticResource WhiteBrush}" Foreground="{StaticResource WhiteBrush}"
Background="{StaticResource TextBrush}" Text="平均"
Opacity="0.8"
Text="平均: "
/> />
<TextBlock Style="{StaticResource ValueStyle}" <TextBlock Style="{StaticResource ValueStyle}"
Foreground="{StaticResource WhiteBrush}" Foreground="{StaticResource WhiteBrush}"
Background="{StaticResource TextBrush}"
Text="{Binding Average,StringFormat={}{0:F1}}" Text="{Binding Average,StringFormat={}{0:F1}}"
/> />
</StackPanel> </StackPanel>
</Viewbox> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}"
<Viewbox> Background="{StaticResource TextBrush}">
<StackPanel Orientation="Horizontal"> <TextBlock Style="{StaticResource TitleStyle}"
<TextBlock Style="{StaticResource TitleStyle}"
Foreground="{StaticResource WhiteBrush}" Foreground="{StaticResource WhiteBrush}"
Background="{StaticResource TextBrush}" Text="2σ"
Opacity="0.8"
Text="3σ: "
/> />
<TextBlock Style="{StaticResource ValueStyle}" <TextBlock Style="{StaticResource ValueStyle}"
Foreground="{StaticResource WhiteBrush}" Foreground="{StaticResource WhiteBrush}"
Background="{StaticResource TextBrush}" Text="{Binding Sigma2,StringFormat={}{0:F2}}"
Text="{Binding Sigma3,StringFormat={}{0:F1}}"
/> />
</StackPanel>
</Viewbox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}" >
<Viewbox > <TextBlock Style="{StaticResource TitleStyle}"
<StackPanel Orientation="Horizontal"> Text="最大" />
<TextBlock Style="{StaticResource TitleStyle}" Text="最大: "/> <TextBlock Style="{StaticResource ValueStyle}"
<TextBlock Style="{StaticResource ValueStyle}" Text="{Binding Max,StringFormat={}{0:F1}}"/> Text="{Binding Max,StringFormat={}{0:F1}}"/>
</StackPanel> </StackPanel>
</Viewbox> <StackPanel Orientation="Horizontal" Margin="{StaticResource TextMargin}" >
<Viewbox > <TextBlock Style="{StaticResource TitleStyle}"
<StackPanel Orientation="Horizontal" > Text="最小" />
<TextBlock Style="{StaticResource TitleStyle}" <TextBlock Style="{StaticResource ValueStyle}"
Text="最小: " />
<TextBlock Style="{StaticResource ValueStyle}"
Text="{Binding Min,StringFormat={}{0:F1}}"/> Text="{Binding Min,StringFormat={}{0:F1}}"/>
</StackPanel>
</Viewbox>
</StackPanel> </StackPanel>
</UniformGrid>
</StackPanel>
</Viewbox> </Viewbox>
</Grid> </Grid>
</Grid> </Grid>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraph.xaml.cs
View file @ 2c9d6c0f
using FLY.Thick.Base.Client; using FLY.Thick.Base.IService;
using FLY.Thick.Base.Common;
using FLY.Thick.Base.IService;
using MultiLayout.UiModule;
using FObjBase;
using LiveCharts;
using Misc;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; 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;
using FLY.Thick.Base.UI;
using Unity; using Unity;
namespace FLY.Thick.Base.UI.UiModule namespace FLY.Thick.Base.UI.UiModule
...@@ -38,7 +17,7 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -38,7 +17,7 @@ namespace FLY.Thick.Base.UI.UiModule
InitializeComponent(); InitializeComponent();
} }
[InjectionMethod] [InjectionMethod]
public void Init(int id, IUnityContainer container, public void Init(int id, IUnityContainer container,
IFixService fixService, ITDGageService gageService) IFixService fixService, ITDGageService gageService)
{ {
//查找参数 //查找参数
...@@ -68,27 +47,6 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -68,27 +47,6 @@ namespace FLY.Thick.Base.UI.UiModule
w.ShowDialog(); w.ShowDialog();
viewModel.IsPaused = isPaused; viewModel.IsPaused = isPaused;
} }
private void button_pause_Click(object sender, RoutedEventArgs e)
{
viewModel.IsPaused = !viewModel.IsPaused;
}
private void button_save_Click(object sender, RoutedEventArgs e)
{
viewModel.PreSave();
WdSaveDatas w = new WdSaveDatas();
w.Init(viewModel);
w.ShowDialog();
}
private void button_analyze_Click(object sender, RoutedEventArgs e)
{
viewModel.GetDatas(out double intervalms, out List<double> datas);
PgFixAnalyze p = new PgFixAnalyze();
p.Init(intervalms, datas);
MultiLayout.FlyLayoutManager.NavigationService.Navigate(p);
}
} }
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraphVm.cs
View file @ 2c9d6c0f
...@@ -11,6 +11,7 @@ using System.Text; ...@@ -11,6 +11,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using FLY.Thick.Base.UI; using FLY.Thick.Base.UI;
using FLY.Thick.Base.Common; using FLY.Thick.Base.Common;
using CommunityToolkit.Mvvm.Input;
namespace FLY.Thick.Base.UI.UiModule namespace FLY.Thick.Base.UI.UiModule
{ {
...@@ -61,9 +62,9 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -61,9 +62,9 @@ namespace FLY.Thick.Base.UI.UiModule
/// </summary> /// </summary>
public double Min { get; set; } public double Min { get; set; }
/// <summary> /// <summary>
/// 3sigma /// 2sigma
/// </summary> /// </summary>
public double Sigma3 { get; set; } public double Sigma2 { get; set; }
#endregion #endregion
#region 状态 #region 状态
...@@ -92,6 +93,12 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -92,6 +93,12 @@ namespace FLY.Thick.Base.UI.UiModule
/// </summary> /// </summary>
public bool IsADMode { get; private set; } public bool IsADMode { get; private set; }
#endregion #endregion
public RelayCommand PauseCmd { get; private set; }
public RelayCommand SaveCmd { get; private set; }
public RelayCommand AnalyzeCmd { get; private set; }
public RelayCommand ClearCmd { get; private set; }
/// <summary> /// <summary>
/// 真实接收的数据，与 Values 不一样， Values只是mDatas的一部分 /// 真实接收的数据，与 Values 不一样， Values只是mDatas的一部分
/// </summary> /// </summary>
...@@ -119,6 +126,11 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -119,6 +126,11 @@ namespace FLY.Thick.Base.UI.UiModule
DynArea dynArea; DynArea dynArea;
public FixGraphVm() public FixGraphVm()
{ {
PauseCmd = new RelayCommand(Pause);
SaveCmd = new RelayCommand(Save);
AnalyzeCmd = new RelayCommand(Analyze);
ClearCmd = new RelayCommand(UpdateIsADMode);
#region 与数据无关界面参数 #region 与数据无关界面参数
XFormatter = (x) => XFormatter = (x) =>
{ {
...@@ -147,7 +159,26 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -147,7 +159,26 @@ namespace FLY.Thick.Base.UI.UiModule
IsPaused = this.dynArea.ControllerState != CTRL_STATE.FIX; IsPaused = this.dynArea.ControllerState != CTRL_STATE.FIX;
} }
private void Analyze()
{
GetDatas(out double intervalms, out List<double> datas);
var p = new FLY.Thick.Base.UI.UiModule.PgFixAnalyze();
p.Init(intervalms, datas);
MultiLayout.FlyLayoutManager.NavigationService.Navigate(p);
}
private void Save()
{
PreSave();
WdSaveDatas w = new WdSaveDatas();
w.Init(this);
w.ShowDialog();
}
private void Pause()
{
IsPaused = !IsPaused;
}
private void DynArea_PropertyChanged(object sender, PropertyChangedEventArgs e) private void DynArea_PropertyChanged(object sender, PropertyChangedEventArgs e)
{ {
if (e.PropertyName == nameof(DynArea.ControllerState)) { if (e.PropertyName == nameof(DynArea.ControllerState)) {
...@@ -426,7 +457,7 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -426,7 +457,7 @@ namespace FLY.Thick.Base.UI.UiModule
Max = double.NaN; Max = double.NaN;
Min = double.NaN; Min = double.NaN;
Average = double.NaN; Average = double.NaN;
Sigma3 = double.NaN; Sigma2 = double.NaN;
AutoTarget = double.NaN; AutoTarget = double.NaN;
return; return;
} }
...@@ -434,7 +465,7 @@ namespace FLY.Thick.Base.UI.UiModule ...@@ -434,7 +465,7 @@ namespace FLY.Thick.Base.UI.UiModule
Max = mDatas.Max(); Max = mDatas.Max();
Min = mDatas.Min(); Min = mDatas.Min();
Average = mDatas.Average(); Average = mDatas.Average();
Sigma3 = mDatas.Sigma() * 3; Sigma2 = mDatas.Sigma() * 2;
if (mDatas.Count > 100) if (mDatas.Count > 100)
{ {
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/WdPassword.xaml.cs
View file @ 2c9d6c0f
...@@ -73,23 +73,23 @@ namespace FLY.Thick.Base.UI ...@@ -73,23 +73,23 @@ namespace FLY.Thick.Base.UI
/// <returns></returns> /// <returns></returns>
public static bool Authorize(string uiName, out int pwLv, string msg=null) public static bool Authorize(string uiName, out int pwLv, string msg=null)
{ {
pwLv = 0; return Authorize(uiName, 0, out pwLv, msg);
//从容器获取 }
var container = Application.Current.Properties["container"] as IUnityContainer;
if (container == null)
return true;
var passwordAuthorize = container.Resolve<PasswordAuthorize>(); /// <summary>
int level = passwordAuthorize.GetLv(uiName); ///
if (level <= 0) /// </summary>
return true; /// <param name="level">要求的级别</param>
/// <param name="pwLv">当密码正确时，密码的级别</param>
/// <returns></returns>
public static bool Authorize(int level, out int pwLv)
{
return Authorize(null, level, out pwLv);
}
WdPassword w = new WdPassword(); public static bool Authorize(int level, string msg)
w.Init(passwordAuthorize, level, msg); {
w.Owner = Application.Current.MainWindow; return Authorize(null, level, out int pwLv, msg);
bool ret = (bool)w.ShowDialog();
pwLv = w.PwLv;
return ret;
} }
/// <summary> /// <summary>
...@@ -98,7 +98,7 @@ namespace FLY.Thick.Base.UI ...@@ -98,7 +98,7 @@ namespace FLY.Thick.Base.UI
/// <param name="level">要求的级别</param> /// <param name="level">要求的级别</param>
/// <param name="pwLv">当密码正确时，密码的级别</param> /// <param name="pwLv">当密码正确时，密码的级别</param>
/// <returns></returns> /// <returns></returns>
public static bool Authorize(int level, out int pwLv) public static bool Authorize(string uiName, int level, out int pwLv, string msg = null)
{ {
pwLv = 0; pwLv = 0;
//从容器获取 //从容器获取
...@@ -107,11 +107,16 @@ namespace FLY.Thick.Base.UI ...@@ -107,11 +107,16 @@ namespace FLY.Thick.Base.UI
return true; return true;
var passwordAuthorize = container.Resolve<PasswordAuthorize>(); var passwordAuthorize = container.Resolve<PasswordAuthorize>();
if (!string.IsNullOrEmpty(uiName))
{
level = passwordAuthorize.GetLv(uiName);
}
if (level <= 0) if (level <= 0)
return true; return true;
WdPassword w = new WdPassword(); WdPassword w = new WdPassword();
w.Init(passwordAuthorize, level); w.Init(passwordAuthorize, level, msg);
w.Owner = Application.Current.MainWindow; w.Owner = Application.Current.MainWindow;
bool ret = (bool)w.ShowDialog(); bool ret = (bool)w.ShowDialog();
pwLv = w.PwLv; pwLv = w.PwLv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment