chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from irihitech/page

Browse Source 
Update Pagination
This commit is contained in:
Dong Bin
2024-03-16 16:55:40 +08:00
committed by GitHub
parent 31cd8a4490 3cc5621368
commit fc69b4275d
8 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
demo/Ursa.Demo/Pages/PaginationDemo.axaml
View File

@@ -13,11 +13,16 @@
<viewModels:PaginationDemoViewModel />
</Design.DataContext>
<StackPanel>
<TextBlock Text="{Binding #page.CurrentPage}" />
<StackPanel Orientation="Horizontal">
<TextBlock Text="Current Page: "></TextBlock>
<TextBlock Text="{Binding #page.CurrentPage}" />
</StackPanel>
<ToggleSwitch Name="pageSizeSelector" Content="Show Page Size Selector" />
<ToggleSwitch Name="quickJumperSelector" Content="Show Quick Jumper"></ToggleSwitch>
<u:Pagination
Name="page"
PageSizeOptions="10, 20, 50, 100"
ShowQuickJump="{Binding #quickJumperSelector.IsChecked}"
ShowPageSizeSelector="{Binding #pageSizeSelector.IsChecked}"
TotalCount="600" />
</StackPanel>

2
demo/Ursa.Demo/ViewModels/MenuViewModel.cs
View File

@@ -34,7 +34,7 @@ public class MenuViewModel: ViewModelBase
// new() { MenuHeader = "Number Displayer", Key = MenuKeys.MenuKeyNumberDisplayer, Status = "New" },
new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown },
new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad, Status = "New" },
new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination, Status = "Updated" },
new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider },
new() { MenuHeader = "Scroll To", Key = MenuKeys.MenuKeyScrollToButton, Status = "New" },
new() { MenuHeader = "Selection List", Key = MenuKeys.MenuKeySelectionList, Status = "New" },

1
src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml
View File

@@ -35,6 +35,7 @@
MinWidth="0"
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
AllowSpin="{TemplateBinding AllowSpin}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"

22
src/Ursa.Themes.Semi/Controls/Pagination.axaml
View File

@@ -12,7 +12,7 @@
<Setter Property="Template">
<ControlTemplate TargetType="u:Pagination">
<StackPanel Orientation="Horizontal">
<u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}">
<u:PaginationButton u:DisabledAdorner.IsEnabled="True" Name="{x:Static u:Pagination.PART_PreviousButton}">
<PathIcon
Width="12"
Height="12"
@@ -20,15 +20,25 @@
Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton>
<StackPanel Name="{x:Static u:Pagination.PART_ButtonPanel}" Orientation="Horizontal" />
<u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}">
<u:PaginationButton u:DisabledAdorner.IsEnabled="True" Name="{x:Static u:Pagination.PART_NextButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource PaginationForwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton>
<StackPanel Orientation="Horizontal" IsVisible="{TemplateBinding ShowQuickJump}">
<TextBlock
Margin="4 0"
VerticalAlignment="Center"
Text="{DynamicResource STRING_PAGINATION_JUMP_TO}" />
<u:NumericIntUpDown x:Name="{x:Static u:Pagination.PART_QuickJumpInput}" ShowButtonSpinner="False" Width="50"></u:NumericIntUpDown>
<TextBlock
Margin="4 0"
VerticalAlignment="Center"
Text="{DynamicResource STRING_PAGINATION_PAGE}" />
</StackPanel>
<ComboBox
Name="{x:Static u:Pagination.PART_SizeChangerComboBox}"
IsVisible="{TemplateBinding ShowPageSizeSelector}"
ItemsSource="{TemplateBinding PageSizeOptions}"
SelectedItem="{TemplateBinding PageSize,
@@ -114,9 +124,9 @@
</Style>
</Style>
<Style Selector="^:selected">
<Setter Property="u:PaginationButton.Background" Value="{DynamicResource PaginationButtonSelectedBackground}" />
<Setter Property="u:PaginationButton.Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" />
<Setter Property="u:PaginationButton.FontWeight" Value="600" />
<Setter Property="Background" Value="{DynamicResource PaginationButtonSelectedBackground}" />
<Setter Property="Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" />
<Setter Property="FontWeight" Value="600" />
</Style>
</ControlTheme>

2
src/Ursa.Themes.Semi/Locale/en-us.axaml
View File

@@ -10,4 +10,6 @@
<x:String x:Key="STRING_MENU_DIALOG_YES">Yes</x:String>
<x:String x:Key="STRING_MENU_DIALOG_NO">No</x:String>
<x:String x:Key="STRING_MENU_DIALOG_CLOSE">Close</x:String>
<x:String x:Key="STRING_PAGINATION_JUMP_TO">Jump to page</x:String>
<x:String x:Key="STRING_PAGINATION_PAGE"> </x:String>
</ResourceDictionary>

2
src/Ursa.Themes.Semi/Locale/zh-cn.axaml
View File

