diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj index b59499e..4c8199c 100644 --- a/AntdUIDemo.csproj +++ b/AntdUIDemo.csproj @@ -10,7 +10,6 @@ app.manifest assets\icon.ico AnyCPU - 12 Copyright © 2024 czz_y $(Version) $(Version) diff --git a/Views/ButtonDemo.cs b/Views/ButtonDemo.cs index edd4573..f37174c 100644 --- a/Views/ButtonDemo.cs +++ b/Views/ButtonDemo.cs @@ -87,7 +87,7 @@ namespace AntdUIDemo.Views if (toggle) { tooltipText.AppendLine($"Toggle: {toggle}"); - if (toggletype is not null) + if (toggletype != null) tooltipText.AppendLine($"ToggleType: {toggletype}"); if (!string.IsNullOrEmpty(toggleiconsvg)) { diff --git a/Views/CalendarDemo.cs b/Views/CalendarDemo.cs index e1df9c7..ef58fd4 100644 --- a/Views/CalendarDemo.cs +++ b/Views/CalendarDemo.cs @@ -34,12 +34,12 @@ namespace AntdUIDemo.Views // dates 参数为 DateTime[] 数组长度固定为2，返回UI上显示的开始日期与结束日期 // DateTime start_date = dates[0], end_date = dates[1]; var now = dates[1]; - return [ - new(now.ToString("yyyy-MM-dd"),0), - new(now.AddDays(-20).ToString("yyyy-MM-dd"),5), - new(now.AddDays(-2).ToString("yyyy-MM-dd"),99), - new(now.AddDays(-6).ToString("yyyy-MM-dd"),998,Color.FromArgb(112, 237, 58)), - ]; + return new List { + new DateBadge(now.ToString("yyyy-MM-dd"),0), + new DateBadge(now.AddDays(-20).ToString("yyyy-MM-dd"),5), + new DateBadge(now.AddDays(-2).ToString("yyyy-MM-dd"),99), + new DateBadge(now.AddDays(-6).ToString("yyyy-MM-dd"),998,Color.FromArgb(112, 237, 58)), + }; }; calendar.LoadBadge(); } diff --git a/Views/DatePickerRangeDemo.cs b/Views/DatePickerRangeDemo.cs index dc0e0c2..b2a4ab7 100644 --- a/Views/DatePickerRangeDemo.cs +++ b/Views/DatePickerRangeDemo.cs @@ -39,7 +39,7 @@ namespace AntdUIDemo.Views daysToMonday += 7; start = today.AddDays(-daysToMonday); end = start.AddDays(6); - datePickerRange.Value = [start, end]; + datePickerRange.Value = new DateTime[] { start, end }; break; case "上周": daysToMonday = (int)today.DayOfWeek - (int)DayOfWeek.Monday; @@ -47,27 +47,27 @@ namespace AntdUIDemo.Views daysToMonday += 7; start = today.AddDays(-daysToMonday - 7); end = start.AddDays(6); - datePickerRange.Value = [start, end]; + datePickerRange.Value = new DateTime[] { start, end }; break; case "本月": start = new DateTime(today.Year, today.Month, 1); end = start.AddMonths(1).AddDays(-1); - datePickerRange.Value = [start, end]; + datePickerRange.Value = new DateTime[] { start, end }; break; case "上月": start = new DateTime(today.Year, today.Month, 1).AddMonths(-1); end = start.AddMonths(1).AddDays(-1); - datePickerRange.Value = [start, end]; + datePickerRange.Value = new DateTime[] { start, end }; break; case "本年": start = new DateTime(today.Year, 1, 1); end = start.AddYears(1).AddDays(-1); - datePickerRange.Value = [start, end]; + datePickerRange.Value = new DateTime[] { start, end }; break; case "去年": start = new DateTime(today.Year - 1, 1, 1); end = start.AddYears(1).AddDays(-1); - datePickerRange.Value = [start, end]; + datePickerRange.Value = new DateTime[] { start, end }; break; } } diff --git a/Views/MenuDemo.cs b/Views/MenuDemo.cs index 48acbec..2ffbce3 100644 --- a/Views/MenuDemo.cs +++ b/Views/MenuDemo.cs @@ -95,10 +95,38 @@ namespace AntdUIDemo.Views menu.Radius = (int)input_radius.Value; - menu.ForeColor = colorPicker_forecolor.Value == Color.Transparent ? null : colorPicker_forecolor.Value; - menu.ForeActive = colorPicker_foreactive.Value == Color.Transparent ? null : colorPicker_foreactive.Value; - menu.BackHover = colorPicker_backhover.Value == Color.Transparent ? null : colorPicker_backhover.Value; - menu.BackActive = colorPicker_backactive.Value == Color.Transparent ? null : colorPicker_backactive.Value; + if (colorPicker_forecolor.Value == Color.Transparent) + { + menu.ForeColor = null; + } + else + { + menu.ForeColor = colorPicker_forecolor.Value; + } + if (colorPicker_foreactive.Value == Color.Transparent) + { + menu.ForeActive = null; + } + else + { + menu.ForeActive = colorPicker_foreactive.Value; + } + if (colorPicker_backhover.Value == Color.Transparent) + { + menu.BackHover = null; + } + else + { + menu.BackHover = colorPicker_backhover.Value; + } + if (colorPicker_backactive.Value == Color.Transparent) + { + menu.BackActive = null; + } + else + { + menu.BackActive = colorPicker_backactive.Value; + } } } diff --git a/Views/ModalDemo.cs b/Views/ModalDemo.cs index 5d2762c..c825801 100644 --- a/Views/ModalDemo.cs +++ b/Views/ModalDemo.cs @@ -77,8 +77,8 @@ namespace AntdUIDemo.Views { AntdUI.Modal.open(new AntdUI.Modal.Config(window, "Basic Modal", "Some contents...\r\nSome contents...\r\nSome contents...") { - Btns = [new AntdUI.Modal.Btn("return", "Return", AntdUI.TTypeMini.Default), - new AntdUI.Modal.Btn("submit", "Submit", AntdUI.TTypeMini.Warn)], + Btns = new Modal.Btn[]{ new AntdUI.Modal.Btn("return", "Return", AntdUI.TTypeMini.Default), + new AntdUI.Modal.Btn("submit", "Submit", AntdUI.TTypeMini.Warn) }, CancelText = null, OkText = "Search On Google", OnOk = config => diff --git a/Views/PaginationDemo.cs b/Views/PaginationDemo.cs index 0294846..41e01a9 100644 --- a/Views/PaginationDemo.cs +++ b/Views/PaginationDemo.cs @@ -129,7 +129,7 @@ namespace AntdUIDemo.Views switch_show.Checked = true; switch_right.Checked = true; - selectMultiple.SelectedValue = ["1", "2", "5", "10"]; + selectMultiple.SelectedValue = new object[] { "1", "2", "5", "10" }; } } } diff --git a/Views/PopoverDemo.cs b/Views/PopoverDemo.cs index c71b910..04ab988 100644 --- a/Views/PopoverDemo.cs +++ b/Views/PopoverDemo.cs @@ -59,12 +59,16 @@ namespace AntdUIDemo.Views ArrowAlign = TAlign.TL, OnControlLoad = () => { - popovercalendar.DateChanged += (sender, e) => - AntdUI.Message.info(window, e.Value.ToString("yyyy-MM-dd"), autoClose: 1); + popovercalendar.DateChanged += Popovercalendar_DateChanged; } }); } + private void Popovercalendar_DateChanged(object sender, DateTimeEventArgs e) + { + AntdUI.Message.info(window, e.Value.ToString("yyyy-MM-dd"), autoClose: 1); + } + private void button_form_Click(object sender, EventArgs e) { var button = sender as AntdUI.Button; @@ -93,12 +97,16 @@ namespace AntdUIDemo.Views { OnControlLoad = () => { - popoverbutton.Click += (sender, e) => - AntdUI.Message.info(window, "点击了PopoverButton", autoClose: 1); + popoverbutton.Click += Popoverbutton_Click; } }); } + private void Popoverbutton_Click(object sender, EventArgs e) + { + AntdUI.Message.info(window, "点击了PopoverButton", autoClose: 1); + } + private void button_close_Click(object sender, EventArgs e) { Popover.open(new Popover.Config(button_close, "Title", "Content\r\nContent\r\nContent") diff --git a/Views/PreviewDemo.cs b/Views/PreviewDemo.cs index 51c643f..2cfe882 100644 --- a/Views/PreviewDemo.cs +++ b/Views/PreviewDemo.cs @@ -29,8 +29,8 @@ namespace AntdUIDemo.Views private void Button_views_Click(object sender, EventArgs e) { - Preview.open(new Preview.Config(window, - [Properties.Resources.bg1, Properties.Resources.bg2, Properties.Resources.bg3])); + Preview.open(new Preview.Config(window, new List() { + Properties.Resources.bg1, Properties.Resources.bg2, Properties.Resources.bg3 })); } private void Button_view_Click(object sender, EventArgs e) diff --git a/Views/SelectDemo.cs b/Views/SelectDemo.cs index 1be6ef4..a3fc382 100644 --- a/Views/SelectDemo.cs +++ b/Views/SelectDemo.cs @@ -22,7 +22,7 @@ namespace AntdUIDemo.Views private void InitData() { select_custom.Items.Clear(); - select_custom.Items.AddRange([ + select_custom.Items.AddRange(new object[] { new SelectItem("在线状态"){ Online = 1, @@ -48,7 +48,7 @@ namespace AntdUIDemo.Views { SubText = "子文本" } - ]); + }); select_custom.SelectedIndex = 0; } diff --git a/Views/TableDemo.cs b/Views/TableDemo.cs index d55070f..c349b83 100644 --- a/Views/TableDemo.cs +++ b/Views/TableDemo.cs @@ -25,7 +25,7 @@ namespace AntdUIDemo.Views private void InitTableColumns() { - table_base.Columns = [ + table_base.Columns = new ColumnCollection() { new ColumnCheck("Selected"){Fixed = true}, new Column("Name", "姓名",ColumnAlign.Center), new Column("Age", "年龄",ColumnAlign.Center), @@ -49,7 +49,7 @@ namespace AntdUIDemo.Views new Column("CellProgress", "进度条",ColumnAlign.Center), new Column("CellDivider", "分割线",ColumnAlign.Center), new Column("CellLinks", "链接",ColumnAlign.Center), - ]; + }; } private void BindEventHandler() @@ -112,14 +112,14 @@ namespace AntdUIDemo.Views User useradd = new User() { CellBadge = new CellBadge(TState.Processing, "测试中"), - CellImages = [new CellImage(Properties.Resources.head)], + CellImages = new CellImage[] { new CellImage(Properties.Resources.head) }, CellDivider = new CellDivider(), - CellTags = [new CellTag("测试", TTypeMini.Primary), new CellTag("测试", TTypeMini.Success), new CellTag("测试", TTypeMini.Warn)], + CellTags = new CellTag[] { new CellTag("测试", TTypeMini.Primary), new CellTag("测试", TTypeMini.Success), new CellTag("测试", TTypeMini.Warn) }, CellText = new CellText("这是一个无图标的文本"), CellProgress = new CellProgress(0.5f), - CellLinks = [new CellLink("https://gitee.com/antdui/AntdUI", "AntdUI"), + CellLinks = new CellLink[]{ new CellLink("https://gitee.com/antdui/AntdUI", "AntdUI"), new CellButton(Guid.NewGuid().ToString(),"编辑",TTypeMini.Primary), - new CellButton(Guid.NewGuid().ToString(),"删除",TTypeMini.Error)], + new CellButton(Guid.NewGuid().ToString(),"删除",TTypeMini.Error) }, }; var form = new UserEdit(window, useradd) { Size = new Size(700, 400) }; AntdUI.Modal.open(new AntdUI.Modal.Config(window, "", form, TType.None) @@ -177,7 +177,7 @@ namespace AntdUIDemo.Views else AntdUI.Message.info(window, item.Text, autoClose: 1); }, - [ + new IContextMenuStripItem[] { new AntdUI.ContextMenuStripItem("编辑"){ IconSvg = "", }, @@ -186,11 +186,11 @@ namespace AntdUIDemo.Views }, new ContextMenuStripItemDivider(), new AntdUI.ContextMenuStripItem("详情"){ - Sub = [ new AntdUI.ContextMenuStripItem("打印", "Ctrl + P") { }, - new AntdUI.ContextMenuStripItem("另存为", "Ctrl + S") { } ], + Sub = new IContextMenuStripItem[]{ new AntdUI.ContextMenuStripItem("打印", "Ctrl + P") { }, + new AntdUI.ContextMenuStripItem("另存为", "Ctrl + S") { } }, IconSvg = "", } - ])); + })); } } } @@ -264,17 +264,17 @@ namespace AntdUIDemo.Views Age = 30 + i, Address = $"浙江省杭州市西湖区湖底公园{i + 1}号", Enabled = i % 2 == 0, - CellImages = [new CellImage(Properties.Resources.head)], - CellTags = [new CellTag("测试", TTypeMini.Primary), new CellTag("测试", TTypeMini.Success), new CellTag("测试", TTypeMini.Warn)], + CellImages = new CellImage[] { new CellImage(Properties.Resources.head) }, + CellTags = new CellTag[] { new CellTag("测试", TTypeMini.Primary), new CellTag("测试", TTypeMini.Success), new CellTag("测试", TTypeMini.Warn) }, CellBadge = new CellBadge(TState.Processing, "测试中"), CellText = new CellText("这是一个带图标的文本") { IconRatio = 0.5f, PrefixSvg = "" }, - CellLinks = [new CellLink("https://gitee.com/antdui/AntdUI", "AntdUI"), + CellLinks = new CellLink[] {new CellLink("https://gitee.com/antdui/AntdUI", "AntdUI"), new CellButton(Guid.NewGuid().ToString(),"编辑",TTypeMini.Primary), - new CellButton(Guid.NewGuid().ToString(),"删除",TTypeMini.Error)], + new CellButton(Guid.NewGuid().ToString(),"删除",TTypeMini.Error) }, //value:0-1 CellProgress = new CellProgress(0.5f), CellDivider = new CellDivider(),