diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj
index 927eedf..ef51d44 100644
--- a/AntdUIDemo.csproj
+++ b/AntdUIDemo.csproj
@@ -13,7 +13,7 @@
Copyright © 2025 czz_y
$(Version)
$(Version)
- 1.8.9
+ 1.9.11
czz_y
基于 Winform UI 框架 AntdUI 设计的 Demo
https://gitee.com/mubaiyanghua/antd-uidemo
@@ -30,7 +30,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/MainWindow.Designer.cs b/MainWindow.Designer.cs
index 542f39f..5c53f33 100644
--- a/MainWindow.Designer.cs
+++ b/MainWindow.Designer.cs
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
- AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard();
+ AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard();
this.titlebar = new AntdUI.PageHeader();
this.input_search = new AntdUI.Input();
this.dropdown_translate = new AntdUI.Dropdown();
@@ -63,7 +63,7 @@
this.titlebar.Size = new System.Drawing.Size(1024, 40);
this.titlebar.SubText = "Demo";
this.titlebar.TabIndex = 0;
- this.titlebar.Text = "AntdUI 1.8.9";
+ this.titlebar.Text = "AntdUI 1.9.11";
//
// input_search
//
@@ -129,6 +129,7 @@
this.pageHeader1.Name = "pageHeader1";
this.pageHeader1.Size = new System.Drawing.Size(1024, 40);
this.pageHeader1.TabIndex = 7;
+ this.pageHeader1.UseLeftMargin = false;
//
// button_collapse
//
@@ -146,6 +147,7 @@
//
// tabs
//
+ this.tabs.Controls.Add(this.tabPage);
this.tabs.Cursor = System.Windows.Forms.Cursors.Default;
this.tabs.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabs.Gap = 20;
@@ -153,8 +155,8 @@
this.tabs.Name = "tabs";
this.tabs.Pages.Add(this.tabPage);
this.tabs.Size = new System.Drawing.Size(954, 560);
- styleCard2.Closable = true;
- this.tabs.Style = styleCard2;
+ styleCard1.Closable = true;
+ this.tabs.Style = styleCard1;
this.tabs.TabIndex = 9;
this.tabs.Type = AntdUI.TabType.Card;
//
diff --git a/MainWindow.cs b/MainWindow.cs
index 026e986..82d0936 100644
--- a/MainWindow.cs
+++ b/MainWindow.cs
@@ -47,7 +47,7 @@ namespace AntdUIDemo
//初始化消息弹出位置
Config.ShowInWindow = true;
- UserControl control = new Wellcome { Dock = DockStyle.Fill };
+ UserControl control = new Wellcome(this) { Dock = DockStyle.Fill };
AutoDpi(control);
panel_content.Controls.Add(control);
diff --git a/README-en.md b/README-en.md
index ccfd8c1..5c1f195 100644
--- a/README-en.md
+++ b/README-en.md
@@ -4,7 +4,7 @@
AntdUI Demo
-This project is developed based on `Winform .NET Framework 4.8`, and is a demo project of [AntdUI](https://gitee.com/antdui/AntdUI), the current version is `1.8.9`
+This project is developed based on `Winform .NET Framework 4.8`, and is a demo project of [AntdUI](https://gitee.com/antdui/AntdUI), the current version is `1.9.11`
diff --git a/README.md b/README.md
index 1ef8c38..b04d947 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
AntdUI Demo
-本项目基于 `Winform .NET Framework 4.8` 开发，是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目，当前版本 `1.8.9`
+本项目基于 `Winform .NET Framework 4.8` 开发，是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目，当前版本 `1.9.11`
diff --git a/Views/SplitterDemo.Designer.cs b/Views/SplitterDemo.Designer.cs
index 711a530..cdce4f4 100644
--- a/Views/SplitterDemo.Designer.cs
+++ b/Views/SplitterDemo.Designer.cs
@@ -29,13 +29,13 @@
private void InitializeComponent()
{
this.header1 = new AntdUI.PageHeader();
- this.splitter1 = new AntdUI.Splitter();
- this.button1 = new AntdUI.Button();
- this.button2 = new AntdUI.Button();
- ((System.ComponentModel.ISupportInitialize)(this.splitter1)).BeginInit();
- this.splitter1.Panel1.SuspendLayout();
- this.splitter1.Panel2.SuspendLayout();
- this.splitter1.SuspendLayout();
+ this.splitter = new AntdUI.Splitter();
+ this.button3 = new AntdUI.Button();
+ this.button4 = new AntdUI.Button();
+ ((System.ComponentModel.ISupportInitialize)(this.splitter)).BeginInit();
+ this.splitter.Panel1.SuspendLayout();
+ this.splitter.Panel2.SuspendLayout();
+ this.splitter.SuspendLayout();
this.SuspendLayout();
//
// header1
@@ -52,57 +52,61 @@
this.header1.Text = "Splitter 分隔面板";
this.header1.UseTitleFont = true;
//
- // splitter1
+ // splitter
//
- this.splitter1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitter1.Location = new System.Drawing.Point(0, 74);
- this.splitter1.Name = "splitter1";
+ this.splitter.CollapsePanel = AntdUI.Splitter.ADCollapsePanel.Panel1;
+ this.splitter.Cursor = System.Windows.Forms.Cursors.Default;
+ this.splitter.Dock = System.Windows.Forms.DockStyle.Top;
+ this.splitter.Location = new System.Drawing.Point(0, 74);
+ this.splitter.Name = "splitter";
//
- // splitter1.Panel1
+ // splitter.Panel1
//
- this.splitter1.Panel1.Controls.Add(this.button1);
+ this.splitter.Panel1.Controls.Add(this.button3);
+ this.splitter.Panel1MinSize = 0;
//
- // splitter1.Panel2
+ // splitter.Panel2
//
- this.splitter1.Panel2.Controls.Add(this.button2);
- this.splitter1.Size = new System.Drawing.Size(750, 457);
- this.splitter1.SplitterDistance = 264;
- this.splitter1.SplitterSize = 30;
- this.splitter1.TabIndex = 31;
+ this.splitter.Panel2.Controls.Add(this.button4);
+ this.splitter.Size = new System.Drawing.Size(750, 209);
+ this.splitter.SplitterDistance = 262;
+ this.splitter.SplitterSize = 30;
+ this.splitter.SplitterWidth = 10;
+ this.splitter.TabIndex = 32;
//
- // button1
+ // button3
//
- this.button1.Dock = System.Windows.Forms.DockStyle.Top;
- this.button1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(0, 0);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(264, 45);
- this.button1.TabIndex = 0;
- this.button1.Text = "Button";
- this.button1.Type = AntdUI.TTypeMini.Primary;
+ this.button3.Dock = System.Windows.Forms.DockStyle.Top;
+ this.button3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button3.Location = new System.Drawing.Point(0, 0);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(262, 45);
+ this.button3.TabIndex = 0;
+ this.button3.Text = "Button";
+ this.button3.Type = AntdUI.TTypeMini.Primary;
//
- // button2
+ // button4
//
- this.button2.Dock = System.Windows.Forms.DockStyle.Top;
- this.button2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(0, 0);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(482, 45);
- this.button2.TabIndex = 1;
- this.button2.Text = "Button";
- this.button2.Type = AntdUI.TTypeMini.Warn;
+ this.button4.Dock = System.Windows.Forms.DockStyle.Top;
+ this.button4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button4.Location = new System.Drawing.Point(0, 0);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(478, 45);
+ this.button4.TabIndex = 1;
+ this.button4.Text = "Button";
+ this.button4.Type = AntdUI.TTypeMini.Warn;
//
// SplitterDemo
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
- this.Controls.Add(this.splitter1);
+ this.Controls.Add(this.splitter);
this.Controls.Add(this.header1);
this.Name = "SplitterDemo";
this.Size = new System.Drawing.Size(750, 531);
- this.splitter1.Panel1.ResumeLayout(false);
- this.splitter1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitter1)).EndInit();
- this.splitter1.ResumeLayout(false);
+ this.splitter.Panel1.ResumeLayout(false);
+ this.splitter.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitter)).EndInit();
+ this.splitter.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -110,8 +114,8 @@
#endregion
private AntdUI.PageHeader header1;
- private AntdUI.Splitter splitter1;
- private AntdUI.Button button1;
- private AntdUI.Button button2;
+ private AntdUI.Splitter splitter;
+ private AntdUI.Button button4;
+ private AntdUI.Button button3;
}
}
diff --git a/Views/SubView/Wellcome.Designer.cs b/Views/SubView/Wellcome.Designer.cs
index da675f7..13bd9f9 100644
--- a/Views/SubView/Wellcome.Designer.cs
+++ b/Views/SubView/Wellcome.Designer.cs
@@ -40,7 +40,6 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(750, 150);
this.label1.TabIndex = 0;
- this.label1.Text = "欢迎使用 AntdUI Demo";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// Wellcome
@@ -48,6 +47,7 @@
this.Controls.Add(this.label1);
this.Name = "Wellcome";
this.Size = new System.Drawing.Size(750, 150);
+ this.Load += new System.EventHandler(this.Wellcome_Load);
this.ResumeLayout(false);
}
diff --git a/Views/SubView/Wellcome.cs b/Views/SubView/Wellcome.cs
index 2d85946..3921b47 100644
--- a/Views/SubView/Wellcome.cs
+++ b/Views/SubView/Wellcome.cs
@@ -1,12 +1,35 @@
-using System.Windows.Forms;
+using AntdUI;
+using System.Drawing;
+using System.Threading;
+using System.Windows.Forms;
namespace AntdUIDemo.Views.SubView
{
public partial class Wellcome : UserControl
{
- public Wellcome()
+ private AntdUI.Window window;
+ public Wellcome(AntdUI.Window _window)
{
+ window = _window;
InitializeComponent();
}
+
+ private void Wellcome_Load(object sender, System.EventArgs e)
+ {
+ AntdUI.Spin.open(window, new AntdUI.Spin.Config()
+ {
+ Radius = 6,
+ Font = new Font("Microsoft YaHei UI", 12f),//字体可以控制进度圈的大小
+ }, (config) =>
+ {
+ config.Text = "LOADING...";
+ //耗时代码，处理数据
+ Thread.Sleep(2000);
+ }, () =>
+ {
+ //结束时执行的代码
+ label1.Text = "欢迎使用 AntdUI Demo";
+ });
+ }
}
}
diff --git a/Views/TableDemo.Designer.cs b/Views/TableDemo.Designer.cs
index 56c55de..e4f0989 100644
--- a/Views/TableDemo.Designer.cs
+++ b/Views/TableDemo.Designer.cs
@@ -72,12 +72,13 @@
this.stackPanel1.Name = "stackPanel1";
this.stackPanel1.Padding = new System.Windows.Forms.Padding(3);
this.stackPanel1.Radius = 0;
- this.stackPanel1.Size = new System.Drawing.Size(750, 526);
+ this.stackPanel1.Size = new System.Drawing.Size(750, 565);
this.stackPanel1.TabIndex = 0;
this.stackPanel1.Text = "stackPanel1";
//
// table_base
//
+ this.table_base.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill;
this.table_base.Dock = System.Windows.Forms.DockStyle.Top;
this.table_base.EmptyHeader = true;
this.table_base.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -85,7 +86,6 @@
this.table_base.Location = new System.Drawing.Point(3, 103);
this.table_base.MultipleRows = true;
this.table_base.Name = "table_base";
- this.table_base.SelectedIndexs = new int[0];
this.table_base.ShowTip = false;
this.table_base.Size = new System.Drawing.Size(744, 417);
this.table_base.TabIndex = 30;
@@ -108,7 +108,6 @@
//
// checkbox_sort
//
- this.checkbox_sort.AutoCheck = true;
this.checkbox_sort.AutoSizeMode = AntdUI.TAutoSize.Auto;
this.checkbox_sort.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.checkbox_sort.Location = new System.Drawing.Point(467, 0);
@@ -120,7 +119,6 @@
//
// checkbox_rowstyle
//
- this.checkbox_rowstyle.AutoCheck = true;
this.checkbox_rowstyle.AutoSizeMode = AntdUI.TAutoSize.Auto;
this.checkbox_rowstyle.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.checkbox_rowstyle.Location = new System.Drawing.Point(388, 0);
@@ -132,7 +130,6 @@
//
// checkbox_border
//
- this.checkbox_border.AutoCheck = true;
this.checkbox_border.AutoSizeMode = AntdUI.TAutoSize.Auto;
this.checkbox_border.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.checkbox_border.Location = new System.Drawing.Point(285, 0);
@@ -144,7 +141,6 @@
//
// checkbox_columndragsort
//
- this.checkbox_columndragsort.AutoCheck = true;
this.checkbox_columndragsort.AutoSizeMode = AntdUI.TAutoSize.Auto;
this.checkbox_columndragsort.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.checkbox_columndragsort.Location = new System.Drawing.Point(182, 0);
@@ -156,7 +152,6 @@
//
// checkbox_visibleheader
//
- this.checkbox_visibleheader.AutoCheck = true;
this.checkbox_visibleheader.AutoSizeMode = AntdUI.TAutoSize.Auto;
this.checkbox_visibleheader.Checked = true;
this.checkbox_visibleheader.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
@@ -169,7 +164,6 @@
//
// checkbox_fixheader
//
- this.checkbox_fixheader.AutoCheck = true;
this.checkbox_fixheader.AutoSizeMode = AntdUI.TAutoSize.Auto;
this.checkbox_fixheader.Checked = true;
this.checkbox_fixheader.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
@@ -228,7 +222,7 @@
this.Controls.Add(this.stackPanel1);
this.Controls.Add(this.header1);
this.Name = "TableDemo";
- this.Size = new System.Drawing.Size(750, 600);
+ this.Size = new System.Drawing.Size(750, 639);
this.stackPanel1.ResumeLayout(false);
this.flowPanel1.ResumeLayout(false);
this.flowPanel1.PerformLayout();
diff --git a/Views/TableDemo.cs b/Views/TableDemo.cs
index e7fd004..bd1a4c7 100644
--- a/Views/TableDemo.cs
+++ b/Views/TableDemo.cs
@@ -63,6 +63,14 @@ namespace AntdUIDemo.Views
Fixed = true,//冻结列
},
};
+
+ //设置多表头
+ table_base.StackedHeaderRows = new StackedHeaderRow[]
+ {
+ new StackedHeaderRow(
+ new AntdUI.StackedColumn("Name,Address","个人信息").SetForeColor(Color.Red),
+ new AntdUI.StackedColumn("CellImages,CellTags","图标"))
+ };
}
private void BindEventHandler()
@@ -447,6 +455,11 @@ namespace AntdUIDemo.Views
//设置行禁用
table_base.SetRowEnable(0, false, true);
+
+ //竖向合并单元格
+ table_base.AddMergedRegion(new CellRange(2, 4, 3, 3));
+ //横向合并单元格
+ table_base.AddMergedRegion(new CellRange(5, 5, 1, 3));
}
}
}
diff --git a/Views/TabsDemo.Designer.cs b/Views/TabsDemo.Designer.cs
index 429cfff..58ab9f2 100644
--- a/Views/TabsDemo.Designer.cs
+++ b/Views/TabsDemo.Designer.cs
@@ -28,11 +28,11 @@
///
private void InitializeComponent()
{
- AntdUI.Tabs.StyleLine styleLine4 = new AntdUI.Tabs.StyleLine();
+ AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TabsDemo));
- AntdUI.Tabs.StyleLine styleLine5 = new AntdUI.Tabs.StyleLine();
- AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard();
- AntdUI.Tabs.StyleLine styleLine6 = new AntdUI.Tabs.StyleLine();
+ AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine();
+ AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard();
+ AntdUI.Tabs.StyleLine styleLine3 = new AntdUI.Tabs.StyleLine();
this.stackPanel1 = new AntdUI.StackPanel();
this.tabs_typeexceed = new AntdUI.Tabs();
this.tabPage10 = new AntdUI.TabPage();
@@ -118,6 +118,19 @@
//
// tabs_typeexceed
//
+ this.tabs_typeexceed.Controls.Add(this.tabPage10);
+ this.tabs_typeexceed.Controls.Add(this.tabPage11);
+ this.tabs_typeexceed.Controls.Add(this.tabPage12);
+ this.tabs_typeexceed.Controls.Add(this.tabPage13);
+ this.tabs_typeexceed.Controls.Add(this.tabPage14);
+ this.tabs_typeexceed.Controls.Add(this.tabPage15);
+ this.tabs_typeexceed.Controls.Add(this.tabPage16);
+ this.tabs_typeexceed.Controls.Add(this.tabPage17);
+ this.tabs_typeexceed.Controls.Add(this.tabPage18);
+ this.tabs_typeexceed.Controls.Add(this.tabPage19);
+ this.tabs_typeexceed.Controls.Add(this.tabPage20);
+ this.tabs_typeexceed.Controls.Add(this.tabPage21);
+ this.tabs_typeexceed.Controls.Add(this.tabPage22);
this.tabs_typeexceed.Cursor = System.Windows.Forms.Cursors.Default;
this.tabs_typeexceed.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.tabs_typeexceed.Gap = 12;
@@ -137,7 +150,7 @@
this.tabs_typeexceed.Pages.Add(this.tabPage21);
this.tabs_typeexceed.Pages.Add(this.tabPage22);
this.tabs_typeexceed.Size = new System.Drawing.Size(744, 88);
- this.tabs_typeexceed.Style = styleLine4;
+ this.tabs_typeexceed.Style = styleLine1;
this.tabs_typeexceed.TabIndex = 35;
this.tabs_typeexceed.Text = "tabs2";
this.tabs_typeexceed.TypExceed = AntdUI.TabTypExceed.None;
@@ -145,7 +158,6 @@
// tabPage10
//
this.tabPage10.Controls.Add(this.label16);
- this.tabPage10.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabPage10.IconSvg = resources.GetString("tabPage10.IconSvg");
this.tabPage10.Location = new System.Drawing.Point(3, 38);
@@ -165,7 +177,6 @@
//
// tabPage11
//
- this.tabPage11.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage11.Location = new System.Drawing.Point(0, 0);
this.tabPage11.Name = "tabPage11";
this.tabPage11.Size = new System.Drawing.Size(0, 0);
@@ -174,8 +185,7 @@
//
// tabPage12
//
- this.tabPage12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabPage12.Location = new System.Drawing.Point(3, 38);
+ this.tabPage12.Location = new System.Drawing.Point(-688, -47);
this.tabPage12.Name = "tabPage12";
this.tabPage12.Size = new System.Drawing.Size(688, 47);
this.tabPage12.TabIndex = 0;
@@ -183,7 +193,6 @@
//
// tabPage13
//
- this.tabPage13.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage13.Location = new System.Drawing.Point(0, 0);
this.tabPage13.Name = "tabPage13";
this.tabPage13.Size = new System.Drawing.Size(0, 0);
@@ -192,7 +201,6 @@
//
// tabPage14
//
- this.tabPage14.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage14.Location = new System.Drawing.Point(0, 0);
this.tabPage14.Name = "tabPage14";
this.tabPage14.Size = new System.Drawing.Size(0, 0);
@@ -201,7 +209,6 @@
//
// tabPage15
//
- this.tabPage15.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage15.Location = new System.Drawing.Point(0, 0);
this.tabPage15.Name = "tabPage15";
this.tabPage15.Size = new System.Drawing.Size(0, 0);
@@ -210,7 +217,6 @@
//
// tabPage16
//
- this.tabPage16.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage16.Location = new System.Drawing.Point(0, 0);
this.tabPage16.Name = "tabPage16";
this.tabPage16.Size = new System.Drawing.Size(0, 0);
@@ -219,7 +225,6 @@
//
// tabPage17
//
- this.tabPage17.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage17.Location = new System.Drawing.Point(0, 0);
this.tabPage17.Name = "tabPage17";
this.tabPage17.Size = new System.Drawing.Size(0, 0);
@@ -228,8 +233,7 @@
//
// tabPage18
//
- this.tabPage18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabPage18.Location = new System.Drawing.Point(3, 38);
+ this.tabPage18.Location = new System.Drawing.Point(-688, -47);
this.tabPage18.Name = "tabPage18";
this.tabPage18.Size = new System.Drawing.Size(688, 47);
this.tabPage18.TabIndex = 0;
@@ -237,8 +241,7 @@
//
// tabPage19
//
- this.tabPage19.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabPage19.Location = new System.Drawing.Point(3, 38);
+ this.tabPage19.Location = new System.Drawing.Point(-688, -47);
this.tabPage19.Name = "tabPage19";
this.tabPage19.Size = new System.Drawing.Size(688, 47);
this.tabPage19.TabIndex = 0;
@@ -246,8 +249,7 @@
//
// tabPage20
//
- this.tabPage20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabPage20.Location = new System.Drawing.Point(3, 38);
+ this.tabPage20.Location = new System.Drawing.Point(-688, -47);
this.tabPage20.Name = "tabPage20";
this.tabPage20.Size = new System.Drawing.Size(688, 47);
this.tabPage20.TabIndex = 0;
@@ -255,7 +257,6 @@
//
// tabPage21
//
- this.tabPage21.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage21.Location = new System.Drawing.Point(0, 0);
this.tabPage21.Name = "tabPage21";
this.tabPage21.Size = new System.Drawing.Size(0, 0);
@@ -264,7 +265,6 @@
//
// tabPage22
//
- this.tabPage22.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage22.Location = new System.Drawing.Point(0, 0);
this.tabPage22.Name = "tabPage22";
this.tabPage22.Size = new System.Drawing.Size(0, 0);
@@ -312,6 +312,9 @@
// tabs3
//
this.tabs3.Centered = true;
+ this.tabs3.Controls.Add(this.tabPage5);
+ this.tabs3.Controls.Add(this.tabPage8);
+ this.tabs3.Controls.Add(this.tabPage9);
this.tabs3.Cursor = System.Windows.Forms.Cursors.Hand;
this.tabs3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.tabs3.Gap = 12;
@@ -321,7 +324,7 @@
this.tabs3.Pages.Add(this.tabPage8);
this.tabs3.Pages.Add(this.tabPage9);
this.tabs3.Size = new System.Drawing.Size(744, 120);
- this.tabs3.Style = styleLine5;
+ this.tabs3.Style = styleLine2;
this.tabs3.TabIndex = 29;
this.tabs3.Text = "tabs3";
//
@@ -329,7 +332,6 @@
//
this.tabPage5.Badge = "99";
this.tabPage5.Controls.Add(this.label10);
- this.tabPage5.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabPage5.IconSvg = resources.GetString("tabPage5.IconSvg");
this.tabPage5.Location = new System.Drawing.Point(3, 38);
@@ -350,9 +352,8 @@
// tabPage8
//
this.tabPage8.Controls.Add(this.label13);
- this.tabPage8.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
- this.tabPage8.Location = new System.Drawing.Point(3, 38);
+ this.tabPage8.Location = new System.Drawing.Point(-688, -89);
this.tabPage8.Name = "tabPage8";
this.tabPage8.Size = new System.Drawing.Size(688, 89);
this.tabPage8.TabIndex = 0;
@@ -371,9 +372,8 @@
// tabPage9
//
this.tabPage9.Controls.Add(this.label14);
- this.tabPage9.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
- this.tabPage9.Location = new System.Drawing.Point(3, 38);
+ this.tabPage9.Location = new System.Drawing.Point(-688, -89);
this.tabPage9.Name = "tabPage9";
this.tabPage9.Size = new System.Drawing.Size(688, 89);
this.tabPage9.TabIndex = 0;
@@ -400,6 +400,9 @@
//
// tabs_close
//
+ this.tabs_close.Controls.Add(this.tabPage2);
+ this.tabs_close.Controls.Add(this.tabPage3);
+ this.tabs_close.Controls.Add(this.tabPage4);
this.tabs_close.Cursor = System.Windows.Forms.Cursors.Hand;
this.tabs_close.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.tabs_close.Gap = 12;
@@ -409,9 +412,9 @@
this.tabs_close.Pages.Add(this.tabPage3);
this.tabs_close.Pages.Add(this.tabPage4);
this.tabs_close.Size = new System.Drawing.Size(744, 120);
- styleCard2.Closable = true;
- styleCard2.Gap = 6;
- this.tabs_close.Style = styleCard2;
+ styleCard1.Closable = true;
+ styleCard1.Gap = 6;
+ this.tabs_close.Style = styleCard1;
this.tabs_close.TabIndex = 26;
this.tabs_close.Text = "tabs2";
this.tabs_close.Type = AntdUI.TabType.Card;
@@ -419,7 +422,6 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.label12);
- this.tabPage2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.tabPage2.Location = new System.Drawing.Point(3, 38);
this.tabPage2.Name = "tabPage2";
@@ -440,9 +442,8 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.label11);
- this.tabPage3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
- this.tabPage3.Location = new System.Drawing.Point(3, 38);
+ this.tabPage3.Location = new System.Drawing.Point(-688, -89);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(688, 89);
this.tabPage3.TabIndex = 0;
@@ -461,9 +462,8 @@
// tabPage4
//
this.tabPage4.Controls.Add(this.label8);
- this.tabPage4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
- this.tabPage4.Location = new System.Drawing.Point(3, 38);
+ this.tabPage4.Location = new System.Drawing.Point(-688, -89);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(688, 89);
this.tabPage4.TabIndex = 0;
@@ -490,7 +490,10 @@
//
// tabs1
//
- this.tabs1.Cursor = System.Windows.Forms.Cursors.Default;
+ this.tabs1.Controls.Add(this.tabPage1);
+ this.tabs1.Controls.Add(this.tabPage6);
+ this.tabs1.Controls.Add(this.tabPage7);
+ this.tabs1.Cursor = System.Windows.Forms.Cursors.Hand;
this.tabs1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.tabs1.Gap = 12;
this.tabs1.Location = new System.Drawing.Point(3, 33);
@@ -499,14 +502,13 @@
this.tabs1.Pages.Add(this.tabPage6);
this.tabs1.Pages.Add(this.tabPage7);
this.tabs1.Size = new System.Drawing.Size(744, 120);
- this.tabs1.Style = styleLine6;
+ this.tabs1.Style = styleLine3;
this.tabs1.TabIndex = 23;
this.tabs1.Text = "tabs1";
//
// tabPage1
//
this.tabPage1.Controls.Add(this.label4);
- this.tabPage1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabPage1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabPage1.IconSvg = resources.GetString("tabPage1.IconSvg");
this.tabPage1.Location = new System.Drawing.Point(3, 38);
@@ -527,8 +529,7 @@
// tabPage6
//
this.tabPage6.Controls.Add(this.label5);
- this.tabPage6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabPage6.Location = new System.Drawing.Point(3, 38);
+ this.tabPage6.Location = new System.Drawing.Point(-688, -89);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(688, 89);
this.tabPage6.TabIndex = 0;
@@ -547,8 +548,8 @@
// tabPage7
//
this.tabPage7.Controls.Add(this.label6);
- this.tabPage7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabPage7.Location = new System.Drawing.Point(3, 38);
+ this.tabPage7.Enabled = false;
+ this.tabPage7.Location = new System.Drawing.Point(-738, -79);
this.tabPage7.Name = "tabPage7";
this.tabPage7.Size = new System.Drawing.Size(738, 79);
this.tabPage7.TabIndex = 0;
diff --git a/assets/screenshots/Splitter.png b/assets/screenshots/Splitter.png
index 701ab7c..67a7749 100644
Binary files a/assets/screenshots/Splitter.png and b/assets/screenshots/Splitter.png differ
diff --git a/assets/screenshots/Table.png b/assets/screenshots/Table.png
index 4a7bba4..87477b0 100644
Binary files a/assets/screenshots/Table.png and b/assets/screenshots/Table.png differ