From 28999ee3f86d70c5be79f6f6a686c59e56bcad32 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 24 十二月 2024 21:22:30 +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 | 150 +++++++++++++++++++++++---------------------------
1 files changed, 69 insertions(+), 81 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 b5a26ee..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,37 +29,36 @@
private void InitializeComponent()
{
components = new Container();
+ 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();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroTankListCtrl));
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();
+ 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();
@@ -90,7 +89,7 @@
//
// hydroTankViewModelBindingSource
//
- hydroTankViewModelBindingSource.DataSource = typeof(HydroElbowViewModel);
+ hydroTankViewModelBindingSource.DataSource = typeof(HydroTankViewModel);
//
// layoutControl1
//
@@ -129,31 +128,10 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colPoolElev, colInitLevel, colMinLevel, colMaxLevel, colDN, colMinVol, colCurve, colOverFlow, colHasDb, colDescription, colFlags, colCalcuPress, colCalcuHead, colCalcuDemand, colSet });
+ 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.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
//
@@ -166,16 +144,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";
@@ -186,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";
@@ -195,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 = 12;
- colHasDb.Width = 40;
//
// colPoolElev
//
@@ -266,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";
@@ -283,8 +241,37 @@
colOverFlow.MinWidth = 60;
colOverFlow.Name = "colOverFlow";
colOverFlow.Visible = true;
- colOverFlow.VisibleIndex = 11;
+ colOverFlow.VisibleIndex = 10;
colOverFlow.Width = 60;
+ //
+ // colHasDb
+ //
+ colHasDb.FieldName = "HasDb";
+ colHasDb.MaxWidth = 40;
+ colHasDb.MinWidth = 40;
+ colHasDb.Name = "colHasDb";
+ colHasDb.Visible = true;
+ colHasDb.VisibleIndex = 11;
+ colHasDb.Width = 40;
+ //
+ // colDescription
+ //
+ colDescription.FieldName = "Description";
+ colDescription.MinWidth = 100;
+ colDescription.Name = "colDescription";
+ colDescription.Visible = true;
+ colDescription.VisibleIndex = 13;
+ colDescription.Width = 100;
+ //
+ // colFlags
+ //
+ colFlags.FieldName = "Flags";
+ colFlags.MaxWidth = 200;
+ colFlags.MinWidth = 100;
+ colFlags.Name = "colFlags";
+ colFlags.Visible = true;
+ colFlags.VisibleIndex = 12;
+ colFlags.Width = 100;
//
// colCalcuPress
//
@@ -296,7 +283,7 @@
colCalcuPress.MinWidth = 100;
colCalcuPress.Name = "colCalcuPress";
colCalcuPress.Visible = true;
- colCalcuPress.VisibleIndex = 15;
+ colCalcuPress.VisibleIndex = 14;
colCalcuPress.Width = 100;
//
// colCalcuHead
@@ -309,7 +296,7 @@
colCalcuHead.MinWidth = 100;
colCalcuHead.Name = "colCalcuHead";
colCalcuHead.Visible = true;
- colCalcuHead.VisibleIndex = 16;
+ colCalcuHead.VisibleIndex = 15;
colCalcuHead.Width = 100;
//
// colCalcuDemand
@@ -322,27 +309,29 @@
colCalcuDemand.MinWidth = 110;
colCalcuDemand.Name = "colCalcuDemand";
colCalcuDemand.Visible = true;
- colCalcuDemand.VisibleIndex = 17;
+ colCalcuDemand.VisibleIndex = 16;
colCalcuDemand.Width = 110;
//
- // colFlags
+ // colSet
//
- colFlags.FieldName = "Flags";
- colFlags.MaxWidth = 200;
- colFlags.MinWidth = 100;
- colFlags.Name = "colFlags";
- colFlags.Visible = true;
- colFlags.VisibleIndex = 13;
- colFlags.Width = 100;
+ 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;
//
- // colDescription
+ // repositoryItemButtonEdit1
//
- colDescription.FieldName = "Description";
- colDescription.MinWidth = 100;
- colDescription.Name = "colDescription";
- colDescription.Visible = true;
- colDescription.VisibleIndex = 14;
- colDescription.Width = 100;
+ 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
//
@@ -492,7 +481,6 @@
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;
--
Gitblit v1.9.3