@@ -10,4 +10,6 @@
<x:String x:Key="STRING_MENU_DIALOG_YES">是</x:String>
<x:String x:Key="STRING_MENU_DIALOG_NO">否</x:String>
<x:String x:Key="STRING_MENU_DIALOG_CLOSE">关闭</x:String>
<x:String x:Key="STRING_PAGINATION_JUMP_TO">跳至</x:String>
<x:String x:Key="STRING_PAGINATION_PAGE">页</x:String>
</ResourceDictionary>

9
src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
View File

@@ -110,6 +110,15 @@ public abstract class NumericUpDown : TemplatedControl, IClearControl
set => SetValue(AllowSpinProperty, value);
}
public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
ButtonSpinner.ShowButtonSpinnerProperty.AddOwner<NumericUpDown>();
public bool ShowButtonSpinner
{
get => GetValue(ShowButtonSpinnerProperty);
set => SetValue(ShowButtonSpinnerProperty, value);
}
public event EventHandler<SpinEventArgs>? Spinned;
static NumericUpDown()

157
src/Ursa/Controls/Pagination/Pagination.cs
View File

@@ -3,8 +3,10 @@ using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Styling;
using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
@@ -16,39 +18,23 @@ namespace Ursa.Controls;
[TemplatePart(PART_PreviousButton, typeof(PaginationButton))]
[TemplatePart(PART_NextButton, typeof(PaginationButton))]
[TemplatePart(PART_ButtonPanel, typeof(StackPanel))]
[TemplatePart(PART_SizeChangerComboBox, typeof(ComboBox))]
[TemplatePart(PART_QuickJumpInput, typeof(NumericIntUpDown))]
public class Pagination: TemplatedControl
{
public const string PART_PreviousButton = "PART_PreviousButton";
public const string PART_NextButton = "PART_NextButton";
public const string PART_ButtonPanel = "PART_ButtonPanel";
public const string PART_SizeChangerComboBox = "PART_SizeChangerComboBox";
public const string PART_QuickJumpInput = "PART_QuickJumpInput";
private PaginationButton? _previousButton;
private PaginationButton? _nextButton;
private StackPanel? _buttonPanel;
private readonly PaginationButton[] _buttons = new PaginationButton[7];
private ComboBox? _sizeChangerComboBox;
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
if (_previousButton != null) _previousButton.Click -= OnButtonClick;
if (_nextButton != null) _nextButton.Click -= OnButtonClick;
_previousButton = e.NameScope.Find<PaginationButton>(PART_PreviousButton);
_nextButton = e.NameScope.Find<PaginationButton>(PART_NextButton);
_buttonPanel = e.NameScope.Find<StackPanel>(PART_ButtonPanel);
_sizeChangerComboBox = e.NameScope.Find<ComboBox>(PART_SizeChangerComboBox);
if (_previousButton != null) _previousButton.Click += OnButtonClick;
if (_nextButton != null) _nextButton.Click += OnButtonClick;
InitializePanelButtons();
UpdateButtons(0);
}
private NumericIntUpDown? _quickJumpInput;
public static readonly StyledProperty<int> CurrentPageProperty = AvaloniaProperty.Register<Pagination, int>(
public static readonly StyledProperty<int?> CurrentPageProperty = AvaloniaProperty.Register<Pagination, int?>(
nameof(CurrentPage));
public int CurrentPage
public int? CurrentPage
{
get => GetValue(CurrentPageProperty);
set => SetValue(CurrentPageProperty, value);
@@ -121,40 +107,85 @@ public class Pagination: TemplatedControl
public static readonly StyledProperty<bool> ShowQuickJumpProperty = AvaloniaProperty.Register<Pagination, bool>(
nameof(ShowQuickJump));
public bool ShowQuickJump
{
get => GetValue(ShowQuickJumpProperty);
set => SetValue(ShowQuickJumpProperty, value);
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
static Pagination()
{
base.OnPropertyChanged(change);
// When page size is updated, the selected current page must be updated.
if (change.Property == PageSizeProperty)
PageSizeProperty.Changed.AddClassHandler<Pagination, int>((pagination, args)=>pagination.OnPageSizeChanged(args));
CurrentPageProperty.Changed.AddClassHandler<Pagination, int?>((pagination, args) =>
pagination.UpdateButtonsByCurrentPage(args.NewValue.Value));
TotalCountProperty.Changed.AddClassHandler<Pagination, int>((pagination, args) =>
pagination.UpdateButtonsByCurrentPage(pagination.CurrentPage));
}
private void OnPageSizeChanged(AvaloniaPropertyChangedEventArgs<int> args)
{
int pageCount = TotalCount / args.NewValue.Value;
int residue = TotalCount % args.NewValue.Value;
if (residue > 0)
{
int oldPageSize = change.GetOldValue<int>();
int index = oldPageSize * CurrentPage;
UpdateButtons(index);
pageCount++;
}
else if (change.Property == TotalCountProperty || change.Property == CurrentPageProperty)
PageCount = pageCount;
if (CurrentPage > PageCount)
{
int index = PageSize * CurrentPage;
UpdateButtons(index);
CurrentPage = null;
}
UpdateButtonsByCurrentPage(CurrentPage);
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
Button.ClickEvent.AddHandler(OnButtonClick, _previousButton, _nextButton);
_previousButton = e.NameScope.Find<PaginationButton>(PART_PreviousButton);
_nextButton = e.NameScope.Find<PaginationButton>(PART_NextButton);
_buttonPanel = e.NameScope.Find<StackPanel>(PART_ButtonPanel);
Button.ClickEvent.AddHandler(OnButtonClick, _previousButton, _nextButton);
KeyDownEvent.RemoveHandler(OnQuickJumpInputKeyDown, _quickJumpInput);
LostFocusEvent.RemoveHandler(OnQuickJumpInputLostFocus, _quickJumpInput);
_quickJumpInput = e.NameScope.Find<NumericIntUpDown>(PART_QuickJumpInput);
KeyDownEvent.AddHandler(OnQuickJumpInputKeyDown, _quickJumpInput);
LostFocusEvent.AddHandler(OnQuickJumpInputLostFocus, _quickJumpInput);
InitializePanelButtons();
UpdateButtonsByCurrentPage(0);
}
private void OnQuickJumpInputKeyDown(object sender, KeyEventArgs e)
{
if (e.Key is Key.Enter or Key.Return)
{
SyncQuickJumperValue();
}
}
private void OnQuickJumpInputLostFocus(object sender, RoutedEventArgs e)
{
SyncQuickJumperValue();
}
private void SyncQuickJumperValue()
{
if (_quickJumpInput is null) return;
var value = _quickJumpInput?.Value;
if (value is null) return;
value = Clamp(value.Value, 1, PageCount);
SetCurrentValue(CurrentPageProperty, value);
_quickJumpInput?.SetCurrentValue(NumericIntUpDown.ValueProperty, null);
}
private void OnButtonClick(object? sender, RoutedEventArgs e)
{
if (Equals(sender, _previousButton))
{
AddCurrentPage(-1);
}
else
{
AddCurrentPage(1);
}
var diff = Equals(sender, _previousButton) ? -1 : 1;
AddCurrentPage(diff);
}
private void InitializePanelButtons()
@@ -166,7 +197,7 @@ public class Pagination: TemplatedControl
var button = new PaginationButton() { Page = i, IsVisible = true };
_buttonPanel.Children.Add(button);
_buttons![i - 1] = button;
button.Click+= OnPageButtonClick;
Button.ClickEvent.AddHandler(OnPageButtonClick, button);
}
}
@@ -191,30 +222,32 @@ public class Pagination: TemplatedControl
private void AddCurrentPage(int pageChange)
{
int newValue = CurrentPage + pageChange;
if (newValue <= 0) newValue = 1;
else if(newValue>=PageCount) newValue = PageCount;
CurrentPage = newValue;
int newValue = (CurrentPage ?? 0) + pageChange;
newValue = Clamp(newValue, 1, PageCount);
; SetCurrentValue(CurrentPageProperty, newValue);
}
private void UpdateButtons(int index)
private int Clamp(int value, int min, int max)
{
return value < min ? min : value > max ? max : value;
}
/// <summary>
/// Update Button Content and Visibility by current page.
/// </summary>
/// <param name="page"></param>
private void UpdateButtonsByCurrentPage(int? page)
{
if (_buttonPanel is null) return;
if (PageSize == 0) return;
int currentIndex = index;
int? currentPage = CurrentPage;
int pageCount = TotalCount / PageSize;
int residue = TotalCount % PageSize;
if (residue > 0)
{
pageCount++;
}
PageCount = pageCount;
int currentPage = currentIndex/ PageSize;
if (currentPage == 0) currentPage++;
if (pageCount <= 7)
{
@@ -237,9 +270,8 @@ public class Pagination: TemplatedControl
{
_buttons[i].IsVisible = true;
}
int mid = currentPage;
if (mid < 4) mid = 4;
else if (mid > pageCount - 3) mid = pageCount - 3;
int mid = currentPage ?? 0;
mid = Clamp(mid, 4, pageCount - 3);
_buttons[3].Page = mid;
_buttons[2].Page = mid - 1;
_buttons[4].Page = mid + 1;
@@ -247,7 +279,7 @@ public class Pagination: TemplatedControl
_buttons[6].Page = pageCount;
if(mid>4)
{
_buttons[1].SetStatus(0, false, true, false);
_buttons[1].SetStatus(-1, false, true, false);
}
else
{
@@ -255,7 +287,7 @@ public class Pagination: TemplatedControl
}
if(mid<pageCount-3)
{
_buttons[5].SetStatus(0, false, false, true);
_buttons[5].SetStatus(-1, false, false, true);
}
else
{
@@ -275,8 +307,9 @@ public class Pagination: TemplatedControl
}
}
CurrentPage = currentPage;
if (_previousButton != null) _previousButton.IsEnabled = CurrentPage > 1;
if( _nextButton!=null) _nextButton.IsEnabled = CurrentPage < PageCount;
PageCount = pageCount;
SetCurrentValue(CurrentPageProperty, currentPage);
if (_previousButton != null) _previousButton.IsEnabled = (CurrentPage??int.MaxValue) > 1;
if (_nextButton != null) _nextButton.IsEnabled = (CurrentPage ?? 0) < PageCount;
}
}