冲突

Shuxia Ning

2024-10-29 0d9526152334f26c9110dab0652796f59a185820

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/XhsPumpMatchingListCtrl.Designer.cs

@@ -80,6 +80,7 @@
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 1;
            colName.Width = 77;
            // 
            // colCode
            // 
@@ -87,6 +88,7 @@
            colCode.Name = "colCode";
            colCode.Visible = true;
            colCode.VisibleIndex = 0;
            colCode.Width = 77;
            // 
            // colModelType
            // 
@@ -94,6 +96,7 @@
            colModelType.Name = "colModelType";
            colModelType.Visible = true;
            colModelType.VisibleIndex = 3;
            colModelType.Width = 124;
            // 
            // colRatedP
            // 
@@ -101,6 +104,7 @@
            colRatedP.Name = "colRatedP";
            colRatedP.Visible = true;
            colRatedP.VisibleIndex = 4;
            colRatedP.Width = 112;
            // 
            // colRatedQ
            // 
@@ -108,6 +112,7 @@
            colRatedQ.Name = "colRatedQ";
            colRatedQ.Visible = true;
            colRatedQ.VisibleIndex = 5;
            colRatedQ.Width = 90;
            // 
            // colRatedH
            // 
@@ -115,6 +120,7 @@
            colRatedH.Name = "colRatedH";
            colRatedH.Visible = true;
            colRatedH.VisibleIndex = 6;
            colRatedH.Width = 79;
            // 
            // colRatedN
            // 
@@ -122,6 +128,7 @@
            colRatedN.Name = "colRatedN";
            colRatedN.Visible = true;
            colRatedN.VisibleIndex = 7;
            colRatedN.Width = 74;
            // 
            // colDbLocked
            // 
@@ -129,6 +136,7 @@
            colDbLocked.Name = "colDbLocked";
            colDbLocked.Visible = true;
            colDbLocked.VisibleIndex = 2;
            colDbLocked.Width = 51;
            // 
            // colMatchingRatedP
            // 
@@ -136,6 +144,7 @@
            colMatchingRatedP.Name = "colMatchingRatedP";
            colMatchingRatedP.Visible = true;
            colMatchingRatedP.VisibleIndex = 8;
            colMatchingRatedP.Width = 76;
            // 
            // colMatchingRatedQ
            // 
@@ -143,6 +152,7 @@
            colMatchingRatedQ.Name = "colMatchingRatedQ";
            colMatchingRatedQ.Visible = true;
            colMatchingRatedQ.VisibleIndex = 9;
            colMatchingRatedQ.Width = 76;
            // 
            // colMatchingRatedH
            // 
@@ -150,6 +160,7 @@
            colMatchingRatedH.Name = "colMatchingRatedH";
            colMatchingRatedH.Visible = true;
            colMatchingRatedH.VisibleIndex = 10;
            colMatchingRatedH.Width = 64;
            // 
            // colMatchingRatedN
            // 
@@ -157,6 +168,7 @@
            colMatchingRatedN.Name = "colMatchingRatedN";
            colMatchingRatedN.Visible = true;
            colMatchingRatedN.VisibleIndex = 11;
            colMatchingRatedN.Width = 58;
            // 
            // colMatchingSatus
            // 
@@ -164,13 +176,14 @@
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 12;
            colMatchingSatus.Width = 48;
            // 
            // XhsProjectSimulationPumpMatchingListCtrl
            // XhsPumpMatchingListCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(gridControl1);
            Name = "XhsProjectSimulationPumpMatchingListCtrl";
            Name = "XhsPumpMatchingListCtrl";
            Size = new Size(1035, 503);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)pumpFormViewModelBindingSource).EndInit();