From d5a2d7e66f9c8046bd88b8269e61aac5a2a265e2 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/03-list/SetHydroGradingModelCtrl.Designer.cs | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/03-list/SetHydroGradingModelCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/03-list/SetHydroGradingModelCtrl.Designer.cs
index bc09065..15ac407 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/03-list/SetHydroGradingModelCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/03-list/SetHydroGradingModelCtrl.Designer.cs
@@ -29,22 +29,24 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(SetHydroGradingModelCtrl));
- 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.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();
setHydroGradingModelViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ colSetValue = new DevExpress.XtraGrid.Columns.GridColumn();
colMinValue = new DevExpress.XtraGrid.Columns.GridColumn();
colMaxValue = new DevExpress.XtraGrid.Columns.GridColumn();
colColor = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemColorPickEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit();
colDelete = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- colSetValue = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinPercent = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMaxPercent = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)setHydroGradingModelViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
@@ -60,7 +62,7 @@
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemColorPickEdit1, repositoryItemButtonEdit1 });
- gridControl1.Size = new Size(497, 402);
+ gridControl1.Size = new Size(731, 402);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -70,13 +72,20 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colSetValue, colMinValue, colMaxValue, colColor, colDelete });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colSetValue, colMinValue, colMaxValue, colMinPercent, colMaxPercent, colColor, colDelete });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.RowCellClick += gridView1_RowCellClick;
gridView1.CustomRowCellEdit += gridView1_CustomRowCellEdit;
gridView1.ShowingEditor += gridView1_ShowingEditor;
gridView1.InitNewRow += gridView1_InitNewRow;
+ //
+ // colSetValue
+ //
+ colSetValue.FieldName = "SetValue";
+ colSetValue.Name = "colSetValue";
+ colSetValue.Visible = true;
+ colSetValue.VisibleIndex = 0;
//
// colMinValue
//
@@ -98,7 +107,7 @@
colColor.FieldName = "Color";
colColor.Name = "colColor";
colColor.Visible = true;
- colColor.VisibleIndex = 3;
+ colColor.VisibleIndex = 5;
//
// repositoryItemColorPickEdit1
//
@@ -118,24 +127,31 @@
colDelete.Name = "colDelete";
colDelete.OptionsColumn.AllowEdit = false;
colDelete.Visible = true;
- colDelete.VisibleIndex = 4;
+ colDelete.VisibleIndex = 6;
colDelete.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;
//
- // colSetValue
+ // colMinPercent
//
- colSetValue.FieldName = "SetValue";
- colSetValue.Name = "colSetValue";
- colSetValue.Visible = true;
- colSetValue.VisibleIndex = 0;
+ colMinPercent.FieldName = "MinPercent";
+ colMinPercent.Name = "colMinPercent";
+ colMinPercent.Visible = true;
+ colMinPercent.VisibleIndex = 3;
+ //
+ // colMaxPercent
+ //
+ colMaxPercent.FieldName = "MaxPercent";
+ colMaxPercent.Name = "colMaxPercent";
+ colMaxPercent.Visible = true;
+ colMaxPercent.VisibleIndex = 4;
//
// SetHydroGradingModelCtrl
//
@@ -143,7 +159,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(gridControl1);
Name = "SetHydroGradingModelCtrl";
- Size = new Size(497, 402);
+ Size = new Size(731, 402);
((ISupportInitialize)gridControl1).EndInit();
((ISupportInitialize)setHydroGradingModelViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
@@ -164,5 +180,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colDelete;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn colSetValue;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinPercent;
+ private DevExpress.XtraGrid.Columns.GridColumn colMaxPercent;
}
}
--
Gitblit v1.9.3