From 00ab1b5282ada6ffdc78b3dd46f0ce08726a51e6 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 20 三月 2025 13:47:24 +0800
Subject: [PATCH] 优化IBox界面

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/05-blunthead/HydroBluntheadListCtrl.Designer.cs |  368 ++++++++++++++++++++++------------------------------
 1 files changed, 154 insertions(+), 214 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/05-blunthead/HydroBluntheadListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/05-blunthead/HydroBluntheadListCtrl.Designer.cs
index 866c327..a65584f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/05-blunthead/HydroBluntheadListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/05-blunthead/HydroBluntheadListCtrl.Designer.cs
@@ -29,37 +29,35 @@
         private void InitializeComponent()
         {
             components = new Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroBluntheadListCtrl));
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             gridControl1 = new DevExpress.XtraGrid.GridControl();
             hydroBluntheadViewModelBindingSource = new BindingSource(components);
             gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
-            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
             colName = new DevExpress.XtraGrid.Columns.GridColumn();
+            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
             colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
-            colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
+            colElev = new DevExpress.XtraGrid.Columns.GridColumn();
             colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
             colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
-            colElev = new DevExpress.XtraGrid.Columns.GridColumn();
             colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
-            colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
-            colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
+            colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
             colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
             colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
+            colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
+            colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
+            colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
             colSet = new DevExpress.XtraGrid.Columns.GridColumn();
             repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             txtCaliberMax = new DevExpress.XtraEditors.TextEdit();
             txtCaliberMin = new DevExpress.XtraEditors.TextEdit();
             txtMaterial = new DevExpress.XtraEditors.TextEdit();
-            btnReset = new DevExpress.XtraEditors.SimpleButton();
-            btnSet = new DevExpress.XtraEditors.SimpleButton();
-            btnSearch = new DevExpress.XtraEditors.SimpleButton();
             txtName = new DevExpress.XtraEditors.TextEdit();
             txtModelType = new DevExpress.XtraEditors.TextEdit();
             txtCode = new DevExpress.XtraEditors.TextEdit();
@@ -68,15 +66,13 @@
             layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
             layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            generalSearchAndSetCtrl1 = new GeneralSearchAndSetCtrl();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             ((ISupportInitialize)gridControl1).BeginInit();
             ((ISupportInitialize)hydroBluntheadViewModelBindingSource).BeginInit();
             ((ISupportInitialize)gridView1).BeginInit();
@@ -94,25 +90,22 @@
             ((ISupportInitialize)layoutControlItem4).BeginInit();
             ((ISupportInitialize)layoutControlItem2).BeginInit();
             ((ISupportInitialize)layoutControlItem3).BeginInit();
-            ((ISupportInitialize)emptySpaceItem1).BeginInit();
-            ((ISupportInitialize)layoutControlItem5).BeginInit();
-            ((ISupportInitialize)layoutControlItem6).BeginInit();
-            ((ISupportInitialize)layoutControlItem7).BeginInit();
             ((ISupportInitialize)layoutControlItem8).BeginInit();
             ((ISupportInitialize)layoutControlItem9).BeginInit();
             ((ISupportInitialize)simpleLabelItem1).BeginInit();
             ((ISupportInitialize)layoutControlItem10).BeginInit();
             ((ISupportInitialize)layoutControlItem11).BeginInit();
+            ((ISupportInitialize)layoutControlItem1).BeginInit();
             SuspendLayout();
             // 
             // gridControl1
             // 
             gridControl1.DataSource = hydroBluntheadViewModelBindingSource;
-            gridControl1.Location = new Point(2, 50);
+            gridControl1.Location = new Point(2, 52);
             gridControl1.MainView = gridView1;
             gridControl1.Name = "gridControl1";
             gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
-            gridControl1.Size = new Size(1267, 599);
+            gridControl1.Size = new Size(1267, 597);
             gridControl1.TabIndex = 0;
             gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
