From 26f45822a2a84af81e20ca543da98d3b822c5afd Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 21:25:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/02-tank/HydroTankListCtrl.Designer.cs | 359 +++++++++++++++++++++++------------------------------------
1 files changed, 138 insertions(+), 221 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/02-tank/HydroTankListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/02-tank/HydroTankListCtrl.Designer.cs
index cbe98f3..eac1f42 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/02-tank/HydroTankListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/02-tank/HydroTankListCtrl.Designer.cs
@@ -29,39 +29,36 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroTankListCtrl));
+ 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();
hydroTankViewModelBindingSource = new BindingSource(components);
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ generalSearchAndSetCtrl1 = new GeneralSearchAndSetCtrl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- colSet = new DevExpress.XtraGrid.Columns.GridColumn();
- repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
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();
colPoolElev = new DevExpress.XtraGrid.Columns.GridColumn();
colInitLevel = new DevExpress.XtraGrid.Columns.GridColumn();
colMinLevel = new DevExpress.XtraGrid.Columns.GridColumn();
colMaxLevel = new DevExpress.XtraGrid.Columns.GridColumn();
colDN = new DevExpress.XtraGrid.Columns.GridColumn();
colMinVol = new DevExpress.XtraGrid.Columns.GridColumn();
- colCurve = new DevExpress.XtraGrid.Columns.GridColumn();
colOverFlow = new DevExpress.XtraGrid.Columns.GridColumn();
+ colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
+ colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
+ colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
- colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
- colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
- btnReset = new DevExpress.XtraEditors.SimpleButton();
- btnSet = new DevExpress.XtraEditors.SimpleButton();
- btnSearch = new DevExpress.XtraEditors.SimpleButton();
+ colSet = new DevExpress.XtraGrid.Columns.GridColumn();
+ repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
txtModelType = new DevExpress.XtraEditors.TextEdit();
txtCode = new DevExpress.XtraEditors.TextEdit();
@@ -70,10 +67,7 @@
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();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)hydroTankViewModelBindingSource).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
@@ -89,10 +83,7 @@
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)emptySpaceItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
SuspendLayout();
//
@@ -102,10 +93,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);
@@ -114,69 +103,46 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1227, 184, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(1689, 607);
+ layoutControl1.Size = new Size(1179, 609);
layoutControl1.TabIndex = 3;
layoutControl1.Text = "layoutControl1";
+ //
+ // generalSearchAndSetCtrl1
+ //
+ generalSearchAndSetCtrl1.Location = new Point(614, 14);
+ generalSearchAndSetCtrl1.Margin = new Padding(2, 2, 2, 2);
+ generalSearchAndSetCtrl1.Name = "generalSearchAndSetCtrl1";
+ generalSearchAndSetCtrl1.Size = new Size(551, 24);
+ generalSearchAndSetCtrl1.TabIndex = 4;
//
// gridControl1
//
gridControl1.DataSource = hydroTankViewModelBindingSource;
- 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(1685, 555);
+ gridControl1.Size = new Size(1175, 555);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colSet, colDbLocked, colCode, colName, colModelType, colHasDb, colPoolElev, colInitLevel, colMinLevel, colMaxLevel, colDN, colMinVol, colCurve, colOverFlow, colCalcuPress, colCalcuHead, colCalcuDemand, colFlags, colDescription });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colPoolElev, colInitLevel, colMinLevel, colMaxLevel, colDN, colMinVol, colOverFlow, colHasDb, colDescription, colFlags, colCalcuPress, colCalcuHead, colCalcuDemand, colSet });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
- gridView1.OptionsFind.AlwaysVisible = true;
gridView1.RowCellClick += gridView1_RowCellClick;
- //
- // colSet
- //
- colSet.Caption = "璁剧疆";
- colSet.ColumnEdit = repositoryItemButtonEdit1;
- colSet.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
- colSet.MaxWidth = 60;
- colSet.MinWidth = 60;
- colSet.Name = "colSet";
- colSet.Visible = true;
- colSet.VisibleIndex = 18;
- colSet.Width = 60;
- //
- // repositoryItemButtonEdit1
- //
- repositoryItemButtonEdit1.AutoHeight = false;
- 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, "璁剧疆", "set", null, DevExpress.Utils.ToolTipAnchor.Default) });
- repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
// colDbLocked
//
colDbLocked.FieldName = "DbLocked";
+ colDbLocked.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
colDbLocked.MaxWidth = 40;
colDbLocked.MinWidth = 40;
colDbLocked.Name = "colDbLocked";
colDbLocked.Visible = true;
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
//
@@ -188,6 +154,16 @@
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
//
colModelType.FieldName = "ModelType";
@@ -197,16 +173,6 @@
colModelType.Visible = true;
colModelType.VisibleIndex = 3;
colModelType.Width = 100;
- //
- // colHasDb
- //
- colHasDb.FieldName = "HasDb";
- colHasDb.MaxWidth = 40;
- colHasDb.MinWidth = 40;
- colHasDb.Name = "colHasDb";
- colHasDb.Visible = true;
- colHasDb.VisibleIndex = 15;
- colHasDb.Width = 40;
//
// colPoolElev
//
@@ -268,16 +234,6 @@
colMinVol.VisibleIndex = 9;
colMinVol.Width = 100;
//
- // colCurve
- //
- colCurve.FieldName = "Curve";
- colCurve.MaxWidth = 100;
- colCurve.MinWidth = 100;
- colCurve.Name = "colCurve";
- colCurve.Visible = true;
- colCurve.VisibleIndex = 10;
- colCurve.Width = 100;
- //
// colOverFlow
//
colOverFlow.FieldName = "OverFlow";
@@ -285,38 +241,27 @@
colOverFlow.MinWidth = 60;
colOverFlow.Name = "colOverFlow";
colOverFlow.Visible = true;
- colOverFlow.VisibleIndex = 11;
+ colOverFlow.VisibleIndex = 10;
colOverFlow.Width = 60;
//
- // colCalcuPress
+ // colHasDb
//
- colCalcuPress.FieldName = "CalcuPress";
- colCalcuPress.MaxWidth = 100;
- colCalcuPress.MinWidth = 100;
- colCalcuPress.Name = "colCalcuPress";
- colCalcuPress.Visible = true;
- colCalcuPress.VisibleIndex = 12;
- colCalcuPress.Width = 100;
+ colHasDb.FieldName = "HasDb";
+ colHasDb.MaxWidth = 40;
+ colHasDb.MinWidth = 40;
+ colHasDb.Name = "colHasDb";
+ colHasDb.Visible = true;
+ colHasDb.VisibleIndex = 11;
+ colHasDb.Width = 40;
//
- // colCalcuHead
+ // colDescription
//
- colCalcuHead.FieldName = "CalcuHead";
- colCalcuHead.MaxWidth = 100;
- colCalcuHead.MinWidth = 100;
- colCalcuHead.Name = "colCalcuHead";
- colCalcuHead.Visible = true;
- colCalcuHead.VisibleIndex = 13;
- colCalcuHead.Width = 100;
- //
- // colCalcuDemand
- //
- colCalcuDemand.FieldName = "CalcuDemand";
- colCalcuDemand.MaxWidth = 100;
- colCalcuDemand.MinWidth = 100;
- colCalcuDemand.Name = "colCalcuDemand";
- colCalcuDemand.Visible = true;
- colCalcuDemand.VisibleIndex = 14;
- colCalcuDemand.Width = 100;
+ colDescription.FieldName = "Description";
+ colDescription.MinWidth = 100;
+ colDescription.Name = "colDescription";
+ colDescription.Visible = true;
+ colDescription.VisibleIndex = 13;
+ colDescription.Width = 100;
//
// colFlags
//
@@ -325,78 +270,90 @@
colFlags.MinWidth = 100;
colFlags.Name = "colFlags";
colFlags.Visible = true;
- colFlags.VisibleIndex = 16;
+ colFlags.VisibleIndex = 12;
colFlags.Width = 100;
//
- // colDescription
+ // colCalcuPress
//
- colDescription.FieldName = "Description";
- colDescription.MinWidth = 100;
- colDescription.Name = "colDescription";
- colDescription.Visible = true;
- colDescription.VisibleIndex = 17;
- colDescription.Width = 100;
+ 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 = 14;
+ colCalcuPress.Width = 100;
//
- // btnReset
+ // colCalcuHead
//
- 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;
+ 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 = 15;
+ colCalcuHead.Width = 100;
//
- // btnSet
+ // colCalcuDemand
//
- btnSet.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
- btnSet.Appearance.Options.UseBackColor = true;
- btnSet.Location = new Point(1579, 14);
- btnSet.Name = "btnSet";
- btnSet.Size = new Size(96, 22);
- btnSet.StyleController = layoutControl1;
- btnSet.TabIndex = 6;
- btnSet.Text = "璁剧疆";
- btnSet.Click += btnSet_Click;
+ 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 = 16;
+ colCalcuDemand.Width = 110;
//
- // btnSearch
+ // colSet
//
- 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;
+ colSet.Caption = "璁剧疆";
+ colSet.ColumnEdit = repositoryItemButtonEdit1;
+ colSet.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colSet.MaxWidth = 60;
+ colSet.MinWidth = 60;
+ colSet.Name = "colSet";
+ colSet.Visible = true;
+ colSet.VisibleIndex = 17;
+ colSet.Width = 60;
+ //
+ // repositoryItemButtonEdit1
+ //
+ repositoryItemButtonEdit1.AutoHeight = false;
+ 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, "璁剧疆", "set", null, DevExpress.Utils.ToolTipAnchor.Default) });
+ repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
// txtName
//
- txtName.Location = new Point(54, 14);
+ txtName.Location = new Point(54, 16);
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;
//
// txtModelType
//
- txtModelType.Location = new Point(454, 14);
+ txtModelType.Location = new Point(454, 16);
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;
//
// txtCode
//
- txtCode.Location = new Point(254, 14);
+ txtCode.Location = new Point(254, 16);
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;
//
@@ -409,105 +366,74 @@
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { groupForHead, layoutControlItem8 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(1689, 607);
+ Root.Size = new Size(1179, 609);
Root.TextVisible = false;
//
// 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(1689, 50);
+ groupForHead.Size = new Size(1179, 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
+ // layoutControlItem1
//
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(800, 0);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(765, 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(1565, 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;
+ layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+ layoutControlItem1.Control = generalSearchAndSetCtrl1;
+ layoutControlItem1.Location = new Point(600, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(555, 28);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.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(1689, 557);
+ layoutControlItem8.Size = new Size(1179, 557);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -517,7 +443,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
Name = "HydroTankListCtrl";
- Size = new Size(1689, 607);
+ Size = new Size(1179, 609);
((ISupportInitialize)hydroTankViewModelBindingSource).EndInit();
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
@@ -532,10 +458,7 @@
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)emptySpaceItem1).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
ResumeLayout(false);
}
@@ -558,16 +481,12 @@
private DevExpress.XtraGrid.Columns.GridColumn colMaxLevel;
private DevExpress.XtraGrid.Columns.GridColumn colDN;
private DevExpress.XtraGrid.Columns.GridColumn colMinVol;
- private DevExpress.XtraGrid.Columns.GridColumn colCurve;
private DevExpress.XtraGrid.Columns.GridColumn colOverFlow;
private DevExpress.XtraGrid.Columns.GridColumn colCalcuPress;
private DevExpress.XtraGrid.Columns.GridColumn colCalcuHead;
private DevExpress.XtraGrid.Columns.GridColumn colCalcuDemand;
private DevExpress.XtraGrid.Columns.GridColumn colFlags;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- 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;
@@ -576,10 +495,8 @@
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 GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
--
Gitblit v1.9.3