Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2025-03-28 d5a2d7e66f9c8046bd88b8269e61aac5a2a265e2

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/03-waterbox/HydroWaterboxListCtrl.Designer.cs

@@ -49,13 +49,11 @@
            colMaxLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            colDN = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinVol = new DevExpress.XtraGrid.Columns.GridColumn();
            colCurve = new DevExpress.XtraGrid.Columns.GridColumn();
            colVolCurve = new DevExpress.XtraGrid.Columns.GridColumn();
            colOverFlow = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuL = new DevExpress.XtraGrid.Columns.GridColumn();
            colSet = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
@@ -70,6 +68,7 @@
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            colBeginGroup = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroWaterboxViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -105,7 +104,7 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colPoolElev, colInitLevel, colMinLevel, colMaxLevel, colDN, colMinVol, colCurve, colOverFlow, colFlags, colDescription, colCalcuPress, colCalcuHead, colCalcuDemand, colSet });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colBeginGroup, colCode, colName, colModelType, colHasDb, colPoolElev, colInitLevel, colMinLevel, colMaxLevel, colDN, colMinVol, colVolCurve, colOverFlow, colFlags, colDescription, colCalcuL, colSet });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.RowCellClick += gridView1_RowCellClick;
@@ -128,7 +127,7 @@
            colCode.MinWidth = 100;
            colCode.Name = "colCode";
            colCode.Visible = true;
            colCode.VisibleIndex = 2;
            colCode.VisibleIndex = 3;
            colCode.Width = 100;
            // 
            // colName
@@ -138,7 +137,7 @@
            colName.MinWidth = 100;
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 1;
            colName.VisibleIndex = 2;
            colName.Width = 100;
            // 
            // colModelType
@@ -148,7 +147,7 @@
            colModelType.MinWidth = 100;
            colModelType.Name = "colModelType";
            colModelType.Visible = true;
            colModelType.VisibleIndex = 3;
            colModelType.VisibleIndex = 4;
            colModelType.Width = 100;
            // 
            // colHasDb
@@ -158,7 +157,7 @@
            colHasDb.MinWidth = 40;
            colHasDb.Name = "colHasDb";
            colHasDb.Visible = true;
            colHasDb.VisibleIndex = 12;
            colHasDb.VisibleIndex = 13;
            colHasDb.Width = 40;
            // 
            // colPoolElev
@@ -168,7 +167,7 @@
            colPoolElev.MinWidth = 80;
            colPoolElev.Name = "colPoolElev";
            colPoolElev.Visible = true;
            colPoolElev.VisibleIndex = 4;
            colPoolElev.VisibleIndex = 5;
            colPoolElev.Width = 80;
            // 
            // colInitLevel
@@ -178,7 +177,7 @@
            colInitLevel.MinWidth = 80;
            colInitLevel.Name = "colInitLevel";
            colInitLevel.Visible = true;
            colInitLevel.VisibleIndex = 5;
            colInitLevel.VisibleIndex = 6;
            colInitLevel.Width = 80;
            // 
            // colMinLevel
@@ -188,7 +187,7 @@
            colMinLevel.MinWidth = 80;
            colMinLevel.Name = "colMinLevel";
            colMinLevel.Visible = true;
            colMinLevel.VisibleIndex = 6;
            colMinLevel.VisibleIndex = 7;
            colMinLevel.Width = 80;
            // 
            // colMaxLevel
@@ -198,7 +197,7 @@
            colMaxLevel.MinWidth = 80;
            colMaxLevel.Name = "colMaxLevel";
            colMaxLevel.Visible = true;
            colMaxLevel.VisibleIndex = 7;
            colMaxLevel.VisibleIndex = 8;
            colMaxLevel.Width = 80;
            // 
            // colDN
@@ -208,7 +207,7 @@
            colDN.MinWidth = 80;
            colDN.Name = "colDN";
            colDN.Visible = true;
            colDN.VisibleIndex = 8;
            colDN.VisibleIndex = 9;
            colDN.Width = 80;
            // 
            // colMinVol