@@ -122,10 +115,9 @@
             // 
             // gridView1
             // 
-            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colHasDb, colMaterial, colCaliber, colElev, colMinorLoss, colCalcuPress, colCalcuHead, colFlags, colDescription, colSet });
+            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colElev, colMaterial, colCaliber, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuPress, colCalcuHead, colCalcuDemand, colSet });
             gridView1.GridControl = gridControl1;
             gridView1.Name = "gridView1";
-            gridView1.OptionsFind.AlwaysVisible = true;
             gridView1.RowCellClick += gridView1_RowCellClick;
             // 
             // colDbLocked
@@ -139,16 +131,6 @@
             colDbLocked.VisibleIndex = 0;
             colDbLocked.Width = 40;
             // 
-            // colCode
-            // 
-            colCode.FieldName = "Code";
-            colCode.MaxWidth = 150;
-            colCode.MinWidth = 100;
-            colCode.Name = "colCode";
-            colCode.Visible = true;
-            colCode.VisibleIndex = 2;
-            colCode.Width = 100;
-            // 
             // colName
             // 
             colName.FieldName = "Name";
@@ -158,6 +140,16 @@
             colName.Visible = true;
             colName.VisibleIndex = 1;
             colName.Width = 100;
+            // 
+            // colCode
+            // 
+            colCode.FieldName = "Code";
+            colCode.MaxWidth = 150;
+            colCode.MinWidth = 100;
+            colCode.Name = "colCode";
+            colCode.Visible = true;
+            colCode.VisibleIndex = 2;
+            colCode.Width = 100;
             // 
             // colModelType
             // 
@@ -169,15 +161,15 @@
             colModelType.VisibleIndex = 3;
             colModelType.Width = 100;
             // 
-            // colHasDb
+            // colElev
             // 
-            colHasDb.FieldName = "HasDb";
-            colHasDb.MaxWidth = 40;
-            colHasDb.MinWidth = 40;
-            colHasDb.Name = "colHasDb";
-            colHasDb.Visible = true;
-            colHasDb.VisibleIndex = 10;
-            colHasDb.Width = 40;
+            colElev.FieldName = "Elev";
+            colElev.MaxWidth = 80;
+            colElev.MinWidth = 80;
+            colElev.Name = "colElev";
+            colElev.Visible = true;
+            colElev.VisibleIndex = 4;
+            colElev.Width = 80;
             // 
             // colMaterial
             // 
@@ -186,7 +178,7 @@
             colMaterial.MinWidth = 100;
             colMaterial.Name = "colMaterial";
             colMaterial.Visible = true;
-            colMaterial.VisibleIndex = 4;
+            colMaterial.VisibleIndex = 5;
             colMaterial.Width = 100;
             // 
             // colCaliber
@@ -196,18 +188,8 @@
             colCaliber.MinWidth = 80;
             colCaliber.Name = "colCaliber";
             colCaliber.Visible = true;
-            colCaliber.VisibleIndex = 5;
+            colCaliber.VisibleIndex = 6;
             colCaliber.Width = 80;
-            // 
-            // colElev
-            // 
-            colElev.FieldName = "Elev";
-            colElev.MaxWidth = 80;
-            colElev.MinWidth = 80;
-            colElev.Name = "colElev";
-            colElev.Visible = true;
-            colElev.VisibleIndex = 6;
-            colElev.Width = 80;
             // 
             // colMinorLoss
             // 
@@ -219,25 +201,15 @@
             colMinorLoss.VisibleIndex = 7;
             colMinorLoss.Width = 80;
             // 
-            // colCalcuPress
+            // colHasDb
             // 
