修改代码

This commit is contained in:
chfei committed 2026-11-12 18:22:14 +08:00
1 parent f03e2b08f4
commit 3dcb6a1c34
23 files changed
+631 -229

No files matched your search

@@ -3,7 +3,6 @@ namespace Store.Management.Api;
public sealed class ApiClientOptions public sealed class ApiClientOptions
{ {
public required Uri BaseUrl { get; init; } public required Uri BaseUrl { get; init; }
public string Version { get; init; } = "v1";
public TimeSpan Timeout { get; init; } = TimeSpan.FromSeconds(30); public TimeSpan Timeout { get; init; } = TimeSpan.FromSeconds(30);
internal void Validate() internal void Validate()
@@ -12,8 +11,6 @@ public sealed class ApiClientOptions
(BaseUrl.Scheme != "https" && BaseUrl.Scheme != "http") || (BaseUrl.Scheme != "https" && BaseUrl.Scheme != "http") ||
!string.IsNullOrEmpty(BaseUrl.UserInfo) || !string.IsNullOrEmpty(BaseUrl.Query) || !string.IsNullOrEmpty(BaseUrl.Fragment)) !string.IsNullOrEmpty(BaseUrl.UserInfo) || !string.IsNullOrEmpty(BaseUrl.Query) || !string.IsNullOrEmpty(BaseUrl.Fragment))
throw new ArgumentException("BaseUrl 必须是无凭据、查询参数和片段的 HTTP(S) 绝对地址。"); throw new ArgumentException("BaseUrl 必须是无凭据、查询参数和片段的 HTTP(S) 绝对地址。");
if (!System.Text.RegularExpressions.Regex.IsMatch(Version, @"^v\d+(\.\d+)?$"))
throw new ArgumentException("Version 格式应为 v1 或 v1.0。");
if (Timeout <= TimeSpan.Zero) throw new ArgumentOutOfRangeException(nameof(Timeout)); if (Timeout <= TimeSpan.Zero) throw new ArgumentOutOfRangeException(nameof(Timeout));
} }
} }
@@ -16,6 +16,9 @@ public sealed class StoreApiClient : IDisposable
public StoreApiClient(ApiClientOptions options, HttpClient? httpClient = null) public StoreApiClient(ApiClientOptions options, HttpClient? httpClient = null)
{ {
ArgumentNullException.ThrowIfNull(options); ArgumentNullException.ThrowIfNull(options);
#if DEBUG
Session.Set("store-local-dev-7f2c9e4a6b814d38a5910e62c4f837bd");
#endif
Transport = new ApiTransport(options, Session, httpClient); Transport = new ApiTransport(options, Session, httpClient);
Auth = new AuthApi(Transport, Session); Auth = new AuthApi(Transport, Session);
Users = new UserApi(Transport); Users = new UserApi(Transport);
@@ -12,14 +12,12 @@ public sealed class ApiTransport : IDisposable
{ {
private readonly RestClient _client; private readonly RestClient _client;
private readonly TokenSession _session; private readonly TokenSession _session;
private readonly string _version;
private static readonly JsonSerializerOptions Json = new(JsonSerializerDefaults.Web); private static readonly JsonSerializerOptions Json = new(JsonSerializerDefaults.Web);
internal ApiTransport(ApiClientOptions options, TokenSession session, HttpClient? httpClient) internal ApiTransport(ApiClientOptions options, TokenSession session, HttpClient? httpClient)
{ {
options.Validate(); options.Validate();
_session = session; _session = session;
_version = options.Version;
RestClientOptions settings = new RestClientOptions(new Uri(options.BaseUrl.AbsoluteUri.TrimEnd('/') + "/")) RestClientOptions settings = new RestClientOptions(new Uri(options.BaseUrl.AbsoluteUri.TrimEnd('/') + "/"))
{ {
Timeout = options.Timeout, Timeout = options.Timeout,
@@ -47,7 +45,7 @@ public sealed class ApiTransport : IDisposable
{ {
throw new ApiException(ApiErrorKind.Unauthorized, "请先登录。", code: 401); throw new ApiException(ApiErrorKind.Unauthorized, "请先登录。", code: 401);
} }
RestRequest request = new RestRequest($"{_version}/{route}", method); RestRequest request = new RestRequest($"/{route}", method);
if (token is not null) if (token is not null)
{ {
request.AddHeader("Authorization", $"Bearer {token}"); request.AddHeader("Authorization", $"Bearer {token}");
@@ -1,16 +1,21 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Store.Management.Framework.Controls"
xmlns:ext="clr-namespace:Store.Management.Framework.Controls" xmlns:ext="clr-namespace:Store.Management.Framework.Controls"
xmlns:f="clr-namespace:Store.Management.Framework.Controls.Attach;assembly=Store.Management.Framework" xmlns:f="clr-namespace:Store.Management.Framework.Controls.Attach;assembly=Store.Management.Framework"
xmlns:local="clr-namespace:Store.Management.Framework.Controls"
xmlns:wpf="MAX.WPF"
xmlns:sys="clr-namespace:System;assembly=mscorlib"> xmlns:sys="clr-namespace:System;assembly=mscorlib">
<sys:Double x:Key="DataGridExFontSize">12</sys:Double> <sys:Double x:Key="DataGridExFontSize">12</sys:Double>
<FontFamily x:Key="DataGridExFontFamily">Microsoft YaHei UI, Segoe UI</FontFamily> <FontFamily x:Key="DataGridExFontFamily">Microsoft YaHei UI, Segoe UI</FontFamily>
<BooleanToVisibilityConverter x:Key="DataGridExVisibility"/> <wpf:ThicknessSplitConverter x:Key="DataGridExBorderThicknessSplit" />
<Style x:Key="DataGridExCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}"/> <BooleanToVisibilityConverter x:Key="DataGridExVisibility" />
<Style
x:Key="DataGridExCheckBoxStyle"
BasedOn="{StaticResource {x:Type CheckBox}}"
TargetType="CheckBox" />
<Style x:Key="DataGridExDefaultCellHeaderStyle" TargetType="DataGridColumnHeader"> <Style x:Key="DataGridExDefaultCellHeaderStyle" TargetType="DataGridColumnHeader">
<Setter Property="UseLayoutRounding" Value="True" /> <Setter Property="UseLayoutRounding" Value="True" />
<!--<Setter Property="f:DataGridHelper.ShowBorder" Value="True" />--> <!--<Setter Property="f:DataGridHelper.ShowBorder" Value="True" />-->
@@ -240,7 +245,8 @@
Grid.Column="1" Grid.Column="1"
SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
Visibility="{TemplateBinding DetailsVisibility}" /> Visibility="{TemplateBinding DetailsVisibility}" />
<DataGridRowHeader x:Name="PART_RowHeader" <DataGridRowHeader
x:Name="PART_RowHeader"
Grid.RowSpan="2" Grid.RowSpan="2"
SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" /> Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
@@ -357,33 +363,67 @@
<Style x:Key="DataGridExDefaultDataGridStyle" TargetType="local:DataGridEx"> <Style x:Key="DataGridExDefaultDataGridStyle" TargetType="local:DataGridEx">
<Style.Resources> <Style.Resources>
<Style x:Key="DataGridExColumnMenu" TargetType="ContextMenu"> <Style x:Key="DataGridExColumnMenu" TargetType="ContextMenu">
<Setter Property="Width" Value="240"/> <Setter Property="Width" Value="240" />
<Setter Property="FontSize" Value="12"/> <Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#343A40"/> <Setter Property="Foreground" Value="#343A40" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="ContextMenu"> <ControlTemplate TargetType="ContextMenu">
<Border Background="White" BorderBrush="#DDE0E5" BorderThickness="1" CornerRadius="6" Padding="0"> <Border
Padding="0"
Background="White"
BorderBrush="#DDE0E5"
BorderThickness="1"
CornerRadius="6">
<StackPanel KeyboardNavigation.DirectionalNavigation="Cycle"> <StackPanel KeyboardNavigation.DirectionalNavigation="Cycle">
<StackPanel Margin="14,12,14,8"> <StackPanel Margin="14,12,14,8">
<TextBlock Text="显示的列" FontSize="14" FontWeight="SemiBold"/> <TextBlock
<TextBlock Text="勾选后立即生效" Foreground="#858A94" Margin="0,4,0,0"/> FontSize="14"
FontWeight="SemiBold"
Text="显示的列" />
<TextBlock
Margin="0,4,0,0"
Foreground="#858A94"
Text="勾选后立即生效" />
</StackPanel> </StackPanel>
<ScrollViewer MaxHeight="340" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="6,0,6,8"> <ScrollViewer
<ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle"/> MaxHeight="340"
Margin="6,0,6,8"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto">
<ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle" />
</ScrollViewer> </ScrollViewer>
<Border BorderBrush="#ECEEF1" BorderThickness="0,1,0,0" Padding="12,9" Background="#FAFAFB"> <Border
<Button x:Name="PART_DoneButton" Content="完成" HorizontalAlignment="Right" Width="64" Height="28" Padding="12,9"
Background="#FAFAFB"
BorderBrush="#ECEEF1"
BorderThickness="0,1,0,0">
<Button
x:Name="PART_DoneButton"
Width="64"
Height="28"
HorizontalAlignment="Right"
Background="#98638F"
BorderThickness="0"
Command="{x:Static ApplicationCommands.Close}" Command="{x:Static ApplicationCommands.Close}"
Foreground="White" Background="#98638F" BorderThickness="0"> Content="完成"
Foreground="White">
<Button.Template> <Button.Template>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="ButtonBorder" Background="{TemplateBinding Background}" CornerRadius="4"> <Border
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/> x:Name="ButtonBorder"
Background="{TemplateBinding Background}"
CornerRadius="4">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"><Setter TargetName="ButtonBorder" Property="Opacity" Value="0.85"/></Trigger> <Trigger Property="IsMouseOver" Value="True">
<Trigger Property="IsKeyboardFocused" Value="True"><Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#343A40"/><Setter TargetName="ButtonBorder" Property="BorderThickness" Value="1"/></Trigger> <Setter TargetName="ButtonBorder" Property="Opacity" Value="0.85" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#343A40" />
<Setter TargetName="ButtonBorder" Property="BorderThickness" Value="1" />
</Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Button.Template> </Button.Template>
@@ -397,32 +437,57 @@
<Setter Property="ItemContainerStyle"> <Setter Property="ItemContainerStyle">
<Setter.Value> <Setter.Value>
<Style TargetType="MenuItem"> <Style TargetType="MenuItem">
<Setter Property="Height" Value="30"/> <Setter Property="Height" Value="30" />
<Setter Property="Padding" Value="8,0"/> <Setter Property="Padding" Value="8,0" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="MenuItem"> <ControlTemplate TargetType="MenuItem">
<Border x:Name="ItemBorder" Background="Transparent" CornerRadius="4" Padding="{TemplateBinding Padding}"> <Border
x:Name="ItemBorder"
Padding="{TemplateBinding Padding}"
Background="Transparent"
CornerRadius="4">
<Grid> <Grid>
<Grid.ColumnDefinitions><ColumnDefinition Width="24"/><ColumnDefinition Width="*"/></Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<Border x:Name="CheckBorder" Width="14" Height="14" HorizontalAlignment="Left" VerticalAlignment="Center" <ColumnDefinition Width="24" />
BorderBrush="#C8CDD4" BorderThickness="1" CornerRadius="3" Background="White"> <ColumnDefinition Width="*" />
<Path x:Name="CheckMark" Data="M 2,6 L 5,9 L 11,3" Stroke="White" StrokeThickness="1.5" Visibility="Collapsed"/> </Grid.ColumnDefinitions>
<Border
x:Name="CheckBorder"
Width="14"
Height="14"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="White"
BorderBrush="#C8CDD4"
BorderThickness="1"
CornerRadius="3">
<Path
x:Name="CheckMark"
Data="M 2,6 L 5,9 L 11,3"
Stroke="White"
StrokeThickness="1.5"
Visibility="Collapsed" />
</Border> </Border>
<ContentPresenter Grid.Column="1" ContentSource="Header" VerticalAlignment="Center"/> <ContentPresenter
Grid.Column="1"
VerticalAlignment="Center"
ContentSource="Header" />
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsHighlighted" Value="True"><Setter TargetName="ItemBorder" Property="Background" Value="#F3F4F6"/></Trigger> <Trigger Property="IsHighlighted" Value="True">
<Setter TargetName="ItemBorder" Property="Background" Value="#F3F4F6" />
</Trigger>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="CheckBorder" Property="Background" Value="#98638F"/> <Setter TargetName="CheckBorder" Property="Background" Value="#98638F" />
<Setter TargetName="CheckBorder" Property="BorderBrush" Value="#98638F"/> <Setter TargetName="CheckBorder" Property="BorderBrush" Value="#98638F" />
<Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/> <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="#8A8F98"/> <Setter Property="Foreground" Value="#8A8F98" />
<Setter TargetName="CheckBorder" Property="Background" Value="#D5D8DE"/> <Setter TargetName="CheckBorder" Property="Background" Value="#D5D8DE" />
<Setter TargetName="CheckBorder" Property="BorderBrush" Value="#D5D8DE"/> <Setter TargetName="CheckBorder" Property="BorderBrush" Value="#D5D8DE" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
@@ -466,20 +531,40 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type local:DataGridEx}"> <ControlTemplate TargetType="{x:Type local:DataGridEx}">
<Grid> <Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/><RowDefinition Height="Auto"/></Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 调用方可以提供批量操作内容,默认展示选择提示和列设置。 --> <!-- 调用方可以提供批量操作内容,默认展示选择提示和列设置。 -->
<Border x:Name="PART_ToolbarArea" Grid.Row="0" Background="#FAFAFA" BorderBrush="#E1E4E8" BorderThickness="1,1,1,0" Padding="8,5" <Border
x:Name="PART_ToolbarArea"
Grid.Row="0"
Padding="8,5"
Background="#FAFAFA"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DataGridExBorderThicknessSplit}, ConverterParameter='1,1,1,0'}"
Visibility="{Binding ShowToolbar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource DataGridExVisibility}}"> Visibility="{Binding ShowToolbar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource DataGridExVisibility}}">
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<Button x:Name="PART_ColumnsButton" DockPanel.Dock="Right" Content="列设置" Padding="10,3" MinHeight="26" <Button
Visibility="{Binding ShowColumnSettings, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource DataGridExVisibility}}"/> x:Name="PART_ColumnsButton"
<TextBlock DockPanel.Dock="Left" VerticalAlignment="Center" Margin="0,0,12,0" MinHeight="26"
Text="{Binding SelectionSummary, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"/> Padding="10,3"
<ContentPresenter Content="{TemplateBinding ToolbarContent}" VerticalAlignment="Center"/> Content="列设置"
DockPanel.Dock="Right"
Visibility="{Binding ShowColumnSettings, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource DataGridExVisibility}}" />
<TextBlock
Margin="0,0,12,0"
VerticalAlignment="Center"
DockPanel.Dock="Left"
Text="{Binding SelectionSummary, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
<ContentPresenter VerticalAlignment="Center" Content="{TemplateBinding ToolbarContent}" />
</DockPanel> </DockPanel>
</Border> </Border>
<!-- 原生 DataGrid 滚动与虚拟化宿主。 --> <!-- 原生 DataGrid 滚动与虚拟化宿主。 -->
<Border x:Name="PART_TableArea" Grid.Row="1" <Border
x:Name="PART_TableArea"
Grid.Row="1"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
@@ -517,7 +602,7 @@
CommandTarget="{Binding RelativeSource={RelativeSource AncestorType={x:Type ext:DataGridEx}}}" CommandTarget="{Binding RelativeSource={RelativeSource AncestorType={x:Type ext:DataGridEx}}}"
IsChecked="{Binding AreAllRowsSelected, RelativeSource={RelativeSource AncestorType={x:Type ext:DataGridEx}}, Mode=OneWay}"> IsChecked="{Binding AreAllRowsSelected, RelativeSource={RelativeSource AncestorType={x:Type ext:DataGridEx}}, Mode=OneWay}">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource DataGridExCheckBoxStyle}"> <Style BasedOn="{StaticResource DataGridExCheckBoxStyle}" TargetType="CheckBox">
<Setter Property="Visibility" Value="Collapsed" /> <Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers> <Style.Triggers>
<MultiDataTrigger> <MultiDataTrigger>
@@ -576,16 +661,17 @@
Grid.Column="2" Grid.Column="2"
Maximum="{TemplateBinding ScrollableHeight}" Maximum="{TemplateBinding ScrollableHeight}"
Orientation="Vertical" Orientation="Vertical"
ViewportSize="{TemplateBinding ViewportHeight}" ViewportSize="{TemplateBinding ViewportHeight}"
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" /> Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"> <Grid
Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="2">
<ScrollBar <ScrollBar
x:Name="PART_HorizontalScrollBar" x:Name="PART_HorizontalScrollBar"
Maximum="{TemplateBinding ScrollableWidth}" Maximum="{TemplateBinding ScrollableWidth}"
Orientation="Horizontal" Orientation="Horizontal"
ViewportSize="{TemplateBinding ViewportWidth}" ViewportSize="{TemplateBinding ViewportWidth}"
Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" /> Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -612,45 +698,93 @@
</ScrollViewer> </ScrollViewer>
</Border> </Border>
<!-- 分页仅请求数据,不截断调用方的 ItemsSource。 --> <!-- 分页仅请求数据,不截断调用方的 ItemsSource。 -->
<Border x:Name="PART_PaginationArea" Grid.Row="2" Background="#FAFAFA" BorderBrush="#E1E4E8" BorderThickness="1,0,1,1" Padding="8,4" <Border
x:Name="PART_PaginationArea"
Grid.Row="2"
Padding="8,4"
Background="#FAFAFA"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DataGridExBorderThicknessSplit}, ConverterParameter='1,0,1,1'}"
Visibility="{Binding ShowPagination, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource DataGridExVisibility}}"> Visibility="{Binding ShowPagination, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource DataGridExVisibility}}">
<Grid> <Grid>
<ContentPresenter x:Name="PART_PaginationContent" Content="{TemplateBinding PaginationContent}"/> <ContentPresenter x:Name="PART_PaginationContent" Content="{TemplateBinding PaginationContent}" />
<DockPanel x:Name="PART_DefaultPagination" Visibility="Collapsed"> <DockPanel x:Name="PART_DefaultPagination" Visibility="Collapsed">
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal"> <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
<TextBlock Text="每页" VerticalAlignment="Center" Margin="0,0,6,0"/> <TextBlock
<ComboBox Width="70" MinHeight="26" IsEditable="False" Margin="0,0,8,0" Margin="0,0,6,0"
VerticalAlignment="Center"
Text="每页" />
<ComboBox
Width="70"
MinHeight="26"
Margin="0,0,8,0"
IsEditable="False"
ItemsSource="{Binding PageSizes, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" ItemsSource="{Binding PageSizes, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
SelectedItem="{Binding PageSize, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/> SelectedItem="{Binding PageSize, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<Button Content="首页" Command="{x:Static local:DataGridEx.FirstPageCommand}" Padding="8,2" Margin="0,0,4,0"/> <Button
<Button Content="上一页" Command="{x:Static local:DataGridEx.PreviousPageCommand}" Padding="8,2"/> Margin="0,0,4,0"
<TextBlock Text="{Binding PageSummary, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" VerticalAlignment="Center" Margin="10,0"/> Padding="8,2"
<Button Content="下一页" Command="{x:Static local:DataGridEx.NextPageCommand}" Padding="8,2"/> Command="{x:Static local:DataGridEx.FirstPageCommand}"
<Button Content="末页" Command="{x:Static local:DataGridEx.LastPageCommand}" Padding="8,2" Margin="4,0,0,0"/> Content="首页" />
<Button
Padding="8,2"
Command="{x:Static local:DataGridEx.PreviousPageCommand}"
Content="上一页" />
<TextBlock
Margin="10,0"
VerticalAlignment="Center"
Text="{Binding PageSummary, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
<Button
Padding="8,2"
Command="{x:Static local:DataGridEx.NextPageCommand}"
Content="下一页" />
<Button
Margin="4,0,0,0"
Padding="8,2"
Command="{x:Static local:DataGridEx.LastPageCommand}"
Content="末页" />
</StackPanel> </StackPanel>
<TextBlock Text="{Binding TotalSummary, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" VerticalAlignment="Center"/> <TextBlock VerticalAlignment="Center" Text="{Binding TotalSummary, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
</DockPanel> </DockPanel>
</Grid> </Grid>
</Border> </Border>
<Border x:Name="PART_LoadingOverlay" Grid.RowSpan="3" Background="#DDFFFFFF" Visibility="Collapsed" Cursor="Wait"> <Border
<StackPanel Width="180" HorizontalAlignment="Center" VerticalAlignment="Center"> x:Name="PART_LoadingOverlay"
<ProgressBar x:Name="PART_LoadingProgress" Height="4" IsIndeterminate="False" Foreground="#98638F" Background="#EDE5EB" BorderThickness="0"/> Grid.RowSpan="3"
<TextBlock Text="{TemplateBinding LoadingText}" HorizontalAlignment="Center" Margin="0,12,0,0" Foreground="#626873" Background="#DDFFFFFF"
AutomationProperties.LiveSetting="Polite"/> Cursor="Wait"
Visibility="Collapsed">
<StackPanel
Width="180"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ProgressBar
x:Name="PART_LoadingProgress"
Height="4"
Background="#EDE5EB"
BorderThickness="0"
Foreground="#98638F"
IsIndeterminate="False" />
<TextBlock
Margin="0,12,0,0"
HorizontalAlignment="Center"
AutomationProperties.LiveSetting="Polite"
Foreground="#626873"
Text="{TemplateBinding LoadingText}" />
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsLoading" Value="True"> <Trigger Property="IsLoading" Value="True">
<Setter TargetName="PART_LoadingOverlay" Property="Visibility" Value="Visible"/> <Setter TargetName="PART_LoadingOverlay" Property="Visibility" Value="Visible" />
<Setter TargetName="PART_LoadingProgress" Property="IsIndeterminate" Value="True"/> <Setter TargetName="PART_LoadingProgress" Property="IsIndeterminate" Value="True" />
<Setter TargetName="PART_ToolbarArea" Property="IsEnabled" Value="False"/> <Setter TargetName="PART_ToolbarArea" Property="IsEnabled" Value="False" />
<Setter TargetName="PART_TableArea" Property="IsEnabled" Value="False"/> <Setter TargetName="PART_TableArea" Property="IsEnabled" Value="False" />
<Setter TargetName="PART_PaginationArea" Property="IsEnabled" Value="False"/> <Setter TargetName="PART_PaginationArea" Property="IsEnabled" Value="False" />
</Trigger> </Trigger>
<Trigger Property="PaginationContent" Value="{x:Null}"> <Trigger Property="PaginationContent" Value="{x:Null}">
<Setter TargetName="PART_DefaultPagination" Property="Visibility" Value="Visible"/> <Setter TargetName="PART_DefaultPagination" Property="Visibility" Value="Visible" />
<Setter TargetName="PART_PaginationContent" Property="Visibility" Value="Collapsed"/> <Setter TargetName="PART_PaginationContent" Property="Visibility" Value="Collapsed" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
@@ -739,7 +873,8 @@
Grid.Column="1" Grid.Column="1"
SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
Visibility="{TemplateBinding DetailsVisibility}" /> Visibility="{TemplateBinding DetailsVisibility}" />
<DataGridRowHeader x:Name="PART_RowHeader" <DataGridRowHeader
x:Name="PART_RowHeader"
Grid.RowSpan="2" Grid.RowSpan="2"
SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" /> Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
@@ -838,13 +973,23 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="DataGridExRowHeaderStyle" BasedOn="{StaticResource DataGridExDefaultRowHeaderStyle}" TargetType="DataGridRowHeader"> <Style
x:Key="DataGridExRowHeaderStyle"
BasedOn="{StaticResource DataGridExDefaultRowHeaderStyle}"
TargetType="DataGridRowHeader">
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="DataGridRowHeader"> <ControlTemplate TargetType="DataGridRowHeader">
<Border Background="Transparent" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,1,1"> <Border
<CheckBox Style="{StaticResource DataGridExCheckBoxStyle}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.Name="选择行" Background="Transparent"
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/> BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="0,0,1,1">
<CheckBox
HorizontalAlignment="Center"
VerticalAlignment="Center"
AutomationProperties.Name="选择行"
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource DataGridExCheckBoxStyle}" />
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -1,7 +1,8 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:f="clr-namespace:Store.Management.Framework.Controls"> xmlns:f="clr-namespace:Store.Management.Framework.Controls"
xmlns:wpf="MAX.WPF">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Fonts/FontGeometry.xaml" /> <ResourceDictionary Source="Fonts/FontGeometry.xaml" />
<ResourceDictionary Source="pack://application:,,,/MAX.Common.WPF;component/Resources/Generic.xaml" /> <ResourceDictionary Source="pack://application:,,,/MAX.Common.WPF;component/Resources/Generic.xaml" />
@@ -35,4 +36,14 @@
</Style> </Style>
<Style BasedOn="{StaticResource WindowBase}" TargetType="f:WindowBase" /> <Style BasedOn="{StaticResource WindowBase}" TargetType="f:WindowBase" />
<Style BasedOn="{StaticResource DialogWindowStyle}" TargetType="f:DialogWindow" /> <Style BasedOn="{StaticResource DialogWindowStyle}" TargetType="f:DialogWindow" />
<Style
x:Key="VerticalAlignment"
BasedOn="{StaticResource TitleContentBaseStyle}"
TargetType="wpf:TitleContent">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="TitleVerticalAlignment" Value="Center" />
<Setter Property="Placement" Value="Left" />
</Style>
</ResourceDictionary> </ResourceDictionary>
@@ -0,0 +1,44 @@
using MAX.Common.WPF.Helpers;
using MAX.Core.DependencyInjection;
using Prism.Mvvm;
namespace Store.Management.Framework.Services;
public enum StatusLevel
{
Info,
Success,
Warning,
Error
}
public sealed record StatusBarMessage(string Text, StatusLevel Level, int? Progress);
/// <summary>各页面共享主窗口底部的最新状态。</summary>
public interface IStatusBarService
{
StatusBarMessage Current { get; }
/// <summary>发布一条状态。进度范围为 0 到 100,省略时隐藏进度条。</summary>
void Report(string text, StatusLevel level = StatusLevel.Info, int? progress = null);
}
internal sealed class StatusBarService : BindableBase, IStatusBarService, ISingletonDependency
{
private StatusBarMessage _current = new("就绪", StatusLevel.Info, null);
public StatusBarMessage Current
{
get => _current;
private set => SetProperty(ref _current, value);
}
public void Report(string text, StatusLevel level = StatusLevel.Info, int? progress = null)
{
ArgumentNullException.ThrowIfNull(text);
if (progress is < 0 or > 100)
{
throw new ArgumentOutOfRangeException(nameof(progress), "进度必须在 0 到 100 之间。");
}
DispatcherHelper.RunInDispatcher(() => Current = new StatusBarMessage(text, level, progress));
}
}
+1 -1
View File
@@ -80,7 +80,7 @@ public partial class App : FrameworkApplication
containerRegistry.RegisterDialog<DataGridTestView, DataGridTestViewModel>(); containerRegistry.RegisterDialog<DataGridTestView, DataGridTestViewModel>();
ViewModelLocationProvider.Register<MainWindow, MainWindowViewModel>(); ViewModelLocationProvider.Register<MainWindow, MainViewModel>();
containerRegistry.RegisterDialog<LoginWindow, LoginViewModel>(); containerRegistry.RegisterDialog<LoginWindow, LoginViewModel>();
-45
View File
@@ -1,45 +0,0 @@
<f:WindowBase
x:Class="Store.Management.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:f="Store.Management.Framework"
xmlns:local="clr-namespace:Store.Management.Views"
xmlns:prism="http://prismlibrary.com/"
Title="{Binding Title}"
Width="1140"
Height="720"
MinWidth="900"
MinHeight="560"
WindowStartupLocation="CenterScreen">
<Border>
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="20" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="180" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border
Grid.Column="0"
BorderBrush="{StaticResource SecondaryBorderBrush}"
BorderThickness="0,0,1,0">
<local:LeftNavView />
</Border>
<!-- 右侧页面标题与内容 -->
<DockPanel Grid.Column="1">
<TextBlock
Margin="16,16,16,0"
DockPanel.Dock="Top"
Text="{Binding SelectedItem.Header, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
<ContentControl x:Name="PART_SelectedContentHost" prism:RegionManager.RegionName="{Binding Source={x:Static f:Navigation.MainContext}}" />
</DockPanel>
<Border
Grid.Row="1"
Grid.ColumnSpan="2"
BorderBrush="{StaticResource SecondaryBorderBrush}"
BorderThickness="0,1,0,0" />
</Grid>
</Border>
</f:WindowBase>
@@ -1,29 +0,0 @@
using Prism.Mvvm;
using Prism.Commands;
using Prism.Services.Dialogs;
using Store.Management.Views;
using Store.Management.Framework.Controls;
using System.Windows;
namespace Store.Management;
public partial class MainWindow : WindowBase
{
public MainWindow() => InitializeComponent();
}
public class MainWindowViewModel(IDialogService dialogService) : BindableBase
{
public DelegateCommand OpenDataGridTestCommand => field ??= new(() =>
dialogService.ShowDialog(nameof(DataGridTestView), new DialogParameters(), _ => { }));
public DelegateCommand OpenLoginCommand => field ??= new(() =>
dialogService.ShowDialog(nameof(LoginWindow), new DialogParameters(), _ => { }));
private string _title="TTTT";
public string Title
{
get => _title;
set => SetProperty(ref _title, value);
}
}
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Store.Management.ViewModels
{
partial class MainViewModel
{
partial void InitHeader()
{
}
}
}
@@ -1,8 +1,6 @@
using MAX.Common.Helpers;
using MAX.Common.Helpers;
using PipeReviewReport.Resources.Fonts; using PipeReviewReport.Resources.Fonts;
using Prism.Commands; using Prism.Commands;
using Prism.Mvvm;
using Prism.Regions; using Prism.Regions;
using Store.Management.Framework; using Store.Management.Framework;
using Store.Management.Views; using Store.Management.Views;
@@ -16,19 +14,17 @@ using System.Windows.Input;
namespace Store.Management.ViewModels namespace Store.Management.ViewModels
{ {
internal class LeftNavViewModel : BindableBase partial class MainViewModel
{ {
private readonly IRegionManager _regionManager;
public ObservableCollection<NavItemViewModel> NavItems { get; } = []; public ObservableCollection<NavItemViewModel> NavItems { get; } = [];
public LeftNavViewModel(IRegionManager regionManager) partial void InitNav()
{ {
NavItems.Add(new NavItemViewModel NavItems.Add(new NavItemViewModel
{ {
Code = "1", Code = "1",
Title = "角色管理", Title = "角色管理",
Icon = IconNameEnum.Person, Icon = IconNameEnum.Person,
Url=nameof(DataGridTestView) Url = nameof(DataGridTestView)
}); });
NavItems.Add(new NavItemViewModel NavItems.Add(new NavItemViewModel
{ {
@@ -36,9 +32,8 @@ namespace Store.Management.ViewModels
Title = "商铺管理", Title = "商铺管理",
Icon = IconNameEnum.BuildingShop, Icon = IconNameEnum.BuildingShop,
IsSelected = true, IsSelected = true,
Url=nameof(UserManagementPage) Url = nameof(UserManagementPage)
}); });
_regionManager = regionManager;
} }
public ICommand NavItemCommand => new AsyncDelegateCommand<NavItemViewModel>(NavItem); public ICommand NavItemCommand => new AsyncDelegateCommand<NavItemViewModel>(NavItem);
@@ -51,18 +46,4 @@ namespace Store.Management.ViewModels
_regionManager.RequestNavigate(Navigation.MainContext, model.Url); _regionManager.RequestNavigate(Navigation.MainContext, model.Url);
} }
} }
public class NavItemViewModel : BindableBase
{
public string Code { get; set; }
public string Title { get; set; }
public IconNameEnum Icon { get; set; }
public string Url { get; set; }
private bool _isSelected;
public bool IsSelected
{
get => _isSelected;
set => SetProperty(ref _isSelected, value);
}
}
} }
@@ -0,0 +1,26 @@
using Store.Management.Framework.Services;
using Prism.Mvvm;
using Prism.Regions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Store.Management.ViewModels
{
partial class MainViewModel : BindableBase
{
private readonly IRegionManager _regionManager;
public IStatusBarService StatusBar { get; }
public MainViewModel(IRegionManager regionManager, IStatusBarService statusBar)
{
_regionManager = regionManager;
StatusBar = statusBar;
InitNav();
InitHeader();
}
partial void InitNav();
partial void InitHeader();
}
}
@@ -0,0 +1,19 @@
using PipeReviewReport.Resources.Fonts;
using Prism.Mvvm;
namespace Store.Management.ViewModels
{
public class NavItemViewModel : BindableBase
{
public string Code { get; set; }
public string Title { get; set; }
public IconNameEnum Icon { get; set; }
public string Url { get; set; }
private bool _isSelected;
public bool IsSelected
{
get => _isSelected;
set => SetProperty(ref _isSelected, value);
}
}
}
@@ -6,20 +6,22 @@ using Store.Management.Api.Models;
using Store.Management.Api.Transport; using Store.Management.Api.Transport;
using Store.Management.Api.Users; using Store.Management.Api.Users;
using Store.Management.Framework.Controls; using Store.Management.Framework.Controls;
using Store.Management.Framework.ViewModels; using Store.Management.Framework.Services;
using Store.Management.Views; using Store.Management.Views;
using System.Windows; using System.Windows;
using System.Windows.Controls.Primitives;
namespace Store.Management.ViewModels; namespace Store.Management.ViewModels;
public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogService dialogs) : BindableBase public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogService dialogs, IStatusBarService statusBar) : BindableBase
{ {
public const int KeywordLimit = 100; public const int KeywordLimit = 100;
private string appliedKeyword = ""; private string appliedKeyword = "";
private int pageSize = 50; private int pageSize = 50;
public string Keyword { get; set; } = ""; public string Keyword { get; set; } = "";
public LoadingStatus Status { get; } = new(); private bool _canInteract = true;
public bool CanInteract { get => _canInteract; private set => SetProperty(ref _canInteract, value); }
public int Page { get; private set => SetProperty(ref field, value); } = 1; public int Page { get; private set => SetProperty(ref field, value); } = 1;
public int Total { get; private set => SetProperty(ref field, value); } public int Total { get; private set => SetProperty(ref field, value); }
public IReadOnlyList<UserInfo> Users { get; private set => SetProperty(ref field, value); } = []; public IReadOnlyList<UserInfo> Users { get; private set => SetProperty(ref field, value); } = [];
@@ -27,7 +29,7 @@ public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogSe
public AsyncDelegateCommand SearchCommand => field ??= new(() => LoadAsync(Keyword.Trim(), 1, pageSize)); public AsyncDelegateCommand SearchCommand => field ??= new(() => LoadAsync(Keyword.Trim(), 1, pageSize));
public AsyncDelegateCommand<DataGridPageRequest> PageCommand => field ??= new( public AsyncDelegateCommand<DataGridPageRequest> PageCommand => field ??= new(
request => LoadAsync(appliedKeyword, request.PageIndex, request.PageSize), _ => !Status.IsLoading); request => LoadAsync(appliedKeyword, request.PageIndex, request.PageSize), _ => CanInteract);
public AsyncDelegateCommand CreateCommand => field ??= new(() => OpenEditorAsync(null)); public AsyncDelegateCommand CreateCommand => field ??= new(() => OpenEditorAsync(null));
public AsyncDelegateCommand EditCommand => field ??= new AsyncDelegateCommand(() => OpenEditorAsync(SelectedUser), public AsyncDelegateCommand EditCommand => field ??= new AsyncDelegateCommand(() => OpenEditorAsync(SelectedUser),
() => SelectedUser != null).ObservesProperty(() => SelectedUser); () => SelectedUser != null).ObservesProperty(() => SelectedUser);
@@ -48,13 +50,14 @@ public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogSe
private async Task LoadAsync(string keyword, int page, int size) private async Task LoadAsync(string keyword, int page, int size)
{ {
if (Status.IsLoading) if (!CanInteract)
{ {
return; return;
} }
Status.Initialize("正在查询用户…"); CanInteract = false;
try try
{ {
statusBar.Report("正在查询用户…");
UserSearchRequest request = new() { Keyword = keyword, Page = page, PageSize = size }; UserSearchRequest request = new() { Keyword = keyword, Page = page, PageSize = size };
PageResult<UserInfo> result = await client.Users.SearchAsync(request); PageResult<UserInfo> result = await client.Users.SearchAsync(request);
// 删除末页最后一条记录后,按服务端总数回到有效页。 // 删除末页最后一条记录后,按服务端总数回到有效页。
@@ -70,6 +73,8 @@ public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogSe
Users = result.Items; Users = result.Items;
Total = (int)Math.Min(result.Total, int.MaxValue); Total = (int)Math.Min(result.Total, int.MaxValue);
Page = request.Page; Page = request.Page;
statusBar.Report($"用户查询完成,共 {Total} 条。", StatusLevel.Success,100);
} }
catch (ApiException ex) catch (ApiException ex)
{ {
@@ -79,11 +84,11 @@ public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogSe
Page = 1; Page = 1;
appliedKeyword = keyword; appliedKeyword = keyword;
pageSize = size; pageSize = size;
Status.Error(ex.Message); statusBar.Report(ex.Message, StatusLevel.Error);
} }
finally finally
{ {
Status.Done(); CanInteract = true;
} }
} }
@@ -106,17 +111,21 @@ public sealed class UserManagementPageViewModel(StoreApiClient client, IDialogSe
{ {
return; return;
} }
Status.Initialize("正在删除用户…"); CanInteract = false;
try try
{ {
statusBar.Report("正在删除用户…");
await client.Users.DeleteAsync(user.Id); await client.Users.DeleteAsync(user.Id);
} }
catch (ApiException ex) catch (ApiException ex)
{ {
Status.Error(ex.Message); statusBar.Report(ex.Message, StatusLevel.Error);
return; return;
} }
Status.Done(); finally
{
CanInteract = true;
}
await LoadAsync(appliedKeyword, Page, pageSize); await LoadAsync(appliedKeyword, Page, pageSize);
} }
} }
@@ -6,6 +6,7 @@
xmlns:f="Store.Management.Framework" xmlns:f="Store.Management.Framework"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Store.Management.ViewModels" xmlns:vm="clr-namespace:Store.Management.ViewModels"
d:Background="White"
d:DataContext="{d:DesignInstance Type=vm:DataGridTestViewModel}" d:DataContext="{d:DesignInstance Type=vm:DataGridTestViewModel}"
d:DesignHeight="760" d:DesignHeight="760"
d:DesignWidth="1280" d:DesignWidth="1280"
@@ -109,7 +110,8 @@
x:Name="StoreGrid" x:Name="StoreGrid"
Grid.Row="1" Grid.Row="1"
Margin="10" Margin="10"
d:IsLoading="True" d:IsLoading="false"
BorderThickness="1"
CanUserSortColumns="True" CanUserSortColumns="True"
IsLoading="{Binding LoadingStatus.IsLoading, Mode=OneWay}" IsLoading="{Binding LoadingStatus.IsLoading, Mode=OneWay}"
IsReadOnly="True" IsReadOnly="True"
@@ -9,11 +9,10 @@
xmlns:vm="clr-namespace:Store.Management.ViewModels" xmlns:vm="clr-namespace:Store.Management.ViewModels"
xmlns:wpf="MAX.WPF" xmlns:wpf="MAX.WPF"
d:Background="White" d:Background="White"
d:DataContext="{d:DesignInstance Type=vm:LeftNavViewModel}" d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
d:DesignHeight="450" d:DesignHeight="450"
d:Width="255" d:Width="255"
Background="White" Background="White"
DataContext="{f:DISource Type=vm:LeftNavViewModel}"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<wpf:CommandProxy x:Key="NavItemCommand" Command="{Binding NavItemCommand}" /> <wpf:CommandProxy x:Key="NavItemCommand" Command="{Binding NavItemCommand}" />
@@ -0,0 +1,13 @@
<UserControl
x:Class="Store.Management.Views.MainHeaderView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Store.Management.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Height="50"
d:Background="White"
d:Width="800"
mc:Ignorable="d">
<Grid />
</UserControl>
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
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;
namespace Store.Management.Views
{
/// <summary>
/// MainHeaderView.xaml 的交互逻辑
/// </summary>
public partial class MainHeaderView : UserControl
{
public MainHeaderView()
{
InitializeComponent();
}
}
}
@@ -0,0 +1,107 @@
<f:WindowBase
x:Class="Store.Management.Views.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:f="Store.Management.Framework"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:Store.Management.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
Width="1140"
Height="720"
MinWidth="900"
MinHeight="560"
Background="#f4f5f7"
ShowIcon="True"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<Border>
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="20" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="180" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border
Grid.Column="0"
BorderBrush="{StaticResource SecondaryBorderBrush}"
BorderThickness="0,0,1,0">
<local:LeftNavView />
</Border>
<!-- 右侧页面标题与内容 -->
<Border Grid.Column="1" Padding="0">
<ContentControl x:Name="PART_SelectedContentHost" prism:RegionManager.RegionName="{Binding Source={x:Static f:Navigation.MainContext}}" />
</Border>
<Border
Grid.Row="1"
Grid.ColumnSpan="2"
Padding="0,0"
Background="{DynamicResource RegionBrush}"
BorderBrush="{StaticResource SecondaryBorderBrush}"
BorderThickness="0,1,0,0"
DataContext="{Binding StatusBar.Current}">
<Grid Width="auto" HorizontalAlignment="Stretch">
<Grid.Style>
<Style TargetType="Grid">
<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryTextBrush}" />
<Style.Triggers>
<DataTrigger Binding="{Binding Level}" Value="Success">
<Setter Property="TextElement.Foreground" Value="{DynamicResource SuccessBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding Level}" Value="Warning">
<Setter Property="TextElement.Foreground" Value="{DynamicResource WarningBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding Level}" Value="Error">
<Setter Property="TextElement.Foreground" Value="{DynamicResource DangerBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Style>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<ProgressBar
x:Name="StatusProgress"
Grid.Column="1"
Width="80"
Height="6"
Margin="15,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
d:Visibility="Visible"
hc:BorderElement.CornerRadius="2"
hc:VisualElement.Text=""
AutomationProperties.Name="任务进度"
Foreground="{Binding Path=(TextElement.Foreground), RelativeSource={RelativeSource AncestorType=Grid}}"
Value="{Binding Progress, Mode=OneWay, TargetNullValue=0}">
<ProgressBar.Style>
<Style BasedOn="{StaticResource {x:Type ProgressBar}}" TargetType="ProgressBar">
<Style.Triggers>
<DataTrigger Binding="{Binding Progress}" Value="{x:Null}">
<Setter Property="Visibility" Value="Collapsed" />
</DataTrigger>
</Style.Triggers>
</Style>
</ProgressBar.Style>
</ProgressBar>
<TextBlock
x:Name="StatusText"
Grid.Column="0"
Margin="15,0,0,0"
VerticalAlignment="Center"
d:Text="就绪"
FontSize="12"
Foreground="{Binding Path=(TextElement.Foreground), RelativeSource={RelativeSource AncestorType=Grid}}"
Text="{Binding Text}"
TextTrimming="CharacterEllipsis"
ToolTip="{Binding Text}" />
</Grid>
</Border>
</Grid>
</Border>
</f:WindowBase>
@@ -0,0 +1,29 @@
using Prism.Mvvm;
using Prism.Commands;
using Prism.Services.Dialogs;
using Store.Management.Views;
using Store.Management.Framework.Controls;
using System.Windows;
namespace Store.Management.Views;
public partial class MainWindow : WindowBase
{
public MainWindow()
{
InitializeComponent();
NonClientAreaHeight = 50;
NonClientAreaContent = new MainHeaderView();
}
}
//public class MainWindowViewModel(IDialogService dialogService) : BindableBase
//{
// public DelegateCommand OpenDataGridTestCommand => field ??= new(() =>
// dialogService.ShowDialog(nameof(DataGridTestView), new DialogParameters(), _ => { }));
// public DelegateCommand OpenLoginCommand => field ??= new(() =>
// dialogService.ShowDialog(nameof(LoginWindow), new DialogParameters(), _ => { }));
//}
@@ -7,32 +7,27 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Store.Management.ViewModels" xmlns:vm="clr-namespace:Store.Management.ViewModels"
xmlns:wpf="MAX.WPF" xmlns:wpf="MAX.WPF"
Margin="5"
d:Background="White" d:Background="White"
d:DataContext="{d:DesignInstance Type=vm:UserManagementPageViewModel}"
d:DesignHeight="760" d:DesignHeight="760"
d:DesignWidth="1280" d:DesignWidth="1280"
Background="White"
Loaded="OnLoaded" Loaded="OnLoaded"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="16">
<DockPanel IsEnabled="{Binding CanInteract}">
<!-- 查询及用户操作 --> <!-- 查询及用户操作 -->
<Border
Padding="10,5"
VerticalAlignment="Center"
DockPanel.Dock="Top">
<wpf:SpacingStackPanel <wpf:SpacingStackPanel
Margin="0,0,0,12" Height="44"
DockPanel.Dock="Top"
HorizontalSpacing="8" HorizontalSpacing="8"
Orientation="Horizontal"> Orientation="Horizontal">
<wpf:SpacingStackPanel.Style> <wpf:TitleContent Title="关键词" Style="{StaticResource VerticalAlignment}">
<Style TargetType="wpf:SpacingStackPanel">
<Style.Triggers>
<DataTrigger Binding="{Binding Status.IsLoading, Mode=OneWay}" Value="True">
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
</Style>
</wpf:SpacingStackPanel.Style>
<Button Command="{Binding LoginCommand}" Content="登录" />
<wpf:TitleContent
Title="关键词"
Placement="Left"
TitleVerticalAlignment="Center">
<TextBox <TextBox
Width="175" Width="175"
AutomationProperties.Name="用户查询关键词" AutomationProperties.Name="用户查询关键词"
@@ -43,24 +38,23 @@
</TextBox.InputBindings> </TextBox.InputBindings>
</TextBox> </TextBox>
</wpf:TitleContent> </wpf:TitleContent>
<Button Command="{Binding SearchCommand}" Content="查询" /> <Button
Command="{Binding SearchCommand}"
Content="查询"
Style="{StaticResource ButtonPrimary}" />
<Button Command="{Binding CreateCommand}" Content="创建用户" /> <Button Command="{Binding CreateCommand}" Content="创建用户" />
<Button Command="{Binding EditCommand}" Content="编辑" /> <Button Command="{Binding EditCommand}" Content="编辑" />
<Button Command="{Binding DeleteCommand}" Content="删除" /> <Button Command="{Binding DeleteCommand}" Content="删除" />
</wpf:SpacingStackPanel> </wpf:SpacingStackPanel>
<TextBlock </Border>
DockPanel.Dock="Bottom"
Foreground="{DynamicResource DangerBrush}"
Text="{Binding Status.ErrorMessage, Mode=OneWay}"
TextWrapping="Wrap" />
<!-- 用户列表与服务端分页 --> <!-- 用户列表与服务端分页 -->
<f:DataGridEx <f:DataGridEx
AutoGenerateColumns="False" AutoGenerateColumns="False"
BorderThickness="1"
CanUserSortColumns="False" CanUserSortColumns="False"
IsLoading="{Binding Status.IsLoading, Mode=OneWay}"
IsReadOnly="True" IsReadOnly="True"
ItemsSource="{Binding Users, Mode=OneWay}" ItemsSource="{Binding Users, Mode=OneWay}"
LoadingText="{Binding Status.Message, Mode=OneWay}"
NoDataTips="没有符合条件的用户" NoDataTips="没有符合条件的用户"
PageChangedCommand="{Binding PageCommand}" PageChangedCommand="{Binding PageCommand}"
PageSize="50" PageSize="50"
@@ -95,4 +89,5 @@
</f:DataGridEx.Columns> </f:DataGridEx.Columns>
</f:DataGridEx> </f:DataGridEx>
</DockPanel> </DockPanel>
</UserControl> </UserControl>
@@ -1,4 +1,6 @@
using Autofac; using Autofac;
using Store.Management.Framework.Services;
using System.Windows.Controls;
using System.Windows; using System.Windows;
using System.Windows.Threading; using System.Windows.Threading;
using Store.Management; using Store.Management;
@@ -30,13 +32,10 @@ class Program
Check(ReferenceEquals(productionClient, productionContainer.Resolve<StoreApiClient>()), "自动注册 API 单例"); Check(ReferenceEquals(productionClient, productionContainer.Resolve<StoreApiClient>()), "自动注册 API 单例");
Check(productionContainer.Resolve<Store.Management.Framework.Services.ILoginService>() != null, "自动注册登录服务"); Check(productionContainer.Resolve<Store.Management.Framework.Services.ILoginService>() != null, "自动注册登录服务");
} }
var builder = new ContainerBuilder(); var testExtension = new Prism.Autofac.AutofacContainerExtension();
builder.RegisterInstance(client); testExtension.RegisterInstance(typeof(StoreApiClient), client);
new Store.Management.Framework.DependencyInjection.ApiClientRegistration().Register(builder); testExtension.FinalizeExtension();
builder.RegisterAssemblyTypes(typeof(Store.Management.Framework.Services.ILoginService).Assembly) using var container = testExtension.Instance;
.Where(type => typeof(MAX.Core.DependencyInjection.ISingletonDependency).IsAssignableFrom(type))
.AsImplementedInterfaces().SingleInstance();
using var container = builder.Build();
Check(ReferenceEquals(client, container.Resolve<StoreApiClient>()), "保留测试客户端注册"); Check(ReferenceEquals(client, container.Resolve<StoreApiClient>()), "保留测试客户端注册");
var service = container.Resolve<Store.Management.Framework.Services.ILoginService>(); var service = container.Resolve<Store.Management.Framework.Services.ILoginService>();
using var vm = new LoginViewModel(service); using var vm = new LoginViewModel(service);
@@ -59,13 +58,51 @@ class Program
Console.WriteLine("PASS: LoginViewModel -> ILoginService -> AuthApi, retry, password contract and cancellation."); Console.WriteLine("PASS: LoginViewModel -> ILoginService -> AuthApi, retry, password contract and cancellation.");
return 0; return 0;
} }
var app = new TestApp(client); App app = args.Contains("--status-bar") ? new App() : new TestApp(client);
app.InitializeComponent(); app.InitializeComponent();
int exitCode = 0; int exitCode = 0;
app.Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, new Action(async () => app.Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, new Action(async () =>
{ {
try try
{ {
if (args.Contains("--status-bar"))
{
for (int attempt = 0; attempt < 200 && app.MainWindow is not MainWindow; attempt++)
{
await Task.Delay(50);
}
MainWindow shell = (MainWindow)app.MainWindow;
IStatusBarService status = app.Container.Resolve<IStatusBarService>();
TextBlock text = (TextBlock)shell.FindName("StatusText");
ProgressBar progress = (ProgressBar)shell.FindName("StatusProgress");
Check(text.Text == "就绪" && progress.Visibility == Visibility.Collapsed, "初始状态");
foreach ((StatusLevel level, string brush, int value) in new[] {
(StatusLevel.Info, "PrimaryTextBrush", 0), (StatusLevel.Warning, "WarningBrush", 50),
(StatusLevel.Error, "DangerBrush", 75), (StatusLevel.Success, "SuccessBrush", 100) })
{
await Task.Run(() => status.Report(level.ToString(), level, value));
await Dispatcher.Yield(DispatcherPriority.ApplicationIdle);
Check(text.Text == level.ToString() && text.Foreground == shell.FindResource(brush), "状态文字和颜色");
Check(progress.Visibility == Visibility.Visible && progress.Value == value, "任务进度");
}
status.Report("完成");
await Dispatcher.Yield(DispatcherPriority.ApplicationIdle);
Check(text.Text == "完成" && progress.Visibility == Visibility.Collapsed, "纯文本状态隐藏进度");
using var usersClient = new StoreApiClient(new ApiClientOptions { BaseUrl = new Uri("http://localhost:14312/api/v1/") }, httpClient);
usersClient.Session.Clear();
var usersVm = new UserManagementPageViewModel(usersClient, app.Container.Resolve<IDialogService>(), status);
await usersVm.SearchCommand.Execute();
Check(status.Current.Level == StatusLevel.Error && usersVm.CanInteract, "查询失败后显示错误并允许重试");
await usersClient.Auth.LoginAsync(new() { UserName = "admin", Password = "320BB1D43EC042096A83DBAC6DC9294A" });
Task search = usersVm.SearchCommand.Execute();
Check(!usersVm.CanInteract && status.Current.Level == StatusLevel.Info, "查询期间禁用操作");
await search;
Check(usersVm.CanInteract && usersVm.Total == 51 && status.Current.Level == StatusLevel.Success, "重试查询成功");
await usersVm.PageCommand.Execute(new DataGridPageRequest(2, 50));
Check(usersVm.Page == 2 && usersVm.CanInteract && status.Current.Level == StatusLevel.Success, "分页查询成功");
Console.WriteLine("PASS: status bar bindings, colors and background progress reports.");
return;
}
for (int attempt = 0; attempt < 100 && !app.Windows.OfType<DialogWindow>().Any(window => window.Content is LoginWindow && window.IsLoaded); attempt++) for (int attempt = 0; attempt < 100 && !app.Windows.OfType<DialogWindow>().Any(window => window.Content is LoginWindow && window.IsLoaded); attempt++)
{ {
await Task.Delay(20); await Task.Delay(20);
@@ -185,6 +222,14 @@ sealed class LoginHandler : HttpMessageHandler
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{ {
RequestCount++; RequestCount++;
if (request.RequestUri?.AbsolutePath == "/api/v1/user/GetAllUser")
{
await Task.Delay(30, cancellationToken);
return new HttpResponseMessage(HttpStatusCode.OK)
{
Content = new StringContent("""{"code":200,"data":{"total":51,"items":[{"id":1,"userName":"admin"}]}}""", Encoding.UTF8, "application/json")
};
}
if (request.RequestUri?.AbsoluteUri != "http://localhost:14312/api/v1/Auth/Login") if (request.RequestUri?.AbsoluteUri != "http://localhost:14312/api/v1/Auth/Login")
throw new Exception("登录路由错误"); throw new Exception("登录路由错误");
var body = System.Text.Json.JsonDocument.Parse(await request.Content!.ReadAsStringAsync(cancellationToken)); var body = System.Text.Json.JsonDocument.Parse(await request.Content!.ReadAsStringAsync(cancellationToken));
@@ -54,7 +54,16 @@ internal static class Program
window = new Window { Content = view, Width = 1280, Height = 760, Left = -10000, Top = -10000, ShowInTaskbar = false }; window = new Window { Content = view, Width = 1280, Height = 760, Left = -10000, Top = -10000, ShowInTaskbar = false };
window.Show(); window.Show();
Pump(); Pump();
Check(grid.BorderThickness.Left == 1 && grid.BorderThickness.Right == 1, "continuous table side borders"); Border toolbar = (Border)grid.Template.FindName("PART_ToolbarArea", grid);
Border pagination = (Border)grid.Template.FindName("PART_PaginationArea", grid);
Check(grid.BorderThickness == new Thickness(0) && toolbar.BorderThickness == grid.BorderThickness && pagination.BorderThickness == grid.BorderThickness, "borderless demo includes toolbar and pagination");
grid.BorderThickness = new Thickness(2, 3, 4, 5);
grid.BorderBrush = Brushes.Transparent;
Pump();
Check(toolbar.BorderThickness == new Thickness(2, 3, 4, 0) && pagination.BorderThickness == new Thickness(2, 0, 4, 5), "toolbar and pagination follow outer border widths");
Check(toolbar.BorderBrush == grid.BorderBrush && pagination.BorderBrush == grid.BorderBrush, "toolbar and pagination follow grid border brush");
grid.BorderThickness = new Thickness(0);
grid.ClearValue(Control.BorderBrushProperty);
Check(vm.TotalCount == 237 && grid.Items.Count == 50 && grid.PageCount == 5, "Bogus data and page count"); Check(vm.TotalCount == 237 && grid.Items.Count == 50 && grid.PageCount == 5, "Bogus data and page count");
Check(grid.Columns.Count == 10 && Equals(grid.Columns[0].Header, "序号"), "separate serial column"); Check(grid.Columns.Count == 10 && Equals(grid.Columns[0].Header, "序号"), "separate serial column");
DataGridRow row = (DataGridRow)grid.ItemContainerGenerator.ContainerFromIndex(0); DataGridRow row = (DataGridRow)grid.ItemContainerGenerator.ContainerFromIndex(0);