diff --git a/example/ChatUI/Main.Designer.cs b/example/ChatUI/Main.Designer.cs index 4478beb4..6b8bc064 100644 --- a/example/ChatUI/Main.Designer.cs +++ b/example/ChatUI/Main.Designer.cs @@ -62,12 +62,12 @@ namespace ChatUI msgItem3.Icon = Properties.Resources.antd; msgItem3.Name = "AntdUI"; msgItem3.Select = true; - msgItem3.Text = "Tom:❤AntDesign设计语言的Winform界面库"; + msgItem3.Text = "Tom:❤️AntDesign设计语言的Winform界面库"; msgItem3.Time = "前天"; msgItem4.Count = 1; msgItem4.Icon = Properties.Resources.av1; msgItem4.Name = "Tom"; - msgItem4.Text = "晚上一起 Crazy Day 4"; + msgItem4.Text = "晚上一起 🍔 Crazy Day 4"; msgItem4.Time = "疯狂星期四"; msgList.Items.Add(msgItem1); msgList.Items.Add(msgItem2); diff --git a/example/Demo/Controls/Table.Designer.cs b/example/Demo/Controls/Table.Designer.cs index 8b1cc6bf..21aff57b 100644 --- a/example/Demo/Controls/Table.Designer.cs +++ b/example/Demo/Controls/Table.Designer.cs @@ -37,6 +37,7 @@ namespace Demo.Controls selectEditStyle = new AntdUI.Select(); selectEditMode = new AntdUI.Select(); checkScrollBarAvoidHeader = new AntdUI.Checkbox(); + checkTree = new AntdUI.Checkbox(); checkFilter = new AntdUI.Checkbox(); checkAddressLineBreak = new AntdUI.Checkbox(); checkVisibleHeader = new AntdUI.Checkbox(); @@ -107,6 +108,7 @@ namespace Demo.Controls panel1.Controls.Add(selectEditStyle); panel1.Controls.Add(selectEditMode); panel1.Controls.Add(checkScrollBarAvoidHeader); + panel1.Controls.Add(checkTree); panel1.Controls.Add(checkFilter); panel1.Controls.Add(checkAddressLineBreak); panel1.Controls.Add(checkVisibleHeader); @@ -132,7 +134,7 @@ namespace Demo.Controls checkboxSummaryCustomize.Location = new Point(1531, 0); checkboxSummaryCustomize.Name = "checkboxSummaryCustomize"; checkboxSummaryCustomize.Size = new Size(101, 41); - checkboxSummaryCustomize.TabIndex = 13; + checkboxSummaryCustomize.TabIndex = 16; checkboxSummaryCustomize.Text = "自定义汇总"; checkboxSummaryCustomize.CheckedChanged += checkboxSummaryCustomize_CheckedChanged; // @@ -145,7 +147,7 @@ namespace Demo.Controls checkboxFocusNavigation.Location = new Point(1417, 0); checkboxFocusNavigation.Name = "checkboxFocusNavigation"; checkboxFocusNavigation.Size = new Size(114, 41); - checkboxFocusNavigation.TabIndex = 9; + checkboxFocusNavigation.TabIndex = 15; checkboxFocusNavigation.Text = "单元焦点导航"; checkboxFocusNavigation.CheckedChanged += checkboxFocusNavigation_CheckedChanged; // @@ -160,7 +162,7 @@ namespace Demo.Controls selectFocusedStyle.Name = "selectFocusedStyle"; selectFocusedStyle.PlaceholderText = "焦点列样式"; selectFocusedStyle.Size = new Size(114, 41); - selectFocusedStyle.TabIndex = 12; + selectFocusedStyle.TabIndex = 14; selectFocusedStyle.SelectedValueChanged += selectFocusedStyle_SelectedValueChanged; // // selectEditStyle @@ -175,7 +177,7 @@ namespace Demo.Controls selectEditStyle.Name = "selectEditStyle"; selectEditStyle.PlaceholderText = "编辑风格"; selectEditStyle.Size = new Size(100, 41); - selectEditStyle.TabIndex = 11; + selectEditStyle.TabIndex = 13; selectEditStyle.SelectedValueChanged += selectEditStyle_SelectedValueChanged; // // selectEditMode @@ -189,7 +191,7 @@ namespace Demo.Controls selectEditMode.Name = "selectEditMode"; selectEditMode.PlaceholderText = "编辑模式"; selectEditMode.Size = new Size(104, 41); - selectEditMode.TabIndex = 10; + selectEditMode.TabIndex = 12; selectEditMode.SelectedValueChanged += selectEditMode_SelectedValueChanged; // // checkScrollBarAvoidHeader @@ -200,10 +202,22 @@ namespace Demo.Controls checkScrollBarAvoidHeader.Location = new Point(958, 0); checkScrollBarAvoidHeader.Name = "checkScrollBarAvoidHeader"; checkScrollBarAvoidHeader.Size = new Size(141, 41); - checkScrollBarAvoidHeader.TabIndex = 12; + checkScrollBarAvoidHeader.TabIndex = 11; checkScrollBarAvoidHeader.Text = "滚动条在表头显示"; checkScrollBarAvoidHeader.CheckedChanged += checkScrollBarAvoidHeader_CheckedChanged; // + // checkTree + // + checkTree.AutoSizeMode = AntdUI.TAutoSize.Width; + checkTree.Dock = DockStyle.Left; + checkTree.LocalizationText = "Table.{id}"; + checkTree.Location = new Point(870, 0); + checkTree.Name = "checkTree"; + checkTree.Size = new Size(88, 41); + checkTree.TabIndex = 10; + checkTree.Text = "树表格"; + checkTree.CheckedChanged += checkTree_CheckedChanged; + // // checkFilter // checkFilter.AutoSizeMode = AntdUI.TAutoSize.Width; @@ -356,6 +370,7 @@ namespace Demo.Controls private AntdUI.Checkbox checkVisibleHeader; private AntdUI.Checkbox checkAddressLineBreak; private AntdUI.Checkbox checkFilter; + private AntdUI.Checkbox checkTree; private AntdUI.Checkbox checkScrollBarAvoidHeader; private AntdUI.Select selectEditMode; private AntdUI.Select selectEditStyle; diff --git a/example/Demo/Controls/Table.cs b/example/Demo/Controls/Table.cs index 2dbbc34a..ba9959fa 100644 --- a/example/Demo/Controls/Table.cs +++ b/example/Demo/Controls/Table.cs @@ -24,7 +24,7 @@ namespace Demo.Controls table1.Columns = new AntdUI.ColumnCollection { new AntdUI.ColumnCheck("check").SetFixed(), - new AntdUI.Column("name", "姓名").SetFixed().SetTree("Sub").SetLocalizationTitleID("Table.Column."), + new AntdUI.Column("name", "姓名").SetFixed().SetLocalizationTitleID("Table.Column."), new AntdUI.ColumnCheck("checkTitle", "不全选标题").SetColAlign().SetLocalizationTitleID("Table.Column."), new AntdUI.ColumnRadio("radio", "单选").SetLocalizationTitleID("Table.Column."), new AntdUI.Column("online", "状态", AntdUI.ColumnAlign.Center).SetLocalizationTitleID("Table.Column."), @@ -194,6 +194,27 @@ namespace Demo.Controls } } + void checkTree_CheckedChanged(object sender, AntdUI.BoolEventArgs e) + { + if (e.Value) + { + foreach (var it in table1.Columns) + { + switch (it.Key) + { + case "name": + it.SetTree("Sub"); + break; + } + } + } + else + { + foreach (var it in table1.Columns) it.KeyTree = null; + } + table1.Refresh(); + } + void selectEditMode_SelectedValueChanged(object sender, AntdUI.ObjectNEventArgs e) { if (e.Value is AntdUI.TEditMode v) diff --git a/example/Demo/Localizer.cs b/example/Demo/Localizer.cs index 15cbf132..2895c714 100644 --- a/example/Demo/Localizer.cs +++ b/example/Demo/Localizer.cs @@ -578,6 +578,8 @@ namespace Demo return "EditStyle"; case "Table.selectFocusedStyle": return "FocusedStyle"; + case "Table.checkTree": + return "Tree"; case "Table.checkScrollBarAvoidHeader": return "ScrollBar AvoidHeader"; case "Table.checkboxFocusNavigation":