-            colCalcuPress.FieldName = "CalcuPress";
-            colCalcuPress.MaxWidth = 100;
-            colCalcuPress.MinWidth = 100;
-            colCalcuPress.Name = "colCalcuPress";
-            colCalcuPress.Visible = true;
-            colCalcuPress.VisibleIndex = 8;
-            colCalcuPress.Width = 100;
-            // 
-            // colCalcuHead
-            // 
-            colCalcuHead.FieldName = "CalcuHead";
-            colCalcuHead.MaxWidth = 100;
-            colCalcuHead.MinWidth = 100;
-            colCalcuHead.Name = "colCalcuHead";
-            colCalcuHead.Visible = true;
-            colCalcuHead.VisibleIndex = 9;
-            colCalcuHead.Width = 100;
+            colHasDb.FieldName = "HasDb";
+            colHasDb.MaxWidth = 40;
+            colHasDb.MinWidth = 40;
+            colHasDb.Name = "colHasDb";
+            colHasDb.Visible = true;
+            colHasDb.VisibleIndex = 8;
+            colHasDb.Width = 40;
             // 
             // colFlags
             // 
@@ -246,7 +218,7 @@
             colFlags.MinWidth = 100;
             colFlags.Name = "colFlags";
             colFlags.Visible = true;
-            colFlags.VisibleIndex = 11;
+            colFlags.VisibleIndex = 9;
             colFlags.Width = 100;
             // 
             // colDescription
@@ -255,8 +227,47 @@
             colDescription.MinWidth = 100;
             colDescription.Name = "colDescription";
             colDescription.Visible = true;
-            colDescription.VisibleIndex = 12;
+            colDescription.VisibleIndex = 10;
             colDescription.Width = 100;
+            // 
+            // colCalcuPress
+            // 
+            colCalcuPress.FieldName = "CalcuPress";
+            colCalcuPress.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            colCalcuPress.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuPress.ImageOptions.SvgImage");
+            colCalcuPress.ImageOptions.SvgImageSize = new Size(16, 16);
+            colCalcuPress.MaxWidth = 100;
+            colCalcuPress.MinWidth = 100;
+            colCalcuPress.Name = "colCalcuPress";
+            colCalcuPress.Visible = true;
+            colCalcuPress.VisibleIndex = 11;
+            colCalcuPress.Width = 100;
+            // 
+            // colCalcuHead
+            // 
+            colCalcuHead.FieldName = "CalcuHead";
+            colCalcuHead.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            colCalcuHead.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuHead.ImageOptions.SvgImage");
+            colCalcuHead.ImageOptions.SvgImageSize = new Size(16, 16);
+            colCalcuHead.MaxWidth = 100;
+            colCalcuHead.MinWidth = 100;
+            colCalcuHead.Name = "colCalcuHead";
+            colCalcuHead.Visible = true;
+            colCalcuHead.VisibleIndex = 12;
+            colCalcuHead.Width = 100;
+            // 
+            // colCalcuDemand
+            // 
+            colCalcuDemand.FieldName = "CalcuDemand";
+            colCalcuDemand.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            colCalcuDemand.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuDemand.ImageOptions.SvgImage");
+            colCalcuDemand.ImageOptions.SvgImageSize = new Size(16, 16);
+            colCalcuDemand.MaxWidth = 110;
+            colCalcuDemand.MinWidth = 110;
+            colCalcuDemand.Name = "colCalcuDemand";
+            colCalcuDemand.Visible = true;
+            colCalcuDemand.VisibleIndex = 13;
+            colCalcuDemand.Width = 110;
             // 
             // colSet
             // 
@@ -267,27 +278,25 @@
             colSet.MinWidth = 60;
             colSet.Name = "colSet";
             colSet.Visible = true;
-            colSet.VisibleIndex = 13;
+            colSet.VisibleIndex = 14;
             colSet.Width = 60;
             // 
             // repositoryItemButtonEdit1
             // 
             repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
-            editorButtonImageOptions2.SvgImageSize = new Size(20, 20);
-            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+            editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
+            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
             repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             // 
             // layoutControl1
             // 
