From e0df433d23b1afffa0b04389ad8b915a91f8debc Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 04 十二月 2024 23:40:34 +0800
Subject: [PATCH] 对接部分匹配
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/12-flowmeter/HydroFlowmeterListCtrl.Designer.cs | 208 ++++++++++++++-------------------------------------
1 files changed, 59 insertions(+), 149 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/12-flowmeter/HydroFlowmeterListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/12-flowmeter/HydroFlowmeterListCtrl.Designer.cs
index 099fb76..6ca3d2f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/12-flowmeter/HydroFlowmeterListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/12-flowmeter/HydroFlowmeterListCtrl.Designer.cs
@@ -29,8 +29,8 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroFlowmeterListCtrl));
+ 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();
@@ -45,16 +45,12 @@
colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
colElev = new DevExpress.XtraGrid.Columns.GridColumn();
colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
- colCurrentFlow = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuQ = new DevExpress.XtraGrid.Columns.GridColumn();
colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colSet = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- 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();
@@ -63,11 +59,9 @@
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();
+ generalSearchAndSetCtrl1 = new GeneralSearchAndSetCtrl();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)hydroFlowmeterViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
@@ -82,21 +76,18 @@
((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)layoutControlItem1).BeginInit();
SuspendLayout();
//
// gridControl1
//
gridControl1.DataSource = hydroFlowmeterViewModelBindingSource;
- 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(1114, 486);
+ gridControl1.Size = new Size(1114, 484);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -106,10 +97,9 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colElev, colMinorLoss, colCurrentFlow, colCalcuQ, colFlags, colDescription, colSet });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colElev, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuQ, colSet });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
- gridView1.OptionsFind.AlwaysVisible = true;
gridView1.RowCellClick += gridView1_RowCellClick;
//
// colDbLocked
@@ -160,7 +150,7 @@
colHasDb.MinWidth = 40;
colHasDb.Name = "colHasDb";
colHasDb.Visible = true;
- colHasDb.VisibleIndex = 8;
+ colHasDb.VisibleIndex = 6;
colHasDb.Width = 40;
//
// colElev
@@ -183,25 +173,18 @@
colMinorLoss.VisibleIndex = 5;
colMinorLoss.Width = 100;
//
- // colCurrentFlow
- //
- colCurrentFlow.FieldName = "CurrentFlow";
- colCurrentFlow.MaxWidth = 100;
- colCurrentFlow.MinWidth = 100;
- colCurrentFlow.Name = "colCurrentFlow";
- colCurrentFlow.Visible = true;
- colCurrentFlow.VisibleIndex = 6;
- colCurrentFlow.Width = 100;
- //
// colCalcuQ
//
colCalcuQ.FieldName = "CalcuQ";
- colCalcuQ.MaxWidth = 100;
- colCalcuQ.MinWidth = 100;
+ colCalcuQ.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colCalcuQ.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuQ.ImageOptions.SvgImage");
+ colCalcuQ.ImageOptions.SvgImageSize = new Size(16, 16);
+ colCalcuQ.MaxWidth = 120;
+ colCalcuQ.MinWidth = 120;
colCalcuQ.Name = "colCalcuQ";
colCalcuQ.Visible = true;
- colCalcuQ.VisibleIndex = 7;
- colCalcuQ.Width = 100;
+ colCalcuQ.VisibleIndex = 9;
+ colCalcuQ.Width = 120;
//
// colFlags
//
@@ -210,7 +193,7 @@
colFlags.MinWidth = 100;
colFlags.Name = "colFlags";
colFlags.Visible = true;
- colFlags.VisibleIndex = 9;
+ colFlags.VisibleIndex = 7;
colFlags.Width = 100;
//
// colDescription
@@ -219,7 +202,7 @@
colDescription.MinWidth = 100;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 10;
+ colDescription.VisibleIndex = 8;
colDescription.Width = 118;
//
// colSet
@@ -229,7 +212,7 @@
colSet.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
colSet.Name = "colSet";
colSet.Visible = true;
- colSet.VisibleIndex = 11;
+ colSet.VisibleIndex = 10;
//
// repositoryItemButtonEdit1
//
@@ -242,10 +225,8 @@
//
// layoutControl1
//
+ layoutControl1.Controls.Add(generalSearchAndSetCtrl1);
layoutControl1.Controls.Add(gridControl1);
- layoutControl1.Controls.Add(btnReset);
- layoutControl1.Controls.Add(btnSet);
- layoutControl1.Controls.Add(btnSearch);
layoutControl1.Controls.Add(txtName);
layoutControl1.Controls.Add(txtModelType);
layoutControl1.Controls.Add(txtCode);
@@ -258,48 +239,11 @@
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
- // btnReset
- //
- btnReset.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- btnReset.Appearance.Options.UseBackColor = true;
- btnReset.Location = new Point(714, 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(1008, 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(614, 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.Name = "txtName";
- txtName.Properties.AutoHeight = false;
- txtName.Size = new Size(156, 22);
+ txtName.Size = new Size(156, 20);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 0;
//
@@ -307,8 +251,7 @@
//
txtModelType.Location = new Point(454, 14);
txtModelType.Name = "txtModelType";
- txtModelType.Properties.AutoHeight = false;
- txtModelType.Size = new Size(156, 22);
+ txtModelType.Size = new Size(156, 20);
txtModelType.StyleController = layoutControl1;
txtModelType.TabIndex = 3;
//
@@ -316,8 +259,7 @@
//
txtCode.Location = new Point(254, 14);
txtCode.Name = "txtCode";
- txtCode.Properties.AutoHeight = false;
- txtCode.Size = new Size(156, 22);
+ txtCode.Size = new Size(156, 20);
txtCode.StyleController = layoutControl1;
txtCode.TabIndex = 2;
//
@@ -335,102 +277,79 @@
//
// groupForHead
//
- groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem5, layoutControlItem6, layoutControlItem7 });
+ groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem1 });
groupForHead.Location = new Point(0, 0);
groupForHead.Name = "groupForHead";
- groupForHead.Size = new Size(1118, 50);
+ groupForHead.Size = new Size(1118, 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(200, 26);
- layoutControlItem4.MinSize = new Size(200, 26);
+ layoutControlItem4.MaxSize = new Size(200, 0);
+ layoutControlItem4.MinSize = new Size(200, 24);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(200, 26);
+ layoutControlItem4.Size = new Size(200, 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(200, 0);
- layoutControlItem2.MaxSize = new Size(200, 26);
- layoutControlItem2.MinSize = new Size(200, 26);
+ layoutControlItem2.MaxSize = new Size(200, 0);
+ layoutControlItem2.MinSize = new Size(200, 24);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(200, 26);
+ layoutControlItem2.Size = new Size(200, 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(400, 0);
- layoutControlItem3.MaxSize = new Size(200, 26);
- layoutControlItem3.MinSize = new Size(200, 26);
+ layoutControlItem3.MaxSize = new Size(200, 0);
+ layoutControlItem3.MinSize = new Size(200, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(200, 26);
+ layoutControlItem3.Size = new Size(200, 28);
layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
layoutControlItem3.Text = "鍨嬪彿:";
layoutControlItem3.TextSize = new Size(28, 14);
//
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(800, 0);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(194, 26);
- emptySpaceItem1.TextSize = new Size(0, 0);
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = btnSearch;
- layoutControlItem5.Location = new Point(600, 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(994, 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(700, 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.Control = gridControl1;
- layoutControlItem8.Location = new Point(0, 50);
+ layoutControlItem8.Location = new Point(0, 52);
layoutControlItem8.Name = "layoutControlItem8";
layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 2);
- layoutControlItem8.Size = new Size(1118, 488);
+ layoutControlItem8.Size = new Size(1118, 486);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
+ //
+ // generalSearchAndSetCtrl1
+ //
+ generalSearchAndSetCtrl1.Location = new Point(614, 14);
+ generalSearchAndSetCtrl1.Margin = new Padding(2, 2, 2, 2);
+ generalSearchAndSetCtrl1.Name = "generalSearchAndSetCtrl1";
+ generalSearchAndSetCtrl1.Size = new Size(490, 24);
+ generalSearchAndSetCtrl1.TabIndex = 4;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+ layoutControlItem1.Control = generalSearchAndSetCtrl1;
+ layoutControlItem1.Location = new Point(600, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(494, 28);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
//
// HydroFlowmeterListCtrl
//
@@ -453,11 +372,8 @@
((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)layoutControlItem1).EndInit();
ResumeLayout(false);
}
@@ -475,11 +391,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colHasDb;
private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
private DevExpress.XtraGrid.Columns.GridColumn colCalcuQ;
- private DevExpress.XtraGrid.Columns.GridColumn colCurrentFlow;
private DevExpress.XtraLayout.LayoutControl layoutControl1;
- 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;
@@ -488,13 +400,11 @@
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.XtraGrid.Columns.GridColumn colFlags;
private DevExpress.XtraGrid.Columns.GridColumn colSet;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
--
Gitblit v1.9.3