Resize the table to display all of them

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -324,6 +324,8 @@ namespace OTSIncAReportGrids
             {
                 gridView.Rows[sumRowIndex].DefaultCellStyle.BackColor = Color.Azure;
             }
+            //gridView.Rows[sumRowIndex].Height = 30;
+            gridView.Size = new System.Drawing.Size(gridView.ColumnCount * 100 + 60, gridView.RowCount * 30);
         }
 
         private Point SetDataGridViewStyle(OTSGridView gridView)
@@ -357,7 +359,7 @@ namespace OTSIncAReportGrids
             gridView.RowHeadersWidth = 40;
             gridView.RowTemplate.Height = 30;
             gridView.Size = new System.Drawing.Size(gridView.ColumnCount * 100 + 60, gridView.RowCount * 30);
-            int gridheight = (gridView.RowCount + 1) * 30 + 5;
+            int gridheight = (gridView.RowCount + 2) * 30 + 5;
             gridwidth = gridwidth + gridView.ColumnCount * 100 + 60;
             chartposition = chartposition + gridView.ColumnCount * 100;
             GridPosition = gridView.ColumnCount * 100 + 40;
@@ -375,12 +377,15 @@ namespace OTSIncAReportGrids
             gridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing;
             gridView.ColumnHeadersHeight = 40;
 
-            list_table_size.Add(new Point(gridView.ColumnCount * 100 + 40, gridView.RowCount * 30));
-            return new Point(gridwidth - (gridView.ColumnCount * 100 + 60), gridheight + 30);
+            list_table_size.Add(new Point(gridView.ColumnCount * 100 + 40, (gridView.RowCount+2) * 30));
+
+            return new Point(gridwidth - (gridView.ColumnCount * 100 + 60), gridheight + 5);
         }
 
         #endregion
 
+
+
         #region charts
 
         public void SetGraphicType(ReportCondition sourceGridData)

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -45,6 +45,7 @@ namespace OTSIncAReportGrids
 
 		
         
+        
         #region 自定义方法
 
 		private string getWhere(string max, string min, string col, string partic)
@@ -176,9 +177,6 @@ namespace OTSIncAReportGrids
 
             List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 7, 8, 9 };
             List<string> NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString() };
-
-            //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
             int sel = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
             DataTable dt;
@@ -313,6 +311,10 @@ namespace OTSIncAReportGrids
                     }
                 }
             }
+            //gridView.Rows[a1].Height = 30;
+
+            gridView.Rows[a1].DefaultCellStyle.BackColor = Color.Azure;
+            gridView.Size = new System.Drawing.Size(gridView.ColumnCount * 100 + 60, gridView.RowCount * 30);
         }
         /// <summary>
         /// 设置DataGridView样式
@@ -359,7 +361,6 @@ namespace OTSIncAReportGrids
             gridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             gridView.ContextMenuStrip = this.contextMenuStrip1;
             gridView.BorderStyle = 0;
-			int outpos = gridwidth;
 
 			gridView.Location = new System.Drawing.Point(gridwidth, 0);
 
@@ -380,7 +381,6 @@ namespace OTSIncAReportGrids
 			}
 			gridView.Size = new System.Drawing.Size(gridView_Width, gridView.RowCount * 30);
 			//gridheight = gridheight + gridView.RowCount * 30 + 80;
-			gridheight = gridheight + gridView.RowCount * 30 + 5;
             gridwidth = gridwidth + gridView.ColumnCount * 100;
 			gridView.TabIndex = 0;
             //先设置一下头的高度，否则会太矮不好看
@@ -389,7 +389,9 @@ namespace OTSIncAReportGrids
 
             gridView.Columns[4].Visible = false;
 
-			list_table_size.Add(new Point(gridView.ColumnCount * 100 - 40, gridView.RowCount * 30));
+			list_table_size.Add(new Point(gridView.ColumnCount * 100 - 40, (gridView.RowCount+2) * 30));
+            int outpos = gridView.Location.X;
+			gridheight = (gridView.RowCount + 2) * 30 + 5;
             return new Point(outpos, gridheight);
             //list_table_Point.Add(new Point(gridwidth, gridheight));
         }
@@ -482,6 +484,9 @@ namespace OTSIncAReportGrids
 			}
 
 		}
+
+
+
         /// <summary>
         /// chart图创建
         /// </summary>