+            layoutControl1.Controls.Add(generalSearchAndSetCtrl1);
             layoutControl1.Controls.Add(gridControl1);
             layoutControl1.Controls.Add(txtCaliberMax);
             layoutControl1.Controls.Add(txtCaliberMin);
             layoutControl1.Controls.Add(txtMaterial);
-            layoutControl1.Controls.Add(btnReset);
-            layoutControl1.Controls.Add(btnSet);
-            layoutControl1.Controls.Add(btnSearch);
             layoutControl1.Controls.Add(txtName);
             layoutControl1.Controls.Add(txtModelType);
             layoutControl1.Controls.Add(txtCode);
@@ -302,99 +311,57 @@
             // 
             // txtCaliberMax
             // 
-            txtCaliberMax.Location = new Point(728, 14);
+            txtCaliberMax.Location = new Point(728, 16);
             txtCaliberMax.Name = "txtCaliberMax";
             txtCaliberMax.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
-            txtCaliberMax.Properties.AutoHeight = false;
             txtCaliberMax.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             txtCaliberMax.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             txtCaliberMax.Properties.NullValuePrompt = "mm";
-            txtCaliberMax.Size = new Size(50, 22);
+            txtCaliberMax.Size = new Size(50, 20);
             txtCaliberMax.StyleController = layoutControl1;
             txtCaliberMax.TabIndex = 10;
             // 
             // txtCaliberMin
             // 
-            txtCaliberMin.Location = new Point(654, 14);
+            txtCaliberMin.Location = new Point(654, 16);
             txtCaliberMin.Name = "txtCaliberMin";
             txtCaliberMin.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
-            txtCaliberMin.Properties.AutoHeight = false;
             txtCaliberMin.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             txtCaliberMin.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             txtCaliberMin.Properties.NullValuePrompt = "mm";
-            txtCaliberMin.Size = new Size(50, 22);
+            txtCaliberMin.Size = new Size(50, 20);
             txtCaliberMin.StyleController = layoutControl1;
             txtCaliberMin.TabIndex = 9;
             // 
             // txtMaterial
             // 
-            txtMaterial.Location = new Point(504, 14);
+            txtMaterial.Location = new Point(504, 16);
             txtMaterial.Name = "txtMaterial";
-            txtMaterial.Properties.AutoHeight = false;
-            txtMaterial.Size = new Size(106, 22);
+            txtMaterial.Size = new Size(106, 20);
             txtMaterial.StyleController = layoutControl1;
             txtMaterial.TabIndex = 8;
             // 
-            // btnReset
-            // 
-            btnReset.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
-            btnReset.Appearance.Options.UseBackColor = true;
-            btnReset.Location = new Point(882, 14);
-            btnReset.Name = "btnReset";
-            btnReset.Size = new Size(96, 22);
-            btnReset.StyleController = layoutControl1;
-            btnReset.TabIndex = 7;
-            btnReset.Text = "閲嶇疆";
-            btnReset.Click += btnReset_Click;
-            // 
-            // btnSet
-            // 
-            btnSet.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
-            btnSet.Appearance.Options.UseBackColor = true;
-            btnSet.Location = new Point(1161, 14);
-            btnSet.Name = "btnSet";
-            btnSet.Size = new Size(96, 22);
-            btnSet.StyleController = layoutControl1;
-            btnSet.TabIndex = 6;
-            btnSet.Text = "璁剧疆";
-            btnSet.Click += btnSet_Click;
-            // 
-            // btnSearch
-            // 
-            btnSearch.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            btnSearch.Appearance.Options.UseBackColor = true;
-            btnSearch.Location = new Point(782, 14);
-            btnSearch.Name = "btnSearch";
-            btnSearch.Size = new Size(96, 22);
-            btnSearch.StyleController = layoutControl1;
-            btnSearch.TabIndex = 5;
-            btnSearch.Text = "鏌ヨ";
-            btnSearch.Click += btnSearch_Click;
-            // 
             // txtName
             // 
