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

lixiaojun

2025-02-19 294b81166f21e12247e784d6bf404f5f34b2ee19

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/09-hydrant/HydroHydrantListCtrl.Designer.cs

@@ -29,8 +29,8 @@
        private void InitializeComponent()
        {
            components = new Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroHydrantListCtrl));
            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();
@@ -54,9 +54,7 @@
            colSet = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            btnReset = new DevExpress.XtraEditors.SimpleButton();
            btnSet = new DevExpress.XtraEditors.SimpleButton();
            btnSearch = new DevExpress.XtraEditors.SimpleButton();
            generalSearchAndSetCtrl1 = new GeneralSearchAndSetCtrl();
            txtName = new DevExpress.XtraEditors.TextEdit();
            txtModelType = new DevExpress.XtraEditors.TextEdit();
            txtCode = new DevExpress.XtraEditors.TextEdit();
@@ -65,10 +63,7 @@
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroHydrantViewModelBindingSource).BeginInit();
@@ -84,21 +79,18 @@
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
            // 
            gridControl1.DataSource = hydroHydrantViewModelBindingSource;
            gridControl1.Location = new Point(2, 50);
            gridControl1.Location = new Point(2, 52);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(1399, 621);
            gridControl1.Size = new Size(1399, 619);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -108,10 +100,9 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colCoefficient, colElev, colMinorLoss, colCalcuPress, colCalcuHead, colCalcuDemand, colFlags, colDescription, colSet });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colCoefficient, colElev, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuPress, colCalcuHead, colCalcuDemand, colSet });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsFind.AlwaysVisible = true;
            gridView1.RowCellClick += gridView1_RowCellClick;
            // 
            // colDbLocked
@@ -162,7 +153,7 @@
            colHasDb.MinWidth = 40;
            colHasDb.Name = "colHasDb";
            colHasDb.Visible = true;
            colHasDb.VisibleIndex = 10;
            colHasDb.VisibleIndex = 7;
            colHasDb.Width = 40;
            // 
            // colCoefficient
@@ -172,7 +163,7 @@
            colCoefficient.MinWidth = 100;
            colCoefficient.Name = "colCoefficient";
            colCoefficient.Visible = true;
            colCoefficient.VisibleIndex = 7;
            colCoefficient.VisibleIndex = 6;
            colCoefficient.Width = 100;
            // 
            // colElev
@@ -190,44 +181,53 @@
            colMinorLoss.FieldName = "MinorLoss";
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 6;
            colMinorLoss.VisibleIndex = 5;
            // 
            // colCalcuPress
            // 
            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.Visible = true;
            colCalcuPress.VisibleIndex = 8;
            colCalcuPress.VisibleIndex = 10;
            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.Visible = true;
            colCalcuHead.VisibleIndex = 9;
            colCalcuHead.VisibleIndex = 11;
            colCalcuHead.Width = 100;
            // 
            // colCalcuDemand
            // 
            colCalcuDemand.FieldName = "CalcuDemand";
            colCalcuDemand.MaxWidth = 100;
            colCalcuDemand.MinWidth = 100;
            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.Visible = true;
            colCalcuDemand.VisibleIndex = 5;
            colCalcuDemand.Width = 100;
            colCalcuDemand.VisibleIndex = 12;
            colCalcuDemand.Width = 110;
            // 
            // colFlags
            // 
            colFlags.FieldName = "Flags";
            colFlags.Name = "colFlags";
            colFlags.Visible = true;
            colFlags.VisibleIndex = 11;
            colFlags.VisibleIndex = 8;
            // 
            // colDescription
            // 
@@ -235,7 +235,7 @@
            colDescription.MinWidth = 100;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 12;
            colDescription.VisibleIndex = 9;
            colDescription.Width = 100;
            // 
            // colSet
@@ -261,10 +261,8 @@
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(generalSearchAndSetCtrl1);
            layoutControl1.Controls.Add(gridControl1);
            layoutControl1.Controls.Add(btnReset);
            layoutControl1.Controls.Add(btnSet);
            layoutControl1.Controls.Add(btnSearch);
            layoutControl1.Controls.Add(txtName);
            layoutControl1.Controls.Add(txtModelType);
            layoutControl1.Controls.Add(txtCode);
