diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj index 4bfc4ab..fcd1fbc 100644 --- a/AntdUIDemo.csproj +++ b/AntdUIDemo.csproj @@ -13,7 +13,7 @@ Copyright © 2024 czz_y $(Version) $(Version) - 1.6.9 + 1.6.10 czz_y 基于 Winform UI框架 AntdUI 设计的 Demo https://gitee.com/mubaiyanghua/antd-uidemo @@ -30,7 +30,7 @@ - + diff --git a/MainWindow.cs b/MainWindow.cs index bef128c..5898abe 100644 --- a/MainWindow.cs +++ b/MainWindow.cs @@ -28,7 +28,7 @@ namespace AntdUIDemo private void InitData() { - var control = new Wellcome(); + control = new Wellcome(); AutoDpi(control); panel_content.Controls.Add(control); } @@ -259,6 +259,9 @@ namespace AntdUIDemo case "TimePicker": control = new TimePickerDemo(); break; + case "UploadDragger": + control = new UploadDraggerDemo(this); + break; case "Avatar": control = new AvatarDemo(); break; diff --git a/Models/DataUtil.cs b/Models/DataUtil.cs index 576e4ee..1a275dc 100644 --- a/Models/DataUtil.cs +++ b/Models/DataUtil.cs @@ -52,6 +52,7 @@ namespace AntdUIDemo.Models new MenuItems { Text = "SliderRange 滑动范围输入条", Tag = "SliderRange"}, new MenuItems { Text = "Switch 开关", Tag = "Switch"}, new MenuItems { Text = "TimePicker 时间选择框", Tag = "TimePicker"}, + new MenuItems { Text = "UploadDragger 上传", Tag = "UploadDragger"} } }, { "数据展示", new List diff --git a/README.md b/README.md index aa27d8b..04edbfb 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.6.9` +本项目基于 `Winform .NET Framework 4.8` 开发，是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目，当前版本 `1.6.10` @@ -17,7 +17,9 @@ ## ⚠️ 注意事项 - 电脑屏幕分辨率低于 1920×1080(1080P) 请使用大于等于 1080P 分辨率的屏幕开发 -- 电脑屏幕分辨率大于 1080P 或者缩放不是 100% 的，务必选择以下任一方式打开项目，详细原因见 [解决 Visual Studio 中 Windows 窗体设计器的 HDPI/缩放问题](https://learn.microsoft.com/zh-cn/visualstudio/designers/disable-dpi-awareness?view=vs-2022)： +- 如果 `TargetFramework` 设置为 `net6.0-windows7.0` 及以上，可以直接打开窗体界面，显示如下提示 +![coredesign](assets/screenshots/coredesign.png) +- 如果 `TargetFramework` 设置为 `net48` 及以下且电脑屏幕分辨率大于 1080P 或者缩放不是 100% 的，务必选择以下任一方式打开项目，详细原因见 [解决 Visual Studio 中 Windows 窗体设计器的 HDPI/缩放问题](https://learn.microsoft.com/zh-cn/visualstudio/designers/disable-dpi-awareness?view=vs-2022)： 1. 使用 `devenv /noScale` 命令启动 Visual Studio 并点击`文件-打开-项目/解决方案`，如下所示 ![vsstart](assets/screenshots/vsstart.png) ![vsopen](assets/screenshots/vsopen.png) @@ -97,6 +99,8 @@ ![Switch](assets/screenshots/Switch.png) #### TimePicker 时间选择框 ![TimePicker](assets/screenshots/TimePicker.png) +#### UploadDragger 上传 +![UploadDragger](assets/screenshots/UploadDragger.png) ### 数据展示 #### Avatar 头像 diff --git a/Views/BadgeDemo.Designer.cs b/Views/BadgeDemo.Designer.cs index f54ccaf..a0528f1 100644 --- a/Views/BadgeDemo.Designer.cs +++ b/Views/BadgeDemo.Designer.cs @@ -28,34 +28,46 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BadgeDemo)); this.stackPanel1 = new AntdUI.StackPanel(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.label3 = new AntdUI.Label(); - this.flowPanel1 = new AntdUI.FlowPanel(); - this.badge6 = new AntdUI.Badge(); - this.badge5 = new AntdUI.Badge(); - this.badge3 = new AntdUI.Badge(); - this.badge2 = new AntdUI.Badge(); - this.badge1 = new AntdUI.Badge(); - this.flowPanel2 = new AntdUI.FlowPanel(); - this.badge7 = new AntdUI.Badge(); this.flowPanel3 = new AntdUI.FlowPanel(); + this.badge12 = new AntdUI.Badge(); this.badge4 = new AntdUI.Badge(); this.badge8 = new AntdUI.Badge(); this.badge9 = new AntdUI.Badge(); this.badge10 = new AntdUI.Badge(); this.badge11 = new AntdUI.Badge(); - this.badge12 = new AntdUI.Badge(); + this.flowPanel2 = new AntdUI.FlowPanel(); + this.badge7 = new AntdUI.Badge(); + this.flowPanel1 = new AntdUI.FlowPanel(); + this.badge5 = new AntdUI.Badge(); + this.badge3 = new AntdUI.Badge(); + this.badge2 = new AntdUI.Badge(); + this.badge1 = new AntdUI.Badge(); + this.badge6 = new AntdUI.Badge(); + this.label3 = new AntdUI.Label(); + this.divider1 = new AntdUI.Divider(); + this.label2 = new AntdUI.Label(); + this.label1 = new AntdUI.Label(); + this.label4 = new AntdUI.Label(); + this.flowPanel9 = new AntdUI.FlowPanel(); + this.button30 = new AntdUI.Button(); + this.button31 = new AntdUI.Button(); + this.button32 = new AntdUI.Button(); + this.button38 = new AntdUI.Button(); + this.button40 = new AntdUI.Button(); + this.button41 = new AntdUI.Button(); this.stackPanel1.SuspendLayout(); - this.flowPanel1.SuspendLayout(); - this.flowPanel2.SuspendLayout(); this.flowPanel3.SuspendLayout(); + this.flowPanel2.SuspendLayout(); + this.flowPanel1.SuspendLayout(); + this.flowPanel9.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 // + this.stackPanel1.Controls.Add(this.flowPanel9); + this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel3); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.flowPanel1); @@ -71,121 +83,6 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(694, 12); - this.divider1.TabIndex = 25; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(694, 24); - this.label2.TabIndex = 24; - this.label2.Text = "图标右上角的圆形徽标数字。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(694, 40); - this.label1.TabIndex = 23; - this.label1.Text = "Badge 徽标数"; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(694, 24); - this.label3.TabIndex = 26; - this.label3.Text = "基本用法"; - // - // flowPanel1 - // - this.flowPanel1.Controls.Add(this.badge5); - this.flowPanel1.Controls.Add(this.badge3); - this.flowPanel1.Controls.Add(this.badge2); - this.flowPanel1.Controls.Add(this.badge1); - this.flowPanel1.Controls.Add(this.badge6); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); - this.flowPanel1.Name = "flowPanel1"; - this.flowPanel1.Size = new System.Drawing.Size(694, 38); - this.flowPanel1.TabIndex = 27; - this.flowPanel1.Text = "flowPanel1"; - // - // badge6 - // - this.badge6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge6.Location = new System.Drawing.Point(3, 3); - this.badge6.Name = "badge6"; - this.badge6.Size = new System.Drawing.Size(120, 32); - this.badge6.TabIndex = 5; - this.badge6.Text = "Default"; - // - // badge5 - // - this.badge5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge5.Location = new System.Drawing.Point(507, 3); - this.badge5.Name = "badge5"; - this.badge5.Size = new System.Drawing.Size(120, 32); - this.badge5.State = AntdUI.TState.Warn; - this.badge5.TabIndex = 10; - this.badge5.Text = "Warn"; - // - // badge3 - // - this.badge3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge3.Location = new System.Drawing.Point(381, 3); - this.badge3.Name = "badge3"; - this.badge3.Size = new System.Drawing.Size(120, 32); - this.badge3.State = AntdUI.TState.Error; - this.badge3.TabIndex = 8; - this.badge3.Text = "Error"; - // - // badge2 - // - this.badge2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge2.Location = new System.Drawing.Point(255, 3); - this.badge2.Name = "badge2"; - this.badge2.Size = new System.Drawing.Size(120, 32); - this.badge2.State = AntdUI.TState.Primary; - this.badge2.TabIndex = 7; - this.badge2.Text = "Primary"; - // - // badge1 - // - this.badge1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge1.Location = new System.Drawing.Point(129, 3); - this.badge1.Name = "badge1"; - this.badge1.Size = new System.Drawing.Size(120, 32); - this.badge1.State = AntdUI.TState.Success; - this.badge1.TabIndex = 6; - this.badge1.Text = "Success"; - // - // flowPanel2 - // - this.flowPanel2.Controls.Add(this.badge7); - this.flowPanel2.Location = new System.Drawing.Point(3, 171); - this.flowPanel2.Name = "flowPanel2"; - this.flowPanel2.Size = new System.Drawing.Size(694, 38); - this.flowPanel2.TabIndex = 28; - this.flowPanel2.Text = "flowPanel2"; - // - // badge7 - // - this.badge7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge7.Location = new System.Drawing.Point(3, 3); - this.badge7.Name = "badge7"; - this.badge7.Size = new System.Drawing.Size(120, 32); - this.badge7.State = AntdUI.TState.Processing; - this.badge7.TabIndex = 12; - this.badge7.Text = "Processing"; - // // flowPanel3 // this.flowPanel3.Controls.Add(this.badge12); @@ -200,6 +97,15 @@ this.flowPanel3.TabIndex = 29; this.flowPanel3.Text = "flowPanel3"; // + // badge12 + // + this.badge12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge12.Location = new System.Drawing.Point(193, 3); + this.badge12.Name = "badge12"; + this.badge12.Size = new System.Drawing.Size(32, 32); + this.badge12.State = AntdUI.TState.Processing; + this.badge12.TabIndex = 13; + // // badge4 // this.badge4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -244,14 +150,211 @@ this.badge11.Size = new System.Drawing.Size(32, 32); this.badge11.TabIndex = 5; // - // badge12 + // flowPanel2 // - this.badge12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.badge12.Location = new System.Drawing.Point(193, 3); - this.badge12.Name = "badge12"; - this.badge12.Size = new System.Drawing.Size(32, 32); - this.badge12.State = AntdUI.TState.Processing; - this.badge12.TabIndex = 13; + this.flowPanel2.Controls.Add(this.badge7); + this.flowPanel2.Location = new System.Drawing.Point(3, 171); + this.flowPanel2.Name = "flowPanel2"; + this.flowPanel2.Size = new System.Drawing.Size(694, 38); + this.flowPanel2.TabIndex = 28; + this.flowPanel2.Text = "flowPanel2"; + // + // badge7 + // + this.badge7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge7.Location = new System.Drawing.Point(3, 3); + this.badge7.Name = "badge7"; + this.badge7.Size = new System.Drawing.Size(120, 32); + this.badge7.State = AntdUI.TState.Processing; + this.badge7.TabIndex = 12; + this.badge7.Text = "Processing"; + // + // flowPanel1 + // + this.flowPanel1.Controls.Add(this.badge5); + this.flowPanel1.Controls.Add(this.badge3); + this.flowPanel1.Controls.Add(this.badge2); + this.flowPanel1.Controls.Add(this.badge1); + this.flowPanel1.Controls.Add(this.badge6); + this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Name = "flowPanel1"; + this.flowPanel1.Size = new System.Drawing.Size(694, 38); + this.flowPanel1.TabIndex = 27; + this.flowPanel1.Text = "flowPanel1"; + // + // badge5 + // + this.badge5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge5.Location = new System.Drawing.Point(507, 3); + this.badge5.Name = "badge5"; + this.badge5.Size = new System.Drawing.Size(120, 32); + this.badge5.State = AntdUI.TState.Warn; + this.badge5.TabIndex = 10; + this.badge5.Text = "Warn"; + // + // badge3 + // + this.badge3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge3.Location = new System.Drawing.Point(381, 3); + this.badge3.Name = "badge3"; + this.badge3.Size = new System.Drawing.Size(120, 32); + this.badge3.State = AntdUI.TState.Error; + this.badge3.TabIndex = 8; + this.badge3.Text = "Error"; + // + // badge2 + // + this.badge2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge2.Location = new System.Drawing.Point(255, 3); + this.badge2.Name = "badge2"; + this.badge2.Size = new System.Drawing.Size(120, 32); + this.badge2.State = AntdUI.TState.Primary; + this.badge2.TabIndex = 7; + this.badge2.Text = "Primary"; + // + // badge1 + // + this.badge1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge1.Location = new System.Drawing.Point(129, 3); + this.badge1.Name = "badge1"; + this.badge1.Size = new System.Drawing.Size(120, 32); + this.badge1.State = AntdUI.TState.Success; + this.badge1.TabIndex = 6; + this.badge1.Text = "Success"; + // + // badge6 + // + this.badge6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.badge6.Location = new System.Drawing.Point(3, 3); + this.badge6.Name = "badge6"; + this.badge6.Size = new System.Drawing.Size(120, 32); + this.badge6.TabIndex = 5; + this.badge6.Text = "Default"; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(694, 24); + this.label3.TabIndex = 26; + this.label3.Text = "基本用法"; + // + // divider1 + // + this.divider1.Location = new System.Drawing.Point(3, 79); + this.divider1.Name = "divider1"; + this.divider1.Size = new System.Drawing.Size(694, 12); + this.divider1.TabIndex = 25; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(3, 49); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(694, 24); + this.label2.TabIndex = 24; + this.label2.Text = "图标右上角的圆形徽标数字。"; + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(3, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(694, 40); + this.label1.TabIndex = 23; + this.label1.Text = "Badge 徽标数"; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(3, 259); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(694, 24); + this.label4.TabIndex = 30; + this.label4.Text = "控件组合"; + // + // flowPanel9 + // + this.flowPanel9.Controls.Add(this.button30); + this.flowPanel9.Controls.Add(this.button31); + this.flowPanel9.Controls.Add(this.button32); + this.flowPanel9.Controls.Add(this.button38); + this.flowPanel9.Controls.Add(this.button40); + this.flowPanel9.Controls.Add(this.button41); + this.flowPanel9.Location = new System.Drawing.Point(3, 289); + this.flowPanel9.Name = "flowPanel9"; + this.flowPanel9.Size = new System.Drawing.Size(694, 44); + this.flowPanel9.TabIndex = 31; + this.flowPanel9.Text = "flowPanel9"; + // + // button30 + // + this.button30.BadgeSvg = "DeleteFilled"; + this.button30.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button30.Location = new System.Drawing.Point(433, 3); + this.button30.Name = "button30"; + this.button30.Size = new System.Drawing.Size(80, 38); + this.button30.TabIndex = 5; + this.button30.Text = "Info"; + this.button30.Type = AntdUI.TTypeMini.Info; + // + // button31 + // + this.button31.BadgeSvg = resources.GetString("button31.BadgeSvg"); + this.button31.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button31.Location = new System.Drawing.Point(347, 3); + this.button31.Name = "button31"; + this.button31.Size = new System.Drawing.Size(80, 38); + this.button31.TabIndex = 4; + this.button31.Text = "Error"; + this.button31.Type = AntdUI.TTypeMini.Error; + // + // button32 + // + this.button32.Badge = "1"; + this.button32.BadgeAlign = AntdUI.TAlignFrom.BR; + this.button32.BadgeBack = System.Drawing.Color.Orange; + this.button32.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button32.Location = new System.Drawing.Point(261, 3); + this.button32.Name = "button32"; + this.button32.Size = new System.Drawing.Size(80, 38); + this.button32.TabIndex = 3; + this.button32.Text = "Warn"; + this.button32.Type = AntdUI.TTypeMini.Warn; + // + // button38 + // + this.button38.Badge = "99+"; + this.button38.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button38.Location = new System.Drawing.Point(175, 3); + this.button38.Name = "button38"; + this.button38.Size = new System.Drawing.Size(80, 38); + this.button38.TabIndex = 2; + this.button38.Text = "Success"; + this.button38.Type = AntdUI.TTypeMini.Success; + // + // button40 + // + this.button40.Badge = "1"; + this.button40.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button40.Location = new System.Drawing.Point(89, 3); + this.button40.Name = "button40"; + this.button40.Size = new System.Drawing.Size(80, 38); + this.button40.TabIndex = 1; + this.button40.Text = "Primary"; + this.button40.Type = AntdUI.TTypeMini.Primary; + // + // button41 + // + this.button41.Badge = ""; + this.button41.Cursor = System.Windows.Forms.Cursors.Default; + this.button41.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button41.Location = new System.Drawing.Point(3, 3); + this.button41.Name = "button41"; + this.button41.Size = new System.Drawing.Size(80, 38); + this.button41.TabIndex = 0; + this.button41.Text = "Default"; // // BadgeDemo // @@ -260,9 +363,10 @@ this.Name = "BadgeDemo"; this.Size = new System.Drawing.Size(700, 467); this.stackPanel1.ResumeLayout(false); - this.flowPanel1.ResumeLayout(false); - this.flowPanel2.ResumeLayout(false); this.flowPanel3.ResumeLayout(false); + this.flowPanel2.ResumeLayout(false); + this.flowPanel1.ResumeLayout(false); + this.flowPanel9.ResumeLayout(false); this.ResumeLayout(false); } @@ -289,5 +393,13 @@ private AntdUI.Badge badge10; private AntdUI.Badge badge11; private AntdUI.Badge badge12; + private AntdUI.Label label4; + private AntdUI.FlowPanel flowPanel9; + private AntdUI.Button button30; + private AntdUI.Button button31; + private AntdUI.Button button32; + private AntdUI.Button button38; + private AntdUI.Button button40; + private AntdUI.Button button41; } } diff --git a/Views/BadgeDemo.resx b/Views/BadgeDemo.resx index 1af7de1..64a05d4 100644 --- a/Views/BadgeDemo.resx +++ b/Views/BadgeDemo.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <svg t="1729062572939" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7023" width="16" height="16"><path d="M953.7024 156.4032a44.6848 44.6848 0 0 1 6.0672 88.9472l-6.0672 0.4096-33.2672-0.0512 0.0384 576.064c0 87.1296-68.032 158.3744-153.9072 163.5328l-9.984 0.2944H279.8336c-87.168 0-158.4384-68.0192-163.584-153.856l-0.3072-9.9712-0.0384-576.064-45.5936 0.0512a44.6976 44.6976 0 0 1-44.288-38.6176L25.6 201.0752a44.6976 44.6976 0 0 1 38.6304-44.2624l6.0672-0.4096h883.4048z m-122.6624 89.3056H205.2864l0.0384 576.064a74.496 74.496 0 0 0 66.88 74.0864l7.616 0.384h476.7744a74.496 74.496 0 0 0 74.112-66.8544l0.384-7.616-0.0512-576.064zM589.5936 38.4a44.6848 44.6848 0 0 1 6.0672 88.96l-6.0672 0.3968H428.8a44.6848 44.6848 0 0 1-6.0672-88.96L428.8 38.4h160.768z" fill="#1F1F1F" p-id="7024"></path><path d="M645.824 347.008A45.3248 45.3248 0 0 1 691.2 392.256v330.4576A45.3248 45.3248 0 0 1 645.824 768a45.3248 45.3248 0 0 1-45.3888-45.2736V392.2688a45.3248 45.3248 0 0 1 45.3888-45.2736zM403.776 345.6a45.3248 45.3248 0 0 1 45.3888 45.2736v331.136a45.3248 45.3248 0 0 1-45.3888 45.2736A45.3248 45.3248 0 0 1 358.4 722.0096v-331.136A45.3248 45.3248 0 0 1 403.776 345.6z" fill="#455CED" p-id="7025"></path></svg> + \ No newline at end of file diff --git a/Views/ButtonDemo.Designer.cs b/Views/ButtonDemo.Designer.cs index 8d79644..dd3a6c8 100644 --- a/Views/ButtonDemo.Designer.cs +++ b/Views/ButtonDemo.Designer.cs @@ -30,33 +30,6 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ButtonDemo)); this.stackPanel1 = new AntdUI.StackPanel(); - this.flowPanel9 = new AntdUI.FlowPanel(); - this.button30 = new AntdUI.Button(); - this.button31 = new AntdUI.Button(); - this.button32 = new AntdUI.Button(); - this.button38 = new AntdUI.Button(); - this.button40 = new AntdUI.Button(); - this.button41 = new AntdUI.Button(); - this.label11 = new AntdUI.Label(); - this.flowPanel1 = new AntdUI.FlowPanel(); - this.button6 = new AntdUI.Button(); - this.button5 = new AntdUI.Button(); - this.button4 = new AntdUI.Button(); - this.button3 = new AntdUI.Button(); - this.button2 = new AntdUI.Button(); - this.button1 = new AntdUI.Button(); - this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.label12 = new AntdUI.Label(); - this.flowPanel10 = new AntdUI.FlowPanel(); - this.button42 = new AntdUI.Button(); - this.button43 = new AntdUI.Button(); - this.button44 = new AntdUI.Button(); - this.button45 = new AntdUI.Button(); - this.button46 = new AntdUI.Button(); - this.button47 = new AntdUI.Button(); this.flowPanel8 = new AntdUI.FlowPanel(); this.button_toggle2 = new AntdUI.Button(); this.button_toggle = new AntdUI.Button(); @@ -104,10 +77,37 @@ this.button11 = new AntdUI.Button(); this.button12 = new AntdUI.Button(); this.label4 = new AntdUI.Label(); + this.flowPanel10 = new AntdUI.FlowPanel(); + this.button42 = new AntdUI.Button(); + this.button43 = new AntdUI.Button(); + this.button44 = new AntdUI.Button(); + this.button45 = new AntdUI.Button(); + this.button46 = new AntdUI.Button(); + this.button47 = new AntdUI.Button(); + this.label12 = new AntdUI.Label(); + this.flowPanel9 = new AntdUI.FlowPanel(); + this.button30 = new AntdUI.Button(); + this.button31 = new AntdUI.Button(); + this.button32 = new AntdUI.Button(); + this.button38 = new AntdUI.Button(); + this.button40 = new AntdUI.Button(); + this.button41 = new AntdUI.Button(); + this.label11 = new AntdUI.Label(); + this.flowPanel1 = new AntdUI.FlowPanel(); + this.button6 = new AntdUI.Button(); + this.button5 = new AntdUI.Button(); + this.button4 = new AntdUI.Button(); + this.button3 = new AntdUI.Button(); + this.button2 = new AntdUI.Button(); + this.button1 = new AntdUI.Button(); + this.label3 = new AntdUI.Label(); + this.divider1 = new AntdUI.Divider(); + this.label2 = new AntdUI.Label(); + this.label1 = new AntdUI.Label(); + this.button48 = new AntdUI.Button(); + this.button49 = new AntdUI.Button(); + this.button_toggle3 = new AntdUI.Button(); this.stackPanel1.SuspendLayout(); - this.flowPanel9.SuspendLayout(); - this.flowPanel1.SuspendLayout(); - this.flowPanel10.SuspendLayout(); this.flowPanel8.SuspendLayout(); this.flowPanel7.SuspendLayout(); this.flowPanel6.SuspendLayout(); @@ -117,6 +117,9 @@ this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.flowPanel2.SuspendLayout(); + this.flowPanel10.SuspendLayout(); + this.flowPanel9.SuspendLayout(); + this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -152,329 +155,9 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // - // flowPanel9 - // - this.flowPanel9.Controls.Add(this.button30); - this.flowPanel9.Controls.Add(this.button31); - this.flowPanel9.Controls.Add(this.button32); - this.flowPanel9.Controls.Add(this.button38); - this.flowPanel9.Controls.Add(this.button40); - this.flowPanel9.Controls.Add(this.button41); - this.flowPanel9.Location = new System.Drawing.Point(3, 201); - this.flowPanel9.Name = "flowPanel9"; - this.flowPanel9.Size = new System.Drawing.Size(694, 44); - this.flowPanel9.TabIndex = 22; - this.flowPanel9.Text = "flowPanel9"; - // - // button30 - // - this.button30.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button30.Location = new System.Drawing.Point(433, 3); - this.button30.Name = "button30"; - this.button30.Size = new System.Drawing.Size(80, 38); - this.button30.TabIndex = 5; - this.button30.Text = "Info"; - this.button30.Type = AntdUI.TTypeMini.Info; - // - // button31 - // - this.button31.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button31.Location = new System.Drawing.Point(347, 3); - this.button31.Name = "button31"; - this.button31.Size = new System.Drawing.Size(80, 38); - this.button31.TabIndex = 4; - this.button31.Text = "Error"; - this.button31.Type = AntdUI.TTypeMini.Error; - // - // button32 - // - this.button32.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button32.Location = new System.Drawing.Point(261, 3); - this.button32.Name = "button32"; - this.button32.Size = new System.Drawing.Size(80, 38); - this.button32.TabIndex = 3; - this.button32.Text = "Warn"; - this.button32.Type = AntdUI.TTypeMini.Warn; - // - // button38 - // - this.button38.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button38.Location = new System.Drawing.Point(175, 3); - this.button38.Name = "button38"; - this.button38.Size = new System.Drawing.Size(80, 38); - this.button38.TabIndex = 2; - this.button38.Text = "Success"; - this.button38.Type = AntdUI.TTypeMini.Success; - // - // button40 - // - this.button40.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button40.Location = new System.Drawing.Point(89, 3); - this.button40.Name = "button40"; - this.button40.Size = new System.Drawing.Size(80, 38); - this.button40.TabIndex = 1; - this.button40.Text = "Primary"; - this.button40.Type = AntdUI.TTypeMini.Primary; - // - // button41 - // - this.button41.Cursor = System.Windows.Forms.Cursors.Default; - this.button41.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button41.Location = new System.Drawing.Point(3, 3); - this.button41.Name = "button41"; - this.button41.Size = new System.Drawing.Size(80, 38); - this.button41.TabIndex = 0; - this.button41.Text = "Default"; - // - // label11 - // - this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(3, 171); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(694, 24); - this.label11.TabIndex = 21; - this.label11.Text = "水波效果"; - this.label11.TooltipConfig = null; - // - // flowPanel1 - // - this.flowPanel1.Controls.Add(this.button6); - this.flowPanel1.Controls.Add(this.button5); - this.flowPanel1.Controls.Add(this.button4); - this.flowPanel1.Controls.Add(this.button3); - this.flowPanel1.Controls.Add(this.button2); - this.flowPanel1.Controls.Add(this.button1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); - this.flowPanel1.Name = "flowPanel1"; - this.flowPanel1.Size = new System.Drawing.Size(694, 38); - this.flowPanel1.TabIndex = 6; - this.flowPanel1.Text = "flowPanel1"; - // - // button6 - // - this.button6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button6.Location = new System.Drawing.Point(433, 3); - this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(80, 32); - this.button6.TabIndex = 5; - this.button6.Text = "Info"; - this.button6.Type = AntdUI.TTypeMini.Info; - this.button6.WaveSize = 0; - // - // button5 - // - this.button5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button5.Location = new System.Drawing.Point(347, 3); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(80, 32); - this.button5.TabIndex = 4; - this.button5.Text = "Error"; - this.button5.Type = AntdUI.TTypeMini.Error; - this.button5.WaveSize = 0; - // - // button4 - // - 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(261, 3); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(80, 32); - this.button4.TabIndex = 3; - this.button4.Text = "Warn"; - this.button4.Type = AntdUI.TTypeMini.Warn; - this.button4.WaveSize = 0; - // - // button3 - // - 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(175, 3); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(80, 32); - this.button3.TabIndex = 2; - this.button3.Text = "Success"; - this.button3.Type = AntdUI.TTypeMini.Success; - this.button3.WaveSize = 0; - // - // button2 - // - 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(89, 3); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(80, 32); - this.button2.TabIndex = 1; - this.button2.Text = "Primary"; - this.button2.Type = AntdUI.TTypeMini.Primary; - this.button2.WaveSize = 0; - // - // button1 - // - this.button1.Cursor = System.Windows.Forms.Cursors.Default; - 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(3, 3); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(80, 32); - this.button1.TabIndex = 0; - this.button1.Text = "Default"; - this.button1.WaveSize = 0; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(694, 24); - this.label3.TabIndex = 5; - this.label3.Text = "按钮类型"; - this.label3.TooltipConfig = null; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(694, 12); - this.divider1.TabIndex = 4; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(694, 24); - this.label2.TabIndex = 1; - this.label2.Text = "按钮用于开始一个即时操作。"; - this.label2.TooltipConfig = null; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(694, 40); - this.label1.TabIndex = 0; - this.label1.Text = "Button 按钮"; - this.label1.TooltipConfig = null; - // - // label12 - // - this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(3, 251); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(694, 24); - this.label12.TabIndex = 37; - this.label12.Text = "加载状态附波浪效果"; - this.label12.TooltipConfig = null; - // - // flowPanel10 - // - this.flowPanel10.Controls.Add(this.button42); - this.flowPanel10.Controls.Add(this.button43); - this.flowPanel10.Controls.Add(this.button44); - this.flowPanel10.Controls.Add(this.button45); - this.flowPanel10.Controls.Add(this.button46); - this.flowPanel10.Controls.Add(this.button47); - this.flowPanel10.Location = new System.Drawing.Point(3, 281); - this.flowPanel10.Name = "flowPanel10"; - this.flowPanel10.Size = new System.Drawing.Size(694, 38); - this.flowPanel10.TabIndex = 38; - this.flowPanel10.Text = "flowPanel10"; - // - // button42 - // - this.button42.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button42.Loading = true; - this.button42.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.button42.LoadingWaveCount = 6; - this.button42.LoadingWaveSize = 6; - this.button42.LoadingWaveValue = 0.6F; - this.button42.LoadingWaveVertical = true; - this.button42.Location = new System.Drawing.Point(433, 3); - this.button42.Name = "button42"; - this.button42.Size = new System.Drawing.Size(80, 32); - this.button42.TabIndex = 5; - this.button42.Text = "Info"; - this.button42.Type = AntdUI.TTypeMini.Info; - this.button42.WaveSize = 0; - // - // button43 - // - this.button43.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button43.Loading = true; - this.button43.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.button43.LoadingWaveCount = 4; - this.button43.LoadingWaveSize = 4; - this.button43.LoadingWaveValue = 0.2F; - this.button43.LoadingWaveVertical = true; - this.button43.Location = new System.Drawing.Point(347, 3); - this.button43.Name = "button43"; - this.button43.Size = new System.Drawing.Size(80, 32); - this.button43.TabIndex = 4; - this.button43.Text = "Error"; - this.button43.Type = AntdUI.TTypeMini.Error; - this.button43.WaveSize = 0; - // - // button44 - // - this.button44.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button44.Loading = true; - this.button44.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.button44.LoadingWaveCount = 2; - this.button44.LoadingWaveValue = 0.1F; - this.button44.LoadingWaveVertical = true; - this.button44.Location = new System.Drawing.Point(261, 3); - this.button44.Name = "button44"; - this.button44.Size = new System.Drawing.Size(80, 32); - this.button44.TabIndex = 3; - this.button44.Text = "Warn"; - this.button44.Type = AntdUI.TTypeMini.Warn; - this.button44.WaveSize = 0; - // - // button45 - // - this.button45.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button45.Loading = true; - this.button45.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.button45.LoadingWaveCount = 4; - this.button45.LoadingWaveSize = 4; - this.button45.LoadingWaveValue = 0.6F; - this.button45.Location = new System.Drawing.Point(175, 3); - this.button45.Name = "button45"; - this.button45.Size = new System.Drawing.Size(80, 32); - this.button45.TabIndex = 2; - this.button45.Text = "Success"; - this.button45.Type = AntdUI.TTypeMini.Success; - this.button45.WaveSize = 0; - // - // button46 - // - this.button46.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button46.Loading = true; - this.button46.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.button46.LoadingWaveCount = 2; - this.button46.LoadingWaveValue = 0.2F; - this.button46.Location = new System.Drawing.Point(89, 3); - this.button46.Name = "button46"; - this.button46.Size = new System.Drawing.Size(80, 32); - this.button46.TabIndex = 1; - this.button46.Text = "Primary"; - this.button46.Type = AntdUI.TTypeMini.Primary; - this.button46.WaveSize = 0; - // - // button47 - // - this.button47.Cursor = System.Windows.Forms.Cursors.Default; - this.button47.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button47.Loading = true; - this.button47.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.button47.LoadingWaveSize = 1; - this.button47.LoadingWaveValue = 0.1F; - this.button47.Location = new System.Drawing.Point(3, 3); - this.button47.Name = "button47"; - this.button47.Size = new System.Drawing.Size(80, 32); - this.button47.TabIndex = 0; - this.button47.Text = "Default"; - this.button47.WaveSize = 0; - // // flowPanel8 // + this.flowPanel8.Controls.Add(this.button_toggle3); this.flowPanel8.Controls.Add(this.button_toggle2); this.flowPanel8.Controls.Add(this.button_toggle); this.flowPanel8.Location = new System.Drawing.Point(3, 835); @@ -519,6 +202,8 @@ // // flowPanel7 // + this.flowPanel7.Controls.Add(this.button49); + this.flowPanel7.Controls.Add(this.button48); this.flowPanel7.Controls.Add(this.button39); this.flowPanel7.Location = new System.Drawing.Point(3, 755); this.flowPanel7.Name = "flowPanel7"; @@ -1019,15 +704,380 @@ this.label4.Text = "文本按钮"; this.label4.TooltipConfig = null; // + // flowPanel10 + // + this.flowPanel10.Controls.Add(this.button42); + this.flowPanel10.Controls.Add(this.button43); + this.flowPanel10.Controls.Add(this.button44); + this.flowPanel10.Controls.Add(this.button45); + this.flowPanel10.Controls.Add(this.button46); + this.flowPanel10.Controls.Add(this.button47); + this.flowPanel10.Location = new System.Drawing.Point(3, 281); + this.flowPanel10.Name = "flowPanel10"; + this.flowPanel10.Size = new System.Drawing.Size(694, 38); + this.flowPanel10.TabIndex = 38; + this.flowPanel10.Text = "flowPanel10"; + // + // button42 + // + this.button42.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button42.Loading = true; + this.button42.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.button42.LoadingWaveCount = 6; + this.button42.LoadingWaveSize = 6; + this.button42.LoadingWaveValue = 0.6F; + this.button42.LoadingWaveVertical = true; + this.button42.Location = new System.Drawing.Point(433, 3); + this.button42.Name = "button42"; + this.button42.Size = new System.Drawing.Size(80, 32); + this.button42.TabIndex = 5; + this.button42.Text = "Info"; + this.button42.Type = AntdUI.TTypeMini.Info; + this.button42.WaveSize = 0; + // + // button43 + // + this.button43.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button43.Loading = true; + this.button43.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.button43.LoadingWaveCount = 4; + this.button43.LoadingWaveSize = 4; + this.button43.LoadingWaveValue = 0.2F; + this.button43.LoadingWaveVertical = true; + this.button43.Location = new System.Drawing.Point(347, 3); + this.button43.Name = "button43"; + this.button43.Size = new System.Drawing.Size(80, 32); + this.button43.TabIndex = 4; + this.button43.Text = "Error"; + this.button43.Type = AntdUI.TTypeMini.Error; + this.button43.WaveSize = 0; + // + // button44 + // + this.button44.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button44.Loading = true; + this.button44.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.button44.LoadingWaveCount = 2; + this.button44.LoadingWaveValue = 0.1F; + this.button44.LoadingWaveVertical = true; + this.button44.Location = new System.Drawing.Point(261, 3); + this.button44.Name = "button44"; + this.button44.Size = new System.Drawing.Size(80, 32); + this.button44.TabIndex = 3; + this.button44.Text = "Warn"; + this.button44.Type = AntdUI.TTypeMini.Warn; + this.button44.WaveSize = 0; + // + // button45 + // + this.button45.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button45.Loading = true; + this.button45.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.button45.LoadingWaveCount = 4; + this.button45.LoadingWaveSize = 4; + this.button45.LoadingWaveValue = 0.6F; + this.button45.Location = new System.Drawing.Point(175, 3); + this.button45.Name = "button45"; + this.button45.Size = new System.Drawing.Size(80, 32); + this.button45.TabIndex = 2; + this.button45.Text = "Success"; + this.button45.Type = AntdUI.TTypeMini.Success; + this.button45.WaveSize = 0; + // + // button46 + // + this.button46.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button46.Loading = true; + this.button46.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.button46.LoadingWaveCount = 2; + this.button46.LoadingWaveValue = 0.2F; + this.button46.Location = new System.Drawing.Point(89, 3); + this.button46.Name = "button46"; + this.button46.Size = new System.Drawing.Size(80, 32); + this.button46.TabIndex = 1; + this.button46.Text = "Primary"; + this.button46.Type = AntdUI.TTypeMini.Primary; + this.button46.WaveSize = 0; + // + // button47 + // + this.button47.Cursor = System.Windows.Forms.Cursors.Default; + this.button47.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button47.Loading = true; + this.button47.LoadingWaveColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.button47.LoadingWaveSize = 1; + this.button47.LoadingWaveValue = 0.1F; + this.button47.Location = new System.Drawing.Point(3, 3); + this.button47.Name = "button47"; + this.button47.Size = new System.Drawing.Size(80, 32); + this.button47.TabIndex = 0; + this.button47.Text = "Default"; + this.button47.WaveSize = 0; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(3, 251); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(694, 24); + this.label12.TabIndex = 37; + this.label12.Text = "加载状态附波浪效果"; + this.label12.TooltipConfig = null; + // + // flowPanel9 + // + this.flowPanel9.Controls.Add(this.button30); + this.flowPanel9.Controls.Add(this.button31); + this.flowPanel9.Controls.Add(this.button32); + this.flowPanel9.Controls.Add(this.button38); + this.flowPanel9.Controls.Add(this.button40); + this.flowPanel9.Controls.Add(this.button41); + this.flowPanel9.Location = new System.Drawing.Point(3, 201); + this.flowPanel9.Name = "flowPanel9"; + this.flowPanel9.Size = new System.Drawing.Size(694, 44); + this.flowPanel9.TabIndex = 22; + this.flowPanel9.Text = "flowPanel9"; + // + // button30 + // + this.button30.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button30.Location = new System.Drawing.Point(433, 3); + this.button30.Name = "button30"; + this.button30.Size = new System.Drawing.Size(80, 38); + this.button30.TabIndex = 5; + this.button30.Text = "Info"; + this.button30.Type = AntdUI.TTypeMini.Info; + // + // button31 + // + this.button31.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button31.Location = new System.Drawing.Point(347, 3); + this.button31.Name = "button31"; + this.button31.Size = new System.Drawing.Size(80, 38); + this.button31.TabIndex = 4; + this.button31.Text = "Error"; + this.button31.Type = AntdUI.TTypeMini.Error; + // + // button32 + // + this.button32.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button32.Location = new System.Drawing.Point(261, 3); + this.button32.Name = "button32"; + this.button32.Size = new System.Drawing.Size(80, 38); + this.button32.TabIndex = 3; + this.button32.Text = "Warn"; + this.button32.Type = AntdUI.TTypeMini.Warn; + // + // button38 + // + this.button38.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button38.Location = new System.Drawing.Point(175, 3); + this.button38.Name = "button38"; + this.button38.Size = new System.Drawing.Size(80, 38); + this.button38.TabIndex = 2; + this.button38.Text = "Success"; + this.button38.Type = AntdUI.TTypeMini.Success; + // + // button40 + // + this.button40.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button40.Location = new System.Drawing.Point(89, 3); + this.button40.Name = "button40"; + this.button40.Size = new System.Drawing.Size(80, 38); + this.button40.TabIndex = 1; + this.button40.Text = "Primary"; + this.button40.Type = AntdUI.TTypeMini.Primary; + // + // button41 + // + this.button41.Cursor = System.Windows.Forms.Cursors.Default; + this.button41.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button41.Location = new System.Drawing.Point(3, 3); + this.button41.Name = "button41"; + this.button41.Size = new System.Drawing.Size(80, 38); + this.button41.TabIndex = 0; + this.button41.Text = "Default"; + // + // label11 + // + this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label11.Location = new System.Drawing.Point(3, 171); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(694, 24); + this.label11.TabIndex = 21; + this.label11.Text = "水波效果"; + this.label11.TooltipConfig = null; + // + // flowPanel1 + // + this.flowPanel1.Controls.Add(this.button6); + this.flowPanel1.Controls.Add(this.button5); + this.flowPanel1.Controls.Add(this.button4); + this.flowPanel1.Controls.Add(this.button3); + this.flowPanel1.Controls.Add(this.button2); + this.flowPanel1.Controls.Add(this.button1); + this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Name = "flowPanel1"; + this.flowPanel1.Size = new System.Drawing.Size(694, 38); + this.flowPanel1.TabIndex = 6; + this.flowPanel1.Text = "flowPanel1"; + // + // button6 + // + this.button6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button6.Location = new System.Drawing.Point(433, 3); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(80, 32); + this.button6.TabIndex = 5; + this.button6.Text = "Info"; + this.button6.Type = AntdUI.TTypeMini.Info; + this.button6.WaveSize = 0; + // + // button5 + // + this.button5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button5.Location = new System.Drawing.Point(347, 3); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(80, 32); + this.button5.TabIndex = 4; + this.button5.Text = "Error"; + this.button5.Type = AntdUI.TTypeMini.Error; + this.button5.WaveSize = 0; + // + // button4 + // + 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(261, 3); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(80, 32); + this.button4.TabIndex = 3; + this.button4.Text = "Warn"; + this.button4.Type = AntdUI.TTypeMini.Warn; + this.button4.WaveSize = 0; + // + // button3 + // + 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(175, 3); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(80, 32); + this.button3.TabIndex = 2; + this.button3.Text = "Success"; + this.button3.Type = AntdUI.TTypeMini.Success; + this.button3.WaveSize = 0; + // + // button2 + // + 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(89, 3); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(80, 32); + this.button2.TabIndex = 1; + this.button2.Text = "Primary"; + this.button2.Type = AntdUI.TTypeMini.Primary; + this.button2.WaveSize = 0; + // + // button1 + // + this.button1.Cursor = System.Windows.Forms.Cursors.Default; + 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(3, 3); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(80, 32); + this.button1.TabIndex = 0; + this.button1.Text = "Default"; + this.button1.WaveSize = 0; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(694, 24); + this.label3.TabIndex = 5; + this.label3.Text = "按钮类型"; + this.label3.TooltipConfig = null; + // + // divider1 + // + this.divider1.Location = new System.Drawing.Point(3, 79); + this.divider1.Name = "divider1"; + this.divider1.Size = new System.Drawing.Size(694, 12); + this.divider1.TabIndex = 4; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(3, 49); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(694, 24); + this.label2.TabIndex = 1; + this.label2.Text = "按钮用于开始一个即时操作。"; + this.label2.TooltipConfig = null; + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(3, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(694, 40); + this.label1.TabIndex = 0; + this.label1.Text = "Button 按钮"; + this.label1.TooltipConfig = null; + // + // button48 + // + this.button48.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(134)))), ((int)(((byte)(147)))), ((int)(((byte)(171))))); + this.button48.BackExtend = "135, #8693AB, #BDD4E7"; + this.button48.BackHover = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(212)))), ((int)(((byte)(231))))); + this.button48.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button48.IconSvg = resources.GetString("button48.IconSvg"); + this.button48.Location = new System.Drawing.Point(175, 3); + this.button48.Name = "button48"; + this.button48.Size = new System.Drawing.Size(166, 38); + this.button48.TabIndex = 8; + this.button48.Text = "Gradient Button"; + this.button48.Type = AntdUI.TTypeMini.Primary; + // + // button49 + // + this.button49.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(174))))); + this.button49.BackExtend = "45, #a8edea, #fed6e3"; + this.button49.BackHover = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(214)))), ((int)(((byte)(227))))); + this.button49.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button49.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.button49.IconSvg = resources.GetString("button49.IconSvg"); + this.button49.Location = new System.Drawing.Point(347, 3); + this.button49.Name = "button49"; + this.button49.Size = new System.Drawing.Size(166, 38); + this.button49.TabIndex = 9; + this.button49.Text = "Gradient Button"; + this.button49.Type = AntdUI.TTypeMini.Primary; + // + // button_toggle3 + // + this.button_toggle3.Cursor = System.Windows.Forms.Cursors.Default; + this.button_toggle3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.button_toggle3.IconPosition = AntdUI.TAlignMini.Right; + this.button_toggle3.Location = new System.Drawing.Point(175, 3); + this.button_toggle3.Name = "button_toggle3"; + this.button_toggle3.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.button_toggle3.Size = new System.Drawing.Size(80, 38); + this.button_toggle3.TabIndex = 2; + this.button_toggle3.Text = "搜索"; + this.button_toggle3.Toggle = true; + this.button_toggle3.ToggleBackActive = System.Drawing.Color.FromArgb(((int)(((byte)(134)))), ((int)(((byte)(147)))), ((int)(((byte)(171))))); + this.button_toggle3.ToggleBackExtend = "135, #8693AB, #BDD4E7"; + this.button_toggle3.ToggleBackHover = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(212)))), ((int)(((byte)(231))))); + this.button_toggle3.ToggleIconSvg = resources.GetString("button_toggle3.ToggleIconSvg"); + this.button_toggle3.ToggleType = AntdUI.TTypeMini.Primary; + // // ButtonDemo // this.Controls.Add(this.stackPanel1); this.Name = "ButtonDemo"; this.Size = new System.Drawing.Size(700, 914); this.stackPanel1.ResumeLayout(false); - this.flowPanel9.ResumeLayout(false); - this.flowPanel1.ResumeLayout(false); - this.flowPanel10.ResumeLayout(false); this.flowPanel8.ResumeLayout(false); this.flowPanel7.ResumeLayout(false); this.flowPanel6.ResumeLayout(false); @@ -1037,6 +1087,9 @@ this.flowPanel4.ResumeLayout(false); this.flowPanel3.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); + this.flowPanel10.ResumeLayout(false); + this.flowPanel9.ResumeLayout(false); + this.flowPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -1118,5 +1171,8 @@ private AntdUI.Button button46; private AntdUI.Button button47; private AntdUI.Label label12; + private AntdUI.Button button49; + private AntdUI.Button button48; + private AntdUI.Button button_toggle3; } } diff --git a/Views/ButtonDemo.cs b/Views/ButtonDemo.cs index 0af96c9..06ef467 100644 --- a/Views/ButtonDemo.cs +++ b/Views/ButtonDemo.cs @@ -23,6 +23,7 @@ namespace AntdUIDemo.Views { button_toggle.Click += Button_toggle_Click; button_toggle2.Click += Button_toggle_Click; + button_toggle3.Click += Button_toggle_Click; } private void Button_toggle_Click(object sender, EventArgs e) @@ -48,7 +49,9 @@ namespace AntdUIDemo.Views bool joinleft = button.JoinLeft; bool joinright = button.JoinRight; var iconsvg = button.IconSvg; + var backactive = button.BackActive; var backentend = button.BackExtend; + var backhover = button.BackHover; var toggle = button.Toggle; var toggletype = button.ToggleType; var toggleiconsvg = button.ToggleIconSvg; @@ -88,10 +91,18 @@ namespace AntdUIDemo.Views { tooltipText.AppendLine($"IconSvg: 参见IconSvg属性"); } + if (backactive != null) + { + tooltipText.AppendLine($"BackActive: {backactive}"); + } if (!string.IsNullOrEmpty(backentend)) { tooltipText.AppendLine($"BackExtend: {backentend}"); } + if (backhover != null) + { + tooltipText.AppendLine($"BackHover: {backhover}"); + } if (toggle) { tooltipText.AppendLine($"Toggle: {toggle}"); diff --git a/Views/ButtonDemo.resx b/Views/ButtonDemo.resx index 73a807d..52cb321 100644 --- a/Views/ButtonDemo.resx +++ b/Views/ButtonDemo.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <svg viewBox="64 64 896 896" focusable="false" data-icon="poweroff" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M705.6 124.9a8 8 0 00-11.6 7.2v64.2c0 5.5 2.9 10.6 7.5 13.6a352.2 352.2 0 0162.2 49.8c32.7 32.8 58.4 70.9 76.3 113.3a355 355 0 0127.9 138.7c0 48.1-9.4 94.8-27.9 138.7a355.92 355.92 0 01-76.3 113.3 353.06 353.06 0 01-113.2 76.4c-43.8 18.6-90.5 28-138.5 28s-94.7-9.4-138.5-28a353.06 353.06 0 01-113.2-76.4A355.92 355.92 0 01184 650.4a355 355 0 01-27.9-138.7c0-48.1 9.4-94.8 27.9-138.7 17.9-42.4 43.6-80.5 76.3-113.3 19-19 39.8-35.6 62.2-49.8 4.7-2.9 7.5-8.1 7.5-13.6V132c0-6-6.3-9.8-11.6-7.2C178.5 195.2 82 339.3 80 506.3 77.2 745.1 272.5 943.5 511.2 944c239 .5 432.8-193.3 432.8-432.4 0-169.2-97-315.7-238.4-386.7zM480 560h64c4.4 0 8-3.6 8-8V88c0-4.4-3.6-8-8-8h-64c-4.4 0-8 3.6-8 8v464c0 4.4 3.6 8 8 8z"></path></svg> + <svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg> @@ -129,6 +132,12 @@ <svg viewBox="64 64 896 896" focusable="false" data-icon="poweroff" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M705.6 124.9a8 8 0 00-11.6 7.2v64.2c0 5.5 2.9 10.6 7.5 13.6a352.2 352.2 0 0162.2 49.8c32.7 32.8 58.4 70.9 76.3 113.3a355 355 0 0127.9 138.7c0 48.1-9.4 94.8-27.9 138.7a355.92 355.92 0 01-76.3 113.3 353.06 353.06 0 01-113.2 76.4c-43.8 18.6-90.5 28-138.5 28s-94.7-9.4-138.5-28a353.06 353.06 0 01-113.2-76.4A355.92 355.92 0 01184 650.4a355 355 0 01-27.9-138.7c0-48.1 9.4-94.8 27.9-138.7 17.9-42.4 43.6-80.5 76.3-113.3 19-19 39.8-35.6 62.2-49.8 4.7-2.9 7.5-8.1 7.5-13.6V132c0-6-6.3-9.8-11.6-7.2C178.5 195.2 82 339.3 80 506.3 77.2 745.1 272.5 943.5 511.2 944c239 .5 432.8-193.3 432.8-432.4 0-169.2-97-315.7-238.4-386.7zM480 560h64c4.4 0 8-3.6 8-8V88c0-4.4-3.6-8-8-8h-64c-4.4 0-8 3.6-8 8v464c0 4.4 3.6 8 8 8z"></path></svg> + + <svg viewBox="64 64 896 896"><path d="M716.3 313.8c19-18.9 19-49.7 0-68.6l-69.9-69.9.1.1c-18.5-18.5-50.3-50.3-95.3-95.2-21.2-20.7-55.5-20.5-76.5.5L80.9 474.2a53.84 53.84 0 000 76.4L474.6 944a54.14 54.14 0 0076.5 0l165.1-165c19-18.9 19-49.7 0-68.6a48.7 48.7 0 00-68.7 0l-125 125.2c-5.2 5.2-13.3 5.2-18.5 0L189.5 521.4c-5.2-5.2-5.2-13.3 0-18.5l314.4-314.2c.4-.4.9-.7 1.3-1.1 5.2-4.1 12.4-3.7 17.2 1.1l125.2 125.1c19 19 49.8 19 68.7 0zM408.6 514.4a106.3 106.2 0 10212.6 0 106.3 106.2 0 10-212.6 0zm536.2-38.6L821.9 353.5c-19-18.9-49.8-18.9-68.7.1a48.4 48.4 0 000 68.6l83 82.9c5.2 5.2 5.2 13.3 0 18.5l-81.8 81.7a48.4 48.4 0 000 68.6 48.7 48.7 0 0068.7 0l121.8-121.7a53.93 53.93 0 00-.1-76.4z"></path></svg> + + + <svg viewBox="64 64 896 896"><path d="M716.3 313.8c19-18.9 19-49.7 0-68.6l-69.9-69.9.1.1c-18.5-18.5-50.3-50.3-95.3-95.2-21.2-20.7-55.5-20.5-76.5.5L80.9 474.2a53.84 53.84 0 000 76.4L474.6 944a54.14 54.14 0 0076.5 0l165.1-165c19-18.9 19-49.7 0-68.6a48.7 48.7 0 00-68.7 0l-125 125.2c-5.2 5.2-13.3 5.2-18.5 0L189.5 521.4c-5.2-5.2-5.2-13.3 0-18.5l314.4-314.2c.4-.4.9-.7 1.3-1.1 5.2-4.1 12.4-3.7 17.2 1.1l125.2 125.1c19 19 49.8 19 68.7 0zM408.6 514.4a106.3 106.2 0 10212.6 0 106.3 106.2 0 10-212.6 0zm536.2-38.6L821.9 353.5c-19-18.9-49.8-18.9-68.7.1a48.4 48.4 0 000 68.6l83 82.9c5.2 5.2 5.2 13.3 0 18.5l-81.8 81.7a48.4 48.4 0 000 68.6 48.7 48.7 0 0068.7 0l121.8-121.7a53.93 53.93 0 00-.1-76.4z"></path></svg> + <svg viewBox="64 64 896 896"><path d="M716.3 313.8c19-18.9 19-49.7 0-68.6l-69.9-69.9.1.1c-18.5-18.5-50.3-50.3-95.3-95.2-21.2-20.7-55.5-20.5-76.5.5L80.9 474.2a53.84 53.84 0 000 76.4L474.6 944a54.14 54.14 0 0076.5 0l165.1-165c19-18.9 19-49.7 0-68.6a48.7 48.7 0 00-68.7 0l-125 125.2c-5.2 5.2-13.3 5.2-18.5 0L189.5 521.4c-5.2-5.2-5.2-13.3 0-18.5l314.4-314.2c.4-.4.9-.7 1.3-1.1 5.2-4.1 12.4-3.7 17.2 1.1l125.2 125.1c19 19 49.8 19 68.7 0zM408.6 514.4a106.3 106.2 0 10212.6 0 106.3 106.2 0 10-212.6 0zm536.2-38.6L821.9 353.5c-19-18.9-49.8-18.9-68.7.1a48.4 48.4 0 000 68.6l83 82.9c5.2 5.2 5.2 13.3 0 18.5l-81.8 81.7a48.4 48.4 0 000 68.6 48.7 48.7 0 0068.7 0l121.8-121.7a53.93 53.93 0 00-.1-76.4z"></path></svg> diff --git a/Views/InputDemo.Designer.cs b/Views/InputDemo.Designer.cs index 1f6db89..3cb96d5 100644 --- a/Views/InputDemo.Designer.cs +++ b/Views/InputDemo.Designer.cs @@ -76,6 +76,12 @@ this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); this.tooltipComponent1 = new AntdUI.TooltipComponent(); + this.flowPanel10 = new AntdUI.FlowPanel(); + this.label12 = new AntdUI.Label(); + this.input21 = new AntdUI.Input(); + this.input19 = new AntdUI.Input(); + this.input22 = new AntdUI.Input(); + this.input23 = new AntdUI.Input(); this.stackPanel1.SuspendLayout(); this.flowPanel9.SuspendLayout(); this.flowPanel8.SuspendLayout(); @@ -88,10 +94,13 @@ this.flowPanel4.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); + this.flowPanel10.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 // + this.stackPanel1.Controls.Add(this.flowPanel10); + this.stackPanel1.Controls.Add(this.label12); this.stackPanel1.Controls.Add(this.flowPanel9); this.stackPanel1.Controls.Add(this.label11); this.stackPanel1.Controls.Add(this.flowPanel8); @@ -116,7 +125,7 @@ this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.stackPanel1.Location = new System.Drawing.Point(0, 0); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(700, 821); + this.stackPanel1.Size = new System.Drawing.Size(700, 882); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -497,6 +506,7 @@ // // flowPanel2 // + this.flowPanel2.Controls.Add(this.input23); this.flowPanel2.Controls.Add(this.input2); this.flowPanel2.Controls.Add(this.input4); this.flowPanel2.Location = new System.Drawing.Point(3, 201); @@ -629,12 +639,81 @@ this.tooltipComponent1.ArrowAlign = AntdUI.TAlign.TL; this.tooltipComponent1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); // + // flowPanel10 + // + this.flowPanel10.Controls.Add(this.input19); + this.flowPanel10.Controls.Add(this.input22); + this.flowPanel10.Controls.Add(this.input21); + this.flowPanel10.Location = new System.Drawing.Point(3, 831); + this.flowPanel10.Name = "flowPanel10"; + this.flowPanel10.Size = new System.Drawing.Size(694, 38); + this.flowPanel10.TabIndex = 30; + this.flowPanel10.Text = "flowPanel10"; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(3, 801); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(694, 24); + this.label12.TabIndex = 29; + this.label12.Text = "渐变背景"; + this.label12.TooltipConfig = null; + // + // input21 + // + this.input21.BackExtend = "135, #6253E1, #04BEFE"; + this.input21.Badge = ""; + this.input21.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.input21.Location = new System.Drawing.Point(3, 3); + this.input21.Name = "input21"; + this.input21.Size = new System.Drawing.Size(200, 32); + this.input21.TabIndex = 2; + this.input21.WaveSize = 0; + // + // input19 + // + this.input19.BackExtend = "45, #a8edea, #fed6e3"; + this.input19.Badge = ""; + this.input19.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.input19.Location = new System.Drawing.Point(415, 3); + this.input19.Name = "input19"; + this.input19.Size = new System.Drawing.Size(200, 32); + this.input19.TabIndex = 4; + this.input19.WaveSize = 0; + // + // input22 + // + this.input22.BackExtend = "135, #8693AB, #BDD4E7"; + this.input22.Badge = ""; + this.input22.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.input22.Location = new System.Drawing.Point(209, 3); + this.input22.Name = "input22"; + this.input22.Size = new System.Drawing.Size(200, 32); + this.input22.TabIndex = 3; + this.input22.WaveSize = 0; + // + // input23 + // + this.input23.Badge = ""; + this.input23.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.input23.Location = new System.Drawing.Point(415, 3); + this.input23.Name = "input23"; + this.input23.PlaceholderText = "标签颜色"; + this.input23.PrefixFore = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(150)))), ((int)(((byte)(243))))); + this.input23.PrefixSvg = "WindowsFilled"; + this.input23.Size = new System.Drawing.Size(200, 32); + this.input23.SuffixFore = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.input23.SuffixSvg = "AppleFilled"; + this.input23.TabIndex = 7; + this.input23.WaveSize = 0; + // // InputDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); this.Name = "InputDemo"; - this.Size = new System.Drawing.Size(700, 821); + this.Size = new System.Drawing.Size(700, 882); this.stackPanel1.ResumeLayout(false); this.flowPanel9.ResumeLayout(false); this.flowPanel8.ResumeLayout(false); @@ -647,6 +726,7 @@ this.flowPanel4.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); this.flowPanel1.ResumeLayout(false); + this.flowPanel10.ResumeLayout(false); this.ResumeLayout(false); } @@ -700,5 +780,11 @@ private AntdUI.Input input20; private AntdUI.Label label11; private AntdUI.Input input18; + private AntdUI.FlowPanel flowPanel10; + private AntdUI.Label label12; + private AntdUI.Input input21; + private AntdUI.Input input19; + private AntdUI.Input input22; + private AntdUI.Input input23; } } diff --git a/Views/InputDemo.resx b/Views/InputDemo.resx index eb36694..0c8c889 100644 --- a/Views/InputDemo.resx +++ b/Views/InputDemo.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg> + + + <svg viewBox="64 64 896 896" focusable="false" data-icon="poweroff" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M705.6 124.9a8 8 0 00-11.6 7.2v64.2c0 5.5 2.9 10.6 7.5 13.6a352.2 352.2 0 0162.2 49.8c32.7 32.8 58.4 70.9 76.3 113.3a355 355 0 0127.9 138.7c0 48.1-9.4 94.8-27.9 138.7a355.92 355.92 0 01-76.3 113.3 353.06 353.06 0 01-113.2 76.4c-43.8 18.6-90.5 28-138.5 28s-94.7-9.4-138.5-28a353.06 353.06 0 01-113.2-76.4A355.92 355.92 0 01184 650.4a355 355 0 01-27.9-138.7c0-48.1 9.4-94.8 27.9-138.7 17.9-42.4 43.6-80.5 76.3-113.3 19-19 39.8-35.6 62.2-49.8 4.7-2.9 7.5-8.1 7.5-13.6V132c0-6-6.3-9.8-11.6-7.2C178.5 195.2 82 339.3 80 506.3 77.2 745.1 272.5 943.5 511.2 944c239 .5 432.8-193.3 432.8-432.4 0-169.2-97-315.7-238.4-386.7zM480 560h64c4.4 0 8-3.6 8-8V88c0-4.4-3.6-8-8-8h-64c-4.4 0-8 3.6-8 8v464c0 4.4 3.6 8 8 8z"></path></svg> + 17, 17 @@ -126,10 +132,10 @@ <svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg> - - <svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg> - - - <svg viewBox="64 64 896 896" focusable="false" data-icon="poweroff" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M705.6 124.9a8 8 0 00-11.6 7.2v64.2c0 5.5 2.9 10.6 7.5 13.6a352.2 352.2 0 0162.2 49.8c32.7 32.8 58.4 70.9 76.3 113.3a355 355 0 0127.9 138.7c0 48.1-9.4 94.8-27.9 138.7a355.92 355.92 0 01-76.3 113.3 353.06 353.06 0 01-113.2 76.4c-43.8 18.6-90.5 28-138.5 28s-94.7-9.4-138.5-28a353.06 353.06 0 01-113.2-76.4A355.92 355.92 0 01184 650.4a355 355 0 01-27.9-138.7c0-48.1 9.4-94.8 27.9-138.7 17.9-42.4 43.6-80.5 76.3-113.3 19-19 39.8-35.6 62.2-49.8 4.7-2.9 7.5-8.1 7.5-13.6V132c0-6-6.3-9.8-11.6-7.2C178.5 195.2 82 339.3 80 506.3 77.2 745.1 272.5 943.5 511.2 944c239 .5 432.8-193.3 432.8-432.4 0-169.2-97-315.7-238.4-386.7zM480 560h64c4.4 0 8-3.6 8-8V88c0-4.4-3.6-8-8-8h-64c-4.4 0-8 3.6-8 8v464c0 4.4 3.6 8 8 8z"></path></svg> - + + 17, 17 + + + 52 + \ No newline at end of file diff --git a/Views/ModalDemo.cs b/Views/ModalDemo.cs index b03e087..3485720 100644 --- a/Views/ModalDemo.cs +++ b/Views/ModalDemo.cs @@ -81,7 +81,9 @@ namespace AntdUIDemo.Views OkText = "Search On Google", OnOk = config => { + //模拟耗时操作 Thread.Sleep(2000); + AntdUI.Message.info(window, config.OkText, autoClose: 1); return true; }, OnBtns = button => diff --git a/Views/PanelDemo.Designer.cs b/Views/PanelDemo.Designer.cs index ef4c21c..5ae5ca0 100644 --- a/Views/PanelDemo.Designer.cs +++ b/Views/PanelDemo.Designer.cs @@ -31,32 +31,13 @@ this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel2 = new AntdUI.StackPanel(); this.stackPanel15 = new AntdUI.StackPanel(); - this.panel = new AntdUI.Panel(); this.stackPanel13 = new AntdUI.StackPanel(); this.input_shadowOH = new AntdUI.InputNumber(); this.label12 = new AntdUI.Label(); this.stackPanel14 = new AntdUI.StackPanel(); + this.switch_shadowOA = new AntdUI.Switch(); this.label13 = new AntdUI.Label(); this.stackPanel3 = new AntdUI.StackPanel(); - this.buttonCZ = new AntdUI.Button(); - this.stackPanel12 = new AntdUI.StackPanel(); - this.input_shadowO = new AntdUI.InputNumber(); - this.label11 = new AntdUI.Label(); - this.stackPanel11 = new AntdUI.StackPanel(); - this.input_shadowY = new AntdUI.InputNumber(); - this.label9 = new AntdUI.Label(); - this.stackPanel10 = new AntdUI.StackPanel(); - this.input_shadowX = new AntdUI.InputNumber(); - this.label8 = new AntdUI.Label(); - this.stackPanel9 = new AntdUI.StackPanel(); - this.colorPicker_shadow = new AntdUI.ColorPicker(); - this.label7 = new AntdUI.Label(); - this.stackPanel8 = new AntdUI.StackPanel(); - this.select_shadowalign = new AntdUI.Select(); - this.label6 = new AntdUI.Label(); - this.stackPanel7 = new AntdUI.StackPanel(); - this.input_shadow = new AntdUI.InputNumber(); - this.label5 = new AntdUI.Label(); this.stackPanel17 = new AntdUI.StackPanel(); this.input_borderwidth = new AntdUI.InputNumber(); this.label15 = new AntdUI.Label(); @@ -75,24 +56,47 @@ this.divider1 = new AntdUI.Divider(); this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); - this.switch_shadowOA = new AntdUI.Switch(); + this.buttonCZ = new AntdUI.Button(); + this.panel = new AntdUI.Panel(); + this.stackPanel18 = new AntdUI.StackPanel(); + this.select_borderstyle = new AntdUI.Select(); + this.label16 = new AntdUI.Label(); + this.stackPanel12 = new AntdUI.StackPanel(); + this.input_shadowO = new AntdUI.InputNumber(); + this.label11 = new AntdUI.Label(); + this.stackPanel11 = new AntdUI.StackPanel(); + this.input_shadowY = new AntdUI.InputNumber(); + this.label9 = new AntdUI.Label(); + this.stackPanel10 = new AntdUI.StackPanel(); + this.input_shadowX = new AntdUI.InputNumber(); + this.label8 = new AntdUI.Label(); + this.stackPanel9 = new AntdUI.StackPanel(); + this.colorPicker_shadow = new AntdUI.ColorPicker(); + this.label7 = new AntdUI.Label(); + this.stackPanel8 = new AntdUI.StackPanel(); + this.select_shadowalign = new AntdUI.Select(); + this.label6 = new AntdUI.Label(); + this.stackPanel7 = new AntdUI.StackPanel(); + this.input_shadow = new AntdUI.InputNumber(); + this.label5 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel15.SuspendLayout(); this.stackPanel13.SuspendLayout(); this.stackPanel14.SuspendLayout(); this.stackPanel3.SuspendLayout(); + this.stackPanel17.SuspendLayout(); + this.stackPanel16.SuspendLayout(); + this.stackPanel6.SuspendLayout(); + this.stackPanel5.SuspendLayout(); + this.stackPanel4.SuspendLayout(); + this.stackPanel18.SuspendLayout(); this.stackPanel12.SuspendLayout(); this.stackPanel11.SuspendLayout(); this.stackPanel10.SuspendLayout(); this.stackPanel9.SuspendLayout(); this.stackPanel8.SuspendLayout(); this.stackPanel7.SuspendLayout(); - this.stackPanel17.SuspendLayout(); - this.stackPanel16.SuspendLayout(); - this.stackPanel6.SuspendLayout(); - this.stackPanel5.SuspendLayout(); - this.stackPanel4.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -104,7 +108,7 @@ this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.stackPanel1.Location = new System.Drawing.Point(0, 0); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(700, 560); + this.stackPanel1.Size = new System.Drawing.Size(750, 560); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -115,13 +119,14 @@ this.stackPanel2.Controls.Add(this.stackPanel3); this.stackPanel2.Location = new System.Drawing.Point(3, 97); this.stackPanel2.Name = "stackPanel2"; - this.stackPanel2.Size = new System.Drawing.Size(694, 469); + this.stackPanel2.Size = new System.Drawing.Size(744, 469); this.stackPanel2.TabIndex = 9; this.stackPanel2.Text = "stackPanel2"; // // stackPanel15 // this.stackPanel15.Controls.Add(this.panel); + this.stackPanel15.Controls.Add(this.buttonCZ); this.stackPanel15.Controls.Add(this.stackPanel13); this.stackPanel15.Controls.Add(this.stackPanel14); this.stackPanel15.Location = new System.Drawing.Point(259, 3); @@ -131,17 +136,6 @@ this.stackPanel15.Text = "stackPanel15"; this.stackPanel15.Vertical = true; // - // panel - // - this.panel.BackColor = System.Drawing.Color.Transparent; - this.panel.Location = new System.Drawing.Point(3, 79); - this.panel.Name = "panel"; - this.panel.Shadow = 12; - this.panel.ShadowOpacityAnimation = true; - this.panel.Size = new System.Drawing.Size(456, 298); - this.panel.TabIndex = 35; - this.panel.Text = "panel1"; - // // stackPanel13 // this.stackPanel13.Controls.Add(this.input_shadowOH); @@ -191,7 +185,6 @@ this.label12.Size = new System.Drawing.Size(220, 26); this.label12.TabIndex = 4; this.label12.Text = "ShadowOpacityHover"; - this.label12.TooltipConfig = null; // // stackPanel14 // @@ -203,6 +196,16 @@ this.stackPanel14.TabIndex = 29; this.stackPanel14.Text = "stackPanel14"; // + // switch_shadowOA + // + this.switch_shadowOA.AutoCheck = true; + this.switch_shadowOA.Checked = true; + this.switch_shadowOA.Location = new System.Drawing.Point(229, 3); + this.switch_shadowOA.Name = "switch_shadowOA"; + this.switch_shadowOA.Size = new System.Drawing.Size(50, 26); + this.switch_shadowOA.TabIndex = 12; + this.switch_shadowOA.Text = "switch1"; + // // label13 // this.label13.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -211,17 +214,16 @@ this.label13.Size = new System.Drawing.Size(220, 26); this.label13.TabIndex = 4; this.label13.Text = "ShadowOpacityAnimation"; - this.label13.TooltipConfig = null; // // stackPanel3 // - this.stackPanel3.Controls.Add(this.buttonCZ); this.stackPanel3.Controls.Add(this.stackPanel12); this.stackPanel3.Controls.Add(this.stackPanel11); this.stackPanel3.Controls.Add(this.stackPanel10); this.stackPanel3.Controls.Add(this.stackPanel9); this.stackPanel3.Controls.Add(this.stackPanel8); this.stackPanel3.Controls.Add(this.stackPanel7); + this.stackPanel3.Controls.Add(this.stackPanel18); this.stackPanel3.Controls.Add(this.stackPanel17); this.stackPanel3.Controls.Add(this.stackPanel16); this.stackPanel3.Controls.Add(this.stackPanel6); @@ -234,25 +236,263 @@ this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; // + // stackPanel17 + // + this.stackPanel17.Controls.Add(this.input_borderwidth); + this.stackPanel17.Controls.Add(this.label15); + this.stackPanel17.Location = new System.Drawing.Point(3, 155); + this.stackPanel17.Name = "stackPanel17"; + this.stackPanel17.Size = new System.Drawing.Size(244, 32); + this.stackPanel17.TabIndex = 28; + this.stackPanel17.Text = "stackPanel17"; + // + // input_borderwidth + // + this.input_borderwidth.DecimalPlaces = 2; + this.input_borderwidth.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_borderwidth.Location = new System.Drawing.Point(139, 3); + this.input_borderwidth.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_borderwidth.Name = "input_borderwidth"; + this.input_borderwidth.Size = new System.Drawing.Size(100, 26); + this.input_borderwidth.TabIndex = 5; + this.input_borderwidth.Text = "0.00"; + this.input_borderwidth.WaveSize = 0; + // + // label15 + // + this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(3, 3); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(130, 26); + this.label15.TabIndex = 4; + this.label15.Text = "BorderWidth"; + // + // stackPanel16 + // + this.stackPanel16.Controls.Add(this.colorPicker_border); + this.stackPanel16.Controls.Add(this.label14); + this.stackPanel16.Location = new System.Drawing.Point(3, 117); + this.stackPanel16.Name = "stackPanel16"; + this.stackPanel16.Size = new System.Drawing.Size(244, 32); + this.stackPanel16.TabIndex = 27; + this.stackPanel16.Text = "stackPanel16"; + // + // colorPicker_border + // + this.colorPicker_border.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker_border.Location = new System.Drawing.Point(139, 3); + this.colorPicker_border.Name = "colorPicker_border"; + this.colorPicker_border.ShowText = true; + this.colorPicker_border.Size = new System.Drawing.Size(100, 26); + this.colorPicker_border.TabIndex = 5; + this.colorPicker_border.Text = "colorPicker1"; + this.colorPicker_border.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker_border.WaveSize = 0; + // + // label14 + // + this.label14.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.Location = new System.Drawing.Point(3, 3); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(130, 26); + this.label14.TabIndex = 4; + this.label14.Text = "BorderColor"; + // + // stackPanel6 + // + this.stackPanel6.Controls.Add(this.input_radius); + this.stackPanel6.Controls.Add(this.label4); + this.stackPanel6.Location = new System.Drawing.Point(3, 79); + this.stackPanel6.Name = "stackPanel6"; + this.stackPanel6.Size = new System.Drawing.Size(244, 32); + this.stackPanel6.TabIndex = 12; + this.stackPanel6.Text = "stackPanel6"; + // + // input_radius + // + this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_radius.Location = new System.Drawing.Point(139, 3); + this.input_radius.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_radius.Name = "input_radius"; + this.input_radius.Size = new System.Drawing.Size(100, 26); + this.input_radius.TabIndex = 5; + this.input_radius.Text = "6"; + this.input_radius.Value = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.input_radius.WaveSize = 0; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(3, 3); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(130, 26); + this.label4.TabIndex = 4; + this.label4.Text = "Radius"; + // + // stackPanel5 + // + this.stackPanel5.Controls.Add(this.input_arrowsize); + this.stackPanel5.Controls.Add(this.label3); + this.stackPanel5.Location = new System.Drawing.Point(3, 41); + this.stackPanel5.Name = "stackPanel5"; + this.stackPanel5.Size = new System.Drawing.Size(244, 32); + this.stackPanel5.TabIndex = 11; + this.stackPanel5.Text = "stackPanel5"; + // + // input_arrowsize + // + this.input_arrowsize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_arrowsize.Location = new System.Drawing.Point(139, 3); + this.input_arrowsize.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_arrowsize.Name = "input_arrowsize"; + this.input_arrowsize.Size = new System.Drawing.Size(100, 26); + this.input_arrowsize.TabIndex = 5; + this.input_arrowsize.Text = "8"; + this.input_arrowsize.Value = new decimal(new int[] { + 8, + 0, + 0, + 0}); + this.input_arrowsize.WaveSize = 0; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 3); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(130, 26); + this.label3.TabIndex = 4; + this.label3.Text = "ArrowSize"; + // + // stackPanel4 + // + this.stackPanel4.Controls.Add(this.select_arrowalign); + this.stackPanel4.Controls.Add(this.label10); + this.stackPanel4.Location = new System.Drawing.Point(3, 3); + this.stackPanel4.Name = "stackPanel4"; + this.stackPanel4.Size = new System.Drawing.Size(244, 32); + this.stackPanel4.TabIndex = 10; + this.stackPanel4.Text = "stackPanel4"; + // + // select_arrowalign + // + this.select_arrowalign.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.select_arrowalign.List = true; + this.select_arrowalign.Location = new System.Drawing.Point(139, 3); + this.select_arrowalign.Name = "select_arrowalign"; + this.select_arrowalign.Size = new System.Drawing.Size(100, 26); + this.select_arrowalign.TabIndex = 11; + this.select_arrowalign.WaveSize = 0; + // + // label10 + // + this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(3, 3); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(130, 26); + this.label10.TabIndex = 4; + this.label10.Text = "ArrowAlign"; + // + // divider1 + // + this.divider1.Location = new System.Drawing.Point(3, 79); + this.divider1.Name = "divider1"; + this.divider1.Size = new System.Drawing.Size(744, 12); + this.divider1.TabIndex = 8; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(3, 49); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(744, 24); + this.label2.TabIndex = 7; + this.label2.Text = "普通布局面板"; + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(3, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(744, 40); + this.label1.TabIndex = 6; + this.label1.Text = "Panel 面板"; + // // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonCZ.Location = new System.Drawing.Point(3, 421); + this.buttonCZ.Location = new System.Drawing.Point(3, 79); this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(244, 32); - this.buttonCZ.TabIndex = 35; + this.buttonCZ.Size = new System.Drawing.Size(456, 32); + this.buttonCZ.TabIndex = 36; this.buttonCZ.Text = "重 置"; this.buttonCZ.Type = AntdUI.TTypeMini.Warn; this.buttonCZ.WaveSize = 0; // + // panel + // + this.panel.BackColor = System.Drawing.Color.Transparent; + this.panel.Location = new System.Drawing.Point(3, 117); + this.panel.Name = "panel"; + this.panel.Shadow = 12; + this.panel.ShadowOpacityAnimation = true; + this.panel.Size = new System.Drawing.Size(456, 298); + this.panel.TabIndex = 37; + this.panel.Text = "panel1"; + // + // stackPanel18 + // + this.stackPanel18.Controls.Add(this.select_borderstyle); + this.stackPanel18.Controls.Add(this.label16); + this.stackPanel18.Location = new System.Drawing.Point(3, 193); + this.stackPanel18.Name = "stackPanel18"; + this.stackPanel18.Size = new System.Drawing.Size(244, 32); + this.stackPanel18.TabIndex = 35; + this.stackPanel18.Text = "stackPanel18"; + // + // select_borderstyle + // + this.select_borderstyle.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.select_borderstyle.List = true; + this.select_borderstyle.Location = new System.Drawing.Point(139, 3); + this.select_borderstyle.Name = "select_borderstyle"; + this.select_borderstyle.Size = new System.Drawing.Size(100, 26); + this.select_borderstyle.TabIndex = 11; + this.select_borderstyle.WaveSize = 0; + // + // label16 + // + this.label16.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label16.Location = new System.Drawing.Point(3, 3); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(130, 26); + this.label16.TabIndex = 4; + this.label16.Text = "BorderStyle"; + // // stackPanel12 // this.stackPanel12.Controls.Add(this.input_shadowO); this.stackPanel12.Controls.Add(this.label11); - this.stackPanel12.Location = new System.Drawing.Point(3, 383); + this.stackPanel12.Location = new System.Drawing.Point(3, 421); this.stackPanel12.Name = "stackPanel12"; this.stackPanel12.Size = new System.Drawing.Size(244, 32); - this.stackPanel12.TabIndex = 34; + this.stackPanel12.TabIndex = 41; this.stackPanel12.Text = "stackPanel12"; // // input_shadowO @@ -294,16 +534,15 @@ this.label11.Size = new System.Drawing.Size(130, 26); this.label11.TabIndex = 4; this.label11.Text = "ShadowOpacity"; - this.label11.TooltipConfig = null; // // stackPanel11 // this.stackPanel11.Controls.Add(this.input_shadowY); this.stackPanel11.Controls.Add(this.label9); - this.stackPanel11.Location = new System.Drawing.Point(3, 345); + this.stackPanel11.Location = new System.Drawing.Point(3, 383); this.stackPanel11.Name = "stackPanel11"; this.stackPanel11.Size = new System.Drawing.Size(244, 32); - this.stackPanel11.TabIndex = 33; + this.stackPanel11.TabIndex = 40; this.stackPanel11.Text = "stackPanel11"; // // input_shadowY @@ -329,16 +568,15 @@ this.label9.Size = new System.Drawing.Size(130, 26); this.label9.TabIndex = 4; this.label9.Text = "ShadowOffsetY"; - this.label9.TooltipConfig = null; // // stackPanel10 // this.stackPanel10.Controls.Add(this.input_shadowX); this.stackPanel10.Controls.Add(this.label8); - this.stackPanel10.Location = new System.Drawing.Point(3, 307); + this.stackPanel10.Location = new System.Drawing.Point(3, 345); this.stackPanel10.Name = "stackPanel10"; this.stackPanel10.Size = new System.Drawing.Size(244, 32); - this.stackPanel10.TabIndex = 32; + this.stackPanel10.TabIndex = 39; this.stackPanel10.Text = "stackPanel10"; // // input_shadowX @@ -364,16 +602,15 @@ this.label8.Size = new System.Drawing.Size(130, 26); this.label8.TabIndex = 4; this.label8.Text = "ShadowOffsetX"; - this.label8.TooltipConfig = null; // // stackPanel9 // this.stackPanel9.Controls.Add(this.colorPicker_shadow); this.stackPanel9.Controls.Add(this.label7); - this.stackPanel9.Location = new System.Drawing.Point(3, 269); + this.stackPanel9.Location = new System.Drawing.Point(3, 307); this.stackPanel9.Name = "stackPanel9"; this.stackPanel9.Size = new System.Drawing.Size(244, 32); - this.stackPanel9.TabIndex = 31; + this.stackPanel9.TabIndex = 38; this.stackPanel9.Text = "stackPanel9"; // // colorPicker_shadow @@ -396,16 +633,15 @@ this.label7.Size = new System.Drawing.Size(130, 26); this.label7.TabIndex = 4; this.label7.Text = "ShadowColor"; - this.label7.TooltipConfig = null; // // stackPanel8 // this.stackPanel8.Controls.Add(this.select_shadowalign); this.stackPanel8.Controls.Add(this.label6); - this.stackPanel8.Location = new System.Drawing.Point(3, 231); + this.stackPanel8.Location = new System.Drawing.Point(3, 269); this.stackPanel8.Name = "stackPanel8"; this.stackPanel8.Size = new System.Drawing.Size(244, 32); - this.stackPanel8.TabIndex = 30; + this.stackPanel8.TabIndex = 37; this.stackPanel8.Text = "stackPanel8"; // // select_shadowalign @@ -426,16 +662,15 @@ this.label6.Size = new System.Drawing.Size(130, 26); this.label6.TabIndex = 4; this.label6.Text = "ShadowAlign"; - this.label6.TooltipConfig = null; // // stackPanel7 // this.stackPanel7.Controls.Add(this.input_shadow); this.stackPanel7.Controls.Add(this.label5); - this.stackPanel7.Location = new System.Drawing.Point(3, 193); + this.stackPanel7.Location = new System.Drawing.Point(3, 231); this.stackPanel7.Name = "stackPanel7"; this.stackPanel7.Size = new System.Drawing.Size(244, 32); - this.stackPanel7.TabIndex = 29; + this.stackPanel7.TabIndex = 36; this.stackPanel7.Text = "stackPanel7"; // // input_shadow @@ -466,228 +701,12 @@ this.label5.Size = new System.Drawing.Size(130, 26); this.label5.TabIndex = 4; this.label5.Text = "Shadow"; - this.label5.TooltipConfig = null; - // - // stackPanel17 - // - this.stackPanel17.Controls.Add(this.input_borderwidth); - this.stackPanel17.Controls.Add(this.label15); - this.stackPanel17.Location = new System.Drawing.Point(3, 155); - this.stackPanel17.Name = "stackPanel17"; - this.stackPanel17.Size = new System.Drawing.Size(244, 32); - this.stackPanel17.TabIndex = 28; - this.stackPanel17.Text = "stackPanel17"; - // - // input_borderwidth - // - this.input_borderwidth.DecimalPlaces = 2; - this.input_borderwidth.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_borderwidth.Location = new System.Drawing.Point(139, 3); - this.input_borderwidth.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_borderwidth.Name = "input_borderwidth"; - this.input_borderwidth.Size = new System.Drawing.Size(100, 26); - this.input_borderwidth.TabIndex = 5; - this.input_borderwidth.Text = "0.00"; - this.input_borderwidth.WaveSize = 0; - // - // label15 - // - this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(3, 3); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(130, 26); - this.label15.TabIndex = 4; - this.label15.Text = "BorderWidth"; - this.label15.TooltipConfig = null; - // - // stackPanel16 - // - this.stackPanel16.Controls.Add(this.colorPicker_border); - this.stackPanel16.Controls.Add(this.label14); - this.stackPanel16.Location = new System.Drawing.Point(3, 117); - this.stackPanel16.Name = "stackPanel16"; - this.stackPanel16.Size = new System.Drawing.Size(244, 32); - this.stackPanel16.TabIndex = 27; - this.stackPanel16.Text = "stackPanel16"; - // - // colorPicker_border - // - this.colorPicker_border.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker_border.Location = new System.Drawing.Point(139, 3); - this.colorPicker_border.Name = "colorPicker_border"; - this.colorPicker_border.ShowText = true; - this.colorPicker_border.Size = new System.Drawing.Size(100, 26); - this.colorPicker_border.TabIndex = 5; - this.colorPicker_border.Text = "colorPicker1"; - this.colorPicker_border.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker_border.WaveSize = 0; - // - // label14 - // - this.label14.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label14.Location = new System.Drawing.Point(3, 3); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(130, 26); - this.label14.TabIndex = 4; - this.label14.Text = "BorderColor"; - this.label14.TooltipConfig = null; - // - // stackPanel6 - // - this.stackPanel6.Controls.Add(this.input_radius); - this.stackPanel6.Controls.Add(this.label4); - this.stackPanel6.Location = new System.Drawing.Point(3, 79); - this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(244, 32); - this.stackPanel6.TabIndex = 12; - this.stackPanel6.Text = "stackPanel6"; - // - // input_radius - // - this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_radius.Location = new System.Drawing.Point(139, 3); - this.input_radius.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(100, 26); - this.input_radius.TabIndex = 5; - this.input_radius.Text = "6"; - this.input_radius.Value = new decimal(new int[] { - 6, - 0, - 0, - 0}); - this.input_radius.WaveSize = 0; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(130, 26); - this.label4.TabIndex = 4; - this.label4.Text = "Radius"; - this.label4.TooltipConfig = null; - // - // stackPanel5 - // - this.stackPanel5.Controls.Add(this.input_arrowsize); - this.stackPanel5.Controls.Add(this.label3); - this.stackPanel5.Location = new System.Drawing.Point(3, 41); - this.stackPanel5.Name = "stackPanel5"; - this.stackPanel5.Size = new System.Drawing.Size(244, 32); - this.stackPanel5.TabIndex = 11; - this.stackPanel5.Text = "stackPanel5"; - // - // input_arrowsize - // - this.input_arrowsize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_arrowsize.Location = new System.Drawing.Point(139, 3); - this.input_arrowsize.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_arrowsize.Name = "input_arrowsize"; - this.input_arrowsize.Size = new System.Drawing.Size(100, 26); - this.input_arrowsize.TabIndex = 5; - this.input_arrowsize.Text = "8"; - this.input_arrowsize.Value = new decimal(new int[] { - 8, - 0, - 0, - 0}); - this.input_arrowsize.WaveSize = 0; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 3); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(130, 26); - this.label3.TabIndex = 4; - this.label3.Text = "ArrowSize"; - this.label3.TooltipConfig = null; - // - // stackPanel4 - // - this.stackPanel4.Controls.Add(this.select_arrowalign); - this.stackPanel4.Controls.Add(this.label10); - this.stackPanel4.Location = new System.Drawing.Point(3, 3); - this.stackPanel4.Name = "stackPanel4"; - this.stackPanel4.Size = new System.Drawing.Size(244, 32); - this.stackPanel4.TabIndex = 10; - this.stackPanel4.Text = "stackPanel4"; - // - // select_arrowalign - // - this.select_arrowalign.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_arrowalign.List = true; - this.select_arrowalign.Location = new System.Drawing.Point(139, 3); - this.select_arrowalign.Name = "select_arrowalign"; - this.select_arrowalign.Size = new System.Drawing.Size(100, 26); - this.select_arrowalign.TabIndex = 11; - this.select_arrowalign.WaveSize = 0; - // - // label10 - // - this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(3, 3); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(130, 26); - this.label10.TabIndex = 4; - this.label10.Text = "ArrowAlign"; - this.label10.TooltipConfig = null; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(694, 12); - this.divider1.TabIndex = 8; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(694, 24); - this.label2.TabIndex = 7; - this.label2.Text = "普通布局面板"; - this.label2.TooltipConfig = null; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(694, 40); - this.label1.TabIndex = 6; - this.label1.Text = "Panel 面板"; - this.label1.TooltipConfig = null; - // - // switch_shadowOA - // - this.switch_shadowOA.AutoCheck = true; - this.switch_shadowOA.Checked = true; - this.switch_shadowOA.Location = new System.Drawing.Point(229, 3); - this.switch_shadowOA.Name = "switch_shadowOA"; - this.switch_shadowOA.Size = new System.Drawing.Size(50, 26); - this.switch_shadowOA.TabIndex = 12; - this.switch_shadowOA.Text = "switch1"; // // PanelDemo // this.Controls.Add(this.stackPanel1); this.Name = "PanelDemo"; - this.Size = new System.Drawing.Size(700, 560); + this.Size = new System.Drawing.Size(750, 560); this.Load += new System.EventHandler(this.PanelDemo_Load); this.stackPanel1.ResumeLayout(false); this.stackPanel2.ResumeLayout(false); @@ -695,17 +714,18 @@ this.stackPanel13.ResumeLayout(false); this.stackPanel14.ResumeLayout(false); this.stackPanel3.ResumeLayout(false); + this.stackPanel17.ResumeLayout(false); + this.stackPanel16.ResumeLayout(false); + this.stackPanel6.ResumeLayout(false); + this.stackPanel5.ResumeLayout(false); + this.stackPanel4.ResumeLayout(false); + this.stackPanel18.ResumeLayout(false); this.stackPanel12.ResumeLayout(false); this.stackPanel11.ResumeLayout(false); this.stackPanel10.ResumeLayout(false); this.stackPanel9.ResumeLayout(false); this.stackPanel8.ResumeLayout(false); this.stackPanel7.ResumeLayout(false); - this.stackPanel17.ResumeLayout(false); - this.stackPanel16.ResumeLayout(false); - this.stackPanel6.ResumeLayout(false); - this.stackPanel5.ResumeLayout(false); - this.stackPanel4.ResumeLayout(false); this.ResumeLayout(false); } @@ -718,7 +738,6 @@ private AntdUI.Divider divider1; private AntdUI.StackPanel stackPanel2; private AntdUI.StackPanel stackPanel15; - private AntdUI.Panel panel; private AntdUI.StackPanel stackPanel13; private AntdUI.InputNumber input_shadowOH; private AntdUI.Label label12; @@ -740,6 +759,9 @@ private AntdUI.StackPanel stackPanel4; private AntdUI.Select select_arrowalign; private AntdUI.Label label10; + private AntdUI.Switch switch_shadowOA; + private AntdUI.Panel panel; + private AntdUI.Button buttonCZ; private AntdUI.StackPanel stackPanel12; private AntdUI.InputNumber input_shadowO; private AntdUI.Label label11; @@ -758,7 +780,8 @@ private AntdUI.StackPanel stackPanel7; private AntdUI.InputNumber input_shadow; private AntdUI.Label label5; - private AntdUI.Button buttonCZ; - private AntdUI.Switch switch_shadowOA; + private AntdUI.StackPanel stackPanel18; + private AntdUI.Select select_borderstyle; + private AntdUI.Label label16; } } diff --git a/Views/PanelDemo.cs b/Views/PanelDemo.cs index fd4dbd4..7e857ca 100644 --- a/Views/PanelDemo.cs +++ b/Views/PanelDemo.cs @@ -1,5 +1,6 @@ using AntdUI; using System; +using System.Drawing.Drawing2D; using System.Windows.Forms; namespace AntdUIDemo.Views @@ -23,6 +24,7 @@ namespace AntdUIDemo.Views select_arrowalign.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; select_shadowalign.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; + select_borderstyle.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; switch_shadowOA.CheckedChanged += switch_CheckedChanged; @@ -54,6 +56,12 @@ namespace AntdUIDemo.Views { select_shadowalign.Items.Add(align); } + //初始化边框 + select_borderstyle.Items.Clear(); + foreach(DashStyle dashStyle in Enum.GetValues(typeof(DashStyle))) + { + select_borderstyle.Items.Add(dashStyle); + } } // 设置默认值 @@ -61,6 +69,7 @@ namespace AntdUIDemo.Views { select_arrowalign.SelectedIndex = 0; select_shadowalign.SelectedIndex = 0; + select_borderstyle.SelectedIndex = 0; switch_shadowOA.Checked = true; @@ -89,6 +98,7 @@ namespace AntdUIDemo.Views panel.Radius = (int)input_radius.Value; panel.BorderWidth = (float)input_borderwidth.Value; panel.BorderColor = colorPicker_border.Value; + panel.BorderStyle = (DashStyle)select_borderstyle.SelectedValue; panel.Shadow = (int)input_shadow.Value; panel.ShadowAlign = (TAlignMini)select_shadowalign.SelectedValue; panel.ShadowColor = colorPicker_shadow.Value; diff --git a/Views/UploadDraggerDemo.Designer.cs b/Views/UploadDraggerDemo.Designer.cs new file mode 100644 index 0000000..291746c --- /dev/null +++ b/Views/UploadDraggerDemo.Designer.cs @@ -0,0 +1,120 @@ +namespace AntdUIDemo.Views +{ + partial class UploadDraggerDemo + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.stackPanel1 = new AntdUI.StackPanel(); + this.label3 = new AntdUI.Label(); + this.divider1 = new AntdUI.Divider(); + this.label2 = new AntdUI.Label(); + this.label1 = new AntdUI.Label(); + this.uploadDragger = new AntdUI.UploadDragger(); + this.stackPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // stackPanel1 + // + this.stackPanel1.Controls.Add(this.uploadDragger); + this.stackPanel1.Controls.Add(this.label3); + this.stackPanel1.Controls.Add(this.divider1); + this.stackPanel1.Controls.Add(this.label2); + this.stackPanel1.Controls.Add(this.label1); + this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Name = "stackPanel1"; + this.stackPanel1.Size = new System.Drawing.Size(750, 542); + this.stackPanel1.TabIndex = 0; + this.stackPanel1.Text = "stackPanel1"; + this.stackPanel1.Vertical = true; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(744, 24); + this.label3.TabIndex = 35; + this.label3.Text = "基本用法"; + // + // divider1 + // + this.divider1.Location = new System.Drawing.Point(3, 79); + this.divider1.Name = "divider1"; + this.divider1.Size = new System.Drawing.Size(744, 12); + this.divider1.TabIndex = 34; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(3, 49); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(744, 24); + this.label2.TabIndex = 33; + this.label2.Text = "文件选择上传和拖拽上传控件。"; + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(3, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(744, 40); + this.label1.TabIndex = 32; + this.label1.Text = "UploadDragger 上传"; + // + // uploadDragger + // + this.uploadDragger.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.uploadDragger.Location = new System.Drawing.Point(3, 127); + this.uploadDragger.Name = "uploadDragger"; + this.uploadDragger.Size = new System.Drawing.Size(744, 155); + this.uploadDragger.TabIndex = 36; + this.uploadDragger.Text = "Click or drag file to this area to upload"; + this.uploadDragger.TextDesc = "Support for a single or bulk upload. Strictly prohibited from uploading company d" + + "ata or other banned files."; + // + // UploadDraggerDemo + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Name = "UploadDraggerDemo"; + this.Size = new System.Drawing.Size(750, 542); + this.stackPanel1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private AntdUI.StackPanel stackPanel1; + private AntdUI.Label label3; + private AntdUI.Divider divider1; + private AntdUI.Label label2; + private AntdUI.Label label1; + private AntdUI.UploadDragger uploadDragger; + } +} diff --git a/Views/UploadDraggerDemo.cs b/Views/UploadDraggerDemo.cs new file mode 100644 index 0000000..9422f13 --- /dev/null +++ b/Views/UploadDraggerDemo.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AntdUIDemo.Views +{ + public partial class UploadDraggerDemo : UserControl + { + private AntdUI.Window window; + public UploadDraggerDemo(AntdUI.Window _window) + { + window = _window; + InitializeComponent(); + BindEventHandler(); + } + + private void BindEventHandler() + { + uploadDragger.DragChanged += UploadDragger_DragChanged; + uploadDragger.Click += UploadDragger_Click; + } + + private void UploadDragger_Click(object sender, EventArgs e) + { + // 创建一个文件对话框实例 + OpenFileDialog openFileDialog = new OpenFileDialog(); + + // 设置文件对话框的属性 + openFileDialog.Filter = "All Files (*.*)|*.*"; // 过滤器，允许选择所有文件 + openFileDialog.Title = "Select a File"; // 对话框标题 + openFileDialog.Multiselect = false; // 不允许多选文件 + + // 显示文件对话框并检查用户是否选择了文件 + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + // 获取用户选择的文件路径 + string[] filePaths = openFileDialog.FileNames; + foreach (string path in filePaths) + { + AntdUI.Message.info(window, path, autoClose: 3); + } + } + } + + private void UploadDragger_DragChanged(object sender, AntdUI.UploadDragger.StringsEventArgs e) + { + string[] filePaths = e.Value; + foreach (string path in filePaths) + { + AntdUI.Message.info(window, path,autoClose:3); + } + } + } +} diff --git a/Views/UploadDraggerDemo.resx b/Views/UploadDraggerDemo.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Views/UploadDraggerDemo.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/assets/screenshots/Badge.png b/assets/screenshots/Badge.png index 3ad7776..c0dbe7e 100644 Binary files a/assets/screenshots/Badge.png and b/assets/screenshots/Badge.png differ diff --git a/assets/screenshots/Panel.png b/assets/screenshots/Panel.png index 64e3d49..2793fd6 100644 Binary files a/assets/screenshots/Panel.png and b/assets/screenshots/Panel.png differ diff --git a/assets/screenshots/UploadDragger.png b/assets/screenshots/UploadDragger.png new file mode 100644 index 0000000..87d91ce Binary files /dev/null and b/assets/screenshots/UploadDragger.png differ diff --git a/assets/screenshots/coredesign.png b/assets/screenshots/coredesign.png new file mode 100644 index 0000000..737a4ed Binary files /dev/null and b/assets/screenshots/coredesign.png differ