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

duheng

2024-12-24 422bb59e2c51524096faaafbe7cabccdc3efb701

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/18-valve/HydroValveListCtrl.Designer.cs

@@ -29,12 +29,12 @@
        private void InitializeComponent()
        {
            components = new Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            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();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroValveListCtrl));
            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();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            hydroValveViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -50,8 +50,6 @@
            colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuFlow = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuVelocity = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colSet = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
@@ -67,6 +65,9 @@
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            colCalcuQ = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuPr1 = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuPr2 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroValveViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -102,7 +103,7 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colValveType, colLinkStatus, colMaterial, colDiameter, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuFlow, colCalcuVelocity, colCalcuMinorLoss, colSet });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colValveType, colLinkStatus, colMaterial, colDiameter, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuQ, colCalcuPr1, colCalcuPr2, colCalcuMinorLoss, colSet });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.RowCellClick += gridView1_RowCellClick;
@@ -227,32 +228,6 @@
            colDescription.VisibleIndex = 11;
            colDescription.Width = 100;
            // 
            // colCalcuFlow
            // 
            colCalcuFlow.FieldName = "CalcuFlow";
            colCalcuFlow.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            colCalcuFlow.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuFlow.ImageOptions.SvgImage");
            colCalcuFlow.ImageOptions.SvgImageSize = new Size(16, 16);
            colCalcuFlow.MaxWidth = 100;
            colCalcuFlow.MinWidth = 100;
            colCalcuFlow.Name = "colCalcuFlow";
            colCalcuFlow.Visible = true;
            colCalcuFlow.VisibleIndex = 12;
            colCalcuFlow.Width = 100;
            // 
            // colCalcuVelocity
            // 
            colCalcuVelocity.FieldName = "CalcuVelocity";
            colCalcuVelocity.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            colCalcuVelocity.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuVelocity.ImageOptions.SvgImage");
            colCalcuVelocity.ImageOptions.SvgImageSize = new Size(16, 16);
            colCalcuVelocity.MaxWidth = 100;
            colCalcuVelocity.MinWidth = 100;
            colCalcuVelocity.Name = "colCalcuVelocity";
            colCalcuVelocity.Visible = true;
            colCalcuVelocity.VisibleIndex = 13;
            colCalcuVelocity.Width = 100;
            // 
            // colCalcuMinorLoss
            // 
            colCalcuMinorLoss.FieldName = "CalcuMinorLoss";
@@ -263,7 +238,7 @@
            colCalcuMinorLoss.MinWidth = 100;
            colCalcuMinorLoss.Name = "colCalcuMinorLoss";
            colCalcuMinorLoss.Visible = true;
            colCalcuMinorLoss.VisibleIndex = 14;
            colCalcuMinorLoss.VisibleIndex = 15;
            colCalcuMinorLoss.Width = 100;
            // 
            // colSet
@@ -275,15 +250,15 @@
            colSet.MinWidth = 60;
            colSet.Name = "colSet";
            colSet.Visible = true;
            colSet.VisibleIndex = 15;
            colSet.VisibleIndex = 16;
            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, "", 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;
            // 
@@ -415,6 +390,45 @@
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // colCalcuQ
            // 
            colCalcuQ.FieldName = "CalcuQ";
            colCalcuQ.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            colCalcuQ.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuQ.ImageOptions.SvgImage");
            colCalcuQ.ImageOptions.SvgImageSize = new Size(16, 16);
            colCalcuQ.MaxWidth = 100;
            colCalcuQ.MinWidth = 100;
            colCalcuQ.Name = "colCalcuQ";
            colCalcuQ.Visible = true;
            colCalcuQ.VisibleIndex = 12;
            colCalcuQ.Width = 100;
            // 
            // colCalcuPr1
            // 
            colCalcuPr1.FieldName = "CalcuPr1";
            colCalcuPr1.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            colCalcuPr1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuPr1.ImageOptions.SvgImage");
            colCalcuPr1.ImageOptions.SvgImageSize = new Size(16, 16);
            colCalcuPr1.MaxWidth = 100;
            colCalcuPr1.MinWidth = 100;
            colCalcuPr1.Name = "colCalcuPr1";
            colCalcuPr1.Visible = true;
            colCalcuPr1.VisibleIndex = 13;
            colCalcuPr1.Width = 100;
            // 
            // colCalcuPr2
            // 
            colCalcuPr2.FieldName = "CalcuPr2";
            colCalcuPr2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            colCalcuPr2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuPr2.ImageOptions.SvgImage");
            colCalcuPr2.ImageOptions.SvgImageSize = new Size(16, 16);
            colCalcuPr2.MaxWidth = 100;
            colCalcuPr2.MinWidth = 100;
            colCalcuPr2.Name = "colCalcuPr2";
            colCalcuPr2.Visible = true;
            colCalcuPr2.VisibleIndex = 14;
            colCalcuPr2.Width = 100;
            // 
            // HydroValveListCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -455,8 +469,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colValveType;
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colModelType;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuFlow;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuVelocity;
        private DevExpress.XtraGrid.Columns.GridColumn colHasDb;
        private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
@@ -475,5 +487,8 @@
        private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuQ;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPr1;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPr2;
    }
}