SVN r1104

SVN-Revision: r1104
This commit is contained in:
cyf
2026-01-30 07:48:24 +00:00
parent 5ccfe15fee
commit 47cf35aa28
45 changed files with 4096 additions and 449 deletions
+45 -3
View File
@@ -192,6 +192,7 @@ namespace Lskj.Control
// 初始化底部多标签
this.InitializePages();
}
Console.WriteLine(DateTime.Now);
//tcButtom.TabControlObj.ShowTabHeader = tcButtom.TabControlObj.TabPages.Count == 1 ? DefaultBoolean.False : DefaultBoolean.Default;
}
@@ -206,7 +207,6 @@ namespace Lskj.Control
MessageUtil.Show(Message, ex.Message);
//throw;
}
}
/// <summary>
@@ -333,6 +333,19 @@ namespace Lskj.Control
string htight = IniHelper.Read(string.Format("base_height_{0}", this.Model.ModuleCode));
if (!string.IsNullOrEmpty(htight))
{
//if (this.InvokeRequired)
//{
// this.BeginInvoke(new Action(() =>
// {
// this.scc_container.SplitterPosition = Convert.ToInt32(htight);
// }));
//}
//else
//{
// this.scc_container.SplitterPosition = Convert.ToInt32(htight);
//}
this.scc_container.SplitterPosition = Convert.ToInt32(htight);
}
}
@@ -796,6 +809,14 @@ namespace Lskj.Control
{
return;
}
if (model.IsChart&& !string.IsNullOrWhiteSpace(model.ChartText))
{
ChartControlEx controlEx = tabPage.Tag as ChartControlEx;
controlEx.SetTitle(ReplaceHelper.ReplaceRowParam(rowItem, model.ChartText), model.ChartTextColor);
}
string searchSql = this.GetSearchSql(model, rowItem);
//if (moduleGridEx != null&& moduleGridEx.SearchObj!=null)
//{
@@ -912,10 +933,13 @@ namespace Lskj.Control
sqlValue = ReplaceHelper.ReplaceRowParam(row, sqlValue);
}
// ① 先拿普通 GridView 的焦点列(始终会有)
GridColumn fixColumn = this.ModuleGridObj.GridControlObj.GridView.FocusedColumn;
string columnCaption = fixColumn?.Caption ?? string.Empty;
string columnCaption = fixColumn?.Caption ?? string.Empty;
string subColumnCaption = string.Empty;
string Columnvalue= string.Empty;
/* ② 如果启用了多表头(CustomGroupBandEx)
* 尝试用 BandedGridColumn.OwnerBand 获取 Band 标题 */
if (this.ModuleGridObj.GridControlObj.CustomGroupBandEx != null)
@@ -936,6 +960,7 @@ namespace Lskj.Control
while (band.ParentBand != null) band = band.ParentBand;
columnCaption = band.Caption; // 用 Band 的标题
subColumnCaption= focusedColumn.FieldName;
}
}
@@ -958,6 +983,7 @@ namespace Lskj.Control
while (band.ParentBand != null) band = band.ParentBand;
columnCaption = band.Caption; // 用 Band 的标题
subColumnCaption = focusedColumn.FieldName;
}
}
@@ -967,6 +993,14 @@ namespace Lskj.Control
// ③ 替换占位符(Replace 会返回新字符串)
sqlValue = sqlValue.Replace("{COLUMN_TITLE}", columnCaption);
sqlValue = sqlValue.Replace("{COLUMN_SUBTITLE}", subColumnCaption);
if (sqlValue.Contains("{COLUMN_VALUE}")&&!string.IsNullOrWhiteSpace(subColumnCaption))
{
string value = rowItem[subColumnCaption]+"";
sqlValue = sqlValue.Replace("{COLUMN_VALUE}", value);
}
if (ReplaceHelper.IsSelect(sqlValue) && !string.IsNullOrEmpty(model.UnionValue))
{
string Conditions = string.Empty;
@@ -981,6 +1015,11 @@ namespace Lskj.Control
string UnionCond = ReplaceHelper.ReplaceRowParam(rowItem, model.UnionCond);
sqlValue += UnionCond;
}
//替换普通焦点行列列名
if (sqlValue.Contains("{FOCUSEDCOLUMN_NAME}") && fixColumn != null)
{
sqlValue = sqlValue.Replace("{FOCUSEDCOLUMN_NAME}", fixColumn.FieldName);
}
return sqlValue;
}
/// <summary>
@@ -1157,6 +1196,8 @@ namespace Lskj.Control
// 获取点击的行句柄
int rowHandle = hitInfo.RowHandle;
//this.ModuleGridObj.GridControlObj.GridView.FocusedColumn = hitInfo.Column;
if (LastFocusedRowHandle == rowHandle)
{
//和上一次点击行一致就刷新数据原
@@ -1343,6 +1384,7 @@ namespace Lskj.Control
{
if (this.Model != null)
{
IniHelper.Write(string.Format("base_height_{0}", this.Model.ModuleCode), this.scc_container.SplitterPosition + "");
}
}