diff --git a/example/Demo/Controls/GridPanel.Designer.cs b/example/Demo/Controls/GridPanel.Designer.cs
index d5db263..100e0c6 100644
--- a/example/Demo/Controls/GridPanel.Designer.cs
+++ b/example/Demo/Controls/GridPanel.Designer.cs
@@ -46,8 +46,7 @@ namespace Demo.Controls
///
private void InitializeComponent()
{
- pageHeader1 = new AntdUI.PageHeader();
- stackPanel1 = new AntdUI.StackPanel();
+ header1 = new AntdUI.PageHeader();
label1 = new AntdUI.Label();
input1 = new AntdUI.Input();
gridPanel1 = new AntdUI.GridPanel();
@@ -57,51 +56,43 @@ namespace Demo.Controls
button3 = new AntdUI.Button();
button2 = new AntdUI.Button();
button1 = new AntdUI.Button();
- stackPanel1.SuspendLayout();
+ tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
gridPanel1.SuspendLayout();
+ tableLayoutPanel1.SuspendLayout();
SuspendLayout();
//
- // pageHeader1
- //
- pageHeader1.Description = "精准划分区域的格栅布局容器。";
- pageHeader1.Dock = System.Windows.Forms.DockStyle.Top;
- pageHeader1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
- pageHeader1.LocalizationDescription = "GridPanel.Description";
- pageHeader1.LocalizationText = "GridPanel.Text";
- pageHeader1.Location = new System.Drawing.Point(0, 0);
- pageHeader1.Name = "pageHeader1";
- pageHeader1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10);
- pageHeader1.Size = new System.Drawing.Size(1000, 75);
- pageHeader1.TabIndex = 0;
- pageHeader1.Text = "GridPanel 格栅布局";
- pageHeader1.UseTitleFont = true;
- //
- // stackPanel1
- //
- stackPanel1.Controls.Add(label1);
- stackPanel1.Controls.Add(input1);
- stackPanel1.Dock = System.Windows.Forms.DockStyle.Top;
- stackPanel1.Location = new System.Drawing.Point(0, 75);
- stackPanel1.Name = "stackPanel1";
- stackPanel1.Size = new System.Drawing.Size(1000, 72);
- stackPanel1.TabIndex = 1;
- stackPanel1.Text = "stackPanel1";
+ // header1
+ //
+ header1.Description = "精准划分区域的格栅布局容器。";
+ header1.Dock = System.Windows.Forms.DockStyle.Top;
+ header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
+ header1.LocalizationDescription = "GridPanel.Description";
+ header1.LocalizationText = "GridPanel.Text";
+ header1.Location = new System.Drawing.Point(0, 0);
+ header1.Name = "header1";
+ header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10);
+ header1.Size = new System.Drawing.Size(1000, 75);
+ header1.TabIndex = 0;
+ header1.Text = "GridPanel 格栅布局";
+ header1.UseTitleFont = true;
//
// label1
//
- label1.Location = new System.Drawing.Point(530, 3);
+ label1.Dock = System.Windows.Forms.DockStyle.Fill;
+ label1.Location = new System.Drawing.Point(503, 3);
label1.Name = "label1";
- label1.Size = new System.Drawing.Size(698, 66);
+ label1.Size = new System.Drawing.Size(494, 60);
label1.TabIndex = 1;
label1.Text = "以-为分解。-前为列宽属性，-后为行高属性列宽以；分组。每一组代表一行\r\n行高属性个数要与行数对应,每个数之间用空格间隔";
//
// input1
//
+ input1.Dock = System.Windows.Forms.DockStyle.Fill;
input1.Location = new System.Drawing.Point(3, 3);
input1.Multiline = true;
input1.Name = "input1";
input1.PrefixText = "Span属性";
- input1.Size = new System.Drawing.Size(521, 66);
+ input1.Size = new System.Drawing.Size(494, 60);
input1.SuffixText = "";
input1.TabIndex = 0;
input1.Text = "10% 20%;20% 20%;30% 50%;-50% 10% 10%";
@@ -116,91 +107,97 @@ namespace Demo.Controls
gridPanel1.Controls.Add(button2);
gridPanel1.Controls.Add(button1);
gridPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- gridPanel1.Location = new System.Drawing.Point(0, 147);
+ gridPanel1.Location = new System.Drawing.Point(0, 141);
gridPanel1.Name = "gridPanel1";
- gridPanel1.Size = new System.Drawing.Size(1000, 653);
+ gridPanel1.Size = new System.Drawing.Size(1000, 659);
gridPanel1.Span = "10% 20%;20% 20%;30% 50%";
gridPanel1.TabIndex = 2;
gridPanel1.Text = "gridPanel1";
//
// button6
//
- button6.BackExtend = "135, #6253E1, #04BEFE";
- button6.Location = new System.Drawing.Point(303, 437);
+ button6.Location = new System.Drawing.Point(303, 441);
button6.Name = "button6";
- button6.Size = new System.Drawing.Size(494, 211);
+ button6.Size = new System.Drawing.Size(494, 213);
button6.TabIndex = 5;
- button6.Text = "button6";
+ button6.Text = "Button6";
button6.Type = AntdUI.TTypeMini.Primary;
//
// button5
//
- button5.BackExtend = "135, #6253E1, #04BEFE";
- button5.Location = new System.Drawing.Point(3, 437);
+ button5.Location = new System.Drawing.Point(3, 441);
button5.Name = "button5";
- button5.Size = new System.Drawing.Size(294, 211);
+ button5.Size = new System.Drawing.Size(294, 213);
button5.TabIndex = 4;
- button5.Text = "button5";
+ button5.Text = "Button5";
button5.Type = AntdUI.TTypeMini.Primary;
//
// button4
//
- button4.BackExtend = "135, #6253E1, #04BEFE";
- button4.Location = new System.Drawing.Point(203, 220);
+ button4.Location = new System.Drawing.Point(203, 222);
button4.Name = "button4";
- button4.Size = new System.Drawing.Size(194, 211);
+ button4.Size = new System.Drawing.Size(194, 213);
button4.TabIndex = 3;
- button4.Text = "button4";
+ button4.Text = "Button4";
button4.Type = AntdUI.TTypeMini.Primary;
//
// button3
//
- button3.BackExtend = "135, #6253E1, #04BEFE";
- button3.Location = new System.Drawing.Point(3, 220);
+ button3.Location = new System.Drawing.Point(3, 222);
button3.Name = "button3";
- button3.Size = new System.Drawing.Size(194, 211);
+ button3.Size = new System.Drawing.Size(194, 213);
button3.TabIndex = 2;
- button3.Text = "button3";
+ button3.Text = "Button3";
button3.Type = AntdUI.TTypeMini.Primary;
//
// button2
//
- button2.BackExtend = "135, #6253E1, #04BEFE";
button2.Location = new System.Drawing.Point(103, 3);
button2.Name = "button2";
- button2.Size = new System.Drawing.Size(194, 211);
+ button2.Size = new System.Drawing.Size(194, 213);
button2.TabIndex = 1;
- button2.Text = "button2";
+ button2.Text = "Button2";
button2.Type = AntdUI.TTypeMini.Primary;
//
// button1
//
- button1.BackExtend = "135, #6253E1, #04BEFE";
button1.Location = new System.Drawing.Point(3, 3);
button1.Name = "button1";
- button1.Size = new System.Drawing.Size(94, 211);
+ button1.Size = new System.Drawing.Size(94, 213);
button1.TabIndex = 0;
- button1.Text = "button1";
+ button1.Text = "Button1";
button1.Type = AntdUI.TTypeMini.Primary;
//
+ // tableLayoutPanel1
+ //
+ tableLayoutPanel1.ColumnCount = 2;
+ tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ tableLayoutPanel1.Controls.Add(label1, 1, 0);
+ tableLayoutPanel1.Controls.Add(input1, 0, 0);
+ tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
+ tableLayoutPanel1.Location = new System.Drawing.Point(0, 75);
+ tableLayoutPanel1.Name = "tableLayoutPanel1";
+ tableLayoutPanel1.RowCount = 1;
+ tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ tableLayoutPanel1.Size = new System.Drawing.Size(1000, 66);
+ tableLayoutPanel1.TabIndex = 1;
+ //
// GridPanel
//
- AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
- AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
Controls.Add(gridPanel1);
- Controls.Add(stackPanel1);
- Controls.Add(pageHeader1);
+ Controls.Add(tableLayoutPanel1);
+ Controls.Add(header1);
Name = "GridPanel";
Size = new System.Drawing.Size(1000, 800);
- stackPanel1.ResumeLayout(false);
gridPanel1.ResumeLayout(false);
+ tableLayoutPanel1.ResumeLayout(false);
ResumeLayout(false);
}
#endregion
- private AntdUI.PageHeader pageHeader1;
- private AntdUI.StackPanel stackPanel1;
+ private AntdUI.PageHeader header1;
private AntdUI.Input input1;
private AntdUI.Label label1;
private AntdUI.GridPanel gridPanel1;
@@ -210,5 +207,6 @@ namespace Demo.Controls
private AntdUI.Button button1;
private AntdUI.Button button6;
private AntdUI.Button button5;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
}
}
diff --git a/example/Demo/Controls/GridPanel.cs b/example/Demo/Controls/GridPanel.cs
index edfa0c0..7cab4c7 100644
--- a/example/Demo/Controls/GridPanel.cs
+++ b/example/Demo/Controls/GridPanel.cs
@@ -16,38 +16,21 @@
// CSDN: https://blog.csdn.net/v_132
// QQ: 17379620
-using AntdUI;
-
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 Demo.Controls
{
public partial class GridPanel : UserControl
{
- private Window window;
- public GridPanel()
+ Form form;
+ public GridPanel(Form _form)
{
+ form = _form;
InitializeComponent();
-
gridPanel1.Span = input1.Text.Trim();
}
- public GridPanel(Window _window) : this()
- {
- window = _window;
- }
-
- private void input1_TextChanged(object sender, EventArgs e)
- {
- gridPanel1.Span = input1.Text.Trim();
- }
+ private void input1_TextChanged(object sender, EventArgs e) => gridPanel1.Span = input1.Text.Trim();
}
}
diff --git a/example/Demo/Controls/Progress.Designer.cs b/example/Demo/Controls/Progress.Designer.cs
index 2ee5e3c..3dc3efa 100644
--- a/example/Demo/Controls/Progress.Designer.cs
+++ b/example/Demo/Controls/Progress.Designer.cs
@@ -101,7 +101,6 @@ namespace Demo.Controls
//
// progress1
//
- progress1.ContainerControl = this;
progress1.Dock = DockStyle.Top;
progress1.Location = new Point(0, 28);
progress1.Name = "progress1";
@@ -132,7 +131,6 @@ namespace Demo.Controls
//
// progress8
//
- progress8.ContainerControl = this;
progress8.Dock = DockStyle.Top;
progress8.Font = new Font("Microsoft YaHei UI", 8F);
progress8.Location = new Point(0, 236);
@@ -145,7 +143,6 @@ namespace Demo.Controls
//
// progress9
//
- progress9.ContainerControl = this;
progress9.Dock = DockStyle.Top;
progress9.Font = new Font("Microsoft YaHei UI", 8F);
progress9.Location = new Point(0, 216);
@@ -158,7 +155,6 @@ namespace Demo.Controls
//
// progress10
//
- progress10.ContainerControl = this;
progress10.Dock = DockStyle.Top;
progress10.Font = new Font("Microsoft YaHei UI", 8F);
progress10.Loading = true;
@@ -171,7 +167,6 @@ namespace Demo.Controls
//
// progress11
//
- progress11.ContainerControl = this;
progress11.Dock = DockStyle.Top;
progress11.Font = new Font("Microsoft YaHei UI", 8F);
progress11.Location = new Point(0, 176);
@@ -195,7 +190,6 @@ namespace Demo.Controls
//
// progress4
//
- progress4.ContainerControl = this;
progress4.Dock = DockStyle.Top;
progress4.Location = new Point(0, 118);
progress4.Name = "progress4";
@@ -207,7 +201,6 @@ namespace Demo.Controls
//
// progress3
//
- progress3.ContainerControl = this;
progress3.Dock = DockStyle.Top;
progress3.Location = new Point(0, 88);
progress3.Name = "progress3";
@@ -219,7 +212,6 @@ namespace Demo.Controls
//
// progress2
//
- progress2.ContainerControl = this;
progress2.Dock = DockStyle.Top;
progress2.Loading = true;
progress2.Location = new Point(0, 58);
@@ -299,7 +291,6 @@ namespace Demo.Controls
//
// progress15
//
- progress15.ContainerControl = this;
progress15.Dock = DockStyle.Top;
progress15.Location = new Point(0, 334);
progress15.Name = "progress15";
@@ -314,7 +305,6 @@ namespace Demo.Controls
//
// progress16
//
- progress16.ContainerControl = this;
progress16.Dock = DockStyle.Top;
progress16.Location = new Point(0, 304);
progress16.Name = "progress16";
@@ -327,7 +317,6 @@ namespace Demo.Controls
//
// progress17
//
- progress17.ContainerControl = this;
progress17.Dock = DockStyle.Top;
progress17.Location = new Point(0, 274);
progress17.Name = "progress17";
diff --git a/example/Demo/Main.Designer.cs b/example/Demo/Main.Designer.cs
index 32c5ace..263ebd1 100644
--- a/example/Demo/Main.Designer.cs
+++ b/example/Demo/Main.Designer.cs
@@ -355,7 +355,6 @@ namespace Demo
//
// progress1
//
- progress1.ContainerControl = this;
progress1.Loading = true;
progress1.Location = new Point(40, 332);
progress1.Name = "progress1";
@@ -366,7 +365,6 @@ namespace Demo
//
// progress2
//
- progress2.ContainerControl = this;
progress2.Location = new Point(40, 378);
progress2.Name = "progress2";
progress2.Size = new Size(480, 30);
@@ -376,7 +374,6 @@ namespace Demo
//
// progress3
//
- progress3.ContainerControl = this;
progress3.Location = new Point(40, 424);
progress3.Name = "progress3";
progress3.Size = new Size(480, 30);
@@ -387,7 +384,6 @@ namespace Demo
//
// progress4
//
- progress4.ContainerControl = this;
progress4.Font = new Font("Microsoft YaHei UI Light", 16F);
progress4.Loading = true;
progress4.Location = new Point(42, 488);
@@ -401,7 +397,6 @@ namespace Demo
//
// progress5
//
- progress5.ContainerControl = this;
progress5.Font = new Font("Microsoft YaHei UI Light", 16F);
progress5.Location = new Point(201, 488);
progress5.Name = "progress5";
@@ -414,7 +409,6 @@ namespace Demo
//
// progress6
//
- progress6.ContainerControl = this;
progress6.Font = new Font("Microsoft YaHei UI Light", 16F);
progress6.Location = new Point(360, 488);
progress6.Name = "progress6";
@@ -429,7 +423,6 @@ namespace Demo
// progress7
//
progress7.Back = Color.FromArgb(40, 22, 119, 255);
- progress7.ContainerControl = this;
progress7.Location = new Point(42, 622);
progress7.Name = "progress7";
progress7.Radius = 4;
@@ -444,7 +437,6 @@ namespace Demo
// progress8
//
progress8.Back = Color.FromArgb(40, 0, 204, 0);
- progress8.ContainerControl = this;
progress8.Location = new Point(201, 622);
progress8.Name = "progress8";
progress8.Radius = 4;
@@ -459,7 +451,6 @@ namespace Demo
// progress9
//
progress9.Back = Color.FromArgb(40, 255, 79, 87);
- progress9.ContainerControl = this;
progress9.Location = new Point(360, 622);
progress9.Name = "progress9";
progress9.Radius = 4;
diff --git a/example/Demo/Overview.cs b/example/Demo/Overview.cs
index 9e7603d..7bc7360 100644
Binary files a/example/Demo/Overview.cs and b/example/Demo/Overview.cs differ
diff --git a/example/Demo/res_dark.Designer.cs b/example/Demo/res_dark.Designer.cs
index 469a77c..d23061a 100644
--- a/example/Demo/res_dark.Designer.cs
+++ b/example/Demo/res_dark.Designer.cs
@@ -186,6 +186,15 @@ namespace Demo {
}
}
+ ///
+ /// 查找类似 <svg viewBox="0 0 156 104" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版---黑" transform="translate(-540.000000, -775.000000)"><g id="Grid" transform="translate(541.000000, 775.500000)"><rect id="矩形" fill="#001D66" x="9.8333333" y="15.5" width="93" height="72"></rect><rect id="矩形复制-38" fill="#001D66" x="113.166667" y="15.5" width="31" height="72"></rect><g id="编组-27"><rect id="矩形" fill-opacity="0.15" fill="#FFFFFF" f [字符串的其余部分被截断]"; 的本地化字符串。
+ ///
+ internal static string Grid {
+ get {
+ return ResourceManager.GetString("Grid", resourceCulture);
+ }
+ }
+
///
/// 查找类似 <svg viewBox="0 0 112 32" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版---黑" transform="translate(-562.000000, -463.000000)"><g id="Icon" transform="translate(562.000000, 463.000000)"><g id="smile-fill"><rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M16,2 C8.26875,2 2,8.26875 2,16 C2,23.73125 8.26875,30 16,30 C23.73125,30 30,23.73125 30,16 C30,8.26875 [字符串的其余部分被截断]"; 的本地化字符串。
///
diff --git a/example/Demo/res_dark.resx b/example/Demo/res_dark.resx
index f43126c..1d2cfda 100644
--- a/example/Demo/res_dark.resx
+++ b/example/Demo/res_dark.resx
@@ -159,6 +159,9 @@
<svg viewBox="0 0 161 40" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版---黑" transform="translate(-903.000000, -5173.000000)"><g id="FloatButton" transform="translate(903.500000, 5173.000000)"><g id="编组" transform="translate(60.000000, 0.000000)" fill-rule="nonzero"><circle id="椭圆形备份" fill="#1677FF" cx="20" cy="20" r="20"></circle><g id="file-text-outlined" transform="translate(10.000000, 10.000000)" fill="#FFFFFF"><rect id="矩形" opacity="0" x="0" y="0" width="20" height="20"></rect><path d="M16.6914062,5.63671875 L12.4882812,1.43359375 C12.3710937,1.31640625 12.2128906,1.25 12.046875,1.25 L3.75,1.25 C3.40429688,1.25 3.125,1.52929688 3.125,1.875 L3.125,18.125 C3.125,18.4707031 3.40429688,18.75 3.75,18.75 L16.25,18.75 C16.5957031,18.75 16.875,18.4707031 16.875,18.125 L16.875,6.08007812 C16.875,5.9140625 16.8085938,5.75390625 16.6914062,5.63671875 Z M15.4335938,6.3671875 L11.7578125,6.3671875 L11.7578125,2.69140625 L15.4335938,6.3671875 Z M15.46875,17.34375 L4.53125,17.34375 L4.53125,2.65625 L10.4296875,2.65625 L10.4296875,6.875 C10.4296875,7.328125 10.796875,7.6953125 11.25,7.6953125 L15.46875,7.6953125 L15.46875,17.34375 Z M9.84375,12.0703125 L6.25,12.0703125 C6.1640625,12.0703125 6.09375,12.140625 6.09375,12.2265625 L6.09375,13.1640625 C6.09375,13.25 6.1640625,13.3203125 6.25,13.3203125 L9.84375,13.3203125 C9.9296875,13.3203125 10,13.25 10,13.1640625 L10,12.2265625 C10,12.140625 9.9296875,12.0703125 9.84375,12.0703125 Z M6.09375,9.5703125 L6.09375,10.5078125 C6.09375,10.59375 6.1640625,10.6640625 6.25,10.6640625 L13.75,10.6640625 C13.8359375,10.6640625 13.90625,10.59375 13.90625,10.5078125 L13.90625,9.5703125 C13.90625,9.484375 13.8359375,9.4140625 13.75,9.4140625 L6.25,9.4140625 C6.1640625,9.4140625 6.09375,9.484375 6.09375,9.5703125 Z" id="形状"></path></g></g><g id="编组-3" transform="translate(120.000000, 0.000000)"><rect id="矩形" stroke-opacity="0.25" stroke="#FFFFFF" x="0.5" y="0.5" width="39" height="39" rx="6"></rect><rect id="矩形" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="9" y="27" width="1" height="8"></rect><rect id="矩形备份" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="12" y="27" width="1" height="8"></rect><rect id="矩形备份-2" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="15" y="27" width="1" height="8"></rect><rect id="矩形备份-3" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="18" y="27" width="1" height="8"></rect><rect id="矩形备份-4" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="21" y="27" width="1" height="8"></rect><rect id="矩形备份-5" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="24" y="27" width="1" height="8"></rect><rect id="矩形备份-6" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="27" y="27" width="1" height="8"></rect><rect id="矩形备份-7" fill-opacity="0.45" fill="#FFFFFF" fill-rule="nonzero" x="30" y="27" width="1" height="8"></rect></g><g id="comment-outlinedd" transform="translate(130.000000, 4.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="20" height="20"></rect><path d="M11.2245518,8.35403328 C10.7605177,8.35403328 10.4009415,8.70074574 10.4009415,9.12880972 C10.4009415,9.55687371 10.7605177,9.90358617 11.2245518,9.90358617 C11.6484097,9.90358617 12.0079859,9.55687371 12.0079859,9.12880972 C12.0079859,8.70074574 11.6484097,8.35403328 11.2245518,8.35403328 Z M5.59989647,8.35403328 C5.1358624,8.35403328 4.77628622,8.70074574 4.77628622,9.12880972 C4.77628622,9.55687371 5.1358624,9.90358617 5.59989647,9.90358617 C6.02375442,9.90358617 6.3833306,9.55687371 6.3833306,9.12880972 C6.3833306,8.70074574 6.02375442,8.35403328 5.59989647,8.35403328 Z M17.6728174,6.88195804 C16.7065819,5.60357691 15.3566646,4.74938588 13.876175,4.3639346 L13.876175,4.36587154 C13.5326693,3.99785273 13.1449698,3.65888804 12.7110678,3.35672522 C9.42265328,1.0517653 4.80641831,1.75487493 2.40589577,4.92564752 C0.471416097,7.50177919 0.553777122,10.9669668 2.5264241,13.428819 L2.54249454,15.9972029 C2.54249454,16.059185 2.55253857,16.1211671 2.57262662,16.1792754 C2.67909331,16.5066184 3.0406783,16.6867539 3.37815762,16.584096 L5.92130534,15.8112565 C6.59425518,16.0417525 7.28930187,16.1734645 7.98033095,16.2102664 L7.97028692,16.2180142 C9.7601326,17.475089 12.1064174,17.8527925 14.2578481,17.1671153 L16.8110398,17.9690089 C16.8753216,17.9883784 16.9416122,18 17.0099115,18 C17.3654701,18 17.6527293,17.7230174 17.6527293,17.3801788 L17.6527293,14.7846778 C19.4224869,12.4680962 19.4686894,9.26633254 17.6728174,6.88195804 Z M6.20253811,14.4360284 L5.96148145,14.3391813 L3.97276404,14.939633 L3.95267598,12.9252143 L3.79197154,12.7508896 C2.09252211,10.7519664 1.98002901,7.87173495 3.57100294,5.7585322 C5.50749142,3.19789605 9.21976393,2.63230925 11.8673695,4.48015107 C14.5230104,6.34155147 15.1115904,9.91520781 13.1931812,12.4603484 C11.584128,14.5890467 8.70350092,15.3754448 6.20253811,14.4360284 Z M16.3470057,14.1067484 L16.1863013,14.3004425 L16.2063894,16.3148612 L14.23776,15.6756707 L13.9967033,15.7725177 C12.8717723,16.1754015 11.6725154,16.2083295 10.561646,15.9081036 L10.5576284,15.9061667 C12.0421356,15.466481 13.3880353,14.5754881 14.3582883,13.2932331 C15.8930157,11.2536341 16.1421076,8.69106103 15.250198,6.50619146 L15.2622508,6.51393923 C15.724276,6.83353451 16.148134,7.23254438 16.5077102,7.71484272 C17.966103,9.64403606 17.8837419,12.2705282 16.3470057,14.1067484 Z M8.41222413,8.35403328 C7.94819006,8.35403328 7.58861388,8.70074574 7.58861388,9.12880972 C7.58861388,9.55687371 7.94819006,9.90358617 8.41222413,9.90358617 C8.83608208,9.90358617 9.19565826,9.55687371 9.19565826,9.12880972 C9.19565826,8.70074574 8.83608208,8.35403328 8.41222413,8.35403328 Z" id="形状" fill="#FFFFFF"></path></g><circle id="椭圆形" stroke-opacity="0.25" stroke="#FFFFFF" cx="20" cy="20" r="19.5"></circle><g id="totop-outlined" transform="translate(10.000000, 10.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="20" height="20"></rect><path d="M17.2851562,15.2343758 L3.22265625,15.2343758 C3.13671875,15.2343758 3.06640625,15.3046883 3.06640625,15.3906258 L3.06640625,16.5625008 C3.06640625,16.6484383 3.13671875,16.7187508 3.22265625,16.7187508 L17.2851562,16.7187508 C17.3710938,16.7187508 17.4414062,16.6484383 17.4414062,16.5625008 L17.4414062,15.3906258 C17.4414062,15.3046883 17.3710938,15.2343758 17.2851562,15.2343758 Z M7.8125,10.0434578 L9.25585938,10.0434578 L9.25585938,3.436036 C9.25585938,3.3500985 9.32617188,3.279786 9.41210938,3.279786 L10.5839844,3.279786 C10.6699219,3.279786 10.7402344,3.3500985 10.7402344,3.436036 L10.7402344,10.0434578 L12.1875,10.0434578 C12.3183594,10.0434578 12.390625,10.1938485 12.3105469,10.295411 L10.1230469,13.0649422 C10.0605469,13.1450203 9.93945312,13.1450203 9.87695312,13.0649422 L7.68945312,10.2973641 C7.609375,10.1938485 7.68164062,10.0434578 7.8125,10.0434578 L7.8125,10.0434578 Z" id="形状" fill="#FFFFFF" transform="translate(10.253906, 9.999268) scale(-1, 1) rotate(-180.000000) translate(-10.253906, -9.999268) "></path></g></g></g></g></svg>
+
+ <svg viewBox="0 0 156 104" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版---黑" transform="translate(-540.000000, -775.000000)"><g id="Grid" transform="translate(541.000000, 775.500000)"><rect id="矩形" fill="#001D66" x="9.8333333" y="15.5" width="93" height="72"></rect><rect id="矩形复制-38" fill="#001D66" x="113.166667" y="15.5" width="31" height="72"></rect><g id="编组-27"><rect id="矩形" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="9.8333333" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形复制-9" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="51.1666667" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形复制-37" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="92.5" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形复制-2" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="30.5" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形复制-36" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="71.8333333" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形复制-39" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="113.166667" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形复制-40" fill-opacity="0.15" fill="#FFFFFF" fill-rule="nonzero" opacity="0.999255952" x="133.833333" y="0.5" width="10.3333333" height="102"></rect><rect id="矩形" stroke-opacity="0.247159091" stroke="#FFFFFF" x="0" y="0" width="154" height="103" rx="2"></rect></g></g></g></g></svg>
+
<svg viewBox="0 0 112 32" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版---黑" transform="translate(-562.000000, -463.000000)"><g id="Icon" transform="translate(562.000000, 463.000000)"><g id="smile-fill"><rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M16,2 C8.26875,2 2,8.26875 2,16 C2,23.73125 8.26875,30 16,30 C23.73125,30 30,23.73125 30,16 C30,8.26875 23.73125,2 16,2 Z M9,13.15625 C9,12.328125 9.671875,11.65625 10.5,11.65625 C11.328125,11.65625 12,12.328125 12,13.15625 C12,13.984375 11.328125,14.65625 10.5,14.65625 C9.671875,14.65625 9,13.984375 9,13.15625 Z M16,21.65625 C13.328125,21.65625 11.1375,19.553125 11,16.91875 C10.99375,16.775 11.10625,16.65625 11.25,16.65625 L12.753125,16.65625 C12.884375,16.65625 12.996875,16.75625 13.00625,16.8875 C13.125,18.434375 14.421875,19.65625 16,19.65625 C17.578125,19.65625 18.878125,18.434375 18.99375,16.8875 C19.003125,16.75625 19.115625,16.65625 19.246875,16.65625 L20.75,16.65625 C20.89375,16.65625 21.00625,16.775 21,16.91875 C20.8625,19.553125 18.671875,21.65625 16,21.65625 Z M21.5,14.65625 C20.671875,14.65625 20,13.984375 20,13.15625 C20,12.328125 20.671875,11.65625 21.5,11.65625 C22.328125,11.65625 23,12.328125 23,13.15625 C23,13.984375 22.328125,14.65625 21.5,14.65625 Z" id="形状" fill="#1677FF"></path></g><g id="heart-fill" transform="translate(40.000000, 0.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M28.84375,8.8625 C28.425,7.890625 27.825,7.021875 27.065625,6.275 C26.30625,5.53125 25.425,4.95 24.440625,4.540625 C23.425,4.11875 22.35,3.90625 21.240625,3.90625 C19.7,3.90625 18.196875,4.328125 16.890625,5.125 C16.578125,5.315625 16.28125,5.525 16,5.753125 C15.71875,5.525 15.421875,5.315625 15.109375,5.125 C13.803125,4.328125 12.3,3.90625 10.759375,3.90625 C9.65,3.90625 8.575,4.11875 7.559375,4.540625 C6.578125,4.946875 5.69375,5.53125 4.934375,6.275 C4.171875,7.021875 3.575,7.890625 3.15625,8.8625 C2.721875,9.871875 2.5,10.94375 2.5,12.046875 C2.5,13.0875 2.7125,14.171875 3.134375,15.275 C3.4875,16.196875 3.99375,17.153125 4.640625,18.11875 C5.665625,19.646875 7.075,21.240625 8.825,22.85625 C11.725,25.534375 14.596875,27.384375 14.71875,27.459375 L15.459375,27.934375 C15.7875,28.14375 16.209375,28.14375 16.5375,27.934375 L17.278125,27.459375 C17.4,27.38125 20.26875,25.534375 23.171875,22.85625 C24.921875,21.240625 26.33125,19.646875 27.35625,18.11875 C28.003125,17.153125 28.5125,16.196875 28.8625,15.275 C29.284375,14.171875 29.4969395,13.0875 29.4969395,12.046875 C29.5,10.94375 29.278125,9.871875 28.84375,8.8625 Z" id="路径" fill="#BAE7FF"></path></g><g id="star-fill" transform="translate(80.000000, 0.000000)"><rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M28.378125,11.034375 L20.44375,9.88125 L16.896875,2.690625 C16.8,2.49375 16.640625,2.334375 16.44375,2.2375 C15.95,1.99375 15.35,2.196875 15.103125,2.690625 L11.55625,9.88125 L3.621875,11.034375 C3.403125,11.065625 3.203125,11.16875 3.05,11.325 C2.665625,11.721875 2.671875,12.353125 3.06875,12.740625 L8.809375,18.3375 L7.453125,26.240625 C7.415625,26.45625 7.45,26.68125 7.553125,26.875 C7.809375,27.3625 8.415625,27.553125 8.903125,27.29375 L16,23.5625 L23.096875,27.29375 C23.290625,27.396875 23.515625,27.43125 23.73125,27.39375 C24.275,27.3 24.640625,26.784375 24.546875,26.240625 L23.190625,18.3375 L28.93125,12.740625 C29.0875,12.5875 29.190625,12.3875 29.221875,12.16875 C29.30625,11.621875 28.925,11.115625 28.378125,11.034375 Z" id="路径" fill-opacity="0.25" fill="#FFFFFF"></path></g></g></g></g></svg>
diff --git a/example/Demo/res_light.Designer.cs b/example/Demo/res_light.Designer.cs
index 4ad2912..948f329 100644
--- a/example/Demo/res_light.Designer.cs
+++ b/example/Demo/res_light.Designer.cs
@@ -186,6 +186,15 @@ namespace Demo {
}
}
+ ///
+ /// 查找类似 <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 156 104"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版" transform="translate(-540.000000, -775.000000)"><g id="Grid" transform="translate(541.000000, 775.000000)"><g id="编组-27"><rect id="矩形" fill="#F5F5F5" fill-rule="nonzero" x="9.8333333" y="0" width="10.3333333" height="104"/><rect id="矩形复制-9" fill="#F5F5F5" fill-rule="nonzero" x="51.1666667" y="0" width="10.3333333" height="104"/><rect id="矩形复制- [字符串的其余部分被截断]"; 的本地化字符串。
+ ///
+ internal static string Grid {
+ get {
+ return ResourceManager.GetString("Grid", resourceCulture);
+ }
+ }
+
///
/// 查找类似 <svg viewBox="0 0 112 32" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版" transform="translate(-562.000000, -463.000000)"><g id="Icon" transform="translate(562.000000, 463.000000)"><g id="smile-fill"><rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M16,2 C8.26875,2 2,8.26875 2,16 C2,23.73125 8.26875,30 16,30 C23.73125,30 30,23.73125 30,16 C30,8.26875 23.7 [字符串的其余部分被截断]"; 的本地化字符串。
///
diff --git a/example/Demo/res_light.resx b/example/Demo/res_light.resx
index b36a71e..a9d33c9 100644
--- a/example/Demo/res_light.resx
+++ b/example/Demo/res_light.resx
@@ -159,6 +159,9 @@
<svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 161 40"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版---黑" transform="translate(-903.000000, -5173.000000)"><g id="FloatButton" transform="translate(903.500000, 5173.000000)"><g id="编组" transform="translate(60.000000, 0.000000)" fill-rule="nonzero"><circle id="椭圆形备份" fill="#1677FF" cx="20" cy="20" r="20"/><g id="file-text-outlined" transform="translate(10.000000, 10.000000)" fill="#FFFFFF"><rect id="矩形" opacity="0" x="0" y="0" width="20" height="20"/><path d="M16.6914062,5.63671875 L12.4882812,1.43359375 C12.3710937,1.31640625 12.2128906,1.25 12.046875,1.25 L3.75,1.25 C3.40429688,1.25 3.125,1.52929688 3.125,1.875 L3.125,18.125 C3.125,18.4707031 3.40429688,18.75 3.75,18.75 L16.25,18.75 C16.5957031,18.75 16.875,18.4707031 16.875,18.125 L16.875,6.08007812 C16.875,5.9140625 16.8085938,5.75390625 16.6914062,5.63671875 Z M15.4335938,6.3671875 L11.7578125,6.3671875 L11.7578125,2.69140625 L15.4335938,6.3671875 Z M15.46875,17.34375 L4.53125,17.34375 L4.53125,2.65625 L10.4296875,2.65625 L10.4296875,6.875 C10.4296875,7.328125 10.796875,7.6953125 11.25,7.6953125 L15.46875,7.6953125 L15.46875,17.34375 Z M9.84375,12.0703125 L6.25,12.0703125 C6.1640625,12.0703125 6.09375,12.140625 6.09375,12.2265625 L6.09375,13.1640625 C6.09375,13.25 6.1640625,13.3203125 6.25,13.3203125 L9.84375,13.3203125 C9.9296875,13.3203125 10,13.25 10,13.1640625 L10,12.2265625 C10,12.140625 9.9296875,12.0703125 9.84375,12.0703125 Z M6.09375,9.5703125 L6.09375,10.5078125 C6.09375,10.59375 6.1640625,10.6640625 6.25,10.6640625 L13.75,10.6640625 C13.8359375,10.6640625 13.90625,10.59375 13.90625,10.5078125 L13.90625,9.5703125 C13.90625,9.484375 13.8359375,9.4140625 13.75,9.4140625 L6.25,9.4140625 C6.1640625,9.4140625 6.09375,9.484375 6.09375,9.5703125 Z" id="形状"/></g></g><g id="编组-3" transform="translate(120.000000, 0.000000)"><rect id="矩形" stroke="#F0F0F0" x="0.5" y="0.5" width="39" height="39" rx="6" fill="#FFFFFF"/><rect id="矩形" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="9" y="27" width="1" height="8"/><rect id="矩形备份" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="12" y="27" width="1" height="8"/><rect id="矩形备份-2" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="15" y="27" width="1" height="8"/><rect id="矩形备份-3" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="18" y="27" width="1" height="8"/><rect id="矩形备份-4" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="21" y="27" width="1" height="8"/><rect id="矩形备份-5" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="24" y="27" width="1" height="8"/><rect id="矩形备份-6" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="27" y="27" width="1" height="8"/><rect id="矩形备份-7" fill-opacity="0.45" fill="#000000" fill-rule="nonzero" x="30" y="27" width="1" height="8"/></g><g id="comment-outlinedd" transform="translate(130.000000, 4.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="20" height="20"/><path d="M11.2245518,8.35403328 C10.7605177,8.35403328 10.4009415,8.70074574 10.4009415,9.12880972 C10.4009415,9.55687371 10.7605177,9.90358617 11.2245518,9.90358617 C11.6484097,9.90358617 12.0079859,9.55687371 12.0079859,9.12880972 C12.0079859,8.70074574 11.6484097,8.35403328 11.2245518,8.35403328 Z M5.59989647,8.35403328 C5.1358624,8.35403328 4.77628622,8.70074574 4.77628622,9.12880972 C4.77628622,9.55687371 5.1358624,9.90358617 5.59989647,9.90358617 C6.02375442,9.90358617 6.3833306,9.55687371 6.3833306,9.12880972 C6.3833306,8.70074574 6.02375442,8.35403328 5.59989647,8.35403328 Z M17.6728174,6.88195804 C16.7065819,5.60357691 15.3566646,4.74938588 13.876175,4.3639346 L13.876175,4.36587154 C13.5326693,3.99785273 13.1449698,3.65888804 12.7110678,3.35672522 C9.42265328,1.0517653 4.80641831,1.75487493 2.40589577,4.92564752 C0.471416097,7.50177919 0.553777122,10.9669668 2.5264241,13.428819 L2.54249454,15.9972029 C2.54249454,16.059185 2.55253857,16.1211671 2.57262662,16.1792754 C2.67909331,16.5066184 3.0406783,16.6867539 3.37815762,16.584096 L5.92130534,15.8112565 C6.59425518,16.0417525 7.28930187,16.1734645 7.98033095,16.2102664 L7.97028692,16.2180142 C9.7601326,17.475089 12.1064174,17.8527925 14.2578481,17.1671153 L16.8110398,17.9690089 C16.8753216,17.9883784 16.9416122,18 17.0099115,18 C17.3654701,18 17.6527293,17.7230174 17.6527293,17.3801788 L17.6527293,14.7846778 C19.4224869,12.4680962 19.4686894,9.26633254 17.6728174,6.88195804 Z M6.20253811,14.4360284 L5.96148145,14.3391813 L3.97276404,14.939633 L3.95267598,12.9252143 L3.79197154,12.7508896 C2.09252211,10.7519664 1.98002901,7.87173495 3.57100294,5.7585322 C5.50749142,3.19789605 9.21976393,2.63230925 11.8673695,4.48015107 C14.5230104,6.34155147 15.1115904,9.91520781 13.1931812,12.4603484 C11.584128,14.5890467 8.70350092,15.3754448 6.20253811,14.4360284 Z M16.3470057,14.1067484 L16.1863013,14.3004425 L16.2063894,16.3148612 L14.23776,15.6756707 L13.9967033,15.7725177 C12.8717723,16.1754015 11.6725154,16.2083295 10.561646,15.9081036 L10.5576284,15.9061667 C12.0421356,15.466481 13.3880353,14.5754881 14.3582883,13.2932331 C15.8930157,11.2536341 16.1421076,8.69106103 15.250198,6.50619146 L15.2622508,6.51393923 C15.724276,6.83353451 16.148134,7.23254438 16.5077102,7.71484272 C17.966103,9.64403606 17.8837419,12.2705282 16.3470057,14.1067484 Z M8.41222413,8.35403328 C7.94819006,8.35403328 7.58861388,8.70074574 7.58861388,9.12880972 C7.58861388,9.55687371 7.94819006,9.90358617 8.41222413,9.90358617 C8.83608208,9.90358617 9.19565826,9.55687371 9.19565826,9.12880972 C9.19565826,8.70074574 8.83608208,8.35403328 8.41222413,8.35403328 Z" id="形状" fill="#333333"/></g><circle id="椭圆形" stroke="#F0F0F0" cx="20" cy="20" r="19.5"/><g id="totop-outlined" transform="translate(10.000000, 10.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="20" height="20"/><path d="M17.2851562,15.2343758 L3.22265625,15.2343758 C3.13671875,15.2343758 3.06640625,15.3046883 3.06640625,15.3906258 L3.06640625,16.5625008 C3.06640625,16.6484383 3.13671875,16.7187508 3.22265625,16.7187508 L17.2851562,16.7187508 C17.3710938,16.7187508 17.4414062,16.6484383 17.4414062,16.5625008 L17.4414062,15.3906258 C17.4414062,15.3046883 17.3710938,15.2343758 17.2851562,15.2343758 Z M7.8125,10.0434578 L9.25585938,10.0434578 L9.25585938,3.436036 C9.25585938,3.3500985 9.32617188,3.279786 9.41210938,3.279786 L10.5839844,3.279786 C10.6699219,3.279786 10.7402344,3.3500985 10.7402344,3.436036 L10.7402344,10.0434578 L12.1875,10.0434578 C12.3183594,10.0434578 12.390625,10.1938485 12.3105469,10.295411 L10.1230469,13.0649422 C10.0605469,13.1450203 9.93945312,13.1450203 9.87695312,13.0649422 L7.68945312,10.2973641 C7.609375,10.1938485 7.68164062,10.0434578 7.8125,10.0434578 L7.8125,10.0434578 Z" id="形状" fill="#333333" transform="translate(10.253906, 9.999268) scale(-1, 1) rotate(-180.000000) translate(-10.253906, -9.999268) "/></g></g></g></g></svg>
+
+ <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 156 104"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版" transform="translate(-540.000000, -775.000000)"><g id="Grid" transform="translate(541.000000, 775.000000)"><g id="编组-27"><rect id="矩形" fill="#F5F5F5" fill-rule="nonzero" x="9.8333333" y="0" width="10.3333333" height="104"/><rect id="矩形复制-9" fill="#F5F5F5" fill-rule="nonzero" x="51.1666667" y="0" width="10.3333333" height="104"/><rect id="矩形复制-37" fill="#F5F5F5" fill-rule="nonzero" x="92.5" y="0" width="10.3333333" height="104"/><rect id="矩形复制-2" fill="#F5F5F5" fill-rule="nonzero" x="30.5" y="0" width="10.3333333" height="104"/><rect id="矩形复制-36" fill="#F5F5F5" fill-rule="nonzero" x="71.8333333" y="0" width="10.3333333" height="104"/><rect id="矩形复制-39" fill="#F5F5F5" fill-rule="nonzero" x="113.166667" y="0" width="10.3333333" height="104"/><rect id="矩形复制-40" fill="#F5F5F5" fill-rule="nonzero" x="133.833333" y="0" width="10.3333333" height="104"/><rect id="矩形" stroke="#D9D9D9" x="0" y="0.5" width="154" height="103" rx="2"/></g><rect id="矩形" fill="#E6F4FF" fill-rule="nonzero" x="9.8333333" y="16" width="93" height="72" opacity="0.8"/><rect id="矩形复制-38" fill="#E6F4FF" fill-rule="nonzero" x="113.166667" y="16" width="31" height="72" opacity="0.8"/></g></g></g></svg>
+
<svg viewBox="0 0 112 32" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="组件骨架图更新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="🎉-5.0-新版" transform="translate(-562.000000, -463.000000)"><g id="Icon" transform="translate(562.000000, 463.000000)"><g id="smile-fill"><rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M16,2 C8.26875,2 2,8.26875 2,16 C2,23.73125 8.26875,30 16,30 C23.73125,30 30,23.73125 30,16 C30,8.26875 23.73125,2 16,2 Z M9,13.15625 C9,12.328125 9.671875,11.65625 10.5,11.65625 C11.328125,11.65625 12,12.328125 12,13.15625 C12,13.984375 11.328125,14.65625 10.5,14.65625 C9.671875,14.65625 9,13.984375 9,13.15625 Z M16,21.65625 C13.328125,21.65625 11.1375,19.553125 11,16.91875 C10.99375,16.775 11.10625,16.65625 11.25,16.65625 L12.753125,16.65625 C12.884375,16.65625 12.996875,16.75625 13.00625,16.8875 C13.125,18.434375 14.421875,19.65625 16,19.65625 C17.578125,19.65625 18.878125,18.434375 18.99375,16.8875 C19.003125,16.75625 19.115625,16.65625 19.246875,16.65625 L20.75,16.65625 C20.89375,16.65625 21.00625,16.775 21,16.91875 C20.8625,19.553125 18.671875,21.65625 16,21.65625 Z M21.5,14.65625 C20.671875,14.65625 20,13.984375 20,13.15625 C20,12.328125 20.671875,11.65625 21.5,11.65625 C22.328125,11.65625 23,12.328125 23,13.15625 C23,13.984375 22.328125,14.65625 21.5,14.65625 Z" id="形状" fill="#1677FF"></path></g><g id="heart-fill" transform="translate(40.000000, 0.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M28.84375,8.8625 C28.425,7.890625 27.825,7.021875 27.065625,6.275 C26.30625,5.53125 25.425,4.95 24.440625,4.540625 C23.425,4.11875 22.35,3.90625 21.240625,3.90625 C19.7,3.90625 18.196875,4.328125 16.890625,5.125 C16.578125,5.315625 16.28125,5.525 16,5.753125 C15.71875,5.525 15.421875,5.315625 15.109375,5.125 C13.803125,4.328125 12.3,3.90625 10.759375,3.90625 C9.65,3.90625 8.575,4.11875 7.559375,4.540625 C6.578125,4.946875 5.69375,5.53125 4.934375,6.275 C4.171875,7.021875 3.575,7.890625 3.15625,8.8625 C2.721875,9.871875 2.5,10.94375 2.5,12.046875 C2.5,13.0875 2.7125,14.171875 3.134375,15.275 C3.4875,16.196875 3.99375,17.153125 4.640625,18.11875 C5.665625,19.646875 7.075,21.240625 8.825,22.85625 C11.725,25.534375 14.596875,27.384375 14.71875,27.459375 L15.459375,27.934375 C15.7875,28.14375 16.209375,28.14375 16.5375,27.934375 L17.278125,27.459375 C17.4,27.38125 20.26875,25.534375 23.171875,22.85625 C24.921875,21.240625 26.33125,19.646875 27.35625,18.11875 C28.003125,17.153125 28.5125,16.196875 28.8625,15.275 C29.284375,14.171875 29.4969395,13.0875 29.4969395,12.046875 C29.5,10.94375 29.278125,9.871875 28.84375,8.8625 Z" id="路径" fill="#BAE7FF"></path></g><g id="star-fill" transform="translate(80.000000, 0.000000)" fill-rule="nonzero"><rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect><path d="M28.378125,11.034375 L20.44375,9.88125 L16.896875,2.690625 C16.8,2.49375 16.640625,2.334375 16.44375,2.2375 C15.95,1.99375 15.35,2.196875 15.103125,2.690625 L11.55625,9.88125 L3.621875,11.034375 C3.403125,11.065625 3.203125,11.16875 3.05,11.325 C2.665625,11.721875 2.671875,12.353125 3.06875,12.740625 L8.809375,18.3375 L7.453125,26.240625 C7.415625,26.45625 7.45,26.68125 7.553125,26.875 C7.809375,27.3625 8.415625,27.553125 8.903125,27.29375 L16,23.5625 L23.096875,27.29375 C23.290625,27.396875 23.515625,27.43125 23.73125,27.39375 C24.275,27.3 24.640625,26.784375 24.546875,26.240625 L23.190625,18.3375 L28.93125,12.740625 C29.0875,12.5875 29.190625,12.3875 29.221875,12.16875 C29.30625,11.621875 28.925,11.115625 28.378125,11.034375 Z" id="路径" fill="#EBEBEB"></path></g></g></g></g></svg>
diff --git a/src/AntdUI/Controls/Layout/GridPanel.cs b/src/AntdUI/Controls/Layout/GridPanel.cs
index ae39b09..73fedff 100644
--- a/src/AntdUI/Controls/Layout/GridPanel.cs
+++ b/src/AntdUI/Controls/Layout/GridPanel.cs
@@ -41,7 +41,7 @@ namespace AntdUI
///
/// 跨度
///
- [Description("跨度"), Category("外观"), DefaultValue("50% 50%;50% 50%-50% 50%")]
+ [Description("跨度"), Category("外观"), DefaultValue("50% 50%;50% 50%")]
[Editor(typeof(System.ComponentModel.Design.MultilineStringEditor), typeof(UITypeEditor))]
public string Span
{
@@ -104,7 +104,7 @@ namespace AntdUI
///
/// 内容大小
///
- public string Span { get; set; } = "50% 50%;50% 50%-50% 50%";
+ public string Span { get; set; } = "50% 50%;50% 50%";
///
/// 间距
@@ -157,16 +157,14 @@ namespace AntdUI
foreach (string xaxis in abs)
{
var x = xaxis.Trim();
- if (x.EndsWith("%") && float.TryParse(x.TrimEnd('%'), out var xF))
- xObjTemp.Add(xF / 100F);
+ if (x.EndsWith("%") && float.TryParse(x.TrimEnd('%'), out var xF)) xObjTemp.Add(xF / 100F);
else if (int.TryParse(x, out var xi))
{
int uw = (int)Math.Round(xi * Config.Dpi);
xObjTemp.Add(uw);
use_width += uw;
}
- else if (float.TryParse(x, out float xF2))
- xObjTemp.Add(xF2);
+ else if (float.TryParse(x, out float xF2)) xObjTemp.Add(xF2);
}
int read_width = rect.Width - use_width;
@@ -174,10 +172,8 @@ namespace AntdUI
foreach (var it in xObjTemp)
{
- if (it is float f)
- x_temp.Add((int)Math.Round(read_width * f));
- else if (it is int i)
- x_temp.Add(i);
+ if (it is float f) x_temp.Add((int)Math.Round(read_width * f));
+ else if (it is int i) x_temp.Add(i);
}
// 转换后实际行高
@@ -194,48 +190,38 @@ namespace AntdUI
// 剩余行高
int read_height = rect.Height - use_height;
- if (y.EndsWith("%") && float.TryParse(y.TrimEnd('%'), out var yF))
- height = (int)Math.Round(read_height * (yF / 100F));
+ if (y.EndsWith("%") && float.TryParse(y.TrimEnd('%'), out var yF)) height = (int)Math.Round(read_height * (yF / 100F));
else if (int.TryParse(y, out var i))
{
int uh = (int)Math.Round(i * Config.Dpi);
height = uh;
use_height += uh;
}
- else if (float.TryParse(y, out float yF2))
- height = (int)Math.Round(read_height * yF2);
- }
- else
- {
- height = -999;
+ else if (float.TryParse(y, out float yF2)) height = (int)Math.Round(read_height * yF2);
}
+ else height = -999;
}
-
- else
- {
- height = -999;
- }
+ else height = -999;
if (x_temp.Count > 0)
{
data_count += x_temp.Count;
data.Add(x_temp, height);
- }
+ }
}
}
if (data.Count > 0)
{
Rectangle[] rects;
- if (data.Count == 1)
- rects = new Rectangle[1] { rect };
+ if (data.Count == 1) rects = new Rectangle[1] { rect };
else
{
if (data.Count > 1)
{
var tmp_rects = new List();
int hasx = 0, hasy = 0;
-
+
foreach (var item in data)
{
int y = item.Value == -999 ? rect.Height / data.Count : item.Value;