diff --git a/Utils/ConfigurationHelper.cs b/Utils/ConfigurationHelper.cs deleted file mode 100644 index 2f82122..0000000 --- a/Utils/ConfigurationHelper.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AntdUIDemo.Utils -{ - public class ConfigurationHelper - { - - } -} diff --git a/Views/FloatButtonDemo.cs b/Views/FloatButtonDemo.cs index 482ca61..b9294aa 100644 --- a/Views/FloatButtonDemo.cs +++ b/Views/FloatButtonDemo.cs @@ -163,18 +163,21 @@ namespace AntdUIDemo.Views if (InvokeRequired) { Invoke(new Action(CloseFloatButtonForm)); - return; } - - if (floatButtonForm != null) + else { - floatButtonForm.Close(); - floatButtonForm.Dispose(); - floatButtonForm = null; + // Ensure that floatButtonForm is not null before attempting to close it + if (floatButtonForm != null) + { + floatButtonForm.Close(); + floatButtonForm.Dispose(); + floatButtonForm = null; + } } } + #region EventHandler private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { diff --git a/Views/FlowPanelDemo.cs b/Views/FlowPanelDemo.cs index f9c5075..2cc3e09 100644 --- a/Views/FlowPanelDemo.cs +++ b/Views/FlowPanelDemo.cs @@ -75,7 +75,14 @@ namespace AntdUIDemo.Views private void switch_autoscroll_CheckedChanged(object sender, BoolEventArgs e) { - flowPanel.AutoScroll = switch_autoscroll.Checked; + if (flowPanel.InvokeRequired) + { + flowPanel.Invoke(new Action(() => { flowPanel.AutoScroll = switch_autoscroll.Checked; })); + } + else + { + flowPanel.AutoScroll = switch_autoscroll.Checked; + } } // 初始化下拉框 @@ -95,6 +102,10 @@ namespace AntdUIDemo.Views { flowPanel.Invoke(new Action(() => { flowPanel.Align = (TAlignFlow)select_align.SelectedValue; })); } + else + { + flowPanel.Align = (TAlignFlow)select_align.SelectedValue; + } } private void input_gap_ValueChanged(object sender, DecimalEventArgs e) @@ -103,6 +114,10 @@ namespace AntdUIDemo.Views { flowPanel.Invoke(new Action(() => { flowPanel.Gap = (int)input_gap.Value; })); } + else + { + flowPanel.Gap = (int)input_gap.Value; + } } // 添加按钮 private void buttonADD_Click(object sender, EventArgs e) diff --git a/Views/ModalDemo.cs b/Views/ModalDemo.cs index c825801..e7f2fe0 100644 --- a/Views/ModalDemo.cs +++ b/Views/ModalDemo.cs @@ -54,6 +54,8 @@ namespace AntdUIDemo.Views AntdUI.Modal.open(new AntdUI.Modal.Config(window, "Basic Modal", "Some contents...\r\nSome contents...\r\nSome contents...") { CloseIcon = true, + Keyboard = false, + MaskClosable = false, }); } @@ -61,6 +63,8 @@ namespace AntdUIDemo.Views { AntdUI.Modal.open(new AntdUI.Modal.Config(window, "Basic Modal", "Some contents...\r\nSome contents...\r\nSome contents...") { + //禁止使用键盘关闭 + Keyboard = false, MaskClosable = false, }); } diff --git a/Views/StackPanelDemo.cs b/Views/StackPanelDemo.cs index 4415083..2de0354 100644 --- a/Views/StackPanelDemo.cs +++ b/Views/StackPanelDemo.cs @@ -89,6 +89,10 @@ namespace AntdUIDemo.Views stackPanel.ItemSize = input_itemsize.Text; })); } + else + { + stackPanel.ItemSize = input_itemsize.Text; + } } private void input_gap_ValueChanged(object sender, DecimalEventArgs e) @@ -100,6 +104,10 @@ namespace AntdUIDemo.Views stackPanel.Gap = (int)input_gap.Value; })); } + else + { + stackPanel.Gap = (int)input_gap.Value; + } } private void ButtonDEL_Click(object sender, EventArgs e)