diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj index e3aad5f..a6f2cae 100644 --- a/AntdUIDemo.csproj +++ b/AntdUIDemo.csproj @@ -30,7 +30,7 @@ - + diff --git a/Controls/SystemSet.cs b/Controls/SystemSet.cs index cce6e25..94f3357 100644 --- a/Controls/SystemSet.cs +++ b/Controls/SystemSet.cs @@ -69,49 +69,49 @@ namespace AntdUIDemo.Controls } #region 事件 - private void Select_colormode_SelectedIndexChanged(object sender, int value) + private void Select_colormode_SelectedIndexChanged(object sender, IntEventArgs e) { AppSetting.UpdateAppSetting("ColorMode", select_colormode.SelectedValue.ToString()); - if (value == 0) + if (e.Value == 0) { ThemeHelper.SetColorMode(Window, ThemeHelper.IsLightMode()); } else { - ThemeHelper.SetColorMode(Window, value == 1); + ThemeHelper.SetColorMode(Window, e.Value == 1); } } - private void switch_animation_CheckedChanged(object sender, bool value) + private void switch_animation_CheckedChanged(object sender, BoolEventArgs e) { AppSetting.UpdateAppSetting("Animation", switch_animation.Checked.ToString()); - AntdUI.Config.Animation = value; + AntdUI.Config.Animation = e.Value; } - private void Input_offset_ValueChanged(object sender, decimal value) + private void Input_offset_ValueChanged(object sender, DecimalEventArgs e) { AppSetting.UpdateAppSetting("ShowOffset", input_offset.Value.ToString()); - AntdUI.Config.NoticeWindowOffsetXY = (int)value; + AntdUI.Config.NoticeWindowOffsetXY = (int)e.Value; } - private void switch_showinwindow_CheckedChanged(object sender, bool value) + private void switch_showinwindow_CheckedChanged(object sender, BoolEventArgs e) { - AppSetting.UpdateAppSetting("ShowInWindow", value ? "True" : "False"); - AntdUI.Config.ShowInWindow = value; + AppSetting.UpdateAppSetting("ShowInWindow", e.Value ? "True" : "False"); + AntdUI.Config.ShowInWindow = e.Value; AntdUI.Message.success(Window, "切换成功!", autoClose: 1); AntdUI.Notification.success(Window, "提示", "切换成功!", autoClose: 1); } - private void switch_scrollbar_CheckedChanged(object sender, bool value) + private void switch_scrollbar_CheckedChanged(object sender, BoolEventArgs e) { - AppSetting.UpdateAppSetting("ScrollBarHide", value ? "True" : "False"); - AntdUI.Config.ScrollBarHide = value; + AppSetting.UpdateAppSetting("ScrollBarHide", e.Value ? "True" : "False"); + AntdUI.Config.ScrollBarHide = e.Value; } - private void switch_shadow_CheckedChanged(object sender, bool value) + private void switch_shadow_CheckedChanged(object sender, BoolEventArgs e) { - AppSetting.UpdateAppSetting("ShadowEnabled", value ? "True" : "False"); - AntdUI.Config.ShadowEnabled = value; + AppSetting.UpdateAppSetting("ShadowEnabled", e.Value ? "True" : "False"); + AntdUI.Config.ShadowEnabled = e.Value; } #endregion diff --git a/MainWindow.cs b/MainWindow.cs index dec1e97..0ac2661 100644 --- a/MainWindow.cs +++ b/MainWindow.cs @@ -124,9 +124,9 @@ namespace AntdUIDemo } - private void Menu_SelectChanged(object sender, AntdUI.MenuItem item) + private void Menu_SelectChanged(object sender, MenuSelectEventArgs e) { - var name = item.Tag; + var name = e.Value.Tag; if (control != null) { if (control is FloatButtonDemo floatButtonDemo) diff --git a/Views/FloatButtonDemo.cs b/Views/FloatButtonDemo.cs index 8157632..1386e3b 100644 --- a/Views/FloatButtonDemo.cs +++ b/Views/FloatButtonDemo.cs @@ -165,13 +165,13 @@ namespace AntdUIDemo.Views } #region EventHandler - private void select_intvalue_SelectedIndexChanged(object sender, int value) + private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { CloseFloatButtonForm(); LoadFloatButton(); } - private void colorPicker_ValueChanged(object sender, Color value) + private void colorPicker_ValueChanged(object sender, ColorEventArgs e) { CloseFloatButtonForm(); LoadFloatButton(); @@ -183,7 +183,7 @@ namespace AntdUIDemo.Views LoadFloatButton(); } - private void input_decimalvalue_ValeChanged(object sender, decimal value) + private void input_decimalvalue_ValeChanged(object sender, DecimalEventArgs e) { CloseFloatButtonForm(); LoadFloatButton(); diff --git a/Views/FlowPanelDemo.cs b/Views/FlowPanelDemo.cs index eb7a623..eb5614d 100644 --- a/Views/FlowPanelDemo.cs +++ b/Views/FlowPanelDemo.cs @@ -83,13 +83,13 @@ namespace AntdUIDemo.Views } } #region 事件 - private void select_intvalue_SelectedIndexChanged(object sender, int value) + private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { flowPanel.Align = (TAlignFlow)select_align.SelectedValue; flowPanel.AutoScroll = select_autoscroll.SelectedIndex == 0; } - private void input_gap_ValueChanged(object sender, decimal value) + private void input_gap_ValueChanged(object sender, DecimalEventArgs e) { flowPanel.Gap = (int)input_gap.Value; } diff --git a/Views/GridPanelDemo.cs b/Views/GridPanelDemo.cs index 5449551..99144a6 100644 --- a/Views/GridPanelDemo.cs +++ b/Views/GridPanelDemo.cs @@ -54,7 +54,7 @@ namespace AntdUIDemo.Views } #region 事件 - private void input_gap_ValueChanged(object sender, decimal value) + private void input_gap_ValueChanged(object sender, DecimalEventArgs e) { LoadGridPanel(input_span.Text, input_gap.Value); } diff --git a/Views/MenuDemo.cs b/Views/MenuDemo.cs index 41a1a9d..48acbec 100644 --- a/Views/MenuDemo.cs +++ b/Views/MenuDemo.cs @@ -47,17 +47,17 @@ namespace AntdUIDemo.Views LoadMenu(); } - private void ColorPicker_ValueChanged(object sender, Color value) + private void ColorPicker_ValueChanged(object sender, ColorEventArgs e) { LoadMenu(); } - private void Input_decimal_ValueChanged(object sender, decimal value) + private void Input_decimal_ValueChanged(object sender, DecimalEventArgs e) { LoadMenu(); } - private void select_intvalue_SelectedIndexChanged(object sender, int value) + private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { LoadMenu(); } diff --git a/Views/PaginationDemo.cs b/Views/PaginationDemo.cs index eb601fe..ec0b014 100644 --- a/Views/PaginationDemo.cs +++ b/Views/PaginationDemo.cs @@ -1,4 +1,5 @@ -using System; +using AntdUI; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,6 +13,8 @@ namespace AntdUIDemo.Views { public partial class PaginationDemo : UserControl { + private int selectMultiple_SelectedIndexChanged; + public PaginationDemo() { InitializeComponent(); @@ -44,12 +47,12 @@ namespace AntdUIDemo.Views pagination.ValueChanged += Pagination_ValueChanged; } - private void Pagination_ValueChanged(int current, int total, int pageSize, int pageTotal) + private void Pagination_ValueChanged(object sender, PagePageEventArgs e) { //与分页交互修改输入值 - input_current.Value = current; - input_total.Value = total; - input_pagesize.Value = pageSize; + input_current.Value = e.Current; + input_total.Value = e.Total; + input_pagesize.Value = e.PageSize; } private void ButtonCZ_Click(object sender, EventArgs e) @@ -58,17 +61,17 @@ namespace AntdUIDemo.Views LoadPagination(); } - private void SelectMultiple_SelectedValueChanged(object sender, object[] value) + private void SelectMultiple_SelectedValueChanged(object sender, ObjectsEventArgs e) { LoadPagination(); } - private void switch_CheckedChanged(object sender, bool value) + private void switch_CheckedChanged(object sender, BoolEventArgs value) { LoadPagination(); } - private void colorPicker_ValueChanged(object sender, Color value) + private void colorPicker_ValueChanged(object sender, ColorEventArgs e) { LoadPagination(); } @@ -78,7 +81,7 @@ namespace AntdUIDemo.Views LoadPagination(); } - private void input_decimal_ValueChanged(object sender, decimal value) + private void input_decimal_ValueChanged(object sender, DecimalEventArgs e) { LoadPagination(); } diff --git a/Views/PanelDemo.cs b/Views/PanelDemo.cs index f3fd64f..aadc243 100644 --- a/Views/PanelDemo.cs +++ b/Views/PanelDemo.cs @@ -95,17 +95,17 @@ namespace AntdUIDemo.Views #region 控件事件 - private void colorPicker_ValueChanged(object sender, Color value) + private void colorPicker_ValueChanged(object sender, ColorEventArgs e) { LoadPanel(); } - private void input_decimalvalue_ValueChanged(object sender, decimal value) + private void input_decimalvalue_ValueChanged(object sender, DecimalEventArgs e) { LoadPanel(); } - private void select_intvalue_SelectedIndexChanged(object sender, int value) + private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { LoadPanel(); } diff --git a/Views/StackPanelDemo.cs b/Views/StackPanelDemo.cs index 5fbc5a4..b5ae689 100644 --- a/Views/StackPanelDemo.cs +++ b/Views/StackPanelDemo.cs @@ -79,12 +79,12 @@ namespace AntdUIDemo.Views stackPanel.ItemSize = input_itemsize.Text; } - private void input_gap_ValueChanged(object sender, decimal value) + private void input_gap_ValueChanged(object sender, DecimalEventArgs e) { stackPanel.Gap = (int)input_gap.Value; } - private void select_intvalue_SelectedIndexChanged(object sender, int value) + private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { stackPanel.AutoScroll = select_autoscroll.SelectedIndex == 0; stackPanel.Vertical = select_vertical.SelectedIndex == 0; @@ -105,7 +105,7 @@ namespace AntdUIDemo.Views { Margin = new Padding(0), Padding = new Padding(3), - Text = $"Button{stackPanel.Controls.Count+1}", + Text = $"Button{stackPanel.Controls.Count + 1}", Type = TTypeMini.Primary, WaveSize = 0, Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(134))), diff --git a/Views/StepsDemo.cs b/Views/StepsDemo.cs index 9ac9ce1..bac63ac 100644 --- a/Views/StepsDemo.cs +++ b/Views/StepsDemo.cs @@ -54,12 +54,12 @@ namespace AntdUIDemo.Views steph.Status = (TStepState)select_Status.SelectedValue; stepsv.Status = steph.Status; } - private void Input_decimalvalue_ValeChanged(object sender, decimal value) + private void Input_decimalvalue_ValeChanged(object sender, DecimalEventArgs e) { LoadSteps(); } - private void select_intvalue_SelectedIndexChanged(object sender, int value) + private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { LoadSteps(); }