From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
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..b2b5557 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs
@@ -38,13 +38,13 @@
{
if (page == this.SelectedPage)
{
- this.SelectedPageStateChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
+ TriggerSelectedPageStateChangedEvent();
}
};
}
_selectedIndex = 0;
- this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
this.SelectedPage.InitialPage(_vm);
+ TriggerSelectedPageChangedEvent();
}
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,8 +119,8 @@
if (this.SelectedPage.CanPrev())
{
--_selectedIndex;
- this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
this.SelectedPage.InitialPage(_vm);
+ TriggerSelectedPageChangedEvent();
return true;
}
return false;
@@ -141,8 +142,8 @@
if (this.SelectedPage.CanNext())
{
++_selectedIndex;
- this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
this.SelectedPage.InitialPage(_vm);
+ TriggerSelectedPageChangedEvent();
return true;
}
return false;
@@ -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