SVN r458
SVN-Revision: r458
This commit is contained in:
@@ -280,18 +280,18 @@ namespace Lskj.Control
|
|||||||
DateTime? maxDateForRow = null;
|
DateTime? maxDateForRow = null;
|
||||||
if (gridRow.Table.Columns.Contains("PrecomputedMaxDate"))
|
if (gridRow.Table.Columns.Contains("PrecomputedMaxDate"))
|
||||||
{
|
{
|
||||||
bool isFieldDate= DateTime.TryParse(e.Column.FieldName, out DateTime FieldDate);
|
bool isFieldDate = DateTime.TryParse(e.Column.FieldName, out DateTime FieldDate);
|
||||||
bool isMaxDate = DateTime.TryParse(gridRow["PrecomputedMaxDate"].ToString(), out DateTime parsedDate);
|
bool isMaxDate = DateTime.TryParse(gridRow["PrecomputedMaxDate"].ToString(), out DateTime parsedDate);
|
||||||
if (isMaxDate && isFieldDate)
|
if (isMaxDate && isFieldDate)
|
||||||
{
|
{
|
||||||
maxDateForRow = parsedDate;
|
maxDateForRow = parsedDate;
|
||||||
|
|
||||||
if (FieldDate< parsedDate)
|
if (FieldDate < parsedDate)
|
||||||
{
|
{
|
||||||
isLaterDatePresent = true;
|
isLaterDatePresent = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(isFieldDate)
|
else if (isFieldDate)
|
||||||
{
|
{
|
||||||
return; // 如果当前是日期框模式且没有定义最大值则直接跳过
|
return; // 如果当前是日期框模式且没有定义最大值则直接跳过
|
||||||
}
|
}
|
||||||
@@ -315,7 +315,7 @@ namespace Lskj.Control
|
|||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrWhiteSpace(cond) && ReplaceHelper.EvalCond(cond) && (!string.IsNullOrEmpty(e.CellValue + "")|| isLaterDatePresent))
|
if (!string.IsNullOrWhiteSpace(cond) && ReplaceHelper.EvalCond(cond) && (!string.IsNullOrEmpty(e.CellValue + "") || isLaterDatePresent))
|
||||||
{
|
{
|
||||||
GridRowColorModel model = new GridRowColorModel(item);
|
GridRowColorModel model = new GridRowColorModel(item);
|
||||||
if (!string.IsNullOrWhiteSpace(model.BackColor))
|
if (!string.IsNullOrWhiteSpace(model.BackColor))
|
||||||
@@ -370,7 +370,7 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
if (!maxDate.HasValue || date > maxDate.Value)
|
if (!maxDate.HasValue || date > maxDate.Value)
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(row[column.ColumnName]+""))
|
if (!string.IsNullOrEmpty(row[column.ColumnName] + ""))
|
||||||
{
|
{
|
||||||
maxDate = date;
|
maxDate = date;
|
||||||
}
|
}
|
||||||
@@ -1378,41 +1378,8 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
GridView gridView = this.gridControl.MainView as GridView;
|
GridView gridView = this.gridControl.MainView as GridView;
|
||||||
DataTable dataTable = this.gridControl.DataSourceTable();
|
DataTable dataTable = this.gridControl.DataSourceTable();
|
||||||
if (dataTable != null&&dataTable.Columns.Contains("PrecomputedMaxDate"))
|
|
||||||
{
|
|
||||||
DataRow HandleRow = this.bandedGridView.GetDataRow(e.RowHandle);
|
|
||||||
DateTime? maxDate = null; // 初始化为 null,表示尚未找到有效日期
|
|
||||||
bool isdatefile= DateTime.TryParse(e.Column.FieldName, out DateTime tempDate);//获取改变当前列日期
|
|
||||||
bool isMaxDatefile = rowDateValues.TryGetValue(e.RowHandle, out List<DateTime> currentRowDateColumns);//获取记录日期
|
|
||||||
if (isdatefile)
|
|
||||||
{
|
|
||||||
if (isMaxDatefile&& currentRowDateColumns.Count>0)
|
|
||||||
{
|
|
||||||
List<DateTime> validDateColumns= rowDateValues[e.RowHandle];
|
|
||||||
if (tempDate > currentRowDateColumns.Max()) // 只有在找到更大的日期时才更新
|
|
||||||
{
|
|
||||||
validDateColumns.Add(tempDate);
|
|
||||||
HandleRow["PrecomputedMaxDate"] = tempDate.ToString("yyyy-MM-dd");
|
|
||||||
}
|
|
||||||
else if (tempDate == currentRowDateColumns.Max() && string.IsNullOrEmpty(e.Value + ""))
|
|
||||||
{
|
|
||||||
rowDateValues[e.RowHandle].Remove(tempDate);
|
|
||||||
HandleRow["PrecomputedMaxDate"] = currentRowDateColumns.Max().ToString("yyyy-MM-dd");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(!validDateColumns.Contains(tempDate)) validDateColumns.Add(tempDate);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
rowDateValues[e.RowHandle].Add(tempDate);
|
|
||||||
HandleRow["PrecomputedMaxDate"] = tempDate.ToString("yyyy-MM-dd");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (e.Column.Tag == null) return;
|
if (e.Column.Tag == null) return;
|
||||||
GridColumnModel model = e.Column.Tag as GridColumnModel;
|
GridColumnModel model = e.Column.Tag as GridColumnModel;
|
||||||
if (model == null) return;
|
if (model == null) return;
|
||||||
@@ -1724,7 +1691,7 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
GridColumn col = GridView.VisibleColumns[_colNumber];
|
GridColumn col = GridView.VisibleColumns[_colNumber];
|
||||||
GridColumnModel model = col.Tag as GridColumnModel;
|
GridColumnModel model = col.Tag as GridColumnModel;
|
||||||
if (DateTime.TryParse(col.FieldName,out _)||(model.CanCopy || ((GridView.OptionsBehavior.Editable) && (GridView.VisibleColumns[_colNumber].OptionsColumn.AllowEdit))))
|
if (DateTime.TryParse(col.FieldName, out _) || (model.CanCopy || ((GridView.OptionsBehavior.Editable) && (GridView.VisibleColumns[_colNumber].OptionsColumn.AllowEdit))))
|
||||||
{
|
{
|
||||||
// 返回ID类型特殊处理
|
// 返回ID类型特殊处理
|
||||||
string cellValue = _arrayStr2[j];
|
string cellValue = _arrayStr2[j];
|
||||||
@@ -3168,4 +3135,32 @@ namespace Lskj.Control
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
string tempSql = string.Format(@"insert i
|
string tempSql = string.Format(@"insert into {3}(GroupName,GroupAmount,OperAtorId) values('{0}','{1}','{2}');", editValue, groupText, ERPInfo.Instance.UserId, ResourceKeys.SettingGrouprptab);
|
||||||
|
SqlHelper.ExecuteNonQuery(tempSql);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
string Message = ErrorMessage.PromptErrorMessage(ex, Model.ModuleCode);
|
||||||
|
MessageUtil.Show(Message, ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 点击标题行排序后,默认选中第一行
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void BandedGridView_EndSorting(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.bandedGridView.MoveFirst(); // 将焦点行移动到第一行
|
||||||
|
this.bandedGridView.FocusedRowHandle = 0;// 确保第一行被聚焦
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user