From fcf32c2aed6a83904576016b1a113ec9972f00b5 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 22 七月 2024 15:00:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs b/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs
index fe9089b..081bbd5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs
@@ -38,12 +38,12 @@
{
if (page == this.SelectedPage)
{
- this.SelectedPageStateChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ TriggerSelectedPageStateChangedEvent();
}
};
}
_selectedIndex = 0;
- this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ TriggerSelectedPageChangedEvent();
this.SelectedPage.InitialPage(_vm);
}
else
@@ -65,7 +65,7 @@
/// <summary>
/// vm瀵硅薄
/// </summary>
- protected readonly T _vm = new T();
+ protected readonly T _vm = new();
#endregion
@@ -93,6 +93,7 @@
{
get { return _selectedIndex; }
}
+
/// <summary>
/// 閫夋嫨绱㈠紩
/// </summary>
@@ -118,7 +119,7 @@
if (this.SelectedPage.CanPrev())
{
--_selectedIndex;
- this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ TriggerSelectedPageChangedEvent();
this.SelectedPage.InitialPage(_vm);
return true;
}
@@ -141,7 +142,7 @@
if (this.SelectedPage.CanNext())
{
++_selectedIndex;
- this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ TriggerSelectedPageChangedEvent();
this.SelectedPage.InitialPage(_vm);
return true;
}
@@ -190,6 +191,26 @@
#endregion
+ #region 鏂规硶
+
+ /// <summary>
+ /// 瑙﹀彂閫夋嫨椤甸潰鏀瑰彉浜嬩欢
+ /// </summary>
+ protected void TriggerSelectedPageChangedEvent()
+ {
+ this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ }
+
+ /// <summary>
+ /// 瑙﹀彂閫夋嫨椤甸潰鐘舵�佹敼鍙樹簨浠�
+ /// </summary>
+ protected void TriggerSelectedPageStateChangedEvent()
+ {
+ this.SelectedPageStateChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ }
+
+ #endregion
+
}
}
--
Gitblit v1.9.3