-            txtName.Location = new Point(54, 14);
+            txtName.Location = new Point(54, 16);
             txtName.Name = "txtName";
-            txtName.Properties.AutoHeight = false;
-            txtName.Size = new Size(106, 22);
+            txtName.Size = new Size(106, 20);
             txtName.StyleController = layoutControl1;
             txtName.TabIndex = 0;
             // 
             // txtModelType
             // 
-            txtModelType.Location = new Point(354, 14);
+            txtModelType.Location = new Point(354, 16);
             txtModelType.Name = "txtModelType";
-            txtModelType.Properties.AutoHeight = false;
-            txtModelType.Size = new Size(106, 22);
+            txtModelType.Size = new Size(106, 20);
             txtModelType.StyleController = layoutControl1;
             txtModelType.TabIndex = 3;
             // 
             // txtCode
             // 
-            txtCode.Location = new Point(204, 14);
+            txtCode.Location = new Point(204, 16);
             txtCode.Name = "txtCode";
-            txtCode.Properties.AutoHeight = false;
-            txtCode.Size = new Size(106, 22);
+            txtCode.Size = new Size(106, 20);
             txtCode.StyleController = layoutControl1;
             txtCode.TabIndex = 2;
             // 
@@ -412,113 +379,74 @@
             // 
             // groupForHead
             // 
-            groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem5, layoutControlItem6, layoutControlItem7, layoutControlItem8, layoutControlItem9, simpleLabelItem1, layoutControlItem10 });
+            groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem8, layoutControlItem9, simpleLabelItem1, layoutControlItem10, layoutControlItem1 });
             groupForHead.Location = new Point(0, 0);
             groupForHead.Name = "groupForHead";
-            groupForHead.Size = new Size(1271, 50);
+            groupForHead.Size = new Size(1271, 52);
             groupForHead.Text = "鏌ヨ鏉′欢";
             groupForHead.TextVisible = false;
             // 
             // layoutControlItem4
             // 
+            layoutControlItem4.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             layoutControlItem4.Control = txtName;
             layoutControlItem4.Location = new Point(0, 0);
-            layoutControlItem4.MaxSize = new Size(150, 26);
-            layoutControlItem4.MinSize = new Size(150, 26);
+            layoutControlItem4.MaxSize = new Size(150, 24);
+            layoutControlItem4.MinSize = new Size(150, 24);
             layoutControlItem4.Name = "layoutControlItem4";
-            layoutControlItem4.Size = new Size(150, 26);
+            layoutControlItem4.Size = new Size(150, 28);
             layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem4.Text = "鍚嶇О:";
             layoutControlItem4.TextSize = new Size(28, 14);
             // 
             // layoutControlItem2
             // 
+            layoutControlItem2.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             layoutControlItem2.Control = txtCode;
             layoutControlItem2.Location = new Point(150, 0);
-            layoutControlItem2.MaxSize = new Size(150, 26);
-            layoutControlItem2.MinSize = new Size(150, 26);
+            layoutControlItem2.MaxSize = new Size(150, 0);
+            layoutControlItem2.MinSize = new Size(150, 24);
             layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(150, 26);
+            layoutControlItem2.Size = new Size(150, 28);
             layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem2.Text = "缂栫爜:";
             layoutControlItem2.TextSize = new Size(28, 14);
             // 
             // layoutControlItem3
             // 
+            layoutControlItem3.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             layoutControlItem3.Control = txtModelType;
             layoutControlItem3.Location = new Point(300, 0);
-            layoutControlItem3.MaxSize = new Size(150, 26);
-            layoutControlItem3.MinSize = new Size(150, 26);
+            layoutControlItem3.MaxSize = new Size(150, 24);
+            layoutControlItem3.MinSize = new Size(150, 24);
             layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(150, 26);
+            layoutControlItem3.Size = new Size(150, 28);
             layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem3.Text = "鍨嬪彿:";
             layoutControlItem3.TextSize = new Size(28, 14);
             // 
