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

SVN r620

Browse Source 
SVN-Revision: r620
This commit is contained in:
tdx
2025-05-22 06:21:37 +00:00
parent 58255abd07
commit df4cd2b684
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/GridControlEx.cs
+20 -3
View File
@@ -61,6 +61,11 @@ namespace Lskj.Control
/// </summary>
public partial class GridControlEx : UserControl
{
/// <summary>
/// <para>说明：缓存计划行</para>
/// <para>时间：2024-5-22</para>
/// </summary>
public DataRow jhrowitem = null;
/// <summary>
/// <para>说明：第一列获取合计</para>
/// <para>时间：2022-5-7</para>
@@ -5808,7 +5813,15 @@ namespace Lskj.Control
this.lblTotal.Text = string.Format(ResourceKeys.GridTotalDisplayText, count, Math.Round(sum, 2), Math.Round(avg, 2), Math.Round(max, 2), Math.Round(min, 2));
if (!string.IsNullOrWhiteSpace(dataFormat))
{
this.lblTotal.Text = string.Format(ResourceKeys.GridTotalDisplayText, count, string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(sum)), string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(avg)), string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(max)), string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(min)));
if (dataFormat.StartsWith("{0:"))
{
this.lblTotal.Text = string.Format(ResourceKeys.GridTotalDisplayText, count, string.Format(dataFormat, Convert.ToDecimal(sum)), string.Format(dataFormat, Convert.ToDecimal(avg)), string.Format(dataFormat, Convert.ToDecimal(max)), string.Format(dataFormat, Convert.ToDecimal(min)));
}
else
{
this.lblTotal.Text = string.Format(ResourceKeys.GridTotalDisplayText, count, string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(sum)), string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(avg)), string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(max)), string.Format("{0:" + dataFormat + "}", Convert.ToDecimal(min)));
}
}
}
@@ -8327,7 +8340,11 @@ namespace Lskj.Control
if (gridColumn.Summary.ActiveCount > 0)
{
if (gridColumn.Summary.ActiveCount == 1 && dataRow == null) continue;
if (gridColumn.Summary.ActiveCount == 1 && dataRow == null)
{
jhrowitem = null;
continue;
}
GridColumnSummaryItem sumItem = new GridColumnSummaryItem();
if (gridColumn.Summary.ActiveCount == 1)
{
@@ -8342,4 +8359,4 @@ namespace Lskj.Control
//新建汇总
if (dataRow != null)
{
GridColum