冲突

duheng

2024-11-21 c653f2f6f2de553395b706de3a62fec5e4a6fbf7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-value/HydroMonitorValueListCtrl.Designer.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-value/HydroVisualMonitorValueListCtrl.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
    partial class HydroVisualMonitorValueListCtrl
    partial class HydroMonitorValueListCtrl
    {
        /// <summary> 
        /// Required designer variable.
@@ -29,23 +29,23 @@
        private void InitializeComponent()
        {
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroVisualMonitorValueListCtrl));
            ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroMonitorValueListCtrl));
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            hydroVisualMonitorValueViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colRelation = new DevExpress.XtraGrid.Columns.GridColumn();
            colPropName = new DevExpress.XtraGrid.Columns.GridColumn();
            colMonitorValue = new DevExpress.XtraGrid.Columns.GridColumn();
            colUnitName = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            hydroMonitorValueViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroVisualMonitorValueViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)hydroMonitorValueViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
            // 
            gridControl1.DataSource = hydroVisualMonitorValueViewModelBindingSource;
            gridControl1.DataSource = hydroMonitorValueViewModelBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
@@ -53,10 +53,6 @@
            gridControl1.Size = new Size(913, 394);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // hydroVisualMonitorValueViewModelBindingSource
            // 
            hydroVisualMonitorValueViewModelBindingSource.DataSource = typeof(HydroVisualMonitorValueViewModel);
            // 
            // gridView1
            // 
@@ -116,6 +112,10 @@
            colDescription.VisibleIndex = 4;
            colDescription.Width = 100;
            // 
            // hydroMonitorValueViewModelBindingSource
            // 
            hydroMonitorValueViewModelBindingSource.DataSource = typeof(HydroMonitorValueViewModel);
            // 
            // HydroVisualMonitorValueListCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -124,8 +124,8 @@
            Name = "HydroVisualMonitorValueListCtrl";
            Size = new Size(913, 394);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)hydroVisualMonitorValueViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)hydroMonitorValueViewModelBindingSource).EndInit();
            ResumeLayout(false);
        }

@@ -133,11 +133,11 @@

        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private BindingSource hydroVisualMonitorValueViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colRelation;
        private DevExpress.XtraGrid.Columns.GridColumn colPropName;
        private DevExpress.XtraGrid.Columns.GridColumn colMonitorValue;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private DevExpress.XtraGrid.Columns.GridColumn colUnitName;
        private BindingSource hydroMonitorValueViewModelBindingSource;
    }
}