-            // emptySpaceItem1
-            // 
-            emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new Point(968, 0);
-            emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new Size(179, 26);
-            emptySpaceItem1.TextSize = new Size(0, 0);
-            // 
-            // layoutControlItem5
-            // 
-            layoutControlItem5.Control = btnSearch;
-            layoutControlItem5.Location = new Point(768, 0);
-            layoutControlItem5.MaxSize = new Size(100, 26);
-            layoutControlItem5.MinSize = new Size(100, 26);
-            layoutControlItem5.Name = "layoutControlItem5";
-            layoutControlItem5.Size = new Size(100, 26);
-            layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem5.TextSize = new Size(0, 0);
-            layoutControlItem5.TextVisible = false;
-            // 
-            // layoutControlItem6
-            // 
-            layoutControlItem6.Control = btnSet;
-            layoutControlItem6.Location = new Point(1147, 0);
-            layoutControlItem6.MaxSize = new Size(100, 26);
-            layoutControlItem6.MinSize = new Size(100, 26);
-            layoutControlItem6.Name = "layoutControlItem6";
-            layoutControlItem6.Size = new Size(100, 26);
-            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem6.TextSize = new Size(0, 0);
-            layoutControlItem6.TextVisible = false;
-            // 
-            // layoutControlItem7
-            // 
-            layoutControlItem7.Control = btnReset;
-            layoutControlItem7.Location = new Point(868, 0);
-            layoutControlItem7.MaxSize = new Size(100, 26);
-            layoutControlItem7.MinSize = new Size(100, 26);
-            layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new Size(100, 26);
-            layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem7.TextSize = new Size(0, 0);
-            layoutControlItem7.TextVisible = false;
-            // 
             // layoutControlItem8
             // 
+            layoutControlItem8.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             layoutControlItem8.Control = txtMaterial;
             layoutControlItem8.Location = new Point(450, 0);
-            layoutControlItem8.MaxSize = new Size(150, 26);
-            layoutControlItem8.MinSize = new Size(150, 26);
+            layoutControlItem8.MaxSize = new Size(150, 24);
+            layoutControlItem8.MinSize = new Size(150, 24);
             layoutControlItem8.Name = "layoutControlItem8";
-            layoutControlItem8.Size = new Size(150, 26);
+            layoutControlItem8.Size = new Size(150, 28);
             layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem8.Text = "鏉愯川:";
             layoutControlItem8.TextSize = new Size(28, 14);
             // 
             // layoutControlItem9
             // 
+            layoutControlItem9.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             layoutControlItem9.Control = txtCaliberMin;
             layoutControlItem9.Location = new Point(600, 0);
-            layoutControlItem9.MaxSize = new Size(94, 26);
-            layoutControlItem9.MinSize = new Size(94, 26);
+            layoutControlItem9.MaxSize = new Size(94, 24);
+            layoutControlItem9.MinSize = new Size(94, 24);
             layoutControlItem9.Name = "layoutControlItem9";
-            layoutControlItem9.Size = new Size(94, 26);
+            layoutControlItem9.Size = new Size(94, 28);
             layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem9.Text = "鍙e緞:";
             layoutControlItem9.TextSize = new Size(28, 14);
@@ -532,7 +460,7 @@
             simpleLabelItem1.MaxSize = new Size(20, 18);
             simpleLabelItem1.MinSize = new Size(20, 18);
             simpleLabelItem1.Name = "simpleLabelItem1";
-            simpleLabelItem1.Size = new Size(20, 26);
+            simpleLabelItem1.Size = new Size(20, 28);
             simpleLabelItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             simpleLabelItem1.Text = "-";
             simpleLabelItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
@@ -540,12 +468,13 @@
             // 
             // layoutControlItem10
             // 
+            layoutControlItem10.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             layoutControlItem10.Control = txtCaliberMax;
             layoutControlItem10.Location = new Point(714, 0);
