升级1.6.4，新增步骤进度条，此版本Progress属性涉及大量变更

AntdUIDemo.csproj

@@ -13,7 +13,7 @@
     <Copyright>Copyright © 2024 czz_y</Copyright>
     <FileVersion>$(Version)</FileVersion>
     <AssemblyVersion>$(Version)</AssemblyVersion>
-    <Version>1.6.2</Version>
+    <Version>1.6.4</Version>
     <Authors>czz_y</Authors>
     <Description>基于 Winform UI框架 AntdUI 设计的Demo</Description>
     <PackageProjectUrl>https://gitee.com/mubaiyanghua/antd-uidemo</PackageProjectUrl>
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AntdUI" Version="1.6.3" />
+    <PackageReference Include="AntdUI" Version="1.6.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.3.3" />
   </ItemGroup>

README.md

@@ -4,7 +4,7 @@
 
 <h1>AntdUI Demo</h1>
 
-本项目基于 `Winform .NET Framework 4.8` 开发，是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目，当前版本 `1.6.2`
+本项目基于 `Winform .NET Framework 4.8` 开发，是 [AntdUI](https://gitee.com/antdui/AntdUI) 的 Demo 项目，当前版本 `1.6.4`
 
 </div>
 

Views/CollapseDemo.Designer.cs

@@ -347,7 +347,6 @@
             this.progress1.Loading = true;
             this.progress1.Location = new System.Drawing.Point(0, 0);
             this.progress1.Name = "progress1";
-            this.progress1.ShowText = true;
             this.progress1.Size = new System.Drawing.Size(656, 60);
             this.progress1.TabIndex = 0;
             this.progress1.Text = "%";

Views/ProgressDemo.Designer.cs

@@ -29,6 +29,8 @@
         private void InitializeComponent()
         {
             this.stackPanel1 = new AntdUI.StackPanel();
+            this.progress13 = new AntdUI.Progress();
+            this.label6 = new AntdUI.Label();
             this.flowPanel1 = new AntdUI.FlowPanel();
             this.progress10 = new AntdUI.Progress();
             this.progress9 = new AntdUI.Progress();
@@ -48,9 +50,13 @@
             this.divider1 = new AntdUI.Divider();
             this.label2 = new AntdUI.Label();
             this.label1 = new AntdUI.Label();
-            this.label6 = new AntdUI.Label();
+            this.label7 = new AntdUI.Label();
             this.progress12 = new AntdUI.Progress();
-            this.progress13 = new AntdUI.Progress();
+            this.progress14 = new AntdUI.Progress();
+            this.progress15 = new AntdUI.Progress();
+            this.progress16 = new AntdUI.Progress();
+            this.progress17 = new AntdUI.Progress();
+            this.progress18 = new AntdUI.Progress();
             this.stackPanel1.SuspendLayout();
             this.flowPanel1.SuspendLayout();
             this.flowPanel4.SuspendLayout();
@@ -58,8 +64,14 @@
             // 
             // stackPanel1
             // 
-            this.stackPanel1.Controls.Add(this.progress13);
+            this.stackPanel1.Controls.Add(this.progress18);
+            this.stackPanel1.Controls.Add(this.progress17);
+            this.stackPanel1.Controls.Add(this.progress16);
+            this.stackPanel1.Controls.Add(this.progress15);
+            this.stackPanel1.Controls.Add(this.progress14);
             this.stackPanel1.Controls.Add(this.progress12);
+            this.stackPanel1.Controls.Add(this.label7);
+            this.stackPanel1.Controls.Add(this.progress13);
             this.stackPanel1.Controls.Add(this.label6);
             this.stackPanel1.Controls.Add(this.flowPanel1);
             this.stackPanel1.Controls.Add(this.label5);
@@ -77,18 +89,39 @@
             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, 547);
+            this.stackPanel1.Size = new System.Drawing.Size(700, 715);
             this.stackPanel1.TabIndex = 0;
             this.stackPanel1.Text = "stackPanel1";
             this.stackPanel1.Vertical = true;
             // 
+            // progress13
+            // 
+            this.progress13.ContainerControl = this;
+            this.progress13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.progress13.Loading = true;
+            this.progress13.LoadingFull = true;
+            this.progress13.Location = new System.Drawing.Point(3, 473);
+            this.progress13.Name = "progress13";
+            this.progress13.Size = new System.Drawing.Size(694, 20);
+            this.progress13.TabIndex = 58;
+            // 
+            // label6
+            // 
+            this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(3, 443);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(694, 24);
+            this.label6.TabIndex = 56;
+            this.label6.Text = "动画铺满";
+            this.label6.TooltipConfig = null;
+            // 
             // flowPanel1
             // 
             this.flowPanel1.Controls.Add(this.progress10);
             this.flowPanel1.Controls.Add(this.progress9);
             this.flowPanel1.Controls.Add(this.progress11);
             this.flowPanel1.Gap = 6;
-            this.flowPanel1.Location = new System.Drawing.Point(3, 389);
+            this.flowPanel1.Location = new System.Drawing.Point(3, 399);
             this.flowPanel1.Name = "flowPanel1";
             this.flowPanel1.Size = new System.Drawing.Size(694, 38);
             this.flowPanel1.TabIndex = 55;
@@ -99,8 +132,8 @@
             this.progress10.ContainerControl = this;
             this.progress10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress10.Location = new System.Drawing.Point(179, 3);
-            this.progress10.Mini = true;
             this.progress10.Name = "progress10";
+            this.progress10.Shape = AntdUI.TShapeProgress.Mini;
             this.progress10.Size = new System.Drawing.Size(76, 31);
             this.progress10.State = AntdUI.TType.Success;
             this.progress10.TabIndex = 50;
@@ -112,8 +145,8 @@
             this.progress9.ContainerControl = this;
             this.progress9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress9.Location = new System.Drawing.Point(91, 3);
-            this.progress9.Mini = true;
             this.progress9.Name = "progress9";
+            this.progress9.Shape = AntdUI.TShapeProgress.Mini;
             this.progress9.Size = new System.Drawing.Size(76, 31);
             this.progress9.State = AntdUI.TType.Error;
             this.progress9.TabIndex = 49;
@@ -125,9 +158,8 @@
             this.progress11.ContainerControl = this;
             this.progress11.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress11.Location = new System.Drawing.Point(3, 3);
-            this.progress11.Mini = true;
             this.progress11.Name = "progress11";
-            this.progress11.ShowText = true;
+            this.progress11.Shape = AntdUI.TShapeProgress.Mini;
             this.progress11.Size = new System.Drawing.Size(76, 31);
             this.progress11.TabIndex = 48;
             this.progress11.Text = "%";
@@ -136,11 +168,12 @@
             // label5
             // 
             this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(3, 359);
+            this.label5.Location = new System.Drawing.Point(3, 369);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(694, 24);
             this.label5.TabIndex = 54;
             this.label5.Text = "mini模式";
+            this.label5.TooltipConfig = null;
             // 
             // flowPanel4
             // 
@@ -148,7 +181,7 @@
             this.flowPanel4.Controls.Add(this.progress7);
             this.flowPanel4.Controls.Add(this.progress6);
             this.flowPanel4.Gap = 6;
-            this.flowPanel4.Location = new System.Drawing.Point(3, 277);
+            this.flowPanel4.Location = new System.Drawing.Point(3, 287);
             this.flowPanel4.Name = "flowPanel4";
             this.flowPanel4.Size = new System.Drawing.Size(694, 76);
             this.flowPanel4.TabIndex = 53;
@@ -160,8 +193,7 @@
             this.progress8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress8.Location = new System.Drawing.Point(179, 3);
             this.progress8.Name = "progress8";
-            this.progress8.Shape = AntdUI.TShape.Circle;
+            this.progress8.Shape = AntdUI.TShapeProgress.Circle;
-            this.progress8.ShowText = true;
             this.progress8.Size = new System.Drawing.Size(76, 70);
             this.progress8.State = AntdUI.TType.Success;
             this.progress8.TabIndex = 50;
@@ -174,8 +206,7 @@
             this.progress7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress7.Location = new System.Drawing.Point(91, 3);
             this.progress7.Name = "progress7";
-            this.progress7.Shape = AntdUI.TShape.Circle;
+            this.progress7.Shape = AntdUI.TShapeProgress.Circle;
-            this.progress7.ShowText = true;
             this.progress7.Size = new System.Drawing.Size(76, 70);
             this.progress7.State = AntdUI.TType.Error;
             this.progress7.TabIndex = 49;
@@ -188,8 +219,7 @@
             this.progress6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress6.Location = new System.Drawing.Point(3, 3);
             this.progress6.Name = "progress6";
-            this.progress6.Shape = AntdUI.TShape.Circle;
+            this.progress6.Shape = AntdUI.TShapeProgress.Circle;
-            this.progress6.ShowText = true;
             this.progress6.Size = new System.Drawing.Size(76, 70);
             this.progress6.TabIndex = 48;
             this.progress6.Text = "%";
@@ -198,11 +228,12 @@
             // 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, 247);
+            this.label3.Location = new System.Drawing.Point(3, 257);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(694, 24);
             this.label3.TabIndex = 52;
             this.label3.Text = "进度圈";
+            this.label3.TooltipConfig = null;
             // 
             // progress5
             // 
@@ -211,12 +242,9 @@
             this.progress5.Loading = true;
             this.progress5.Location = new System.Drawing.Point(3, 231);
             this.progress5.Name = "progress5";
-            this.progress5.ShowInfo = false;
+            this.progress5.Size = new System.Drawing.Size(694, 20);
-            this.progress5.ShowText = true;
-            this.progress5.Size = new System.Drawing.Size(694, 10);
             this.progress5.State = AntdUI.TType.Warn;
             this.progress5.TabIndex = 51;
-            this.progress5.Text = "%";
             this.progress5.Value = 0.3F;
             // 
             // progress4
@@ -225,7 +253,6 @@
             this.progress4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress4.Location = new System.Drawing.Point(3, 205);
             this.progress4.Name = "progress4";
-            this.progress4.ShowText = true;
             this.progress4.Size = new System.Drawing.Size(694, 20);
             this.progress4.State = AntdUI.TType.Success;
             this.progress4.TabIndex = 50;
@@ -238,7 +265,6 @@
             this.progress3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress3.Location = new System.Drawing.Point(3, 179);
             this.progress3.Name = "progress3";
-            this.progress3.ShowText = true;
             this.progress3.Size = new System.Drawing.Size(694, 20);
             this.progress3.State = AntdUI.TType.Error;
             this.progress3.TabIndex = 49;
@@ -252,10 +278,8 @@
             this.progress2.Loading = true;
             this.progress2.Location = new System.Drawing.Point(3, 153);
             this.progress2.Name = "progress2";
-            this.progress2.ShowText = true;
             this.progress2.Size = new System.Drawing.Size(694, 20);
             this.progress2.TabIndex = 48;
-            this.progress2.Text = "%";
             this.progress2.Value = 0.5F;
             // 
             // progress1
@@ -264,10 +288,9 @@
             this.progress1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.progress1.Location = new System.Drawing.Point(3, 127);
             this.progress1.Name = "progress1";
-            this.progress1.ShowText = true;
             this.progress1.Size = new System.Drawing.Size(694, 20);
             this.progress1.TabIndex = 47;
-            this.progress1.Text = "%";
+            this.progress1.TextUnit = "";
             this.progress1.Value = 0.3F;
             // 
             // label4
@@ -278,6 +301,7 @@
             this.label4.Size = new System.Drawing.Size(694, 24);
             this.label4.TabIndex = 46;
             this.label4.Text = "进度条";
+            this.label4.TooltipConfig = null;
             // 
             // divider1
             // 
@@ -294,6 +318,7 @@
             this.label2.Size = new System.Drawing.Size(694, 24);
             this.label2.TabIndex = 44;
             this.label2.Text = "展示操作的当前进度。";
+            this.label2.TooltipConfig = null;
             // 
             // label1
             // 
@@ -303,43 +328,102 @@
             this.label1.Size = new System.Drawing.Size(694, 40);
             this.label1.TabIndex = 43;
             this.label1.Text = "Progress 进度条";
+            this.label1.TooltipConfig = null;
             // 
-            // label6
+            // label7
             // 
-            this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(3, 433);
+            this.label7.Location = new System.Drawing.Point(3, 499);
-            this.label6.Name = "label6";
+            this.label7.Name = "label7";
-            this.label6.Size = new System.Drawing.Size(694, 24);
+            this.label7.Size = new System.Drawing.Size(694, 24);
-            this.label6.TabIndex = 56;
+            this.label7.TabIndex = 59;
-            this.label6.Text = "动画铺满";
+            this.label7.Text = "步骤进度条";
+            this.label7.TooltipConfig = null;
             // 
             // progress12
             // 
-            this.progress12.ContainerControl = this;
+            this.progress12.Location = new System.Drawing.Point(3, 529);
-            this.progress12.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.progress12.Loading = true;
-            this.progress12.Location = new System.Drawing.Point(3, 463);
             this.progress12.Name = "progress12";
-            this.progress12.Size = new System.Drawing.Size(694, 20);
+            this.progress12.Shape = AntdUI.TShapeProgress.Steps;
-            this.progress12.TabIndex = 57;
+            this.progress12.Size = new System.Drawing.Size(694, 23);
+            this.progress12.Steps = 50;
+            this.progress12.StepSize = 5;
+            this.progress12.TabIndex = 60;
+            this.progress12.Text = "progress12";
+            this.progress12.TextUnit = "";
+            this.progress12.Value = 0.3F;
             // 
-            // progress13
+            // progress14
             // 
-            this.progress13.ContainerControl = this;
+            this.progress14.Location = new System.Drawing.Point(3, 558);
-            this.progress13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.progress14.Name = "progress14";
-            this.progress13.Loading = true;
+            this.progress14.Shape = AntdUI.TShapeProgress.Steps;
-            this.progress13.LoadingFull = true;
+            this.progress14.Size = new System.Drawing.Size(694, 23);
-            this.progress13.Location = new System.Drawing.Point(3, 489);
+            this.progress14.Steps = 50;
-            this.progress13.Name = "progress13";
+            this.progress14.StepSize = 5;
-            this.progress13.Size = new System.Drawing.Size(694, 20);
+            this.progress14.TabIndex = 61;
-            this.progress13.TabIndex = 58;
+            this.progress14.Text = "progress14";
+            this.progress14.Value = 0.5F;
+            // 
+            // progress15
+            // 
+            this.progress15.Location = new System.Drawing.Point(3, 587);
+            this.progress15.Name = "progress15";
+            this.progress15.Shape = AntdUI.TShapeProgress.Steps;
+            this.progress15.Size = new System.Drawing.Size(694, 23);
+            this.progress15.State = AntdUI.TType.Error;
+            this.progress15.Steps = 50;
+            this.progress15.StepSize = 5;
+            this.progress15.TabIndex = 62;
+            this.progress15.Text = "progress15";
+            this.progress15.Value = 0.7F;
+            // 
+            // progress16
+            // 
+            this.progress16.Location = new System.Drawing.Point(3, 616);
+            this.progress16.Name = "progress16";
+            this.progress16.Shape = AntdUI.TShapeProgress.Steps;
+            this.progress16.Size = new System.Drawing.Size(694, 23);
+            this.progress16.State = AntdUI.TType.Success;
+            this.progress16.Steps = 50;
+            this.progress16.StepSize = 5;
+            this.progress16.TabIndex = 63;
+            this.progress16.Text = "progress16";
+            this.progress16.Value = 1F;
+            // 
+            // progress17
+            // 
+            this.progress17.Location = new System.Drawing.Point(3, 645);
+            this.progress17.Name = "progress17";
+            this.progress17.Shape = AntdUI.TShapeProgress.Steps;
+            this.progress17.Size = new System.Drawing.Size(694, 23);
+            this.progress17.StepGap = 8;
+            this.progress17.Steps = 20;
+            this.progress17.StepSize = 10;
+            this.progress17.TabIndex = 64;
+            this.progress17.Text = "progress17";
+            this.progress17.Value = 0.3F;
+            // 
+            // progress18
+            // 
+            this.progress18.Location = new System.Drawing.Point(3, 674);
+            this.progress18.Name = "progress18";
+            this.progress18.Shape = AntdUI.TShapeProgress.Steps;
+            this.progress18.Size = new System.Drawing.Size(694, 23);
+            this.progress18.State = AntdUI.TType.Warn;
+            this.progress18.StepGap = 5;
+            this.progress18.Steps = 50;
+            this.progress18.StepSize = 2;
+            this.progress18.TabIndex = 65;
+            this.progress18.Text = "progress18";
+            this.progress18.Value = 0.3F;
             // 
             // ProgressDemo
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
             this.Controls.Add(this.stackPanel1);
             this.Name = "ProgressDemo";
-            this.Size = new System.Drawing.Size(700, 547);
+            this.Size = new System.Drawing.Size(700, 715);
             this.stackPanel1.ResumeLayout(false);
             this.flowPanel1.ResumeLayout(false);
             this.flowPanel4.ResumeLayout(false);
@@ -369,8 +453,14 @@
         private AntdUI.Progress progress10;
         private AntdUI.Progress progress9;
         private AntdUI.Progress progress11;
-        private AntdUI.Progress progress12;
         private AntdUI.Label label6;
         private AntdUI.Progress progress13;
+        private AntdUI.Progress progress12;
+        private AntdUI.Label label7;
+        private AntdUI.Progress progress14;
+        private AntdUI.Progress progress17;
+        private AntdUI.Progress progress16;
+        private AntdUI.Progress progress15;
+        private AntdUI.Progress progress18;
     }
 }