Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -531,7 +531,11 @@ namespace OTSIncAReportGrids
 
             ParticleData fielddata = new ParticleData(result.FilePath);
             DataTable particles = fielddata.GetInfoForPartucleDevidePage(PageIndex, pageSize, OrderFunction, condition);
-            //PageSize = particles.Rows.Count;
+            if(PageSize==-1)
+            {
+                PageSize = particles.Rows.Count;
+            }
+
             if (particles == null)
             {
                 return;

OTSIncAReportApp/FunctionClass/OTSDataMgrFunction/DataMgrFun.cs

@@ -629,12 +629,16 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
                 //点击下拉框，级联联动事件
                 int idx = m_ReportApp.m_DataMgrFun.GetSampleIndexByPropItemName(m_ReportApp.SourceGridData.SampleDataList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE);
                 List<string> list_partsize = GetPartSizeList(m_ReportApp.m_RptConfigFile.FileFolderSize + ret.SampleDataList[idx].itemVal.ToString());
+                List<string> list_partsizeChart = new List<string>();
+                for (int i = 0; i < ret.SampleDataList[idx].comboDownList.Count;i++)
+                    list_partsizeChart.Add(ret.SampleDataList[idx].comboDownList[i].ToString());
                 string sscaptionname16 = table["sscaptionname16"].ToString();
                 string sscaptionname18 = table["sscaptionname18"].ToString();
                 list_partsize.Insert(0, sscaptionname16);//全部
                 list_partsize.Insert(1, sscaptionname18);//自定义
-                ret.SampleDataList[GetSampleIndexByPropItemName(ret.SampleDataList, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE)].itemVal = list_partsize[0];
-                ret.SampleDataList[GetSampleIndexByPropItemName(ret.SampleDataList, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE)].comboDownList = list_partsize;
+                ret.SampleDataList[GetSampleIndexByPropItemName(ret.SampleDataList, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE)].itemVal = ret.SampleDataList[idx].itemVal.ToString();
+                ret.SampleDataList[GetSampleIndexByPropItemName(ret.SampleDataList, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE)].comboDownList = list_partsizeChart;
+                ret.SampleDataList[GetSampleIndexByPropItemName(ret.SampleDataList, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS)].comboDownList = list_partsize;
                 m_ReportApp.m_RptConfigFile.PartSizeFile = ret.SampleDataList[idx].itemVal.ToString();
             }