-            layoutControlItem10.MaxSize = new Size(54, 26);
-            layoutControlItem10.MinSize = new Size(54, 26);
+            layoutControlItem10.MaxSize = new Size(54, 24);
+            layoutControlItem10.MinSize = new Size(54, 24);
             layoutControlItem10.Name = "layoutControlItem10";
-            layoutControlItem10.Size = new Size(54, 26);
+            layoutControlItem10.Size = new Size(54, 28);
             layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem10.TextSize = new Size(0, 0);
             layoutControlItem10.TextVisible = false;
@@ -553,12 +482,30 @@
             // layoutControlItem11
             // 
             layoutControlItem11.Control = gridControl1;
-            layoutControlItem11.Location = new Point(0, 50);
+            layoutControlItem11.Location = new Point(0, 52);
             layoutControlItem11.Name = "layoutControlItem11";
             layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 2);
-            layoutControlItem11.Size = new Size(1271, 601);
+            layoutControlItem11.Size = new Size(1271, 599);
             layoutControlItem11.TextSize = new Size(0, 0);
             layoutControlItem11.TextVisible = false;
+            // 
+            // generalSearchAndSetCtrl1
+            // 
+            generalSearchAndSetCtrl1.Location = new Point(782, 14);
+            generalSearchAndSetCtrl1.Margin = new Padding(2, 2, 2, 2);
+            generalSearchAndSetCtrl1.Name = "generalSearchAndSetCtrl1";
+            generalSearchAndSetCtrl1.Size = new Size(475, 24);
+            generalSearchAndSetCtrl1.TabIndex = 11;
+            // 
+            // layoutControlItem1
+            // 
+            layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+            layoutControlItem1.Control = generalSearchAndSetCtrl1;
+            layoutControlItem1.Location = new Point(768, 0);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Size = new Size(479, 28);
+            layoutControlItem1.TextSize = new Size(0, 0);
+            layoutControlItem1.TextVisible = false;
             // 
             // HydroBluntheadListCtrl
             // 
@@ -584,15 +531,12 @@
             ((ISupportInitialize)layoutControlItem4).EndInit();
             ((ISupportInitialize)layoutControlItem2).EndInit();
             ((ISupportInitialize)layoutControlItem3).EndInit();
-            ((ISupportInitialize)emptySpaceItem1).EndInit();
-            ((ISupportInitialize)layoutControlItem5).EndInit();
-            ((ISupportInitialize)layoutControlItem6).EndInit();
-            ((ISupportInitialize)layoutControlItem7).EndInit();
             ((ISupportInitialize)layoutControlItem8).EndInit();
             ((ISupportInitialize)layoutControlItem9).EndInit();
             ((ISupportInitialize)simpleLabelItem1).EndInit();
             ((ISupportInitialize)layoutControlItem10).EndInit();
             ((ISupportInitialize)layoutControlItem11).EndInit();
+            ((ISupportInitialize)layoutControlItem1).EndInit();
             ResumeLayout(false);
         }
 
@@ -617,9 +561,6 @@
         private DevExpress.XtraEditors.TextEdit txtCaliberMax;
         private DevExpress.XtraEditors.TextEdit txtCaliberMin;
         private DevExpress.XtraEditors.TextEdit txtMaterial;
-        private DevExpress.XtraEditors.SimpleButton btnReset;
-        private DevExpress.XtraEditors.SimpleButton btnSet;
-        private DevExpress.XtraEditors.SimpleButton btnSearch;
         private DevExpress.XtraEditors.TextEdit txtName;
         private DevExpress.XtraEditors.TextEdit txtModelType;
         private DevExpress.XtraEditors.TextEdit txtCode;
@@ -628,10 +569,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItem1;
@@ -640,5 +577,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn colFlags;
         private DevExpress.XtraGrid.Columns.GridColumn colSet;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn colCalcuDemand;
+        private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
     }
 }

--
Gitblit v1.9.3