* UIForm: 优化UIPage的Init和Final加载逻辑
* UITabControl: 优化UIPage的Init和Final加载逻辑
This commit is contained in:
parent
8fdf05c475
commit
9dd5b99cf0
@ -360,6 +360,8 @@ namespace Sunny.UI
|
|||||||
return CreateTabIfNotExists(new NavMenuItem("", guid));
|
return CreateTabIfNotExists(new NavMenuItem("", guid));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public event TabPageAndUIPageEventHandler TabPageAndUIPageChanged;
|
||||||
|
|
||||||
public bool SelectPage(int pageIndex)
|
public bool SelectPage(int pageIndex)
|
||||||
{
|
{
|
||||||
if (pageIndex < 0)
|
if (pageIndex < 0)
|
||||||
@ -381,6 +383,7 @@ namespace Sunny.UI
|
|||||||
if (tabControl.TabPages.Contains(item.Key))
|
if (tabControl.TabPages.Contains(item.Key))
|
||||||
{
|
{
|
||||||
tabControl.SelectTab(item.Key);
|
tabControl.SelectTab(item.Key);
|
||||||
|
TabPageAndUIPageChanged?.Invoke(this, new TabPageAndUIPageArgs(item.Key, item.Value.PageIndex, item.Value.PageGuid));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -410,6 +413,7 @@ namespace Sunny.UI
|
|||||||
if (tabControl.TabPages.Contains(item.Key))
|
if (tabControl.TabPages.Contains(item.Key))
|
||||||
{
|
{
|
||||||
tabControl.SelectTab(item.Key);
|
tabControl.SelectTab(item.Key);
|
||||||
|
TabPageAndUIPageChanged?.Invoke(this, new TabPageAndUIPageArgs(item.Key, item.Value.PageIndex, item.Value.PageGuid));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -614,4 +618,21 @@ namespace Sunny.UI
|
|||||||
Text = text;
|
Text = text;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class TabPageAndUIPageArgs : EventArgs
|
||||||
|
{
|
||||||
|
public TabPage TabPage { get; set; }
|
||||||
|
|
||||||
|
public int PageIndex { get; set; }
|
||||||
|
public Guid PageGuid { get; set; }
|
||||||
|
|
||||||
|
public TabPageAndUIPageArgs(TabPage tabPage, int pageIndex, Guid pageGuid)
|
||||||
|
{
|
||||||
|
TabPage = tabPage;
|
||||||
|
PageIndex = pageIndex;
|
||||||
|
PageGuid = pageGuid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public delegate void TabPageAndUIPageEventHandler(object sender, TabPageAndUIPageArgs e);
|
||||||
}
|
}
|
@ -32,6 +32,7 @@
|
|||||||
* 2022-06-19: V3.2.0 多页面框架关闭页面时执行UIPage的FormClosed事件
|
* 2022-06-19: V3.2.0 多页面框架关闭页面时执行UIPage的FormClosed事件
|
||||||
* 2023-05-12: V3.3.6 重构DrawString函数
|
* 2023-05-12: V3.3.6 重构DrawString函数
|
||||||
* 2023-11-06: V3.5.2 重构主题
|
* 2023-11-06: V3.5.2 重构主题
|
||||||
|
* 2023-12-13: V3.6.2 优化UIPage的Init和Final加载逻辑
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
using Sunny.UI.Win32;
|
using Sunny.UI.Win32;
|
||||||
@ -67,6 +68,7 @@ namespace Sunny.UI
|
|||||||
Version = UIGlobal.Version;
|
Version = UIGlobal.Version;
|
||||||
|
|
||||||
Helper = new UITabControlHelper(this);
|
Helper = new UITabControlHelper(this);
|
||||||
|
Helper.TabPageAndUIPageChanged += Helper_TabPageAndUIPageChanged;
|
||||||
timer = new Timer();
|
timer = new Timer();
|
||||||
timer.Interval = 500;
|
timer.Interval = 500;
|
||||||
timer.Tick += Timer_Tick;
|
timer.Tick += Timer_Tick;
|
||||||
@ -79,6 +81,13 @@ namespace Sunny.UI
|
|||||||
_fillColor = UIStyles.Blue.TabControlBackColor;
|
_fillColor = UIStyles.Blue.TabControlBackColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Helper_TabPageAndUIPageChanged(object sender, TabPageAndUIPageArgs e)
|
||||||
|
{
|
||||||
|
TabPageAndUIPageChanged?.Invoke(this, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
public event TabPageAndUIPageEventHandler TabPageAndUIPageChanged;
|
||||||
|
|
||||||
[Browsable(false), DefaultValue(null)]
|
[Browsable(false), DefaultValue(null)]
|
||||||
public IFrame Frame
|
public IFrame Frame
|
||||||
{
|
{
|
||||||
|
120
SunnyUI/Controls/UITabControl.resx
Normal file
120
SunnyUI/Controls/UITabControl.resx
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
@ -52,6 +52,7 @@
|
|||||||
* 2023-11-05: V3.5.2 重构主题
|
* 2023-11-05: V3.5.2 重构主题
|
||||||
* 2023-11-19: V3.5.2 修改默认ShowShadow边框阴影打开,ShowRadius显示圆角关闭
|
* 2023-11-19: V3.5.2 修改默认ShowShadow边框阴影打开,ShowRadius显示圆角关闭
|
||||||
* 2023-12-04: V3.6.1 修复修改Style后,BackColor未保存的问题
|
* 2023-12-04: V3.6.1 修复修改Style后,BackColor未保存的问题
|
||||||
|
* 2023-12-13: V3.6.2 优化UIPage的Init和Final加载逻辑
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
@ -2067,49 +2068,44 @@ namespace Sunny.UI
|
|||||||
|
|
||||||
mainTabControl.PageAdded += DealPageAdded;
|
mainTabControl.PageAdded += DealPageAdded;
|
||||||
mainTabControl.PageRemoved += DealPageRemoved;
|
mainTabControl.PageRemoved += DealPageRemoved;
|
||||||
mainTabControl.Selecting += MainTabControl_Selecting;
|
mainTabControl.Selected += MainTabControl_Selected;
|
||||||
mainTabControl.VisibleChanged += MainTabControl_VisibleChanged;
|
mainTabControl.Deselected += MainTabControl_Deselected;
|
||||||
|
mainTabControl.TabPageAndUIPageChanged += MainTabControl_TabPageAndUIPageChanged;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MainTabControl_VisibleChanged(object sender, EventArgs e)
|
private void MainTabControl_TabPageAndUIPageChanged(object sender, TabPageAndUIPageArgs e)
|
||||||
{
|
{
|
||||||
if (SelectedPage == null)
|
|
||||||
{
|
|
||||||
List<UIPage> pages = mainTabControl.SelectedTab.GetControls<UIPage>();
|
|
||||||
if (pages.Count == 1)
|
|
||||||
{
|
|
||||||
SelectedPage = pages[0];
|
|
||||||
PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SelectedPage = null;
|
|
||||||
PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void MainTabControl_Selecting(object sender, TabControlCancelEventArgs e)
|
|
||||||
{
|
|
||||||
if (SelectedPage != null)
|
|
||||||
SelectedPage.Final();
|
|
||||||
|
|
||||||
List<UIPage> pages = e.TabPage.GetControls<UIPage>();
|
List<UIPage> pages = e.TabPage.GetControls<UIPage>();
|
||||||
if (pages.Count == 1)
|
SelectedPage = pages.Count == 1 ? pages[0] : null;
|
||||||
{
|
|
||||||
SelectedPage = pages[0];
|
|
||||||
PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SelectedPage = null;
|
|
||||||
PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void MainTabControl_Deselected(object sender, TabControlEventArgs e)
|
||||||
|
{
|
||||||
|
List<UIPage> pages = e.TabPage.GetControls<UIPage>();
|
||||||
|
if (pages.Count == 1) pages[0].Final();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void MainTabControl_Selected(object sender, TabControlEventArgs e)
|
||||||
|
{
|
||||||
|
List<UIPage> pages = e.TabPage.GetControls<UIPage>();
|
||||||
|
SelectedPage = pages.Count == 1 ? pages[0] : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private UIPage selectedPage = null;
|
||||||
[Browsable(false)]
|
[Browsable(false)]
|
||||||
public UIPage SelectedPage { get; private set; }
|
public UIPage SelectedPage
|
||||||
|
{
|
||||||
|
get => selectedPage;
|
||||||
|
private set
|
||||||
|
{
|
||||||
|
if (selectedPage != value)
|
||||||
|
{
|
||||||
|
selectedPage = value;
|
||||||
|
PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public event OnUIPageChanged PageSelected;
|
public event OnUIPageChanged PageSelected;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user