cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r1167

Browse Source 
SVN-Revision: r1167
This commit is contained in:
cyf
2026-05-11 02:19:43 +00:00
parent 2e85136fbb
commit 2ed5b7975f
21 changed files with 475 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/BandedGridControlEx.cs
+28 -5
View File
@@ -1181,15 +1181,37 @@ namespace Lskj.Control
{
if (model.isSumMerge && !string.IsNullOrEmpty(e.FieldValue + ""))
{
if (model.CanMerge && BeforeClass == Convert.ToDecimal(e.FieldValue))
if (!string.IsNullOrEmpty(model.MergeGroup))
{
BeforeClass = Convert.ToDecimal(e.FieldValue);
bool isMergrGroup = !string.IsNullOrEmpty(model.MergeGroup) && gridRow.Table.Columns.Contains(model.MergeGroup) && e.RowHandle != 0 ? (gridRow[model.MergeGroup] + "").Equals(BeforeGroupName) : false;
if (model.CanMerge && BeforeClass == Convert.ToDecimal(e.FieldValue) && isMergrGroup)
{
BeforeClass = Convert.ToDecimal(e.FieldValue);
BeforeGroupName = !string.IsNullOrEmpty(model.MergeGroup) && gridRow.Table.Columns.Contains(model.MergeGroup) ? gridRow[model.MergeGroup] + "" : "";
}
else
{
BeforeClass = Convert.ToDecimal(e.FieldValue);
BeforeGroupName = !string.IsNullOrEmpty(model.MergeGroup) && gridRow.Table.Columns.Contains(model.MergeGroup) ? gridRow[model.MergeGroup] + "" : "";
if (isSum || String.IsNullOrEmpty(model.SumCond)) customSum += Convert.ToDecimal(e.FieldValue);
}
}
else
else
{
BeforeClass = Convert.ToDecimal(e.FieldValue);
if (isSum || String.IsNullOrEmpty(model.SumCond)) customSum += Convert.ToDecimal(e.FieldValue);
if (model.CanMerge && BeforeClass == Convert.ToDecimal(e.FieldValue))
{
BeforeClass = Convert.ToDecimal(e.FieldValue);
}
else
{
BeforeClass = Convert.ToDecimal(e.FieldValue);
if (isSum || String.IsNullOrEmpty(model.SumCond)) customSum += Convert.ToDecimal(e.FieldValue);
}
}
}
if (isSum)
{
@@ -2833,6 +2855,7 @@ namespace Lskj.Control
Math.Round(avg, 2),
Math.Round(max, 2),
Math.Round(min, 2));
if (this.TotalQuantity) this.lblTotal.Text = string.Format("已选中 {0} 行", rows.Length);
}
}
catch (Exception ex)