@@ -277,63 +275,35 @@
            layoutControl1.TabIndex = 2;
            layoutControl1.Text = "layoutControl1";
            // 
            // btnReset
            // generalSearchAndSetCtrl1
            // 
            btnReset.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnReset.Appearance.Options.UseBackColor = true;
            btnReset.Location = new Point(714, 14);
            btnReset.Name = "btnReset";
            btnReset.Size = new Size(96, 22);
            btnReset.StyleController = layoutControl1;
            btnReset.TabIndex = 7;
            btnReset.Text = "重置";
            // 
            // btnSet
            // 
            btnSet.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
            btnSet.Appearance.Options.UseBackColor = true;
            btnSet.Location = new Point(1293, 14);
            btnSet.Name = "btnSet";
            btnSet.Size = new Size(96, 22);
            btnSet.StyleController = layoutControl1;
            btnSet.TabIndex = 6;
            btnSet.Text = "设置";
            // 
            // btnSearch
            // 
            btnSearch.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnSearch.Appearance.Options.UseBackColor = true;
            btnSearch.Location = new Point(614, 14);
            btnSearch.Name = "btnSearch";
            btnSearch.Size = new Size(96, 22);
            btnSearch.StyleController = layoutControl1;
            btnSearch.TabIndex = 5;
            btnSearch.Text = "查询";
            generalSearchAndSetCtrl1.Location = new Point(614, 14);
            generalSearchAndSetCtrl1.Margin = new Padding(2, 2, 2, 2);
            generalSearchAndSetCtrl1.Name = "generalSearchAndSetCtrl1";
            generalSearchAndSetCtrl1.Size = new Size(775, 24);
            generalSearchAndSetCtrl1.TabIndex = 4;
            // 
            // txtName
            // 
            txtName.Location = new Point(54, 14);
            txtName.Location = new Point(54, 16);
            txtName.Name = "txtName";
            txtName.Properties.AutoHeight = false;
            txtName.Size = new Size(156, 22);
            txtName.Size = new Size(156, 20);
            txtName.StyleController = layoutControl1;
            txtName.TabIndex = 0;
            // 
            // txtModelType
            // 
            txtModelType.Location = new Point(454, 14);
            txtModelType.Location = new Point(454, 16);
            txtModelType.Name = "txtModelType";
            txtModelType.Properties.AutoHeight = false;
            txtModelType.Size = new Size(156, 22);
            txtModelType.Size = new Size(156, 20);
            txtModelType.StyleController = layoutControl1;
            txtModelType.TabIndex = 3;
            // 
            // txtCode
            // 
            txtCode.Location = new Point(254, 14);
            txtCode.Location = new Point(254, 16);
            txtCode.Name = "txtCode";
            txtCode.Properties.AutoHeight = false;
            txtCode.Size = new Size(156, 22);
            txtCode.Size = new Size(156, 20);
            txtCode.StyleController = layoutControl1;
            txtCode.TabIndex = 2;
            // 
@@ -351,100 +321,69 @@
            // 
            // groupForHead
            // 
            groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem5, layoutControlItem6, layoutControlItem7 });
            groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem1 });
            groupForHead.Location = new Point(0, 0);
            groupForHead.Name = "groupForHead";
            groupForHead.Size = new Size(1403, 50);
            groupForHead.Size = new Size(1403, 52);
            groupForHead.Text = "查询条件";
            groupForHead.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem4.Control = txtName;
            layoutControlItem4.Location = new Point(0, 0);
            layoutControlItem4.MaxSize = new Size(200, 26);
            layoutControlItem4.MinSize = new Size(200, 26);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(200, 26);
            layoutControlItem4.Size = new Size(200, 28);
            layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem4.Text = "名称:";
            layoutControlItem4.TextSize = new Size(28, 14);
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem2.Control = txtCode;
            layoutControlItem2.Location = new Point(200, 0);
            layoutControlItem2.MaxSize = new Size(200, 26);
            layoutControlItem2.MinSize = new Size(200, 26);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(200, 26);
            layoutControlItem2.Size = new Size(200, 28);
            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem2.Text = "编码:";
            layoutControlItem2.TextSize = new Size(28, 14);
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem3.Control = txtModelType;
            layoutControlItem3.Location = new Point(400, 0);
            layoutControlItem3.MaxSize = new Size(200, 26);
            layoutControlItem3.MinSize = new Size(200, 26);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(200, 26);
            layoutControlItem3.Size = new Size(200, 28);
            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem3.Text = "型号:";
            layoutControlItem3.TextSize = new Size(28, 14);
            // 
            // emptySpaceItem1
            // layoutControlItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(800, 0);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(479, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = btnSearch;
            layoutControlItem5.Location = new Point(600, 0);
            layoutControlItem5.MaxSize = new Size(100, 26);
            layoutControlItem5.MinSize = new Size(100, 26);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(100, 26);
            layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = btnSet;
            layoutControlItem6.Location = new Point(1279, 0);
            layoutControlItem6.MaxSize = new Size(100, 26);
            layoutControlItem6.MinSize = new Size(100, 26);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(100, 26);
            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = btnReset;
            layoutControlItem7.Location = new Point(700, 0);
            layoutControlItem7.MaxSize = new Size(100, 26);
            layoutControlItem7.MinSize = new Size(100, 26);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(100, 26);
            layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem7.TextSize = new Size(0, 0);
            layoutControlItem7.TextVisible = false;
            layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem1.Control = generalSearchAndSetCtrl1;
            layoutControlItem1.Location = new Point(600, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(779, 28);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = gridControl1;
            layoutControlItem8.Location = new Point(0, 50);
            layoutControlItem8.Location = new Point(0, 52);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 2);
            layoutControlItem8.Size = new Size(1403, 623);
            layoutControlItem8.Size = new Size(1403, 621);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            // 
@@ -469,10 +408,7 @@
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ResumeLayout(false);
        }
@@ -495,9 +431,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colHasDb;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.SimpleButton btnReset;
        private DevExpress.XtraEditors.SimpleButton btnSet;
        private DevExpress.XtraEditors.SimpleButton btnSearch;
        private DevExpress.XtraEditors.TextEdit txtName;
        private DevExpress.XtraEditors.TextEdit txtModelType;
        private DevExpress.XtraEditors.TextEdit txtCode;
@@ -506,13 +439,11 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraGrid.Columns.GridColumn colFlags;
        private DevExpress.XtraGrid.Columns.GridColumn colSet;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
}