From 595f5c19b1f5d7252bfb906a1e5adab27b426b65 Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 15 Mar 2023 21:00:31 +0800 Subject: [PATCH] =?UTF-8?q?*=20UIPage:=20=E9=87=8D=E6=96=B0=E6=A2=B3?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Controls/UITabControl.cs | 17 +---------------- SunnyUI/Frames/UIPage.cs | 3 ++- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/SunnyUI/Controls/UITabControl.cs b/SunnyUI/Controls/UITabControl.cs index fbdf460e..1b6fdef7 100644 --- a/SunnyUI/Controls/UITabControl.cs +++ b/SunnyUI/Controls/UITabControl.cs @@ -938,22 +938,7 @@ namespace Sunny.UI if (SelectedIndex >= 0) { - List pages; - //if (LastIndex != SelectedIndex) - //{ - // if (LastIndex >= 0 && TabPages.Count > 0 && LastIndex < TabPages.Count) - // { - // pages = TabPages[LastIndex].GetControls(); - // foreach (var page in pages) - // { - // page.Final(); - // } - // } - // - // LastIndex = SelectedIndex; - //} - - pages = TabPages[SelectedIndex].GetControls(); + List pages = TabPages[SelectedIndex].GetControls(); foreach (var page in pages) { page.ReLoad(); diff --git a/SunnyUI/Frames/UIPage.cs b/SunnyUI/Frames/UIPage.cs index 30fa70f5..751c59f1 100644 --- a/SunnyUI/Frames/UIPage.cs +++ b/SunnyUI/Frames/UIPage.cs @@ -35,6 +35,7 @@ * 2022-10-28: V3.2.6 标题栏增加扩展按钮 * 2023-02-24: V3.3.2 增加PageDeselecting,取消页面选择时增加判断 * 2023-02-24: V3.3.2 取消设计期的Dock.Fill,改为运行时设置 + * 2023-03-15: V3.3.3 重新梳理页面加载顺序 ******************************************************************************/ using System; @@ -505,7 +506,7 @@ namespace Sunny.UI IsShown = true; } - public void ReLoad() + internal void ReLoad() { if (IsShown) {