From 0711485ecb4fe66fbe820478d92eb9f04b77c042 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 24 十月 2024 13:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-grading/01-set/SetHydroGradingModelCtrl.Designer.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-grading/01-set/SetHydroGradingModelCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-grading/01-set/SetHydroGradingModelCtrl.Designer.cs
index 3598056..bc09065 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-grading/01-set/SetHydroGradingModelCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-grading/01-set/SetHydroGradingModelCtrl.Designer.cs
@@ -29,12 +29,12 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(SetHydroGradingModelCtrl));
- 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();
+ 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();
gridControl1 = new DevExpress.XtraGrid.GridControl();
setHydroGradingModelViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -44,6 +44,7 @@
repositoryItemColorPickEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit();
colDelete = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ colSetValue = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)setHydroGradingModelViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
@@ -69,10 +70,11 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colMinValue, colMaxValue, colColor, colDelete });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colSetValue, colMinValue, colMaxValue, colColor, colDelete });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.RowCellClick += gridView1_RowCellClick;
+ gridView1.CustomRowCellEdit += gridView1_CustomRowCellEdit;
gridView1.ShowingEditor += gridView1_ShowingEditor;
gridView1.InitNewRow += gridView1_InitNewRow;
//
@@ -81,14 +83,14 @@
colMinValue.FieldName = "MinValue";
colMinValue.Name = "colMinValue";
colMinValue.Visible = true;
- colMinValue.VisibleIndex = 0;
+ colMinValue.VisibleIndex = 1;
//
// colMaxValue
//
colMaxValue.FieldName = "MaxValue";
colMaxValue.Name = "colMaxValue";
colMaxValue.Visible = true;
- colMaxValue.VisibleIndex = 1;
+ colMaxValue.VisibleIndex = 2;
//
// colColor
//
@@ -96,7 +98,7 @@
colColor.FieldName = "Color";
colColor.Name = "colColor";
colColor.Visible = true;
- colColor.VisibleIndex = 2;
+ colColor.VisibleIndex = 3;
//
// repositoryItemColorPickEdit1
//
@@ -116,17 +118,24 @@
colDelete.Name = "colDelete";
colDelete.OptionsColumn.AllowEdit = false;
colDelete.Visible = true;
- colDelete.VisibleIndex = 3;
+ colDelete.VisibleIndex = 4;
colDelete.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, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+ 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) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ //
+ // colSetValue
+ //
+ colSetValue.FieldName = "SetValue";
+ colSetValue.Name = "colSetValue";
+ colSetValue.Visible = true;
+ colSetValue.VisibleIndex = 0;
//
// SetHydroGradingModelCtrl
//
@@ -154,5 +163,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit repositoryItemColorPickEdit1;
private DevExpress.XtraGrid.Columns.GridColumn colDelete;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn colSetValue;
}
}
--
Gitblit v1.9.3