diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj
index 3c59dfa..39a2dbf 100644
--- a/AntdUIDemo.csproj
+++ b/AntdUIDemo.csproj
@@ -13,7 +13,7 @@
Copyright © 2024 czz_y
$(Version)
$(Version)
- 1.7.12
+ 1.7.13
czz_y
基于 Winform UI 框架 AntdUI 设计的 Demo
https://gitee.com/mubaiyanghua/antd-uidemo
@@ -30,7 +30,7 @@
-
+
diff --git a/README.md b/README.md
index fcaec8f..8e36ef3 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.7.12`
+本项目基于 `Winform .NET Framework 4.8` 开发,是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目,当前版本 `1.7.13`
diff --git a/Views/CalendarDemo.cs b/Views/CalendarDemo.cs
index 6eb9186..e1e9c22 100644
--- a/Views/CalendarDemo.cs
+++ b/Views/CalendarDemo.cs
@@ -49,7 +49,12 @@ namespace AntdUIDemo.Views
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(-14).ToString("yyyy-MM-dd"), "休"),
+ new DateBadge(now.AddDays(-7).ToString("yyyy-MM-dd"), "休")
+ {
+ //圆角支持,默认值是6
+ Radius = 12
+ },
new DateBadge(now.AddDays(-6).ToString("yyyy-MM-dd"),998,Color.FromArgb(112, 237, 58)),
};
};
diff --git a/Views/ModalDemo.Designer.cs b/Views/ModalDemo.Designer.cs
index 7b762a5..8262aa3 100644
--- a/Views/ModalDemo.Designer.cs
+++ b/Views/ModalDemo.Designer.cs
@@ -45,6 +45,7 @@
this.button_base = new AntdUI.Button();
this.label3 = new AntdUI.Label();
this.header1 = new AntdUI.PageHeader();
+ this.button_drag = new AntdUI.Button();
this.stackPanel1.SuspendLayout();
this.flowPanel4.SuspendLayout();
this.flowPanel3.SuspendLayout();
@@ -195,6 +196,7 @@
//
// flowPanel2
//
+ this.flowPanel2.Controls.Add(this.button_drag);
this.flowPanel2.Controls.Add(this.button_base);
this.flowPanel2.Location = new System.Drawing.Point(3, 33);
this.flowPanel2.Name = "flowPanel2";
@@ -209,7 +211,7 @@
this.button_base.Name = "button_base";
this.button_base.Size = new System.Drawing.Size(90, 32);
this.button_base.TabIndex = 3;
- this.button_base.Text = "Open Modal";
+ this.button_base.Text = "默认";
this.button_base.Type = AntdUI.TTypeMini.Primary;
this.button_base.WaveSize = 0;
//
@@ -236,6 +238,17 @@
this.header1.Text = "Modal 对话框";
this.header1.UseTitleFont = true;
//
+ // button_drag
+ //
+ this.button_drag.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button_drag.Location = new System.Drawing.Point(99, 3);
+ this.button_drag.Name = "button_drag";
+ this.button_drag.Size = new System.Drawing.Size(90, 32);
+ this.button_drag.TabIndex = 4;
+ this.button_drag.Text = "支持拖拽";
+ this.button_drag.Type = AntdUI.TTypeMini.Primary;
+ this.button_drag.WaveSize = 0;
+ //
// ModalDemo
//
this.Controls.Add(this.stackPanel1);
@@ -270,5 +283,6 @@
private AntdUI.Button button_sys;
private AntdUI.Label label6;
private AntdUI.PageHeader header1;
+ private AntdUI.Button button_drag;
}
}
diff --git a/Views/ModalDemo.cs b/Views/ModalDemo.cs
index 3485720..b2ea962 100644
--- a/Views/ModalDemo.cs
+++ b/Views/ModalDemo.cs
@@ -20,6 +20,7 @@ namespace AntdUIDemo.Views
private void BindEventHandler()
{
button_base.Click += Button_base_Click;
+ button_drag.Click += Button_drag_Click;
button_nobutton.Click += Button_nobutton_Click;
button_custombutton.Click += Button_custombutton_Click;
button_nomask.Click += Button_nomask_Click;
@@ -28,6 +29,18 @@ namespace AntdUIDemo.Views
button_sys.Click += Button_sys_Click;
}
+ private void Button_drag_Click(object sender, EventArgs e)
+ {
+ AntdUI.Modal.open(new AntdUI.Modal.Config(window, "Basic Modal", "Some contents...\r\nSome contents...\r\nSome contents...")
+ {
+ Icon = TType.Info,
+ //内边距
+ Padding = new Size(24, 20),
+ //支持拖拽
+ Draggable = true,
+ });
+ }
+
private void Button_sys_Click(object sender, EventArgs e)
{
using (var form = new SystemSet(window))
diff --git a/assets/screenshots/Calendar.png b/assets/screenshots/Calendar.png
index 97a0adc..0b75168 100644
Binary files a/assets/screenshots/Calendar.png and b/assets/screenshots/Calendar.png differ
diff --git a/assets/screenshots/Modal.png b/assets/screenshots/Modal.png
index 6e6f567..6f0eb4e 100644
Binary files a/assets/screenshots/Modal.png and b/assets/screenshots/Modal.png differ