diff --git a/Views/InputDemo.Designer.cs b/Views/InputDemo.Designer.cs index 372037e..7aeb4c1 100644 --- a/Views/InputDemo.Designer.cs +++ b/Views/InputDemo.Designer.cs @@ -31,6 +31,9 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputDemo)); this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); + this.flowPanel11 = new AntdUI.FlowPanel(); + this.panel2 = new AntdUI.Panel(); + this.label1 = new AntdUI.Label(); this.flowPanel10 = new AntdUI.FlowPanel(); this.input19 = new AntdUI.Input(); this.input22 = new AntdUI.Input(); @@ -80,9 +83,8 @@ this.input1 = new AntdUI.Input(); this.label3 = new AntdUI.Label(); this.tooltipComponent1 = new AntdUI.TooltipComponent(); - this.label1 = new AntdUI.Label(); - this.panel2 = new AntdUI.Panel(); this.stackPanel1.SuspendLayout(); + this.flowPanel11.SuspendLayout(); this.flowPanel10.SuspendLayout(); this.flowPanel9.SuspendLayout(); this.flowPanel8.SuspendLayout(); @@ -114,7 +116,7 @@ // stackPanel1 // this.stackPanel1.AutoScroll = true; - this.stackPanel1.Controls.Add(this.panel2); + this.stackPanel1.Controls.Add(this.flowPanel11); this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Controls.Add(this.flowPanel10); this.stackPanel1.Controls.Add(this.label12); @@ -144,6 +146,32 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // flowPanel11 + // + this.flowPanel11.Controls.Add(this.panel2); + this.flowPanel11.Location = new System.Drawing.Point(3, 811); + this.flowPanel11.Name = "flowPanel11"; + this.flowPanel11.Size = new System.Drawing.Size(744, 48); + this.flowPanel11.TabIndex = 33; + this.flowPanel11.Text = "flowPanel11"; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(3, 3); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(406, 39); + this.panel2.TabIndex = 33; + this.panel2.Text = "panel2"; + // + // label1 + // + this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(3, 781); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(744, 24); + this.label1.TabIndex = 31; + this.label1.Text = "Input+Popover+Table组合控件"; + // // flowPanel10 // this.flowPanel10.Controls.Add(this.input19); @@ -664,23 +692,6 @@ 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))); // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 781); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 24); - this.label1.TabIndex = 31; - this.label1.Text = "Input+Popover+Table组合控件"; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(3, 811); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(744, 82); - this.panel2.TabIndex = 32; - this.panel2.Text = "panel2"; - // // InputDemo // this.Controls.Add(this.stackPanel1); @@ -688,6 +699,7 @@ this.Name = "InputDemo"; this.Size = new System.Drawing.Size(750, 1010); this.stackPanel1.ResumeLayout(false); + this.flowPanel11.ResumeLayout(false); this.flowPanel10.ResumeLayout(false); this.flowPanel9.ResumeLayout(false); this.flowPanel8.ResumeLayout(false); @@ -758,6 +770,7 @@ private AntdUI.Input input22; private AntdUI.Input input23; private AntdUI.Label label1; + private AntdUI.FlowPanel flowPanel11; private AntdUI.Panel panel2; } } diff --git a/Views/SubView/InputTable.Designer.cs b/Views/SubView/InputTable.Designer.cs index 30d124f..bd2f2de 100644 --- a/Views/SubView/InputTable.Designer.cs +++ b/Views/SubView/InputTable.Designer.cs @@ -20,54 +20,58 @@ namespace AntdUIDemo /// private void InitializeComponent() { - InputSearch = new AntdUI.Panel(); - txtSearch = new AntdUI.Input(); - btnSearch = new AntdUI.Button(); - InputSearch.SuspendLayout(); - SuspendLayout(); + this.InputSearch = new AntdUI.Panel(); + this.txtSearch = new AntdUI.Input(); + this.btnSearch = new AntdUI.Button(); + this.InputSearch.SuspendLayout(); + this.SuspendLayout(); // // InputSearch // - InputSearch.Controls.Add(txtSearch); - InputSearch.Controls.Add(btnSearch); - InputSearch.Dock = DockStyle.Fill; - InputSearch.Location = new Point(0, 0); - InputSearch.Name = "InputSearch"; - InputSearch.Size = new Size(297, 52); - InputSearch.TabIndex = 3; - InputSearch.Text = "panel1"; + this.InputSearch.Controls.Add(this.txtSearch); + this.InputSearch.Controls.Add(this.btnSearch); + this.InputSearch.Dock = System.Windows.Forms.DockStyle.Fill; + this.InputSearch.Location = new System.Drawing.Point(0, 0); + this.InputSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.InputSearch.Name = "InputSearch"; + this.InputSearch.Size = new System.Drawing.Size(255, 37); + this.InputSearch.TabIndex = 3; + this.InputSearch.Text = "panel1"; // // txtSearch // - txtSearch.Dock = DockStyle.Fill; - txtSearch.IconRatio = 1F; - txtSearch.Location = new Point(0, 0); - txtSearch.Name = "txtSearch"; - txtSearch.PlaceholderText = "输入点什么搜索"; - txtSearch.Size = new Size(251, 52); - txtSearch.SuffixSvg = ""; - txtSearch.TabIndex = 0; + this.txtSearch.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtSearch.IconRatio = 1F; + this.txtSearch.Location = new System.Drawing.Point(0, 0); + this.txtSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtSearch.Name = "txtSearch"; + this.txtSearch.PlaceholderText = "输入点什么搜索"; + this.txtSearch.Size = new System.Drawing.Size(216, 37); + this.txtSearch.SuffixSvg = ""; + this.txtSearch.TabIndex = 0; // // btnSearch // - btnSearch.Dock = DockStyle.Right; - btnSearch.IconRatio = 1F; - btnSearch.IconSvg = "SearchOutlined"; - btnSearch.Location = new Point(251, 0); - btnSearch.Name = "btnSearch"; - btnSearch.Size = new Size(46, 52); - btnSearch.TabIndex = 1; - btnSearch.Type = AntdUI.TTypeMini.Info; + this.btnSearch.Dock = System.Windows.Forms.DockStyle.Right; + this.btnSearch.IconRatio = 1F; + this.btnSearch.IconSvg = "SearchOutlined"; + this.btnSearch.Location = new System.Drawing.Point(216, 0); + this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(39, 37); + this.btnSearch.TabIndex = 1; + this.btnSearch.Type = AntdUI.TTypeMini.Info; // // InputTable // - AutoScaleDimensions = new SizeF(7F, 17F); - AutoScaleMode = AutoScaleMode.Font; - Controls.Add(InputSearch); - Name = "InputTable"; - Size = new Size(297, 52); - InputSearch.ResumeLayout(false); - ResumeLayout(false); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.InputSearch); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "InputTable"; + this.Size = new System.Drawing.Size(255, 37); + this.InputSearch.ResumeLayout(false); + this.ResumeLayout(false); + } #endregion diff --git a/Views/SubView/InputTable.cs b/Views/SubView/InputTable.cs index 2c1ed20..2548d9e 100644 --- a/Views/SubView/InputTable.cs +++ b/Views/SubView/InputTable.cs @@ -103,8 +103,8 @@ namespace AntdUIDemo { Columns = Columns, Size = new Size(txtSearch.Width, 300), - Font = "Microsoft YaHei UI, 9pt", - + Font = new Font("Microsoft YaHei UI", 9f) + }; _table.CellDoubleClick += Table_CellDoubleClick; } @@ -205,7 +205,6 @@ namespace AntdUIDemo // 动态获取实际宽度 var controlWidth = txtSearch.Width > 10 ? txtSearch.Width : 200; // 设置默认最小值 _table.Size = new Size(controlWidth, 300); - _popover = Popover.open(new Popover.Config(txtSearch, _table) { OnControlLoad = () => BeginInvoke(new Action(() => diff --git a/Views/SubView/InputTable.resx b/Views/SubView/InputTable.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Views/SubView/InputTable.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