@@ -218,18 +217,18 @@
            colMinVol.MinWidth = 90;
            colMinVol.Name = "colMinVol";
            colMinVol.Visible = true;
            colMinVol.VisibleIndex = 9;
            colMinVol.VisibleIndex = 10;
            colMinVol.Width = 90;
            // 
            // colCurve
            // colVolCurve
            // 
            colCurve.FieldName = "Curve";
            colCurve.MaxWidth = 80;
            colCurve.MinWidth = 80;
            colCurve.Name = "colCurve";
            colCurve.Visible = true;
            colCurve.VisibleIndex = 10;
            colCurve.Width = 80;
            colVolCurve.FieldName = "VolCurve";
            colVolCurve.MaxWidth = 100;
            colVolCurve.MinWidth = 100;
            colVolCurve.Name = "colVolCurve";
            colVolCurve.Visible = true;
            colVolCurve.VisibleIndex = 12;
            colVolCurve.Width = 100;
            // 
            // colOverFlow
            // 
@@ -248,7 +247,7 @@
            colFlags.MinWidth = 100;
            colFlags.Name = "colFlags";
            colFlags.Visible = true;
            colFlags.VisibleIndex = 13;
            colFlags.VisibleIndex = 14;
            colFlags.Width = 100;
            // 
            // colDescription
@@ -257,50 +256,21 @@
            colDescription.MinWidth = 100;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 14;
            colDescription.VisibleIndex = 15;
            colDescription.Width = 100;
            // 
            // colCalcuPress
            // colCalcuL
            // 
            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.ToolTip = "计算附加属性";
            colCalcuPress.Visible = true;
            colCalcuPress.VisibleIndex = 15;
            colCalcuPress.Width = 100;
            // 
            // colCalcuHead
            // 
            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.ToolTip = "计算附加属性";
            colCalcuHead.Visible = true;
            colCalcuHead.VisibleIndex = 16;
            colCalcuHead.Width = 100;
            // 
            // colCalcuDemand
            // 
            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.ToolTip = "计算附加属性";
            colCalcuDemand.Visible = true;
            colCalcuDemand.VisibleIndex = 17;
            colCalcuDemand.Width = 110;
            colCalcuL.FieldName = "CalcuL";
            colCalcuL.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            colCalcuL.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuL.ImageOptions.SvgImage");
            colCalcuL.ImageOptions.SvgImageSize = new Size(16, 16);
            colCalcuL.MaxWidth = 100;
            colCalcuL.MinWidth = 100;
            colCalcuL.Name = "colCalcuL";
            colCalcuL.Visible = true;
            colCalcuL.VisibleIndex = 16;
            colCalcuL.Width = 100;
            // 
            // colSet
            // 
@@ -311,7 +281,7 @@
            colSet.MinWidth = 60;
            colSet.Name = "colSet";
            colSet.Visible = true;
            colSet.VisibleIndex = 18;
            colSet.VisibleIndex = 17;
            colSet.Width = 60;
            // 
            // repositoryItemButtonEdit1
@@ -451,6 +421,16 @@
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            // 
            // colBeginGroup
            // 
            colBeginGroup.FieldName = "BeginGroup";
            colBeginGroup.MaxWidth = 100;
            colBeginGroup.MinWidth = 100;
            colBeginGroup.Name = "colBeginGroup";
            colBeginGroup.Visible = true;
            colBeginGroup.VisibleIndex = 1;
            colBeginGroup.Width = 100;
            // 
            // HydroWaterboxListCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -492,9 +472,6 @@
        private BindingSource hydroWaterboxViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colModelType;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPress;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuHead;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuDemand;
        private DevExpress.XtraGrid.Columns.GridColumn colHasDb;
        private DevExpress.XtraGrid.Columns.GridColumn colDN;
        private DevExpress.XtraGrid.Columns.GridColumn colOverFlow;
@@ -509,10 +486,12 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraGrid.Columns.GridColumn colCurve;
        private DevExpress.XtraGrid.Columns.GridColumn colSet;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuL;
        private DevExpress.XtraGrid.Columns.GridColumn colVolCurve;
        private DevExpress.XtraGrid.Columns.GridColumn colBeginGroup;
    }
}