冲突

duheng

2024-11-21 c653f2f6f2de553395b706de3a62fec5e4a6fbf7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroMonitorListCtrl.Designer.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroVisualMonitorCtrl.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
    partial class SetHydroVisualMonitorCtrl
    partial class SetHydroMonitorListCtrl
    {
        /// <summary> 
        /// Required designer variable.
@@ -31,19 +31,19 @@
            components = new Container();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            setHydroVisualMonitorViewModelBindingSource = new BindingSource(components);
            colChecked = new DevExpress.XtraGrid.Columns.GridColumn();
            colRelation = new DevExpress.XtraGrid.Columns.GridColumn();
            colPropName = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            setHydroMonitorViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)setHydroVisualMonitorViewModelBindingSource).BeginInit();
            ((ISupportInitialize)setHydroMonitorViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
            // 
            gridControl1.DataSource = setHydroVisualMonitorViewModelBindingSource;
            gridControl1.DataSource = setHydroMonitorViewModelBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
@@ -57,10 +57,6 @@
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colChecked, colRelation, colPropName, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            // 
            // setHydroVisualMonitorViewModelBindingSource
            // 
            setHydroVisualMonitorViewModelBindingSource.DataSource = typeof(SetHydroVisualMonitorViewModel);
            // 
            // colChecked
            // 
@@ -99,6 +95,10 @@
            colDescription.Visible = true;
            colDescription.VisibleIndex = 3;
            // 
            // setHydroMonitorViewModelBindingSource
            // 
            setHydroMonitorViewModelBindingSource.DataSource = typeof(SetHydroMonitorViewModel);
            // 
            // SetHydroVisualMonitorCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -108,7 +108,7 @@
            Size = new Size(683, 307);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)setHydroVisualMonitorViewModelBindingSource).EndInit();
            ((ISupportInitialize)setHydroMonitorViewModelBindingSource).EndInit();
            ResumeLayout(false);
        }

@@ -116,10 +116,10 @@

        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private BindingSource setHydroVisualMonitorViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colChecked;
        private DevExpress.XtraGrid.Columns.GridColumn colRelation;
        private DevExpress.XtraGrid.Columns.GridColumn colPropName;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private BindingSource setHydroMonitorViewModelBindingSource;
    }
}